From ff0dcb36b05eb662b51423774a4502bc04378f69 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 16 Nov 2019 13:05:42 -0500 Subject: New upstream version 1.13.0 --- CHANGES | 188 + COMMITTERS | 4 +- INSTALL | 35 +- LICENSE | 21 + Makefile.in | 39 +- NOTICE | 3 + aclocal.m4 | 2 + build-outputs.mk | 1809 +- build.conf | 177 +- build/ac-macros/ax_boost_base.m4 | 301 + build/ac-macros/ax_boost_unit_test_framework.m4 | 137 + build/ac-macros/compiler.m4 | 17 +- build/ac-macros/java.m4 | 2 +- build/ac-macros/kwallet.m4 | 4 - build/ac-macros/macosx.m4 | 20 +- build/ac-macros/serf.m4 | 4 +- build/ac-macros/swig.m4 | 5 + build/buildcheck.sh | 22 +- build/generator/extractor.py | 2 + build/generator/gen_base.py | 117 +- build/generator/gen_make.py | 9 +- build/generator/gen_vcnet_vcproj.py | 8 + build/generator/gen_win.py | 56 +- build/generator/gen_win_dependencies.py | 12 +- build/generator/templates/build-outputs.mk.ezt | 10 +- build/generator/templates/pkg-config.in.ezt | 6 +- build/generator/templates/vcnet_vcxproj.ezt | 1 - build/run_tests.py | 5 + build/transform_libtool_scripts.sh | 3 +- build/transform_sql.py | 2 +- build/win32/vc6-build.bat.in | 176 - configure | 878 +- configure.ac | 120 +- doc/doxygen.conf | 59 +- doc/programmer/gtest-guide.txt | 30 - doc/user/svn-best-practices.html | 2 +- gen-make.py | 4 - get-deps.sh | 32 +- subversion/bindings/cxx/README | 147 + subversion/bindings/cxx/include/svnxx.hpp | 39 + subversion/bindings/cxx/include/svnxx/client.hpp | 40 + .../bindings/cxx/include/svnxx/client/context.hpp | 60 + .../bindings/cxx/include/svnxx/client/status.hpp | 138 + subversion/bindings/cxx/include/svnxx/depth.hpp | 79 + .../bindings/cxx/include/svnxx/detail/doxygen.hpp | 51 + .../bindings/cxx/include/svnxx/detail/future.hpp | 175 + .../cxx/include/svnxx/detail/noncopyable.hpp | 61 + .../bindings/cxx/include/svnxx/exception.hpp | 254 + subversion/bindings/cxx/include/svnxx/init.hpp | 60 + subversion/bindings/cxx/include/svnxx/revision.hpp | 386 + subversion/bindings/cxx/include/svnxx/tristate.hpp | 501 + subversion/bindings/cxx/src/aprwrap.hpp | 35 + subversion/bindings/cxx/src/aprwrap/array.hpp | 208 + subversion/bindings/cxx/src/aprwrap/hash.hpp | 373 + subversion/bindings/cxx/src/aprwrap/impl.cpp | 67 + subversion/bindings/cxx/src/aprwrap/pool.hpp | 218 + subversion/bindings/cxx/src/client_context.cpp | 60 + subversion/bindings/cxx/src/client_status.cpp | 143 + subversion/bindings/cxx/src/debug.cpp | 37 + subversion/bindings/cxx/src/depth.cpp | 55 + subversion/bindings/cxx/src/exception.cpp | 251 + subversion/bindings/cxx/src/future.cpp | 52 + subversion/bindings/cxx/src/init.cpp | 172 + subversion/bindings/cxx/src/private.hpp | 36 + .../cxx/src/private/client_context_private.hpp | 87 + .../bindings/cxx/src/private/debug_private.hpp | 49 + .../bindings/cxx/src/private/depth_private.hpp | 129 + .../bindings/cxx/src/private/exception_private.hpp | 60 + .../bindings/cxx/src/private/future_private.hpp | 110 + .../bindings/cxx/src/private/init_private.hpp | 83 + .../bindings/cxx/src/private/revision_private.hpp | 161 + .../bindings/cxx/src/private/strings_private.hpp | 106 + .../bindings/cxx/src/private/tristate_private.hpp | 63 + subversion/bindings/cxx/src/revision.cpp | 69 + subversion/bindings/cxx/tests/fixture_init.hpp | 38 + subversion/bindings/cxx/tests/svnxx-tests.cpp | 28 + .../bindings/cxx/tests/test_aprwrap_arrays.cpp | 197 + .../bindings/cxx/tests/test_aprwrap_hashes.cpp | 110 + .../bindings/cxx/tests/test_aprwrap_pools.cpp | 76 + .../bindings/cxx/tests/test_client_status.cpp | 71 + subversion/bindings/cxx/tests/test_depth.cpp | 91 + subversion/bindings/cxx/tests/test_exceptions.cpp | 229 + subversion/bindings/cxx/tests/test_init.cpp | 64 + subversion/bindings/cxx/tests/test_revision.cpp | 157 + subversion/bindings/cxx/tests/test_strings.cpp | 218 + subversion/bindings/cxx/tests/test_tristate.cpp | 368 + subversion/bindings/cxxhl/README | 13 - subversion/bindings/cxxhl/include/svncxxhl.hpp | 37 - .../bindings/cxxhl/include/svncxxhl/_compat.hpp | 144 - .../bindings/cxxhl/include/svncxxhl/exception.hpp | 188 - .../bindings/cxxhl/include/svncxxhl/tristate.hpp | 64 - subversion/bindings/cxxhl/src/aprwrap.hpp | 34 - subversion/bindings/cxxhl/src/aprwrap/array.hpp | 280 - subversion/bindings/cxxhl/src/aprwrap/hash.hpp | 371 - subversion/bindings/cxxhl/src/aprwrap/impl.cpp | 110 - subversion/bindings/cxxhl/src/aprwrap/pool.hpp | 198 - subversion/bindings/cxxhl/src/exception.cpp | 331 - subversion/bindings/cxxhl/src/private.hpp | 29 - .../cxxhl/src/private/exception-private.hpp | 49 - subversion/bindings/cxxhl/src/tristate.cpp | 44 - subversion/bindings/cxxhl/tests/cxxhl-tests.cpp | 46 - subversion/bindings/cxxhl/tests/test_aprwrap.cpp | 435 - subversion/bindings/cxxhl/tests/test_exception.cpp | 133 - subversion/bindings/javahl/README | 4 +- .../bindings/javahl/native/BlameCallback.cpp | 94 +- subversion/bindings/javahl/native/BlameCallback.h | 28 +- subversion/bindings/javahl/native/CxxCompat.hpp | 97 + subversion/bindings/javahl/native/EditorProxy.cpp | 2 +- subversion/bindings/javahl/native/EditorProxy.h | 4 +- subversion/bindings/javahl/native/JNIUtil.cpp | 15 +- .../bindings/javahl/native/OperationContext.cpp | 6 +- .../bindings/javahl/native/OperationContext.h | 7 +- subversion/bindings/javahl/native/Path.cpp | 7 +- subversion/bindings/javahl/native/Prompter.cpp | 12 +- subversion/bindings/javahl/native/Prompter.h | 5 +- .../bindings/javahl/native/RemoteSession.cpp | 37 +- subversion/bindings/javahl/native/RemoteSession.h | 4 +- .../javahl/native/RemoteSessionContext.cpp | 2 +- .../bindings/javahl/native/RemoteSessionContext.h | 3 +- subversion/bindings/javahl/native/SVNClient.cpp | 4 +- .../bindings/javahl/native/StateReporter.cpp | 4 +- .../javahl/native/jniwrapper/jni_class_cache.cpp | 15 +- .../javahl/native/jniwrapper/jni_io_stream.cpp | 6 +- .../org_apache_subversion_javahl_SVNClient.cpp | 13 +- ...ache_subversion_javahl_remote_RemoteSession.cpp | 4 +- ..._subversion_javahl_util_ConfigImpl_Category.cpp | 18 +- .../org_apache_subversion_javahl_util_PropLib.cpp | 4 +- .../org_apache_subversion_javahl_util_SubstLib.cpp | 5 +- .../subversion/javahl/CommitItemStateFlags.java | 9 + .../org/apache/subversion/javahl/ISVNClient.java | 34 +- .../apache/subversion/javahl/NativeResources.java | 7 +- .../org/apache/subversion/javahl/SVNClient.java | 61 +- .../subversion/javahl/callback/BlameCallback.java | 2 + .../javahl/callback/BlameLineCallback.java | 55 + .../javahl/callback/BlameRangeCallback.java | 43 + .../javahl/callback/UserPasswordCallback.java | 5 + .../apache/subversion/javahl/types/Revision.java | 2 + .../subversion/javahl/types/RevisionRange.java | 2 +- .../org/apache/subversion/javahl/BasicTests.java | 205 +- .../apache/subversion/javahl/ExceptionTests.java | 23 +- .../apache/subversion/javahl/SVNRemoteTests.java | 4 +- .../org/tigris/subversion/javahl/BasicTests.java | 2 +- subversion/bindings/swig/core.i | 2 + subversion/bindings/swig/include/svn_types.swg | 11 +- subversion/bindings/swig/perl/native/core.c | 3544 ++- subversion/bindings/swig/perl/native/svn_client.c | 6003 +++- subversion/bindings/swig/perl/native/svn_delta.c | 697 +- subversion/bindings/swig/perl/native/svn_diff.c | 49 +- subversion/bindings/swig/perl/native/svn_fs.c | 535 +- subversion/bindings/swig/perl/native/svn_ra.c | 254 +- subversion/bindings/swig/perl/native/svn_repos.c | 778 +- subversion/bindings/swig/perl/native/svn_wc.c | 758 +- subversion/bindings/swig/proxy/svn_client_h.swg | 25 +- subversion/bindings/swig/proxy/svn_delta_h.swg | 10 + subversion/bindings/swig/proxy/svn_fs_h.swg | 1 + subversion/bindings/swig/proxy/svn_opt_h.swg | 1 + subversion/bindings/swig/proxy/svn_opt_impl_h.swg | 30 + subversion/bindings/swig/proxy/svn_repos_h.swg | 15 +- .../bindings/swig/proxy/svn_types_impl_h.swg | 30 + subversion/bindings/swig/python/client.py | 453 +- subversion/bindings/swig/python/core.c | 2050 +- subversion/bindings/swig/python/core.py | 190 +- subversion/bindings/swig/python/delta.py | 136 + subversion/bindings/swig/python/fs.py | 64 + .../swig/python/libsvn_swig_py/swigutil_py.c | 55 +- subversion/bindings/swig/python/repos.py | 72 + subversion/bindings/swig/python/svn/core.py | 2 +- subversion/bindings/swig/python/svn/fs.py | 74 +- subversion/bindings/swig/python/svn_client.c | 4720 ++- subversion/bindings/swig/python/svn_delta.c | 866 +- subversion/bindings/swig/python/svn_diff.c | 225 +- subversion/bindings/swig/python/svn_fs.c | 430 +- subversion/bindings/swig/python/svn_ra.c | 254 +- subversion/bindings/swig/python/svn_repos.c | 924 +- subversion/bindings/swig/python/svn_wc.c | 466 +- subversion/bindings/swig/python/tests/delta.py | 55 + subversion/bindings/swig/python/tests/fs.py | 124 + .../bindings/swig/python/tests/repository.py | 15 + subversion/bindings/swig/python/tests/run_all.py | 3 +- subversion/bindings/swig/python/wc.py | 4 + subversion/bindings/swig/ruby/core.c | 1973 +- subversion/bindings/swig/ruby/svn/util.rb | 9 +- subversion/bindings/swig/ruby/svn_client.c | 5193 +++- subversion/bindings/swig/ruby/svn_delta.c | 686 +- subversion/bindings/swig/ruby/svn_diff.c | 47 +- subversion/bindings/swig/ruby/svn_fs.c | 466 +- subversion/bindings/swig/ruby/svn_ra.c | 234 +- subversion/bindings/swig/ruby/svn_repos.c | 642 +- subversion/bindings/swig/ruby/svn_wc.c | 392 +- subversion/bindings/swig/ruby/test/test_client.rb | 2 +- subversion/bindings/swig/ruby/test/test_delta.rb | 49 +- subversion/bindings/swig/ruby/test/test_util.rb | 1 + subversion/include/private/svn_client_mtcc.h | 11 + subversion/include/private/svn_client_private.h | 250 +- subversion/include/private/svn_diff_tree.h | 1 - .../include/private/svn_dirent_uri_private.h | 53 + subversion/include/private/svn_element.h | 2 +- subversion/include/private/svn_fs_fs_private.h | 86 +- subversion/include/private/svn_repos_private.h | 39 + subversion/include/private/svn_sorts_private.h | 4 +- subversion/include/private/svn_subr_private.h | 14 +- subversion/include/private/svn_wc_private.h | 72 +- subversion/include/svn_client.h | 852 +- subversion/include/svn_delta.h | 164 +- subversion/include/svn_dirent_uri.h | 145 +- subversion/include/svn_error_codes.h | 10 + subversion/include/svn_fs.h | 58 +- subversion/include/svn_opt.h | 172 +- subversion/include/svn_opt_impl.h | 86 + subversion/include/svn_props.h | 19 +- subversion/include/svn_ra.h | 12 +- subversion/include/svn_repos.h | 72 +- subversion/include/svn_time.h | 11 +- subversion/include/svn_types.h | 99 +- subversion/include/svn_types_impl.h | 157 + subversion/include/svn_utf.h | 2 +- subversion/include/svn_version.h | 8 +- subversion/include/svn_wc.h | 33 +- .../libsvn_auth_gnome_keyring.pc.in | 8 +- .../libsvn_auth_kwallet/libsvn_auth_kwallet.pc.in | 8 +- subversion/libsvn_client/add.c | 7 +- subversion/libsvn_client/blame.c | 22 +- subversion/libsvn_client/client.h | 103 +- subversion/libsvn_client/commit.c | 185 +- subversion/libsvn_client/commit_util.c | 34 +- subversion/libsvn_client/conflicts.c | 5229 +++- subversion/libsvn_client/copy.c | 750 +- subversion/libsvn_client/copy_foreign.c | 575 - subversion/libsvn_client/delete.c | 7 +- subversion/libsvn_client/deprecated.c | 156 +- subversion/libsvn_client/diff.c | 891 +- subversion/libsvn_client/diff_local.c | 126 +- subversion/libsvn_client/diff_summarize.c | 20 +- subversion/libsvn_client/export.c | 33 +- subversion/libsvn_client/info.c | 3 +- subversion/libsvn_client/layout.c | 289 + subversion/libsvn_client/libsvn_client.pc.in | 8 +- subversion/libsvn_client/list.c | 2 +- subversion/libsvn_client/merge.c | 328 +- subversion/libsvn_client/patch.c | 15 +- subversion/libsvn_client/repos_diff.c | 15 +- subversion/libsvn_client/revert.c | 8 +- subversion/libsvn_client/shelf.c | 1273 + subversion/libsvn_client/shelve.c | 560 - subversion/libsvn_client/status.c | 79 + subversion/libsvn_client/update.c | 10 +- subversion/libsvn_client/upgrade.c | 31 +- subversion/libsvn_client/util.c | 1 + subversion/libsvn_client/wc_editor.c | 655 + subversion/libsvn_delta/branch_compat.c | 54 +- subversion/libsvn_delta/compat.c | 50 +- subversion/libsvn_delta/debug_editor.c | 159 +- subversion/libsvn_delta/deprecated.c | 73 + subversion/libsvn_delta/element.c | 4 +- subversion/libsvn_delta/libsvn_delta.pc.in | 8 +- subversion/libsvn_delta/path_driver.c | 313 +- subversion/libsvn_diff/diff_tree.c | 75 +- subversion/libsvn_diff/libsvn_diff.pc.in | 8 +- subversion/libsvn_diff/parse-diff.c | 98 +- subversion/libsvn_fs/fs-loader.c | 39 + subversion/libsvn_fs/fs-loader.h | 13 + subversion/libsvn_fs/libsvn_fs.pc.in | 8 +- subversion/libsvn_fs_base/fs.c | 4 +- subversion/libsvn_fs_base/libsvn_fs_base.pc.in | 8 +- subversion/libsvn_fs_fs/cached_data.h | 2 +- subversion/libsvn_fs_fs/dag.c | 2 +- subversion/libsvn_fs_fs/dump-index.c | 2 +- subversion/libsvn_fs_fs/fs.c | 68 +- subversion/libsvn_fs_fs/fs_fs.h | 52 + subversion/libsvn_fs_fs/id.c | 3 +- subversion/libsvn_fs_fs/index.c | 4 +- subversion/libsvn_fs_fs/libsvn_fs_fs.pc.in | 8 +- subversion/libsvn_fs_fs/load-index.c | 6 +- subversion/libsvn_fs_fs/low_level.c | 6 +- subversion/libsvn_fs_fs/pack.c | 14 +- subversion/libsvn_fs_fs/rep-cache-db.h | 2 +- subversion/libsvn_fs_fs/revprops.c | 58 + subversion/libsvn_fs_fs/revprops.h | 9 + subversion/libsvn_fs_fs/stats.c | 95 +- subversion/libsvn_fs_fs/temp_serializer.h | 6 +- subversion/libsvn_fs_fs/verify.c | 11 +- subversion/libsvn_fs_util/libsvn_fs_util.pc.in | 8 +- subversion/libsvn_fs_x/changes.c | 2 +- subversion/libsvn_fs_x/dag_cache.c | 2 +- subversion/libsvn_fs_x/dag_cache.h | 2 +- subversion/libsvn_fs_x/fs.c | 6 +- subversion/libsvn_fs_x/libsvn_fs_x.pc.in | 8 +- subversion/libsvn_fs_x/low_level.c | 6 +- subversion/libsvn_fs_x/pack.c | 12 +- subversion/libsvn_fs_x/rep-cache-db.h | 2 +- subversion/libsvn_fs_x/transaction.c | 2 +- subversion/libsvn_fs_x/tree.c | 2 +- subversion/libsvn_ra/libsvn_ra.pc.in | 8 +- subversion/libsvn_ra_local/libsvn_ra_local.pc.in | 8 +- subversion/libsvn_ra_serf/commit.c | 4 +- subversion/libsvn_ra_serf/libsvn_ra_serf.pc.in | 8 +- subversion/libsvn_ra_serf/list.c | 13 - subversion/libsvn_ra_serf/options.c | 25 +- subversion/libsvn_ra_serf/replay.c | 2 +- subversion/libsvn_ra_serf/update.c | 2 +- subversion/libsvn_ra_serf/util.c | 8 +- subversion/libsvn_ra_svn/libsvn_ra_svn.pc.in | 8 +- subversion/libsvn_ra_svn/protocol | 2 +- subversion/libsvn_repos/authz.c | 43 +- subversion/libsvn_repos/authz.h | 2 + subversion/libsvn_repos/authz_parse.c | 43 +- subversion/libsvn_repos/commit.c | 28 +- subversion/libsvn_repos/delta.c | 14 +- subversion/libsvn_repos/deprecated.c | 29 + subversion/libsvn_repos/dump.c | 84 +- subversion/libsvn_repos/dump_editor.c | 1040 + subversion/libsvn_repos/libsvn_repos.pc.in | 8 +- subversion/libsvn_repos/list.c | 2 +- subversion/libsvn_repos/load-fs-vtable.c | 24 +- subversion/libsvn_repos/load.c | 58 +- subversion/libsvn_repos/log.c | 2 +- subversion/libsvn_repos/replay.c | 11 +- subversion/libsvn_repos/repos.c | 4 +- subversion/libsvn_subr/compress_lz4.c | 2 +- subversion/libsvn_subr/config_file.c | 38 +- subversion/libsvn_subr/config_win.c | 2 +- subversion/libsvn_subr/deprecated.c | 412 + subversion/libsvn_subr/dirent_uri.c | 175 +- subversion/libsvn_subr/internal_statements.h | 2 +- subversion/libsvn_subr/io.c | 268 +- subversion/libsvn_subr/libsvn_subr.pc.in | 8 +- subversion/libsvn_subr/lz4/lz4.c | 2 +- subversion/libsvn_subr/lz4/lz4internal.h | 2 +- subversion/libsvn_subr/opt.c | 222 +- subversion/libsvn_subr/pool.c | 2 +- subversion/libsvn_subr/sqlite3wrapper.c | 2 + subversion/libsvn_subr/stream.c | 8 +- subversion/libsvn_subr/sysinfo.c | 287 +- subversion/libsvn_subr/utf.c | 2 +- subversion/libsvn_subr/win32_crashrpt.c | 5 +- subversion/libsvn_subr/win32_crypto.c | 17 +- subversion/libsvn_subr/x509info.c | 2 +- subversion/libsvn_wc/README | 15 + subversion/libsvn_wc/conflicts.c | 85 +- subversion/libsvn_wc/conflicts.h | 7 + subversion/libsvn_wc/deprecated.c | 30 +- subversion/libsvn_wc/diff_local.c | 29 +- subversion/libsvn_wc/libsvn_wc.pc.in | 8 +- subversion/libsvn_wc/node.c | 28 + subversion/libsvn_wc/props.c | 4 +- subversion/libsvn_wc/questions.c | 2 +- subversion/libsvn_wc/revert.c | 54 +- subversion/libsvn_wc/tree_conflicts.c | 2 +- subversion/libsvn_wc/update_editor.c | 31 +- subversion/libsvn_wc/upgrade.c | 2 +- subversion/libsvn_wc/wc-checks.h | 2 +- subversion/libsvn_wc/wc-metadata.h | 2 +- subversion/libsvn_wc/wc-queries.h | 1268 +- subversion/libsvn_wc/wc-queries.sql | 22 + subversion/libsvn_wc/wc.h | 1 + subversion/libsvn_wc/wc_db.c | 105 +- subversion/libsvn_wc/wc_db.h | 48 +- subversion/libsvn_wc/wc_db_update_move.c | 10 +- subversion/libsvn_wc/wc_db_wcroot.c | 16 +- subversion/libsvn_wc/wcroot_anchor.c | 16 +- subversion/mod_authz_svn/mod_authz_svn.c | 52 +- subversion/mod_dav_svn/mod_dav_svn.c | 8 +- subversion/mod_dav_svn/reports/file-revs.c | 2 +- subversion/mod_dav_svn/reports/replay.c | 2 +- subversion/mod_dav_svn/repos.c | 77 +- subversion/po/de.po | 29801 +++++++++++-------- subversion/po/subversion.pot | 5349 ++-- subversion/po/sv.po | 6612 ++-- subversion/svn/auth-cmd.c | 17 +- subversion/svn/blame-cmd.c | 42 +- subversion/svn/cl.h | 66 +- subversion/svn/conflict-callbacks.c | 152 +- subversion/svn/diff-cmd.c | 48 +- subversion/svn/filesize.c | 221 + subversion/svn/help-cmd.c | 2 +- subversion/svn/info-cmd.c | 380 +- subversion/svn/list-cmd.c | 89 +- subversion/svn/log-cmd.c | 5 +- subversion/svn/merge-cmd.c | 40 +- subversion/svn/notify.c | 2 +- subversion/svn/propset-cmd.c | 2 +- subversion/svn/revert-cmd.c | 3 +- subversion/svn/shelf-cmd.c | 1233 + subversion/svn/shelve-cmd.c | 369 - subversion/svn/svn.c | 1148 +- subversion/svn/util.c | 2 + subversion/svn_private_config.h.in | 9 + subversion/svnadmin/svnadmin.c | 352 +- subversion/svnbench/cl.h | 2 +- subversion/svnbench/help-cmd.c | 2 +- subversion/svnbench/svnbench.c | 92 +- subversion/svndumpfilter/svndumpfilter.c | 52 +- subversion/svnfsfs/dump-index-cmd.c | 7 +- subversion/svnfsfs/load-index-cmd.c | 8 +- subversion/svnfsfs/stats-cmd.c | 10 +- subversion/svnfsfs/svnfsfs.c | 64 +- subversion/svnlook/svnlook.c | 160 +- subversion/svnmucc/svnmucc.c | 2 +- subversion/svnrdump/dump_editor.c | 967 +- subversion/svnrdump/load_editor.c | 1016 +- subversion/svnrdump/svnrdump.c | 70 +- subversion/svnrdump/svnrdump.h | 21 +- subversion/svnserve/logger.c | 47 +- subversion/svnserve/logger.h | 11 +- subversion/svnserve/serve.c | 295 +- subversion/svnserve/svnserve.c | 2 +- subversion/svnsync/svnsync.c | 81 +- subversion/svnversion/svnversion.c | 2 +- subversion/tests/afl/afl-svndiff-testcase/test1 | Bin 0 -> 4 bytes subversion/tests/afl/afl-svndiff-testcase/test2 | Bin 0 -> 16 bytes subversion/tests/afl/afl-svndiff-testcase/test3 | Bin 0 -> 18 bytes subversion/tests/afl/afl-svndiff.c | 85 + subversion/tests/afl/afl-x509-testcase/test2 | Bin 0 -> 694 bytes subversion/tests/afl/afl-x509-testcase/test3 | Bin 0 -> 810 bytes subversion/tests/cmdline/authz_tests.py | 58 +- subversion/tests/cmdline/basic_tests.py | 71 +- subversion/tests/cmdline/blame_tests.py | 3 +- subversion/tests/cmdline/changelist_tests.py | 99 +- subversion/tests/cmdline/commit_tests.py | 38 +- subversion/tests/cmdline/copy_tests.py | 107 +- subversion/tests/cmdline/dav-mirror-autocheck.sh | 55 +- subversion/tests/cmdline/dav_tests.py | 113 + subversion/tests/cmdline/davautocheck.sh | 28 + subversion/tests/cmdline/depth_tests.py | 2 +- subversion/tests/cmdline/diff_tests.py | 112 +- subversion/tests/cmdline/entries_tests.py | 9 +- subversion/tests/cmdline/export_tests.py | 14 +- subversion/tests/cmdline/externals_tests.py | 28 +- .../cmdline/getopt_tests_data/svn--help_stdout | 5 +- .../getopt_tests_data/svn_help_log_switch_stdout | 56 +- .../cmdline/getopt_tests_data/svn_help_stdout | 5 +- subversion/tests/cmdline/info_tests.py | 74 + subversion/tests/cmdline/iprop_authz_tests.py | 2 +- subversion/tests/cmdline/lock_tests.py | 4 +- subversion/tests/cmdline/log_tests.py | 8 +- subversion/tests/cmdline/merge_authz_tests.py | 4 +- subversion/tests/cmdline/merge_automatic_tests.py | 2 +- .../tests/cmdline/merge_reintegrate_tests.py | 2 +- subversion/tests/cmdline/merge_tests.py | 147 +- .../tests/cmdline/merge_tree_conflict_tests.py | 4 +- subversion/tests/cmdline/mergeinfo_tests.py | 2 +- subversion/tests/cmdline/mod_dav_svn_tests.py | 48 + subversion/tests/cmdline/move_tests.py | 2 +- subversion/tests/cmdline/patch_tests.py | 231 +- subversion/tests/cmdline/pegrev_parse_tests.py | 673 + subversion/tests/cmdline/prop_tests.py | 2 +- subversion/tests/cmdline/revert_tests.py | 192 +- subversion/tests/cmdline/shelf_tests.py | 1012 + subversion/tests/cmdline/shelve_tests.py | 206 - subversion/tests/cmdline/special_tests.py | 5 +- subversion/tests/cmdline/stat_tests.py | 3 +- subversion/tests/cmdline/svnadmin_tests.py | 63 +- subversion/tests/cmdline/svnauthz_tests.py | 21 +- subversion/tests/cmdline/svndumpfilter_tests.py | 8 +- subversion/tests/cmdline/svnfsfs_tests.py | 3 +- subversion/tests/cmdline/svnmover_tests.py | 6 +- subversion/tests/cmdline/svnmucc_tests.py | 2 +- subversion/tests/cmdline/svnrdump_tests.py | 301 +- .../cmdline/svnrdump_tests_data/bad-date-r0.dump | 14 + .../cmdline/svnrdump_tests_data/bad-date-r1.dump | 24 + subversion/tests/cmdline/svnserveautocheck.sh | 39 +- subversion/tests/cmdline/svnsync_authz_tests.py | 2 +- subversion/tests/cmdline/svnsync_tests.py | 2 +- subversion/tests/cmdline/svntest/actions.py | 116 +- subversion/tests/cmdline/svntest/main.py | 151 +- subversion/tests/cmdline/svntest/mergetrees.py | 101 +- subversion/tests/cmdline/svntest/sandbox.py | 47 +- subversion/tests/cmdline/svntest/testcase.py | 4 +- subversion/tests/cmdline/svntest/tree.py | 15 +- subversion/tests/cmdline/svntest/verify.py | 103 +- subversion/tests/cmdline/svnversion_tests.py | 18 +- subversion/tests/cmdline/switch_tests.py | 22 +- subversion/tests/cmdline/trans_tests.py | 6 +- subversion/tests/cmdline/tree_conflict_tests.py | 49 +- subversion/tests/cmdline/update_tests.py | 14 +- subversion/tests/cmdline/upgrade_tests.py | 6 +- subversion/tests/libsvn_client/client-test.c | 39 +- subversion/tests/libsvn_client/conflicts-test.c | 1980 +- subversion/tests/libsvn_fs/fs-test.c | 30 + subversion/tests/libsvn_fs/locks-test.c | 3 + subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c | 4 +- subversion/tests/libsvn_fs_fs/fs-fs-private-test.c | 38 +- subversion/tests/libsvn_repos/authz-test.c | 45 +- subversion/tests/libsvn_repos/dump-load-test.c | 4 +- subversion/tests/libsvn_repos/repos-test.c | 2 +- subversion/tests/libsvn_subr/dirent_uri-test.c | 6 +- subversion/tests/libsvn_subr/priority-queue-test.c | 6 +- subversion/tests/libsvn_subr/stream-test.c | 67 + subversion/tests/libsvn_wc/conflict-data-test.c | 11 +- subversion/tests/libsvn_wc/op-depth-test.c | 2 +- subversion/tests/libsvn_wc/utils.c | 3 +- subversion/tests/libsvn_wc/wc-queries-test.c | 123 +- subversion/tests/libsvn_wc/wc-test-queries.h | 2 +- subversion/tests/svn_test_main.c | 5 +- tools/backup/hot-backup.py.in | 2 +- tools/buildbot/slaves/bb-openbsd/svnbuild.sh | 11 +- .../slaves/bb-openbsd/svncheck-bindings.sh | 6 +- tools/buildbot/slaves/bb-openbsd/svncheck.sh | 8 +- tools/buildbot/slaves/bb-openbsd/svnclean.sh | 14 +- .../svnbuild.sh | 44 - .../svncheck.sh | 40 - .../svnclean.sh | 31 - .../svnlog.sh | 31 - .../slaves/svn-x64-macosx-gnu-shared/svnbuild.sh | 44 - .../slaves/svn-x64-macosx-gnu-shared/svncheck.sh | 40 - .../slaves/svn-x64-macosx-gnu-shared/svnclean.sh | 31 - .../slaves/svn-x64-macosx-gnu-shared/svnlog.sh | 31 - tools/buildbot/slaves/svn-x64-macosx/setenv.sh | 6 +- .../slaves/svn-x64-macosx/svnbuild-bindings.sh | 25 +- tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh | 27 +- .../slaves/svn-x64-macosx/svncheck-bindings.sh | 2 + tools/buildbot/slaves/svn-x64-macosx/svncheck.sh | 17 +- tools/buildbot/slaves/svnbot-common/README | 7 + tools/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl | 44 - tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat | 77 - tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat | 51 - tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat | 28 - tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat | 25 - tools/client-side/bash_completion | 58 +- .../svn-mergeinfo-normalizer/help-cmd.c | 2 +- .../mergeinfo-normalizer.h | 2 +- .../svn-mergeinfo-normalizer.c | 68 +- .../svn-mergeinfo-normalizer/wc_mergeinfo.c | 4 +- tools/client-side/svn-viewspec.py | 50 +- tools/client-side/svnconflict/svnconflict.c | 105 +- tools/client-side/svnviewspec_test.py | 428 + tools/dev/build-svn-deps-win.pl | 20 +- tools/dev/svnmover/svnmover.c | 4 +- .../svnraisetreeconflict/svnraisetreeconflict.c | 2 +- tools/dev/unix-build/Makefile.svn | 435 +- tools/dev/unix-build/README | 19 + tools/dev/wc-ng/svn-wc-db-tester.c | 2 +- tools/dev/which-error.py | 2 +- tools/dist/README.backport | 36 +- tools/dist/backport.pl | 15 +- tools/dist/backport/status.py | 10 +- tools/dist/backport_tests.py | 22 + .../backport_logsummary_colon.dump | 522 + tools/dist/changes-to-html.py | 88 + tools/dist/create-minor-release-branch.py | 328 + tools/dist/edit-N-log-messages | 94 + tools/dist/nightly.sh | 2 +- tools/dist/release.py | 555 +- tools/dist/security/parser.py | 13 +- tools/dist/templates/download.ezt | 6 +- tools/dist/templates/rc-news.ezt | 4 +- tools/dist/templates/rc-release-ann.ezt | 22 +- tools/dist/templates/stable-news.ezt | 6 +- tools/dist/templates/stable-release-ann.ezt | 22 +- tools/examples/svnlook.py | 2 +- tools/hook-scripts/commit-access-control.pl.in | 2 +- tools/hook-scripts/mailer/mailer.py | 22 +- tools/hook-scripts/svn2feed.py | 2 +- tools/hook-scripts/svnperms.py | 2 +- tools/server-side/fsfs-reshard.py | 2 +- tools/server-side/svnauthz.c | 109 +- tools/server-side/svnpubsub/svnwcsub.py | 2 +- win-tests.py | 2 +- 558 files changed, 88331 insertions(+), 38881 deletions(-) create mode 100644 build/ac-macros/ax_boost_base.m4 create mode 100644 build/ac-macros/ax_boost_unit_test_framework.m4 delete mode 100644 build/win32/vc6-build.bat.in delete mode 100644 doc/programmer/gtest-guide.txt create mode 100644 subversion/bindings/cxx/README create mode 100644 subversion/bindings/cxx/include/svnxx.hpp create mode 100644 subversion/bindings/cxx/include/svnxx/client.hpp create mode 100644 subversion/bindings/cxx/include/svnxx/client/context.hpp create mode 100644 subversion/bindings/cxx/include/svnxx/client/status.hpp create mode 100644 subversion/bindings/cxx/include/svnxx/depth.hpp create mode 100644 subversion/bindings/cxx/include/svnxx/detail/doxygen.hpp create mode 100644 subversion/bindings/cxx/include/svnxx/detail/future.hpp create mode 100644 subversion/bindings/cxx/include/svnxx/detail/noncopyable.hpp create mode 100644 subversion/bindings/cxx/include/svnxx/exception.hpp create mode 100644 subversion/bindings/cxx/include/svnxx/init.hpp create mode 100644 subversion/bindings/cxx/include/svnxx/revision.hpp create mode 100644 subversion/bindings/cxx/include/svnxx/tristate.hpp create mode 100644 subversion/bindings/cxx/src/aprwrap.hpp create mode 100644 subversion/bindings/cxx/src/aprwrap/array.hpp create mode 100644 subversion/bindings/cxx/src/aprwrap/hash.hpp create mode 100644 subversion/bindings/cxx/src/aprwrap/impl.cpp create mode 100644 subversion/bindings/cxx/src/aprwrap/pool.hpp create mode 100644 subversion/bindings/cxx/src/client_context.cpp create mode 100644 subversion/bindings/cxx/src/client_status.cpp create mode 100644 subversion/bindings/cxx/src/debug.cpp create mode 100644 subversion/bindings/cxx/src/depth.cpp create mode 100644 subversion/bindings/cxx/src/exception.cpp create mode 100644 subversion/bindings/cxx/src/future.cpp create mode 100644 subversion/bindings/cxx/src/init.cpp create mode 100644 subversion/bindings/cxx/src/private.hpp create mode 100644 subversion/bindings/cxx/src/private/client_context_private.hpp create mode 100644 subversion/bindings/cxx/src/private/debug_private.hpp create mode 100644 subversion/bindings/cxx/src/private/depth_private.hpp create mode 100644 subversion/bindings/cxx/src/private/exception_private.hpp create mode 100644 subversion/bindings/cxx/src/private/future_private.hpp create mode 100644 subversion/bindings/cxx/src/private/init_private.hpp create mode 100644 subversion/bindings/cxx/src/private/revision_private.hpp create mode 100644 subversion/bindings/cxx/src/private/strings_private.hpp create mode 100644 subversion/bindings/cxx/src/private/tristate_private.hpp create mode 100644 subversion/bindings/cxx/src/revision.cpp create mode 100644 subversion/bindings/cxx/tests/fixture_init.hpp create mode 100644 subversion/bindings/cxx/tests/svnxx-tests.cpp create mode 100644 subversion/bindings/cxx/tests/test_aprwrap_arrays.cpp create mode 100644 subversion/bindings/cxx/tests/test_aprwrap_hashes.cpp create mode 100644 subversion/bindings/cxx/tests/test_aprwrap_pools.cpp create mode 100644 subversion/bindings/cxx/tests/test_client_status.cpp create mode 100644 subversion/bindings/cxx/tests/test_depth.cpp create mode 100644 subversion/bindings/cxx/tests/test_exceptions.cpp create mode 100644 subversion/bindings/cxx/tests/test_init.cpp create mode 100644 subversion/bindings/cxx/tests/test_revision.cpp create mode 100644 subversion/bindings/cxx/tests/test_strings.cpp create mode 100644 subversion/bindings/cxx/tests/test_tristate.cpp delete mode 100644 subversion/bindings/cxxhl/README delete mode 100644 subversion/bindings/cxxhl/include/svncxxhl.hpp delete mode 100644 subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp delete mode 100644 subversion/bindings/cxxhl/include/svncxxhl/exception.hpp delete mode 100644 subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp delete mode 100644 subversion/bindings/cxxhl/src/aprwrap.hpp delete mode 100644 subversion/bindings/cxxhl/src/aprwrap/array.hpp delete mode 100644 subversion/bindings/cxxhl/src/aprwrap/hash.hpp delete mode 100644 subversion/bindings/cxxhl/src/aprwrap/impl.cpp delete mode 100644 subversion/bindings/cxxhl/src/aprwrap/pool.hpp delete mode 100644 subversion/bindings/cxxhl/src/exception.cpp delete mode 100644 subversion/bindings/cxxhl/src/private.hpp delete mode 100644 subversion/bindings/cxxhl/src/private/exception-private.hpp delete mode 100644 subversion/bindings/cxxhl/src/tristate.cpp delete mode 100644 subversion/bindings/cxxhl/tests/cxxhl-tests.cpp delete mode 100644 subversion/bindings/cxxhl/tests/test_aprwrap.cpp delete mode 100644 subversion/bindings/cxxhl/tests/test_exception.cpp create mode 100644 subversion/bindings/javahl/native/CxxCompat.hpp create mode 100644 subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameLineCallback.java create mode 100644 subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameRangeCallback.java create mode 100644 subversion/bindings/swig/proxy/svn_opt_impl_h.swg create mode 100644 subversion/bindings/swig/proxy/svn_types_impl_h.swg create mode 100644 subversion/bindings/swig/python/tests/fs.py create mode 100644 subversion/include/private/svn_dirent_uri_private.h create mode 100644 subversion/include/svn_opt_impl.h create mode 100644 subversion/include/svn_types_impl.h delete mode 100644 subversion/libsvn_client/copy_foreign.c create mode 100644 subversion/libsvn_client/layout.c create mode 100644 subversion/libsvn_client/shelf.c delete mode 100644 subversion/libsvn_client/shelve.c create mode 100644 subversion/libsvn_client/wc_editor.c create mode 100644 subversion/libsvn_repos/dump_editor.c create mode 100644 subversion/svn/filesize.c create mode 100644 subversion/svn/shelf-cmd.c delete mode 100644 subversion/svn/shelve-cmd.c create mode 100644 subversion/tests/afl/afl-svndiff-testcase/test1 create mode 100644 subversion/tests/afl/afl-svndiff-testcase/test2 create mode 100644 subversion/tests/afl/afl-svndiff-testcase/test3 create mode 100644 subversion/tests/afl/afl-svndiff.c create mode 100644 subversion/tests/afl/afl-x509-testcase/test2 create mode 100644 subversion/tests/afl/afl-x509-testcase/test3 create mode 100755 subversion/tests/cmdline/dav_tests.py mode change 100644 => 100755 subversion/tests/cmdline/mod_dav_svn_tests.py create mode 100644 subversion/tests/cmdline/pegrev_parse_tests.py create mode 100755 subversion/tests/cmdline/shelf_tests.py delete mode 100755 subversion/tests/cmdline/shelve_tests.py create mode 100644 subversion/tests/cmdline/svnrdump_tests_data/bad-date-r0.dump create mode 100644 subversion/tests/cmdline/svnrdump_tests_data/bad-date-r1.dump mode change 100755 => 100644 subversion/tests/cmdline/svntest/mergetrees.py delete mode 100755 tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh delete mode 100755 tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh delete mode 100755 tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh delete mode 100755 tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh delete mode 100755 tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnbuild.sh delete mode 100755 tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svncheck.sh delete mode 100755 tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnclean.sh delete mode 100755 tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh create mode 100644 tools/buildbot/slaves/svnbot-common/README delete mode 100644 tools/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl delete mode 100644 tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat delete mode 100644 tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat delete mode 100644 tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat delete mode 100644 tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat create mode 100755 tools/client-side/svnviewspec_test.py create mode 100644 tools/dist/backport_tests_data/backport_logsummary_colon.dump create mode 100755 tools/dist/changes-to-html.py create mode 100755 tools/dist/create-minor-release-branch.py create mode 100755 tools/dist/edit-N-log-messages diff --git a/CHANGES b/CHANGES index 0730c3f..66e5b64 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,191 @@ +# To view a revision listed as (rXXXXXXX), visit: +# https://svn.apache.org/rXXXXXXX +# +# To view an issue listed as (issue #XXXX), visit: +# https://issues.apache.org/jira/browse/SVN-XXXX + +Version 1.13.0 +(16 Oct 2019, from /branches/1.13.x) +https://svn.apache.org/repos/asf/subversion/tags/1.13.0 + + User-visible changes: + - Minor new features and improvements: + * New 'svnadmin rev-size' command to report revision size (r1857624) + * In 'svn help', hide experimental commands and global options (issue #4828) + * Add a hint about mod_dav_svn misconfiguration (r1866738) + * Performance improvement for 'svn st' etc., in WC SQLite DB (r1865523) + + - Client-side bugfixes: + * Windows: avoid delays in SSL certificate validation override (r1863018) + * Fix 'svn patch' setting mode 0600 on patched files with props (r1864440) + * Fix "svn diff --changelist ARG" broken in subdirectories (issue #4822) + * Fix misleading 'redirect cycle' error on a non-repository URL (r1866899) + + - Server-side bugfixes: + * svnserve: Report some errors that we previously ignored (r1866062) + * Make server code more resilient to malformed paths and URLs (r1866318 et al) + * Make dump stream parser more resilient to malformed dump stream (r1866951) + * mod_dav_svn: Fix missing Last-Modified header on 'external' GET requests (r1866425) + + - Client-side and server-side bugfixes: + * Fix excessive memory usage in some cases reading binary data (r1866950) + * Win32: fix svn_io_file_rename2() spinning in a retry loop (r1865518) + + - Other tool improvements and bugfixes: + * svn_load_dirs.pl: do not show password; fix cleanup (r1863262, r1863392) + + Developer-visible changes: + * New svn_fs_ioctl() API for FSFS stats, dump/load index, rev-size (r1857435) + + +Version 1.12.2 +(24 Jul 2019, from /branches/1.12.x) +https://svn.apache.org/repos/asf/subversion/tags/1.12.2 + + User-visible changes: + * Fix conflict resolver bug: local and incoming edits swapped. (r1863285) + * Fix memory lifetime problem in a libsvn_wc error code path. (r1863287) + * Faster Windows file existence checks, improving 'svn st' etc. (r1863289) + + Developer-visible changes: + * Allow generating Visual Studio 2019 projects (r1863286) + * Fix build with APR 1.7.0. (r1860377) + * Fix building Subversion with Visual Studio 2005 and 2008. (r1863288) + * Allow svnserve's 'get-deleted-rev' API to return 'not deleted'. (r1863290) + + +Version 1.12.1 +(Not released; see changes for 1.12.2.) + + +Version 1.12.0 +(12 Apr 2019, from /branches/1.12.x) +https://svn.apache.org/repos/asf/subversion/tags/1.12.0 + + User-visible changes: + - Major new features: + + - Minor new features and improvements: + * 'move vs. move' merge conflicts can now be resolved (r1846851, r1851913) + * 'svn --version --verbose' shows loaded libraries on Linux (r1843774) + * 'svnrdump' can read/write a file instead of stdin/stdout (r1844906) + * 'svn list' tries to not truncate the author's name (r1847384 et al.) + * 'svn list' can show sizes in base-2 unit suffixes (r1847384 et al.) + * 'svn info' shows the size of files in the repository (r1847441 et al.) + * 'svn cleanup' can remove read-only directories (#4806, r1854072 et al.) + + - Client-side bugfixes: + * Repos-to-WC copy with --parents works with absent target (r1843888) + * Repos-to-WC copy from foreign repo with peg/operative revs (#4785) + + - Server-side bugfixes: + * Ignore empty group definitions in authz files (#4802, r1851687) + + - Client-side and server-side bugfixes: + + - Other tool improvements and bugfixes: + * svnauthz: warn about empty groups in authz files (#4803, r1851823) + * Storing passwords in plain text on disk is disabled by default (r1845377) + + Developer-visible changes: + - General: + * Updated the required libtool version to 2.x (r1845716) + * get-deps.sh: Remove references to Googlemock and Googletest (r1849200) + * All C++ code is compiled in C++11 mode by default (r1849202) + + - Bindings: + * JavaHL: Fixed potential core dump in ISVNClient.diff (r1845408) + * JavaHL: Let clients decode file contents from ISVNClient.blame (r1851333) + + +Version 1.11.1 +(11 Jan 2019, from /branches/1.11.x) +http://svn.apache.org/repos/asf/subversion/tags/1.11.1 + + User-visible changes: + - Minor new features and improvements: + * Conflict resolver support for added vs unversioned file (r1845577) + * Conflict resolver support for unversioned directories (r1846299) + * Improve help for 'svn add' and the '-N' option (r1842814 et al.) + * Improve display of Mac OS name in 'svn --version --verbose' (r1842334) + + - Client-side bugfixes: + * Fix: repos-to-WC copy with --parents doesn't create dirs (#4768) + * Fix: foreign repo copy with peg/operative revisions (#4785) + * Fix: foreign repo copy of file adding mergeinfo (#4792) + * Fix: assertion failure using -rPREV on a working copy at r0 (#4532) + * Fix: tree conflict message ends a sentence with a colon (#4717) + + - Server-side bugfixes: + * Fix CVE-2018-11803: malicious SVN clients can crash mod_dav_svn + * Fix: unexpected SVN_ERR_FS_NOT_DIRECTORY errors (#4791) + * Fix: mod_dav_svn's SVNUseUTF8 had no effect in some setups (r1844882) + * Fix crash in mod_http2 (#4782) + + - Other tool improvements and bugfixes: + * svndumpfilter: Clarify error messages by including node path (r1845261) + + - Bindings bugfixes: + * JavaHL: Fix crash in client code when using external diff (r1845408) + + Developer-visible changes: + - General: + * Fix build on systems without python in $PATH (r1845555) + * Fix compiler warnings about indentation (r1845556 et al.) + + - API changes: + (none) + + +Version 1.11.0 +(30 Oct 2018, from /branches/1.11.x) +http://svn.apache.org/repos/asf/subversion/tags/1.11.0 + + User-visible changes: + - Major new features: + * Shelving is no longer based on patch files (experimental) (issue #3625) + * Checkpointing (experimental) (issue #3626) + * Viewspec output command (experimental) (issue #4753) + + - Minor new features and improvements: + * Improvements to tree conflict resolution (issue #4694 #4766 ...) + * 'patch' can now read non-pretty-printed svn:mergeinfo diffs (r1822151) + * Better error when http:// URL is not a Subversion repository (r1825302) + * Add 'schedule' and 'depth' items to 'svn info --show-item' (r1827032) + * Allow the client cert password to be saved (r1836762) + + - Client-side bugfixes: + * Fix a crash in a repo:WC summary diff of a local copy (r1835218) + * Fix double diff headers (r1836746) + * Tree conflict resolver: avoid endless scan in some cases (r1839662) + + - Server-side bugfixes: + * svnadmin dump shouldn't canonicalize svn:date (issue #4767) + * 'svnadmin verify --keep-going --quiet' shows an error summary (r1837790) + * Let 'svnadmin recover' prune the rep-cache even if disabled (r1838813) + + - Client-side and server-side bugfixes: + * Fix pattern-matching of top level path in listing with search (r1830599) + * Allow commands like 'svn ci --file X' to work when X is a FIFO (r1836306) + + - Other tool improvements and bugfixes: + * tools/client-side/bash_completion: Add '--password-from-stdin' (r1820045) + + Developer-visible changes: + - General: + * new tool: tools/dist/edit-N-log-messages (r1819207) + * tools/dev/unix-build/Makefile.svn: various fixes + * Expose the diff option 'pretty_print_mergeinfo' in APIs (r1822014) + * In 'revert' APIs, choose whether to delete schedule-add nodes (r1822534) + + - Bindings: + * Fix Python binding fs.FileDiff behaviour with python-future (r1823802) + * Fix Python unit test, fs.SubversionFSTestCase, on Windows (r1824410) + * Bump minimum JDK version required for JavaHL to 1.8 (r1831895) + * Enable building against Java 10 (r1841180 et al) + * Fix a potential crash in JavaHL (issue #4764) + + Version 1.10.6 (24 Jul 2019, from /branches/1.10.x) https://svn.apache.org/repos/asf/subversion/tags/1.10.6 diff --git a/COMMITTERS b/COMMITTERS index 3eb069a..0517bcc 100644 --- a/COMMITTERS +++ b/COMMITTERS @@ -61,6 +61,8 @@ Blanket commit access: astieger Andreas Stieger jamessan James McCoy luke1410 Stefan Hett + troycurtisjr Troy Curtis, Jr + hartmannathan Nathan Hartman [[END ACTIVE FULL COMMITTERS. LEAVE THIS LINE HERE; SCRIPTS LOOK FOR IT.]] @@ -104,7 +106,6 @@ Commit access for specific areas: rschupp Roderich Schupp (Swig bindings) stilor Alexey Neyman (Python bindings, svn-vendor.py) - troycurtisjr Troy Curtis, Jr (Swig bindings) Packages: @@ -214,6 +215,7 @@ giorgio_valoti Giorgio Valoti (po: it) holden Holden Karau (scheme-bindings br.) moklo Morten Kloster (diff-improvements br.) vmpn Vladimir Berezniker (javahl-ra br.) + futatuki Yasuhito Futatsuki (swig-py3 br.) Subprojects that are complete, abandoned or have moved elsewhere: diff --git a/INSTALL b/INSTALL index dcbf67c..c43003c 100644 --- a/INSTALL +++ b/INSTALL @@ -3,7 +3,7 @@ A Quick Guide ====================================== -$LastChangedDate: 2017-12-25 04:00:08 +0000 (Mon, 25 Dec 2017) $ +$LastChangedDate: 2019-06-07 15:01:45 +0000 (Fri, 07 Jun 2019) $ Contents: @@ -23,8 +23,8 @@ Contents: III. BUILDING A SUBVERSION SERVER A. Setting Up Apache Httpd - B. Making and Installing the Subversion Server - C. Configuring Apache for Subversion + B. Making and Installing the Subversion Apache Server Module + C. Configuring Apache Httpd for Subversion D. Running and Testing E. Alternative: 'svnserve' and ra_svn @@ -147,10 +147,11 @@ I. INTRODUCTION for other languages, you need to have those languages available at build time. - * KDELibs, GNOME Keyring (OPTIONAL for client) + * KDE Framework 5, libsecret, GNOME Keyring (OPTIONAL for client) Subversion contains optional support for storing passwords in - KWallet (KDE 4) or GNOME Keyring. + KWallet via KDE Framework 5 libraries (preferred) or kdelibs4, + and GNOME Keyring via libsecret (preferred) or GNOME APIs. * libmagic (OPTIONAL) @@ -160,11 +161,6 @@ I. INTRODUCTION configured via auto-props or the mime-types-file option take precedence. - * Googlemock aka Gmock (OPTIONAL) - - This optional package is used by the tests for Subversions' - C++ bindings. - C. Dependencies in Detail @@ -456,19 +452,22 @@ I. INTRODUCTION and GNOME Keyring. pkg-config is needed to find D-Bus headers and library. - 15. Qt 4 (Unix only, OPTIONAL) + 15. Qt 5 or Qt 4 (Unix only, OPTIONAL) Qt is a cross-platform application framework. QtCore, QtDBus and QtGui modules are required for support for KWallet. pkg-config is needed to find Qt headers and libraries. - 16. KDELibs 4 (Unix only, OPTIONAL) + 16. KDE 5 Framework libraries or KDELibs 4 (Unix only, OPTIONAL) Subversion contains optional support for storing passwords in KWallet. + Subversion will look for KF5Wallet, KF5CoreAddons, KF5I18n APIs by default, + and needs kf5-config to find them. The KDELibs 4 api is also supported. KDELibs contains core KDE libraries. Subversion uses libkdecore and libkdeui libraries when support for KWallet is enabled. kde4-config is used to get some necessary options. pkg-config, D-Bus and Qt 4 are also required. + If you want to build support for KWallet, then pass the '--with-kwallet' option to `configure`. If KDE is installed in a non-standard prefix, then use: @@ -521,12 +520,6 @@ I. INTRODUCTION --with-libmagic - 21. Googlemock (OPTIONAL) - - Googlemock can be installed and built in-tree by invoking - - $ ./get-dep.sh gmock - 22. LZ4 (OPTIONAL) Subversion uses LZ4 compression libary version r129 or above. Configure @@ -856,11 +849,7 @@ II. INSTALLATION E.4 Building the Binaries - To build the binaries either follow the instructions here or use - build\win32\vc6-build.bat.in after editing its default paths to match - yours and saving it as vc6-build.bat. The vc6-build.bat does a full build - using all options so it requires Apache 2 source and the other optional - components. + To build the binaries either follow these instructions. Start in the SVN directory you created. diff --git a/LICENSE b/LICENSE index 5e9188c..cdc6dbd 100644 --- a/LICENSE +++ b/LICENSE @@ -423,3 +423,24 @@ For the (modified) LZ4 library files in subversion/libsvn_subr/lz4 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +For the Autoconf Archive macros for Boost: + + * in build/ac-macros/ax_boost_base.m4: + + Copyright (c) 2008 Thomas Porschberg + Copyright (c) 2009 Peter Adolphs + + Copying and distribution of this file, with or without modification, are + permitted in any medium without royalty provided the copyright notice + and this notice are preserved. This file is offered as-is, without any + warranty. + + * in build/ac-macros/ax_boost_unit_test_framework.m4: + + Copyright (c) 2008 Thomas Porschberg + + Copying and distribution of this file, with or without modification, are + permitted in any medium without royalty provided the copyright notice + and this notice are preserved. This file is offered as-is, without any + warranty. diff --git a/Makefile.in b/Makefile.in index f4c6e61..faf2a70 100644 --- a/Makefile.in +++ b/Makefile.in @@ -56,6 +56,8 @@ SVN_XML_LIBS = @SVN_XML_LIBS@ SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@ SVN_LZ4_LIBS = @SVN_LZ4_LIBS@ SVN_UTF8PROC_LIBS = @SVN_UTF8PROC_LIBS@ +SVN_MACOS_PLIST_LIBS = @SVN_MACOS_PLIST_LIBS@ +SVN_MACOS_KEYCHAIN_LIBS = @SVN_MACOS_KEYCHAIN_LIBS@ LIBS = @LIBS@ @@ -78,6 +80,9 @@ datadir = @datadir@ datarootdir = @datarootdir@ localedir = @localedir@ +# where to install SVN++ +svnxx_libdir = @libdir@ + # where to install libsvn_swig_* swig_py_libdir = @libdir@ swig_pl_libdir = @libdir@ @@ -139,9 +144,8 @@ APACHE_INCLUDES = @APACHE_INCLUDES@ APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@ APACHE_LDFLAGS = @APACHE_LDFLAGS@ -SVN_USE_GOOGLEMOCK = @SVN_USE_GOOGLEMOCK@ -GOOGLEMOCK_INCLUDES = -I@GOOGLEMOCK_SRCDIR@/googlemock/include -I@GOOGLEMOCK_SRCDIR@/googletest/include -GOOGLEMOCK_LIB_INCLUDES = -I@GOOGLEMOCK_SRCDIR@/googlemock -I@GOOGLEMOCK_SRCDIR@/googletest $(GOOGLEMOCK_INCLUDES) +BOOST_TEST_CPPFLAGS = @BOOST_CPPFLAGS@ -DBOOST_TEST_DYN_LINK -DBOOST_TEST_NO_MAIN +BOOST_TEST_LDFLAGS = @BOOST_LDFLAGS@ @BOOST_UNIT_TEST_FRAMEWORK_LIB@ SWIG = @SWIG@ SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py @@ -164,7 +168,9 @@ CTYPES_PYTHON_SRC_DIR = $(abs_srcdir)/subversion/bindings/ctypes-python JAVAHL_JAR=subversion/bindings/javahl/svn-javahl.jar JAVAHL_INCLUDES= @JNI_INCLUDES@ -I$(abs_builddir)/subversion/bindings/javahl/include -CXXHL_INCLUDES = -I$(abs_srcdir)/subversion/bindings/cxxhl/include +SVN_BUILD_SVNXX = @SVN_BUILD_SVNXX@ +SVN_BUILD_SVNXX_TESTS = @SVN_BUILD_SVNXX_TESTS@ +SVNXX_INCLUDES = -I$(abs_srcdir)/subversion/bindings/cxx/include SVN_APR_CONFIG = @SVN_APR_CONFIG@ SVN_APR_INCLUDES = @SVN_APR_INCLUDES@ @@ -218,7 +224,6 @@ COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPF # special compilation for files destined for javahl (i.e. C++) COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(JAVAHL_INCLUDES) -o $@ -c COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS) -COMPILE_JAVAHL_JAVAH = $(JAVAH) COMPILE_JAVAHL_COMPAT_JAVAC = $(JAVAC) $(JAVAC_COMPAT_FLAGS) # On Mac OS X, export an env variable so that the tests can run without @@ -259,15 +264,15 @@ TEST_SHLIB_VAR_SWIG_RB=\ export @SVN_APR_SHLIB_PATH_VAR@; \ fi; -# special compilation for files destined for cxxhl -COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) -o $@ -c -COMPILE_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GOOGLEMOCK_LIB_INCLUDES) -o $@ -c -COMPILE_CXXHL_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GOOGLEMOCK_INCLUDES) -o $@ -c +# special compilation for files destined for SVN++ +COMPILE_SVNXX = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) -o $@ -c +COMPILE_SVNXX_TEST = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) $(BOOST_TEST_CPPFLAGS) -o $@ -c LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) LINK_LIB = $(LINK) $(LT_SO_VERSION) LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir) LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) +LINK_SVNXX_TEST = $(LINK_CXX) $(BOOST_TEST_LDFLAGS) # special link rule for mod_dav_svn LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -shared @@ -321,6 +326,8 @@ INSTALL_DATA = $(INSTALL) -m 644 INSTALL_LOCALE = $(INSTALL_DATA) INSTALL_APACHE_MODS = @INSTALL_APACHE_MODS@ +INSTALL_SVNXX_LIB = $(INSTALL_LIB) + ### this isn't correct yet INSTALL_SWIG_PY = $(INSTALL_LIB) INSTALL_SWIG_PY_LIB = $(INSTALL_LIB) @@ -393,7 +400,6 @@ JAVAC = @JAVAC@ JAVADOC = @JAVADOC@ JAVAC_FLAGS = @JAVAC_FLAGS@ JAVAC_COMPAT_FLAGS = @JAVAC_COMPAT_FLAGS@ -JAVAH = @JAVAH@ JAR = @JAR@ JAVA_CLASSPATH=$(abs_srcdir)/subversion/bindings/javahl/src:@JAVA_CLASSPATH@ @@ -494,8 +500,8 @@ revision-install: install-static: @INSTALL_STATIC_RULES@ # JavaHL target aliases -javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah javahl-remote-javah javahl-types-javah javahl-util-javah javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat -install-javahl: javahl install-javahl-java install-javahl-javah install-javahl-lib +javahl: mkdir-init javahl-java javahl-callback-java javahl-remote-java javahl-types-java javahl-util-java javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat +install-javahl: javahl install-javahl-java install-javahl-lib javahl-compat: javahl-compat-java @JAVAHL_COMPAT_TESTS_TARGET@ clean-javahl: @@ -526,6 +532,9 @@ check-javahl: check-apache-javahl check-all-javahl: check-apache-javahl check-tigris-javahl check-deprecated-authn-javahl +check-svnxx: svnxx-tests + $(abs_builddir)/$(svnxx_tests_PATH)/svnxx-tests$(EXEEXT) + # "make check CLEANUP=true" will clean up directories for successful tests. # "make check TESTS=subversion/tests/cmdline/basic_tests.py" # will perform only basic tests (likewise for other tests). @@ -601,6 +610,9 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS) @BDB_TEST_DEPS@ if test "$(FSFS_DIR_DELTIFICATION)" != ""; then \ flags="--fsfs-dir-deltification $(FSFS_DIR_DELTIFICATION) $$flags";\ fi; \ + if test "$(ALLOW_REMOTE_HTTP_CONNECTION)" != ""; then \ + flags="--allow-remote-http-connection $$flags"; \ + fi; \ if test "$(SVN_BIN_DIR)" != ""; then \ flags="--bin $(SVN_BIN_DIR) $$flags"; \ fi; \ @@ -694,7 +706,8 @@ check-clean: gcov-clean subversion/tests/libsvn_diff/T1 \ subversion/tests/libsvn_diff/T2 \ subversion/tests/libsvn_diff/T3 \ - subversion/tests/svnserveautocheck.pid \ + subversion/tests/cmdline/httpd-* \ + subversion/tests/cmdline/svnserve-* \ tests.log fails.log mkdir-init: diff --git a/NOTICE b/NOTICE index c2b5980..7631b12 100644 --- a/NOTICE +++ b/NOTICE @@ -29,3 +29,6 @@ license, see LICENSE. This product includes code derived from the software developed by Yann Collet under a BSD 2-Clause license, see LICENSE. + +This product includes code derived from the software developed by Thomas +Porschberg and Peter Adolphs under a permissive license, see LICENSE. diff --git a/aclocal.m4 b/aclocal.m4 index 0bf9a1d..44b5d03 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -35,6 +35,8 @@ sinclude(build/ac-macros/apache.m4) sinclude(build/ac-macros/apr.m4) sinclude(build/ac-macros/aprutil.m4) sinclude(build/ac-macros/apr_memcache.m4) +sinclude(build/ac-macros/ax_boost_base.m4) +sinclude(build/ac-macros/ax_boost_unit_test_framework.m4) sinclude(build/ac-macros/berkeley-db.m4) sinclude(build/ac-macros/compiler.m4) sinclude(build/ac-macros/ctypesgen.m4) diff --git a/build-outputs.mk b/build-outputs.mk index ec31c7e..c6c07e0 100644 --- a/build-outputs.mk +++ b/build-outputs.mk @@ -23,21 +23,21 @@ RA_SERF_LINK = ../../subversion/libsvn_ra_serf/libsvn_ra_serf-1.la ../../subvers RA_SVN_DEPS = subversion/libsvn_ra_svn/libsvn_ra_svn-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la RA_SVN_LINK = ../../subversion/libsvn_ra_svn/libsvn_ra_svn-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la -BUILD_DIRS = subversion/tests/afl subversion/tests/cmdline subversion/tests/libsvn_subr subversion/tests/libsvn_repos subversion/tests/libsvn_fs_base subversion/tests/libsvn_client subversion/tests/libsvn_wc subversion/tests/libsvn_client/../libsvn_wc subversion/bindings/cxxhl subversion/bindings/cxxhl/tests tools/diff subversion/tests/libsvn_diff subversion/tests/libsvn_fs_fs subversion/tests/libsvn_fs subversion/tests/libsvn_fs_x tools/dev subversion/bindings/javahl/src/org/apache/subversion/javahl/callback subversion/bindings/javahl/classes subversion/bindings/javahl/include subversion/bindings/javahl/src/org/tigris/subversion/javahl subversion/bindings/javahl/tests/org/tigris/subversion/javahl subversion/bindings/javahl/src/org/apache/subversion/javahl subversion/bindings/javahl/src/org/apache/subversion/javahl/remote subversion/bindings/javahl/src/org/apache/subversion/javahl/types subversion/bindings/javahl/src/org/apache/subversion/javahl/util subversion/bindings/javahl/tests/org/apache/subversion/javahl googlemock googlemock/googletest/src googlemock/googlemock/src subversion/libsvn_auth_gnome_keyring subversion/libsvn_auth_kwallet subversion/libsvn_client subversion/libsvn_delta subversion/libsvn_diff subversion/libsvn_fs subversion/libsvn_fs_base subversion/libsvn_fs_base/bdb subversion/libsvn_fs_base/util subversion/libsvn_fs_fs subversion/libsvn_fs_util subversion/libsvn_fs_x subversion/libsvn_ra subversion/libsvn_ra_local subversion/libsvn_ra_serf subversion/libsvn_ra_svn subversion/libsvn_repos subversion/libsvn_subr subversion/libsvn_subr/lz4 subversion/bindings/swig/perl/libsvn_swig_perl subversion/bindings/swig/python/libsvn_swig_py subversion/bindings/swig/ruby/libsvn_swig_ruby subversion/tests subversion/libsvn_wc subversion/bindings/cxxhl/src subversion/bindings/cxxhl/src/aprwrap subversion/bindings/javahl/native subversion/bindings/javahl/native/jniwrapper subversion/po subversion/mod_authz_svn subversion/mod_dav_svn subversion/mod_dav_svn/reports subversion/mod_dav_svn/posts tools/server-side/mod_dontdothat subversion/tests/libsvn_ra_local subversion/tests/libsvn_ra subversion/tests/libsvn_delta subversion/svn tools/client-side/svn-mergeinfo-normalizer tools/server-side tools/dev/wc-ng subversion/svnadmin subversion/svnbench tools/client-side/svnconflict subversion/svndumpfilter subversion/svnfsfs subversion/svnlook tools/dev/svnmover subversion/svnmucc tools/dev/svnraisetreeconflict subversion/svnrdump subversion/svnserve subversion/svnsync subversion/svnversion subversion/bindings/swig subversion/tests/libsvn_wc/../../libsvn_subr subversion/bindings/swig/python subversion/bindings/swig/perl subversion/bindings/swig/ruby subversion/bindings/swig/proxy +BUILD_DIRS = subversion/tests/afl subversion/tests/cmdline subversion/tests/libsvn_subr subversion/tests/libsvn_repos subversion/tests/libsvn_fs_base subversion/tests/libsvn_client subversion/tests/libsvn_wc subversion/tests/libsvn_client/../libsvn_wc tools/diff subversion/tests/libsvn_diff subversion/tests/libsvn_fs_fs subversion/tests/libsvn_fs subversion/tests/libsvn_fs_x tools/dev subversion/bindings/javahl/src/org/apache/subversion/javahl/callback subversion/bindings/javahl/classes subversion/bindings/javahl/include subversion/bindings/javahl/src/org/tigris/subversion/javahl subversion/bindings/javahl/tests/org/tigris/subversion/javahl subversion/bindings/javahl/src/org/apache/subversion/javahl subversion/bindings/javahl/src/org/apache/subversion/javahl/remote subversion/bindings/javahl/tests/org/apache/subversion/javahl subversion/bindings/javahl/src/org/apache/subversion/javahl/types subversion/bindings/javahl/src/org/apache/subversion/javahl/util subversion/libsvn_auth_gnome_keyring subversion/libsvn_auth_kwallet subversion/libsvn_client subversion/libsvn_delta subversion/libsvn_diff subversion/libsvn_fs subversion/libsvn_fs_base subversion/libsvn_fs_base/bdb subversion/libsvn_fs_base/util subversion/libsvn_fs_fs subversion/libsvn_fs_util subversion/libsvn_fs_x subversion/libsvn_ra subversion/libsvn_ra_local subversion/libsvn_ra_serf subversion/libsvn_ra_svn subversion/libsvn_repos subversion/libsvn_subr subversion/libsvn_subr/lz4 subversion/bindings/swig/perl/libsvn_swig_perl subversion/bindings/swig/python/libsvn_swig_py subversion/bindings/swig/ruby/libsvn_swig_ruby subversion/tests subversion/libsvn_wc subversion/bindings/javahl/native subversion/bindings/javahl/native/jniwrapper subversion/bindings/cxx subversion/bindings/cxx/src subversion/bindings/cxx/src/aprwrap subversion/po subversion/mod_authz_svn subversion/mod_dav_svn subversion/mod_dav_svn/reports subversion/mod_dav_svn/posts tools/server-side/mod_dontdothat subversion/tests/libsvn_ra_local subversion/tests/libsvn_ra subversion/tests/libsvn_delta subversion/svn tools/client-side/svn-mergeinfo-normalizer tools/server-side tools/dev/wc-ng subversion/svnadmin subversion/svnbench tools/client-side/svnconflict subversion/svndumpfilter subversion/svnfsfs subversion/svnlook tools/dev/svnmover subversion/svnmucc tools/dev/svnraisetreeconflict subversion/svnrdump subversion/svnserve subversion/svnsync subversion/svnversion subversion/bindings/cxx/tests subversion/bindings/swig subversion/tests/libsvn_wc/../../libsvn_subr subversion/bindings/swig/python subversion/bindings/swig/perl subversion/bindings/swig/ruby subversion/bindings/swig/proxy BDB_TEST_DEPS = subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) BDB_TEST_PROGRAMS = subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) -TEST_DEPS = subversion/tests/afl/afl-x509$(EXEEXT) subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_repos/authz-test$(EXEEXT) subversion/tests/libsvn_subr/bit-array-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/compress-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_client/conflicts-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_repos/dump-load-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT) subversion/tests/libsvn_fs/fs-sequential-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs_x/fs-x-pack-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/cmdline/lock-helper$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_client/mtcc-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/packed-data-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/prefix-string-test$(EXEEXT) subversion/tests/libsvn_subr/priority-queue-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/root-pools-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/sqlite-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_fs_x/string-table-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) tools/dev/wc-ng/svn-wc-db-tester$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) subversion/tests/libsvn_delta/svndiff-stream-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_subr/x509-test$(EXEEXT) subversion/tests/libsvn_subr/xml-test$(EXEEXT) subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/changelist_tests.py subversion/tests/cmdline/checkout_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/entries_tests.py subversion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/info_tests.py subversion/tests/cmdline/input_validation_tests.py subversion/tests/cmdline/iprop_authz_tests.py subversion/tests/cmdline/iprop_tests.py subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/merge_automatic_tests.py subversion/tests/cmdline/merge_reintegrate_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/merge_tree_conflict_tests.py subversion/tests/cmdline/mergeinfo_tests.py subversion/tests/cmdline/mod_authz_svn_tests.py subversion/tests/cmdline/mod_dav_svn_tests.py subversion/tests/cmdline/move_tests.py subversion/tests/cmdline/patch_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/redirect_tests.py subversion/tests/cmdline/relocate_tests.py subversion/tests/cmdline/resolve_tests.py subversion/tests/cmdline/revert_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/shelve_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnauthz_tests.py subversion/tests/cmdline/svndumpfilter_tests.py subversion/tests/cmdline/svnfsfs_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnmover_tests.py subversion/tests/cmdline/svnmucc_tests.py subversion/tests/cmdline/svnrdump_tests.py subversion/tests/cmdline/svnsync_authz_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/tree_conflict_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/upgrade_tests.py subversion/tests/cmdline/wc_tests.py +TEST_DEPS = subversion/tests/afl/afl-svndiff$(EXEEXT) subversion/tests/afl/afl-x509$(EXEEXT) subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_repos/authz-test$(EXEEXT) subversion/tests/libsvn_subr/bit-array-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/compress-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_client/conflicts-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_repos/dump-load-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT) subversion/tests/libsvn_fs/fs-sequential-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs_x/fs-x-pack-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/cmdline/lock-helper$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_client/mtcc-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/packed-data-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/prefix-string-test$(EXEEXT) subversion/tests/libsvn_subr/priority-queue-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/root-pools-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/sqlite-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_fs_x/string-table-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) tools/dev/wc-ng/svn-wc-db-tester$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) subversion/tests/libsvn_delta/svndiff-stream-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) tools/dev/svnmover/svnmover$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_subr/x509-test$(EXEEXT) subversion/tests/libsvn_subr/xml-test$(EXEEXT) subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/changelist_tests.py subversion/tests/cmdline/checkout_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/dav_tests.py subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/entries_tests.py subversion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/info_tests.py subversion/tests/cmdline/input_validation_tests.py subversion/tests/cmdline/iprop_authz_tests.py subversion/tests/cmdline/iprop_tests.py subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/merge_automatic_tests.py subversion/tests/cmdline/merge_reintegrate_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/merge_tree_conflict_tests.py subversion/tests/cmdline/mergeinfo_tests.py subversion/tests/cmdline/mod_authz_svn_tests.py subversion/tests/cmdline/mod_dav_svn_tests.py subversion/tests/cmdline/move_tests.py subversion/tests/cmdline/patch_tests.py subversion/tests/cmdline/pegrev_parse_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/redirect_tests.py subversion/tests/cmdline/relocate_tests.py subversion/tests/cmdline/resolve_tests.py subversion/tests/cmdline/revert_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/shelf_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnauthz_tests.py subversion/tests/cmdline/svndumpfilter_tests.py subversion/tests/cmdline/svnfsfs_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnmover_tests.py subversion/tests/cmdline/svnmucc_tests.py subversion/tests/cmdline/svnrdump_tests.py subversion/tests/cmdline/svnsync_authz_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/tree_conflict_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/upgrade_tests.py subversion/tests/cmdline/wc_tests.py -TEST_PROGRAMS = subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_repos/authz-test$(EXEEXT) subversion/tests/libsvn_subr/bit-array-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/compress-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_client/conflicts-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_repos/dump-load-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT) subversion/tests/libsvn_fs/fs-sequential-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs_x/fs-x-pack-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_client/mtcc-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/packed-data-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/prefix-string-test$(EXEEXT) subversion/tests/libsvn_subr/priority-queue-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/root-pools-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/sqlite-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_fs_x/string-table-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-stream-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_subr/x509-test$(EXEEXT) subversion/tests/libsvn_subr/xml-test$(EXEEXT) subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/changelist_tests.py subversion/tests/cmdline/checkout_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/entries_tests.py subversion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/info_tests.py subversion/tests/cmdline/input_validation_tests.py subversion/tests/cmdline/iprop_authz_tests.py subversion/tests/cmdline/iprop_tests.py subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/merge_automatic_tests.py subversion/tests/cmdline/merge_reintegrate_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/merge_tree_conflict_tests.py subversion/tests/cmdline/mergeinfo_tests.py subversion/tests/cmdline/mod_authz_svn_tests.py subversion/tests/cmdline/mod_dav_svn_tests.py subversion/tests/cmdline/move_tests.py subversion/tests/cmdline/patch_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/redirect_tests.py subversion/tests/cmdline/relocate_tests.py subversion/tests/cmdline/resolve_tests.py subversion/tests/cmdline/revert_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/shelve_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnauthz_tests.py subversion/tests/cmdline/svndumpfilter_tests.py subversion/tests/cmdline/svnfsfs_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnmover_tests.py subversion/tests/cmdline/svnmucc_tests.py subversion/tests/cmdline/svnrdump_tests.py subversion/tests/cmdline/svnsync_authz_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/tree_conflict_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/upgrade_tests.py subversion/tests/cmdline/wc_tests.py +TEST_PROGRAMS = subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_repos/authz-test$(EXEEXT) subversion/tests/libsvn_subr/bit-array-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/compress-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_client/conflicts-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_repos/dump-load-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT) subversion/tests/libsvn_fs/fs-sequential-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs_x/fs-x-pack-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_client/mtcc-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/packed-data-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/prefix-string-test$(EXEEXT) subversion/tests/libsvn_subr/priority-queue-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/root-pools-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/sqlite-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_fs_x/string-table-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-stream-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_subr/x509-test$(EXEEXT) subversion/tests/libsvn_subr/xml-test$(EXEEXT) subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/changelist_tests.py subversion/tests/cmdline/checkout_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/dav_tests.py subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/entries_tests.py subversion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/info_tests.py subversion/tests/cmdline/input_validation_tests.py subversion/tests/cmdline/iprop_authz_tests.py subversion/tests/cmdline/iprop_tests.py subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/merge_automatic_tests.py subversion/tests/cmdline/merge_reintegrate_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/merge_tree_conflict_tests.py subversion/tests/cmdline/mergeinfo_tests.py subversion/tests/cmdline/mod_authz_svn_tests.py subversion/tests/cmdline/mod_dav_svn_tests.py subversion/tests/cmdline/move_tests.py subversion/tests/cmdline/patch_tests.py subversion/tests/cmdline/pegrev_parse_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/redirect_tests.py subversion/tests/cmdline/relocate_tests.py subversion/tests/cmdline/resolve_tests.py subversion/tests/cmdline/revert_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/shelf_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnauthz_tests.py subversion/tests/cmdline/svndumpfilter_tests.py subversion/tests/cmdline/svnfsfs_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnmover_tests.py subversion/tests/cmdline/svnmucc_tests.py subversion/tests/cmdline/svnrdump_tests.py subversion/tests/cmdline/svnsync_authz_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/tree_conflict_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/upgrade_tests.py subversion/tests/cmdline/wc_tests.py -check-deps test-deps: subversion/tests/afl/afl-x509$(EXEEXT) subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/cmdline/lock-helper$(EXEEXT) tools/dev/wc-ng/svn-wc-db-tester$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) +check-deps test-deps: subversion/tests/afl/afl-svndiff$(EXEEXT) subversion/tests/afl/afl-x509$(EXEEXT) subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/cmdline/lock-helper$(EXEEXT) tools/dev/wc-ng/svn-wc-db-tester$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) tools/dev/svnmover/svnmover$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) MANPAGES = subversion/svn/svn.1 subversion/svnadmin/svnadmin.1 subversion/svndumpfilter/svndumpfilter.1 subversion/svnlook/svnlook.1 subversion/svnmucc/svnmucc.1 subversion/svnrdump/svnrdump.1 subversion/svnserve/svnserve.8 subversion/svnserve/svnserve.conf.5 subversion/svnsync/svnsync.1 subversion/svnversion/svnversion.1 -CLEAN_FILES = subversion/bindings/cxxhl/cxxhl-tests$(EXEEXT) subversion/svn/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) subversion/svnbench/svnbench$(EXEEXT) subversion/svndumpfilter/svndumpfilter$(EXEEXT) subversion/svnfsfs/svnfsfs$(EXEEXT) subversion/svnlook/svnlook$(EXEEXT) subversion/svnmucc/svnmucc$(EXEEXT) subversion/svnrdump/svnrdump$(EXEEXT) subversion/svnserve/svnserve$(EXEEXT) subversion/svnsync/svnsync$(EXEEXT) subversion/svnversion/svnversion$(EXEEXT) subversion/tests/afl/afl-x509$(EXEEXT) subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/cmdline/authz_tests.pyc subversion/tests/cmdline/autoprop_tests.pyc subversion/tests/cmdline/basic_tests.pyc subversion/tests/cmdline/blame_tests.pyc subversion/tests/cmdline/cat_tests.pyc subversion/tests/cmdline/changelist_tests.pyc subversion/tests/cmdline/checkout_tests.pyc subversion/tests/cmdline/commit_tests.pyc subversion/tests/cmdline/copy_tests.pyc subversion/tests/cmdline/depth_tests.pyc subversion/tests/cmdline/diff_tests.pyc subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/cmdline/entries_tests.pyc subversion/tests/cmdline/export_tests.pyc subversion/tests/cmdline/externals_tests.pyc subversion/tests/cmdline/getopt_tests.pyc subversion/tests/cmdline/history_tests.pyc subversion/tests/cmdline/import_tests.pyc subversion/tests/cmdline/info_tests.pyc subversion/tests/cmdline/input_validation_tests.pyc subversion/tests/cmdline/iprop_authz_tests.pyc subversion/tests/cmdline/iprop_tests.pyc subversion/tests/cmdline/lock-helper$(EXEEXT) subversion/tests/cmdline/lock_tests.pyc subversion/tests/cmdline/log_tests.pyc subversion/tests/cmdline/merge_authz_tests.pyc subversion/tests/cmdline/merge_automatic_tests.pyc subversion/tests/cmdline/merge_reintegrate_tests.pyc subversion/tests/cmdline/merge_tests.pyc subversion/tests/cmdline/merge_tree_conflict_tests.pyc subversion/tests/cmdline/mergeinfo_tests.pyc subversion/tests/cmdline/mod_authz_svn_tests.pyc subversion/tests/cmdline/mod_dav_svn_tests.pyc subversion/tests/cmdline/move_tests.pyc subversion/tests/cmdline/patch_tests.pyc subversion/tests/cmdline/prop_tests.pyc subversion/tests/cmdline/redirect_tests.pyc subversion/tests/cmdline/relocate_tests.pyc subversion/tests/cmdline/resolve_tests.pyc subversion/tests/cmdline/revert_tests.pyc subversion/tests/cmdline/schedule_tests.pyc subversion/tests/cmdline/shelve_tests.pyc subversion/tests/cmdline/special_tests.pyc subversion/tests/cmdline/stat_tests.pyc subversion/tests/cmdline/svnadmin_tests.pyc subversion/tests/cmdline/svnauthz_tests.pyc subversion/tests/cmdline/svndumpfilter_tests.pyc subversion/tests/cmdline/svnfsfs_tests.pyc subversion/tests/cmdline/svnlook_tests.pyc subversion/tests/cmdline/svnmover_tests.pyc subversion/tests/cmdline/svnmucc_tests.pyc subversion/tests/cmdline/svnrdump_tests.pyc subversion/tests/cmdline/svnsync_authz_tests.pyc subversion/tests/cmdline/svnsync_tests.pyc subversion/tests/cmdline/svnversion_tests.pyc subversion/tests/cmdline/switch_tests.pyc subversion/tests/cmdline/trans_tests.pyc subversion/tests/cmdline/tree_conflict_tests.pyc subversion/tests/cmdline/update_tests.pyc subversion/tests/cmdline/upgrade_tests.pyc subversion/tests/cmdline/wc_tests.pyc subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_client/conflicts-test$(EXEEXT) subversion/tests/libsvn_client/mtcc-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-stream-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_fs/fs-sequential-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT) subversion/tests/libsvn_fs_x/fs-x-pack-test$(EXEEXT) subversion/tests/libsvn_fs_x/string-table-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_repos/authz-test$(EXEEXT) subversion/tests/libsvn_repos/dump-load-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/bit-array-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/compress-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/packed-data-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/prefix-string-test$(EXEEXT) subversion/tests/libsvn_subr/priority-queue-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/root-pools-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/sqlite-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_subr/x509-test$(EXEEXT) subversion/tests/libsvn_subr/xml-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer$(EXEEXT) tools/client-side/svnconflict/svnconflict$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/dev/svnmover/svnmover$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/dev/wc-ng/svn-wc-db-tester$(EXEEXT) tools/dev/x509-parser$(EXEEXT) tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) +CLEAN_FILES = subversion/bindings/cxx/svnxx-tests$(EXEEXT) subversion/svn/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) subversion/svnbench/svnbench$(EXEEXT) subversion/svndumpfilter/svndumpfilter$(EXEEXT) subversion/svnfsfs/svnfsfs$(EXEEXT) subversion/svnlook/svnlook$(EXEEXT) subversion/svnmucc/svnmucc$(EXEEXT) subversion/svnrdump/svnrdump$(EXEEXT) subversion/svnserve/svnserve$(EXEEXT) subversion/svnsync/svnsync$(EXEEXT) subversion/svnversion/svnversion$(EXEEXT) subversion/tests/afl/afl-svndiff$(EXEEXT) subversion/tests/afl/afl-x509$(EXEEXT) subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/cmdline/authz_tests.pyc subversion/tests/cmdline/autoprop_tests.pyc subversion/tests/cmdline/basic_tests.pyc subversion/tests/cmdline/blame_tests.pyc subversion/tests/cmdline/cat_tests.pyc subversion/tests/cmdline/changelist_tests.pyc subversion/tests/cmdline/checkout_tests.pyc subversion/tests/cmdline/commit_tests.pyc subversion/tests/cmdline/copy_tests.pyc subversion/tests/cmdline/dav_tests.pyc subversion/tests/cmdline/depth_tests.pyc subversion/tests/cmdline/diff_tests.pyc subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/cmdline/entries_tests.pyc subversion/tests/cmdline/export_tests.pyc subversion/tests/cmdline/externals_tests.pyc subversion/tests/cmdline/getopt_tests.pyc subversion/tests/cmdline/history_tests.pyc subversion/tests/cmdline/import_tests.pyc subversion/tests/cmdline/info_tests.pyc subversion/tests/cmdline/input_validation_tests.pyc subversion/tests/cmdline/iprop_authz_tests.pyc subversion/tests/cmdline/iprop_tests.pyc subversion/tests/cmdline/lock-helper$(EXEEXT) subversion/tests/cmdline/lock_tests.pyc subversion/tests/cmdline/log_tests.pyc subversion/tests/cmdline/merge_authz_tests.pyc subversion/tests/cmdline/merge_automatic_tests.pyc subversion/tests/cmdline/merge_reintegrate_tests.pyc subversion/tests/cmdline/merge_tests.pyc subversion/tests/cmdline/merge_tree_conflict_tests.pyc subversion/tests/cmdline/mergeinfo_tests.pyc subversion/tests/cmdline/mod_authz_svn_tests.pyc subversion/tests/cmdline/mod_dav_svn_tests.pyc subversion/tests/cmdline/move_tests.pyc subversion/tests/cmdline/patch_tests.pyc subversion/tests/cmdline/pegrev_parse_tests.pyc subversion/tests/cmdline/prop_tests.pyc subversion/tests/cmdline/redirect_tests.pyc subversion/tests/cmdline/relocate_tests.pyc subversion/tests/cmdline/resolve_tests.pyc subversion/tests/cmdline/revert_tests.pyc subversion/tests/cmdline/schedule_tests.pyc subversion/tests/cmdline/shelf_tests.pyc subversion/tests/cmdline/special_tests.pyc subversion/tests/cmdline/stat_tests.pyc subversion/tests/cmdline/svnadmin_tests.pyc subversion/tests/cmdline/svnauthz_tests.pyc subversion/tests/cmdline/svndumpfilter_tests.pyc subversion/tests/cmdline/svnfsfs_tests.pyc subversion/tests/cmdline/svnlook_tests.pyc subversion/tests/cmdline/svnmover_tests.pyc subversion/tests/cmdline/svnmucc_tests.pyc subversion/tests/cmdline/svnrdump_tests.pyc subversion/tests/cmdline/svnsync_authz_tests.pyc subversion/tests/cmdline/svnsync_tests.pyc subversion/tests/cmdline/svnversion_tests.pyc subversion/tests/cmdline/switch_tests.pyc subversion/tests/cmdline/trans_tests.pyc subversion/tests/cmdline/tree_conflict_tests.pyc subversion/tests/cmdline/update_tests.pyc subversion/tests/cmdline/upgrade_tests.pyc subversion/tests/cmdline/wc_tests.pyc subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_client/conflicts-test$(EXEEXT) subversion/tests/libsvn_client/mtcc-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-stream-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_fs/fs-sequential-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT) subversion/tests/libsvn_fs_x/fs-x-pack-test$(EXEEXT) subversion/tests/libsvn_fs_x/string-table-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_repos/authz-test$(EXEEXT) subversion/tests/libsvn_repos/dump-load-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/bit-array-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/compress-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/packed-data-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/prefix-string-test$(EXEEXT) subversion/tests/libsvn_subr/priority-queue-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/root-pools-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/sqlite-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_subr/x509-test$(EXEEXT) subversion/tests/libsvn_subr/xml-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer$(EXEEXT) tools/client-side/svnconflict/svnconflict$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/dev/svnmover/svnmover$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/dev/wc-ng/svn-wc-db-tester$(EXEEXT) tools/dev/x509-parser$(EXEEXT) tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) EXTRACLEAN_FILES = subversion/libsvn_fs_fs/rep-cache-db.h subversion/libsvn_fs_x/rep-cache-db.h subversion/libsvn_subr/internal_statements.h subversion/libsvn_wc/wc-queries.h subversion/tests/libsvn_wc/wc-test-queries.h \ $(abs_builddir)/subversion/libsvn_subr/errorcode.inc \ $(abs_builddir)/subversion/libsvn_subr/config_keys.inc \ @@ -93,6 +93,12 @@ autogen-swig: autogen-swig-rb # Section 5: Individual target build rules ######################################## +afl_svndiff_PATH = subversion/tests/afl +afl_svndiff_DEPS = subversion/tests/afl/afl-svndiff.lo subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la +afl_svndiff_OBJECTS = afl-svndiff.lo +subversion/tests/afl/afl-svndiff$(EXEEXT): $(afl_svndiff_DEPS) + cd subversion/tests/afl && $(LINK) $(afl_svndiff_LDFLAGS) -o afl-svndiff$(EXEEXT) $(afl_svndiff_OBJECTS) ../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) $(LIBS) + afl_x509_PATH = subversion/tests/afl afl_x509_DEPS = subversion/tests/afl/afl-x509.lo subversion/libsvn_subr/libsvn_subr-1.la afl_x509_OBJECTS = afl-x509.lo @@ -183,12 +189,6 @@ crypto_test_OBJECTS = crypto-test.lo subversion/tests/libsvn_subr/crypto-test$(EXEEXT): $(crypto_test_DEPS) cd subversion/tests/libsvn_subr && $(LINK) $(crypto_test_LDFLAGS) -o crypto-test$(EXEEXT) $(crypto_test_OBJECTS) ../../../subversion/tests/libsvn_test-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) -cxxhl_tests_PATH = subversion/bindings/cxxhl -cxxhl_tests_DEPS = subversion/bindings/cxxhl/tests/cxxhl-tests.lo subversion/bindings/cxxhl/tests/test_aprwrap.lo subversion/bindings/cxxhl/tests/test_exception.lo subversion/bindings/cxxhl/libsvncxxhl-1.la googlemock/libgooglemock-1.la subversion/libsvn_subr/libsvn_subr-1.la -cxxhl_tests_OBJECTS = tests/cxxhl-tests.lo tests/test_aprwrap.lo tests/test_exception.lo -subversion/bindings/cxxhl/cxxhl-tests$(EXEEXT): $(cxxhl_tests_DEPS) - if $(SVN_USE_GOOGLEMOCK) ; then cd subversion/bindings/cxxhl && $(LINK_CXX) $(cxxhl_tests_LDFLAGS) -o cxxhl-tests$(EXEEXT) $(cxxhl_tests_OBJECTS) ../../../subversion/bindings/cxxhl/libsvncxxhl-1.la ../../../googlemock/libgooglemock-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) $(LIBS) ; else echo "fake" > subversion/bindings/cxxhl/cxxhl-tests$(EXEEXT) ; fi - db_test_PATH = subversion/tests/libsvn_wc db_test_DEPS = subversion/tests/libsvn_wc/db-test.lo subversion/tests/libsvn_wc/utils.lo subversion/libsvn_client/libsvn_client-1.la subversion/tests/libsvn_test-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_subr/libsvn_subr-1.la db_test_OBJECTS = db-test.lo utils.lo @@ -274,10 +274,10 @@ subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT): $(fs_fs_pack_test_DEPS) cd subversion/tests/libsvn_fs_fs && $(LINK) $(fs_fs_pack_test_LDFLAGS) -o fs-fs-pack-test$(EXEEXT) $(fs_fs_pack_test_OBJECTS) ../../../subversion/tests/libsvn_test-1.la ../../../subversion/libsvn_fs/libsvn_fs-1.la ../../../subversion/libsvn_fs_fs/libsvn_fs_fs-1.la ../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) fs_fs_private_test_PATH = subversion/tests/libsvn_fs_fs -fs_fs_private_test_DEPS = subversion/tests/libsvn_fs_fs/fs-fs-private-test.lo subversion/tests/libsvn_test-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_fs_fs/libsvn_fs_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_subr/libsvn_subr-1.la +fs_fs_private_test_DEPS = subversion/tests/libsvn_fs_fs/fs-fs-private-test.lo subversion/tests/libsvn_test-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_subr/libsvn_subr-1.la fs_fs_private_test_OBJECTS = fs-fs-private-test.lo subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT): $(fs_fs_private_test_DEPS) - cd subversion/tests/libsvn_fs_fs && $(LINK) $(fs_fs_private_test_LDFLAGS) -o fs-fs-private-test$(EXEEXT) $(fs_fs_private_test_OBJECTS) ../../../subversion/tests/libsvn_test-1.la ../../../subversion/libsvn_fs/libsvn_fs-1.la ../../../subversion/libsvn_fs_fs/libsvn_fs_fs-1.la ../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) + cd subversion/tests/libsvn_fs_fs && $(LINK) $(fs_fs_private_test_LDFLAGS) -o fs-fs-private-test$(EXEEXT) $(fs_fs_private_test_OBJECTS) ../../../subversion/tests/libsvn_test-1.la ../../../subversion/libsvn_fs/libsvn_fs-1.la ../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) fs_sequential_test_PATH = subversion/tests/libsvn_fs fs_sequential_test_DEPS = subversion/tests/libsvn_fs/fs-sequential-test.lo subversion/tests/libsvn_test-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_fs_util/libsvn_fs_util-1.la subversion/libsvn_subr/libsvn_subr-1.la @@ -315,24 +315,23 @@ io_test_OBJECTS = io-test.lo subversion/tests/libsvn_subr/io-test$(EXEEXT): $(io_test_DEPS) cd subversion/tests/libsvn_subr && $(LINK) $(io_test_LDFLAGS) -o io-test$(EXEEXT) $(io_test_OBJECTS) ../../../subversion/tests/libsvn_test-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) -javahl_callback_javah_PATH = subversion/bindings/javahl/include -javahl_callback_javah_HEADERS = subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_AuthnCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_BlameCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_ChangelistCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_ClientNotifyCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_CommitCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_CommitMessageCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_ConfigEvent.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_ConflictResolverCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_DiffSummaryCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_ImportFilterCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_InfoCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_InheritedProplistCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_ListCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_ListItemCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_LogMessageCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_PatchCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_ProgressCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_ProplistCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_RemoteFileRevisionsCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_RemoteLocationSegmentsCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_RemoteStatus.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_ReposFreezeAction.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_ReposNotifyCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_ReposVerifyCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_StatusCallback.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_TunnelAgent.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h -javahl_callback_javah_OBJECTS = -javahl_callback_javah_DEPS = $(javahl_callback_javah_HEADERS) $(javahl_callback_javah_OBJECTS) $(javahl_java_DEPS) -javahl-callback-javah: $(javahl_callback_javah_DEPS) -javahl_callback_javah_CLASS_FILENAMES = subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/AuthnCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/BlameCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ChangelistCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ClientNotifyCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/CommitCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/CommitMessageCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ConfigEvent.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ConflictResolverCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/DiffSummaryCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ImportFilterCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/InfoCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/InheritedProplistCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ListCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ListItemCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/LogMessageCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/PatchCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ProgressCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ProplistCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/RemoteFileRevisionsCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/RemoteLocationSegmentsCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/RemoteStatus.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ReposFreezeAction.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ReposNotifyCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ReposVerifyCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/StatusCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/TunnelAgent.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/UserPasswordCallback.class -javahl_callback_javah_CLASSES = org.apache.subversion.javahl.callback.AuthnCallback org.apache.subversion.javahl.callback.BlameCallback org.apache.subversion.javahl.callback.ChangelistCallback org.apache.subversion.javahl.callback.ClientNotifyCallback org.apache.subversion.javahl.callback.CommitCallback org.apache.subversion.javahl.callback.CommitMessageCallback org.apache.subversion.javahl.callback.ConfigEvent org.apache.subversion.javahl.callback.ConflictResolverCallback org.apache.subversion.javahl.callback.DiffSummaryCallback org.apache.subversion.javahl.callback.ImportFilterCallback org.apache.subversion.javahl.callback.InfoCallback org.apache.subversion.javahl.callback.InheritedProplistCallback org.apache.subversion.javahl.callback.ListCallback org.apache.subversion.javahl.callback.ListItemCallback org.apache.subversion.javahl.callback.LogMessageCallback org.apache.subversion.javahl.callback.PatchCallback org.apache.subversion.javahl.callback.ProgressCallback org.apache.subversion.javahl.callback.ProplistCallback org.apache.subversion.javahl.callback.RemoteFileRevisionsCallback org.apache.subversion.javahl.callback.RemoteLocationSegmentsCallback org.apache.subversion.javahl.callback.RemoteStatus org.apache.subversion.javahl.callback.ReposFreezeAction org.apache.subversion.javahl.callback.ReposNotifyCallback org.apache.subversion.javahl.callback.ReposVerifyCallback org.apache.subversion.javahl.callback.StatusCallback org.apache.subversion.javahl.callback.TunnelAgent org.apache.subversion.javahl.callback.UserPasswordCallback -$(javahl_callback_javah_HEADERS): $(javahl_callback_javah_CLASS_FILENAMES) - $(COMPILE_JAVAHL_JAVAH) -force -d subversion/bindings/javahl/include -classpath subversion/bindings/javahl/classes:$(javahl_callback_javah_CLASSPATH) $(javahl_callback_javah_CLASSES) +javahl_callback_java_PATH = subversion/bindings/javahl/classes +javahl_callback_java_HEADERS = subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h +javahl_callback_java_OBJECTS = subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/AuthnCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/BlameCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/BlameLineCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/BlameRangeCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ChangelistCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ClientNotifyCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/CommitCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/CommitMessageCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ConfigEvent.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ConflictResolverCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/DiffSummaryCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ImportFilterCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/InfoCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/InheritedProplistCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ListCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ListItemCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/LogMessageCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/PatchCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ProgressCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ProplistCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/RemoteFileRevisionsCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/RemoteLocationSegmentsCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/RemoteStatus.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ReposFreezeAction.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ReposNotifyCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ReposVerifyCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/StatusCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/TunnelAgent.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/UserPasswordCallback.class +javahl_callback_java_DEPS = $(javahl_callback_java_HEADERS) $(javahl_callback_java_OBJECTS) +javahl-callback-java: $(javahl_callback_java_DEPS) +javahl_callback_java_SRC = $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/AuthnCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameLineCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameRangeCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ChangelistCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ClientNotifyCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ConfigEvent.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ConflictResolverCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/DiffSummaryCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ImportFilterCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/InfoCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/InheritedProplistCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListItemCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/LogMessageCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/PatchCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ProgressCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ProplistCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteFileRevisionsCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteLocationSegmentsCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteStatus.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ReposFreezeAction.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ReposNotifyCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ReposVerifyCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/StatusCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/TunnelAgent.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java +$(javahl_callback_java_HEADERS) $(javahl_callback_java_OBJECTS): $(javahl_callback_java_SRC) + $(COMPILE_JAVAHL_JAVAC) -h subversion/bindings/javahl/include -d subversion/bindings/javahl/classes -classpath subversion/bindings/javahl/classes:$(javahl_callback_java_CLASSPATH) $(javahl_callback_java_SRC) javahl_compat_java_PATH = subversion/bindings/javahl/classes javahl_compat_java_HEADERS = javahl_compat_java_OBJECTS = subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallback3.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/BlameCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangePath.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ChangelistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ClientException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItem.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitItemStateFlags.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CommitMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictDescriptor.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResolverCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictResult.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ConflictVersion.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/CopySource.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Depth.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummary.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DiffSummaryReceiver.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/DirEntry.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ErrorCodes.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Info2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InfoCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/InputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ListCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Lock.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LockStatus.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogDate.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessage.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/LogMessageCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Mergeinfo.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/MergeinfoLogKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NativeException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NodeKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Notify2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyAction.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyInformation.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/NotifyStatus.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Operation.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/OutputInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Path.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressEvent.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProgressListener.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword2.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PromptUserPassword3.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/PropertyData.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ProplistCallbackImpl.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Revision.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/RevisionRange.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNAdmin.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClient.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientInterface.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientLogLevel.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNClientSynchronized.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNInputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SVNOutputStream.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/ScheduleKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Status.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusCallback.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/StatusKind.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/SubversionException.class subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Version.class -javahl_compat_java_DEPS = $(javahl_compat_java_HEADERS) $(javahl_compat_java_OBJECTS) $(javahl_java_DEPS) +javahl_compat_java_DEPS = $(javahl_compat_java_HEADERS) $(javahl_compat_java_OBJECTS) $(javahl_callback_java_DEPS) $(javahl_remote_java_DEPS) $(javahl_types_java_DEPS) $(javahl_util_java_DEPS) $(javahl_java_DEPS) javahl-compat-java: $(javahl_compat_java_DEPS) javahl_compat_java_SRC = $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback3.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallbackImpl.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangelistCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ClientException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitMessage.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResolverCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CopySource.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummary.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummaryReceiver.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ErrorCodes.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InfoCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InputInterface.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ListCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LockStatus.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessage.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessageCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/MergeinfoLogKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyStatus.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/OutputInterface.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressEvent.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProgressListener.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword2.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword3.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallbackImpl.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/RevisionRange.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientLogLevel.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNInputStream.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNOutputStream.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ScheduleKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/StatusCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/StatusKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SubversionException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java -$(javahl_compat_java_OBJECTS): $(javahl_compat_java_SRC) +$(javahl_compat_java_HEADERS) $(javahl_compat_java_OBJECTS): $(javahl_compat_java_SRC) $(COMPILE_JAVAHL_COMPAT_JAVAC) -d subversion/bindings/javahl/classes -classpath subversion/bindings/javahl/classes:$(javahl_compat_java_CLASSPATH) $(javahl_compat_java_SRC) @@ -342,80 +341,60 @@ javahl_compat_tests_OBJECTS = subversion/bindings/javahl/classes/org/tigris/subv javahl_compat_tests_DEPS = $(javahl_compat_tests_HEADERS) $(javahl_compat_tests_OBJECTS) $(javahl_compat_java_DEPS) javahl-compat-tests: $(javahl_compat_tests_DEPS) javahl_compat_tests_SRC = $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/RunTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNAdminTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/WC.java -$(javahl_compat_tests_OBJECTS): $(javahl_compat_tests_SRC) +$(javahl_compat_tests_HEADERS) $(javahl_compat_tests_OBJECTS): $(javahl_compat_tests_SRC) $(COMPILE_JAVAHL_COMPAT_JAVAC) -d subversion/bindings/javahl/classes -classpath subversion/bindings/javahl/classes:$(javahl_compat_tests_CLASSPATH) $(javahl_compat_tests_SRC) javahl_java_PATH = subversion/bindings/javahl/classes -javahl_java_HEADERS = -javahl_java_OBJECTS = subversion/bindings/javahl/classes/org/apache/subversion/javahl/ClientException.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ClientNotifyInformation.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/CommitInfo.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/CommitItem.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/CommitItemStateFlags.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ConflictDescriptor.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ConflictResult.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/DiffSummary.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNClient.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNConfig.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNEditor.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNRemote.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNReporter.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNRepos.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/JNIError.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/JNIObject.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/NativeException.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/NativeResources.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/OperationContext.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ProgressEvent.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ReposNotifyInformation.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/SVNClient.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/SVNRepos.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/SVNUtil.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/SubversionException.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/AuthnCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/BlameCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ChangelistCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ClientNotifyCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/CommitCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/CommitMessageCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ConfigEvent.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ConflictResolverCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/DiffSummaryCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ImportFilterCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/InfoCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/InheritedProplistCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ListCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ListItemCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/LogMessageCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/PatchCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ProgressCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ProplistCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/RemoteFileRevisionsCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/RemoteLocationSegmentsCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/RemoteStatus.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ReposFreezeAction.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ReposNotifyCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ReposVerifyCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/StatusCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/TunnelAgent.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/UserPasswordCallback.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/CommitEditor.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/RemoteFactory.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/RemoteSession.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/RetryOpenSession.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/StateReporter.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/StatusEditor.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/ChangePath.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Checksum.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/ConflictVersion.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/CopySource.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Depth.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/DiffOptions.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/DirEntry.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/ExternalItem.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Info.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Lock.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/LogDate.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Mergeinfo.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/NativeInputStream.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/NativeOutputStream.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/NodeKind.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Property.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Revision.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/RevisionRange.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/RevisionRangeList.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/RuntimeVersion.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Status.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Tristate.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Version.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/VersionExtended.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/ConfigImpl.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/ConfigLib.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/DiffLib.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/PropLib.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/RequestChannel.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/ResponseChannel.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/SubstLib.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/TunnelChannel.class +javahl_java_HEADERS = subversion/bindings/javahl/include/org_apache_subversion_javahl_CommitItemStateFlags.h subversion/bindings/javahl/include/org_apache_subversion_javahl_NativeResources.h subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNClient.h subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNRepos.h +javahl_java_OBJECTS = subversion/bindings/javahl/classes/org/apache/subversion/javahl/ClientException.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ClientNotifyInformation.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/CommitInfo.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/CommitItem.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/CommitItemStateFlags.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ConflictDescriptor.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ConflictResult.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/DiffSummary.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNClient.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNConfig.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNEditor.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNRemote.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNReporter.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNRepos.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/JNIError.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/JNIObject.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/NativeException.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/NativeResources.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/OperationContext.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ProgressEvent.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ReposNotifyInformation.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/SVNClient.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/SVNRepos.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/SVNUtil.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/SubversionException.class javahl_java_DEPS = $(javahl_java_HEADERS) $(javahl_java_OBJECTS) javahl-java: $(javahl_java_DEPS) -javahl_java_SRC = $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNConfig.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNReporter.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIObject.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/OperationContext.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNUtil.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/SubversionException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/AuthnCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ChangelistCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ClientNotifyCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ConfigEvent.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ConflictResolverCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/DiffSummaryCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ImportFilterCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/InfoCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/InheritedProplistCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListItemCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/LogMessageCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/PatchCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ProgressCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ProplistCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteFileRevisionsCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteLocationSegmentsCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteStatus.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ReposFreezeAction.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ReposNotifyCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ReposVerifyCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/StatusCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/TunnelAgent.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteFactory.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RetryOpenSession.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StateReporter.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StatusEditor.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Checksum.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ConflictVersion.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Depth.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DiffOptions.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ExternalItem.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NativeInputStream.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NativeOutputStream.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NodeKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Property.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRangeList.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RuntimeVersion.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Tristate.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigImpl.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigLib.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/DiffLib.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/PropLib.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/RequestChannel.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ResponseChannel.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/SubstLib.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/TunnelChannel.java -$(javahl_java_OBJECTS): $(javahl_java_SRC) - $(COMPILE_JAVAHL_JAVAC) -d subversion/bindings/javahl/classes -classpath subversion/bindings/javahl/classes:$(javahl_java_CLASSPATH) $(javahl_java_SRC) - - -javahl_javah_PATH = subversion/bindings/javahl/include -javahl_javah_HEADERS = subversion/bindings/javahl/include/org_apache_subversion_javahl_ClientException.h subversion/bindings/javahl/include/org_apache_subversion_javahl_ClientNotifyInformation.h subversion/bindings/javahl/include/org_apache_subversion_javahl_CommitInfo.h subversion/bindings/javahl/include/org_apache_subversion_javahl_CommitItem.h subversion/bindings/javahl/include/org_apache_subversion_javahl_CommitItemStateFlags.h subversion/bindings/javahl/include/org_apache_subversion_javahl_ConflictDescriptor.h subversion/bindings/javahl/include/org_apache_subversion_javahl_ConflictResult.h subversion/bindings/javahl/include/org_apache_subversion_javahl_DiffSummary.h subversion/bindings/javahl/include/org_apache_subversion_javahl_ISVNClient.h subversion/bindings/javahl/include/org_apache_subversion_javahl_ISVNConfig.h subversion/bindings/javahl/include/org_apache_subversion_javahl_ISVNEditor.h subversion/bindings/javahl/include/org_apache_subversion_javahl_ISVNRemote.h subversion/bindings/javahl/include/org_apache_subversion_javahl_ISVNReporter.h subversion/bindings/javahl/include/org_apache_subversion_javahl_ISVNRepos.h subversion/bindings/javahl/include/org_apache_subversion_javahl_JNIError.h subversion/bindings/javahl/include/org_apache_subversion_javahl_JNIObject.h subversion/bindings/javahl/include/org_apache_subversion_javahl_NativeException.h subversion/bindings/javahl/include/org_apache_subversion_javahl_NativeResources.h subversion/bindings/javahl/include/org_apache_subversion_javahl_OperationContext.h subversion/bindings/javahl/include/org_apache_subversion_javahl_ProgressEvent.h subversion/bindings/javahl/include/org_apache_subversion_javahl_ReposNotifyInformation.h subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNClient.h subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNRepos.h subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNUtil.h subversion/bindings/javahl/include/org_apache_subversion_javahl_SubversionException.h -javahl_javah_OBJECTS = -javahl_javah_DEPS = $(javahl_javah_HEADERS) $(javahl_javah_OBJECTS) $(javahl_java_DEPS) -javahl-javah: $(javahl_javah_DEPS) -javahl_javah_CLASS_FILENAMES = subversion/bindings/javahl/classes/org/apache/subversion/javahl/ClientException.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ClientNotifyInformation.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/CommitInfo.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/CommitItem.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/CommitItemStateFlags.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ConflictDescriptor.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ConflictResult.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/DiffSummary.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNClient.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNConfig.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNEditor.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNRemote.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNReporter.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNRepos.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/JNIError.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/JNIObject.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/NativeException.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/NativeResources.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/OperationContext.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ProgressEvent.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ReposNotifyInformation.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/SVNClient.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/SVNRepos.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/SVNUtil.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/SubversionException.class -javahl_javah_CLASSES = org.apache.subversion.javahl.ClientException org.apache.subversion.javahl.ClientNotifyInformation org.apache.subversion.javahl.CommitInfo org.apache.subversion.javahl.CommitItem org.apache.subversion.javahl.CommitItemStateFlags org.apache.subversion.javahl.ConflictDescriptor org.apache.subversion.javahl.ConflictResult org.apache.subversion.javahl.DiffSummary org.apache.subversion.javahl.ISVNClient org.apache.subversion.javahl.ISVNConfig org.apache.subversion.javahl.ISVNEditor org.apache.subversion.javahl.ISVNRemote org.apache.subversion.javahl.ISVNReporter org.apache.subversion.javahl.ISVNRepos org.apache.subversion.javahl.JNIError org.apache.subversion.javahl.JNIObject org.apache.subversion.javahl.NativeException org.apache.subversion.javahl.NativeResources org.apache.subversion.javahl.OperationContext org.apache.subversion.javahl.ProgressEvent org.apache.subversion.javahl.ReposNotifyInformation org.apache.subversion.javahl.SVNClient org.apache.subversion.javahl.SVNRepos org.apache.subversion.javahl.SVNUtil org.apache.subversion.javahl.SubversionException -$(javahl_javah_HEADERS): $(javahl_javah_CLASS_FILENAMES) - $(COMPILE_JAVAHL_JAVAH) -force -d subversion/bindings/javahl/include -classpath subversion/bindings/javahl/classes:$(javahl_javah_CLASSPATH) $(javahl_javah_CLASSES) +javahl_java_SRC = $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNConfig.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNReporter.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIObject.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/OperationContext.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNUtil.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/SubversionException.java +$(javahl_java_HEADERS) $(javahl_java_OBJECTS): $(javahl_java_SRC) + $(COMPILE_JAVAHL_JAVAC) -h subversion/bindings/javahl/include -d subversion/bindings/javahl/classes -classpath subversion/bindings/javahl/classes:$(javahl_java_CLASSPATH) $(javahl_java_SRC) -javahl_remote_javah_PATH = subversion/bindings/javahl/include -javahl_remote_javah_HEADERS = subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_CommitEditor.h subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_RemoteFactory.h subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_RemoteSession.h subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_RetryOpenSession.h subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_StateReporter.h subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_StatusEditor.h -javahl_remote_javah_OBJECTS = -javahl_remote_javah_DEPS = $(javahl_remote_javah_HEADERS) $(javahl_remote_javah_OBJECTS) $(javahl_java_DEPS) -javahl-remote-javah: $(javahl_remote_javah_DEPS) -javahl_remote_javah_CLASS_FILENAMES = subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/CommitEditor.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/RemoteFactory.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/RemoteSession.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/RetryOpenSession.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/StateReporter.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/StatusEditor.class -javahl_remote_javah_CLASSES = org.apache.subversion.javahl.remote.CommitEditor org.apache.subversion.javahl.remote.RemoteFactory org.apache.subversion.javahl.remote.RemoteSession org.apache.subversion.javahl.remote.RetryOpenSession org.apache.subversion.javahl.remote.StateReporter org.apache.subversion.javahl.remote.StatusEditor -$(javahl_remote_javah_HEADERS): $(javahl_remote_javah_CLASS_FILENAMES) - $(COMPILE_JAVAHL_JAVAH) -force -d subversion/bindings/javahl/include -classpath subversion/bindings/javahl/classes:$(javahl_remote_javah_CLASSPATH) $(javahl_remote_javah_CLASSES) +javahl_remote_java_PATH = subversion/bindings/javahl/classes +javahl_remote_java_HEADERS = subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_CommitEditor.h subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_RemoteFactory.h subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_RemoteSession.h subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_StateReporter.h +javahl_remote_java_OBJECTS = subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/CommitEditor.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/RemoteFactory.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/RemoteSession.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/RetryOpenSession.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/StateReporter.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/StatusEditor.class +javahl_remote_java_DEPS = $(javahl_remote_java_HEADERS) $(javahl_remote_java_OBJECTS) +javahl-remote-java: $(javahl_remote_java_DEPS) +javahl_remote_java_SRC = $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteFactory.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RetryOpenSession.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StateReporter.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StatusEditor.java +$(javahl_remote_java_HEADERS) $(javahl_remote_java_OBJECTS): $(javahl_remote_java_SRC) + $(COMPILE_JAVAHL_JAVAC) -h subversion/bindings/javahl/include -d subversion/bindings/javahl/classes -classpath subversion/bindings/javahl/classes:$(javahl_remote_java_CLASSPATH) $(javahl_remote_java_SRC) javahl_tests_PATH = subversion/bindings/javahl/classes javahl_tests_HEADERS = javahl_tests_OBJECTS = subversion/bindings/javahl/classes/org/apache/subversion/javahl/BasicTests.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/ExceptionTests.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/RunTests.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/SVNRemoteTests.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/SVNReposTests.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/SVNTests.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/UtilTests.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/WC.class -javahl_tests_DEPS = $(javahl_tests_HEADERS) $(javahl_tests_OBJECTS) $(javahl_java_DEPS) +javahl_tests_DEPS = $(javahl_tests_HEADERS) $(javahl_tests_OBJECTS) $(javahl_callback_java_DEPS) $(javahl_remote_java_DEPS) $(javahl_types_java_DEPS) $(javahl_util_java_DEPS) $(javahl_java_DEPS) javahl-tests: $(javahl_tests_DEPS) javahl_tests_SRC = $(abs_srcdir)/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/apache/subversion/javahl/ExceptionTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNReposTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java $(abs_srcdir)/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java -$(javahl_tests_OBJECTS): $(javahl_tests_SRC) +$(javahl_tests_HEADERS) $(javahl_tests_OBJECTS): $(javahl_tests_SRC) $(COMPILE_JAVAHL_JAVAC) -d subversion/bindings/javahl/classes -classpath subversion/bindings/javahl/classes:$(javahl_tests_CLASSPATH) $(javahl_tests_SRC) -javahl_types_javah_PATH = subversion/bindings/javahl/include -javahl_types_javah_HEADERS = subversion/bindings/javahl/include/org_apache_subversion_javahl_types_ChangePath.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Checksum.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_ConflictVersion.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_CopySource.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Depth.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_DiffOptions.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_DirEntry.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_ExternalItem.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Info.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Lock.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_LogDate.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Mergeinfo.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_NativeInputStream.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_NativeOutputStream.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_NodeKind.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Property.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Revision.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_RevisionRange.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_RevisionRangeList.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_RuntimeVersion.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Status.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Tristate.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Version.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended.h -javahl_types_javah_OBJECTS = -javahl_types_javah_DEPS = $(javahl_types_javah_HEADERS) $(javahl_types_javah_OBJECTS) $(javahl_java_DEPS) -javahl-types-javah: $(javahl_types_javah_DEPS) -javahl_types_javah_CLASS_FILENAMES = subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/ChangePath.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Checksum.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/ConflictVersion.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/CopySource.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Depth.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/DiffOptions.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/DirEntry.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/ExternalItem.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Info.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Lock.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/LogDate.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Mergeinfo.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/NativeInputStream.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/NativeOutputStream.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/NodeKind.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Property.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Revision.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/RevisionRange.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/RevisionRangeList.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/RuntimeVersion.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Status.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Tristate.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Version.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/VersionExtended.class -javahl_types_javah_CLASSES = org.apache.subversion.javahl.types.ChangePath org.apache.subversion.javahl.types.Checksum org.apache.subversion.javahl.types.ConflictVersion org.apache.subversion.javahl.types.CopySource org.apache.subversion.javahl.types.Depth org.apache.subversion.javahl.types.DiffOptions org.apache.subversion.javahl.types.DirEntry org.apache.subversion.javahl.types.ExternalItem org.apache.subversion.javahl.types.Info org.apache.subversion.javahl.types.Lock org.apache.subversion.javahl.types.LogDate org.apache.subversion.javahl.types.Mergeinfo org.apache.subversion.javahl.types.NativeInputStream org.apache.subversion.javahl.types.NativeOutputStream org.apache.subversion.javahl.types.NodeKind org.apache.subversion.javahl.types.Property org.apache.subversion.javahl.types.Revision org.apache.subversion.javahl.types.RevisionRange org.apache.subversion.javahl.types.RevisionRangeList org.apache.subversion.javahl.types.RuntimeVersion org.apache.subversion.javahl.types.Status org.apache.subversion.javahl.types.Tristate org.apache.subversion.javahl.types.Version org.apache.subversion.javahl.types.VersionExtended -$(javahl_types_javah_HEADERS): $(javahl_types_javah_CLASS_FILENAMES) - $(COMPILE_JAVAHL_JAVAH) -force -d subversion/bindings/javahl/include -classpath subversion/bindings/javahl/classes:$(javahl_types_javah_CLASSPATH) $(javahl_types_javah_CLASSES) +javahl_types_java_PATH = subversion/bindings/javahl/classes +javahl_types_java_HEADERS = subversion/bindings/javahl/include/org_apache_subversion_javahl_types_NativeInputStream.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_NativeOutputStream.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Revision.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_RevisionRangeList.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_RuntimeVersion.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Version.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended.h +javahl_types_java_OBJECTS = subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/ChangePath.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Checksum.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/ConflictVersion.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/CopySource.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Depth.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/DiffOptions.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/DirEntry.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/ExternalItem.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Info.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Lock.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/LogDate.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Mergeinfo.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/NativeInputStream.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/NativeOutputStream.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/NodeKind.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Property.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Revision.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/RevisionRange.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/RevisionRangeList.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/RuntimeVersion.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Status.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Tristate.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Version.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/VersionExtended.class +javahl_types_java_DEPS = $(javahl_types_java_HEADERS) $(javahl_types_java_OBJECTS) +javahl-types-java: $(javahl_types_java_DEPS) +javahl_types_java_SRC = $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Checksum.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ConflictVersion.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Depth.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DiffOptions.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ExternalItem.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NativeInputStream.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NativeOutputStream.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NodeKind.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Property.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRangeList.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RuntimeVersion.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Tristate.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java +$(javahl_types_java_HEADERS) $(javahl_types_java_OBJECTS): $(javahl_types_java_SRC) + $(COMPILE_JAVAHL_JAVAC) -h subversion/bindings/javahl/include -d subversion/bindings/javahl/classes -classpath subversion/bindings/javahl/classes:$(javahl_types_java_CLASSPATH) $(javahl_types_java_SRC) -javahl_util_javah_PATH = subversion/bindings/javahl/include -javahl_util_javah_HEADERS = subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ConfigImpl.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ConfigLib.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_DiffLib.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_PropLib.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_RequestChannel.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ResponseChannel.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_SubstLib.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_TunnelChannel.h -javahl_util_javah_OBJECTS = -javahl_util_javah_DEPS = $(javahl_util_javah_HEADERS) $(javahl_util_javah_OBJECTS) $(javahl_java_DEPS) -javahl-util-javah: $(javahl_util_javah_DEPS) -javahl_util_javah_CLASS_FILENAMES = subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/ConfigImpl.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/ConfigLib.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/DiffLib.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/PropLib.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/RequestChannel.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/ResponseChannel.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/SubstLib.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/TunnelChannel.class -javahl_util_javah_CLASSES = org.apache.subversion.javahl.util.ConfigImpl org.apache.subversion.javahl.util.ConfigLib org.apache.subversion.javahl.util.DiffLib org.apache.subversion.javahl.util.PropLib org.apache.subversion.javahl.util.RequestChannel org.apache.subversion.javahl.util.ResponseChannel org.apache.subversion.javahl.util.SubstLib org.apache.subversion.javahl.util.TunnelChannel -$(javahl_util_javah_HEADERS): $(javahl_util_javah_CLASS_FILENAMES) - $(COMPILE_JAVAHL_JAVAH) -force -d subversion/bindings/javahl/include -classpath subversion/bindings/javahl/classes:$(javahl_util_javah_CLASSPATH) $(javahl_util_javah_CLASSES) +javahl_util_java_PATH = subversion/bindings/javahl/classes +javahl_util_java_HEADERS = subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ConfigImpl.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ConfigLib.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_DiffLib.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_PropLib.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_RequestChannel.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ResponseChannel.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_SubstLib.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_TunnelChannel.h +javahl_util_java_OBJECTS = subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/ConfigImpl.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/ConfigLib.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/DiffLib.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/PropLib.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/RequestChannel.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/ResponseChannel.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/SubstLib.class subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/TunnelChannel.class +javahl_util_java_DEPS = $(javahl_util_java_HEADERS) $(javahl_util_java_OBJECTS) +javahl-util-java: $(javahl_util_java_DEPS) +javahl_util_java_SRC = $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigImpl.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigLib.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/DiffLib.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/PropLib.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/RequestChannel.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ResponseChannel.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/SubstLib.java $(abs_srcdir)/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/TunnelChannel.java +$(javahl_util_java_HEADERS) $(javahl_util_java_OBJECTS): $(javahl_util_java_SRC) + $(COMPILE_JAVAHL_JAVAC) -h subversion/bindings/javahl/include -d subversion/bindings/javahl/classes -classpath subversion/bindings/javahl/classes:$(javahl_util_java_CLASSPATH) $(javahl_util_java_SRC) -libgooglemock_PATH = googlemock -libgooglemock_DEPS = -libgooglemock_OBJECTS = -googlemock/libgooglemock-1.la: $(libgooglemock_DEPS) - if $(SVN_USE_GOOGLEMOCK) ; then cd googlemock && $(LINK_CXX_LIB) $(libgooglemock_LDFLAGS) -o libgooglemock-1.la $(LT_NO_UNDEFINED) $(libgooglemock_OBJECTS) $(LIBS) ; else echo "fake" > googlemock/libgooglemock-1.la ; fi - libsvn_auth_gnome_keyring_PATH = subversion/libsvn_auth_gnome_keyring libsvn_auth_gnome_keyring_DEPS = subversion/libsvn_auth_gnome_keyring/gnome_keyring.lo subversion/libsvn_auth_gnome_keyring/version.lo subversion/libsvn_subr/libsvn_subr-1.la libsvn_auth_gnome_keyring_OBJECTS = gnome_keyring.lo version.lo @@ -429,8 +408,8 @@ subversion/libsvn_auth_kwallet/libsvn_auth_kwallet-1.la: $(libsvn_auth_kwallet_D cd subversion/libsvn_auth_kwallet && $(LINK_SHARED_ONLY_CXX_LIB) $(libsvn_auth_kwallet_LDFLAGS) -o libsvn_auth_kwallet-1.la $(LT_NO_UNDEFINED) $(libsvn_auth_kwallet_OBJECTS) ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) $(SVN_KWALLET_LIBS) $(LIBS) libsvn_client_PATH = subversion/libsvn_client -libsvn_client_DEPS = subversion/libsvn_client/add.lo subversion/libsvn_client/blame.lo subversion/libsvn_client/cat.lo subversion/libsvn_client/changelist.lo subversion/libsvn_client/checkout.lo subversion/libsvn_client/cleanup.lo subversion/libsvn_client/cmdline.lo subversion/libsvn_client/commit.lo subversion/libsvn_client/commit_util.lo subversion/libsvn_client/compat_providers.lo subversion/libsvn_client/conflicts.lo subversion/libsvn_client/copy.lo subversion/libsvn_client/copy_foreign.lo subversion/libsvn_client/ctx.lo subversion/libsvn_client/delete.lo subversion/libsvn_client/deprecated.lo subversion/libsvn_client/diff.lo subversion/libsvn_client/diff_local.lo subversion/libsvn_client/diff_summarize.lo subversion/libsvn_client/export.lo subversion/libsvn_client/externals.lo subversion/libsvn_client/import.lo subversion/libsvn_client/info.lo subversion/libsvn_client/iprops.lo subversion/libsvn_client/list.lo subversion/libsvn_client/locking_commands.lo subversion/libsvn_client/log.lo subversion/libsvn_client/merge.lo subversion/libsvn_client/merge_elements.lo subversion/libsvn_client/mergeinfo.lo subversion/libsvn_client/mtcc.lo subversion/libsvn_client/patch.lo subversion/libsvn_client/prop_commands.lo subversion/libsvn_client/ra.lo subversion/libsvn_client/relocate.lo subversion/libsvn_client/repos_diff.lo subversion/libsvn_client/resolved.lo subversion/libsvn_client/revert.lo subversion/libsvn_client/revisions.lo subversion/libsvn_client/shelve.lo subversion/libsvn_client/status.lo subversion/libsvn_client/switch.lo subversion/libsvn_client/update.lo subversion/libsvn_client/upgrade.lo subversion/libsvn_client/url.lo subversion/libsvn_client/util.lo subversion/libsvn_client/version.lo subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la -libsvn_client_OBJECTS = add.lo blame.lo cat.lo changelist.lo checkout.lo cleanup.lo cmdline.lo commit.lo commit_util.lo compat_providers.lo conflicts.lo copy.lo copy_foreign.lo ctx.lo delete.lo deprecated.lo diff.lo diff_local.lo diff_summarize.lo export.lo externals.lo import.lo info.lo iprops.lo list.lo locking_commands.lo log.lo merge.lo merge_elements.lo mergeinfo.lo mtcc.lo patch.lo prop_commands.lo ra.lo relocate.lo repos_diff.lo resolved.lo revert.lo revisions.lo shelve.lo status.lo switch.lo update.lo upgrade.lo url.lo util.lo version.lo +libsvn_client_DEPS = subversion/libsvn_client/add.lo subversion/libsvn_client/blame.lo subversion/libsvn_client/cat.lo subversion/libsvn_client/changelist.lo subversion/libsvn_client/checkout.lo subversion/libsvn_client/cleanup.lo subversion/libsvn_client/cmdline.lo subversion/libsvn_client/commit.lo subversion/libsvn_client/commit_util.lo subversion/libsvn_client/compat_providers.lo subversion/libsvn_client/conflicts.lo subversion/libsvn_client/copy.lo subversion/libsvn_client/ctx.lo subversion/libsvn_client/delete.lo subversion/libsvn_client/deprecated.lo subversion/libsvn_client/diff.lo subversion/libsvn_client/diff_local.lo subversion/libsvn_client/diff_summarize.lo subversion/libsvn_client/export.lo subversion/libsvn_client/externals.lo subversion/libsvn_client/import.lo subversion/libsvn_client/info.lo subversion/libsvn_client/iprops.lo subversion/libsvn_client/layout.lo subversion/libsvn_client/list.lo subversion/libsvn_client/locking_commands.lo subversion/libsvn_client/log.lo subversion/libsvn_client/merge.lo subversion/libsvn_client/merge_elements.lo subversion/libsvn_client/mergeinfo.lo subversion/libsvn_client/mtcc.lo subversion/libsvn_client/patch.lo subversion/libsvn_client/prop_commands.lo subversion/libsvn_client/ra.lo subversion/libsvn_client/relocate.lo subversion/libsvn_client/repos_diff.lo subversion/libsvn_client/resolved.lo subversion/libsvn_client/revert.lo subversion/libsvn_client/revisions.lo subversion/libsvn_client/shelf.lo subversion/libsvn_client/status.lo subversion/libsvn_client/switch.lo subversion/libsvn_client/update.lo subversion/libsvn_client/upgrade.lo subversion/libsvn_client/url.lo subversion/libsvn_client/util.lo subversion/libsvn_client/version.lo subversion/libsvn_client/wc_editor.lo subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la +libsvn_client_OBJECTS = add.lo blame.lo cat.lo changelist.lo checkout.lo cleanup.lo cmdline.lo commit.lo commit_util.lo compat_providers.lo conflicts.lo copy.lo ctx.lo delete.lo deprecated.lo diff.lo diff_local.lo diff_summarize.lo export.lo externals.lo import.lo info.lo iprops.lo layout.lo list.lo locking_commands.lo log.lo merge.lo merge_elements.lo mergeinfo.lo mtcc.lo patch.lo prop_commands.lo ra.lo relocate.lo repos_diff.lo resolved.lo revert.lo revisions.lo shelf.lo status.lo switch.lo update.lo upgrade.lo url.lo util.lo version.lo wc_editor.lo subversion/libsvn_client/libsvn_client-1.la: $(libsvn_client_DEPS) cd subversion/libsvn_client && $(LINK_LIB) $(libsvn_client_LDFLAGS) -o libsvn_client-1.la $(LT_NO_UNDEFINED) $(libsvn_client_OBJECTS) ../../subversion/libsvn_wc/libsvn_wc-1.la ../../subversion/libsvn_ra/libsvn_ra-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_diff/libsvn_diff-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) @@ -503,8 +482,8 @@ subversion/libsvn_ra_svn/libsvn_ra_svn-1.la: $(libsvn_ra_svn_DEPS) cd subversion/libsvn_ra_svn && $(LINK_LIB) $(libsvn_ra_svn_LDFLAGS) -o libsvn_ra_svn-1.la $(LT_NO_UNDEFINED) $(libsvn_ra_svn_OBJECTS) ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(SVN_SASL_LIBS) $(LIBS) libsvn_repos_PATH = subversion/libsvn_repos -libsvn_repos_DEPS = subversion/libsvn_repos/authz.lo subversion/libsvn_repos/authz_info.lo subversion/libsvn_repos/authz_parse.lo subversion/libsvn_repos/commit.lo subversion/libsvn_repos/compat.lo subversion/libsvn_repos/config_file.lo subversion/libsvn_repos/config_pool.lo subversion/libsvn_repos/delta.lo subversion/libsvn_repos/deprecated.lo subversion/libsvn_repos/dump.lo subversion/libsvn_repos/fs-wrap.lo subversion/libsvn_repos/hooks.lo subversion/libsvn_repos/list.lo subversion/libsvn_repos/load-fs-vtable.lo subversion/libsvn_repos/load.lo subversion/libsvn_repos/log.lo subversion/libsvn_repos/node_tree.lo subversion/libsvn_repos/notify.lo subversion/libsvn_repos/replay.lo subversion/libsvn_repos/reporter.lo subversion/libsvn_repos/repos.lo subversion/libsvn_repos/rev_hunt.lo subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la -libsvn_repos_OBJECTS = authz.lo authz_info.lo authz_parse.lo commit.lo compat.lo config_file.lo config_pool.lo delta.lo deprecated.lo dump.lo fs-wrap.lo hooks.lo list.lo load-fs-vtable.lo load.lo log.lo node_tree.lo notify.lo replay.lo reporter.lo repos.lo rev_hunt.lo +libsvn_repos_DEPS = subversion/libsvn_repos/authz.lo subversion/libsvn_repos/authz_info.lo subversion/libsvn_repos/authz_parse.lo subversion/libsvn_repos/commit.lo subversion/libsvn_repos/compat.lo subversion/libsvn_repos/config_file.lo subversion/libsvn_repos/config_pool.lo subversion/libsvn_repos/delta.lo subversion/libsvn_repos/deprecated.lo subversion/libsvn_repos/dump.lo subversion/libsvn_repos/dump_editor.lo subversion/libsvn_repos/fs-wrap.lo subversion/libsvn_repos/hooks.lo subversion/libsvn_repos/list.lo subversion/libsvn_repos/load-fs-vtable.lo subversion/libsvn_repos/load.lo subversion/libsvn_repos/log.lo subversion/libsvn_repos/node_tree.lo subversion/libsvn_repos/notify.lo subversion/libsvn_repos/replay.lo subversion/libsvn_repos/reporter.lo subversion/libsvn_repos/repos.lo subversion/libsvn_repos/rev_hunt.lo subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la +libsvn_repos_OBJECTS = authz.lo authz_info.lo authz_parse.lo commit.lo compat.lo config_file.lo config_pool.lo delta.lo deprecated.lo dump.lo dump_editor.lo fs-wrap.lo hooks.lo list.lo load-fs-vtable.lo load.lo log.lo node_tree.lo notify.lo replay.lo reporter.lo repos.lo rev_hunt.lo subversion/libsvn_repos/libsvn_repos-1.la: $(libsvn_repos_DEPS) cd subversion/libsvn_repos && $(LINK_LIB) $(libsvn_repos_LDFLAGS) -o libsvn_repos-1.la $(LT_NO_UNDEFINED) $(libsvn_repos_OBJECTS) ../../subversion/libsvn_fs/libsvn_fs-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) @@ -512,7 +491,7 @@ libsvn_subr_PATH = subversion/libsvn_subr libsvn_subr_DEPS = subversion/libsvn_subr/adler32.lo subversion/libsvn_subr/atomic.lo subversion/libsvn_subr/auth.lo subversion/libsvn_subr/base64.lo subversion/libsvn_subr/bit_array.lo subversion/libsvn_subr/cache-inprocess.lo subversion/libsvn_subr/cache-membuffer.lo subversion/libsvn_subr/cache-memcache.lo subversion/libsvn_subr/cache-null.lo subversion/libsvn_subr/cache.lo subversion/libsvn_subr/cache_config.lo subversion/libsvn_subr/checksum.lo subversion/libsvn_subr/cmdline.lo subversion/libsvn_subr/compat.lo subversion/libsvn_subr/compress_lz4.lo subversion/libsvn_subr/compress_zlib.lo subversion/libsvn_subr/config.lo subversion/libsvn_subr/config_auth.lo subversion/libsvn_subr/config_file.lo subversion/libsvn_subr/config_win.lo subversion/libsvn_subr/crypto.lo subversion/libsvn_subr/ctype.lo subversion/libsvn_subr/date.lo subversion/libsvn_subr/debug.lo subversion/libsvn_subr/deprecated.lo subversion/libsvn_subr/dirent_uri.lo subversion/libsvn_subr/dso.lo subversion/libsvn_subr/encode.lo subversion/libsvn_subr/eol.lo subversion/libsvn_subr/error.lo subversion/libsvn_subr/fnv1a.lo subversion/libsvn_subr/gpg_agent.lo subversion/libsvn_subr/hash.lo subversion/libsvn_subr/io.lo subversion/libsvn_subr/iter.lo subversion/libsvn_subr/lock.lo subversion/libsvn_subr/log.lo subversion/libsvn_subr/lz4/lz4.lo subversion/libsvn_subr/macos_keychain.lo subversion/libsvn_subr/magic.lo subversion/libsvn_subr/md5.lo subversion/libsvn_subr/mergeinfo.lo subversion/libsvn_subr/mutex.lo subversion/libsvn_subr/nls.lo subversion/libsvn_subr/object_pool.lo subversion/libsvn_subr/opt.lo subversion/libsvn_subr/packed_data.lo subversion/libsvn_subr/path.lo subversion/libsvn_subr/pool.lo subversion/libsvn_subr/prefix_string.lo subversion/libsvn_subr/prompt.lo subversion/libsvn_subr/properties.lo subversion/libsvn_subr/quoprint.lo subversion/libsvn_subr/root_pools.lo subversion/libsvn_subr/simple_providers.lo subversion/libsvn_subr/skel.lo subversion/libsvn_subr/sorts.lo subversion/libsvn_subr/spillbuf.lo subversion/libsvn_subr/sqlite.lo subversion/libsvn_subr/sqlite3wrapper.lo subversion/libsvn_subr/ssl_client_cert_providers.lo subversion/libsvn_subr/ssl_client_cert_pw_providers.lo subversion/libsvn_subr/ssl_server_trust_providers.lo subversion/libsvn_subr/stream.lo subversion/libsvn_subr/string.lo subversion/libsvn_subr/subst.lo subversion/libsvn_subr/sysinfo.lo subversion/libsvn_subr/target.lo subversion/libsvn_subr/temp_serializer.lo subversion/libsvn_subr/time.lo subversion/libsvn_subr/token.lo subversion/libsvn_subr/types.lo subversion/libsvn_subr/user.lo subversion/libsvn_subr/username_providers.lo subversion/libsvn_subr/utf.lo subversion/libsvn_subr/utf8proc.lo subversion/libsvn_subr/utf_validate.lo subversion/libsvn_subr/utf_width.lo subversion/libsvn_subr/validate.lo subversion/libsvn_subr/version.lo subversion/libsvn_subr/win32_crashrpt.lo subversion/libsvn_subr/win32_crypto.lo subversion/libsvn_subr/win32_xlate.lo subversion/libsvn_subr/x509info.lo subversion/libsvn_subr/x509parse.lo subversion/libsvn_subr/xml.lo libsvn_subr_OBJECTS = adler32.lo atomic.lo auth.lo base64.lo bit_array.lo cache-inprocess.lo cache-membuffer.lo cache-memcache.lo cache-null.lo cache.lo cache_config.lo checksum.lo cmdline.lo compat.lo compress_lz4.lo compress_zlib.lo config.lo config_auth.lo config_file.lo config_win.lo crypto.lo ctype.lo date.lo debug.lo deprecated.lo dirent_uri.lo dso.lo encode.lo eol.lo error.lo fnv1a.lo gpg_agent.lo hash.lo io.lo iter.lo lock.lo log.lo lz4/lz4.lo macos_keychain.lo magic.lo md5.lo mergeinfo.lo mutex.lo nls.lo object_pool.lo opt.lo packed_data.lo path.lo pool.lo prefix_string.lo prompt.lo properties.lo quoprint.lo root_pools.lo simple_providers.lo skel.lo sorts.lo spillbuf.lo sqlite.lo sqlite3wrapper.lo ssl_client_cert_providers.lo ssl_client_cert_pw_providers.lo ssl_server_trust_providers.lo stream.lo string.lo subst.lo sysinfo.lo target.lo temp_serializer.lo time.lo token.lo types.lo user.lo username_providers.lo utf.lo utf8proc.lo utf_validate.lo utf_width.lo validate.lo version.lo win32_crashrpt.lo win32_crypto.lo win32_xlate.lo x509info.lo x509parse.lo xml.lo subversion/libsvn_subr/libsvn_subr-1.la: $(libsvn_subr_DEPS) - cd subversion/libsvn_subr && $(LINK_LIB) $(libsvn_subr_LDFLAGS) -o libsvn_subr-1.la $(LT_NO_UNDEFINED) $(libsvn_subr_OBJECTS) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(SVN_XML_LIBS) $(SVN_ZLIB_LIBS) $(SVN_APR_MEMCACHE_LIBS) $(SVN_SQLITE_LIBS) $(SVN_MAGIC_LIBS) $(SVN_INTL_LIBS) $(SVN_LZ4_LIBS) $(SVN_UTF8PROC_LIBS) $(LIBS) + cd subversion/libsvn_subr && $(LINK_LIB) $(libsvn_subr_LDFLAGS) -o libsvn_subr-1.la $(LT_NO_UNDEFINED) $(libsvn_subr_OBJECTS) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(SVN_XML_LIBS) $(SVN_ZLIB_LIBS) $(SVN_APR_MEMCACHE_LIBS) $(SVN_SQLITE_LIBS) $(SVN_MAGIC_LIBS) $(SVN_INTL_LIBS) $(SVN_LZ4_LIBS) $(SVN_UTF8PROC_LIBS) $(SVN_MACOS_PLIST_LIBS) $(SVN_MACOS_KEYCHAIN_LIBS) $(LIBS) libsvn_swig_perl_PATH = subversion/bindings/swig/perl/libsvn_swig_perl libsvn_swig_perl_DEPS = subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.lo subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la @@ -544,18 +523,18 @@ libsvn_wc_OBJECTS = adm_crawler.lo adm_files.lo adm_ops.lo ambient_depth_filter_ subversion/libsvn_wc/libsvn_wc-1.la: $(libsvn_wc_DEPS) cd subversion/libsvn_wc && $(LINK_LIB) $(libsvn_wc_LDFLAGS) -o libsvn_wc-1.la $(LT_NO_UNDEFINED) $(libsvn_wc_OBJECTS) ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_diff/libsvn_diff-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) -libsvncxxhl_PATH = subversion/bindings/cxxhl -libsvncxxhl_DEPS = subversion/bindings/cxxhl/src/aprwrap/impl.lo subversion/bindings/cxxhl/src/exception.lo subversion/bindings/cxxhl/src/tristate.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la subversion/libsvn_fs/libsvn_fs-1.la -libsvncxxhl_OBJECTS = src/aprwrap/impl.lo src/exception.lo src/tristate.lo -subversion/bindings/cxxhl/libsvncxxhl-1.la: $(libsvncxxhl_DEPS) - cd subversion/bindings/cxxhl && $(LINK_CXX_LIB) $(libsvncxxhl_LDFLAGS) -o libsvncxxhl-1.la $(LT_NO_UNDEFINED) $(libsvncxxhl_OBJECTS) ../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../subversion/libsvn_client/libsvn_client-1.la ../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../subversion/libsvn_diff/libsvn_diff-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la ../../../subversion/libsvn_fs/libsvn_fs-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) - libsvnjavahl_PATH = subversion/bindings/javahl/native -libsvnjavahl_DEPS = $(javahl_java_DEPS) $(javahl_callback_javah_DEPS) $(javahl_remote_javah_DEPS) $(javahl_types_javah_DEPS) $(javahl_util_javah_DEPS) $(javahl_javah_DEPS) subversion/bindings/javahl/native/Array.lo subversion/bindings/javahl/native/AuthnCallback.lo subversion/bindings/javahl/native/BlameCallback.lo subversion/bindings/javahl/native/ChangelistCallback.lo subversion/bindings/javahl/native/ClientContext.lo subversion/bindings/javahl/native/CommitCallback.lo subversion/bindings/javahl/native/CommitEditor.lo subversion/bindings/javahl/native/CommitMessage.lo subversion/bindings/javahl/native/CopySources.lo subversion/bindings/javahl/native/CreateJ.lo subversion/bindings/javahl/native/Credential.lo subversion/bindings/javahl/native/DiffOptions.lo subversion/bindings/javahl/native/DiffSummaryReceiver.lo subversion/bindings/javahl/native/EditorCallbacks.lo subversion/bindings/javahl/native/EditorProxy.lo subversion/bindings/javahl/native/EnumMapper.lo subversion/bindings/javahl/native/ExternalItem.lo subversion/bindings/javahl/native/File.lo subversion/bindings/javahl/native/ImportFilterCallback.lo subversion/bindings/javahl/native/InfoCallback.lo subversion/bindings/javahl/native/InputStream.lo subversion/bindings/javahl/native/Iterator.lo subversion/bindings/javahl/native/JNIByteArray.lo subversion/bindings/javahl/native/JNICriticalSection.lo subversion/bindings/javahl/native/JNIMutex.lo subversion/bindings/javahl/native/JNIStackElement.lo subversion/bindings/javahl/native/JNIStringHolder.lo subversion/bindings/javahl/native/JNIUtil.lo subversion/bindings/javahl/native/ListCallback.lo subversion/bindings/javahl/native/LockTokenTable.lo subversion/bindings/javahl/native/LogMessageCallback.lo subversion/bindings/javahl/native/MessageReceiver.lo subversion/bindings/javahl/native/NativeStream.lo subversion/bindings/javahl/native/OperationContext.lo subversion/bindings/javahl/native/OutputStream.lo subversion/bindings/javahl/native/PatchCallback.lo subversion/bindings/javahl/native/Path.lo subversion/bindings/javahl/native/Pool.lo subversion/bindings/javahl/native/Prompter.lo subversion/bindings/javahl/native/PropertyTable.lo subversion/bindings/javahl/native/ProplistCallback.lo subversion/bindings/javahl/native/RemoteSession.lo subversion/bindings/javahl/native/RemoteSessionContext.lo subversion/bindings/javahl/native/ReposFreezeAction.lo subversion/bindings/javahl/native/ReposNotifyCallback.lo subversion/bindings/javahl/native/ReposVerifyCallback.lo subversion/bindings/javahl/native/Revision.lo subversion/bindings/javahl/native/RevisionRange.lo subversion/bindings/javahl/native/RevisionRangeList.lo subversion/bindings/javahl/native/SVNBase.lo subversion/bindings/javahl/native/SVNClient.lo subversion/bindings/javahl/native/SVNRepos.lo subversion/bindings/javahl/native/StateReporter.lo subversion/bindings/javahl/native/StatusCallback.lo subversion/bindings/javahl/native/StringArray.lo subversion/bindings/javahl/native/SubversionException.lo subversion/bindings/javahl/native/Targets.lo subversion/bindings/javahl/native/Utility.lo subversion/bindings/javahl/native/VersionExtended.lo subversion/bindings/javahl/native/deprecated.lo subversion/bindings/javahl/native/jniwrapper/jni_base.lo subversion/bindings/javahl/native/jniwrapper/jni_channel.lo subversion/bindings/javahl/native/jniwrapper/jni_class_cache.lo subversion/bindings/javahl/native/jniwrapper/jni_io_stream.lo subversion/bindings/javahl/native/jniwrapper/jni_iterator.lo subversion/bindings/javahl/native/jniwrapper/jni_list.lo subversion/bindings/javahl/native/jniwrapper/jni_string_map.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RevisionRangeList.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RuntimeVersion.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la subversion/libsvn_fs/libsvn_fs-1.la +libsvnjavahl_DEPS = $(javahl_java_DEPS) $(javahl_callback_java_DEPS) $(javahl_remote_java_DEPS) $(javahl_types_java_DEPS) $(javahl_util_java_DEPS) $(javahl_java_DEPS) subversion/bindings/javahl/native/Array.lo subversion/bindings/javahl/native/AuthnCallback.lo subversion/bindings/javahl/native/BlameCallback.lo subversion/bindings/javahl/native/ChangelistCallback.lo subversion/bindings/javahl/native/ClientContext.lo subversion/bindings/javahl/native/CommitCallback.lo subversion/bindings/javahl/native/CommitEditor.lo subversion/bindings/javahl/native/CommitMessage.lo subversion/bindings/javahl/native/CopySources.lo subversion/bindings/javahl/native/CreateJ.lo subversion/bindings/javahl/native/Credential.lo subversion/bindings/javahl/native/DiffOptions.lo subversion/bindings/javahl/native/DiffSummaryReceiver.lo subversion/bindings/javahl/native/EditorCallbacks.lo subversion/bindings/javahl/native/EditorProxy.lo subversion/bindings/javahl/native/EnumMapper.lo subversion/bindings/javahl/native/ExternalItem.lo subversion/bindings/javahl/native/File.lo subversion/bindings/javahl/native/ImportFilterCallback.lo subversion/bindings/javahl/native/InfoCallback.lo subversion/bindings/javahl/native/InputStream.lo subversion/bindings/javahl/native/Iterator.lo subversion/bindings/javahl/native/JNIByteArray.lo subversion/bindings/javahl/native/JNICriticalSection.lo subversion/bindings/javahl/native/JNIMutex.lo subversion/bindings/javahl/native/JNIStackElement.lo subversion/bindings/javahl/native/JNIStringHolder.lo subversion/bindings/javahl/native/JNIUtil.lo subversion/bindings/javahl/native/ListCallback.lo subversion/bindings/javahl/native/LockTokenTable.lo subversion/bindings/javahl/native/LogMessageCallback.lo subversion/bindings/javahl/native/MessageReceiver.lo subversion/bindings/javahl/native/NativeStream.lo subversion/bindings/javahl/native/OperationContext.lo subversion/bindings/javahl/native/OutputStream.lo subversion/bindings/javahl/native/PatchCallback.lo subversion/bindings/javahl/native/Path.lo subversion/bindings/javahl/native/Pool.lo subversion/bindings/javahl/native/Prompter.lo subversion/bindings/javahl/native/PropertyTable.lo subversion/bindings/javahl/native/ProplistCallback.lo subversion/bindings/javahl/native/RemoteSession.lo subversion/bindings/javahl/native/RemoteSessionContext.lo subversion/bindings/javahl/native/ReposFreezeAction.lo subversion/bindings/javahl/native/ReposNotifyCallback.lo subversion/bindings/javahl/native/ReposVerifyCallback.lo subversion/bindings/javahl/native/Revision.lo subversion/bindings/javahl/native/RevisionRange.lo subversion/bindings/javahl/native/RevisionRangeList.lo subversion/bindings/javahl/native/SVNBase.lo subversion/bindings/javahl/native/SVNClient.lo subversion/bindings/javahl/native/SVNRepos.lo subversion/bindings/javahl/native/StateReporter.lo subversion/bindings/javahl/native/StatusCallback.lo subversion/bindings/javahl/native/StringArray.lo subversion/bindings/javahl/native/SubversionException.lo subversion/bindings/javahl/native/Targets.lo subversion/bindings/javahl/native/Utility.lo subversion/bindings/javahl/native/VersionExtended.lo subversion/bindings/javahl/native/deprecated.lo subversion/bindings/javahl/native/jniwrapper/jni_base.lo subversion/bindings/javahl/native/jniwrapper/jni_channel.lo subversion/bindings/javahl/native/jniwrapper/jni_class_cache.lo subversion/bindings/javahl/native/jniwrapper/jni_io_stream.lo subversion/bindings/javahl/native/jniwrapper/jni_iterator.lo subversion/bindings/javahl/native/jniwrapper/jni_list.lo subversion/bindings/javahl/native/jniwrapper/jni_string_map.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RevisionRangeList.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RuntimeVersion.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.lo subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la subversion/libsvn_fs/libsvn_fs-1.la libsvnjavahl_OBJECTS = Array.lo AuthnCallback.lo BlameCallback.lo ChangelistCallback.lo ClientContext.lo CommitCallback.lo CommitEditor.lo CommitMessage.lo CopySources.lo CreateJ.lo Credential.lo DiffOptions.lo DiffSummaryReceiver.lo EditorCallbacks.lo EditorProxy.lo EnumMapper.lo ExternalItem.lo File.lo ImportFilterCallback.lo InfoCallback.lo InputStream.lo Iterator.lo JNIByteArray.lo JNICriticalSection.lo JNIMutex.lo JNIStackElement.lo JNIStringHolder.lo JNIUtil.lo ListCallback.lo LockTokenTable.lo LogMessageCallback.lo MessageReceiver.lo NativeStream.lo OperationContext.lo OutputStream.lo PatchCallback.lo Path.lo Pool.lo Prompter.lo PropertyTable.lo ProplistCallback.lo RemoteSession.lo RemoteSessionContext.lo ReposFreezeAction.lo ReposNotifyCallback.lo ReposVerifyCallback.lo Revision.lo RevisionRange.lo RevisionRangeList.lo SVNBase.lo SVNClient.lo SVNRepos.lo StateReporter.lo StatusCallback.lo StringArray.lo SubversionException.lo Targets.lo Utility.lo VersionExtended.lo deprecated.lo jniwrapper/jni_base.lo jniwrapper/jni_channel.lo jniwrapper/jni_class_cache.lo jniwrapper/jni_io_stream.lo jniwrapper/jni_iterator.lo jniwrapper/jni_list.lo jniwrapper/jni_string_map.lo org_apache_subversion_javahl_NativeResources.lo org_apache_subversion_javahl_SVNClient.lo org_apache_subversion_javahl_SVNRepos.lo org_apache_subversion_javahl_remote_CommitEditor.lo org_apache_subversion_javahl_remote_RemoteFactory.lo org_apache_subversion_javahl_remote_RemoteSession.lo org_apache_subversion_javahl_remote_StateReporter.lo org_apache_subversion_javahl_types_RevisionRangeList.lo org_apache_subversion_javahl_types_RuntimeVersion.lo org_apache_subversion_javahl_types_Version.lo org_apache_subversion_javahl_types_VersionExtended.lo org_apache_subversion_javahl_util_ConfigImpl_Category.lo org_apache_subversion_javahl_util_ConfigLib.lo org_apache_subversion_javahl_util_DiffLib.lo org_apache_subversion_javahl_util_PropLib.lo org_apache_subversion_javahl_util_SubstLib.lo org_apache_subversion_javahl_util_TunnelChannel.lo subversion/bindings/javahl/native/libsvnjavahl-1.la: $(libsvnjavahl_DEPS) cd subversion/bindings/javahl/native && $(LINK_JAVAHL_CXX) $(libsvnjavahl_LDFLAGS) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../subversion/libsvn_diff/libsvn_diff-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la ../../../../subversion/libsvn_fs/libsvn_fs-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(SVN_JAVA_SDK_LIBS) $(LIBS) +libsvnxx_PATH = subversion/bindings/cxx +libsvnxx_DEPS = subversion/bindings/cxx/src/aprwrap/impl.lo subversion/bindings/cxx/src/client_context.lo subversion/bindings/cxx/src/client_status.lo subversion/bindings/cxx/src/debug.lo subversion/bindings/cxx/src/depth.lo subversion/bindings/cxx/src/exception.lo subversion/bindings/cxx/src/future.lo subversion/bindings/cxx/src/init.lo subversion/bindings/cxx/src/revision.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la subversion/libsvn_fs/libsvn_fs-1.la +libsvnxx_OBJECTS = src/aprwrap/impl.lo src/client_context.lo src/client_status.lo src/debug.lo src/depth.lo src/exception.lo src/future.lo src/init.lo src/revision.lo +subversion/bindings/cxx/libsvnxx-1.la: $(libsvnxx_DEPS) + if $(SVN_BUILD_SVNXX) ; then cd subversion/bindings/cxx && $(LINK_CXX_LIB) $(libsvnxx_LDFLAGS) -o libsvnxx-1.la $(LT_NO_UNDEFINED) $(libsvnxx_OBJECTS) ../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../subversion/libsvn_client/libsvn_client-1.la ../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../subversion/libsvn_diff/libsvn_diff-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la ../../../subversion/libsvn_fs/libsvn_fs-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) ; else echo "fake" > subversion/bindings/cxx/libsvnxx-1.la ; fi + locale_PATH = subversion/po locale_DEPS = subversion/po/de.mo subversion/po/es.mo subversion/po/fr.mo subversion/po/it.mo subversion/po/ja.mo subversion/po/ko.mo subversion/po/nb.mo subversion/po/pl.mo subversion/po/pt_BR.mo subversion/po/sv.mo subversion/po/zh_CN.mo subversion/po/zh_TW.mo locale: $(locale_DEPS) @@ -879,8 +858,8 @@ subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT): $(subst_translate_te cd subversion/tests/libsvn_subr && $(LINK) $(subst_translate_test_LDFLAGS) -o subst_translate-test$(EXEEXT) $(subst_translate_test_OBJECTS) ../../../subversion/tests/libsvn_test-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) svn_PATH = subversion/svn -svn_DEPS = subversion/svn/add-cmd.lo subversion/svn/auth-cmd.lo subversion/svn/blame-cmd.lo subversion/svn/cat-cmd.lo subversion/svn/changelist-cmd.lo subversion/svn/checkout-cmd.lo subversion/svn/cl-conflicts.lo subversion/svn/cleanup-cmd.lo subversion/svn/commit-cmd.lo subversion/svn/conflict-callbacks.lo subversion/svn/copy-cmd.lo subversion/svn/delete-cmd.lo subversion/svn/deprecated.lo subversion/svn/diff-cmd.lo subversion/svn/export-cmd.lo subversion/svn/file-merge.lo subversion/svn/help-cmd.lo subversion/svn/import-cmd.lo subversion/svn/info-cmd.lo subversion/svn/list-cmd.lo subversion/svn/lock-cmd.lo subversion/svn/log-cmd.lo subversion/svn/merge-cmd.lo subversion/svn/mergeinfo-cmd.lo subversion/svn/mkdir-cmd.lo subversion/svn/move-cmd.lo subversion/svn/notify.lo subversion/svn/patch-cmd.lo subversion/svn/propdel-cmd.lo subversion/svn/propedit-cmd.lo subversion/svn/propget-cmd.lo subversion/svn/proplist-cmd.lo subversion/svn/props.lo subversion/svn/propset-cmd.lo subversion/svn/relocate-cmd.lo subversion/svn/resolve-cmd.lo subversion/svn/resolved-cmd.lo subversion/svn/revert-cmd.lo subversion/svn/shelve-cmd.lo subversion/svn/similarity.lo subversion/svn/status-cmd.lo subversion/svn/status.lo subversion/svn/svn.lo subversion/svn/switch-cmd.lo subversion/svn/unlock-cmd.lo subversion/svn/update-cmd.lo subversion/svn/upgrade-cmd.lo subversion/svn/util.lo subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la -svn_OBJECTS = add-cmd.lo auth-cmd.lo blame-cmd.lo cat-cmd.lo changelist-cmd.lo checkout-cmd.lo cl-conflicts.lo cleanup-cmd.lo commit-cmd.lo conflict-callbacks.lo copy-cmd.lo delete-cmd.lo deprecated.lo diff-cmd.lo export-cmd.lo file-merge.lo help-cmd.lo import-cmd.lo info-cmd.lo list-cmd.lo lock-cmd.lo log-cmd.lo merge-cmd.lo mergeinfo-cmd.lo mkdir-cmd.lo move-cmd.lo notify.lo patch-cmd.lo propdel-cmd.lo propedit-cmd.lo propget-cmd.lo proplist-cmd.lo props.lo propset-cmd.lo relocate-cmd.lo resolve-cmd.lo resolved-cmd.lo revert-cmd.lo shelve-cmd.lo similarity.lo status-cmd.lo status.lo svn.lo switch-cmd.lo unlock-cmd.lo update-cmd.lo upgrade-cmd.lo util.lo +svn_DEPS = subversion/svn/add-cmd.lo subversion/svn/auth-cmd.lo subversion/svn/blame-cmd.lo subversion/svn/cat-cmd.lo subversion/svn/changelist-cmd.lo subversion/svn/checkout-cmd.lo subversion/svn/cl-conflicts.lo subversion/svn/cleanup-cmd.lo subversion/svn/commit-cmd.lo subversion/svn/conflict-callbacks.lo subversion/svn/copy-cmd.lo subversion/svn/delete-cmd.lo subversion/svn/deprecated.lo subversion/svn/diff-cmd.lo subversion/svn/export-cmd.lo subversion/svn/file-merge.lo subversion/svn/filesize.lo subversion/svn/help-cmd.lo subversion/svn/import-cmd.lo subversion/svn/info-cmd.lo subversion/svn/list-cmd.lo subversion/svn/lock-cmd.lo subversion/svn/log-cmd.lo subversion/svn/merge-cmd.lo subversion/svn/mergeinfo-cmd.lo subversion/svn/mkdir-cmd.lo subversion/svn/move-cmd.lo subversion/svn/notify.lo subversion/svn/patch-cmd.lo subversion/svn/propdel-cmd.lo subversion/svn/propedit-cmd.lo subversion/svn/propget-cmd.lo subversion/svn/proplist-cmd.lo subversion/svn/props.lo subversion/svn/propset-cmd.lo subversion/svn/relocate-cmd.lo subversion/svn/resolve-cmd.lo subversion/svn/resolved-cmd.lo subversion/svn/revert-cmd.lo subversion/svn/shelf-cmd.lo subversion/svn/similarity.lo subversion/svn/status-cmd.lo subversion/svn/status.lo subversion/svn/svn.lo subversion/svn/switch-cmd.lo subversion/svn/unlock-cmd.lo subversion/svn/update-cmd.lo subversion/svn/upgrade-cmd.lo subversion/svn/util.lo subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la +svn_OBJECTS = add-cmd.lo auth-cmd.lo blame-cmd.lo cat-cmd.lo changelist-cmd.lo checkout-cmd.lo cl-conflicts.lo cleanup-cmd.lo commit-cmd.lo conflict-callbacks.lo copy-cmd.lo delete-cmd.lo deprecated.lo diff-cmd.lo export-cmd.lo file-merge.lo filesize.lo help-cmd.lo import-cmd.lo info-cmd.lo list-cmd.lo lock-cmd.lo log-cmd.lo merge-cmd.lo mergeinfo-cmd.lo mkdir-cmd.lo move-cmd.lo notify.lo patch-cmd.lo propdel-cmd.lo propedit-cmd.lo propget-cmd.lo proplist-cmd.lo props.lo propset-cmd.lo relocate-cmd.lo resolve-cmd.lo resolved-cmd.lo revert-cmd.lo shelf-cmd.lo similarity.lo status-cmd.lo status.lo svn.lo switch-cmd.lo unlock-cmd.lo update-cmd.lo upgrade-cmd.lo util.lo subversion/svn/svn$(EXEEXT): $(svn_DEPS) cd subversion/svn && $(LINK) $(svn_LDFLAGS) -o svn$(EXEEXT) $(svn_OBJECTS) ../../subversion/libsvn_client/libsvn_client-1.la ../../subversion/libsvn_wc/libsvn_wc-1.la ../../subversion/libsvn_ra/libsvn_ra-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_diff/libsvn_diff-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) @@ -951,10 +930,10 @@ subversion/svndumpfilter/svndumpfilter$(EXEEXT): $(svndumpfilter_DEPS) cd subversion/svndumpfilter && $(LINK) $(svndumpfilter_LDFLAGS) -o svndumpfilter$(EXEEXT) $(svndumpfilter_OBJECTS) ../../subversion/libsvn_repos/libsvn_repos-1.la ../../subversion/libsvn_fs/libsvn_fs-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) svnfsfs_PATH = subversion/svnfsfs -svnfsfs_DEPS = subversion/svnfsfs/dump-index-cmd.lo subversion/svnfsfs/load-index-cmd.lo subversion/svnfsfs/stats-cmd.lo subversion/svnfsfs/svnfsfs.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_fs_fs/libsvn_fs_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la +svnfsfs_DEPS = subversion/svnfsfs/dump-index-cmd.lo subversion/svnfsfs/load-index-cmd.lo subversion/svnfsfs/stats-cmd.lo subversion/svnfsfs/svnfsfs.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la svnfsfs_OBJECTS = dump-index-cmd.lo load-index-cmd.lo stats-cmd.lo svnfsfs.lo subversion/svnfsfs/svnfsfs$(EXEEXT): $(svnfsfs_DEPS) - cd subversion/svnfsfs && $(LINK) $(svnfsfs_LDFLAGS) -o svnfsfs$(EXEEXT) $(svnfsfs_OBJECTS) ../../subversion/libsvn_repos/libsvn_repos-1.la ../../subversion/libsvn_fs/libsvn_fs-1.la ../../subversion/libsvn_fs_fs/libsvn_fs_fs-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) + cd subversion/svnfsfs && $(LINK) $(svnfsfs_LDFLAGS) -o svnfsfs$(EXEEXT) $(svnfsfs_OBJECTS) ../../subversion/libsvn_repos/libsvn_repos-1.la ../../subversion/libsvn_fs/libsvn_fs-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) svnlook_PATH = subversion/svnlook svnlook_DEPS = subversion/svnlook/svnlook.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la @@ -1004,6 +983,12 @@ svnversion_OBJECTS = svnversion.lo subversion/svnversion/svnversion$(EXEEXT): $(svnversion_DEPS) cd subversion/svnversion && $(LINK) $(svnversion_LDFLAGS) -o svnversion$(EXEEXT) $(svnversion_OBJECTS) ../../subversion/libsvn_wc/libsvn_wc-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) +svnxx_tests_PATH = subversion/bindings/cxx +svnxx_tests_DEPS = subversion/bindings/cxx/tests/svnxx-tests.lo subversion/bindings/cxx/tests/test_aprwrap_arrays.lo subversion/bindings/cxx/tests/test_aprwrap_hashes.lo subversion/bindings/cxx/tests/test_aprwrap_pools.lo subversion/bindings/cxx/tests/test_client_status.lo subversion/bindings/cxx/tests/test_depth.lo subversion/bindings/cxx/tests/test_exceptions.lo subversion/bindings/cxx/tests/test_init.lo subversion/bindings/cxx/tests/test_revision.lo subversion/bindings/cxx/tests/test_strings.lo subversion/bindings/cxx/tests/test_tristate.lo subversion/bindings/cxx/libsvnxx-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la subversion/libsvn_fs/libsvn_fs-1.la +svnxx_tests_OBJECTS = tests/svnxx-tests.lo tests/test_aprwrap_arrays.lo tests/test_aprwrap_hashes.lo tests/test_aprwrap_pools.lo tests/test_client_status.lo tests/test_depth.lo tests/test_exceptions.lo tests/test_init.lo tests/test_revision.lo tests/test_strings.lo tests/test_tristate.lo +subversion/bindings/cxx/svnxx-tests$(EXEEXT): $(svnxx_tests_DEPS) + if $(SVN_BUILD_SVNXX_TESTS) ; then cd subversion/bindings/cxx && $(LINK_SVNXX_TEST) $(svnxx_tests_LDFLAGS) -o svnxx-tests$(EXEEXT) $(svnxx_tests_OBJECTS) ../../../subversion/bindings/cxx/libsvnxx-1.la ../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../subversion/libsvn_client/libsvn_client-1.la ../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../subversion/libsvn_diff/libsvn_diff-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la ../../../subversion/libsvn_fs/libsvn_fs-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) ; else echo "fake" > subversion/bindings/cxx/svnxx-tests$(EXEEXT) ; fi + time_test_PATH = subversion/tests/libsvn_subr time_test_DEPS = subversion/tests/libsvn_subr/time-test.lo subversion/tests/libsvn_test-1.la subversion/libsvn_subr/libsvn_subr-1.la time_test_OBJECTS = time-test.lo @@ -1089,15 +1074,11 @@ bdb-test: subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests bin: subversion/svn/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) subversion/svnbench/svnbench$(EXEEXT) subversion/svndumpfilter/svndumpfilter$(EXEEXT) subversion/svnfsfs/svnfsfs$(EXEEXT) subversion/svnlook/svnlook$(EXEEXT) subversion/svnmucc/svnmucc$(EXEEXT) subversion/svnrdump/svnrdump$(EXEEXT) subversion/svnserve/svnserve$(EXEEXT) subversion/svnsync/svnsync$(EXEEXT) subversion/svnversion/svnversion$(EXEEXT) -cxxhl-lib: subversion/bindings/cxxhl/libsvncxxhl-1.la - -cxxhl-tests: subversion/bindings/cxxhl/cxxhl-tests$(EXEEXT) googlemock/libgooglemock-1.la - fsmod-lib: subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_fs_fs/libsvn_fs_fs-1.la subversion/libsvn_fs_util/libsvn_fs_util-1.la subversion/libsvn_fs_x/libsvn_fs_x-1.la subversion/libsvn_subr/libsvn_subr-1.la gnome-keyring-lib: subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring-1.la -javahl-callback-javah: +javahl-callback-java: javahl-compat-java: @@ -1105,17 +1086,15 @@ javahl-compat-tests: javahl-java: -javahl-javah: - javahl-lib: subversion/bindings/javahl/native/libsvnjavahl-1.la -javahl-remote-javah: +javahl-remote-java: javahl-tests: -javahl-types-javah: +javahl-types-java: -javahl-util-javah: +javahl-util-java: kwallet-lib: subversion/libsvn_auth_kwallet/libsvn_auth_kwallet-1.la @@ -1129,6 +1108,10 @@ serf-lib: subversion/libsvn_ra_serf/libsvn_ra_serf-1.la sub-test: subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test$(EXEEXT) +svnxx-lib: subversion/bindings/cxx/libsvnxx-1.la + +svnxx-tests: subversion/bindings/cxx/svnxx-tests$(EXEEXT) + swig-pl-lib: subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la swig-py: subversion/bindings/swig/python/_client.la subversion/bindings/swig/python/_core.la subversion/bindings/swig/python/_delta.la subversion/bindings/swig/python/_diff.la subversion/bindings/swig/python/_fs.la subversion/bindings/swig/python/_ra.la subversion/bindings/swig/python/_repos.la subversion/bindings/swig/python/_wc.la @@ -1139,7 +1122,7 @@ swig-rb: subversion/bindings/swig/ruby/client.la subversion/bindings/swig/ruby/c swig-rb-lib: subversion/bindings/swig/ruby/libsvn_swig_ruby/libsvn_swig_ruby-1.la -test: subversion/tests/afl/afl-x509$(EXEEXT) subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_repos/authz-test$(EXEEXT) subversion/tests/libsvn_subr/bit-array-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/compress-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_client/conflicts-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_repos/dump-load-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT) subversion/tests/libsvn_fs/fs-sequential-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs_x/fs-x-pack-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/cmdline/lock-helper$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_client/mtcc-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/packed-data-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/prefix-string-test$(EXEEXT) subversion/tests/libsvn_subr/priority-queue-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/root-pools-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/sqlite-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_fs_x/string-table-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) tools/dev/wc-ng/svn-wc-db-tester$(EXEEXT) subversion/tests/libsvn_delta/svndiff-stream-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_subr/x509-test$(EXEEXT) subversion/tests/libsvn_subr/xml-test$(EXEEXT) +test: subversion/tests/afl/afl-svndiff$(EXEEXT) subversion/tests/afl/afl-x509$(EXEEXT) subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_repos/authz-test$(EXEEXT) subversion/tests/libsvn_subr/bit-array-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/compress-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_client/conflicts-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_repos/dump-load-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-fs-private-test$(EXEEXT) subversion/tests/libsvn_fs/fs-sequential-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs_x/fs-x-pack-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/cmdline/lock-helper$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_client/mtcc-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/packed-data-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/prefix-string-test$(EXEEXT) subversion/tests/libsvn_subr/priority-queue-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/root-pools-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/sqlite-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_fs_x/string-table-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) tools/dev/wc-ng/svn-wc-db-tester$(EXEEXT) subversion/tests/libsvn_delta/svndiff-stream-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_subr/x509-test$(EXEEXT) subversion/tests/libsvn_subr/xml-test$(EXEEXT) tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnconflict/svnconflict$(EXEEXT) tools/dev/svnmover/svnmover$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/dev/x509-parser$(EXEEXT) @@ -1182,20 +1165,6 @@ install-bin: subversion/svn/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) s cd subversion/svnversion ; $(INSTALL_BIN) svnversion$(EXEEXT) $(DESTDIR)$(bindir)/svnversion$(EXEEXT) -install-cxxhl-lib: subversion/bindings/cxxhl/libsvncxxhl-1.la - $(MKDIR) $(DESTDIR)$(cxxhl_libdir) - cd subversion/bindings/cxxhl ; $(INSTALL_CXXHL_LIB) libsvncxxhl-1.la $(DESTDIR)$(cxxhl_libdir)/libsvncxxhl-1.la - - $(INSTALL_EXTRA_CXXHL_LIB) - -install-cxxhl-tests: googlemock/libgooglemock-1.la subversion/bindings/cxxhl/cxxhl-tests$(EXEEXT) - $(MKDIR) $(DESTDIR)$(cxxhl_testsdir) - if $(SVN_USE_GOOGLEMOCK) ; then cd googlemock ; $(INSTALL_CXXHL_TESTS) libgooglemock-1.la $(DESTDIR)$(cxxhl_testsdir)/libgooglemock-1.la ; fi - - if $(SVN_USE_GOOGLEMOCK) ; then cd subversion/bindings/cxxhl ; $(INSTALL_CXXHL_TESTS) cxxhl-tests$(EXEEXT) $(DESTDIR)$(cxxhl_testsdir)/cxxhl-tests$(EXEEXT) ; fi - - $(INSTALL_EXTRA_CXXHL_TESTS) - install-fsmod-lib: subversion/libsvn_subr/libsvn_subr-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_fs_util/libsvn_fs_util-1.la subversion/libsvn_fs_fs/libsvn_fs_fs-1.la subversion/libsvn_fs_x/libsvn_fs_x-1.la $(MKDIR) $(DESTDIR)$(fsmod_libdir) $(DESTDIR)$(pkgconfig_dir) cd subversion/libsvn_subr ; $(INSTALL_FSMOD_LIB) libsvn_subr-1.la $(DESTDIR)$(fsmod_libdir)/libsvn_subr-1.la @@ -1214,9 +1183,9 @@ install-gnome-keyring-lib: subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnom cd subversion/libsvn_auth_gnome_keyring ; $(INSTALL_GNOME_KEYRING_LIB) libsvn_auth_gnome_keyring-1.la $(DESTDIR)$(gnome_keyring_libdir)/libsvn_auth_gnome_keyring-1.la $(INSTALL_DATA) subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring.pc $(DESTDIR)$(pkgconfig_dir)/libsvn_auth_gnome_keyring.pc -install-javahl-callback-javah: - $(MKDIR) $(DESTDIR)$(javahl_callback_javahdir) - $(INSTALL_EXTRA_JAVAHL_CALLBACK_JAVAH) +install-javahl-callback-java: + $(MKDIR) $(DESTDIR)$(javahl_callback_javadir) + $(INSTALL_EXTRA_JAVAHL_CALLBACK_JAVA) install-javahl-compat-java: $(MKDIR) $(DESTDIR)$(javahl_compat_javadir) @@ -1230,31 +1199,27 @@ install-javahl-java: $(MKDIR) $(DESTDIR)$(javahl_javadir) $(INSTALL_EXTRA_JAVAHL_JAVA) -install-javahl-javah: - $(MKDIR) $(DESTDIR)$(javahl_javahdir) - $(INSTALL_EXTRA_JAVAHL_JAVAH) - install-javahl-lib: subversion/bindings/javahl/native/libsvnjavahl-1.la $(MKDIR) $(DESTDIR)$(javahl_libdir) cd subversion/bindings/javahl/native ; $(INSTALL_JAVAHL_LIB) libsvnjavahl-1.la $(DESTDIR)$(javahl_libdir)/libsvnjavahl-1.la $(INSTALL_EXTRA_JAVAHL_LIB) -install-javahl-remote-javah: - $(MKDIR) $(DESTDIR)$(javahl_remote_javahdir) - $(INSTALL_EXTRA_JAVAHL_REMOTE_JAVAH) +install-javahl-remote-java: + $(MKDIR) $(DESTDIR)$(javahl_remote_javadir) + $(INSTALL_EXTRA_JAVAHL_REMOTE_JAVA) install-javahl-tests: $(MKDIR) $(DESTDIR)$(javahl_testsdir) $(INSTALL_EXTRA_JAVAHL_TESTS) -install-javahl-types-javah: - $(MKDIR) $(DESTDIR)$(javahl_types_javahdir) - $(INSTALL_EXTRA_JAVAHL_TYPES_JAVAH) +install-javahl-types-java: + $(MKDIR) $(DESTDIR)$(javahl_types_javadir) + $(INSTALL_EXTRA_JAVAHL_TYPES_JAVA) -install-javahl-util-javah: - $(MKDIR) $(DESTDIR)$(javahl_util_javahdir) - $(INSTALL_EXTRA_JAVAHL_UTIL_JAVAH) +install-javahl-util-java: + $(MKDIR) $(DESTDIR)$(javahl_util_javadir) + $(INSTALL_EXTRA_JAVAHL_UTIL_JAVA) install-kwallet-lib: subversion/libsvn_auth_kwallet/libsvn_auth_kwallet-1.la $(MKDIR) $(DESTDIR)$(kwallet_libdir) $(DESTDIR)$(pkgconfig_dir) @@ -1320,6 +1285,18 @@ install-sub-test: subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test$(EXEEXT) cd subversion/tests/libsvn_fs_fs ; $(INSTALL_SUB_TEST) fs-fs-fuzzy-test$(EXEEXT) $(DESTDIR)$(sub_testdir)/fs-fs-fuzzy-test$(EXEEXT) +install-svnxx-lib: subversion/bindings/cxx/libsvnxx-1.la + $(MKDIR) $(DESTDIR)$(svnxx_libdir) + if $(SVN_BUILD_SVNXX) ; then cd subversion/bindings/cxx ; $(INSTALL_SVNXX_LIB) libsvnxx-1.la $(DESTDIR)$(svnxx_libdir)/libsvnxx-1.la ; fi + + $(INSTALL_EXTRA_SVNXX_LIB) + +install-svnxx-tests: subversion/bindings/cxx/svnxx-tests$(EXEEXT) + $(MKDIR) $(DESTDIR)$(svnxx_testsdir) + if $(SVN_BUILD_SVNXX_TESTS) ; then cd subversion/bindings/cxx ; $(INSTALL_SVNXX_TESTS) svnxx-tests$(EXEEXT) $(DESTDIR)$(svnxx_testsdir)/svnxx-tests$(EXEEXT) ; fi + + $(INSTALL_EXTRA_SVNXX_TESTS) + install-swig-pl-lib: subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la $(MKDIR) $(DESTDIR)$(swig_pl_libdir) cd subversion/bindings/swig/perl/libsvn_swig_perl ; $(INSTALL_SWIG_PL_LIB) libsvn_swig_perl-1.la $(DESTDIR)$(swig_pl_libdir)/libsvn_swig_perl-1.la @@ -1409,7 +1386,7 @@ install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/dif # Section 8: The install-include rule ######################################## -install-include: subversion/include/mod_authz_svn.h subversion/include/mod_dav_svn.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_md5.h subversion/include/svn_mergeinfo.h subversion/include/svn_nls.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_quoprint.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/include/svn_x509.h subversion/include/svn_xml.h +install-include: subversion/include/mod_authz_svn.h subversion/include/mod_dav_svn.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_md5.h subversion/include/svn_mergeinfo.h subversion/include/svn_nls.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_quoprint.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/include/svn_x509.h subversion/include/svn_xml.h $(MKDIR) $(DESTDIR)$(includedir)/subversion-1 $(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/mod_authz_svn.h $(DESTDIR)$(includedir)/subversion-1/mod_authz_svn.h $(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/mod_dav_svn.h $(DESTDIR)$(includedir)/subversion-1/mod_dav_svn.h @@ -1437,6 +1414,7 @@ install-include: subversion/include/mod_authz_svn.h subversion/include/mod_dav_s $(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_mergeinfo.h $(DESTDIR)$(includedir)/subversion-1/svn_mergeinfo.h $(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_nls.h $(DESTDIR)$(includedir)/subversion-1/svn_nls.h $(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_opt.h $(DESTDIR)$(includedir)/subversion-1/svn_opt.h + $(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_opt_impl.h $(DESTDIR)$(includedir)/subversion-1/svn_opt_impl.h $(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_path.h $(DESTDIR)$(includedir)/subversion-1/svn_path.h $(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_pools.h $(DESTDIR)$(includedir)/subversion-1/svn_pools.h $(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_props.h $(DESTDIR)$(includedir)/subversion-1/svn_props.h @@ -1449,6 +1427,7 @@ install-include: subversion/include/mod_authz_svn.h subversion/include/mod_dav_s $(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_subst.h $(DESTDIR)$(includedir)/subversion-1/svn_subst.h $(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_time.h $(DESTDIR)$(includedir)/subversion-1/svn_time.h $(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_types.h $(DESTDIR)$(includedir)/subversion-1/svn_types.h + $(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_types_impl.h $(DESTDIR)$(includedir)/subversion-1/svn_types_impl.h $(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_user.h $(DESTDIR)$(includedir)/subversion-1/svn_user.h $(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_utf.h $(DESTDIR)$(includedir)/subversion-1/svn_utf.h $(INSTALL_INCLUDE) $(abs_srcdir)/subversion/include/svn_version.h $(DESTDIR)$(includedir)/subversion-1/svn_version.h @@ -1460,6 +1439,7 @@ install-include: subversion/include/mod_authz_svn.h subversion/include/mod_dav_s # Section 9: Shortcut targets for manual builds of specific items ######################################## +afl-svndiff: subversion/tests/afl/afl-svndiff$(EXEEXT) afl-x509: subversion/tests/afl/afl-x509$(EXEEXT) atomic-ra-revprop-change: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) auth-test: subversion/tests/libsvn_subr/auth-test$(EXEEXT) @@ -1475,7 +1455,6 @@ config-test: subversion/tests/libsvn_subr/config-test$(EXEEXT) conflict-data-test: subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) conflicts-test: subversion/tests/libsvn_client/conflicts-test$(EXEEXT) crypto-test: subversion/tests/libsvn_subr/crypto-test$(EXEEXT) -cxxhl-tests: subversion/bindings/cxxhl/cxxhl-tests$(EXEEXT) db-test: subversion/tests/libsvn_wc/db-test$(EXEEXT) diff: tools/diff/diff$(EXEEXT) diff-diff3-test: subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) @@ -1497,7 +1476,6 @@ fs-x-pack-test: subversion/tests/libsvn_fs_x/fs-x-pack-test$(EXEEXT) fsfs-access-map: tools/dev/fsfs-access-map$(EXEEXT) hashdump-test: subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) io-test: subversion/tests/libsvn_subr/io-test$(EXEEXT) -libgooglemock: googlemock/libgooglemock-1.la libsvn_auth_gnome_keyring: subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring-1.la libsvn_auth_kwallet: subversion/libsvn_auth_kwallet/libsvn_auth_kwallet-1.la libsvn_client: subversion/libsvn_client/libsvn_client-1.la @@ -1519,8 +1497,8 @@ libsvn_swig_py: subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1. libsvn_swig_ruby: subversion/bindings/swig/ruby/libsvn_swig_ruby/libsvn_swig_ruby-1.la libsvn_test: subversion/tests/libsvn_test-1.la libsvn_wc: subversion/libsvn_wc/libsvn_wc-1.la -libsvncxxhl: subversion/bindings/cxxhl/libsvncxxhl-1.la libsvnjavahl: subversion/bindings/javahl/native/libsvnjavahl-1.la +libsvnxx: subversion/bindings/cxx/libsvnxx-1.la lock-helper: subversion/tests/cmdline/lock-helper$(EXEEXT) locks-test: subversion/tests/libsvn_fs/locks-test$(EXEEXT) mergeinfo-test: subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) @@ -1595,6 +1573,7 @@ svnrdump: subversion/svnrdump/svnrdump$(EXEEXT) svnserve: subversion/svnserve/svnserve$(EXEEXT) svnsync: subversion/svnsync/svnsync$(EXEEXT) svnversion: subversion/svnversion/svnversion$(EXEEXT) +svnxx-tests: subversion/bindings/cxx/svnxx-tests$(EXEEXT) time-test: subversion/tests/libsvn_subr/time-test$(EXEEXT) translate-test: subversion/tests/libsvn_subr/translate-test$(EXEEXT) utf-test: subversion/tests/libsvn_subr/utf-test$(EXEEXT) @@ -1612,23 +1591,65 @@ xml-test: subversion/tests/libsvn_subr/xml-test$(EXEEXT) # Section 10: Rules to build all other kinds of object-like files ######################################## -subversion/bindings/cxxhl/src/aprwrap/impl.lo: subversion/bindings/cxxhl/src/aprwrap/impl.cpp subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp subversion/bindings/cxxhl/include/svncxxhl/exception.hpp subversion/bindings/cxxhl/src/aprwrap/hash.hpp subversion/bindings/cxxhl/src/aprwrap/pool.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/svn_private_config.h - $(COMPILE_CXXHL_CXX) $(canonicalized_srcdir)subversion/bindings/cxxhl/src/aprwrap/impl.cpp +subversion/bindings/cxx/src/aprwrap/impl.lo: subversion/bindings/cxx/src/aprwrap/impl.cpp subversion/bindings/cxx/include/svnxx/detail/noncopyable.hpp subversion/bindings/cxx/include/svnxx/exception.hpp subversion/bindings/cxx/include/svnxx/init.hpp subversion/bindings/cxx/src/aprwrap/hash.hpp subversion/bindings/cxx/src/aprwrap/pool.hpp subversion/bindings/cxx/src/private/init_private.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h + if $(SVN_BUILD_SVNXX) ; then $(COMPILE_SVNXX) $(canonicalized_srcdir)subversion/bindings/cxx/src/aprwrap/impl.cpp ; else echo "fake" > subversion/bindings/cxx/src/aprwrap/impl.lo ; fi + +subversion/bindings/cxx/src/client_context.lo: subversion/bindings/cxx/src/client_context.cpp subversion/bindings/cxx/include/svnxx/client/context.hpp subversion/bindings/cxx/include/svnxx/depth.hpp subversion/bindings/cxx/include/svnxx/detail/future.hpp subversion/bindings/cxx/include/svnxx/detail/noncopyable.hpp subversion/bindings/cxx/include/svnxx/exception.hpp subversion/bindings/cxx/include/svnxx/init.hpp subversion/bindings/cxx/include/svnxx/revision.hpp subversion/bindings/cxx/include/svnxx/tristate.hpp subversion/bindings/cxx/src/aprwrap.hpp subversion/bindings/cxx/src/aprwrap/array.hpp subversion/bindings/cxx/src/aprwrap/hash.hpp subversion/bindings/cxx/src/aprwrap/pool.hpp subversion/bindings/cxx/src/private.hpp subversion/bindings/cxx/src/private/client_context_private.hpp subversion/bindings/cxx/src/private/depth_private.hpp subversion/bindings/cxx/src/private/exception_private.hpp subversion/bindings/cxx/src/private/future_private.hpp subversion/bindings/cxx/src/private/init_private.hpp subversion/bindings/cxx/src/private/revision_private.hpp subversion/bindings/cxx/src/private/strings_private.hpp subversion/bindings/cxx/src/private/tristate_private.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h + if $(SVN_BUILD_SVNXX) ; then $(COMPILE_SVNXX) $(canonicalized_srcdir)subversion/bindings/cxx/src/client_context.cpp ; else echo "fake" > subversion/bindings/cxx/src/client_context.lo ; fi + +subversion/bindings/cxx/src/client_status.lo: subversion/bindings/cxx/src/client_status.cpp subversion/bindings/cxx/include/svnxx/client/context.hpp subversion/bindings/cxx/include/svnxx/client/status.hpp subversion/bindings/cxx/include/svnxx/depth.hpp subversion/bindings/cxx/include/svnxx/detail/future.hpp subversion/bindings/cxx/include/svnxx/detail/noncopyable.hpp subversion/bindings/cxx/include/svnxx/exception.hpp subversion/bindings/cxx/include/svnxx/init.hpp subversion/bindings/cxx/include/svnxx/revision.hpp subversion/bindings/cxx/include/svnxx/tristate.hpp subversion/bindings/cxx/src/aprwrap.hpp subversion/bindings/cxx/src/aprwrap/array.hpp subversion/bindings/cxx/src/aprwrap/hash.hpp subversion/bindings/cxx/src/aprwrap/pool.hpp subversion/bindings/cxx/src/private.hpp subversion/bindings/cxx/src/private/client_context_private.hpp subversion/bindings/cxx/src/private/depth_private.hpp subversion/bindings/cxx/src/private/exception_private.hpp subversion/bindings/cxx/src/private/future_private.hpp subversion/bindings/cxx/src/private/init_private.hpp subversion/bindings/cxx/src/private/revision_private.hpp subversion/bindings/cxx/src/private/strings_private.hpp subversion/bindings/cxx/src/private/tristate_private.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h + if $(SVN_BUILD_SVNXX) ; then $(COMPILE_SVNXX) $(canonicalized_srcdir)subversion/bindings/cxx/src/client_status.cpp ; else echo "fake" > subversion/bindings/cxx/src/client_status.lo ; fi + +subversion/bindings/cxx/src/debug.lo: subversion/bindings/cxx/src/debug.cpp subversion/bindings/cxx/src/private/debug_private.hpp subversion/include/private/svn_debug.h + if $(SVN_BUILD_SVNXX) ; then $(COMPILE_SVNXX) $(canonicalized_srcdir)subversion/bindings/cxx/src/debug.cpp ; else echo "fake" > subversion/bindings/cxx/src/debug.lo ; fi + +subversion/bindings/cxx/src/depth.lo: subversion/bindings/cxx/src/depth.cpp subversion/bindings/cxx/include/svnxx/depth.hpp subversion/bindings/cxx/src/private/depth_private.hpp subversion/bindings/cxx/src/private/strings_private.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/include/svn_types_impl.h + if $(SVN_BUILD_SVNXX) ; then $(COMPILE_SVNXX) $(canonicalized_srcdir)subversion/bindings/cxx/src/depth.cpp ; else echo "fake" > subversion/bindings/cxx/src/depth.lo ; fi + +subversion/bindings/cxx/src/exception.lo: subversion/bindings/cxx/src/exception.cpp subversion/bindings/cxx/include/svnxx/client/context.hpp subversion/bindings/cxx/include/svnxx/depth.hpp subversion/bindings/cxx/include/svnxx/detail/future.hpp subversion/bindings/cxx/include/svnxx/detail/noncopyable.hpp subversion/bindings/cxx/include/svnxx/exception.hpp subversion/bindings/cxx/include/svnxx/init.hpp subversion/bindings/cxx/include/svnxx/revision.hpp subversion/bindings/cxx/include/svnxx/tristate.hpp subversion/bindings/cxx/src/aprwrap.hpp subversion/bindings/cxx/src/aprwrap/array.hpp subversion/bindings/cxx/src/aprwrap/hash.hpp subversion/bindings/cxx/src/aprwrap/pool.hpp subversion/bindings/cxx/src/private.hpp subversion/bindings/cxx/src/private/client_context_private.hpp subversion/bindings/cxx/src/private/depth_private.hpp subversion/bindings/cxx/src/private/exception_private.hpp subversion/bindings/cxx/src/private/future_private.hpp subversion/bindings/cxx/src/private/init_private.hpp subversion/bindings/cxx/src/private/revision_private.hpp subversion/bindings/cxx/src/private/strings_private.hpp subversion/bindings/cxx/src/private/tristate_private.hpp subversion/include/private/svn_debug.h subversion/include/private/svn_error_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h + if $(SVN_BUILD_SVNXX) ; then $(COMPILE_SVNXX) $(canonicalized_srcdir)subversion/bindings/cxx/src/exception.cpp ; else echo "fake" > subversion/bindings/cxx/src/exception.lo ; fi -subversion/bindings/cxxhl/src/exception.lo: subversion/bindings/cxxhl/src/exception.cpp subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp subversion/bindings/cxxhl/include/svncxxhl/exception.hpp subversion/bindings/cxxhl/src/aprwrap.hpp subversion/bindings/cxxhl/src/aprwrap/array.hpp subversion/bindings/cxxhl/src/aprwrap/hash.hpp subversion/bindings/cxxhl/src/aprwrap/pool.hpp subversion/bindings/cxxhl/src/private.hpp subversion/bindings/cxxhl/src/private/exception-private.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_error_private.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h - $(COMPILE_CXXHL_CXX) $(canonicalized_srcdir)subversion/bindings/cxxhl/src/exception.cpp +subversion/bindings/cxx/src/future.lo: subversion/bindings/cxx/src/future.cpp subversion/bindings/cxx/include/svnxx/detail/future.hpp subversion/bindings/cxx/include/svnxx/detail/noncopyable.hpp subversion/bindings/cxx/include/svnxx/exception.hpp subversion/bindings/cxx/include/svnxx/init.hpp subversion/bindings/cxx/src/aprwrap.hpp subversion/bindings/cxx/src/aprwrap/array.hpp subversion/bindings/cxx/src/aprwrap/hash.hpp subversion/bindings/cxx/src/aprwrap/pool.hpp subversion/bindings/cxx/src/private/future_private.hpp subversion/bindings/cxx/src/private/init_private.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h + if $(SVN_BUILD_SVNXX) ; then $(COMPILE_SVNXX) $(canonicalized_srcdir)subversion/bindings/cxx/src/future.cpp ; else echo "fake" > subversion/bindings/cxx/src/future.lo ; fi -subversion/bindings/cxxhl/src/tristate.lo: subversion/bindings/cxxhl/src/tristate.cpp subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h - $(COMPILE_CXXHL_CXX) $(canonicalized_srcdir)subversion/bindings/cxxhl/src/tristate.cpp +subversion/bindings/cxx/src/init.lo: subversion/bindings/cxx/src/init.cpp subversion/bindings/cxx/include/svnxx/detail/noncopyable.hpp subversion/bindings/cxx/include/svnxx/exception.hpp subversion/bindings/cxx/include/svnxx/init.hpp subversion/bindings/cxx/src/private/debug_private.hpp subversion/bindings/cxx/src/private/init_private.hpp subversion/include/private/svn_debug.h subversion/include/svn_types_impl.h + if $(SVN_BUILD_SVNXX) ; then $(COMPILE_SVNXX) $(canonicalized_srcdir)subversion/bindings/cxx/src/init.cpp ; else echo "fake" > subversion/bindings/cxx/src/init.lo ; fi -subversion/bindings/cxxhl/tests/cxxhl-tests.lo: subversion/bindings/cxxhl/tests/cxxhl-tests.cpp - if $(SVN_USE_GOOGLEMOCK) ; then $(COMPILE_CXXHL_GOOGLEMOCK_CXX) $(canonicalized_srcdir)subversion/bindings/cxxhl/tests/cxxhl-tests.cpp ; else echo "fake" > subversion/bindings/cxxhl/tests/cxxhl-tests.lo ; fi +subversion/bindings/cxx/src/revision.lo: subversion/bindings/cxx/src/revision.cpp subversion/bindings/cxx/include/svnxx/revision.hpp subversion/bindings/cxx/include/svnxx/tristate.hpp subversion/bindings/cxx/src/private/revision_private.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_types.h subversion/include/svn_types_impl.h + if $(SVN_BUILD_SVNXX) ; then $(COMPILE_SVNXX) $(canonicalized_srcdir)subversion/bindings/cxx/src/revision.cpp ; else echo "fake" > subversion/bindings/cxx/src/revision.lo ; fi -subversion/bindings/cxxhl/tests/test_aprwrap.lo: subversion/bindings/cxxhl/tests/test_aprwrap.cpp subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp subversion/bindings/cxxhl/include/svncxxhl/exception.hpp subversion/bindings/cxxhl/src/aprwrap.hpp subversion/bindings/cxxhl/src/aprwrap/array.hpp subversion/bindings/cxxhl/src/aprwrap/hash.hpp subversion/bindings/cxxhl/src/aprwrap/pool.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/svn_private_config.h - if $(SVN_USE_GOOGLEMOCK) ; then $(COMPILE_CXXHL_GOOGLEMOCK_CXX) $(canonicalized_srcdir)subversion/bindings/cxxhl/tests/test_aprwrap.cpp ; else echo "fake" > subversion/bindings/cxxhl/tests/test_aprwrap.lo ; fi +subversion/bindings/cxx/tests/svnxx-tests.lo: subversion/bindings/cxx/tests/svnxx-tests.cpp + if $(SVN_BUILD_SVNXX_TESTS) ; then $(COMPILE_SVNXX_TEST) $(canonicalized_srcdir)subversion/bindings/cxx/tests/svnxx-tests.cpp ; else echo "fake" > subversion/bindings/cxx/tests/svnxx-tests.lo ; fi -subversion/bindings/cxxhl/tests/test_exception.lo: subversion/bindings/cxxhl/tests/test_exception.cpp subversion/bindings/cxxhl/include/svncxxhl.hpp subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp subversion/bindings/cxxhl/include/svncxxhl/exception.hpp subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp subversion/bindings/cxxhl/src/private.hpp subversion/bindings/cxxhl/src/private/exception-private.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h - if $(SVN_USE_GOOGLEMOCK) ; then $(COMPILE_CXXHL_GOOGLEMOCK_CXX) $(canonicalized_srcdir)subversion/bindings/cxxhl/tests/test_exception.cpp ; else echo "fake" > subversion/bindings/cxxhl/tests/test_exception.lo ; fi +subversion/bindings/cxx/tests/test_aprwrap_arrays.lo: subversion/bindings/cxx/tests/test_aprwrap_arrays.cpp subversion/bindings/cxx/include/svnxx/detail/noncopyable.hpp subversion/bindings/cxx/include/svnxx/exception.hpp subversion/bindings/cxx/include/svnxx/init.hpp subversion/bindings/cxx/src/aprwrap.hpp subversion/bindings/cxx/src/aprwrap/array.hpp subversion/bindings/cxx/src/aprwrap/hash.hpp subversion/bindings/cxx/src/aprwrap/pool.hpp subversion/bindings/cxx/src/private/init_private.hpp subversion/bindings/cxx/tests/fixture_init.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h + if $(SVN_BUILD_SVNXX_TESTS) ; then $(COMPILE_SVNXX_TEST) $(canonicalized_srcdir)subversion/bindings/cxx/tests/test_aprwrap_arrays.cpp ; else echo "fake" > subversion/bindings/cxx/tests/test_aprwrap_arrays.lo ; fi + +subversion/bindings/cxx/tests/test_aprwrap_hashes.lo: subversion/bindings/cxx/tests/test_aprwrap_hashes.cpp subversion/bindings/cxx/include/svnxx/detail/noncopyable.hpp subversion/bindings/cxx/include/svnxx/exception.hpp subversion/bindings/cxx/include/svnxx/init.hpp subversion/bindings/cxx/src/aprwrap.hpp subversion/bindings/cxx/src/aprwrap/array.hpp subversion/bindings/cxx/src/aprwrap/hash.hpp subversion/bindings/cxx/src/aprwrap/pool.hpp subversion/bindings/cxx/src/private/init_private.hpp subversion/bindings/cxx/tests/fixture_init.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h + if $(SVN_BUILD_SVNXX_TESTS) ; then $(COMPILE_SVNXX_TEST) $(canonicalized_srcdir)subversion/bindings/cxx/tests/test_aprwrap_hashes.cpp ; else echo "fake" > subversion/bindings/cxx/tests/test_aprwrap_hashes.lo ; fi + +subversion/bindings/cxx/tests/test_aprwrap_pools.lo: subversion/bindings/cxx/tests/test_aprwrap_pools.cpp subversion/bindings/cxx/include/svnxx/detail/noncopyable.hpp subversion/bindings/cxx/include/svnxx/exception.hpp subversion/bindings/cxx/include/svnxx/init.hpp subversion/bindings/cxx/src/aprwrap.hpp subversion/bindings/cxx/src/aprwrap/array.hpp subversion/bindings/cxx/src/aprwrap/hash.hpp subversion/bindings/cxx/src/aprwrap/pool.hpp subversion/bindings/cxx/src/private/init_private.hpp subversion/bindings/cxx/tests/fixture_init.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h + if $(SVN_BUILD_SVNXX_TESTS) ; then $(COMPILE_SVNXX_TEST) $(canonicalized_srcdir)subversion/bindings/cxx/tests/test_aprwrap_pools.cpp ; else echo "fake" > subversion/bindings/cxx/tests/test_aprwrap_pools.lo ; fi + +subversion/bindings/cxx/tests/test_client_status.lo: subversion/bindings/cxx/tests/test_client_status.cpp subversion/bindings/cxx/include/svnxx/client/context.hpp subversion/bindings/cxx/include/svnxx/client/status.hpp subversion/bindings/cxx/include/svnxx/depth.hpp subversion/bindings/cxx/include/svnxx/detail/future.hpp subversion/bindings/cxx/include/svnxx/init.hpp subversion/bindings/cxx/include/svnxx/revision.hpp subversion/bindings/cxx/include/svnxx/tristate.hpp subversion/bindings/cxx/tests/fixture_init.hpp subversion/include/svn_opt_impl.h subversion/include/svn_types_impl.h + if $(SVN_BUILD_SVNXX_TESTS) ; then $(COMPILE_SVNXX_TEST) $(canonicalized_srcdir)subversion/bindings/cxx/tests/test_client_status.cpp ; else echo "fake" > subversion/bindings/cxx/tests/test_client_status.lo ; fi + +subversion/bindings/cxx/tests/test_depth.lo: subversion/bindings/cxx/tests/test_depth.cpp subversion/bindings/cxx/include/svnxx/depth.hpp subversion/bindings/cxx/src/private/depth_private.hpp subversion/include/svn_types_impl.h + if $(SVN_BUILD_SVNXX_TESTS) ; then $(COMPILE_SVNXX_TEST) $(canonicalized_srcdir)subversion/bindings/cxx/tests/test_depth.cpp ; else echo "fake" > subversion/bindings/cxx/tests/test_depth.lo ; fi + +subversion/bindings/cxx/tests/test_exceptions.lo: subversion/bindings/cxx/tests/test_exceptions.cpp subversion/bindings/cxx/include/svnxx/exception.hpp subversion/bindings/cxx/include/svnxx/init.hpp subversion/bindings/cxx/src/private/exception_private.hpp subversion/bindings/cxx/tests/fixture_init.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/include/svn_types_impl.h + if $(SVN_BUILD_SVNXX_TESTS) ; then $(COMPILE_SVNXX_TEST) $(canonicalized_srcdir)subversion/bindings/cxx/tests/test_exceptions.cpp ; else echo "fake" > subversion/bindings/cxx/tests/test_exceptions.lo ; fi + +subversion/bindings/cxx/tests/test_init.lo: subversion/bindings/cxx/tests/test_init.cpp subversion/bindings/cxx/include/svnxx/detail/noncopyable.hpp subversion/bindings/cxx/include/svnxx/init.hpp subversion/bindings/cxx/src/private/init_private.hpp + if $(SVN_BUILD_SVNXX_TESTS) ; then $(COMPILE_SVNXX_TEST) $(canonicalized_srcdir)subversion/bindings/cxx/tests/test_init.cpp ; else echo "fake" > subversion/bindings/cxx/tests/test_init.lo ; fi + +subversion/bindings/cxx/tests/test_revision.lo: subversion/bindings/cxx/tests/test_revision.cpp subversion/bindings/cxx/include/svnxx/revision.hpp subversion/bindings/cxx/include/svnxx/tristate.hpp subversion/bindings/cxx/src/private/revision_private.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_types.h subversion/include/svn_types_impl.h + if $(SVN_BUILD_SVNXX_TESTS) ; then $(COMPILE_SVNXX_TEST) $(canonicalized_srcdir)subversion/bindings/cxx/tests/test_revision.cpp ; else echo "fake" > subversion/bindings/cxx/tests/test_revision.lo ; fi + +subversion/bindings/cxx/tests/test_strings.lo: subversion/bindings/cxx/tests/test_strings.cpp subversion/bindings/cxx/include/svnxx/detail/noncopyable.hpp subversion/bindings/cxx/include/svnxx/exception.hpp subversion/bindings/cxx/include/svnxx/init.hpp subversion/bindings/cxx/src/aprwrap.hpp subversion/bindings/cxx/src/aprwrap/array.hpp subversion/bindings/cxx/src/aprwrap/hash.hpp subversion/bindings/cxx/src/aprwrap/pool.hpp subversion/bindings/cxx/src/private/init_private.hpp subversion/bindings/cxx/src/private/strings_private.hpp subversion/bindings/cxx/tests/fixture_init.hpp subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h + if $(SVN_BUILD_SVNXX_TESTS) ; then $(COMPILE_SVNXX_TEST) $(canonicalized_srcdir)subversion/bindings/cxx/tests/test_strings.cpp ; else echo "fake" > subversion/bindings/cxx/tests/test_strings.lo ; fi + +subversion/bindings/cxx/tests/test_tristate.lo: subversion/bindings/cxx/tests/test_tristate.cpp subversion/bindings/cxx/include/svnxx/tristate.hpp subversion/bindings/cxx/src/private/tristate_private.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/include/svn_types_impl.h + if $(SVN_BUILD_SVNXX_TESTS) ; then $(COMPILE_SVNXX_TEST) $(canonicalized_srcdir)subversion/bindings/cxx/tests/test_tristate.cpp ; else echo "fake" > subversion/bindings/cxx/tests/test_tristate.lo ; fi subversion/bindings/javahl/classes/org/apache/subversion/javahl/BasicTests.class: subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java @@ -1700,6 +1721,10 @@ subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/AuthnCa subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/BlameCallback.class: subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java +subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/BlameLineCallback.class: subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameLineCallback.java + +subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/BlameRangeCallback.class: subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameRangeCallback.java + subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ChangelistCallback.class: subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ChangelistCallback.java subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ClientNotifyCallback.class: subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ClientNotifyCallback.java @@ -1968,376 +1993,244 @@ subversion/bindings/javahl/classes/org/tigris/subversion/javahl/Version.class: s subversion/bindings/javahl/classes/org/tigris/subversion/javahl/WC.class: subversion/bindings/javahl/tests/org/tigris/subversion/javahl/WC.java -subversion/bindings/javahl/include/AuthnCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/AuthnCallback.class - -subversion/bindings/javahl/include/BlameCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/BlameCallback.class - -subversion/bindings/javahl/include/ChangePath.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/ChangePath.class - -subversion/bindings/javahl/include/ChangelistCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ChangelistCallback.class - -subversion/bindings/javahl/include/Checksum.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Checksum.class - -subversion/bindings/javahl/include/ClientException.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/ClientException.class - -subversion/bindings/javahl/include/ClientNotifyCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ClientNotifyCallback.class - -subversion/bindings/javahl/include/ClientNotifyInformation.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/ClientNotifyInformation.class - -subversion/bindings/javahl/include/CommitCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/CommitCallback.class - -subversion/bindings/javahl/include/CommitEditor.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/CommitEditor.class - -subversion/bindings/javahl/include/CommitInfo.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/CommitInfo.class - -subversion/bindings/javahl/include/CommitItem.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/CommitItem.class - -subversion/bindings/javahl/include/CommitItemStateFlags.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/CommitItemStateFlags.class - -subversion/bindings/javahl/include/CommitMessageCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/CommitMessageCallback.class - -subversion/bindings/javahl/include/ConfigEvent.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ConfigEvent.class - -subversion/bindings/javahl/include/ConfigImpl.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/ConfigImpl.class - -subversion/bindings/javahl/include/ConfigLib.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/ConfigLib.class +subversion/bindings/javahl/include/CommitEditor.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java -subversion/bindings/javahl/include/ConflictDescriptor.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/ConflictDescriptor.class +subversion/bindings/javahl/include/CommitItemStateFlags.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java -subversion/bindings/javahl/include/ConflictResolverCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ConflictResolverCallback.class +subversion/bindings/javahl/include/ConfigImpl.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigImpl.java -subversion/bindings/javahl/include/ConflictResult.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/ConflictResult.class +subversion/bindings/javahl/include/ConfigLib.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigLib.java -subversion/bindings/javahl/include/ConflictVersion.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/ConflictVersion.class +subversion/bindings/javahl/include/DiffLib.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/util/DiffLib.java -subversion/bindings/javahl/include/CopySource.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/CopySource.class +subversion/bindings/javahl/include/NativeInputStream.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NativeInputStream.java -subversion/bindings/javahl/include/Depth.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Depth.class +subversion/bindings/javahl/include/NativeOutputStream.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NativeOutputStream.java -subversion/bindings/javahl/include/DiffLib.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/DiffLib.class +subversion/bindings/javahl/include/NativeResources.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java -subversion/bindings/javahl/include/DiffOptions.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/DiffOptions.class +subversion/bindings/javahl/include/PropLib.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/util/PropLib.java -subversion/bindings/javahl/include/DiffSummary.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/DiffSummary.class +subversion/bindings/javahl/include/RemoteFactory.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteFactory.java -subversion/bindings/javahl/include/DiffSummaryCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/DiffSummaryCallback.class +subversion/bindings/javahl/include/RemoteSession.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java -subversion/bindings/javahl/include/DirEntry.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/DirEntry.class +subversion/bindings/javahl/include/RequestChannel.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/util/RequestChannel.java -subversion/bindings/javahl/include/ExternalItem.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/ExternalItem.class +subversion/bindings/javahl/include/ResponseChannel.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ResponseChannel.java -subversion/bindings/javahl/include/ISVNClient.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNClient.class +subversion/bindings/javahl/include/Revision.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java -subversion/bindings/javahl/include/ISVNConfig.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNConfig.class +subversion/bindings/javahl/include/RevisionRangeList.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRangeList.java -subversion/bindings/javahl/include/ISVNEditor.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNEditor.class +subversion/bindings/javahl/include/RuntimeVersion.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RuntimeVersion.java -subversion/bindings/javahl/include/ISVNRemote.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNRemote.class +subversion/bindings/javahl/include/SVNClient.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java -subversion/bindings/javahl/include/ISVNReporter.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNReporter.class +subversion/bindings/javahl/include/SVNRepos.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java -subversion/bindings/javahl/include/ISVNRepos.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/ISVNRepos.class +subversion/bindings/javahl/include/StateReporter.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StateReporter.java -subversion/bindings/javahl/include/ImportFilterCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ImportFilterCallback.class +subversion/bindings/javahl/include/SubstLib.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/util/SubstLib.java -subversion/bindings/javahl/include/Info.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Info.class +subversion/bindings/javahl/include/TunnelChannel.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/util/TunnelChannel.java -subversion/bindings/javahl/include/InfoCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/InfoCallback.class +subversion/bindings/javahl/include/UserPasswordCallback.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java -subversion/bindings/javahl/include/InheritedProplistCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/InheritedProplistCallback.class +subversion/bindings/javahl/include/Version.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java -subversion/bindings/javahl/include/JNIError.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/JNIError.class +subversion/bindings/javahl/include/VersionExtended.h: subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java -subversion/bindings/javahl/include/JNIObject.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/JNIObject.class - -subversion/bindings/javahl/include/ListCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ListCallback.class - -subversion/bindings/javahl/include/ListItemCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ListItemCallback.class - -subversion/bindings/javahl/include/Lock.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Lock.class - -subversion/bindings/javahl/include/LogDate.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/LogDate.class - -subversion/bindings/javahl/include/LogMessageCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/LogMessageCallback.class - -subversion/bindings/javahl/include/Mergeinfo.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Mergeinfo.class - -subversion/bindings/javahl/include/NativeException.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/NativeException.class - -subversion/bindings/javahl/include/NativeInputStream.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/NativeInputStream.class - -subversion/bindings/javahl/include/NativeOutputStream.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/NativeOutputStream.class - -subversion/bindings/javahl/include/NativeResources.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/NativeResources.class - -subversion/bindings/javahl/include/NodeKind.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/NodeKind.class - -subversion/bindings/javahl/include/OperationContext.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/OperationContext.class - -subversion/bindings/javahl/include/PatchCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/PatchCallback.class - -subversion/bindings/javahl/include/ProgressCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ProgressCallback.class - -subversion/bindings/javahl/include/ProgressEvent.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/ProgressEvent.class - -subversion/bindings/javahl/include/PropLib.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/PropLib.class - -subversion/bindings/javahl/include/Property.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Property.class - -subversion/bindings/javahl/include/ProplistCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ProplistCallback.class - -subversion/bindings/javahl/include/RemoteFactory.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/RemoteFactory.class - -subversion/bindings/javahl/include/RemoteFileRevisionsCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/RemoteFileRevisionsCallback.class - -subversion/bindings/javahl/include/RemoteLocationSegmentsCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/RemoteLocationSegmentsCallback.class - -subversion/bindings/javahl/include/RemoteSession.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/RemoteSession.class - -subversion/bindings/javahl/include/RemoteStatus.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/RemoteStatus.class - -subversion/bindings/javahl/include/ReposFreezeAction.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ReposFreezeAction.class - -subversion/bindings/javahl/include/ReposNotifyCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ReposNotifyCallback.class - -subversion/bindings/javahl/include/ReposNotifyInformation.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/ReposNotifyInformation.class - -subversion/bindings/javahl/include/ReposVerifyCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/ReposVerifyCallback.class - -subversion/bindings/javahl/include/RequestChannel.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/RequestChannel.class - -subversion/bindings/javahl/include/ResponseChannel.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/ResponseChannel.class - -subversion/bindings/javahl/include/RetryOpenSession.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/RetryOpenSession.class - -subversion/bindings/javahl/include/Revision.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Revision.class - -subversion/bindings/javahl/include/RevisionRange.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/RevisionRange.class - -subversion/bindings/javahl/include/RevisionRangeList.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/RevisionRangeList.class - -subversion/bindings/javahl/include/RuntimeVersion.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/RuntimeVersion.class - -subversion/bindings/javahl/include/SVNClient.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/SVNClient.class - -subversion/bindings/javahl/include/SVNRepos.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/SVNRepos.class - -subversion/bindings/javahl/include/SVNUtil.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/SVNUtil.class - -subversion/bindings/javahl/include/StateReporter.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/StateReporter.class - -subversion/bindings/javahl/include/Status.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Status.class - -subversion/bindings/javahl/include/StatusCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/StatusCallback.class - -subversion/bindings/javahl/include/StatusEditor.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/remote/StatusEditor.class - -subversion/bindings/javahl/include/SubstLib.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/SubstLib.class - -subversion/bindings/javahl/include/SubversionException.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/SubversionException.class - -subversion/bindings/javahl/include/Tristate.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Tristate.class - -subversion/bindings/javahl/include/TunnelAgent.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/TunnelAgent.class - -subversion/bindings/javahl/include/TunnelChannel.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/util/TunnelChannel.class - -subversion/bindings/javahl/include/UserPasswordCallback.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/callback/UserPasswordCallback.class - -subversion/bindings/javahl/include/Version.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/Version.class - -subversion/bindings/javahl/include/VersionExtended.h: subversion/bindings/javahl/classes/org/apache/subversion/javahl/types/VersionExtended.class - -subversion/bindings/javahl/native/Array.lo: subversion/bindings/javahl/native/Array.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h +subversion/bindings/javahl/native/Array.lo: subversion/bindings/javahl/native/Array.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/Array.cpp -subversion/bindings/javahl/native/AuthnCallback.lo: subversion/bindings/javahl/native/AuthnCallback.cpp subversion/bindings/javahl/native/AuthnCallback.hpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp subversion/bindings/javahl/native/jniwrapper/jni_list.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_x509.h subversion/svn_private_config.h +subversion/bindings/javahl/native/AuthnCallback.lo: subversion/bindings/javahl/native/AuthnCallback.cpp subversion/bindings/javahl/native/AuthnCallback.hpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp subversion/bindings/javahl/native/jniwrapper/jni_list.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_x509.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/AuthnCallback.cpp -subversion/bindings/javahl/native/BlameCallback.lo: subversion/bindings/javahl/native/BlameCallback.cpp subversion/bindings/javahl/native/BlameCallback.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/BlameCallback.lo: subversion/bindings/javahl/native/BlameCallback.cpp subversion/bindings/javahl/native/BlameCallback.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/BlameCallback.cpp -subversion/bindings/javahl/native/ChangelistCallback.lo: subversion/bindings/javahl/native/ChangelistCallback.cpp subversion/bindings/javahl/native/ChangelistCallback.h subversion/bindings/javahl/native/ClientContext.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/SVNClient.h subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/ChangelistCallback.lo: subversion/bindings/javahl/native/ChangelistCallback.cpp subversion/bindings/javahl/native/ChangelistCallback.h subversion/bindings/javahl/native/ClientContext.h subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/SVNClient.h subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/ChangelistCallback.cpp -subversion/bindings/javahl/native/ClientContext.lo: subversion/bindings/javahl/native/ClientContext.cpp subversion/bindings/javahl/native/ClientContext.h subversion/bindings/javahl/native/CommitMessage.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNICriticalSection.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/javahl/native/ClientContext.lo: subversion/bindings/javahl/native/ClientContext.cpp subversion/bindings/javahl/native/ClientContext.h subversion/bindings/javahl/native/CommitMessage.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNICriticalSection.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/ClientContext.cpp -subversion/bindings/javahl/native/CommitCallback.lo: subversion/bindings/javahl/native/CommitCallback.cpp subversion/bindings/javahl/native/CommitCallback.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/CommitCallback.lo: subversion/bindings/javahl/native/CommitCallback.cpp subversion/bindings/javahl/native/CommitCallback.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/CommitCallback.cpp -subversion/bindings/javahl/native/CommitEditor.lo: subversion/bindings/javahl/native/CommitEditor.cpp subversion/bindings/javahl/native/CommitCallback.h subversion/bindings/javahl/native/CommitEditor.h subversion/bindings/javahl/native/EditorCallbacks.hpp subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/InputStream.h subversion/bindings/javahl/native/Iterator.h subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/LockTokenTable.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/PropertyTable.h subversion/bindings/javahl/native/RemoteSession.h subversion/bindings/javahl/native/RemoteSessionContext.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/javahl/native/CommitEditor.lo: subversion/bindings/javahl/native/CommitEditor.cpp subversion/bindings/javahl/native/CommitCallback.h subversion/bindings/javahl/native/CommitEditor.h subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/EditorCallbacks.hpp subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/InputStream.h subversion/bindings/javahl/native/Iterator.h subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/LockTokenTable.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/PropertyTable.h subversion/bindings/javahl/native/RemoteSession.h subversion/bindings/javahl/native/RemoteSessionContext.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/CommitEditor.cpp -subversion/bindings/javahl/native/CommitMessage.lo: subversion/bindings/javahl/native/CommitMessage.cpp subversion/bindings/javahl/native/CommitMessage.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/CommitMessage.lo: subversion/bindings/javahl/native/CommitMessage.cpp subversion/bindings/javahl/native/CommitMessage.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/CommitMessage.cpp -subversion/bindings/javahl/native/CopySources.lo: subversion/bindings/javahl/native/CopySources.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/CopySources.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Revision.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/CopySources.lo: subversion/bindings/javahl/native/CopySources.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/CopySources.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Revision.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/CopySources.cpp -subversion/bindings/javahl/native/CreateJ.lo: subversion/bindings/javahl/native/CreateJ.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_CommitItemStateFlags.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Revision.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/RevisionRange.h subversion/bindings/javahl/native/RevisionRangeList.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/CreateJ.lo: subversion/bindings/javahl/native/CreateJ.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_CommitItemStateFlags.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Revision.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/RevisionRange.h subversion/bindings/javahl/native/RevisionRangeList.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/CreateJ.cpp -subversion/bindings/javahl/native/Credential.lo: subversion/bindings/javahl/native/Credential.cpp subversion/bindings/javahl/native/AuthnCallback.hpp subversion/bindings/javahl/native/Credential.hpp subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/bindings/javahl/native/Credential.lo: subversion/bindings/javahl/native/Credential.cpp subversion/bindings/javahl/native/AuthnCallback.hpp subversion/bindings/javahl/native/Credential.hpp subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/Credential.cpp -subversion/bindings/javahl/native/DiffOptions.lo: subversion/bindings/javahl/native/DiffOptions.cpp subversion/bindings/javahl/native/DiffOptions.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/bindings/javahl/native/DiffOptions.lo: subversion/bindings/javahl/native/DiffOptions.cpp subversion/bindings/javahl/native/DiffOptions.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/DiffOptions.cpp -subversion/bindings/javahl/native/DiffSummaryReceiver.lo: subversion/bindings/javahl/native/DiffSummaryReceiver.cpp subversion/bindings/javahl/native/DiffSummaryReceiver.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/DiffSummaryReceiver.lo: subversion/bindings/javahl/native/DiffSummaryReceiver.cpp subversion/bindings/javahl/native/DiffSummaryReceiver.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/DiffSummaryReceiver.cpp -subversion/bindings/javahl/native/EditorCallbacks.lo: subversion/bindings/javahl/native/EditorCallbacks.cpp subversion/bindings/javahl/native/EditorCallbacks.hpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Utility.hpp subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_io_stream.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/bindings/javahl/native/EditorCallbacks.lo: subversion/bindings/javahl/native/EditorCallbacks.cpp subversion/bindings/javahl/native/EditorCallbacks.hpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Utility.hpp subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_io_stream.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/EditorCallbacks.cpp -subversion/bindings/javahl/native/EditorProxy.lo: subversion/bindings/javahl/native/EditorProxy.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EditorProxy.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/NativeStream.hpp subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/javahl/native/EditorProxy.lo: subversion/bindings/javahl/native/EditorProxy.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/EditorProxy.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/NativeStream.hpp subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/EditorProxy.cpp -subversion/bindings/javahl/native/EnumMapper.lo: subversion/bindings/javahl/native/EnumMapper.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_CommitItemStateFlags.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/EnumMapper.lo: subversion/bindings/javahl/native/EnumMapper.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_CommitItemStateFlags.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/EnumMapper.cpp -subversion/bindings/javahl/native/ExternalItem.lo: subversion/bindings/javahl/native/ExternalItem.cpp subversion/bindings/javahl/native/ExternalItem.hpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/ExternalItem.lo: subversion/bindings/javahl/native/ExternalItem.cpp subversion/bindings/javahl/native/ExternalItem.hpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/ExternalItem.cpp -subversion/bindings/javahl/native/File.lo: subversion/bindings/javahl/native/File.cpp subversion/bindings/javahl/native/File.h subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/bindings/javahl/native/File.lo: subversion/bindings/javahl/native/File.cpp subversion/bindings/javahl/native/File.h subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/File.cpp -subversion/bindings/javahl/native/ImportFilterCallback.lo: subversion/bindings/javahl/native/ImportFilterCallback.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/ImportFilterCallback.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/ImportFilterCallback.lo: subversion/bindings/javahl/native/ImportFilterCallback.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/ImportFilterCallback.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/ImportFilterCallback.cpp -subversion/bindings/javahl/native/InfoCallback.lo: subversion/bindings/javahl/native/InfoCallback.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/InfoCallback.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/InfoCallback.lo: subversion/bindings/javahl/native/InfoCallback.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/InfoCallback.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/InfoCallback.cpp -subversion/bindings/javahl/native/InputStream.lo: subversion/bindings/javahl/native/InputStream.cpp subversion/bindings/javahl/native/InputStream.h subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/bindings/javahl/native/InputStream.lo: subversion/bindings/javahl/native/InputStream.cpp subversion/bindings/javahl/native/InputStream.h subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/InputStream.cpp -subversion/bindings/javahl/native/Iterator.lo: subversion/bindings/javahl/native/Iterator.cpp subversion/bindings/javahl/native/Iterator.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h +subversion/bindings/javahl/native/Iterator.lo: subversion/bindings/javahl/native/Iterator.cpp subversion/bindings/javahl/native/Iterator.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/Iterator.cpp -subversion/bindings/javahl/native/JNIByteArray.lo: subversion/bindings/javahl/native/JNIByteArray.cpp subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h +subversion/bindings/javahl/native/JNIByteArray.lo: subversion/bindings/javahl/native/JNIByteArray.cpp subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/JNIByteArray.cpp -subversion/bindings/javahl/native/JNICriticalSection.lo: subversion/bindings/javahl/native/JNICriticalSection.cpp subversion/bindings/javahl/native/JNICriticalSection.h subversion/bindings/javahl/native/JNIMutex.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h +subversion/bindings/javahl/native/JNICriticalSection.lo: subversion/bindings/javahl/native/JNICriticalSection.cpp subversion/bindings/javahl/native/JNICriticalSection.h subversion/bindings/javahl/native/JNIMutex.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/JNICriticalSection.cpp -subversion/bindings/javahl/native/JNIMutex.lo: subversion/bindings/javahl/native/JNIMutex.cpp subversion/bindings/javahl/native/JNIMutex.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h +subversion/bindings/javahl/native/JNIMutex.lo: subversion/bindings/javahl/native/JNIMutex.cpp subversion/bindings/javahl/native/JNIMutex.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/JNIMutex.cpp -subversion/bindings/javahl/native/JNIStackElement.lo: subversion/bindings/javahl/native/JNIStackElement.cpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h +subversion/bindings/javahl/native/JNIStackElement.lo: subversion/bindings/javahl/native/JNIStackElement.cpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/JNIStackElement.cpp -subversion/bindings/javahl/native/JNIStringHolder.lo: subversion/bindings/javahl/native/JNIStringHolder.cpp subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h +subversion/bindings/javahl/native/JNIStringHolder.lo: subversion/bindings/javahl/native/JNIStringHolder.cpp subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/JNIStringHolder.cpp -subversion/bindings/javahl/native/JNIUtil.lo: subversion/bindings/javahl/native/JNIUtil.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/JNICriticalSection.h subversion/bindings/javahl/native/JNIMutex.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/javahl/native/JNIUtil.lo: subversion/bindings/javahl/native/JNIUtil.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/JNICriticalSection.h subversion/bindings/javahl/native/JNIMutex.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/JNIUtil.cpp -subversion/bindings/javahl/native/ListCallback.lo: subversion/bindings/javahl/native/ListCallback.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/ListCallback.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/ListCallback.lo: subversion/bindings/javahl/native/ListCallback.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/ListCallback.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/ListCallback.cpp -subversion/bindings/javahl/native/LockTokenTable.lo: subversion/bindings/javahl/native/LockTokenTable.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/LockTokenTable.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h +subversion/bindings/javahl/native/LockTokenTable.lo: subversion/bindings/javahl/native/LockTokenTable.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/LockTokenTable.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/LockTokenTable.cpp -subversion/bindings/javahl/native/LogMessageCallback.lo: subversion/bindings/javahl/native/LogMessageCallback.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/LogMessageCallback.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/LogMessageCallback.lo: subversion/bindings/javahl/native/LogMessageCallback.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/LogMessageCallback.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/LogMessageCallback.cpp -subversion/bindings/javahl/native/MessageReceiver.lo: subversion/bindings/javahl/native/MessageReceiver.cpp subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/MessageReceiver.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h +subversion/bindings/javahl/native/MessageReceiver.lo: subversion/bindings/javahl/native/MessageReceiver.cpp subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/MessageReceiver.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/MessageReceiver.cpp -subversion/bindings/javahl/native/NativeStream.lo: subversion/bindings/javahl/native/NativeStream.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_types_NativeInputStream.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_NativeOutputStream.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/NativeStream.hpp subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/bindings/javahl/native/NativeStream.lo: subversion/bindings/javahl/native/NativeStream.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_types_NativeInputStream.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_NativeOutputStream.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/NativeStream.hpp subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/NativeStream.cpp -subversion/bindings/javahl/native/OperationContext.lo: subversion/bindings/javahl/native/OperationContext.cpp subversion/bindings/javahl/native/CommitMessage.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/GlobalConfig.h subversion/bindings/javahl/native/JNICriticalSection.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/javahl/native/OperationContext.lo: subversion/bindings/javahl/native/OperationContext.cpp subversion/bindings/javahl/native/CommitMessage.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/GlobalConfig.h subversion/bindings/javahl/native/JNICriticalSection.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/OperationContext.cpp -subversion/bindings/javahl/native/OutputStream.lo: subversion/bindings/javahl/native/OutputStream.cpp subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OutputStream.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/bindings/javahl/native/OutputStream.lo: subversion/bindings/javahl/native/OutputStream.cpp subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OutputStream.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/OutputStream.cpp -subversion/bindings/javahl/native/PatchCallback.lo: subversion/bindings/javahl/native/PatchCallback.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/PatchCallback.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/PatchCallback.lo: subversion/bindings/javahl/native/PatchCallback.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/PatchCallback.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/PatchCallback.cpp -subversion/bindings/javahl/native/Path.lo: subversion/bindings/javahl/native/Path.cpp subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/bindings/javahl/native/Path.lo: subversion/bindings/javahl/native/Path.cpp subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/private/svn_dirent_uri_private.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/Path.cpp -subversion/bindings/javahl/native/Pool.lo: subversion/bindings/javahl/native/Pool.cpp subversion/bindings/javahl/native/JNICriticalSection.h subversion/bindings/javahl/native/JNIMutex.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h +subversion/bindings/javahl/native/Pool.lo: subversion/bindings/javahl/native/Pool.cpp subversion/bindings/javahl/native/JNICriticalSection.h subversion/bindings/javahl/native/JNIMutex.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/Pool.cpp -subversion/bindings/javahl/native/Prompter.lo: subversion/bindings/javahl/native/Prompter.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h subversion/bindings/javahl/native/AuthnCallback.hpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/bindings/javahl/native/Prompter.lo: subversion/bindings/javahl/native/Prompter.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h subversion/bindings/javahl/native/AuthnCallback.hpp subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/Prompter.cpp -subversion/bindings/javahl/native/PropertyTable.lo: subversion/bindings/javahl/native/PropertyTable.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/PropertyTable.h subversion/include/private/svn_debug.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/bindings/javahl/native/PropertyTable.lo: subversion/bindings/javahl/native/PropertyTable.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/PropertyTable.h subversion/include/private/svn_debug.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/PropertyTable.cpp -subversion/bindings/javahl/native/ProplistCallback.lo: subversion/bindings/javahl/native/ProplistCallback.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/ProplistCallback.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/ProplistCallback.lo: subversion/bindings/javahl/native/ProplistCallback.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/ProplistCallback.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/ProplistCallback.cpp -subversion/bindings/javahl/native/RemoteSession.lo: subversion/bindings/javahl/native/RemoteSession.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EditorProxy.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/Iterator.h subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/LogMessageCallback.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/OutputStream.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/RemoteSession.h subversion/bindings/javahl/native/RemoteSessionContext.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/StateReporter.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/javahl/native/RemoteSession.lo: subversion/bindings/javahl/native/RemoteSession.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/EditorProxy.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/Iterator.h subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/LogMessageCallback.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/OutputStream.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/RemoteSession.h subversion/bindings/javahl/native/RemoteSessionContext.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/StateReporter.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/RemoteSession.cpp -subversion/bindings/javahl/native/RemoteSessionContext.lo: subversion/bindings/javahl/native/RemoteSessionContext.cpp subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/RemoteSessionContext.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/RemoteSessionContext.lo: subversion/bindings/javahl/native/RemoteSessionContext.cpp subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/RemoteSessionContext.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/RemoteSessionContext.cpp -subversion/bindings/javahl/native/ReposFreezeAction.lo: subversion/bindings/javahl/native/ReposFreezeAction.cpp subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/ReposFreezeAction.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h +subversion/bindings/javahl/native/ReposFreezeAction.lo: subversion/bindings/javahl/native/ReposFreezeAction.cpp subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/ReposFreezeAction.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/ReposFreezeAction.cpp -subversion/bindings/javahl/native/ReposNotifyCallback.lo: subversion/bindings/javahl/native/ReposNotifyCallback.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/ReposNotifyCallback.h subversion/bindings/javahl/native/RevisionRange.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/ReposNotifyCallback.lo: subversion/bindings/javahl/native/ReposNotifyCallback.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/ReposNotifyCallback.h subversion/bindings/javahl/native/RevisionRange.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/ReposNotifyCallback.cpp -subversion/bindings/javahl/native/ReposVerifyCallback.lo: subversion/bindings/javahl/native/ReposVerifyCallback.cpp subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/ReposVerifyCallback.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/bindings/javahl/native/ReposVerifyCallback.lo: subversion/bindings/javahl/native/ReposVerifyCallback.cpp subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/ReposVerifyCallback.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/ReposVerifyCallback.cpp -subversion/bindings/javahl/native/Revision.lo: subversion/bindings/javahl/native/Revision.cpp subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Revision.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/Revision.lo: subversion/bindings/javahl/native/Revision.cpp subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Revision.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/Revision.cpp -subversion/bindings/javahl/native/RevisionRange.lo: subversion/bindings/javahl/native/RevisionRange.cpp subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/RevisionRange.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/RevisionRange.lo: subversion/bindings/javahl/native/RevisionRange.cpp subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/RevisionRange.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/RevisionRange.cpp -subversion/bindings/javahl/native/RevisionRangeList.lo: subversion/bindings/javahl/native/RevisionRangeList.cpp subversion/bindings/javahl/native/Iterator.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/RevisionRange.h subversion/bindings/javahl/native/RevisionRangeList.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/bindings/javahl/native/RevisionRangeList.lo: subversion/bindings/javahl/native/RevisionRangeList.cpp subversion/bindings/javahl/native/Iterator.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/RevisionRange.h subversion/bindings/javahl/native/RevisionRangeList.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/RevisionRangeList.cpp -subversion/bindings/javahl/native/SVNBase.lo: subversion/bindings/javahl/native/SVNBase.cpp subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h +subversion/bindings/javahl/native/SVNBase.lo: subversion/bindings/javahl/native/SVNBase.cpp subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/SVNBase.cpp -subversion/bindings/javahl/native/SVNClient.lo: subversion/bindings/javahl/native/SVNClient.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/BlameCallback.h subversion/bindings/javahl/native/ChangelistCallback.h subversion/bindings/javahl/native/ClientContext.h subversion/bindings/javahl/native/CommitCallback.h subversion/bindings/javahl/native/CommitMessage.h subversion/bindings/javahl/native/CopySources.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/DiffOptions.h subversion/bindings/javahl/native/DiffSummaryReceiver.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/ExternalItem.hpp subversion/bindings/javahl/native/ImportFilterCallback.h subversion/bindings/javahl/native/InfoCallback.h subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/ListCallback.h subversion/bindings/javahl/native/LogMessageCallback.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/OutputStream.h subversion/bindings/javahl/native/PatchCallback.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/PropertyTable.h subversion/bindings/javahl/native/ProplistCallback.h subversion/bindings/javahl/native/RemoteSession.h subversion/bindings/javahl/native/RemoteSessionContext.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/RevisionRange.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/SVNClient.h subversion/bindings/javahl/native/StatusCallback.h subversion/bindings/javahl/native/StringArray.h subversion/bindings/javahl/native/Targets.h subversion/bindings/javahl/native/VersionExtended.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp subversion/bindings/javahl/native/jniwrapper/jni_list.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/javahl/native/SVNClient.lo: subversion/bindings/javahl/native/SVNClient.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/BlameCallback.h subversion/bindings/javahl/native/ChangelistCallback.h subversion/bindings/javahl/native/ClientContext.h subversion/bindings/javahl/native/CommitCallback.h subversion/bindings/javahl/native/CommitMessage.h subversion/bindings/javahl/native/CopySources.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/DiffOptions.h subversion/bindings/javahl/native/DiffSummaryReceiver.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/ExternalItem.hpp subversion/bindings/javahl/native/ImportFilterCallback.h subversion/bindings/javahl/native/InfoCallback.h subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/ListCallback.h subversion/bindings/javahl/native/LogMessageCallback.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/OutputStream.h subversion/bindings/javahl/native/PatchCallback.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/PropertyTable.h subversion/bindings/javahl/native/ProplistCallback.h subversion/bindings/javahl/native/RemoteSession.h subversion/bindings/javahl/native/RemoteSessionContext.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/RevisionRange.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/SVNClient.h subversion/bindings/javahl/native/StatusCallback.h subversion/bindings/javahl/native/StringArray.h subversion/bindings/javahl/native/Targets.h subversion/bindings/javahl/native/VersionExtended.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp subversion/bindings/javahl/native/jniwrapper/jni_list.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/SVNClient.cpp -subversion/bindings/javahl/native/SVNRepos.lo: subversion/bindings/javahl/native/SVNRepos.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/File.h subversion/bindings/javahl/native/InputStream.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/MessageReceiver.h subversion/bindings/javahl/native/OutputStream.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/ReposFreezeAction.h subversion/bindings/javahl/native/ReposNotifyCallback.h subversion/bindings/javahl/native/ReposVerifyCallback.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/SVNRepos.h subversion/bindings/javahl/native/StringArray.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/javahl/native/SVNRepos.lo: subversion/bindings/javahl/native/SVNRepos.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/File.h subversion/bindings/javahl/native/InputStream.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/MessageReceiver.h subversion/bindings/javahl/native/OutputStream.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/ReposFreezeAction.h subversion/bindings/javahl/native/ReposNotifyCallback.h subversion/bindings/javahl/native/ReposVerifyCallback.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/SVNRepos.h subversion/bindings/javahl/native/StringArray.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/SVNRepos.cpp -subversion/bindings/javahl/native/StateReporter.lo: subversion/bindings/javahl/native/StateReporter.cpp subversion/bindings/javahl/native/EditorProxy.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/StateReporter.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/javahl/native/StateReporter.lo: subversion/bindings/javahl/native/StateReporter.cpp subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/EditorProxy.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/StateReporter.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/StateReporter.cpp -subversion/bindings/javahl/native/StatusCallback.lo: subversion/bindings/javahl/native/StatusCallback.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/StatusCallback.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/StatusCallback.lo: subversion/bindings/javahl/native/StatusCallback.cpp subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/StatusCallback.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/StatusCallback.cpp -subversion/bindings/javahl/native/StringArray.lo: subversion/bindings/javahl/native/StringArray.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/StringArray.h subversion/include/private/svn_debug.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/bindings/javahl/native/StringArray.lo: subversion/bindings/javahl/native/StringArray.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/StringArray.h subversion/include/private/svn_debug.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/StringArray.cpp -subversion/bindings/javahl/native/SubversionException.lo: subversion/bindings/javahl/native/SubversionException.cpp subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SubversionException.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h +subversion/bindings/javahl/native/SubversionException.lo: subversion/bindings/javahl/native/SubversionException.cpp subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SubversionException.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/SubversionException.cpp -subversion/bindings/javahl/native/Targets.lo: subversion/bindings/javahl/native/Targets.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/StringArray.h subversion/bindings/javahl/native/Targets.h subversion/include/private/svn_debug.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/bindings/javahl/native/Targets.lo: subversion/bindings/javahl/native/Targets.cpp subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/StringArray.h subversion/bindings/javahl/native/Targets.h subversion/include/private/svn_debug.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/Targets.cpp -subversion/bindings/javahl/native/Utility.lo: subversion/bindings/javahl/native/Utility.cpp subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Utility.hpp subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/bindings/javahl/native/Utility.lo: subversion/bindings/javahl/native/Utility.cpp subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Utility.hpp subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/Utility.cpp -subversion/bindings/javahl/native/VersionExtended.lo: subversion/bindings/javahl/native/VersionExtended.cpp subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/VersionExtended.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_version.h +subversion/bindings/javahl/native/VersionExtended.lo: subversion/bindings/javahl/native/VersionExtended.cpp subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/VersionExtended.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/VersionExtended.cpp -subversion/bindings/javahl/native/deprecated.lo: subversion/bindings/javahl/native/deprecated.cpp subversion/bindings/javahl/native/ClientContext.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/SVNClient.h subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/deprecated.lo: subversion/bindings/javahl/native/deprecated.cpp subversion/bindings/javahl/native/ClientContext.h subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/SVNClient.h subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/deprecated.cpp -subversion/bindings/javahl/native/jniwrapper/jni_base.lo: subversion/bindings/javahl/native/jniwrapper/jni_base.cpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/bindings/javahl/native/jniwrapper/jni_base.lo: subversion/bindings/javahl/native/jniwrapper/jni_base.cpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/jniwrapper/jni_base.cpp -subversion/bindings/javahl/native/jniwrapper/jni_channel.lo: subversion/bindings/javahl/native/jniwrapper/jni_channel.cpp subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_channel.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/bindings/javahl/native/jniwrapper/jni_channel.lo: subversion/bindings/javahl/native/jniwrapper/jni_channel.cpp subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_channel.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/jniwrapper/jni_channel.cpp -subversion/bindings/javahl/native/jniwrapper/jni_class_cache.lo: subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp subversion/bindings/javahl/native/AuthnCallback.hpp subversion/bindings/javahl/native/Credential.hpp subversion/bindings/javahl/native/EditorCallbacks.hpp subversion/bindings/javahl/native/ExternalItem.hpp subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SubversionException.hpp subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_channel.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_io_stream.hpp subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp subversion/bindings/javahl/native/jniwrapper/jni_list.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/jniwrapper/jni_class_cache.lo: subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp subversion/bindings/javahl/native/AuthnCallback.hpp subversion/bindings/javahl/native/Credential.hpp subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/EditorCallbacks.hpp subversion/bindings/javahl/native/ExternalItem.hpp subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SubversionException.hpp subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_channel.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_io_stream.hpp subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp subversion/bindings/javahl/native/jniwrapper/jni_list.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp -subversion/bindings/javahl/native/jniwrapper/jni_io_stream.lo: subversion/bindings/javahl/native/jniwrapper/jni_io_stream.cpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_io_stream.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/bindings/javahl/native/jniwrapper/jni_io_stream.lo: subversion/bindings/javahl/native/jniwrapper/jni_io_stream.cpp subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_io_stream.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/jniwrapper/jni_io_stream.cpp subversion/bindings/javahl/native/jniwrapper/jni_iterator.lo: subversion/bindings/javahl/native/jniwrapper/jni_iterator.cpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/svn_private_config.h @@ -2352,55 +2245,55 @@ subversion/bindings/javahl/native/jniwrapper/jni_string_map.lo: subversion/bindi subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_NativeResources.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.cpp -subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNClient.h subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/BlameCallback.h subversion/bindings/javahl/native/ChangelistCallback.h subversion/bindings/javahl/native/ClientContext.h subversion/bindings/javahl/native/CommitCallback.h subversion/bindings/javahl/native/CommitMessage.h subversion/bindings/javahl/native/CopySources.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/DiffOptions.h subversion/bindings/javahl/native/DiffSummaryReceiver.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/ImportFilterCallback.h subversion/bindings/javahl/native/InfoCallback.h subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/ListCallback.h subversion/bindings/javahl/native/LogMessageCallback.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/OutputStream.h subversion/bindings/javahl/native/PatchCallback.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/PropertyTable.h subversion/bindings/javahl/native/ProplistCallback.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/RevisionRange.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/SVNClient.h subversion/bindings/javahl/native/StatusCallback.h subversion/bindings/javahl/native/StringArray.h subversion/bindings/javahl/native/Targets.h subversion/bindings/javahl/native/VersionExtended.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/version.h subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNClient.h subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/BlameCallback.h subversion/bindings/javahl/native/ChangelistCallback.h subversion/bindings/javahl/native/ClientContext.h subversion/bindings/javahl/native/CommitCallback.h subversion/bindings/javahl/native/CommitMessage.h subversion/bindings/javahl/native/CopySources.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/DiffOptions.h subversion/bindings/javahl/native/DiffSummaryReceiver.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/ImportFilterCallback.h subversion/bindings/javahl/native/InfoCallback.h subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/ListCallback.h subversion/bindings/javahl/native/LogMessageCallback.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/OutputStream.h subversion/bindings/javahl/native/PatchCallback.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/PropertyTable.h subversion/bindings/javahl/native/ProplistCallback.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/RevisionRange.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/SVNClient.h subversion/bindings/javahl/native/StatusCallback.h subversion/bindings/javahl/native/StringArray.h subversion/bindings/javahl/native/Targets.h subversion/bindings/javahl/native/VersionExtended.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/version.h subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp -subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNRepos.h subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/File.h subversion/bindings/javahl/native/InputStream.h subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/MessageReceiver.h subversion/bindings/javahl/native/OutputStream.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/ReposFreezeAction.h subversion/bindings/javahl/native/ReposNotifyCallback.h subversion/bindings/javahl/native/ReposVerifyCallback.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/SVNRepos.h subversion/bindings/javahl/native/StringArray.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNRepos.h subversion/bindings/javahl/native/Array.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/File.h subversion/bindings/javahl/native/InputStream.h subversion/bindings/javahl/native/JNIByteArray.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/MessageReceiver.h subversion/bindings/javahl/native/OutputStream.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/ReposFreezeAction.h subversion/bindings/javahl/native/ReposNotifyCallback.h subversion/bindings/javahl/native/ReposVerifyCallback.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/SVNRepos.h subversion/bindings/javahl/native/StringArray.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp -subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_CommitEditor.h subversion/bindings/javahl/native/CommitCallback.h subversion/bindings/javahl/native/CommitEditor.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_CommitEditor.h subversion/bindings/javahl/native/CommitCallback.h subversion/bindings/javahl/native/CommitEditor.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp -subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_RemoteFactory.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/RemoteSession.h subversion/bindings/javahl/native/RemoteSessionContext.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_RemoteFactory.h subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/RemoteSession.h subversion/bindings/javahl/native/RemoteSessionContext.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.cpp -subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_RemoteSession.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/RemoteSession.h subversion/bindings/javahl/native/RemoteSessionContext.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_RemoteSession.h subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/Prompter.h subversion/bindings/javahl/native/RemoteSession.h subversion/bindings/javahl/native/RemoteSessionContext.h subversion/bindings/javahl/native/Revision.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp -subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_StateReporter.h subversion/bindings/javahl/native/EditorProxy.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/StateReporter.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_StateReporter.h subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/EditorProxy.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/StateReporter.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.cpp -subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RevisionRangeList.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RevisionRangeList.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_types_RevisionRangeList.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/RevisionRangeList.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RevisionRangeList.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RevisionRangeList.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_types_RevisionRangeList.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/RevisionRangeList.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RevisionRangeList.cpp -subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RuntimeVersion.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RuntimeVersion.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_types_RuntimeVersion.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h +subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RuntimeVersion.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RuntimeVersion.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_types_RuntimeVersion.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_wc.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RuntimeVersion.cpp -subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Version.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_version.h +subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Version.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp -subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LinkedLib.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LinkedLibIterator.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LoadedLib.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LoadedLibIterator.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/VersionExtended.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/svn_private_config.h +subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LinkedLib.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LinkedLibIterator.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LoadedLib.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LoadedLibIterator.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/VersionExtended.h subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp -subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ConfigImpl_Category.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ConfigImpl_Category.h subversion/bindings/javahl/native/CreateJ.h subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OperationContext.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp -subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ConfigLib.h subversion/bindings/javahl/native/AuthnCallback.hpp subversion/bindings/javahl/native/Credential.hpp subversion/bindings/javahl/native/GlobalConfig.h subversion/bindings/javahl/native/JNICriticalSection.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SubversionException.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp subversion/bindings/javahl/native/jniwrapper/jni_list.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_x509.h subversion/svn_private_config.h +subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ConfigLib.h subversion/bindings/javahl/native/AuthnCallback.hpp subversion/bindings/javahl/native/Credential.hpp subversion/bindings/javahl/native/GlobalConfig.h subversion/bindings/javahl/native/JNICriticalSection.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SubversionException.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp subversion/bindings/javahl/native/jniwrapper/jni_list.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_x509.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp -subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_util_DiffLib.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OutputStream.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_util_DiffLib.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIStringHolder.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/OutputStream.h subversion/bindings/javahl/native/Path.h subversion/bindings/javahl/native/Pool.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp -subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_util_PropLib.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/ExternalItem.hpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SubversionException.hpp subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_io_stream.hpp subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp subversion/bindings/javahl/native/jniwrapper/jni_list.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_util_PropLib.h subversion/bindings/javahl/native/EnumMapper.h subversion/bindings/javahl/native/ExternalItem.hpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SubversionException.hpp subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_io_stream.hpp subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp subversion/bindings/javahl/native/jniwrapper/jni_list.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp -subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_util_SubstLib.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/NativeStream.hpp subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/Utility.hpp subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_io_stream.hpp subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_util_SubstLib.h subversion/bindings/javahl/native/CxxCompat.hpp subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/NativeStream.hpp subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/SVNBase.h subversion/bindings/javahl/native/Utility.hpp subversion/bindings/javahl/native/jniwrapper/jni_array.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_io_stream.hpp subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/bindings/javahl/native/jniwrapper/jni_string.hpp subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp -subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_util_RequestChannel.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ResponseChannel.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_TunnelChannel.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/jniwrapper/jni_channel.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.lo: subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.cpp subversion/bindings/javahl/include/org_apache_subversion_javahl_util_RequestChannel.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ResponseChannel.h subversion/bindings/javahl/include/org_apache_subversion_javahl_util_TunnelChannel.h subversion/bindings/javahl/native/JNIStackElement.h subversion/bindings/javahl/native/JNIUtil.h subversion/bindings/javahl/native/Pool.h subversion/bindings/javahl/native/jniwrapper/jni_channel.hpp subversion/bindings/javahl/native/jniwrapper/jni_env.hpp subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp subversion/bindings/javahl/native/jniwrapper/jni_object.hpp subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h $(COMPILE_JAVAHL_CXX) $(canonicalized_srcdir)subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.cpp -subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.lo: subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl__pre_perl.h subversion/bindings/swig/proxy/swig_perl_external_runtime.swg subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.lo: subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl__pre_perl.h subversion/bindings/swig/proxy/swig_perl_external_runtime.swg subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_SWIG_PL) $(canonicalized_srcdir)subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c subversion/bindings/swig/perl/native/core.lo: subversion/bindings/swig/perl/native/core.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h @@ -2430,7 +2323,7 @@ subversion/bindings/swig/perl/native/svn_wc.lo: subversion/bindings/swig/perl/na subversion/bindings/swig/python/core.lo: subversion/bindings/swig/python/core.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/core.c -subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.lo: subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c subversion/bindings/swig/proxy/swig_python_external_runtime.swg subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.lo: subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c subversion/bindings/swig/proxy/swig_python_external_runtime.swg subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_SWIG_PY) $(canonicalized_srcdir)subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c subversion/bindings/swig/python/svn_client.lo: subversion/bindings/swig/python/svn_client.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h @@ -2457,7 +2350,7 @@ subversion/bindings/swig/python/svn_wc.lo: subversion/bindings/swig/python/svn_w subversion/bindings/swig/ruby/core.lo: subversion/bindings/swig/ruby/core.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/core.c -subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.lo: subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_nls.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.lo: subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_nls.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn_private_config.h $(COMPILE_SWIG_RB) $(canonicalized_srcdir)subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c subversion/bindings/swig/ruby/svn_client.lo: subversion/bindings/swig/ruby/svn_client.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h @@ -2481,808 +2374,812 @@ subversion/bindings/swig/ruby/svn_repos.lo: subversion/bindings/swig/ruby/svn_re subversion/bindings/swig/ruby/svn_wc.lo: subversion/bindings/swig/ruby/svn_wc.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h $(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/svn_wc.c -subversion/libsvn_auth_gnome_keyring/gnome_keyring.lo: subversion/libsvn_auth_gnome_keyring/gnome_keyring.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/svn_private_config.h +subversion/libsvn_auth_gnome_keyring/gnome_keyring.lo: subversion/libsvn_auth_gnome_keyring/gnome_keyring.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/svn_private_config.h $(COMPILE_SHARED_ONLY_LIB) $(canonicalized_srcdir)subversion/libsvn_auth_gnome_keyring/gnome_keyring.c -subversion/libsvn_auth_gnome_keyring/version.lo: subversion/libsvn_auth_gnome_keyring/version.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h +subversion/libsvn_auth_gnome_keyring/version.lo: subversion/libsvn_auth_gnome_keyring/version.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h $(COMPILE_SHARED_ONLY_LIB) $(canonicalized_srcdir)subversion/libsvn_auth_gnome_keyring/version.c -subversion/libsvn_auth_kwallet/kwallet.lo: subversion/libsvn_auth_kwallet/kwallet.cpp subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/svn_private_config.h +subversion/libsvn_auth_kwallet/kwallet.lo: subversion/libsvn_auth_kwallet/kwallet.cpp subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/svn_private_config.h $(COMPILE_SHARED_ONLY_CXX_LIB) $(canonicalized_srcdir)subversion/libsvn_auth_kwallet/kwallet.cpp -subversion/libsvn_auth_kwallet/version.lo: subversion/libsvn_auth_kwallet/version.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h +subversion/libsvn_auth_kwallet/version.lo: subversion/libsvn_auth_kwallet/version.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h $(COMPILE_SHARED_ONLY_CXX_LIB) $(canonicalized_srcdir)subversion/libsvn_auth_kwallet/version.c -subversion/libsvn_client/add.lo: subversion/libsvn_client/add.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/add.lo: subversion/libsvn_client/add.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h + +subversion/libsvn_client/blame.lo: subversion/libsvn_client/blame.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/blame.lo: subversion/libsvn_client/blame.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/cat.lo: subversion/libsvn_client/cat.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/cat.lo: subversion/libsvn_client/cat.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/changelist.lo: subversion/libsvn_client/changelist.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/changelist.lo: subversion/libsvn_client/changelist.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/checkout.lo: subversion/libsvn_client/checkout.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/checkout.lo: subversion/libsvn_client/checkout.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/cleanup.lo: subversion/libsvn_client/cleanup.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/cleanup.lo: subversion/libsvn_client/cleanup.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/cmdline.lo: subversion/libsvn_client/cmdline.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_opt_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/cmdline.lo: subversion/libsvn_client/cmdline.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_opt_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/commit.lo: subversion/libsvn_client/commit.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/commit.lo: subversion/libsvn_client/commit.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/commit_util.lo: subversion/libsvn_client/commit_util.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/commit_util.lo: subversion/libsvn_client/commit_util.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/compat_providers.lo: subversion/libsvn_client/compat_providers.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h -subversion/libsvn_client/compat_providers.lo: subversion/libsvn_client/compat_providers.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h +subversion/libsvn_client/conflicts.lo: subversion/libsvn_client/conflicts.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/conflicts.lo: subversion/libsvn_client/conflicts.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/copy.lo: subversion/libsvn_client/copy.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h -subversion/libsvn_client/copy.lo: subversion/libsvn_client/copy.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h +subversion/libsvn_client/ctx.lo: subversion/libsvn_client/ctx.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h -subversion/libsvn_client/copy_foreign.lo: subversion/libsvn_client/copy_foreign.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/delete.lo: subversion/libsvn_client/delete.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/ctx.lo: subversion/libsvn_client/ctx.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h +subversion/libsvn_client/deprecated.lo: subversion/libsvn_client/deprecated.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h -subversion/libsvn_client/delete.lo: subversion/libsvn_client/delete.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/diff.lo: subversion/libsvn_client/diff.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_io_private.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/deprecated.lo: subversion/libsvn_client/deprecated.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h +subversion/libsvn_client/diff_local.lo: subversion/libsvn_client/diff_local.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/diff.lo: subversion/libsvn_client/diff.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_io_private.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/diff_summarize.lo: subversion/libsvn_client/diff_summarize.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h -subversion/libsvn_client/diff_local.lo: subversion/libsvn_client/diff_local.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/export.lo: subversion/libsvn_client/export.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/diff_summarize.lo: subversion/libsvn_client/diff_summarize.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h +subversion/libsvn_client/externals.lo: subversion/libsvn_client/externals.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/export.lo: subversion/libsvn_client/export.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/import.lo: subversion/libsvn_client/import.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/externals.lo: subversion/libsvn_client/externals.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/info.lo: subversion/libsvn_client/info.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/import.lo: subversion/libsvn_client/import.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/iprops.lo: subversion/libsvn_client/iprops.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/info.lo: subversion/libsvn_client/info.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/layout.lo: subversion/libsvn_client/layout.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/iprops.lo: subversion/libsvn_client/iprops.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/list.lo: subversion/libsvn_client/list.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/list.lo: subversion/libsvn_client/list.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/locking_commands.lo: subversion/libsvn_client/locking_commands.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/locking_commands.lo: subversion/libsvn_client/locking_commands.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/log.lo: subversion/libsvn_client/log.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/log.lo: subversion/libsvn_client/log.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/merge.lo: subversion/libsvn_client/merge.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h -subversion/libsvn_client/merge.lo: subversion/libsvn_client/merge.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h +subversion/libsvn_client/merge_elements.lo: subversion/libsvn_client/merge_elements.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_element.h subversion/include/private/svn_magic.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/merge_elements.lo: subversion/libsvn_client/merge_elements.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_element.h subversion/include/private/svn_magic.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/mergeinfo.lo: subversion/libsvn_client/mergeinfo.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h -subversion/libsvn_client/mergeinfo.lo: subversion/libsvn_client/mergeinfo.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h +subversion/libsvn_client/mtcc.lo: subversion/libsvn_client/mtcc.c subversion/include/private/svn_client_mtcc.h subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/mtcc.lo: subversion/libsvn_client/mtcc.c subversion/include/private/svn_client_mtcc.h subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/patch.lo: subversion/libsvn_client/patch.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/patch.lo: subversion/libsvn_client/patch.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/prop_commands.lo: subversion/libsvn_client/prop_commands.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/prop_commands.lo: subversion/libsvn_client/prop_commands.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/ra.lo: subversion/libsvn_client/ra.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h -subversion/libsvn_client/ra.lo: subversion/libsvn_client/ra.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h +subversion/libsvn_client/relocate.lo: subversion/libsvn_client/relocate.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/relocate.lo: subversion/libsvn_client/relocate.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/repos_diff.lo: subversion/libsvn_client/repos_diff.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/repos_diff.lo: subversion/libsvn_client/repos_diff.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/resolved.lo: subversion/libsvn_client/resolved.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/resolved.lo: subversion/libsvn_client/resolved.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/revert.lo: subversion/libsvn_client/revert.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/revert.lo: subversion/libsvn_client/revert.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/revisions.lo: subversion/libsvn_client/revisions.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/revisions.lo: subversion/libsvn_client/revisions.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/shelf.lo: subversion/libsvn_client/shelf.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/shelve.lo: subversion/libsvn_client/shelve.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/status.lo: subversion/libsvn_client/status.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/status.lo: subversion/libsvn_client/status.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/switch.lo: subversion/libsvn_client/switch.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/switch.lo: subversion/libsvn_client/switch.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/update.lo: subversion/libsvn_client/update.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/update.lo: subversion/libsvn_client/update.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/upgrade.lo: subversion/libsvn_client/upgrade.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/upgrade.lo: subversion/libsvn_client/upgrade.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/url.lo: subversion/libsvn_client/url.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/url.lo: subversion/libsvn_client/url.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/util.lo: subversion/libsvn_client/util.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_client/util.lo: subversion/libsvn_client/util.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h +subversion/libsvn_client/version.lo: subversion/libsvn_client/version.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_wc.h -subversion/libsvn_client/version.lo: subversion/libsvn_client/version.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h +subversion/libsvn_client/wc_editor.lo: subversion/libsvn_client/wc_editor.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h -subversion/libsvn_delta/branch.lo: subversion/libsvn_delta/branch.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_impl.h subversion/include/private/svn_debug.h subversion/include/private/svn_element.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_delta/branch.lo: subversion/libsvn_delta/branch.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_impl.h subversion/include/private/svn_debug.h subversion/include/private/svn_element.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_delta/branch_compat.lo: subversion/libsvn_delta/branch_compat.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_compat.h subversion/include/private/svn_branch_impl.h subversion/include/private/svn_branch_nested.h subversion/include/private/svn_branch_repos.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/private/svn_element.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_delta/branch_compat.lo: subversion/libsvn_delta/branch_compat.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_compat.h subversion/include/private/svn_branch_impl.h subversion/include/private/svn_branch_nested.h subversion/include/private/svn_branch_repos.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/private/svn_element.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_delta/branch_migrate.lo: subversion/libsvn_delta/branch_migrate.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_compat.h subversion/include/private/svn_debug.h subversion/include/private/svn_element.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_delta/branch_migrate.lo: subversion/libsvn_delta/branch_migrate.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_compat.h subversion/include/private/svn_debug.h subversion/include/private/svn_element.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_delta/branch_nested.lo: subversion/libsvn_delta/branch_nested.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_impl.h subversion/include/private/svn_branch_nested.h subversion/include/private/svn_branch_repos.h subversion/include/private/svn_debug.h subversion/include/private/svn_element.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_delta/branch_nested.lo: subversion/libsvn_delta/branch_nested.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_impl.h subversion/include/private/svn_branch_nested.h subversion/include/private/svn_branch_repos.h subversion/include/private/svn_debug.h subversion/include/private/svn_element.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_delta/branch_repos.lo: subversion/libsvn_delta/branch_repos.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_repos.h subversion/include/private/svn_debug.h subversion/include/private/svn_element.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_delta/branch_repos.lo: subversion/libsvn_delta/branch_repos.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_repos.h subversion/include/private/svn_debug.h subversion/include/private/svn_element.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_delta/cancel.lo: subversion/libsvn_delta/cancel.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_delta/cancel.lo: subversion/libsvn_delta/cancel.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_delta/compat.lo: subversion/libsvn_delta/compat.c subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_delta/compat.lo: subversion/libsvn_delta/compat.c subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_delta/compose_delta.lo: subversion/libsvn_delta/compose_delta.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_delta/delta.h +subversion/libsvn_delta/compose_delta.lo: subversion/libsvn_delta/compose_delta.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_delta/delta.h -subversion/libsvn_delta/debug_editor.lo: subversion/libsvn_delta/debug_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_delta/debug_editor.lo: subversion/libsvn_delta/debug_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_delta/default_editor.lo: subversion/libsvn_delta/default_editor.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_delta/default_editor.lo: subversion/libsvn_delta/default_editor.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_delta/deprecated.lo: subversion/libsvn_delta/deprecated.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_delta/deprecated.lo: subversion/libsvn_delta/deprecated.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_delta/depth_filter_editor.lo: subversion/libsvn_delta/depth_filter_editor.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_delta/depth_filter_editor.lo: subversion/libsvn_delta/depth_filter_editor.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_delta/editor.lo: subversion/libsvn_delta/editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_delta/editor.lo: subversion/libsvn_delta/editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_delta/element.lo: subversion/libsvn_delta/element.c subversion/include/private/svn_debug.h subversion/include/private/svn_element.h subversion/include/private/svn_sorts_private.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_iter.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_delta/element.lo: subversion/libsvn_delta/element.c subversion/include/private/svn_debug.h subversion/include/private/svn_element.h subversion/include/private/svn_sorts_private.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_iter.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_delta/path_driver.lo: subversion/libsvn_delta/path_driver.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_delta/path_driver.lo: subversion/libsvn_delta/path_driver.c subversion/include/private/svn_debug.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_delta/svndiff.lo: subversion/libsvn_delta/svndiff.c subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_error_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_delta/delta.h subversion/svn_private_config.h +subversion/libsvn_delta/svndiff.lo: subversion/libsvn_delta/svndiff.c subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_error_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_delta/delta.h subversion/svn_private_config.h -subversion/libsvn_delta/text_delta.lo: subversion/libsvn_delta/text_delta.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_delta/delta.h +subversion/libsvn_delta/text_delta.lo: subversion/libsvn_delta/text_delta.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_delta/delta.h -subversion/libsvn_delta/version.lo: subversion/libsvn_delta/version.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h +subversion/libsvn_delta/version.lo: subversion/libsvn_delta/version.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h -subversion/libsvn_delta/xdelta.lo: subversion/libsvn_delta/xdelta.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_delta/delta.h +subversion/libsvn_delta/xdelta.lo: subversion/libsvn_delta/xdelta.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_delta/delta.h -subversion/libsvn_diff/binary_diff.lo: subversion/libsvn_diff/binary_diff.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_diff/diff.h subversion/svn_private_config.h +subversion/libsvn_diff/binary_diff.lo: subversion/libsvn_diff/binary_diff.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_diff/diff.h subversion/svn_private_config.h -subversion/libsvn_diff/deprecated.lo: subversion/libsvn_diff/deprecated.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h +subversion/libsvn_diff/deprecated.lo: subversion/libsvn_diff/deprecated.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/svn_private_config.h -subversion/libsvn_diff/diff.lo: subversion/libsvn_diff/diff.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_diff/diff.h +subversion/libsvn_diff/diff.lo: subversion/libsvn_diff/diff.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_diff/diff.h -subversion/libsvn_diff/diff3.lo: subversion/libsvn_diff/diff3.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_diff/diff.h +subversion/libsvn_diff/diff3.lo: subversion/libsvn_diff/diff3.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_diff/diff.h -subversion/libsvn_diff/diff4.lo: subversion/libsvn_diff/diff4.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_diff/diff.h +subversion/libsvn_diff/diff4.lo: subversion/libsvn_diff/diff4.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_diff/diff.h -subversion/libsvn_diff/diff_file.lo: subversion/libsvn_diff/diff_file.c subversion/include/private/svn_adler32.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/libsvn_diff/diff.h subversion/svn_private_config.h +subversion/libsvn_diff/diff_file.lo: subversion/libsvn_diff/diff_file.c subversion/include/private/svn_adler32.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/libsvn_diff/diff.h subversion/svn_private_config.h -subversion/libsvn_diff/diff_memory.lo: subversion/libsvn_diff/diff_memory.c subversion/include/private/svn_adler32.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/libsvn_diff/diff.h subversion/svn_private_config.h +subversion/libsvn_diff/diff_memory.lo: subversion/libsvn_diff/diff_memory.c subversion/include/private/svn_adler32.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/libsvn_diff/diff.h subversion/svn_private_config.h -subversion/libsvn_diff/diff_tree.lo: subversion/libsvn_diff/diff_tree.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_diff/diff_tree.lo: subversion/libsvn_diff/diff_tree.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_diff/lcs.lo: subversion/libsvn_diff/lcs.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_diff/diff.h +subversion/libsvn_diff/lcs.lo: subversion/libsvn_diff/lcs.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_diff/diff.h -subversion/libsvn_diff/parse-diff.lo: subversion/libsvn_diff/parse-diff.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/libsvn_diff/diff.h subversion/svn_private_config.h +subversion/libsvn_diff/parse-diff.lo: subversion/libsvn_diff/parse-diff.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/libsvn_diff/diff.h subversion/svn_private_config.h -subversion/libsvn_diff/token.lo: subversion/libsvn_diff/token.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_diff/diff.h +subversion/libsvn_diff/token.lo: subversion/libsvn_diff/token.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_diff/diff.h -subversion/libsvn_diff/util.lo: subversion/libsvn_diff/util.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_diff/diff.h subversion/svn_private_config.h +subversion/libsvn_diff/util.lo: subversion/libsvn_diff/util.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_diff/diff.h subversion/svn_private_config.h -subversion/libsvn_fs/access.lo: subversion/libsvn_fs/access.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h +subversion/libsvn_fs/access.lo: subversion/libsvn_fs/access.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h -subversion/libsvn_fs/deprecated.lo: subversion/libsvn_fs/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_fs/deprecated.lo: subversion/libsvn_fs/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_fs/editor.lo: subversion/libsvn_fs/editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs/editor.lo: subversion/libsvn_fs/editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs/fs-loader.lo: subversion/libsvn_fs/fs-loader.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs/fs-loader.lo: subversion/libsvn_fs/fs-loader.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/bdb/bdb-err.lo: subversion/libsvn_fs_base/bdb/bdb-err.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/bdb/bdb-err.lo: subversion/libsvn_fs_base/bdb/bdb-err.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h subversion/libsvn_fs_base/bdb/bdb_compat.lo: subversion/libsvn_fs_base/bdb/bdb_compat.c subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/svn_private_config.h -subversion/libsvn_fs_base/bdb/changes-table.lo: subversion/libsvn_fs_base/bdb/changes-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/bdb/changes-table.lo: subversion/libsvn_fs_base/bdb/changes-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/bdb/checksum-reps-table.lo: subversion/libsvn_fs_base/bdb/checksum-reps-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/checksum-reps-table.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/bdb/checksum-reps-table.lo: subversion/libsvn_fs_base/bdb/checksum-reps-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/checksum-reps-table.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/bdb/copies-table.lo: subversion/libsvn_fs_base/bdb/copies-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/copies-table.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/bdb/copies-table.lo: subversion/libsvn_fs_base/bdb/copies-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/copies-table.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/bdb/dbt.lo: subversion/libsvn_fs_base/bdb/dbt.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/id.h subversion/svn_private_config.h +subversion/libsvn_fs_base/bdb/dbt.lo: subversion/libsvn_fs_base/bdb/dbt.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/id.h subversion/svn_private_config.h -subversion/libsvn_fs_base/bdb/env.lo: subversion/libsvn_fs_base/bdb/env.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/svn_private_config.h +subversion/libsvn_fs_base/bdb/env.lo: subversion/libsvn_fs_base/bdb/env.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/svn_private_config.h -subversion/libsvn_fs_base/bdb/lock-tokens-table.lo: subversion/libsvn_fs_base/bdb/lock-tokens-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/lock-tokens-table.h subversion/libsvn_fs_base/bdb/locks-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/bdb/lock-tokens-table.lo: subversion/libsvn_fs_base/bdb/lock-tokens-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/lock-tokens-table.h subversion/libsvn_fs_base/bdb/locks-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/bdb/locks-table.lo: subversion/libsvn_fs_base/bdb/locks-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/lock-tokens-table.h subversion/libsvn_fs_base/bdb/locks-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/bdb/locks-table.lo: subversion/libsvn_fs_base/bdb/locks-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/lock-tokens-table.h subversion/libsvn_fs_base/bdb/locks-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/bdb/miscellaneous-table.lo: subversion/libsvn_fs_base/bdb/miscellaneous-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/miscellaneous-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/bdb/miscellaneous-table.lo: subversion/libsvn_fs_base/bdb/miscellaneous-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/miscellaneous-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/bdb/node-origins-table.lo: subversion/libsvn_fs_base/bdb/node-origins-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/bdb/node-origins-table.lo: subversion/libsvn_fs_base/bdb/node-origins-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/bdb/nodes-table.lo: subversion/libsvn_fs_base/bdb/nodes-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/bdb/nodes-table.lo: subversion/libsvn_fs_base/bdb/nodes-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/bdb/reps-table.lo: subversion/libsvn_fs_base/bdb/reps-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/reps-table.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/bdb/reps-table.lo: subversion/libsvn_fs_base/bdb/reps-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/reps-table.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/bdb/rev-table.lo: subversion/libsvn_fs_base/bdb/rev-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/bdb/rev-table.lo: subversion/libsvn_fs_base/bdb/rev-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/bdb/strings-table.lo: subversion/libsvn_fs_base/bdb/strings-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/bdb/strings-table.lo: subversion/libsvn_fs_base/bdb/strings-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/bdb/txn-table.lo: subversion/libsvn_fs_base/bdb/txn-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/bdb/txn-table.lo: subversion/libsvn_fs_base/bdb/txn-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/bdb/uuids-table.lo: subversion/libsvn_fs_base/bdb/uuids-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/uuids-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/bdb/uuids-table.lo: subversion/libsvn_fs_base/bdb/uuids-table.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/dbt.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/uuids-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/dag.lo: subversion/libsvn_fs_base/dag.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/checksum-reps-table.h subversion/libsvn_fs_base/bdb/copies-table.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/bdb/reps-table.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/dag.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/node-rev.h subversion/libsvn_fs_base/reps-strings.h subversion/libsvn_fs_base/revs-txns.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/dag.lo: subversion/libsvn_fs_base/dag.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/checksum-reps-table.h subversion/libsvn_fs_base/bdb/copies-table.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/bdb/reps-table.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/dag.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/node-rev.h subversion/libsvn_fs_base/reps-strings.h subversion/libsvn_fs_base/revs-txns.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/err.lo: subversion/libsvn_fs_base/err.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/err.lo: subversion/libsvn_fs_base/err.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/fs.lo: subversion/libsvn_fs_base/fs.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/checksum-reps-table.h subversion/libsvn_fs_base/bdb/copies-table.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/lock-tokens-table.h subversion/libsvn_fs_base/bdb/locks-table.h subversion/libsvn_fs_base/bdb/miscellaneous-table.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/bdb/reps-table.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/bdb/uuids-table.h subversion/libsvn_fs_base/dag.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/lock.h subversion/libsvn_fs_base/revs-txns.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/libsvn_fs_base/uuid.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/fs.lo: subversion/libsvn_fs_base/fs.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/checksum-reps-table.h subversion/libsvn_fs_base/bdb/copies-table.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/lock-tokens-table.h subversion/libsvn_fs_base/bdb/locks-table.h subversion/libsvn_fs_base/bdb/miscellaneous-table.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/bdb/reps-table.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/bdb/uuids-table.h subversion/libsvn_fs_base/dag.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/lock.h subversion/libsvn_fs_base/revs-txns.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/libsvn_fs_base/uuid.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/id.lo: subversion/libsvn_fs_base/id.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h +subversion/libsvn_fs_base/id.lo: subversion/libsvn_fs_base/id.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h -subversion/libsvn_fs_base/key-gen.lo: subversion/libsvn_fs_base/key-gen.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_base/key-gen.h +subversion/libsvn_fs_base/key-gen.lo: subversion/libsvn_fs_base/key-gen.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_base/key-gen.h -subversion/libsvn_fs_base/lock.lo: subversion/libsvn_fs_base/lock.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/lock-tokens-table.h subversion/libsvn_fs_base/bdb/locks-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/lock.h subversion/libsvn_fs_base/revs-txns.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/lock.lo: subversion/libsvn_fs_base/lock.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/lock-tokens-table.h subversion/libsvn_fs_base/bdb/locks-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/lock.h subversion/libsvn_fs_base/revs-txns.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/node-rev.lo: subversion/libsvn_fs_base/node-rev.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/node-rev.h subversion/libsvn_fs_base/reps-strings.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/node-rev.lo: subversion/libsvn_fs_base/node-rev.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/node-rev.h subversion/libsvn_fs_base/reps-strings.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/reps-strings.lo: subversion/libsvn_fs_base/reps-strings.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/reps-table.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/reps-strings.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/reps-strings.lo: subversion/libsvn_fs_base/reps-strings.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/reps-table.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/reps-strings.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/revs-txns.lo: subversion/libsvn_fs_base/revs-txns.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/copies-table.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/dag.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/revs-txns.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/revs-txns.lo: subversion/libsvn_fs_base/revs-txns.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/copies-table.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/dag.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/revs-txns.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/trail.lo: subversion/libsvn_fs_base/trail.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/trail.lo: subversion/libsvn_fs_base/trail.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/tree.lo: subversion/libsvn_fs_base/tree.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/copies-table.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/miscellaneous-table.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/dag.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/lock.h subversion/libsvn_fs_base/node-rev.h subversion/libsvn_fs_base/revs-txns.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/tree.lo: subversion/libsvn_fs_base/tree.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/copies-table.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/miscellaneous-table.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/dag.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/lock.h subversion/libsvn_fs_base/node-rev.h subversion/libsvn_fs_base/revs-txns.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_base/util/fs_skels.lo: subversion/libsvn_fs_base/util/fs_skels.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_skel.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/util/fs_skels.h subversion/svn_private_config.h +subversion/libsvn_fs_base/util/fs_skels.lo: subversion/libsvn_fs_base/util/fs_skels.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_skel.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/util/fs_skels.h subversion/svn_private_config.h -subversion/libsvn_fs_base/uuid.lo: subversion/libsvn_fs_base/uuid.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/uuids-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/uuid.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_base/uuid.lo: subversion/libsvn_fs_base/uuid.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/uuids-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/uuid.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/cached_data.lo: subversion/libsvn_fs_fs/cached_data.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_delta/delta.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/cached_data.lo: subversion/libsvn_fs_fs/cached_data.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_delta/delta.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/caching.lo: subversion/libsvn_fs_fs/caching.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/dag.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/tree.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/caching.lo: subversion/libsvn_fs_fs/caching.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/dag.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/tree.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/dag.lo: subversion/libsvn_fs_fs/dag.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/dag.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/dag.lo: subversion/libsvn_fs_fs/dag.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/dag.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/dump-index.lo: subversion/libsvn_fs_fs/dump-index.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h +subversion/libsvn_fs_fs/dump-index.lo: subversion/libsvn_fs_fs/dump-index.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h -subversion/libsvn_fs_fs/fs.lo: subversion/libsvn_fs_fs/fs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/hotcopy.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/recovery.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_fs/tree.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_fs/verify.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/fs.lo: subversion/libsvn_fs_fs/fs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/hotcopy.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/recovery.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_fs/tree.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_fs/verify.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/fs_fs.lo: subversion/libsvn_fs_fs/fs_fs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_io_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_fs/tree.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/fs_fs.lo: subversion/libsvn_fs_fs/fs_fs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_io_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_fs/tree.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/hotcopy.lo: subversion/libsvn_fs_fs/hotcopy.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/hotcopy.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/recovery.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/hotcopy.lo: subversion/libsvn_fs_fs/hotcopy.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/hotcopy.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/recovery.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/id.lo: subversion/libsvn_fs_fs/id.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_x/fs_init.h +subversion/libsvn_fs_fs/id.lo: subversion/libsvn_fs_fs/id.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_x/fs_init.h -subversion/libsvn_fs_fs/index.lo: subversion/libsvn_fs_fs/index.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/index.lo: subversion/libsvn_fs_fs/index.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/load-index.lo: subversion/libsvn_fs_fs/load-index.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_fs/util.h +subversion/libsvn_fs_fs/load-index.lo: subversion/libsvn_fs_fs/load-index.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_fs/util.h -subversion/libsvn_fs_fs/lock.lo: subversion/libsvn_fs_fs/lock.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/tree.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/lock.lo: subversion/libsvn_fs_fs/lock.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/tree.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/low_level.lo: subversion/libsvn_fs_fs/low_level.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/low_level.lo: subversion/libsvn_fs_fs/low_level.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/pack.lo: subversion/libsvn_fs_fs/pack.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/pack.lo: subversion/libsvn_fs_fs/pack.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/recovery.lo: subversion/libsvn_fs_fs/recovery.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/recovery.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/recovery.lo: subversion/libsvn_fs_fs/recovery.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/recovery.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/rep-cache.lo: subversion/libsvn_fs_fs/rep-cache.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/rep-cache-db.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/rep-cache.lo: subversion/libsvn_fs_fs/rep-cache.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/rep-cache-db.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/rev_file.lo: subversion/libsvn_fs_fs/rev_file.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/rev_file.lo: subversion/libsvn_fs_fs/rev_file.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/revprops.lo: subversion/libsvn_fs_fs/revprops.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/revprops.lo: subversion/libsvn_fs_fs/revprops.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/stats.lo: subversion/libsvn_fs_fs/stats.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/stats.lo: subversion/libsvn_fs_fs/stats.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/temp_serializer.lo: subversion/libsvn_fs_fs/temp_serializer.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/temp_serializer.h +subversion/libsvn_fs_fs/temp_serializer.lo: subversion/libsvn_fs_fs/temp_serializer.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/temp_serializer.h -subversion/libsvn_fs_fs/transaction.lo: subversion/libsvn_fs_fs/transaction.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_fs/tree.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/transaction.lo: subversion/libsvn_fs_fs/transaction.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_fs/tree.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/tree.lo: subversion/libsvn_fs_fs/tree.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/dag.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_fs/tree.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/tree.lo: subversion/libsvn_fs_fs/tree.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/dag.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/transaction.h subversion/libsvn_fs_fs/tree.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/util.lo: subversion/libsvn_fs_fs/util.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/util.lo: subversion/libsvn_fs_fs/util.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_fs/verify.lo: subversion/libsvn_fs_fs/verify.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_fs/verify.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_fs/verify.lo: subversion/libsvn_fs_fs/verify.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/cached_data.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/revprops.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_fs/verify.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_util/fs-util.lo: subversion/libsvn_fs_util/fs-util.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h +subversion/libsvn_fs_util/fs-util.lo: subversion/libsvn_fs_util/fs-util.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h -subversion/libsvn_fs_x/batch_fsync.lo: subversion/libsvn_fs_x/batch_fsync.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_x/batch_fsync.h subversion/svn_private_config.h +subversion/libsvn_fs_x/batch_fsync.lo: subversion/libsvn_fs_x/batch_fsync.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_x/batch_fsync.h subversion/svn_private_config.h -subversion/libsvn_fs_x/cached_data.lo: subversion/libsvn_fs_x/cached_data.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_delta/delta.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/changes.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/noderevs.h subversion/libsvn_fs_x/pack.h subversion/libsvn_fs_x/reps.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/temp_serializer.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h +subversion/libsvn_fs_x/cached_data.lo: subversion/libsvn_fs_x/cached_data.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_delta/delta.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/changes.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/noderevs.h subversion/libsvn_fs_x/pack.h subversion/libsvn_fs_x/reps.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/temp_serializer.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h -subversion/libsvn_fs_x/caching.lo: subversion/libsvn_fs_x/caching.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/changes.h subversion/libsvn_fs_x/dag.h subversion/libsvn_fs_x/dag_cache.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/noderevs.h subversion/libsvn_fs_x/reps.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/temp_serializer.h subversion/svn_private_config.h +subversion/libsvn_fs_x/caching.lo: subversion/libsvn_fs_x/caching.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/changes.h subversion/libsvn_fs_x/dag.h subversion/libsvn_fs_x/dag_cache.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/noderevs.h subversion/libsvn_fs_x/reps.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/temp_serializer.h subversion/svn_private_config.h -subversion/libsvn_fs_x/changes.lo: subversion/libsvn_fs_x/changes.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_packed_data.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_x/changes.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/string_table.h subversion/libsvn_fs_x/temp_serializer.h subversion/svn_private_config.h +subversion/libsvn_fs_x/changes.lo: subversion/libsvn_fs_x/changes.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_packed_data.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_x/changes.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/string_table.h subversion/libsvn_fs_x/temp_serializer.h subversion/svn_private_config.h -subversion/libsvn_fs_x/dag.lo: subversion/libsvn_fs_x/dag.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/dag.h subversion/libsvn_fs_x/dag_cache.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_id.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/temp_serializer.h subversion/libsvn_fs_x/transaction.h subversion/svn_private_config.h +subversion/libsvn_fs_x/dag.lo: subversion/libsvn_fs_x/dag.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/dag.h subversion/libsvn_fs_x/dag_cache.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_id.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/temp_serializer.h subversion/libsvn_fs_x/transaction.h subversion/svn_private_config.h -subversion/libsvn_fs_x/dag_cache.lo: subversion/libsvn_fs_x/dag_cache.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/dag.h subversion/libsvn_fs_x/dag_cache.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_id.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/lock.h subversion/libsvn_fs_x/pack.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/temp_serializer.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/tree.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h +subversion/libsvn_fs_x/dag_cache.lo: subversion/libsvn_fs_x/dag_cache.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/dag.h subversion/libsvn_fs_x/dag_cache.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_id.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/lock.h subversion/libsvn_fs_x/pack.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/temp_serializer.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/tree.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h -subversion/libsvn_fs_x/fs.lo: subversion/libsvn_fs_x/fs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/dag.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/hotcopy.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/lock.h subversion/libsvn_fs_x/pack.h subversion/libsvn_fs_x/recovery.h subversion/libsvn_fs_x/rep-cache.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/revprops.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/tree.h subversion/libsvn_fs_x/util.h subversion/libsvn_fs_x/verify.h subversion/svn_private_config.h +subversion/libsvn_fs_x/fs.lo: subversion/libsvn_fs_x/fs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/dag.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/hotcopy.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/lock.h subversion/libsvn_fs_x/pack.h subversion/libsvn_fs_x/recovery.h subversion/libsvn_fs_x/rep-cache.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/revprops.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/tree.h subversion/libsvn_fs_x/util.h subversion/libsvn_fs_x/verify.h subversion/svn_private_config.h -subversion/libsvn_fs_x/fs_id.lo: subversion/libsvn_fs_x/fs_id.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_id.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/rev_file.h +subversion/libsvn_fs_x/fs_id.lo: subversion/libsvn_fs_x/fs_id.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_id.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/rev_file.h -subversion/libsvn_fs_x/fs_x.lo: subversion/libsvn_fs_x/fs_x.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/dag.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/rep-cache.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/revprops.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/tree.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h +subversion/libsvn_fs_x/fs_x.lo: subversion/libsvn_fs_x/fs_x.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/dag.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/rep-cache.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/revprops.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/tree.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h -subversion/libsvn_fs_x/hotcopy.lo: subversion/libsvn_fs_x/hotcopy.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/hotcopy.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/recovery.h subversion/libsvn_fs_x/rep-cache.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/revprops.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h +subversion/libsvn_fs_x/hotcopy.lo: subversion/libsvn_fs_x/hotcopy.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/hotcopy.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/recovery.h subversion/libsvn_fs_x/rep-cache.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/revprops.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h -subversion/libsvn_fs_x/id.lo: subversion/libsvn_fs_x/id.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/util.h +subversion/libsvn_fs_x/id.lo: subversion/libsvn_fs_x/id.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/util.h -subversion/libsvn_fs_x/index.lo: subversion/libsvn_fs_x/index.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/pack.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/temp_serializer.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h +subversion/libsvn_fs_x/index.lo: subversion/libsvn_fs_x/index.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/pack.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/temp_serializer.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h -subversion/libsvn_fs_x/lock.lo: subversion/libsvn_fs_x/lock.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/dag.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/lock.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/tree.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h +subversion/libsvn_fs_x/lock.lo: subversion/libsvn_fs_x/lock.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/dag.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/lock.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/tree.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h -subversion/libsvn_fs_x/low_level.lo: subversion/libsvn_fs_x/low_level.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/pack.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h +subversion/libsvn_fs_x/low_level.lo: subversion/libsvn_fs_x/low_level.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/pack.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h -subversion/libsvn_fs_x/noderevs.lo: subversion/libsvn_fs_x/noderevs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_packed_data.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/noderevs.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/string_table.h subversion/libsvn_fs_x/temp_serializer.h subversion/svn_private_config.h +subversion/libsvn_fs_x/noderevs.lo: subversion/libsvn_fs_x/noderevs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_packed_data.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/noderevs.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/string_table.h subversion/libsvn_fs_x/temp_serializer.h subversion/svn_private_config.h -subversion/libsvn_fs_x/pack.lo: subversion/libsvn_fs_x/pack.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/changes.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/noderevs.h subversion/libsvn_fs_x/pack.h subversion/libsvn_fs_x/reps.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/revprops.h subversion/libsvn_fs_x/temp_serializer.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h +subversion/libsvn_fs_x/pack.lo: subversion/libsvn_fs_x/pack.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/changes.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/noderevs.h subversion/libsvn_fs_x/pack.h subversion/libsvn_fs_x/reps.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/revprops.h subversion/libsvn_fs_x/temp_serializer.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h -subversion/libsvn_fs_x/recovery.lo: subversion/libsvn_fs_x/recovery.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/recovery.h subversion/libsvn_fs_x/rep-cache.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/revprops.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h +subversion/libsvn_fs_x/recovery.lo: subversion/libsvn_fs_x/recovery.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/recovery.h subversion/libsvn_fs_x/rep-cache.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/revprops.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h -subversion/libsvn_fs_x/rep-cache.lo: subversion/libsvn_fs_x/rep-cache.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/rep-cache-db.h subversion/libsvn_fs_x/rep-cache.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h +subversion/libsvn_fs_x/rep-cache.lo: subversion/libsvn_fs_x/rep-cache.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/rep-cache-db.h subversion/libsvn_fs_x/rep-cache.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h -subversion/libsvn_fs_x/reps.lo: subversion/libsvn_fs_x/reps.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_packed_data.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/reps.h subversion/libsvn_fs_x/rev_file.h subversion/svn_private_config.h +subversion/libsvn_fs_x/reps.lo: subversion/libsvn_fs_x/reps.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_packed_data.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/reps.h subversion/libsvn_fs_x/rev_file.h subversion/svn_private_config.h -subversion/libsvn_fs_x/rev_file.lo: subversion/libsvn_fs_x/rev_file.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h +subversion/libsvn_fs_x/rev_file.lo: subversion/libsvn_fs_x/rev_file.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h -subversion/libsvn_fs_x/revprops.lo: subversion/libsvn_fs_x/revprops.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_packed_data.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/revprops.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h +subversion/libsvn_fs_x/revprops.lo: subversion/libsvn_fs_x/revprops.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_packed_data.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/revprops.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h -subversion/libsvn_fs_x/string_table.lo: subversion/libsvn_fs_x/string_table.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_packed_data.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_x/string_table.h +subversion/libsvn_fs_x/string_table.lo: subversion/libsvn_fs_x/string_table.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_packed_data.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_x/string_table.h -subversion/libsvn_fs_x/temp_serializer.lo: subversion/libsvn_fs_x/temp_serializer.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/temp_serializer.h +subversion/libsvn_fs_x/temp_serializer.lo: subversion/libsvn_fs_x/temp_serializer.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/temp_serializer.h -subversion/libsvn_fs_x/transaction.lo: subversion/libsvn_fs_x/transaction.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_io_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/dag.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/lock.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/rep-cache.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/revprops.h subversion/libsvn_fs_x/temp_serializer.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/tree.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h +subversion/libsvn_fs_x/transaction.lo: subversion/libsvn_fs_x/transaction.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_io_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/dag.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/lock.h subversion/libsvn_fs_x/low_level.h subversion/libsvn_fs_x/rep-cache.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/revprops.h subversion/libsvn_fs_x/temp_serializer.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/tree.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h -subversion/libsvn_fs_x/tree.lo: subversion/libsvn_fs_x/tree.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/dag.h subversion/libsvn_fs_x/dag_cache.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_id.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/lock.h subversion/libsvn_fs_x/pack.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/temp_serializer.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/tree.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h +subversion/libsvn_fs_x/tree.lo: subversion/libsvn_fs_x/tree.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/dag.h subversion/libsvn_fs_x/dag_cache.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_id.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/lock.h subversion/libsvn_fs_x/pack.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/temp_serializer.h subversion/libsvn_fs_x/transaction.h subversion/libsvn_fs_x/tree.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h -subversion/libsvn_fs_x/util.lo: subversion/libsvn_fs_x/util.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h +subversion/libsvn_fs_x/util.lo: subversion/libsvn_fs_x/util.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/util.h subversion/svn_private_config.h -subversion/libsvn_fs_x/verify.lo: subversion/libsvn_fs_x/verify.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/rep-cache.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/revprops.h subversion/libsvn_fs_x/util.h subversion/libsvn_fs_x/verify.h subversion/svn_private_config.h +subversion/libsvn_fs_x/verify.lo: subversion/libsvn_fs_x/verify.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/cached_data.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/fs_init.h subversion/libsvn_fs_x/fs_x.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/index.h subversion/libsvn_fs_x/rep-cache.h subversion/libsvn_fs_x/rev_file.h subversion/libsvn_fs_x/revprops.h subversion/libsvn_fs_x/util.h subversion/libsvn_fs_x/verify.h subversion/svn_private_config.h -subversion/libsvn_ra/compat.lo: subversion/libsvn_ra/compat.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_ra/ra_loader.h subversion/svn_private_config.h +subversion/libsvn_ra/compat.lo: subversion/libsvn_ra/compat.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_ra/ra_loader.h subversion/svn_private_config.h -subversion/libsvn_ra/debug_reporter.lo: subversion/libsvn_ra/debug_reporter.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_ra/debug_reporter.h +subversion/libsvn_ra/debug_reporter.lo: subversion/libsvn_ra/debug_reporter.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_ra/debug_reporter.h -subversion/libsvn_ra/deprecated.lo: subversion/libsvn_ra/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_ra/deprecated.h subversion/libsvn_ra/ra_loader.h subversion/svn_private_config.h +subversion/libsvn_ra/deprecated.lo: subversion/libsvn_ra/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_ra/deprecated.h subversion/libsvn_ra/ra_loader.h subversion/svn_private_config.h -subversion/libsvn_ra/editor.lo: subversion/libsvn_ra/editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_ra/ra_loader.h subversion/svn_private_config.h +subversion/libsvn_ra/editor.lo: subversion/libsvn_ra/editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_ra/ra_loader.h subversion/svn_private_config.h -subversion/libsvn_ra/ra_loader.lo: subversion/libsvn_ra/ra_loader.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/deprecated.h subversion/libsvn_ra/ra_loader.h subversion/svn_private_config.h +subversion/libsvn_ra/ra_loader.lo: subversion/libsvn_ra/ra_loader.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/deprecated.h subversion/libsvn_ra/ra_loader.h subversion/svn_private_config.h -subversion/libsvn_ra/util.lo: subversion/libsvn_ra/util.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_ra/util.lo: subversion/libsvn_ra/util.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_ra_local/ra_plugin.lo: subversion/libsvn_ra_local/ra_plugin.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_local/ra_local.h subversion/svn_private_config.h +subversion/libsvn_ra_local/ra_plugin.lo: subversion/libsvn_ra_local/ra_plugin.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_local/ra_local.h subversion/svn_private_config.h -subversion/libsvn_ra_local/split_url.lo: subversion/libsvn_ra_local/split_url.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_ra_local/ra_local.h subversion/svn_private_config.h +subversion/libsvn_ra_local/split_url.lo: subversion/libsvn_ra_local/split_url.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_ra_local/ra_local.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/blame.lo: subversion/libsvn_ra_serf/blame.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/blame.lo: subversion/libsvn_ra_serf/blame.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/blncache.lo: subversion/libsvn_ra_serf/blncache.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_ra_serf/blncache.h +subversion/libsvn_ra_serf/blncache.lo: subversion/libsvn_ra_serf/blncache.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_ra_serf/blncache.h -subversion/libsvn_ra_serf/commit.lo: subversion/libsvn_ra_serf/commit.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/commit.lo: subversion/libsvn_ra_serf/commit.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/eagain_bucket.lo: subversion/libsvn_ra_serf/eagain_bucket.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/eagain_bucket.lo: subversion/libsvn_ra_serf/eagain_bucket.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/get_deleted_rev.lo: subversion/libsvn_ra_serf/get_deleted_rev.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/get_deleted_rev.lo: subversion/libsvn_ra_serf/get_deleted_rev.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/get_file.lo: subversion/libsvn_ra_serf/get_file.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/get_file.lo: subversion/libsvn_ra_serf/get_file.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/get_lock.lo: subversion/libsvn_ra_serf/get_lock.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/get_lock.lo: subversion/libsvn_ra_serf/get_lock.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/getdate.lo: subversion/libsvn_ra_serf/getdate.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/getdate.lo: subversion/libsvn_ra_serf/getdate.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/getlocations.lo: subversion/libsvn_ra_serf/getlocations.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/getlocations.lo: subversion/libsvn_ra_serf/getlocations.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/getlocationsegments.lo: subversion/libsvn_ra_serf/getlocationsegments.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/getlocationsegments.lo: subversion/libsvn_ra_serf/getlocationsegments.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/getlocks.lo: subversion/libsvn_ra_serf/getlocks.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/getlocks.lo: subversion/libsvn_ra_serf/getlocks.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/inherited_props.lo: subversion/libsvn_ra_serf/inherited_props.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/inherited_props.lo: subversion/libsvn_ra_serf/inherited_props.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/list.lo: subversion/libsvn_ra_serf/list.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/list.lo: subversion/libsvn_ra_serf/list.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/lock.lo: subversion/libsvn_ra_serf/lock.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/lock.lo: subversion/libsvn_ra_serf/lock.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/log.lo: subversion/libsvn_ra_serf/log.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/log.lo: subversion/libsvn_ra_serf/log.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/merge.lo: subversion/libsvn_ra_serf/merge.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/merge.lo: subversion/libsvn_ra_serf/merge.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/mergeinfo.lo: subversion/libsvn_ra_serf/mergeinfo.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/mergeinfo.lo: subversion/libsvn_ra_serf/mergeinfo.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/multistatus.lo: subversion/libsvn_ra_serf/multistatus.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/multistatus.lo: subversion/libsvn_ra_serf/multistatus.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/options.lo: subversion/libsvn_ra_serf/options.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/options.lo: subversion/libsvn_ra_serf/options.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/property.lo: subversion/libsvn_ra_serf/property.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/property.lo: subversion/libsvn_ra_serf/property.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/replay.lo: subversion/libsvn_ra_serf/replay.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/replay.lo: subversion/libsvn_ra_serf/replay.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/request_body.lo: subversion/libsvn_ra_serf/request_body.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h +subversion/libsvn_ra_serf/request_body.lo: subversion/libsvn_ra_serf/request_body.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h -subversion/libsvn_ra_serf/sb_bucket.lo: subversion/libsvn_ra_serf/sb_bucket.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/sb_bucket.lo: subversion/libsvn_ra_serf/sb_bucket.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/serf.lo: subversion/libsvn_ra_serf/serf.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/serf.lo: subversion/libsvn_ra_serf/serf.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/stat.lo: subversion/libsvn_ra_serf/stat.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/stat.lo: subversion/libsvn_ra_serf/stat.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/stream_bucket.lo: subversion/libsvn_ra_serf/stream_bucket.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h +subversion/libsvn_ra_serf/stream_bucket.lo: subversion/libsvn_ra_serf/stream_bucket.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h -subversion/libsvn_ra_serf/update.lo: subversion/libsvn_ra_serf/update.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/update.lo: subversion/libsvn_ra_serf/update.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/util.lo: subversion/libsvn_ra_serf/util.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_cert.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/util.lo: subversion/libsvn_ra_serf/util.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_cert.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_serf/util_error.lo: subversion/libsvn_ra_serf/util_error.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_error_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h +subversion/libsvn_ra_serf/util_error.lo: subversion/libsvn_ra_serf/util_error.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_error_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h -subversion/libsvn_ra_serf/xml.lo: subversion/libsvn_ra_serf/xml.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h +subversion/libsvn_ra_serf/xml.lo: subversion/libsvn_ra_serf/xml.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h -subversion/libsvn_ra_svn/client.lo: subversion/libsvn_ra_svn/client.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_ra_svn_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h +subversion/libsvn_ra_svn/client.lo: subversion/libsvn_ra_svn/client.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_ra_svn_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h -subversion/libsvn_ra_svn/cram.lo: subversion/libsvn_ra_svn/cram.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_svn_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h +subversion/libsvn_ra_svn/cram.lo: subversion/libsvn_ra_svn/cram.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_svn_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h -subversion/libsvn_ra_svn/cyrus_auth.lo: subversion/libsvn_ra_svn/cyrus_auth.c subversion/include/private/ra_svn_sasl.h subversion/include/private/ra_svn_wrapped_sasl.h subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_ra_svn_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h +subversion/libsvn_ra_svn/cyrus_auth.lo: subversion/libsvn_ra_svn/cyrus_auth.c subversion/include/private/ra_svn_sasl.h subversion/include/private/ra_svn_wrapped_sasl.h subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_ra_svn_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h -subversion/libsvn_ra_svn/deprecated.lo: subversion/libsvn_ra_svn/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_svn_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_ra_svn/deprecated.lo: subversion/libsvn_ra_svn/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_svn_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_ra_svn/editorp.lo: subversion/libsvn_ra_svn/editorp.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_svn_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h +subversion/libsvn_ra_svn/editorp.lo: subversion/libsvn_ra_svn/editorp.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_svn_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h -subversion/libsvn_ra_svn/internal_auth.lo: subversion/libsvn_ra_svn/internal_auth.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_svn_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h +subversion/libsvn_ra_svn/internal_auth.lo: subversion/libsvn_ra_svn/internal_auth.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_svn_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h -subversion/libsvn_ra_svn/marshal.lo: subversion/libsvn_ra_svn/marshal.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_error_private.h subversion/include/private/svn_ra_svn_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h +subversion/libsvn_ra_svn/marshal.lo: subversion/libsvn_ra_svn/marshal.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_error_private.h subversion/include/private/svn_ra_svn_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h -subversion/libsvn_ra_svn/streams.lo: subversion/libsvn_ra_svn/streams.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_io_private.h subversion/include/private/svn_ra_svn_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h +subversion/libsvn_ra_svn/streams.lo: subversion/libsvn_ra_svn/streams.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_io_private.h subversion/include/private/svn_ra_svn_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h -subversion/libsvn_ra_svn/version.lo: subversion/libsvn_ra_svn/version.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h +subversion/libsvn_ra_svn/version.lo: subversion/libsvn_ra_svn/version.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_ra_svn/wrapped_sasl.lo: subversion/libsvn_ra_svn/wrapped_sasl.c subversion/include/private/ra_svn_wrapped_sasl.h subversion/svn_private_config.h -subversion/libsvn_repos/authz.lo: subversion/libsvn_repos/authz.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/authz.h subversion/libsvn_repos/config_file.h subversion/libsvn_repos/repos.h +subversion/libsvn_repos/authz.lo: subversion/libsvn_repos/authz.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/authz.h subversion/libsvn_repos/config_file.h subversion/libsvn_repos/repos.h -subversion/libsvn_repos/authz_info.lo: subversion/libsvn_repos/authz_info.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/authz.h subversion/svn_private_config.h +subversion/libsvn_repos/authz_info.lo: subversion/libsvn_repos/authz_info.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/authz.h subversion/svn_private_config.h -subversion/libsvn_repos/authz_parse.lo: subversion/libsvn_repos/authz_parse.c subversion/include/private/svn_config_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/authz.h subversion/svn_private_config.h +subversion/libsvn_repos/authz_parse.lo: subversion/libsvn_repos/authz_parse.c subversion/include/private/svn_config_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/authz.h subversion/svn_private_config.h -subversion/libsvn_repos/commit.lo: subversion/libsvn_repos/commit.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h +subversion/libsvn_repos/commit.lo: subversion/libsvn_repos/commit.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h -subversion/libsvn_repos/compat.lo: subversion/libsvn_repos/compat.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h +subversion/libsvn_repos/compat.lo: subversion/libsvn_repos/compat.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h -subversion/libsvn_repos/config_file.lo: subversion/libsvn_repos/config_file.c subversion/include/private/svn_config_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/config_file.h subversion/svn_private_config.h +subversion/libsvn_repos/config_file.lo: subversion/libsvn_repos/config_file.c subversion/include/private/svn_config_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/config_file.h subversion/svn_private_config.h -subversion/libsvn_repos/config_pool.lo: subversion/libsvn_repos/config_pool.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/config_file.h subversion/svn_private_config.h +subversion/libsvn_repos/config_pool.lo: subversion/libsvn_repos/config_pool.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/config_file.h subversion/svn_private_config.h -subversion/libsvn_repos/delta.lo: subversion/libsvn_repos/delta.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h +subversion/libsvn_repos/delta.lo: subversion/libsvn_repos/delta.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h -subversion/libsvn_repos/deprecated.lo: subversion/libsvn_repos/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h +subversion/libsvn_repos/deprecated.lo: subversion/libsvn_repos/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h -subversion/libsvn_repos/dump.lo: subversion/libsvn_repos/dump.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_repos/dump.lo: subversion/libsvn_repos/dump.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_repos/fs-wrap.lo: subversion/libsvn_repos/fs-wrap.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h +subversion/libsvn_repos/dump_editor.lo: subversion/libsvn_repos/dump_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_repos/hooks.lo: subversion/libsvn_repos/hooks.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h +subversion/libsvn_repos/fs-wrap.lo: subversion/libsvn_repos/fs-wrap.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h -subversion/libsvn_repos/list.lo: subversion/libsvn_repos/list.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h +subversion/libsvn_repos/hooks.lo: subversion/libsvn_repos/hooks.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h -subversion/libsvn_repos/load-fs-vtable.lo: subversion/libsvn_repos/load-fs-vtable.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h +subversion/libsvn_repos/list.lo: subversion/libsvn_repos/list.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h -subversion/libsvn_repos/load.lo: subversion/libsvn_repos/load.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h +subversion/libsvn_repos/load-fs-vtable.lo: subversion/libsvn_repos/load-fs-vtable.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h -subversion/libsvn_repos/log.lo: subversion/libsvn_repos/log.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h +subversion/libsvn_repos/load.lo: subversion/libsvn_repos/load.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h -subversion/libsvn_repos/node_tree.lo: subversion/libsvn_repos/node_tree.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h +subversion/libsvn_repos/log.lo: subversion/libsvn_repos/log.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h -subversion/libsvn_repos/notify.lo: subversion/libsvn_repos/notify.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h +subversion/libsvn_repos/node_tree.lo: subversion/libsvn_repos/node_tree.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h -subversion/libsvn_repos/replay.lo: subversion/libsvn_repos/replay.c subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_repos/notify.lo: subversion/libsvn_repos/notify.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h -subversion/libsvn_repos/reporter.lo: subversion/libsvn_repos/reporter.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fspath.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h +subversion/libsvn_repos/replay.lo: subversion/libsvn_repos/replay.c subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_repos/repos.lo: subversion/libsvn_repos/repos.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h +subversion/libsvn_repos/reporter.lo: subversion/libsvn_repos/reporter.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fspath.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h -subversion/libsvn_repos/rev_hunt.lo: subversion/libsvn_repos/rev_hunt.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h +subversion/libsvn_repos/repos.lo: subversion/libsvn_repos/repos.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h + +subversion/libsvn_repos/rev_hunt.lo: subversion/libsvn_repos/rev_hunt.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h subversion/libsvn_subr/adler32.lo: subversion/libsvn_subr/adler32.c subversion/include/private/svn_adler32.h -subversion/libsvn_subr/atomic.lo: subversion/libsvn_subr/atomic.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h +subversion/libsvn_subr/atomic.lo: subversion/libsvn_subr/atomic.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/auth.lo: subversion/libsvn_subr/auth.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_subr/auth.h subversion/svn_private_config.h +subversion/libsvn_subr/auth.lo: subversion/libsvn_subr/auth.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_subr/auth.h subversion/svn_private_config.h -subversion/libsvn_subr/base64.lo: subversion/libsvn_subr/base64.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/base64.lo: subversion/libsvn_subr/base64.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/bit_array.lo: subversion/libsvn_subr/bit_array.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/bit_array.lo: subversion/libsvn_subr/bit_array.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/cache-inprocess.lo: subversion/libsvn_subr/cache-inprocess.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/cache.h subversion/svn_private_config.h +subversion/libsvn_subr/cache-inprocess.lo: subversion/libsvn_subr/cache-inprocess.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/cache.h subversion/svn_private_config.h -subversion/libsvn_subr/cache-membuffer.lo: subversion/libsvn_subr/cache-membuffer.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/cache.h subversion/libsvn_subr/fnv1a.h subversion/svn_private_config.h +subversion/libsvn_subr/cache-membuffer.lo: subversion/libsvn_subr/cache-membuffer.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/cache.h subversion/libsvn_subr/fnv1a.h subversion/svn_private_config.h -subversion/libsvn_subr/cache-memcache.lo: subversion/libsvn_subr/cache-memcache.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/cache.h subversion/svn_private_config.h +subversion/libsvn_subr/cache-memcache.lo: subversion/libsvn_subr/cache-memcache.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/cache.h subversion/svn_private_config.h -subversion/libsvn_subr/cache-null.lo: subversion/libsvn_subr/cache-null.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/cache.h subversion/svn_private_config.h +subversion/libsvn_subr/cache-null.lo: subversion/libsvn_subr/cache-null.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/cache.h subversion/svn_private_config.h -subversion/libsvn_subr/cache.lo: subversion/libsvn_subr/cache.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/cache.h +subversion/libsvn_subr/cache.lo: subversion/libsvn_subr/cache.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/cache.h -subversion/libsvn_subr/cache_config.lo: subversion/libsvn_subr/cache_config.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/cache_config.lo: subversion/libsvn_subr/cache_config.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/checksum.lo: subversion/libsvn_subr/checksum.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/checksum.h subversion/libsvn_subr/fnv1a.h subversion/svn_private_config.h +subversion/libsvn_subr/checksum.lo: subversion/libsvn_subr/checksum.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/checksum.h subversion/libsvn_subr/fnv1a.h subversion/svn_private_config.h -subversion/libsvn_subr/cmdline.lo: subversion/libsvn_subr/cmdline.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_nls.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_xml.h subversion/libsvn_subr/win32_crashrpt.h subversion/svn_private_config.h +subversion/libsvn_subr/cmdline.lo: subversion/libsvn_subr/cmdline.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_nls.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_xml.h subversion/libsvn_subr/win32_crashrpt.h subversion/svn_private_config.h -subversion/libsvn_subr/compat.lo: subversion/libsvn_subr/compat.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/compat.lo: subversion/libsvn_subr/compat.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/compress_lz4.lo: subversion/libsvn_subr/compress_lz4.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/lz4/lz4internal.h subversion/svn_private_config.h +subversion/libsvn_subr/compress_lz4.lo: subversion/libsvn_subr/compress_lz4.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/lz4/lz4internal.h subversion/svn_private_config.h -subversion/libsvn_subr/compress_zlib.lo: subversion/libsvn_subr/compress_zlib.c subversion/include/private/svn_debug.h subversion/include/private/svn_error_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/compress_zlib.lo: subversion/libsvn_subr/compress_zlib.c subversion/include/private/svn_debug.h subversion/include/private/svn_error_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/config.lo: subversion/libsvn_subr/config.c subversion/include/private/svn_config_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/config_impl.h subversion/svn_private_config.h +subversion/libsvn_subr/config.lo: subversion/libsvn_subr/config.c subversion/include/private/svn_config_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/config_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/config_auth.lo: subversion/libsvn_subr/config_auth.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/auth.h subversion/libsvn_subr/config_impl.h subversion/svn_private_config.h +subversion/libsvn_subr/config_auth.lo: subversion/libsvn_subr/config_auth.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/auth.h subversion/libsvn_subr/config_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/config_file.lo: subversion/libsvn_subr/config_file.c subversion/include/private/svn_config_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/libsvn_subr/config_impl.h subversion/svn_private_config.h +subversion/libsvn_subr/config_file.lo: subversion/libsvn_subr/config_file.c subversion/include/private/svn_config_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/libsvn_subr/config_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/config_win.lo: subversion/libsvn_subr/config_win.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/libsvn_subr/config_impl.h subversion/svn_private_config.h +subversion/libsvn_subr/config_win.lo: subversion/libsvn_subr/config_win.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/libsvn_subr/config_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/crypto.lo: subversion/libsvn_subr/crypto.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/crypto.h subversion/svn_private_config.h +subversion/libsvn_subr/crypto.lo: subversion/libsvn_subr/crypto.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/crypto.h subversion/svn_private_config.h subversion/libsvn_subr/ctype.lo: subversion/libsvn_subr/ctype.c subversion/include/svn_ctype.h -subversion/libsvn_subr/date.lo: subversion/libsvn_subr/date.c subversion/include/private/svn_debug.h subversion/include/private/svn_token.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/date.lo: subversion/libsvn_subr/date.c subversion/include/private/svn_debug.h subversion/include/private/svn_token.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/debug.lo: subversion/libsvn_subr/debug.c subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/debug.lo: subversion/libsvn_subr/debug.c subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/deprecated.lo: subversion/libsvn_subr/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_opt_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_subr/auth.h subversion/libsvn_subr/opt.h subversion/svn_private_config.h +subversion/libsvn_subr/deprecated.lo: subversion/libsvn_subr/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_opt_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_subr/auth.h subversion/libsvn_subr/opt.h subversion/svn_private_config.h -subversion/libsvn_subr/dirent_uri.lo: subversion/libsvn_subr/dirent_uri.c subversion/include/private/svn_cert.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/dirent_uri.h subversion/svn_private_config.h +subversion/libsvn_subr/dirent_uri.lo: subversion/libsvn_subr/dirent_uri.c subversion/include/private/svn_cert.h subversion/include/private/svn_debug.h subversion/include/private/svn_dirent_uri_private.h subversion/include/private/svn_fspath.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/dirent_uri.h subversion/svn_private_config.h -subversion/libsvn_subr/dso.lo: subversion/libsvn_subr/dso.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/dso.lo: subversion/libsvn_subr/dso.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/encode.lo: subversion/libsvn_subr/encode.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/encode.lo: subversion/libsvn_subr/encode.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/eol.lo: subversion/libsvn_subr/eol.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_eol_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/eol.lo: subversion/libsvn_subr/eol.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_eol_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/error.lo: subversion/libsvn_subr/error.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_error_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/libsvn_subr/pools.h subversion/svn_private_config.h +subversion/libsvn_subr/error.lo: subversion/libsvn_subr/error.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_error_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/libsvn_subr/pools.h subversion/svn_private_config.h -subversion/libsvn_subr/fnv1a.lo: subversion/libsvn_subr/fnv1a.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/fnv1a.h +subversion/libsvn_subr/fnv1a.lo: subversion/libsvn_subr/fnv1a.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/fnv1a.h -subversion/libsvn_subr/gpg_agent.lo: subversion/libsvn_subr/gpg_agent.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/libsvn_subr/auth.h subversion/svn_private_config.h +subversion/libsvn_subr/gpg_agent.lo: subversion/libsvn_subr/gpg_agent.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_user.h subversion/libsvn_subr/auth.h subversion/svn_private_config.h -subversion/libsvn_subr/hash.lo: subversion/libsvn_subr/hash.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/hash.lo: subversion/libsvn_subr/hash.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/io.lo: subversion/libsvn_subr/io.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_io_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h +subversion/libsvn_subr/io.lo: subversion/libsvn_subr/io.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_io_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/svn_private_config.h -subversion/libsvn_subr/iter.lo: subversion/libsvn_subr/iter.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_types.h +subversion/libsvn_subr/iter.lo: subversion/libsvn_subr/iter.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/lock.lo: subversion/libsvn_subr/lock.c subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h +subversion/libsvn_subr/lock.lo: subversion/libsvn_subr/lock.c subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/log.lo: subversion/libsvn_subr/log.c subversion/include/private/svn_debug.h subversion/include/private/svn_log.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/log.lo: subversion/libsvn_subr/log.c subversion/include/private/svn_debug.h subversion/include/private/svn_log.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/lz4/lz4.lo: subversion/libsvn_subr/lz4/lz4.c subversion/libsvn_subr/lz4/lz4internal.h subversion/svn_private_config.h -subversion/libsvn_subr/macos_keychain.lo: subversion/libsvn_subr/macos_keychain.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/libsvn_subr/auth.h subversion/svn_private_config.h +subversion/libsvn_subr/macos_keychain.lo: subversion/libsvn_subr/macos_keychain.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/libsvn_subr/auth.h subversion/svn_private_config.h -subversion/libsvn_subr/magic.lo: subversion/libsvn_subr/magic.c subversion/include/private/svn_debug.h subversion/include/private/svn_magic.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/magic.lo: subversion/libsvn_subr/magic.c subversion/include/private/svn_debug.h subversion/include/private/svn_magic.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/md5.lo: subversion/libsvn_subr/md5.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_md5.h subversion/include/svn_types.h subversion/libsvn_subr/checksum.h +subversion/libsvn_subr/md5.lo: subversion/libsvn_subr/md5.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_md5.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/checksum.h -subversion/libsvn_subr/mergeinfo.lo: subversion/libsvn_subr/mergeinfo.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/mergeinfo.lo: subversion/libsvn_subr/mergeinfo.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/mutex.lo: subversion/libsvn_subr/mutex.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/mutex.lo: subversion/libsvn_subr/mutex.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/nls.lo: subversion/libsvn_subr/nls.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_nls.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/nls.lo: subversion/libsvn_subr/nls.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_nls.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/object_pool.lo: subversion/libsvn_subr/object_pool.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/object_pool.lo: subversion/libsvn_subr/object_pool.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/opt.lo: subversion/libsvn_subr/opt.c subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_subr/opt.h subversion/svn_private_config.h +subversion/libsvn_subr/opt.lo: subversion/libsvn_subr/opt.c subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_subr/opt.h subversion/svn_private_config.h -subversion/libsvn_subr/packed_data.lo: subversion/libsvn_subr/packed_data.c subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/private/svn_packed_data.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/packed_data.lo: subversion/libsvn_subr/packed_data.c subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/private/svn_packed_data.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/path.lo: subversion/libsvn_subr/path.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/libsvn_subr/dirent_uri.h subversion/svn_private_config.h +subversion/libsvn_subr/path.lo: subversion/libsvn_subr/path.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/libsvn_subr/dirent_uri.h subversion/svn_private_config.h -subversion/libsvn_subr/pool.lo: subversion/libsvn_subr/pool.c subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/libsvn_subr/pools.h +subversion/libsvn_subr/pool.lo: subversion/libsvn_subr/pool.c subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/pools.h -subversion/libsvn_subr/prefix_string.lo: subversion/libsvn_subr/prefix_string.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/prefix_string.lo: subversion/libsvn_subr/prefix_string.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/prompt.lo: subversion/libsvn_subr/prompt.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/prompt.lo: subversion/libsvn_subr/prompt.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/properties.lo: subversion/libsvn_subr/properties.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/properties.lo: subversion/libsvn_subr/properties.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/quoprint.lo: subversion/libsvn_subr/quoprint.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_quoprint.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/quoprint.lo: subversion/libsvn_subr/quoprint.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_quoprint.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/root_pools.lo: subversion/libsvn_subr/root_pools.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/root_pools.lo: subversion/libsvn_subr/root_pools.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/simple_providers.lo: subversion/libsvn_subr/simple_providers.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/libsvn_subr/auth.h subversion/svn_private_config.h +subversion/libsvn_subr/simple_providers.lo: subversion/libsvn_subr/simple_providers.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/libsvn_subr/auth.h subversion/svn_private_config.h -subversion/libsvn_subr/skel.lo: subversion/libsvn_subr/skel.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/private/svn_string_private.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/skel.lo: subversion/libsvn_subr/skel.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/private/svn_string_private.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/sorts.lo: subversion/libsvn_subr/sorts.c subversion/include/private/svn_debug.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/sorts.lo: subversion/libsvn_subr/sorts.c subversion/include/private/svn_debug.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/spillbuf.lo: subversion/libsvn_subr/spillbuf.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/spillbuf.lo: subversion/libsvn_subr/spillbuf.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/sqlite.lo: subversion/libsvn_subr/sqlite.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_io_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/internal_statements.h subversion/svn_private_config.h +subversion/libsvn_subr/sqlite.lo: subversion/libsvn_subr/sqlite.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_io_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/internal_statements.h subversion/svn_private_config.h subversion/libsvn_subr/sqlite3wrapper.lo: subversion/libsvn_subr/sqlite3wrapper.c subversion/svn_private_config.h -subversion/libsvn_subr/ssl_client_cert_providers.lo: subversion/libsvn_subr/ssl_client_cert_providers.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/ssl_client_cert_providers.lo: subversion/libsvn_subr/ssl_client_cert_providers.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/ssl_client_cert_pw_providers.lo: subversion/libsvn_subr/ssl_client_cert_pw_providers.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/ssl_client_cert_pw_providers.lo: subversion/libsvn_subr/ssl_client_cert_pw_providers.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/ssl_server_trust_providers.lo: subversion/libsvn_subr/ssl_server_trust_providers.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/ssl_server_trust_providers.lo: subversion/libsvn_subr/ssl_server_trust_providers.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/stream.lo: subversion/libsvn_subr/stream.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_error_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h +subversion/libsvn_subr/stream.lo: subversion/libsvn_subr/stream.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_error_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/svn_private_config.h -subversion/libsvn_subr/string.lo: subversion/libsvn_subr/string.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/string.lo: subversion/libsvn_subr/string.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/subst.lo: subversion/libsvn_subr/subst.c subversion/include/private/svn_debug.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h +subversion/libsvn_subr/subst.lo: subversion/libsvn_subr/subst.c subversion/include/private/svn_debug.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/svn_private_config.h -subversion/libsvn_subr/sysinfo.lo: subversion/libsvn_subr/sysinfo.c subversion/include/private/svn_debug.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_subr/sysinfo.h subversion/svn_private_config.h +subversion/libsvn_subr/sysinfo.lo: subversion/libsvn_subr/sysinfo.c subversion/include/private/svn_debug.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_subr/sysinfo.h subversion/svn_private_config.h -subversion/libsvn_subr/target.lo: subversion/libsvn_subr/target.c subversion/include/private/svn_debug.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/target.lo: subversion/libsvn_subr/target.c subversion/include/private/svn_debug.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/temp_serializer.lo: subversion/libsvn_subr/temp_serializer.c subversion/include/private/svn_debug.h subversion/include/private/svn_temp_serializer.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/temp_serializer.lo: subversion/libsvn_subr/temp_serializer.c subversion/include/private/svn_debug.h subversion/include/private/svn_temp_serializer.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/time.lo: subversion/libsvn_subr/time.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h +subversion/libsvn_subr/time.lo: subversion/libsvn_subr/time.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/svn_private_config.h -subversion/libsvn_subr/token.lo: subversion/libsvn_subr/token.c subversion/include/private/svn_debug.h subversion/include/private/svn_token.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/token.lo: subversion/libsvn_subr/token.c subversion/include/private/svn_debug.h subversion/include/private/svn_token.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/types.lo: subversion/libsvn_subr/types.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/types.lo: subversion/libsvn_subr/types.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/user.lo: subversion/libsvn_subr/user.c subversion/include/private/svn_debug.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/include/svn_utf.h +subversion/libsvn_subr/user.lo: subversion/libsvn_subr/user.c subversion/include/private/svn_debug.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_user.h subversion/include/svn_utf.h -subversion/libsvn_subr/username_providers.lo: subversion/libsvn_subr/username_providers.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/include/svn_utf.h +subversion/libsvn_subr/username_providers.lo: subversion/libsvn_subr/username_providers.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_user.h subversion/include/svn_utf.h -subversion/libsvn_subr/utf.lo: subversion/libsvn_subr/utf.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/libsvn_subr/win32_xlate.h subversion/svn_private_config.h +subversion/libsvn_subr/utf.lo: subversion/libsvn_subr/utf.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/libsvn_subr/win32_xlate.h subversion/svn_private_config.h -subversion/libsvn_subr/utf8proc.lo: subversion/libsvn_subr/utf8proc.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/utf8proc/utf8proc.c subversion/libsvn_subr/utf8proc/utf8proc_data.c subversion/libsvn_subr/utf8proc/utf8proc_internal.h subversion/svn_private_config.h +subversion/libsvn_subr/utf8proc.lo: subversion/libsvn_subr/utf8proc.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/utf8proc/utf8proc.c subversion/libsvn_subr/utf8proc/utf8proc_data.c subversion/libsvn_subr/utf8proc/utf8proc_internal.h subversion/svn_private_config.h -subversion/libsvn_subr/utf_validate.lo: subversion/libsvn_subr/utf_validate.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/libsvn_subr/utf_validate.lo: subversion/libsvn_subr/utf_validate.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/libsvn_subr/utf_width.lo: subversion/libsvn_subr/utf_width.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h +subversion/libsvn_subr/utf_width.lo: subversion/libsvn_subr/utf_width.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/svn_private_config.h -subversion/libsvn_subr/validate.lo: subversion/libsvn_subr/validate.c subversion/include/private/svn_debug.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/validate.lo: subversion/libsvn_subr/validate.c subversion/include/private/svn_debug.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/libsvn_subr/version.lo: subversion/libsvn_subr/version.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_subr/sysinfo.h subversion/svn_private_config.h +subversion/libsvn_subr/version.lo: subversion/libsvn_subr/version.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_subr/sysinfo.h subversion/svn_private_config.h -subversion/libsvn_subr/win32_crashrpt.lo: subversion/libsvn_subr/win32_crashrpt.c subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_subr/sysinfo.h subversion/libsvn_subr/win32_crashrpt.h subversion/libsvn_subr/win32_crashrpt_dll.h +subversion/libsvn_subr/win32_crashrpt.lo: subversion/libsvn_subr/win32_crashrpt.c subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_subr/sysinfo.h subversion/libsvn_subr/win32_crashrpt.h subversion/libsvn_subr/win32_crashrpt_dll.h -subversion/libsvn_subr/win32_crypto.lo: subversion/libsvn_subr/win32_crypto.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/libsvn_subr/auth.h subversion/svn_private_config.h +subversion/libsvn_subr/win32_crypto.lo: subversion/libsvn_subr/win32_crypto.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/libsvn_subr/auth.h subversion/svn_private_config.h -subversion/libsvn_subr/win32_xlate.lo: subversion/libsvn_subr/win32_xlate.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/libsvn_subr/win32_xlate.h subversion/svn_private_config.h +subversion/libsvn_subr/win32_xlate.lo: subversion/libsvn_subr/win32_xlate.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/libsvn_subr/win32_xlate.h subversion/svn_private_config.h -subversion/libsvn_subr/x509info.lo: subversion/libsvn_subr/x509info.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_x509.h subversion/libsvn_subr/x509.h +subversion/libsvn_subr/x509info.lo: subversion/libsvn_subr/x509info.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_x509.h subversion/libsvn_subr/x509.h -subversion/libsvn_subr/x509parse.lo: subversion/libsvn_subr/x509parse.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_x509.h subversion/libsvn_subr/x509.h +subversion/libsvn_subr/x509parse.lo: subversion/libsvn_subr/x509parse.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_x509.h subversion/libsvn_subr/x509.h -subversion/libsvn_subr/xml.lo: subversion/libsvn_subr/xml.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/svn_private_config.h +subversion/libsvn_subr/xml.lo: subversion/libsvn_subr/xml.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/svn_private_config.h -subversion/libsvn_wc/adm_crawler.lo: subversion/libsvn_wc/adm_crawler.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/adm_crawler.lo: subversion/libsvn_wc/adm_crawler.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/libsvn_wc/adm_files.lo: subversion/libsvn_wc/adm_files.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/adm_files.lo: subversion/libsvn_wc/adm_files.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/adm_ops.lo: subversion/libsvn_wc/adm_ops.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/adm_ops.lo: subversion/libsvn_wc/adm_ops.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/libsvn_wc/ambient_depth_filter_editor.lo: subversion/libsvn_wc/ambient_depth_filter_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/ambient_depth_filter_editor.lo: subversion/libsvn_wc/ambient_depth_filter_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/cleanup.lo: subversion/libsvn_wc/cleanup.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/cleanup.lo: subversion/libsvn_wc/cleanup.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/libsvn_wc/conflicts.lo: subversion/libsvn_wc/conflicts.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/conflicts.lo: subversion/libsvn_wc/conflicts.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/libsvn_wc/context.lo: subversion/libsvn_wc/context.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/context.lo: subversion/libsvn_wc/context.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/copy.lo: subversion/libsvn_wc/copy.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/copy.lo: subversion/libsvn_wc/copy.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/libsvn_wc/crop.lo: subversion/libsvn_wc/crop.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/crop.lo: subversion/libsvn_wc/crop.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/libsvn_wc/delete.lo: subversion/libsvn_wc/delete.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/delete.lo: subversion/libsvn_wc/delete.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/libsvn_wc/deprecated.lo: subversion/libsvn_wc/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_io_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/deprecated.lo: subversion/libsvn_wc/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_io_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/libsvn_wc/diff_editor.lo: subversion/libsvn_wc/diff_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/diff.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/diff_editor.lo: subversion/libsvn_wc/diff_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/diff.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/diff_local.lo: subversion/libsvn_wc/diff_local.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/diff.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/diff_local.lo: subversion/libsvn_wc/diff_local.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/diff.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/entries.lo: subversion/libsvn_wc/entries.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/tree_conflicts.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h +subversion/libsvn_wc/entries.lo: subversion/libsvn_wc/entries.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/tree_conflicts.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h -subversion/libsvn_wc/externals.lo: subversion/libsvn_wc/externals.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/externals.lo: subversion/libsvn_wc/externals.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/libsvn_wc/info.lo: subversion/libsvn_wc/info.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/info.lo: subversion/libsvn_wc/info.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/lock.lo: subversion/libsvn_wc/lock.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/lock.lo: subversion/libsvn_wc/lock.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/merge.lo: subversion/libsvn_wc/merge.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/merge.lo: subversion/libsvn_wc/merge.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/libsvn_wc/node.lo: subversion/libsvn_wc/node.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/node.lo: subversion/libsvn_wc/node.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/old-and-busted.lo: subversion/libsvn_wc/old-and-busted.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/old-and-busted.lo: subversion/libsvn_wc/old-and-busted.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/props.lo: subversion/libsvn_wc/props.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/props.lo: subversion/libsvn_wc/props.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/libsvn_wc/questions.lo: subversion/libsvn_wc/questions.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/questions.lo: subversion/libsvn_wc/questions.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/relocate.lo: subversion/libsvn_wc/relocate.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/relocate.lo: subversion/libsvn_wc/relocate.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/revert.lo: subversion/libsvn_wc/revert.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_io_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/revert.lo: subversion/libsvn_wc/revert.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_io_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/libsvn_wc/revision_status.lo: subversion/libsvn_wc/revision_status.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/revision_status.lo: subversion/libsvn_wc/revision_status.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/status.lo: subversion/libsvn_wc/status.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/status.lo: subversion/libsvn_wc/status.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/translate.lo: subversion/libsvn_wc/translate.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/translate.lo: subversion/libsvn_wc/translate.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/tree_conflicts.lo: subversion/libsvn_wc/tree_conflicts.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/tree_conflicts.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/tree_conflicts.lo: subversion/libsvn_wc/tree_conflicts.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/tree_conflicts.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/update_editor.lo: subversion/libsvn_wc/update_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/update_editor.lo: subversion/libsvn_wc/update_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/libsvn_wc/upgrade.lo: subversion/libsvn_wc/upgrade.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/props.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/tree_conflicts.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/upgrade.lo: subversion/libsvn_wc/upgrade.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/props.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/tree_conflicts.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/libsvn_wc/util.lo: subversion/libsvn_wc/util.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/util.lo: subversion/libsvn_wc/util.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/wc_db.lo: subversion/libsvn_wc/wc_db.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/wc_db.lo: subversion/libsvn_wc/wc_db.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/libsvn_wc/wc_db_pristine.lo: subversion/libsvn_wc/wc_db_pristine.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_io_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h +subversion/libsvn_wc/wc_db_pristine.lo: subversion/libsvn_wc/wc_db_pristine.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_io_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h -subversion/libsvn_wc/wc_db_update_move.lo: subversion/libsvn_wc/wc_db_update_move.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/wc_db_update_move.lo: subversion/libsvn_wc/wc_db_update_move.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/libsvn_wc/wc_db_util.lo: subversion/libsvn_wc/wc_db_util.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h +subversion/libsvn_wc/wc_db_util.lo: subversion/libsvn_wc/wc_db_util.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h -subversion/libsvn_wc/wc_db_wcroot.lo: subversion/libsvn_wc/wc_db_wcroot.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h +subversion/libsvn_wc/wc_db_wcroot.lo: subversion/libsvn_wc/wc_db_wcroot.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h -subversion/libsvn_wc/wcroot_anchor.lo: subversion/libsvn_wc/wcroot_anchor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/libsvn_wc/wcroot_anchor.lo: subversion/libsvn_wc/wcroot_anchor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/libsvn_wc/workqueue.lo: subversion/libsvn_wc/workqueue.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_io_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/libsvn_wc/workqueue.lo: subversion/libsvn_wc/workqueue.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_io_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/mod_authz_svn/mod_authz_svn.lo: subversion/mod_authz_svn/mod_authz_svn.c subversion/include/mod_authz_svn.h subversion/include/mod_dav_svn.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/mod_authz_svn/mod_authz_svn.lo: subversion/mod_authz_svn/mod_authz_svn.c subversion/include/mod_authz_svn.h subversion/include/mod_dav_svn.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_authz_svn/mod_authz_svn.c ; else echo "fake" > subversion/mod_authz_svn/mod_authz_svn.lo ; fi -subversion/mod_dav_svn/activity.lo: subversion/mod_dav_svn/activity.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/activity.lo: subversion/mod_dav_svn/activity.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/activity.c ; else echo "fake" > subversion/mod_dav_svn/activity.lo ; fi -subversion/mod_dav_svn/authz.lo: subversion/mod_dav_svn/authz.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/authz.lo: subversion/mod_dav_svn/authz.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/authz.c ; else echo "fake" > subversion/mod_dav_svn/authz.lo ; fi -subversion/mod_dav_svn/deadprops.lo: subversion/mod_dav_svn/deadprops.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_log.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/deadprops.lo: subversion/mod_dav_svn/deadprops.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_log.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/deadprops.c ; else echo "fake" > subversion/mod_dav_svn/deadprops.lo ; fi -subversion/mod_dav_svn/liveprops.lo: subversion/mod_dav_svn/liveprops.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/liveprops.lo: subversion/mod_dav_svn/liveprops.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/liveprops.c ; else echo "fake" > subversion/mod_dav_svn/liveprops.lo ; fi -subversion/mod_dav_svn/lock.lo: subversion/mod_dav_svn/lock.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_log.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/lock.lo: subversion/mod_dav_svn/lock.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_log.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/lock.c ; else echo "fake" > subversion/mod_dav_svn/lock.lo ; fi -subversion/mod_dav_svn/merge.lo: subversion/mod_dav_svn/merge.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/merge.lo: subversion/mod_dav_svn/merge.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/merge.c ; else echo "fake" > subversion/mod_dav_svn/merge.lo ; fi -subversion/mod_dav_svn/mirror.lo: subversion/mod_dav_svn/mirror.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/mirror.lo: subversion/mod_dav_svn/mirror.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/mirror.c ; else echo "fake" > subversion/mod_dav_svn/mirror.lo ; fi -subversion/mod_dav_svn/mod_dav_svn.lo: subversion/mod_dav_svn/mod_dav_svn.c subversion/include/mod_authz_svn.h subversion/include/mod_dav_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/private/svn_subr_private.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/mod_dav_svn.lo: subversion/mod_dav_svn/mod_dav_svn.c subversion/include/mod_authz_svn.h subversion/include/mod_dav_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/private/svn_subr_private.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/mod_dav_svn.c ; else echo "fake" > subversion/mod_dav_svn/mod_dav_svn.lo ; fi -subversion/mod_dav_svn/posts/create_txn.lo: subversion/mod_dav_svn/posts/create_txn.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/posts/create_txn.lo: subversion/mod_dav_svn/posts/create_txn.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/posts/create_txn.c ; else echo "fake" > subversion/mod_dav_svn/posts/create_txn.lo ; fi -subversion/mod_dav_svn/reports/dated-rev.lo: subversion/mod_dav_svn/reports/dated-rev.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/reports/dated-rev.lo: subversion/mod_dav_svn/reports/dated-rev.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/reports/dated-rev.c ; else echo "fake" > subversion/mod_dav_svn/reports/dated-rev.lo ; fi -subversion/mod_dav_svn/reports/deleted-rev.lo: subversion/mod_dav_svn/reports/deleted-rev.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/reports/deleted-rev.lo: subversion/mod_dav_svn/reports/deleted-rev.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/reports/deleted-rev.c ; else echo "fake" > subversion/mod_dav_svn/reports/deleted-rev.lo ; fi -subversion/mod_dav_svn/reports/file-revs.lo: subversion/mod_dav_svn/reports/file-revs.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/reports/file-revs.lo: subversion/mod_dav_svn/reports/file-revs.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/reports/file-revs.c ; else echo "fake" > subversion/mod_dav_svn/reports/file-revs.lo ; fi -subversion/mod_dav_svn/reports/get-location-segments.lo: subversion/mod_dav_svn/reports/get-location-segments.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/reports/get-location-segments.lo: subversion/mod_dav_svn/reports/get-location-segments.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/reports/get-location-segments.c ; else echo "fake" > subversion/mod_dav_svn/reports/get-location-segments.lo ; fi -subversion/mod_dav_svn/reports/get-locations.lo: subversion/mod_dav_svn/reports/get-locations.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/reports/get-locations.lo: subversion/mod_dav_svn/reports/get-locations.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/reports/get-locations.c ; else echo "fake" > subversion/mod_dav_svn/reports/get-locations.lo ; fi -subversion/mod_dav_svn/reports/get-locks.lo: subversion/mod_dav_svn/reports/get-locks.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/reports/get-locks.lo: subversion/mod_dav_svn/reports/get-locks.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/reports/get-locks.c ; else echo "fake" > subversion/mod_dav_svn/reports/get-locks.lo ; fi -subversion/mod_dav_svn/reports/inherited-props.lo: subversion/mod_dav_svn/reports/inherited-props.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/reports/inherited-props.lo: subversion/mod_dav_svn/reports/inherited-props.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/reports/inherited-props.c ; else echo "fake" > subversion/mod_dav_svn/reports/inherited-props.lo ; fi -subversion/mod_dav_svn/reports/list.lo: subversion/mod_dav_svn/reports/list.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/reports/list.lo: subversion/mod_dav_svn/reports/list.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/reports/list.c ; else echo "fake" > subversion/mod_dav_svn/reports/list.lo ; fi -subversion/mod_dav_svn/reports/log.lo: subversion/mod_dav_svn/reports/log.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/reports/log.lo: subversion/mod_dav_svn/reports/log.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/reports/log.c ; else echo "fake" > subversion/mod_dav_svn/reports/log.lo ; fi -subversion/mod_dav_svn/reports/mergeinfo.lo: subversion/mod_dav_svn/reports/mergeinfo.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/reports/mergeinfo.lo: subversion/mod_dav_svn/reports/mergeinfo.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/reports/mergeinfo.c ; else echo "fake" > subversion/mod_dav_svn/reports/mergeinfo.lo ; fi -subversion/mod_dav_svn/reports/replay.lo: subversion/mod_dav_svn/reports/replay.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_log.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/reports/replay.lo: subversion/mod_dav_svn/reports/replay.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_log.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/reports/replay.c ; else echo "fake" > subversion/mod_dav_svn/reports/replay.lo ; fi -subversion/mod_dav_svn/reports/update.lo: subversion/mod_dav_svn/reports/update.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/reports/update.lo: subversion/mod_dav_svn/reports/update.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_skel.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/reports/update.c ; else echo "fake" > subversion/mod_dav_svn/reports/update.lo ; fi -subversion/mod_dav_svn/repos.lo: subversion/mod_dav_svn/repos.c subversion/include/mod_authz_svn.h subversion/include/mod_dav_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/repos.lo: subversion/mod_dav_svn/repos.c subversion/include/mod_authz_svn.h subversion/include/mod_dav_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/repos.c ; else echo "fake" > subversion/mod_dav_svn/repos.lo ; fi -subversion/mod_dav_svn/status.lo: subversion/mod_dav_svn/status.c subversion/include/mod_authz_svn.h subversion/include/private/svn_cache.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h subversion/svn_private_config.h +subversion/mod_dav_svn/status.lo: subversion/mod_dav_svn/status.c subversion/include/mod_authz_svn.h subversion/include/private/svn_cache.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h subversion/svn_private_config.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/status.c ; else echo "fake" > subversion/mod_dav_svn/status.lo ; fi -subversion/mod_dav_svn/util.lo: subversion/mod_dav_svn/util.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/private/svn_string_private.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/util.lo: subversion/mod_dav_svn/util.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/private/svn_string_private.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/util.c ; else echo "fake" > subversion/mod_dav_svn/util.lo ; fi -subversion/mod_dav_svn/version.lo: subversion/mod_dav_svn/version.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h +subversion/mod_dav_svn/version.lo: subversion/mod_dav_svn/version.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/version.c ; else echo "fake" > subversion/mod_dav_svn/version.lo ; fi subversion/po/de.mo: subversion/po/de.po @@ -3309,376 +3206,380 @@ subversion/po/zh_CN.mo: subversion/po/zh_CN.po subversion/po/zh_TW.mo: subversion/po/zh_TW.po -subversion/svn/add-cmd.lo: subversion/svn/add-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/add-cmd.lo: subversion/svn/add-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h + +subversion/svn/auth-cmd.lo: subversion/svn/auth-cmd.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/include/svn_x509.h subversion/svn/cl.h subversion/svn_private_config.h + +subversion/svn/blame-cmd.lo: subversion/svn/blame-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/auth-cmd.lo: subversion/svn/auth-cmd.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/include/svn_x509.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/cat-cmd.lo: subversion/svn/cat-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/blame-cmd.lo: subversion/svn/blame-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/changelist-cmd.lo: subversion/svn/changelist-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/cat-cmd.lo: subversion/svn/cat-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/checkout-cmd.lo: subversion/svn/checkout-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/changelist-cmd.lo: subversion/svn/changelist-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/cl-conflicts.lo: subversion/svn/cl-conflicts.c subversion/include/private/svn_debug.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl-conflicts.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/checkout-cmd.lo: subversion/svn/checkout-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/cleanup-cmd.lo: subversion/svn/cleanup-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/cl-conflicts.lo: subversion/svn/cl-conflicts.c subversion/include/private/svn_debug.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl-conflicts.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/commit-cmd.lo: subversion/svn/commit-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/cleanup-cmd.lo: subversion/svn/cleanup-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/conflict-callbacks.lo: subversion/svn/conflict-callbacks.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl-conflicts.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/commit-cmd.lo: subversion/svn/commit-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/copy-cmd.lo: subversion/svn/copy-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/conflict-callbacks.lo: subversion/svn/conflict-callbacks.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl-conflicts.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/delete-cmd.lo: subversion/svn/delete-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/copy-cmd.lo: subversion/svn/copy-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/deprecated.lo: subversion/svn/deprecated.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h -subversion/svn/delete-cmd.lo: subversion/svn/delete-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/diff-cmd.lo: subversion/svn/diff-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/deprecated.lo: subversion/svn/deprecated.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h +subversion/svn/export-cmd.lo: subversion/svn/export-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/diff-cmd.lo: subversion/svn/diff-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/file-merge.lo: subversion/svn/file-merge.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/export-cmd.lo: subversion/svn/export-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/filesize.lo: subversion/svn/filesize.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h -subversion/svn/file-merge.lo: subversion/svn/file-merge.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/help-cmd.lo: subversion/svn/help-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/help-cmd.lo: subversion/svn/help-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/import-cmd.lo: subversion/svn/import-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/import-cmd.lo: subversion/svn/import-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/info-cmd.lo: subversion/svn/info-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl-conflicts.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/info-cmd.lo: subversion/svn/info-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl-conflicts.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/list-cmd.lo: subversion/svn/list-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/list-cmd.lo: subversion/svn/list-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/lock-cmd.lo: subversion/svn/lock-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/lock-cmd.lo: subversion/svn/lock-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/log-cmd.lo: subversion/svn/log-cmd.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl-log.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/log-cmd.lo: subversion/svn/log-cmd.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl-log.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/merge-cmd.lo: subversion/svn/merge-cmd.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/merge-cmd.lo: subversion/svn/merge-cmd.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/mergeinfo-cmd.lo: subversion/svn/mergeinfo-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl-log.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/mergeinfo-cmd.lo: subversion/svn/mergeinfo-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl-log.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/mkdir-cmd.lo: subversion/svn/mkdir-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/mkdir-cmd.lo: subversion/svn/mkdir-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/move-cmd.lo: subversion/svn/move-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/move-cmd.lo: subversion/svn/move-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/notify.lo: subversion/svn/notify.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/notify.lo: subversion/svn/notify.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/patch-cmd.lo: subversion/svn/patch-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/patch-cmd.lo: subversion/svn/patch-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/propdel-cmd.lo: subversion/svn/propdel-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/propdel-cmd.lo: subversion/svn/propdel-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/propedit-cmd.lo: subversion/svn/propedit-cmd.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/propedit-cmd.lo: subversion/svn/propedit-cmd.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/propget-cmd.lo: subversion/svn/propget-cmd.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_sorts_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/propget-cmd.lo: subversion/svn/propget-cmd.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_sorts_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/proplist-cmd.lo: subversion/svn/proplist-cmd.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/proplist-cmd.lo: subversion/svn/proplist-cmd.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/props.lo: subversion/svn/props.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/props.lo: subversion/svn/props.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/propset-cmd.lo: subversion/svn/propset-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/propset-cmd.lo: subversion/svn/propset-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/relocate-cmd.lo: subversion/svn/relocate-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/relocate-cmd.lo: subversion/svn/relocate-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/resolve-cmd.lo: subversion/svn/resolve-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/resolve-cmd.lo: subversion/svn/resolve-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/resolved-cmd.lo: subversion/svn/resolved-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/resolved-cmd.lo: subversion/svn/resolved-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/revert-cmd.lo: subversion/svn/revert-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/revert-cmd.lo: subversion/svn/revert-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/shelf-cmd.lo: subversion/svn/shelf-cmd.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_sorts_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/shelve-cmd.lo: subversion/svn/shelve-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_sorts_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/similarity.lo: subversion/svn/similarity.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/similarity.lo: subversion/svn/similarity.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/status-cmd.lo: subversion/svn/status-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/status-cmd.lo: subversion/svn/status-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/status.lo: subversion/svn/status.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl-conflicts.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/status.lo: subversion/svn/status.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl-conflicts.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/svn.lo: subversion/svn/svn.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/svn.lo: subversion/svn/svn.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/switch-cmd.lo: subversion/svn/switch-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/switch-cmd.lo: subversion/svn/switch-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/unlock-cmd.lo: subversion/svn/unlock-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/unlock-cmd.lo: subversion/svn/unlock-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/update-cmd.lo: subversion/svn/update-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/update-cmd.lo: subversion/svn/update-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/upgrade-cmd.lo: subversion/svn/upgrade-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/upgrade-cmd.lo: subversion/svn/upgrade-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svn/util.lo: subversion/svn/util.c subversion/include/private/svn_client_private.h subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h -subversion/svn/util.lo: subversion/svn/util.c subversion/include/private/svn_client_private.h subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h +subversion/svnadmin/svnadmin.lo: subversion/svnadmin/svnadmin.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/svn_private_config.h -subversion/svnadmin/svnadmin.lo: subversion/svnadmin/svnadmin.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/svn_private_config.h +subversion/svnbench/help-cmd.lo: subversion/svnbench/help-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h subversion/svnbench/cl.h -subversion/svnbench/help-cmd.lo: subversion/svnbench/help-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h subversion/svnbench/cl.h +subversion/svnbench/notify.lo: subversion/svnbench/notify.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h subversion/svnbench/cl.h -subversion/svnbench/notify.lo: subversion/svnbench/notify.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h subversion/svnbench/cl.h +subversion/svnbench/null-blame-cmd.lo: subversion/svnbench/null-blame-cmd.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h subversion/svnbench/cl.h -subversion/svnbench/null-blame-cmd.lo: subversion/svnbench/null-blame-cmd.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h subversion/svnbench/cl.h +subversion/svnbench/null-export-cmd.lo: subversion/svnbench/null-export-cmd.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h subversion/svnbench/cl.h -subversion/svnbench/null-export-cmd.lo: subversion/svnbench/null-export-cmd.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h subversion/svnbench/cl.h +subversion/svnbench/null-info-cmd.lo: subversion/svnbench/null-info-cmd.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn_private_config.h subversion/svnbench/cl.h -subversion/svnbench/null-info-cmd.lo: subversion/svnbench/null-info-cmd.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn_private_config.h subversion/svnbench/cl.h +subversion/svnbench/null-list-cmd.lo: subversion/svnbench/null-list-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn_private_config.h subversion/svnbench/cl.h -subversion/svnbench/null-list-cmd.lo: subversion/svnbench/null-list-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn_private_config.h subversion/svnbench/cl.h +subversion/svnbench/null-log-cmd.lo: subversion/svnbench/null-log-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h subversion/svnbench/cl.h -subversion/svnbench/null-log-cmd.lo: subversion/svnbench/null-log-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h subversion/svnbench/cl.h +subversion/svnbench/svnbench.lo: subversion/svnbench/svnbench.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h subversion/svnbench/cl.h -subversion/svnbench/svnbench.lo: subversion/svnbench/svnbench.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h subversion/svnbench/cl.h +subversion/svnbench/util.lo: subversion/svnbench/util.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h subversion/svnbench/cl.h -subversion/svnbench/util.lo: subversion/svnbench/util.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h subversion/svnbench/cl.h +subversion/svndumpfilter/svndumpfilter.lo: subversion/svndumpfilter/svndumpfilter.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dirent_uri_private.h subversion/include/private/svn_editor.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h -subversion/svndumpfilter/svndumpfilter.lo: subversion/svndumpfilter/svndumpfilter.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h +subversion/svnfsfs/dump-index-cmd.lo: subversion/svnfsfs/dump-index-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_fs_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svnfsfs/svnfsfs.h -subversion/svnfsfs/dump-index-cmd.lo: subversion/svnfsfs/dump-index-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_fs_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svnfsfs/svnfsfs.h +subversion/svnfsfs/load-index-cmd.lo: subversion/svnfsfs/load-index-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h subversion/svnfsfs/svnfsfs.h -subversion/svnfsfs/load-index-cmd.lo: subversion/svnfsfs/load-index-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_sorts_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h subversion/svnfsfs/svnfsfs.h +subversion/svnfsfs/stats-cmd.lo: subversion/svnfsfs/stats-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h subversion/svnfsfs/svnfsfs.h -subversion/svnfsfs/stats-cmd.lo: subversion/svnfsfs/stats-cmd.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h subversion/svnfsfs/svnfsfs.h +subversion/svnfsfs/svnfsfs.lo: subversion/svnfsfs/svnfsfs.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/svnfsfs/svnfsfs.h -subversion/svnfsfs/svnfsfs.lo: subversion/svnfsfs/svnfsfs.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/svnfsfs/svnfsfs.h +subversion/svnlook/svnlook.lo: subversion/svnlook/svnlook.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_io_private.h subversion/include/private/svn_sorts_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/svn_private_config.h -subversion/svnlook/svnlook.lo: subversion/svnlook/svnlook.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_io_private.h subversion/include/private/svn_sorts_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/svn_private_config.h +subversion/svnmucc/svnmucc.lo: subversion/svnmucc/svnmucc.c subversion/include/private/svn_client_mtcc.h subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h -subversion/svnmucc/svnmucc.lo: subversion/svnmucc/svnmucc.c subversion/include/private/svn_client_mtcc.h subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/svnrdump/dump_editor.lo: subversion/svnrdump/dump_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svnrdump/svnrdump.h -subversion/svnrdump/dump_editor.lo: subversion/svnrdump/dump_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/svnrdump/svnrdump.h +subversion/svnrdump/load_editor.lo: subversion/svnrdump/load_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h subversion/svnrdump/svnrdump.h -subversion/svnrdump/load_editor.lo: subversion/svnrdump/load_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/svn_private_config.h subversion/svnrdump/svnrdump.h +subversion/svnrdump/svnrdump.lo: subversion/svnrdump/svnrdump.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn_private_config.h subversion/svnrdump/svnrdump.h -subversion/svnrdump/svnrdump.lo: subversion/svnrdump/svnrdump.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn_private_config.h subversion/svnrdump/svnrdump.h +subversion/svnrdump/util.lo: subversion/svnrdump/util.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svnrdump/svnrdump.h -subversion/svnrdump/util.lo: subversion/svnrdump/util.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svnrdump/svnrdump.h +subversion/svnserve/cyrus_auth.lo: subversion/svnserve/cyrus_auth.c subversion/include/private/ra_svn_sasl.h subversion/include/private/ra_svn_wrapped_sasl.h subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_ra_svn_private.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h subversion/svnserve/server.h -subversion/svnserve/cyrus_auth.lo: subversion/svnserve/cyrus_auth.c subversion/include/private/ra_svn_sasl.h subversion/include/private/ra_svn_wrapped_sasl.h subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_ra_svn_private.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h subversion/svnserve/server.h +subversion/svnserve/log-escape.lo: subversion/svnserve/log-escape.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svnserve/server.h -subversion/svnserve/log-escape.lo: subversion/svnserve/log-escape.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svnserve/server.h +subversion/svnserve/logger.lo: subversion/svnserve/logger.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h subversion/svnserve/logger.h subversion/svnserve/server.h -subversion/svnserve/logger.lo: subversion/svnserve/logger.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/svn_private_config.h subversion/svnserve/logger.h subversion/svnserve/server.h +subversion/svnserve/serve.lo: subversion/svnserve/serve.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_ra_svn_private.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_user.h subversion/svn_private_config.h subversion/svnserve/logger.h subversion/svnserve/server.h -subversion/svnserve/serve.lo: subversion/svnserve/serve.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_ra_svn_private.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/svn_private_config.h subversion/svnserve/logger.h subversion/svnserve/server.h +subversion/svnserve/svnserve.lo: subversion/svnserve/svnserve.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/svnserve/logger.h subversion/svnserve/server.h subversion/svnserve/winservice.h -subversion/svnserve/svnserve.lo: subversion/svnserve/svnserve.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/svnserve/logger.h subversion/svnserve/server.h subversion/svnserve/winservice.h +subversion/svnserve/winservice.lo: subversion/svnserve/winservice.c subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h subversion/svnserve/winservice.h -subversion/svnserve/winservice.lo: subversion/svnserve/winservice.c subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/svn_private_config.h subversion/svnserve/winservice.h +subversion/svnsync/svnsync.lo: subversion/svnsync/svnsync.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_ra_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/svnsync/sync.h -subversion/svnsync/svnsync.lo: subversion/svnsync/svnsync.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_ra_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/svnsync/sync.h +subversion/svnsync/sync.lo: subversion/svnsync/sync.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/svn_private_config.h subversion/svnsync/sync.h -subversion/svnsync/sync.lo: subversion/svnsync/sync.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h subversion/svnsync/sync.h +subversion/svnversion/svnversion.lo: subversion/svnversion/svnversion.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h -subversion/svnversion/svnversion.lo: subversion/svnversion/svnversion.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h +subversion/tests/afl/afl-svndiff.lo: subversion/tests/afl/afl-svndiff.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/tests/afl/afl-x509.lo: subversion/tests/afl/afl-x509.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_x509.h +subversion/tests/afl/afl-x509.lo: subversion/tests/afl/afl-x509.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_x509.h -subversion/tests/cmdline/atomic-ra-revprop-change.lo: subversion/tests/cmdline/atomic-ra-revprop-change.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/tests/cmdline/atomic-ra-revprop-change.lo: subversion/tests/cmdline/atomic-ra-revprop-change.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h -subversion/tests/cmdline/entries-dump.lo: subversion/tests/cmdline/entries-dump.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/tests/cmdline/entries-dump.lo: subversion/tests/cmdline/entries-dump.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/tests/cmdline/lock-helper.lo: subversion/tests/cmdline/lock-helper.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/tests/cmdline/lock-helper.lo: subversion/tests/cmdline/lock-helper.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_client/client-test.lo: subversion/tests/libsvn_client/client-test.c subversion/include/private/svn_client_mtcc.h subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_client/client-test.lo: subversion/tests/libsvn_client/client-test.c subversion/include/private/svn_client_mtcc.h subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_client/conflicts-test.lo: subversion/tests/libsvn_client/conflicts-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_client/conflicts-test.lo: subversion/tests/libsvn_client/conflicts-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_client/mtcc-test.lo: subversion/tests/libsvn_client/mtcc-test.c subversion/include/private/svn_client_mtcc.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_client/mtcc-test.lo: subversion/tests/libsvn_client/mtcc-test.c subversion/include/private/svn_client_mtcc.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_delta/random-test.lo: subversion/tests/libsvn_delta/random-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_delta/compose_delta.c subversion/libsvn_delta/delta.h subversion/tests/libsvn_delta/delta-window-test.h subversion/tests/libsvn_delta/range-index-test.h subversion/tests/svn_test.h +subversion/tests/libsvn_delta/random-test.lo: subversion/tests/libsvn_delta/random-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_delta/compose_delta.c subversion/libsvn_delta/delta.h subversion/tests/libsvn_delta/delta-window-test.h subversion/tests/libsvn_delta/range-index-test.h subversion/tests/svn_test.h -subversion/tests/libsvn_delta/svndiff-stream-test.lo: subversion/tests/libsvn_delta/svndiff-stream-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_delta/svndiff-stream-test.lo: subversion/tests/libsvn_delta/svndiff-stream-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_delta/svndiff-test.lo: subversion/tests/libsvn_delta/svndiff-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_quoprint.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_delta/svndiff-test.lo: subversion/tests/libsvn_delta/svndiff-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_quoprint.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_delta/vdelta-test.lo: subversion/tests/libsvn_delta/vdelta-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_delta/delta.h subversion/tests/libsvn_delta/delta-window-test.h subversion/tests/svn_test.h +subversion/tests/libsvn_delta/vdelta-test.lo: subversion/tests/libsvn_delta/vdelta-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_delta/delta.h subversion/tests/libsvn_delta/delta-window-test.h subversion/tests/svn_test.h -subversion/tests/libsvn_delta/window-test.lo: subversion/tests/libsvn_delta/window-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_delta/window-test.lo: subversion/tests/libsvn_delta/window-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_diff/diff-diff3-test.lo: subversion/tests/libsvn_diff/diff-diff3-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/tests/svn_test.h +subversion/tests/libsvn_diff/diff-diff3-test.lo: subversion/tests/libsvn_diff/diff-diff3-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/tests/svn_test.h -subversion/tests/libsvn_diff/parse-diff-test.lo: subversion/tests/libsvn_diff/parse-diff-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/tests/svn_test.h +subversion/tests/libsvn_diff/parse-diff-test.lo: subversion/tests/libsvn_diff/parse-diff-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/tests/svn_test.h -subversion/tests/libsvn_fs/fs-sequential-test.lo: subversion/tests/libsvn_fs/fs-sequential-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_delta/delta.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_fs/fs-sequential-test.lo: subversion/tests/libsvn_fs/fs-sequential-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_delta/delta.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_fs/fs-test.lo: subversion/tests/libsvn_fs/fs-test.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_delta/delta.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_fs/fs-test.lo: subversion/tests/libsvn_fs/fs-test.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_delta/delta.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_fs/locks-test.lo: subversion/tests/libsvn_fs/locks-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_fs/locks-test.lo: subversion/tests/libsvn_fs/locks-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_fs_base/changes-test.lo: subversion/tests/libsvn_fs_base/changes-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/svn_private_config.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_fs_base/changes-test.lo: subversion/tests/libsvn_fs_base/changes-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/svn_private_config.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_fs_base/fs-base-test.lo: subversion/tests/libsvn_fs_base/fs-base-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_skel.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_delta/delta.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/trail.h subversion/svn_private_config.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_fs_base/fs-base-test.lo: subversion/tests/libsvn_fs_base/fs-base-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_skel.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_delta/delta.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/trail.h subversion/svn_private_config.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_fs_base/strings-reps-test.lo: subversion/tests/libsvn_fs_base/strings-reps-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/reps-table.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_fs_base/strings-reps-test.lo: subversion/tests/libsvn_fs_base/strings-reps-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/private/svn_skel.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/reps-table.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_x/fs_init.h subversion/svn_private_config.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.lo: subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/rev_file.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.lo: subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/rev_file.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_fs_fs/fs-fs-pack-test.lo: subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_fs_fs/fs-fs-pack-test.lo: subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/fs_init.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/fs_init.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/low_level.h subversion/libsvn_fs_fs/pack.h subversion/libsvn_fs_fs/rev_file.h subversion/libsvn_fs_fs/util.h subversion/libsvn_fs_x/fs_init.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_fs_fs/fs-fs-private-test.lo: subversion/tests/libsvn_fs_fs/fs-fs-private-test.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rev_file.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_fs_fs/fs-fs-private-test.lo: subversion/tests/libsvn_fs_fs/fs-fs-private-test.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_fs_private.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/index.h subversion/libsvn_fs_fs/rev_file.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_fs_x/fs-x-pack-test.lo: subversion/tests/libsvn_fs_x/fs-x-pack-test.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/reps.h subversion/libsvn_fs_x/rev_file.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_fs_x/fs-x-pack-test.lo: subversion/tests/libsvn_fs_x/fs-x-pack-test.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_x/batch_fsync.h subversion/libsvn_fs_x/fs.h subversion/libsvn_fs_x/id.h subversion/libsvn_fs_x/reps.h subversion/libsvn_fs_x/rev_file.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_fs_x/string-table-test.lo: subversion/tests/libsvn_fs_x/string-table-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_temp_serializer.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_x/string_table.h subversion/tests/svn_test.h +subversion/tests/libsvn_fs_x/string-table-test.lo: subversion/tests/libsvn_fs_x/string-table-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_temp_serializer.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_fs_x/string_table.h subversion/tests/svn_test.h -subversion/tests/libsvn_ra/ra-test.lo: subversion/tests/libsvn_ra/ra-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/libsvn_ra_local/ra_local.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_ra/ra-test.lo: subversion/tests/libsvn_ra/ra-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_ra_local/ra_local.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_ra_local/ra-local-test.lo: subversion/tests/libsvn_ra_local/ra-local-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_ra_local/ra_local.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_ra_local/ra-local-test.lo: subversion/tests/libsvn_ra_local/ra-local-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_ra_local/ra_local.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_repos/authz-test.lo: subversion/tests/libsvn_repos/authz-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/authz.h subversion/tests/svn_test.h +subversion/tests/libsvn_repos/authz-test.lo: subversion/tests/libsvn_repos/authz-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_repos/authz.h subversion/tests/svn_test.h -subversion/tests/libsvn_repos/dir-delta-editor.lo: subversion/tests/libsvn_repos/dir-delta-editor.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/libsvn_repos/dir-delta-editor.h subversion/tests/svn_test.h +subversion/tests/libsvn_repos/dir-delta-editor.lo: subversion/tests/libsvn_repos/dir-delta-editor.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/libsvn_repos/dir-delta-editor.h subversion/tests/svn_test.h -subversion/tests/libsvn_repos/dump-load-test.lo: subversion/tests/libsvn_repos/dump-load-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_repos/dump-load-test.lo: subversion/tests/libsvn_repos/dump-load-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_repos/repos-test.lo: subversion/tests/libsvn_repos/repos-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_subr/config_impl.h subversion/tests/libsvn_repos/dir-delta-editor.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_repos/repos-test.lo: subversion/tests/libsvn_repos/repos-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/libsvn_subr/config_impl.h subversion/tests/libsvn_repos/dir-delta-editor.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_subr/auth-test.lo: subversion/tests/libsvn_subr/auth-test.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/auth-test.lo: subversion/tests/libsvn_subr/auth-test.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/bit-array-test.lo: subversion/tests/libsvn_subr/bit-array-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/bit-array-test.lo: subversion/tests/libsvn_subr/bit-array-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/cache-test.lo: subversion/tests/libsvn_subr/cache-test.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/cache-test.lo: subversion/tests/libsvn_subr/cache-test.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/svn_private_config.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/checksum-test.lo: subversion/tests/libsvn_subr/checksum-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/checksum-test.lo: subversion/tests/libsvn_subr/checksum-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/compat-test.lo: subversion/tests/libsvn_subr/compat-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/compat-test.lo: subversion/tests/libsvn_subr/compat-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/compress-test.lo: subversion/tests/libsvn_subr/compress-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/compress-test.lo: subversion/tests/libsvn_subr/compress-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/config-test.lo: subversion/tests/libsvn_subr/config-test.c subversion/include/private/svn_config_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/config-test.lo: subversion/tests/libsvn_subr/config-test.c subversion/include/private/svn_config_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/crypto-test.lo: subversion/tests/libsvn_subr/crypto-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/crypto.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/crypto-test.lo: subversion/tests/libsvn_subr/crypto-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_subr/crypto.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/dirent_uri-test.lo: subversion/tests/libsvn_subr/dirent_uri-test.c subversion/include/private/svn_cert.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/dirent_uri-test.lo: subversion/tests/libsvn_subr/dirent_uri-test.c subversion/include/private/svn_cert.h subversion/include/private/svn_debug.h subversion/include/private/svn_dirent_uri_private.h subversion/include/private/svn_fspath.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/error-code-test.lo: subversion/tests/libsvn_subr/error-code-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/error-code-test.lo: subversion/tests/libsvn_subr/error-code-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/error-test.lo: subversion/tests/libsvn_subr/error-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_error_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/error-test.lo: subversion/tests/libsvn_subr/error-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_error_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/hashdump-test.lo: subversion/tests/libsvn_subr/hashdump-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/hashdump-test.lo: subversion/tests/libsvn_subr/hashdump-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/io-test.lo: subversion/tests/libsvn_subr/io-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_io_private.h subversion/include/private/svn_skel.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_subr/io-test.lo: subversion/tests/libsvn_subr/io-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_io_private.h subversion/include/private/svn_skel.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_subr/mergeinfo-test.lo: subversion/tests/libsvn_subr/mergeinfo-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_mergeinfo_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/mergeinfo-test.lo: subversion/tests/libsvn_subr/mergeinfo-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_mergeinfo_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/opt-test.lo: subversion/tests/libsvn_subr/opt-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/opt-test.lo: subversion/tests/libsvn_subr/opt-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/packed-data-test.lo: subversion/tests/libsvn_subr/packed-data-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_packed_data.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/packed-data-test.lo: subversion/tests/libsvn_subr/packed-data-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_packed_data.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/path-test.lo: subversion/tests/libsvn_subr/path-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/path-test.lo: subversion/tests/libsvn_subr/path-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/prefix-string-test.lo: subversion/tests/libsvn_subr/prefix-string-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/prefix-string-test.lo: subversion/tests/libsvn_subr/prefix-string-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/priority-queue-test.lo: subversion/tests/libsvn_subr/priority-queue-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_sorts_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/priority-queue-test.lo: subversion/tests/libsvn_subr/priority-queue-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_sorts_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/revision-test.lo: subversion/tests/libsvn_subr/revision-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/revision-test.lo: subversion/tests/libsvn_subr/revision-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/root-pools-test.lo: subversion/tests/libsvn_subr/root-pools-test.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/root-pools-test.lo: subversion/tests/libsvn_subr/root-pools-test.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/skel-test.lo: subversion/tests/libsvn_subr/skel-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_subr/skel-test.lo: subversion/tests/libsvn_subr/skel-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_subr/spillbuf-test.lo: subversion/tests/libsvn_subr/spillbuf-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/spillbuf-test.lo: subversion/tests/libsvn_subr/spillbuf-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/sqlite-test.lo: subversion/tests/libsvn_subr/sqlite-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/sqlite-test.lo: subversion/tests/libsvn_subr/sqlite-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/stream-test.lo: subversion/tests/libsvn_subr/stream-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_io_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/stream-test.lo: subversion/tests/libsvn_subr/stream-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_io_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/string-test.lo: subversion/tests/libsvn_subr/string-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/string-test.lo: subversion/tests/libsvn_subr/string-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/subst_translate-test.lo: subversion/tests/libsvn_subr/subst_translate-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/subst_translate-test.lo: subversion/tests/libsvn_subr/subst_translate-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/time-test.lo: subversion/tests/libsvn_subr/time-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/time-test.lo: subversion/tests/libsvn_subr/time-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/translate-test.lo: subversion/tests/libsvn_subr/translate-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/translate-test.lo: subversion/tests/libsvn_subr/translate-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/utf-test.lo: subversion/tests/libsvn_subr/utf-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/utf-test.lo: subversion/tests/libsvn_subr/utf-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/x509-test.lo: subversion/tests/libsvn_subr/x509-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_x509.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/x509-test.lo: subversion/tests/libsvn_subr/x509-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_x509.h subversion/tests/svn_test.h -subversion/tests/libsvn_subr/xml-test.lo: subversion/tests/libsvn_subr/xml-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/tests/svn_test.h +subversion/tests/libsvn_subr/xml-test.lo: subversion/tests/libsvn_subr/xml-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/tests/svn_test.h subversion/libsvn_subr/sqlite3wrapper.lo: subversion/libsvn_subr/sqlite3wrapper.c subversion/svn_private_config.h -subversion/tests/libsvn_wc/conflict-data-test.lo: subversion/tests/libsvn_wc/conflict-data-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/tree_conflicts.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h +subversion/tests/libsvn_wc/conflict-data-test.lo: subversion/tests/libsvn_wc/conflict-data-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/tree_conflicts.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h -subversion/tests/libsvn_wc/db-test.lo: subversion/tests/libsvn_wc/db-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h +subversion/tests/libsvn_wc/db-test.lo: subversion/tests/libsvn_wc/db-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h -subversion/tests/libsvn_wc/entries-compat.lo: subversion/tests/libsvn_wc/entries-compat.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h +subversion/tests/libsvn_wc/entries-compat.lo: subversion/tests/libsvn_wc/entries-compat.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h -subversion/tests/libsvn_wc/op-depth-test.lo: subversion/tests/libsvn_wc/op-depth-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/libsvn_wc/wc-test-queries.h subversion/tests/svn_test.h +subversion/tests/libsvn_wc/op-depth-test.lo: subversion/tests/libsvn_wc/op-depth-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/libsvn_wc/wc-test-queries.h subversion/tests/svn_test.h -subversion/tests/libsvn_wc/pristine-store-test.lo: subversion/tests/libsvn_wc/pristine-store-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h +subversion/tests/libsvn_wc/pristine-store-test.lo: subversion/tests/libsvn_wc/pristine-store-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h -subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/token-map.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_wc/wc-incomplete-tester.lo: subversion/tests/libsvn_wc/wc-incomplete-tester.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +subversion/tests/libsvn_wc/wc-incomplete-tester.lo: subversion/tests/libsvn_wc/wc-incomplete-tester.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -subversion/tests/libsvn_wc/wc-lock-tester.lo: subversion/tests/libsvn_wc/wc-lock-tester.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h +subversion/tests/libsvn_wc/wc-lock-tester.lo: subversion/tests/libsvn_wc/wc-lock-tester.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/tests/libsvn_wc/wc-queries-test.lo: subversion/tests/libsvn_wc/wc-queries-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_wc/wc-queries.h subversion/svn_private_config.h subversion/tests/svn_test.h +subversion/tests/libsvn_wc/wc-queries-test.lo: subversion/tests/libsvn_wc/wc-queries-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/libsvn_wc/wc-queries.h subversion/svn_private_config.h subversion/tests/svn_test.h -subversion/tests/libsvn_wc/wc-test.lo: subversion/tests/libsvn_wc/wc-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h +subversion/tests/libsvn_wc/wc-test.lo: subversion/tests/libsvn_wc/wc-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h -subversion/tests/svn_test_fs.lo: subversion/tests/svn_test_fs.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/svn_test_fs.lo: subversion/tests/svn_test_fs.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/svn_test_main.lo: subversion/tests/svn_test_main.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/tests/svn_test.h +subversion/tests/svn_test_main.lo: subversion/tests/svn_test_main.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mutex.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/tests/svn_test.h -tools/client-side/svn-mergeinfo-normalizer/analyze-cmd.lo: tools/client-side/svn-mergeinfo-normalizer/analyze-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h +tools/client-side/svn-mergeinfo-normalizer/analyze-cmd.lo: tools/client-side/svn-mergeinfo-normalizer/analyze-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h -tools/client-side/svn-mergeinfo-normalizer/help-cmd.lo: tools/client-side/svn-mergeinfo-normalizer/help-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h +tools/client-side/svn-mergeinfo-normalizer/help-cmd.lo: tools/client-side/svn-mergeinfo-normalizer/help-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h -tools/client-side/svn-mergeinfo-normalizer/log.lo: tools/client-side/svn-mergeinfo-normalizer/log.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h +tools/client-side/svn-mergeinfo-normalizer/log.lo: tools/client-side/svn-mergeinfo-normalizer/log.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h -tools/client-side/svn-mergeinfo-normalizer/logic.lo: tools/client-side/svn-mergeinfo-normalizer/logic.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_sorts_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h +tools/client-side/svn-mergeinfo-normalizer/logic.lo: tools/client-side/svn-mergeinfo-normalizer/logic.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_sorts_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h -tools/client-side/svn-mergeinfo-normalizer/missing-branches.lo: tools/client-side/svn-mergeinfo-normalizer/missing-branches.c subversion/include/private/svn_debug.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h +tools/client-side/svn-mergeinfo-normalizer/missing-branches.lo: tools/client-side/svn-mergeinfo-normalizer/missing-branches.c subversion/include/private/svn_debug.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h -tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.lo: tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h +tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.lo: tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h -tools/client-side/svn-mergeinfo-normalizer/remove-branches-cmd.lo: tools/client-side/svn-mergeinfo-normalizer/remove-branches-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h +tools/client-side/svn-mergeinfo-normalizer/remove-branches-cmd.lo: tools/client-side/svn-mergeinfo-normalizer/remove-branches-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h -tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.lo: tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h +tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.lo: tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h -tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.lo: tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h +tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.lo: tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h -tools/client-side/svnconflict/svnconflict.lo: tools/client-side/svnconflict/svnconflict.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h +tools/client-side/svnconflict/svnconflict.lo: tools/client-side/svnconflict/svnconflict.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h -tools/dev/fsfs-access-map.lo: tools/dev/fsfs-access-map.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +tools/dev/fsfs-access-map.lo: tools/dev/fsfs-access-map.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -tools/dev/svnmover/merge3.lo: tools/dev/svnmover/merge3.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_compat.h subversion/include/private/svn_branch_nested.h subversion/include/private/svn_branch_repos.h subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_element.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/dev/svnmover/svnmover.h +tools/dev/svnmover/merge3.lo: tools/dev/svnmover/merge3.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_compat.h subversion/include/private/svn_branch_nested.h subversion/include/private/svn_branch_repos.h subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_element.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/dev/svnmover/svnmover.h -tools/dev/svnmover/ra.lo: tools/dev/svnmover/ra.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_compat.h subversion/include/private/svn_branch_repos.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/private/svn_element.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/dev/svnmover/svnmover.h +tools/dev/svnmover/ra.lo: tools/dev/svnmover/ra.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_compat.h subversion/include/private/svn_branch_repos.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/private/svn_element.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/dev/svnmover/svnmover.h -tools/dev/svnmover/scanlog.lo: tools/dev/svnmover/scanlog.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_compat.h subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_element.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/dev/svnmover/svnmover.h +tools/dev/svnmover/scanlog.lo: tools/dev/svnmover/scanlog.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_compat.h subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_element.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/dev/svnmover/svnmover.h -tools/dev/svnmover/svnmover.lo: tools/dev/svnmover/svnmover.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_compat.h subversion/include/private/svn_branch_nested.h subversion/include/private/svn_branch_repos.h subversion/include/private/svn_client_private.h subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_element.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/dev/svnmover/linenoise/linenoise.h tools/dev/svnmover/svnmover.h +tools/dev/svnmover/svnmover.lo: tools/dev/svnmover/svnmover.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_compat.h subversion/include/private/svn_branch_nested.h subversion/include/private/svn_branch_repos.h subversion/include/private/svn_client_private.h subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_element.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_sorts_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/dev/svnmover/linenoise/linenoise.h tools/dev/svnmover/svnmover.h -tools/dev/svnmover/util.lo: tools/dev/svnmover/util.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_compat.h subversion/include/private/svn_debug.h subversion/include/private/svn_element.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h tools/dev/svnmover/linenoise/linenoise.c tools/dev/svnmover/linenoise/linenoise.h tools/dev/svnmover/svnmover.h +tools/dev/svnmover/util.lo: tools/dev/svnmover/util.c subversion/include/private/svn_branch.h subversion/include/private/svn_branch_compat.h subversion/include/private/svn_debug.h subversion/include/private/svn_element.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_wc.h tools/dev/svnmover/linenoise/linenoise.c tools/dev/svnmover/linenoise/linenoise.h tools/dev/svnmover/svnmover.h -tools/dev/svnraisetreeconflict/svnraisetreeconflict.lo: tools/dev/svnraisetreeconflict/svnraisetreeconflict.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h +tools/dev/svnraisetreeconflict/svnraisetreeconflict.lo: tools/dev/svnraisetreeconflict/svnraisetreeconflict.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h -tools/dev/wc-ng/svn-wc-db-tester.lo: tools/dev/wc-ng/svn-wc-db-tester.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h +tools/dev/wc-ng/svn-wc-db-tester.lo: tools/dev/wc-ng/svn-wc-db-tester.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h -tools/dev/x509-parser.lo: tools/dev/x509-parser.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_x509.h subversion/svn_private_config.h +tools/dev/x509-parser.lo: tools/dev/x509-parser.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_x509.h subversion/svn_private_config.h -tools/diff/diff.lo: tools/diff/diff.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h +tools/diff/diff.lo: tools/diff/diff.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h -tools/diff/diff3.lo: tools/diff/diff3.c subversion/include/private/svn_debug.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +tools/diff/diff3.lo: tools/diff/diff3.c subversion/include/private/svn_debug.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -tools/diff/diff4.lo: tools/diff/diff4.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h +tools/diff/diff4.lo: tools/diff/diff4.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h -tools/server-side/mod_dontdothat/mod_dontdothat.lo: tools/server-side/mod_dontdothat/mod_dontdothat.c subversion/include/mod_dav_svn.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h +tools/server-side/mod_dontdothat/mod_dontdothat.lo: tools/server-side/mod_dontdothat/mod_dontdothat.c subversion/include/mod_dav_svn.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)tools/server-side/mod_dontdothat/mod_dontdothat.c ; else echo "fake" > tools/server-side/mod_dontdothat/mod_dontdothat.lo ; fi -tools/server-side/svn-populate-node-origins-index.lo: tools/server-side/svn-populate-node-origins-index.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h +tools/server-side/svn-populate-node-origins-index.lo: tools/server-side/svn-populate-node-origins-index.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h -tools/server-side/svnauthz.lo: tools/server-side/svnauthz.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h +tools/server-side/svnauthz.lo: tools/server-side/svnauthz.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/svn_private_config.h -tools/server-side/svnauthz.lo: tools/server-side/svnauthz.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h +tools/server-side/svnauthz.lo: tools/server-side/svnauthz.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_opt_impl.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_utf.h subversion/svn_private_config.h diff --git a/build.conf b/build.conf index 8f01622..7631a61 100644 --- a/build.conf +++ b/build.conf @@ -38,11 +38,14 @@ private-includes = subversion/include/private/*.h subversion/bindings/swig/include/*.swg subversion/libsvn_delta/compose_delta.c - subversion/bindings/cxxhl/include/*.hpp - subversion/bindings/cxxhl/include/svncxxhl/*.hpp - subversion/bindings/cxxhl/src/*.hpp - subversion/bindings/cxxhl/src/aprwrap/*.hpp - subversion/bindings/cxxhl/src/private/*.hpp + subversion/bindings/cxx/include/*.hpp + subversion/bindings/cxx/include/svnxx/*.hpp + subversion/bindings/cxx/include/svnxx/client/*.hpp + subversion/bindings/cxx/include/svnxx/detail/*.hpp + subversion/bindings/cxx/src/*.hpp + subversion/bindings/cxx/src/aprwrap/*.hpp + subversion/bindings/cxx/src/private/*.hpp + subversion/bindings/cxx/tests/*.hpp subversion/bindings/javahl/native/*.hpp subversion/bindings/javahl/native/jniwrapper/jni_*.hpp tools/dev/svnmover/linenoise/linenoise.h @@ -371,7 +374,8 @@ type = lib install = fsmod-lib path = subversion/libsvn_subr sources = *.c lz4/*.c -libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic intl lz4 utf8proc +libs = aprutil apriconv apr xml zlib apr_memcache + sqlite magic intl lz4 utf8proc macos-plist macos-keychain msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib crypt32.lib version.lib msvc-export = @@ -392,7 +396,7 @@ msvc-export = private\svn_string_private.h private\svn_magic.h private\svn_subr_private.h private\svn_mutex.h private\svn_packed_data.h private\svn_object_pool.h private\svn_cert.h - private\svn_config_private.h + private\svn_config_private.h private\svn_dirent_uri_private.h # Working copy management lib [libsvn_wc] @@ -438,7 +442,7 @@ description = Subversion FSFS Repository Manipulation Tool type = exe path = subversion/svnfsfs install = bin -libs = libsvn_repos libsvn_fs libsvn_fs_fs libsvn_delta libsvn_subr apriconv apr +libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr # ---------------------------------------------------------------------------- # @@ -608,16 +612,14 @@ msvc-export = ../bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h [javahl-java] type = java path = subversion/bindings/javahl/src/org/apache/subversion/javahl - subversion/bindings/javahl/src/org/apache/subversion/javahl/callback - subversion/bindings/javahl/src/org/apache/subversion/javahl/remote - subversion/bindings/javahl/src/org/apache/subversion/javahl/types - subversion/bindings/javahl/src/org/apache/subversion/javahl/util -src-root = subversion/bindings/javahl/src sources = *.java +native = CommitItemStateFlags.java NativeResources.java SVNClient.java + SVNRepos.java install = javahl-java link-cmd = $(COMPILE_JAVAHL_JAVAC) classes = subversion/bindings/javahl/classes -package-roots = org +headers = subversion/bindings/javahl/include +package = org.apache.subversion.javahl [javahl-compat-java] type = java @@ -626,10 +628,12 @@ sources = *.java install = javahl-java link-cmd = $(COMPILE_JAVAHL_COMPAT_JAVAC) classes = subversion/bindings/javahl/classes -add-deps = $(javahl_java_DEPS) +add-deps = $(javahl_callback_java_DEPS) $(javahl_remote_java_DEPS) + $(javahl_types_java_DEPS) $(javahl_util_java_DEPS) + $(javahl_java_DEPS) ### Replace JAR call in INSTALL_EXTRA_JAVAHL_JAVA macro Makefile.in. #jar = svn-javahl.jar -package-roots = org +package = org.tigris.subversion.javahl [javahl-tests] type = java @@ -638,10 +642,12 @@ sources = *.java install = javahl-java link-cmd = $(COMPILE_JAVAHL_JAVAC) classes = subversion/bindings/javahl/classes -package-roots = org +package = org.apache.subversion.javahl ### Java targets don't do up-to-date checks yet. #add-deps = javahl-java -add-deps = $(javahl_java_DEPS) +add-deps = $(javahl_callback_java_DEPS) $(javahl_remote_java_DEPS) + $(javahl_types_java_DEPS) $(javahl_util_java_DEPS) + $(javahl_java_DEPS) [javahl-compat-tests] type = java @@ -650,65 +656,59 @@ sources = *.java install = javahl-java link-cmd = $(COMPILE_JAVAHL_COMPAT_JAVAC) classes = subversion/bindings/javahl/classes -package-roots = org +package = org.tigris.subversion.javahl ### Java targets don't do up-to-date checks yet. #add-deps = javahl-compat-java add-deps = $(javahl_compat_java_DEPS) -[javahl-callback-javah] -type = javah +[javahl-callback-java] +type = java path = subversion/bindings/javahl/src/org/apache/subversion/javahl/callback classes = subversion/bindings/javahl/classes headers = subversion/bindings/javahl/include package = org.apache.subversion.javahl.callback sources = *.java -add-deps = $(javahl_java_DEPS) -install = javahl-javah -link-cmd = $(COMPILE_JAVAHL_JAVAH) -force +native = UserPasswordCallback.java +install = javahl-java +link-cmd = $(COMPILE_JAVAHL_JAVAC) -[javahl-remote-javah] -type = javah +[javahl-remote-java] +type = java path = subversion/bindings/javahl/src/org/apache/subversion/javahl/remote classes = subversion/bindings/javahl/classes headers = subversion/bindings/javahl/include package = org.apache.subversion.javahl.remote sources = *.java -add-deps = $(javahl_java_DEPS) -install = javahl-javah -link-cmd = $(COMPILE_JAVAHL_JAVAH) -force +native = CommitEditor.java RemoteFactory.java RemoteSession.java + StateReporter.java +install = javahl-java +link-cmd = $(COMPILE_JAVAHL_JAVAC) -[javahl-types-javah] -type = javah +[javahl-types-java] +type = java path = subversion/bindings/javahl/src/org/apache/subversion/javahl/types classes = subversion/bindings/javahl/classes headers = subversion/bindings/javahl/include package = org.apache.subversion.javahl.types sources = *.java -add-deps = $(javahl_java_DEPS) -install = javahl-javah -link-cmd = $(COMPILE_JAVAHL_JAVAH) -force +native = NativeInputStream.java NativeOutputStream.java Revision.java + RevisionRangeList.java RuntimeVersion.java VersionExtended.java + Version.java +install = javahl-java +link-cmd = $(COMPILE_JAVAHL_JAVAC) -[javahl-util-javah] -type = javah +[javahl-util-java] +type = java path = subversion/bindings/javahl/src/org/apache/subversion/javahl/util classes = subversion/bindings/javahl/classes headers = subversion/bindings/javahl/include package = org.apache.subversion.javahl.util sources = *.java -add-deps = $(javahl_java_DEPS) -install = javahl-javah -link-cmd = $(COMPILE_JAVAHL_JAVAH) -force - -[javahl-javah] -type = javah -path = subversion/bindings/javahl/src/org/apache/subversion/javahl -classes = subversion/bindings/javahl/classes -headers = subversion/bindings/javahl/include -package = org.apache.subversion.javahl -sources = *.java -add-deps = $(javahl_java_DEPS) -install = javahl-javah -link-cmd = $(COMPILE_JAVAHL_JAVAH) -force +native = ConfigImpl.java ConfigLib.java DiffLib.java PropLib.java + RequestChannel.java ResponseChannel.java SubstLib.java + TunnelChannel.java +install = javahl-java +link-cmd = $(COMPILE_JAVAHL_JAVAC) [libsvnjavahl] description = Subversion Java HighLevel binding @@ -717,9 +717,9 @@ 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 java-sdk sources = *.cpp jniwrapper/*.cpp -add-deps = $(javahl_java_DEPS) $(javahl_callback_javah_DEPS) - $(javahl_remote_javah_DEPS) $(javahl_types_javah_DEPS) - $(javahl_util_javah_DEPS) $(javahl_javah_DEPS) +add-deps = $(javahl_java_DEPS) $(javahl_callback_java_DEPS) + $(javahl_remote_java_DEPS) $(javahl_types_java_DEPS) + $(javahl_util_java_DEPS) $(javahl_java_DEPS) install = javahl-lib # need special build rule to include -I$(JDK)/include/jni.h compile-cmd = $(COMPILE_JAVAHL_CXX) @@ -727,48 +727,34 @@ link-cmd = $(LINK_JAVAHL_CXX) # ---------------------------------------------------------------------------- # -# C++HL targets +# SVN++ targets # -[libsvncxxhl] -description = Subversion C++ HighLevel bindings +[libsvnxx] +description = Subversion C++ bindings +when = SVN_BUILD_SVNXX type = lib -path = subversion/bindings/cxxhl +path = subversion/bindings/cxx libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr libsvn_fs aprutil apriconv apr sources = src/*.cpp src/aprwrap/*.cpp -install = cxxhl-lib +install = svnxx-lib msvc-static = yes -compile-cmd = $(COMPILE_CXXHL_CXX) +compile-cmd = $(COMPILE_SVNXX) link-cmd = $(LINK_CXX_LIB) -[cxxhl-tests] -description = Unit tests for Subversion C++ HighLevel bindings -when = SVN_USE_GOOGLEMOCK +[svnxx-tests] +description = Unit tests for Subversion C++ bindings +when = SVN_BUILD_SVNXX_TESTS type = exe -path = subversion/bindings/cxxhl -libs = libsvncxxhl libgooglemock libsvn_subr apr +path = subversion/bindings/cxx +libs = libsvnxx + libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff + libsvn_subr libsvn_fs aprutil apriconv apr sources = tests/*.cpp -install = cxxhl-tests -compile-cmd = $(COMPILE_CXXHL_GOOGLEMOCK_CXX) -link-cmd = $(LINK_CXX) - - -# ---------------------------------------------------------------------------- -# -# Googlemock targets -# - -[libgooglemock] -description = Googlemock Library -when = SVN_USE_GOOGLEMOCK -type = lib -path = googlemock -sources = googletest/src/gtest-all.cc googlemock/src/gmock-all.cc -install = cxxhl-tests -msvc-static = yes -compile-cmd = $(COMPILE_GOOGLEMOCK_CXX) -link-cmd = $(LINK_CXX_LIB) +install = svnxx-tests +compile-cmd = $(COMPILE_SVNXX_TEST) +link-cmd = $(LINK_SVNXX_TEST) # ---------------------------------------------------------------------------- # @@ -845,7 +831,7 @@ type = exe path = subversion/tests/libsvn_fs_fs sources = fs-fs-private-test.c install = test -libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta +libs = libsvn_test libsvn_fs libsvn_delta libsvn_repos libsvn_subr apriconv apr msvc-force-static = yes @@ -1474,6 +1460,14 @@ external-lib = $(SVN_KWALLET_LIBS) type = lib external-lib = $(SVN_MAGIC_LIBS) +[macos-plist] +type = lib +external-lib = $(SVN_MACOS_PLIST_LIBS) + +[macos-keychain] +type = lib +external-lib = $(SVN_MACOS_KEYCHAIN_LIBS) + [sasl] type = lib external-lib = $(SVN_SASL_LIBS) @@ -1588,7 +1582,7 @@ libs = __ALL__ conflict-data-test db-test pristine-store-test entries-compat-test op-depth-test dirent_uri-test wc-queries-test wc-test auth-test - parse-diff-test x509-test xml-test afl-x509 compress-test + parse-diff-test x509-test xml-test afl-x509 afl-svndiff compress-test svndiff-stream-test [__MORE__] @@ -1630,7 +1624,7 @@ lang = ruby [__JAVAHL__] type = project path = build/win32 -libs = javahl-java javahl-javah libsvnjavahl +libs = javahl-java libsvnjavahl [__JAVAHL_TESTS__] type = project @@ -1749,3 +1743,12 @@ sources = afl-x509.c install = test libs = libsvn_subr apr testing = skip + +[afl-svndiff] +description = AFL fuzzer for svndiff to txdelta parser +type = exe +path = subversion/tests/afl +sources = afl-svndiff.c +install = test +libs = libsvn_delta libsvn_subr apr +testing = skip diff --git a/build/ac-macros/ax_boost_base.m4 b/build/ac-macros/ax_boost_base.m4 new file mode 100644 index 0000000..d540395 --- /dev/null +++ b/build/ac-macros/ax_boost_base.m4 @@ -0,0 +1,301 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_base.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Test for the Boost C++ libraries of a particular version (or newer) +# +# If no path to the installed boost library is given the macro searchs +# under /usr, /usr/local, /opt and /opt/local and evaluates the +# $BOOST_ROOT environment variable. Further documentation is available at +# . +# +# This macro calls: +# +# AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS) +# +# And sets: +# +# HAVE_BOOST +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# Copyright (c) 2009 Peter Adolphs +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 45 + +# example boost program (need to pass version) +m4_define([_AX_BOOST_BASE_PROGRAM], + [AC_LANG_PROGRAM([[ +#include +]],[[ +(void) ((void)sizeof(char[1 - 2*!!((BOOST_VERSION) < ($1))])); +]])]) + +AC_DEFUN([AX_BOOST_BASE], +[ +AC_ARG_WITH([boost], + [AS_HELP_STRING([--with-boost@<:@=ARG@:>@], + [use Boost library from a standard location (ARG=yes), + from the specified location (ARG=), + or disable it (ARG=no) + @<:@ARG=yes@:>@ ])], + [ + AS_CASE([$withval], + [no],[want_boost="no";_AX_BOOST_BASE_boost_path=""], + [yes],[want_boost="yes";_AX_BOOST_BASE_boost_path=""], + [want_boost="yes";_AX_BOOST_BASE_boost_path="$withval"]) + ], + [want_boost="yes"]) + + +AC_ARG_WITH([boost-libdir], + [AS_HELP_STRING([--with-boost-libdir=LIB_DIR], + [Force given directory for boost libraries. + Note that this will override library path detection, + so use this parameter only if default library detection fails + and you know exactly where your boost libraries are located.])], + [ + AS_IF([test -d "$withval"], + [_AX_BOOST_BASE_boost_lib_path="$withval"], + [AC_MSG_ERROR([--with-boost-libdir expected directory name])]) + ], + [_AX_BOOST_BASE_boost_lib_path=""]) + +BOOST_LDFLAGS="" +BOOST_CPPFLAGS="" +AS_IF([test "x$want_boost" = "xyes"], + [_AX_BOOST_BASE_RUNDETECT([$1],[$2],[$3])]) +AC_SUBST(BOOST_CPPFLAGS) +AC_SUBST(BOOST_LDFLAGS) +]) + + +# convert a version string in $2 to numeric and affect to polymorphic var $1 +AC_DEFUN([_AX_BOOST_BASE_TONUMERICVERSION],[ + AS_IF([test "x$2" = "x"],[_AX_BOOST_BASE_TONUMERICVERSION_req="1.20.0"],[_AX_BOOST_BASE_TONUMERICVERSION_req="$2"]) + _AX_BOOST_BASE_TONUMERICVERSION_req_shorten=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '\([[0-9]]*\.[[0-9]]*\)'` + _AX_BOOST_BASE_TONUMERICVERSION_req_major=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '\([[0-9]]*\)'` + AS_IF([test "x$_AX_BOOST_BASE_TONUMERICVERSION_req_major" = "x"], + [AC_MSG_ERROR([You should at least specify libboost major version])]) + _AX_BOOST_BASE_TONUMERICVERSION_req_minor=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '[[0-9]]*\.\([[0-9]]*\)'` + AS_IF([test "x$_AX_BOOST_BASE_TONUMERICVERSION_req_minor" = "x"], + [_AX_BOOST_BASE_TONUMERICVERSION_req_minor="0"]) + _AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + AS_IF([test "X$_AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor" = "X"], + [_AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor="0"]) + _AX_BOOST_BASE_TONUMERICVERSION_RET=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req_major \* 100000 \+ $_AX_BOOST_BASE_TONUMERICVERSION_req_minor \* 100 \+ $_AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor` + AS_VAR_SET($1,$_AX_BOOST_BASE_TONUMERICVERSION_RET) +]) + +dnl Run the detection of boost should be run only if $want_boost +AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[ + _AX_BOOST_BASE_TONUMERICVERSION(WANT_BOOST_VERSION,[$1]) + succeeded=no + + + AC_REQUIRE([AC_CANONICAL_HOST]) + dnl On 64-bit systems check for system libraries in both lib64 and lib. + dnl The former is specified by FHS, but e.g. Debian does not adhere to + dnl this (as it rises problems for generic multi-arch support). + dnl The last entry in the list is chosen by default when no libraries + dnl are found, e.g. when only header-only libraries are installed! + AS_CASE([${host_cpu}], + [x86_64],[libsubdirs="lib64 libx32 lib lib64"], + [ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64],[libsubdirs="lib64 lib lib64"], + [libsubdirs="lib"] + ) + + dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give + dnl them priority over the other paths since, if libs are found there, they + dnl are almost assuredly the ones desired. + AS_CASE([${host_cpu}], + [i?86],[multiarch_libsubdir="lib/i386-${host_os}"], + [multiarch_libsubdir="lib/${host_cpu}-${host_os}"] + ) + + dnl first we check the system location for boost libraries + dnl this location ist chosen if boost libraries are installed with the --layout=system option + dnl or if you install boost with RPM + AS_IF([test "x$_AX_BOOST_BASE_boost_path" != "x"],[ + AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION) includes in "$_AX_BOOST_BASE_boost_path/include"]) + AS_IF([test -d "$_AX_BOOST_BASE_boost_path/include" && test -r "$_AX_BOOST_BASE_boost_path/include"],[ + AC_MSG_RESULT([yes]) + BOOST_CPPFLAGS="-I$_AX_BOOST_BASE_boost_path/include" + for _AX_BOOST_BASE_boost_path_tmp in $multiarch_libsubdir $libsubdirs; do + AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION) lib path in "$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp"]) + AS_IF([test -d "$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp" && test -r "$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp" ],[ + AC_MSG_RESULT([yes]) + BOOST_LDFLAGS="-L$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp"; + break; + ], + [AC_MSG_RESULT([no])]) + done],[ + AC_MSG_RESULT([no])]) + ],[ + if test X"$cross_compiling" = Xyes; then + search_libsubdirs=$multiarch_libsubdir + else + search_libsubdirs="$multiarch_libsubdir $libsubdirs" + fi + for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local ; do + if test -d "$_AX_BOOST_BASE_boost_path_tmp/include/boost" && test -r "$_AX_BOOST_BASE_boost_path_tmp/include/boost" ; then + for libsubdir in $search_libsubdirs ; do + if ls "$_AX_BOOST_BASE_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi + done + BOOST_LDFLAGS="-L$_AX_BOOST_BASE_boost_path_tmp/$libsubdir" + BOOST_CPPFLAGS="-I$_AX_BOOST_BASE_boost_path_tmp/include" + break; + fi + done + ]) + + dnl overwrite ld flags if we have required special directory with + dnl --with-boost-libdir parameter + AS_IF([test "x$_AX_BOOST_BASE_boost_lib_path" != "x"], + [BOOST_LDFLAGS="-L$_AX_BOOST_BASE_boost_lib_path"]) + + AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION)]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_REQUIRE([AC_PROG_CXX]) + AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE([_AX_BOOST_BASE_PROGRAM($WANT_BOOST_VERSION)],[ + AC_MSG_RESULT(yes) + succeeded=yes + found_system=yes + ],[ + ]) + AC_LANG_POP([C++]) + + + + dnl if we found no boost with system layout we search for boost libraries + dnl built and installed without the --layout=system option or for a staged(not installed) version + if test "x$succeeded" != "xyes" ; then + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + BOOST_CPPFLAGS= + if test -z "$_AX_BOOST_BASE_boost_lib_path" ; then + BOOST_LDFLAGS= + fi + _version=0 + if test -n "$_AX_BOOST_BASE_boost_path" ; then + if test -d "$_AX_BOOST_BASE_boost_path" && test -r "$_AX_BOOST_BASE_boost_path"; then + for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$_AX_BOOST_BASE_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "x$V_CHECK" = "x1" ; then + _version=$_version_tmp + fi + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$_AX_BOOST_BASE_boost_path/include/boost-$VERSION_UNDERSCORE" + done + dnl if nothing found search for layout used in Windows distributions + if test -z "$BOOST_CPPFLAGS"; then + if test -d "$_AX_BOOST_BASE_boost_path/boost" && test -r "$_AX_BOOST_BASE_boost_path/boost"; then + BOOST_CPPFLAGS="-I$_AX_BOOST_BASE_boost_path" + fi + fi + dnl if we found something and BOOST_LDFLAGS was unset before + dnl (because "$_AX_BOOST_BASE_boost_lib_path" = ""), set it here. + if test -n "$BOOST_CPPFLAGS" && test -z "$BOOST_LDFLAGS"; then + for libsubdir in $libsubdirs ; do + if ls "$_AX_BOOST_BASE_boost_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi + done + BOOST_LDFLAGS="-L$_AX_BOOST_BASE_boost_path/$libsubdir" + fi + fi + else + if test "x$cross_compiling" != "xyes" ; then + for _AX_BOOST_BASE_boost_path in /usr /usr/local /opt /opt/local ; do + if test -d "$_AX_BOOST_BASE_boost_path" && test -r "$_AX_BOOST_BASE_boost_path" ; then + for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$_AX_BOOST_BASE_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "x$V_CHECK" = "x1" ; then + _version=$_version_tmp + best_path=$_AX_BOOST_BASE_boost_path + fi + done + fi + done + + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" + if test -z "$_AX_BOOST_BASE_boost_lib_path" ; then + for libsubdir in $libsubdirs ; do + if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi + done + BOOST_LDFLAGS="-L$best_path/$libsubdir" + fi + fi + + if test -n "$BOOST_ROOT" ; then + for libsubdir in $libsubdirs ; do + if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi + done + if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then + version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'` + stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'` + stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'` + V_CHECK=`expr $stage_version_shorten \>\= $_version` + if test "x$V_CHECK" = "x1" && test -z "$_AX_BOOST_BASE_boost_lib_path" ; then + AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT) + BOOST_CPPFLAGS="-I$BOOST_ROOT" + BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir" + fi + fi + fi + fi + + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE([_AX_BOOST_BASE_PROGRAM($WANT_BOOST_VERSION)],[ + AC_MSG_RESULT(yes) + succeeded=yes + found_system=yes + ],[ + ]) + AC_LANG_POP([C++]) + fi + + if test "x$succeeded" != "xyes" ; then + if test "x$_version" = "x0" ; then + AC_MSG_NOTICE([[We could not detect the boost libraries (version $1 or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation.]]) + else + AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).]) + fi + # execute ACTION-IF-NOT-FOUND (if present): + ifelse([$3], , :, [$3]) + else + AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available]) + # execute ACTION-IF-FOUND (if present): + ifelse([$2], , :, [$2]) + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + +]) diff --git a/build/ac-macros/ax_boost_unit_test_framework.m4 b/build/ac-macros/ax_boost_unit_test_framework.m4 new file mode 100644 index 0000000..3d8e93e --- /dev/null +++ b/build/ac-macros/ax_boost_unit_test_framework.m4 @@ -0,0 +1,137 @@ +# ================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_boost_unit_test_framework.html +# ================================================================================= +# +# SYNOPSIS +# +# AX_BOOST_UNIT_TEST_FRAMEWORK +# +# DESCRIPTION +# +# Test for Unit_Test_Framework library from the Boost C++ libraries. The +# macro requires a preceding call to AX_BOOST_BASE. Further documentation +# is available at . +# +# This macro calls: +# +# AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB) +# +# And sets: +# +# HAVE_BOOST_UNIT_TEST_FRAMEWORK +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 21 + +AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK], +[ + AC_ARG_WITH([boost-unit-test-framework], + AS_HELP_STRING([--with-boost-unit-test-framework@<:@=special-lib@:>@], + [use the Unit_Test_Framework library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-unit-test-framework=boost_unit_test_framework-gcc ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_unit_test_framework_lib="" + else + want_boost="yes" + ax_boost_user_unit_test_framework_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::Unit_Test_Framework library is available, + ax_cv_boost_unit_test_framework, + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], + [[using boost::unit_test::test_suite; + test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); if (test == NULL) { return 1; } else { return 0; }]])], + ax_cv_boost_unit_test_framework=yes, ax_cv_boost_unit_test_framework=no) + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then + AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_Test_Framework library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + + if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then + saved_ldflags="${LDFLAGS}" + for monitor_library in `ls $BOOSTLIBDIR/libboost_unit_test_framework*.so* $BOOSTLIBDIR/libboost_unit_test_framework*.dylib* $BOOSTLIBDIR/libboost_unit_test_framework*.a* 2>/dev/null` ; do + if test -r $monitor_library ; then + libextension=`echo $monitor_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.a.*$;\1;'` + ax_lib=${libextension} + link_unit_test_framework="yes" + else + link_unit_test_framework="no" + fi + + if test "x$link_unit_test_framework" = "xyes"; then + BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib" + AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB) + break + fi + done + if test "x$link_unit_test_framework" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_unit_test_framework*.dll* $BOOSTLIBDIR/boost_unit_test_framework*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_unit_test_framework.*\)\.dll.*$;\1;' -e 's;^\(boost_unit_test_framework.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"; AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB) link_unit_test_framework="yes"; break], + [link_unit_test_framework="no"]) + done + fi + else + link_unit_test_framework="no" + saved_ldflags="${LDFLAGS}" + for ax_lib in boost_unit_test_framework-$ax_boost_user_unit_test_framework_lib $ax_boost_user_unit_test_framework_lib ; do + if test "x$link_unit_test_framework" = "xyes"; then + break; + fi + for unittest_library in `ls $BOOSTLIBDIR/lib${ax_lib}.so* $BOOSTLIBDIR/lib${ax_lib}.a* 2>/dev/null` ; do + if test -r $unittest_library ; then + libextension=`echo $unittest_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.a*$;\1;'` + ax_lib=${libextension} + link_unit_test_framework="yes" + else + link_unit_test_framework="no" + fi + + if test "x$link_unit_test_framework" = "xyes"; then + BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib" + AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB) + break + fi + done + done + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_unit_test_framework" != "xyes"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff --git a/build/ac-macros/compiler.m4 b/build/ac-macros/compiler.m4 index f42a30d..53185b7 100644 --- a/build/ac-macros/compiler.m4 +++ b/build/ac-macros/compiler.m4 @@ -102,7 +102,7 @@ AC_DEFUN([SVN_CXX_MODE_SETUP], if test "$GXX" = "yes"; then dnl Find flags to force C++98 mode dnl g++ and clang++ - SVN_CXXFLAGS_ADD_IFELSE([-std=c++98]) + SVN_CXXFLAGS_ADD_IFELSE([-std=c++11]) fi CXXMODEFLAGS="$CXXFLAGS" @@ -126,18 +126,3 @@ AC_DEFUN([SVN_CXX_MODE_SETUP], SVN_CXXFLAGS_ADD_IFELSE([-Werror=unknown-warning-option]) fi ]) - -dnl The KWallet provider needs to use C++11 mode when using KDE 5 -AC_DEFUN([SVN_CXX_MODE_SETUP11], -[ - CXXFLAGS_KEEP="$CXXFLAGS" - CXXFLAGS="" - - if test "$GXX" = "yes"; then - SVN_CXXFLAGS_ADD_IFELSE([-std=c++11]) - fi - - CXXMODEFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS_KEEP" - AC_SUBST(CXXMODEFLAGS) -]) diff --git a/build/ac-macros/java.m4 b/build/ac-macros/java.m4 index d8a7a36..928a9a3 100644 --- a/build/ac-macros/java.m4 +++ b/build/ac-macros/java.m4 @@ -166,7 +166,7 @@ AC_DEFUN(SVN_FIND_JDK, # The release for "-source" could actually be greater than that # of "-target", if we want to cross-compile for lesser JVMs. if test -z "$JAVAC_FLAGS"; then - JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.6" + JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.8" if test "$enable_debugging" = "yes"; then JAVAC_FLAGS="-g -Xlint -Xlint:unchecked -Xlint:serial -Xlint:path $JAVAC_FLAGS" if test -z "$JAVAC_COMPAT_FLAGS"; then diff --git a/build/ac-macros/kwallet.m4 b/build/ac-macros/kwallet.m4 index ea3b21f..ee5b5e5 100644 --- a/build/ac-macros/kwallet.m4 +++ b/build/ac-macros/kwallet.m4 @@ -83,10 +83,6 @@ AC_DEFUN(SVN_LIB_KWALLET, fi fi if test -n "$KDE_CONFIG"; then - if test $kde_config_name = "kf5-config"; then - dnl KF5 does not compile with -std=c++98 - SVN_CXX_MODE_SETUP11 - fi old_CXXFLAGS="$CXXFLAGS" old_LDFLAGS="$LDFLAGS" old_LIBS="$LIBS" diff --git a/build/ac-macros/macosx.m4 b/build/ac-macros/macosx.m4 index 43e3eb2..92fa58e 100644 --- a/build/ac-macros/macosx.m4 +++ b/build/ac-macros/macosx.m4 @@ -55,19 +55,8 @@ AC_DEFUN(SVN_LIB_MACOS_PLIST, #error ProperyList API unavailable. #endif ]],[[]])],[ - dnl ### Hack. We should only need to pass the -framework options when - dnl linking libsvn_subr, since it is the only library that uses Keychain. - dnl - dnl Unfortunately, libtool 1.5.x doesn't track transitive dependencies for - dnl OS X frameworks like it does for normal libraries, so we need to - dnl explicitly pass the option to all the users of libsvn_subr to allow - dnl static builds to link successfully. - dnl - dnl This does mean that all executables we link will be linked directly - dnl to these frameworks - even when building shared libraries - but that - dnl shouldn't cause any problems. - - LIBS="$LIBS -framework CoreFoundation" + SVN_MACOS_PLIST_LIBS="-framework CoreFoundation" + AC_SUBST(SVN_MACOS_PLIST_LIBS) AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1], [Is Mac OS property list API available?]) AC_MSG_RESULT([yes]) @@ -97,9 +86,8 @@ AC_DEFUN(SVN_LIB_MACOS_KEYCHAIN, #error KeyChain API unavailable. #endif ]],[[]])],[ - dnl ### Hack, see SVN_LIB_MACOS_PLIST - LIBS="$LIBS -framework Security" - LIBS="$LIBS -framework CoreServices" + SVN_MACOS_KEYCHAIN_LIBS="-framework Security -framework CoreServices" + AC_SUBST(SVN_MACOS_KEYCHAIN_LIBS) AC_DEFINE([SVN_HAVE_KEYCHAIN_SERVICES], [1], [Is Mac OS KeyChain support enabled?]) AC_MSG_RESULT([yes]) ],[ diff --git a/build/ac-macros/serf.m4 b/build/ac-macros/serf.m4 index 0acc7f7..0a549b3 100644 --- a/build/ac-macros/serf.m4 +++ b/build/ac-macros/serf.m4 @@ -168,8 +168,8 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG, if $PKG_CONFIG $serf_pc_arg --atleast-version=$serf_check_version; then AC_MSG_RESULT([yes]) serf_found=yes - SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/ -D[^ ]*//g' -e 's/^-D[^ ]*//g'`] - SVN_SERF_LIBS=`$PKG_CONFIG $serf_pc_arg --libs-only-l` + SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags-only-I`] + SVN_SERF_LIBS=[`$PKG_CONFIG $serf_pc_arg --libs-only-l`] dnl don't use --libs-only-L because then we might miss some options LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"] break diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4 index d63e87c..2963872 100644 --- a/build/ac-macros/swig.m4 +++ b/build/ac-macros/swig.m4 @@ -148,6 +148,11 @@ AC_DEFUN(SVN_FIND_SWIG, SWIG_RB_COMPILE="none" SWIG_RB_LINK="none" if test "$RUBY" != "none"; then + if test x"$SWIG_VERSION" = x"3""00""008"; then + # Use a local variable to escape the '#' sign. + ruby_swig_issue_602='https://subversion.apache.org/docs/release-notes/1.11#ruby-swig-issue-602' + AC_MSG_WARN([Ruby bindings are known not to support swig 3.0.8; see $ruby_swig_issue_602]) + fi rbconfig="$RUBY -rrbconfig -e " for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \ diff --git a/build/buildcheck.sh b/build/buildcheck.sh index 9b0eb18..0763073 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -76,26 +76,12 @@ fi echo "buildcheck: autoheader version $ah_version (ok)" #-------------------------------------------------------------------------- -# libtool 1.4 or newer +# libtool 2.0 or newer # -LIBTOOL_WANTED_MAJOR=1 -LIBTOOL_WANTED_MINOR=4 +LIBTOOL_WANTED_MAJOR=2 +LIBTOOL_WANTED_MINOR=0 LIBTOOL_WANTED_PATCH= -LIBTOOL_WANTED_VERSION=1.4 - -# The minimum version for source releases is 1.4.3, -# because it's required by (at least) Solaris. -if test "$VERSION_CHECK" = "--release"; then - LIBTOOL_WANTED_PATCH=3 - LIBTOOL_WANTED_VERSION=1.4.3 -else - case `uname -sr` in - SunOS\ 5.*) - LIBTOOL_WANTED_PATCH=3 - LIBTOOL_WANTED_VERSION=1.4.3 - ;; - esac -fi +LIBTOOL_WANTED_VERSION=2.0 # Much like APR except we do not prefer libtool 1 over libtool 2. libtoolize=${LIBTOOLIZE:-`./build/PrintPath glibtoolize libtoolize glibtoolize1 libtoolize15 libtoolize14`} diff --git a/build/generator/extractor.py b/build/generator/extractor.py index 63921f3..553457e 100755 --- a/build/generator/extractor.py +++ b/build/generator/extractor.py @@ -69,4 +69,6 @@ if __name__ == '__main__': if os.path.basename(fname) == 'svn_ctype.h': print('svn_ctype_table = svn_ctype_table_internal CONSTANT') elif os.path.basename(fname) == 'svn_wc_private.h': + # svn_wc__internal_walk_children() is now internal to libsvn_wc + # but entries-dump.c still calls it print('svn_wc__internal_walk_children') diff --git a/build/generator/gen_base.py b/build/generator/gen_base.py index f7a75da..458545c 100644 --- a/build/generator/gen_base.py +++ b/build/generator/gen_base.py @@ -663,7 +663,7 @@ class TargetExe(TargetLinked): TargetLinked.add_dependencies(self) # collect test programs - if 'svnauthz' in self.name: # special case + if 'svnauthz' in self.name or 'svnmover' in self.name: # special case self.gen_obj.test_deps.append(self.filename) self.gen_obj.test_helpers.append(self.filename) elif self.install == 'test': @@ -900,115 +900,67 @@ class TargetJava(TargetLinked): def __init__(self, name, options, gen_obj): TargetLinked.__init__(self, name, options, gen_obj) self.link_cmd = options.get('link-cmd') - self.packages = options.get('package-roots', '').split() + self.package = options.get('package') self.jar = options.get('jar') self.deps = [ ] - -class TargetJavaHeaders(TargetJava): - def __init__(self, name, options, gen_obj): - TargetJava.__init__(self, name, options, gen_obj) self.objext = '.class' - self.javah_objext = '.h' self.headers = options.get('headers') self.classes = options.get('classes') - self.package = options.get('package') - self.output_dir = self.headers + self.native = options.get('native', '') + self.output_dir = self.classes + self.headers_dir = self.headers def add_dependencies(self): sources = _collect_paths(self.sources, self.path) + native = _collect_paths(self.native, self.path) + + class_pkg_list = self.package.split('.') + sourcepath = build_path_split(self.path)[:-len(class_pkg_list)] + sourcepath = build_path_join(*sourcepath) for src, reldir in sources: if src[-5:] != '.java': raise GenError('ERROR: unknown file extension on ' + src) + sfile = SourceFile(src, reldir) + sfile.sourcepath = sourcepath + class_name = build_path_basename(src[:-5]) - class_header = build_path_join(self.headers, class_name + '.h') - class_header_win = build_path_join(self.headers, - self.package.replace(".", "_") - + "_" + class_name + '.h') - class_pkg_list = self.package.split('.') class_pkg = build_path_join(*class_pkg_list) class_file = ObjectFile(build_path_join(self.classes, class_pkg, class_name + self.objext), - self.when) + self.compile_cmd, self.when) class_file.source_generated = 1 class_file.class_name = class_name - hfile = HeaderFile(class_header, self.package + '.' + class_name, - self.compile_cmd) - hfile.filename_win = class_header_win - hfile.source_generated = 1 - self.gen_obj.graph.add(DT_OBJECT, hfile, class_file) - self.deps.append(hfile) - - # target (a linked item) depends upon object - self.gen_obj.graph.add(DT_LINK, self.name, hfile) - - - # collect all the paths where stuff might get built - ### we should collect this from the dependency nodes rather than - ### the sources. "what dir are you going to put yourself into?" - self.gen_obj.target_dirs.append(self.path) - self.gen_obj.target_dirs.append(self.classes) - self.gen_obj.target_dirs.append(self.headers) - for pattern in self.sources.split(): - dirname = build_path_dirname(pattern) - if dirname: - self.gen_obj.target_dirs.append(build_path_join(self.path, dirname)) - - self.gen_obj.graph.add(DT_INSTALL, self.name, self) - -class TargetJavaClasses(TargetJava): - def __init__(self, name, options, gen_obj): - TargetJava.__init__(self, name, options, gen_obj) - self.objext = '.class' - self.lang = 'java' - self.classes = options.get('classes') - self.output_dir = self.classes - - def add_dependencies(self): - sources = [] - for p in self.path.split(): - sources.extend(_collect_paths(self.sources, p)) - for src, reldir in sources: - if src[-5:] == '.java': - objname = src[:-5] + self.objext - - # As .class files are likely not generated into the same - # directory as the source files, the object path may need - # adjustment. To this effect, take "target_ob.classes" into - # account. - dirs = build_path_split(objname) - sourcedirs = dirs[:-1] # Last element is the .class file name. - while sourcedirs: - if sourcedirs.pop() in self.packages: - sourcepath = build_path_join(*sourcedirs) - objname = build_path_join(self.classes, *dirs[len(sourcedirs):]) - break - else: - raise GenError('Unable to find Java package root in path "%s"' % objname) - else: - raise GenError('ERROR: unknown file extension on "' + src + '"') - - ofile = ObjectFile(objname, self.compile_cmd, self.when) - sfile = SourceFile(src, reldir) - sfile.sourcepath = sourcepath + self.gen_obj.graph.add(DT_OBJECT, class_file, sfile) + self.gen_obj.graph.add(DT_LINK, self.name, class_file) + self.deps.append(class_file) - # object depends upon source - self.gen_obj.graph.add(DT_OBJECT, ofile, sfile) + if (src, reldir) in native: + class_header = build_path_join(self.headers, class_name + '.h') + class_header_win = build_path_join(self.headers, + self.package.replace(".", "_") + + "_" + class_name + '.h') + hfile = HeaderFile(class_header, self.package + '.' + class_name, + self.compile_cmd) + hfile.filename_win = class_header_win + hfile.source_generated = 1 + self.gen_obj.graph.add(DT_OBJECT, hfile, sfile) + self.deps.append(hfile) - # target (a linked item) depends upon object - self.gen_obj.graph.add(DT_LINK, self.name, ofile) + # target (a linked item) depends upon object + self.gen_obj.graph.add(DT_LINK, self.name, hfile) - # Add the class file to the dependency tree for this target - self.deps.append(ofile) # collect all the paths where stuff might get built ### we should collect this from the dependency nodes rather than ### the sources. "what dir are you going to put yourself into?" - self.gen_obj.target_dirs.extend(self.path.split()) + self.gen_obj.target_dirs.append(self.path) self.gen_obj.target_dirs.append(self.classes) + if self.headers: + self.gen_obj.target_dirs.append(self.headers) for pattern in self.sources.split(): dirname = build_path_dirname(pattern) if dirname: @@ -1057,8 +1009,7 @@ _build_types = { 'apache-mod': TargetApacheMod, 'shared-only-lib': TargetSharedOnlyLib, 'shared-only-cxx-lib': TargetSharedOnlyCxxLib, - 'javah' : TargetJavaHeaders, - 'java' : TargetJavaClasses, + 'java' : TargetJava, 'i18n' : TargetI18N, 'sql-header' : TargetSQLHeader, } diff --git a/build/generator/gen_make.py b/build/generator/gen_make.py index df9677c..bdb5d00 100644 --- a/build/generator/gen_make.py +++ b/build/generator/gen_make.py @@ -309,6 +309,8 @@ class Generator(gen_base.GeneratorBase): ezt_target.link_cmd = target_ob.link_cmd if hasattr(target_ob, 'output_dir'): ezt_target.output_dir = target_ob.output_dir + if hasattr(target_ob, 'headers_dir'): + ezt_target.headers_dir = target_ob.headers_dir # Add additional install dependencies if necessary if target_ob.add_install_deps: @@ -443,7 +445,7 @@ class Generator(gen_base.GeneratorBase): ### we should turn AREA into an object, then test it instead of this if area[:5] == 'swig-' and area[-4:] != '-lib' \ or area[:7] == 'javahl-' \ - or area[:6] == 'cxxhl-' \ + or area[:6] == 'svnxx-' \ or area == 'tools': ezt_area.extra_install = 'yes' @@ -631,9 +633,10 @@ DIR=`pwd` lib_deps=[], lib_required=[], lib_required_private=[], + version=self.version, ) - # libsvn_foo -> -lsvn_foo - data.lib_deps.append('-l%s' % lib_name.replace('lib', '', 1)) + # libsvn_foo -> -lsvn_foo-1 + data.lib_deps.append('-l%s-%s' % (lib_name.replace('lib', '', 1), data.version)) for lib_dep in lib_deps.split(): if lib_dep == 'apriconv': # apriconv is part of apr-util, skip it diff --git a/build/generator/gen_vcnet_vcproj.py b/build/generator/gen_vcnet_vcproj.py index 5a66e1a..f34b280 100644 --- a/build/generator/gen_vcnet_vcproj.py +++ b/build/generator/gen_vcnet_vcproj.py @@ -283,3 +283,11 @@ class Generator(gen_win.WinGeneratorBase): } self.write_with_template('subversion_vcnet.sln', 'templates/vcnet_sln.ezt', data) + + def quote_define(self, value): + "Properly quote special characters in a define (if needed)" + + if self.vcproj_extension == '.vcproj': + return value.replace('"', '""') + else: + return value diff --git a/build/generator/gen_win.py b/build/generator/gen_win.py index d2a900c..9d7350a 100644 --- a/build/generator/gen_win.py +++ b/build/generator/gen_win.py @@ -217,7 +217,6 @@ class WinGeneratorBase(gen_win_dependencies.GenDependenciesBase): if 'java_sdk' not in self._libraries: install_targets = [x for x in install_targets if not (isinstance(x, gen_base.TargetJava) - or isinstance(x, gen_base.TargetJavaHeaders) or x.name == '__JAVAHL__' or x.name == '__JAVAHL_TESTS__' or x.name == 'libsvnjavahl')] @@ -332,11 +331,9 @@ class WinGeneratorBase(gen_win_dependencies.GenDependenciesBase): sources = [ ] javac_exe = "javac" - javah_exe = "javah" jar_exe = "jar" if self.jdk_path: javac_exe = os.path.join(self.jdk_path, "bin", javac_exe) - javah_exe = os.path.join(self.jdk_path, "bin", javah_exe) jar_exe = os.path.join(self.jdk_path, "bin", jar_exe) if not isinstance(target, gen_base.TargetProject): @@ -345,25 +342,13 @@ class WinGeneratorBase(gen_win_dependencies.GenDependenciesBase): ctarget = None cdesc = None cignore = None - if isinstance(target, gen_base.TargetJavaHeaders): - classes = self.path(target.classes) - if self.junit_path is not None: - classes = "%s;%s" % (classes, self.junit_path) - - headers = self.path(target.headers) - classname = target.package + "." + source.class_name - - cbuild = "%s -verbose -force -classpath %s -d %s %s" \ - % (self.quote(javah_exe), self.quote(classes), - self.quote(headers), classname) - - ctarget = self.path(object.filename_win) - cdesc = "Generating %s" % (object.filename_win) - - elif isinstance(target, gen_base.TargetJavaClasses): + if isinstance(target, gen_base.TargetJava): classes = targetdir = self.path(target.classes) if self.junit_path is not None: classes = "%s;%s" % (classes, self.junit_path) + headers = '' + if target.headers is not None: + headers = '-h %s' % self.quote(self.path(target.headers)) sourcepath = self.path(source.sourcepath) @@ -373,17 +358,21 @@ class WinGeneratorBase(gen_win_dependencies.GenDependenciesBase): per_project_flags += "-Xlint:-deprecation -Xlint:-dep-ann" \ " -Xlint:-rawtypes" - cbuild = ("%s -g -Xlint -Xlint:-options " + - per_project_flags + - " -target 1.5 -source 1.5 -classpath " + cbuild = ("%s -g -Xlint -Xlint:-options %s %s " + " -target 1.8 -source 1.8 -classpath " " %s -d %s " " -sourcepath %s $(InputPath)") \ - % tuple(map(self.quote, (javac_exe, classes, - targetdir, sourcepath))) + % (self.quote(javac_exe), per_project_flags, headers, + self.quote(classes), self.quote(targetdir), + self.quote(sourcepath)) - ctarget = self.path(object.filename) - cdesc = "Compiling %s" % (source) + if isinstance(object, gen_base.HeaderFile): + ctarget = self.path(object.filename_win) + cdesc = "Generating %s" % (object.filename_win) + else: + ctarget = self.path(object.filename) + cdesc = "Compiling %s" % (source) rsrc = self.path(str(source)) if quote_path and '-' in rsrc: @@ -403,7 +392,7 @@ class WinGeneratorBase(gen_win_dependencies.GenDependenciesBase): custom_desc=cdesc, ignored = cignore, extension=os.path.splitext(rsrc)[1])) - if isinstance(target, gen_base.TargetJavaClasses) and target.jar: + if isinstance(target, gen_base.TargetJava) and target.jar: classdir = self.path(target.classes) jarfile = msvc_path_join(classdir, target.jar) cbuild = "%s cf %s -C %s %s" \ @@ -507,9 +496,7 @@ class WinGeneratorBase(gen_win_dependencies.GenDependenciesBase): return name[0] + '.pdb' def get_output_dir(self, target): - if isinstance(target, gen_base.TargetJavaHeaders): - return msvc_path("../" + target.headers) - elif isinstance(target, gen_base.TargetJavaClasses): + if isinstance(target, gen_base.TargetJava): return msvc_path("../" + target.classes) else: return msvc_path(target.path) @@ -749,8 +736,13 @@ class WinGeneratorBase(gen_win_dependencies.GenDependenciesBase): if target.name.endswith('svn_subr'): fakedefines.append("SVN_USE_WIN32_CRASHHANDLER") + fakedefines.append(self.quote_define('SVN_WIN32_CRASHREPORT_EMAIL="users@subversion.apache.org"')) return fakedefines + + def quote_define(self, value): + "Properly quote special characters in a define (if needed)" + return value def get_win_includes(self, target, cfg='Release'): "Return the list of include directories for target" @@ -791,8 +783,8 @@ class WinGeneratorBase(gen_win_dependencies.GenDependenciesBase): fakeincludes.append(os.path.join(self.swig_libdir, lang_subdir)) fakeincludes.append(self.swig_libdir) - if 'cxxhl' in target.name: - fakeincludes.append("subversion/bindings/cxxhl/include") + if 'svnxx' in target.name: + fakeincludes.append("subversion/bindings/cxx/include") return gen_base.unique(map(self.apath, fakeincludes)) diff --git a/build/generator/gen_win_dependencies.py b/build/generator/gen_win_dependencies.py index 0317e72..da59599 100644 --- a/build/generator/gen_win_dependencies.py +++ b/build/generator/gen_win_dependencies.py @@ -124,6 +124,8 @@ class GenDependenciesBase(gen_base.GeneratorBase): # So optional, we don't even have any code to detect them on Windows 'magic', + 'macos-plist', + 'macos-keychain', ] # When build.conf contains a 'when = SOMETHING' where SOMETHING is not in @@ -1072,11 +1074,15 @@ class GenDependenciesBase(gen_base.GeneratorBase): return try: - outfp = subprocess.Popen([os.path.join(jdk_path, 'bin', 'javah.exe'), - '-version'], stdout=subprocess.PIPE).stdout + # Apparently a 1.8 javac writes its version output to stderr, while + # a 1.10 javac writes it to stdout. To catch them all, we redirect + # stderr to stdout. + outfp = subprocess.Popen([os.path.join(jdk_path, 'bin', 'javac.exe'), + '-version'], stdout=subprocess.PIPE, + stderr=subprocess.STDOUT).stdout line = outfp.read() if line: - vermatch = re.search(r'"(([0-9]+(\.[0-9]+)+)(_[._0-9]+)?)"', line, re.M) + vermatch = re.search(r'(([0-9]+(\.[0-9]+)+)(_[._0-9]+)?)', line, re.M) else: vermatch = None diff --git a/build/generator/templates/build-outputs.mk.ezt b/build/generator/templates/build-outputs.mk.ezt index 3677a6d..8e52bdf 100644 --- a/build/generator/templates/build-outputs.mk.ezt +++ b/build/generator/templates/build-outputs.mk.ezt @@ -102,13 +102,9 @@ install-[target.install]: [target.install_deps][end] [target.varname]_OBJECTS = [for target.objects][if-index target.objects first][else] [end][target.objects][end] [target.varname]_DEPS = $([target.varname]_HEADERS) $([target.varname]_OBJECTS)[for target.add_deps] [target.add_deps][end][for target.deps][if-index target.deps first][else] [end][target.deps][end] [target.name]: $([target.varname]_DEPS) -[if-any target.headers][target.varname]_CLASS_FILENAMES =[for target.header_class_filenames] [target.header_class_filenames][end] -[target.varname]_CLASSES =[for target.header_classes] [target.header_classes][end] -$([target.varname]_HEADERS): $([target.varname]_CLASS_FILENAMES) - [target.link_cmd] -d [target.output_dir] -classpath [target.classes]:$([target.varname]_CLASSPATH) $([target.varname]_CLASSES) -[end][if-any target.sources][target.varname]_SRC =[for target.sources] [target.sources][end] -$([target.varname]_OBJECTS): $([target.varname]_SRC) - [target.link_cmd] -d [target.output_dir] -classpath [target.classes]:$([target.varname]_CLASSPATH) $([target.varname]_SRC) +[if-any target.sources][target.varname]_SRC =[for target.sources] [target.sources][end] +$([target.varname]_HEADERS) $([target.varname]_OBJECTS): $([target.varname]_SRC) + [target.link_cmd][if-any target.headers] -h [target.headers_dir][end] -d [target.output_dir] -classpath [target.classes]:$([target.varname]_CLASSPATH) $([target.varname]_SRC) [if-any target.jar] $(JAR) cf [target.jar_path] -C [target.classes][for target.packages] [target.packages][end][end][end] [else][is target.type "i18n"][target.varname]_DEPS =[for target.add_deps] [target.add_deps][end][for target.objects] [target.objects][end][for target.deps] [target.deps][end] diff --git a/build/generator/templates/pkg-config.in.ezt b/build/generator/templates/pkg-config.in.ezt index 959eb81..b5a2126 100644 --- a/build/generator/templates/pkg-config.in.ezt +++ b/build/generator/templates/pkg-config.in.ezt @@ -6,7 +6,7 @@ includedir=@includedir@ Name: [lib_name] Description: [lib_desc] Version: @PACKAGE_VERSION@ -Requires: [for lib_required] [lib_required][end] -Requires.private: [for lib_required_private] [lib_required_private][end] +Requires: [for lib_required][if-index lib_required first][else], [end][lib_required][end] +Requires.private: [for lib_required_private][if-index lib_required_private first][else], [end][lib_required_private][end] Libs: -L${libdir} [for lib_deps] [lib_deps][end] -Cflags: -I${includedir} +Cflags: -I${includedir}/subversion-[version] diff --git a/build/generator/templates/vcnet_vcxproj.ezt b/build/generator/templates/vcnet_vcxproj.ezt index 845c322..41c8f08 100644 --- a/build/generator/templates/vcnet_vcxproj.ezt +++ b/build/generator/templates/vcnet_vcxproj.ezt @@ -62,7 +62,6 @@ [if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][is platforms "x64"]WIN64;[end][for configs.defines][configs.defines];[end]%(PreprocessorDefinitions) Level4 ProgramDatabase - $(OutDir)$(TargetName).pdb 4100;4127;4206;4512;4701;4706;4800;%(DisableSpecificWarnings) 4002;4003;4013;4020;4022;4024;4028;4029;4030;4031;4033;4047;4089;4113;4115;4133;4204;4700;4715;4789;%(TreatSpecificWarningsAsErrors) [if-any configs.forced_include_files] [for configs.forced_include_files][configs.forced_include_files];[end]%(ForcedIncludeFiles) diff --git a/build/run_tests.py b/build/run_tests.py index 163c984..7760d81 100755 --- a/build/run_tests.py +++ b/build/run_tests.py @@ -34,6 +34,7 @@ [--config-file=] [--ssl-cert=] [--exclusive-wc-locks] [--memcached-server=] [--fsfs-compression=] [--fsfs-dir-deltification=] + [--allow-remote-http-connection] @@ -280,6 +281,8 @@ class TestHarness: cmdline.append('--fsfs-compression=%s' % self.opts.fsfs_compression) if self.opts.fsfs_dir_deltification is not None: cmdline.append('--fsfs-dir-deltification=%s' % self.opts.fsfs_dir_deltification) + if self.opts.allow_remote_http_connection is not None: + cmdline.append('--allow-remote-http-connection') self.py_test_cmdline = cmdline @@ -1033,6 +1036,8 @@ def create_parser(): help='Set compression type (for fsfs)') parser.add_option('--fsfs-dir-deltification', action='store', type='str', help='Set directory deltification option (for fsfs)') + parser.add_option('--allow-remote-http-connection', action='store_true', + help='Run tests that connect to remote HTTP(S) servers') parser.set_defaults(set_log_level=None) return parser diff --git a/build/transform_libtool_scripts.sh b/build/transform_libtool_scripts.sh index cdced3a..45a7113 100755 --- a/build/transform_libtool_scripts.sh +++ b/build/transform_libtool_scripts.sh @@ -49,6 +49,7 @@ transform() DIR=`pwd` +transform subversion/tests/afl/afl-svndiff "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_delta/.libs/libsvn_delta-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so" transform subversion/tests/afl/afl-x509 "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so" transform subversion/tests/cmdline/atomic-ra-revprop-change "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_delta/.libs/libsvn_delta-1.so $DIR/subversion/libsvn_fs/.libs/libsvn_fs-1.so $DIR/subversion/libsvn_fs_base/.libs/libsvn_fs_base-1.so $DIR/subversion/libsvn_fs_fs/.libs/libsvn_fs_fs-1.so $DIR/subversion/libsvn_fs_util/.libs/libsvn_fs_util-1.so $DIR/subversion/libsvn_fs_x/.libs/libsvn_fs_x-1.so $DIR/subversion/libsvn_ra/.libs/libsvn_ra-1.so $DIR/subversion/libsvn_ra_local/.libs/libsvn_ra_local-1.so $DIR/subversion/libsvn_ra_serf/.libs/libsvn_ra_serf-1.so $DIR/subversion/libsvn_ra_svn/.libs/libsvn_ra_svn-1.so $DIR/subversion/libsvn_repos/.libs/libsvn_repos-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so" transform subversion/tests/libsvn_subr/auth-test "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_delta/.libs/libsvn_delta-1.so $DIR/subversion/libsvn_fs/.libs/libsvn_fs-1.so $DIR/subversion/libsvn_fs_base/.libs/libsvn_fs_base-1.so $DIR/subversion/libsvn_fs_fs/.libs/libsvn_fs_fs-1.so $DIR/subversion/libsvn_fs_util/.libs/libsvn_fs_util-1.so $DIR/subversion/libsvn_fs_x/.libs/libsvn_fs_x-1.so $DIR/subversion/libsvn_repos/.libs/libsvn_repos-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so $DIR/subversion/tests/.libs/libsvn_test-1.so" @@ -64,7 +65,6 @@ transform subversion/tests/libsvn_subr/config-test "$DIR/subversion/libsvn_auth_ transform subversion/tests/libsvn_wc/conflict-data-test "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_client/.libs/libsvn_client-1.so $DIR/subversion/libsvn_delta/.libs/libsvn_delta-1.so $DIR/subversion/libsvn_diff/.libs/libsvn_diff-1.so $DIR/subversion/libsvn_fs/.libs/libsvn_fs-1.so $DIR/subversion/libsvn_fs_base/.libs/libsvn_fs_base-1.so $DIR/subversion/libsvn_fs_fs/.libs/libsvn_fs_fs-1.so $DIR/subversion/libsvn_fs_util/.libs/libsvn_fs_util-1.so $DIR/subversion/libsvn_fs_x/.libs/libsvn_fs_x-1.so $DIR/subversion/libsvn_ra/.libs/libsvn_ra-1.so $DIR/subversion/libsvn_ra_local/.libs/libsvn_ra_local-1.so $DIR/subversion/libsvn_ra_serf/.libs/libsvn_ra_serf-1.so $DIR/subversion/libsvn_ra_svn/.libs/libsvn_ra_svn-1.so $DIR/subversion/libsvn_repos/.libs/libsvn_repos-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so $DIR/subversion/tests/.libs/libsvn_test-1.so $DIR/subversion/libsvn_wc/.libs/libsvn_wc-1.so" transform subversion/tests/libsvn_client/conflicts-test "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_client/.libs/libsvn_client-1.so $DIR/subversion/libsvn_delta/.libs/libsvn_delta-1.so $DIR/subversion/libsvn_diff/.libs/libsvn_diff-1.so $DIR/subversion/libsvn_fs/.libs/libsvn_fs-1.so $DIR/subversion/libsvn_fs_base/.libs/libsvn_fs_base-1.so $DIR/subversion/libsvn_fs_fs/.libs/libsvn_fs_fs-1.so $DIR/subversion/libsvn_fs_util/.libs/libsvn_fs_util-1.so $DIR/subversion/libsvn_fs_x/.libs/libsvn_fs_x-1.so $DIR/subversion/libsvn_ra/.libs/libsvn_ra-1.so $DIR/subversion/libsvn_ra_local/.libs/libsvn_ra_local-1.so $DIR/subversion/libsvn_ra_serf/.libs/libsvn_ra_serf-1.so $DIR/subversion/libsvn_ra_svn/.libs/libsvn_ra_svn-1.so $DIR/subversion/libsvn_repos/.libs/libsvn_repos-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so $DIR/subversion/tests/.libs/libsvn_test-1.so $DIR/subversion/libsvn_wc/.libs/libsvn_wc-1.so" transform subversion/tests/libsvn_subr/crypto-test "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_delta/.libs/libsvn_delta-1.so $DIR/subversion/libsvn_fs/.libs/libsvn_fs-1.so $DIR/subversion/libsvn_fs_base/.libs/libsvn_fs_base-1.so $DIR/subversion/libsvn_fs_fs/.libs/libsvn_fs_fs-1.so $DIR/subversion/libsvn_fs_util/.libs/libsvn_fs_util-1.so $DIR/subversion/libsvn_fs_x/.libs/libsvn_fs_x-1.so $DIR/subversion/libsvn_repos/.libs/libsvn_repos-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so $DIR/subversion/tests/.libs/libsvn_test-1.so" -transform subversion/bindings/cxxhl/cxxhl-tests "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_client/.libs/libsvn_client-1.so $DIR/subversion/libsvn_delta/.libs/libsvn_delta-1.so $DIR/subversion/libsvn_diff/.libs/libsvn_diff-1.so $DIR/subversion/libsvn_fs/.libs/libsvn_fs-1.so $DIR/subversion/libsvn_fs_base/.libs/libsvn_fs_base-1.so $DIR/subversion/libsvn_fs_fs/.libs/libsvn_fs_fs-1.so $DIR/subversion/libsvn_fs_util/.libs/libsvn_fs_util-1.so $DIR/subversion/libsvn_fs_x/.libs/libsvn_fs_x-1.so $DIR/subversion/libsvn_ra/.libs/libsvn_ra-1.so $DIR/subversion/libsvn_ra_local/.libs/libsvn_ra_local-1.so $DIR/subversion/libsvn_ra_serf/.libs/libsvn_ra_serf-1.so $DIR/subversion/libsvn_ra_svn/.libs/libsvn_ra_svn-1.so $DIR/subversion/libsvn_repos/.libs/libsvn_repos-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so $DIR/subversion/libsvn_wc/.libs/libsvn_wc-1.so" transform subversion/tests/libsvn_wc/db-test "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_client/.libs/libsvn_client-1.so $DIR/subversion/libsvn_delta/.libs/libsvn_delta-1.so $DIR/subversion/libsvn_diff/.libs/libsvn_diff-1.so $DIR/subversion/libsvn_fs/.libs/libsvn_fs-1.so $DIR/subversion/libsvn_fs_base/.libs/libsvn_fs_base-1.so $DIR/subversion/libsvn_fs_fs/.libs/libsvn_fs_fs-1.so $DIR/subversion/libsvn_fs_util/.libs/libsvn_fs_util-1.so $DIR/subversion/libsvn_fs_x/.libs/libsvn_fs_x-1.so $DIR/subversion/libsvn_ra/.libs/libsvn_ra-1.so $DIR/subversion/libsvn_ra_local/.libs/libsvn_ra_local-1.so $DIR/subversion/libsvn_ra_serf/.libs/libsvn_ra_serf-1.so $DIR/subversion/libsvn_ra_svn/.libs/libsvn_ra_svn-1.so $DIR/subversion/libsvn_repos/.libs/libsvn_repos-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so $DIR/subversion/tests/.libs/libsvn_test-1.so $DIR/subversion/libsvn_wc/.libs/libsvn_wc-1.so" transform tools/diff/diff "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_diff/.libs/libsvn_diff-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so" transform subversion/tests/libsvn_diff/diff-diff3-test "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_delta/.libs/libsvn_delta-1.so $DIR/subversion/libsvn_diff/.libs/libsvn_diff-1.so $DIR/subversion/libsvn_fs/.libs/libsvn_fs-1.so $DIR/subversion/libsvn_fs_base/.libs/libsvn_fs_base-1.so $DIR/subversion/libsvn_fs_fs/.libs/libsvn_fs_fs-1.so $DIR/subversion/libsvn_fs_util/.libs/libsvn_fs_util-1.so $DIR/subversion/libsvn_fs_x/.libs/libsvn_fs_x-1.so $DIR/subversion/libsvn_repos/.libs/libsvn_repos-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so $DIR/subversion/tests/.libs/libsvn_test-1.so" @@ -133,6 +133,7 @@ transform subversion/svnrdump/svnrdump "$DIR/subversion/libsvn_auth_gnome_keyrin transform subversion/svnserve/svnserve "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_delta/.libs/libsvn_delta-1.so $DIR/subversion/libsvn_fs/.libs/libsvn_fs-1.so $DIR/subversion/libsvn_fs_base/.libs/libsvn_fs_base-1.so $DIR/subversion/libsvn_fs_fs/.libs/libsvn_fs_fs-1.so $DIR/subversion/libsvn_fs_util/.libs/libsvn_fs_util-1.so $DIR/subversion/libsvn_fs_x/.libs/libsvn_fs_x-1.so $DIR/subversion/libsvn_ra_svn/.libs/libsvn_ra_svn-1.so $DIR/subversion/libsvn_repos/.libs/libsvn_repos-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so" transform subversion/svnsync/svnsync "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_delta/.libs/libsvn_delta-1.so $DIR/subversion/libsvn_fs/.libs/libsvn_fs-1.so $DIR/subversion/libsvn_fs_base/.libs/libsvn_fs_base-1.so $DIR/subversion/libsvn_fs_fs/.libs/libsvn_fs_fs-1.so $DIR/subversion/libsvn_fs_util/.libs/libsvn_fs_util-1.so $DIR/subversion/libsvn_fs_x/.libs/libsvn_fs_x-1.so $DIR/subversion/libsvn_ra/.libs/libsvn_ra-1.so $DIR/subversion/libsvn_ra_local/.libs/libsvn_ra_local-1.so $DIR/subversion/libsvn_ra_serf/.libs/libsvn_ra_serf-1.so $DIR/subversion/libsvn_ra_svn/.libs/libsvn_ra_svn-1.so $DIR/subversion/libsvn_repos/.libs/libsvn_repos-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so" transform subversion/svnversion/svnversion "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_delta/.libs/libsvn_delta-1.so $DIR/subversion/libsvn_diff/.libs/libsvn_diff-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so $DIR/subversion/libsvn_wc/.libs/libsvn_wc-1.so" +transform subversion/bindings/cxx/svnxx-tests "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_client/.libs/libsvn_client-1.so $DIR/subversion/libsvn_delta/.libs/libsvn_delta-1.so $DIR/subversion/libsvn_diff/.libs/libsvn_diff-1.so $DIR/subversion/libsvn_fs/.libs/libsvn_fs-1.so $DIR/subversion/libsvn_fs_base/.libs/libsvn_fs_base-1.so $DIR/subversion/libsvn_fs_fs/.libs/libsvn_fs_fs-1.so $DIR/subversion/libsvn_fs_util/.libs/libsvn_fs_util-1.so $DIR/subversion/libsvn_fs_x/.libs/libsvn_fs_x-1.so $DIR/subversion/libsvn_ra/.libs/libsvn_ra-1.so $DIR/subversion/libsvn_ra_local/.libs/libsvn_ra_local-1.so $DIR/subversion/libsvn_ra_serf/.libs/libsvn_ra_serf-1.so $DIR/subversion/libsvn_ra_svn/.libs/libsvn_ra_svn-1.so $DIR/subversion/libsvn_repos/.libs/libsvn_repos-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so $DIR/subversion/libsvn_wc/.libs/libsvn_wc-1.so" transform subversion/tests/libsvn_subr/time-test "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_delta/.libs/libsvn_delta-1.so $DIR/subversion/libsvn_fs/.libs/libsvn_fs-1.so $DIR/subversion/libsvn_fs_base/.libs/libsvn_fs_base-1.so $DIR/subversion/libsvn_fs_fs/.libs/libsvn_fs_fs-1.so $DIR/subversion/libsvn_fs_util/.libs/libsvn_fs_util-1.so $DIR/subversion/libsvn_fs_x/.libs/libsvn_fs_x-1.so $DIR/subversion/libsvn_repos/.libs/libsvn_repos-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so $DIR/subversion/tests/.libs/libsvn_test-1.so" transform subversion/tests/libsvn_subr/translate-test "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_delta/.libs/libsvn_delta-1.so $DIR/subversion/libsvn_fs/.libs/libsvn_fs-1.so $DIR/subversion/libsvn_fs_base/.libs/libsvn_fs_base-1.so $DIR/subversion/libsvn_fs_fs/.libs/libsvn_fs_fs-1.so $DIR/subversion/libsvn_fs_util/.libs/libsvn_fs_util-1.so $DIR/subversion/libsvn_fs_x/.libs/libsvn_fs_x-1.so $DIR/subversion/libsvn_repos/.libs/libsvn_repos-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so $DIR/subversion/tests/.libs/libsvn_test-1.so" transform subversion/tests/libsvn_subr/utf-test "$DIR/subversion/libsvn_auth_gnome_keyring/.libs/libsvn_auth_gnome_keyring-1.so $DIR/subversion/libsvn_auth_kwallet/.libs/libsvn_auth_kwallet-1.so $DIR/subversion/libsvn_delta/.libs/libsvn_delta-1.so $DIR/subversion/libsvn_fs/.libs/libsvn_fs-1.so $DIR/subversion/libsvn_fs_base/.libs/libsvn_fs_base-1.so $DIR/subversion/libsvn_fs_fs/.libs/libsvn_fs_fs-1.so $DIR/subversion/libsvn_fs_util/.libs/libsvn_fs_util-1.so $DIR/subversion/libsvn_fs_x/.libs/libsvn_fs_x-1.so $DIR/subversion/libsvn_repos/.libs/libsvn_repos-1.so $DIR/subversion/libsvn_subr/.libs/libsvn_subr-1.so $DIR/subversion/tests/.libs/libsvn_test-1.so" diff --git a/build/transform_sql.py b/build/transform_sql.py index a1cc6f0..18091f2 100755 --- a/build/transform_sql.py +++ b/build/transform_sql.py @@ -274,7 +274,7 @@ def main(input_filepath, output): '/* This file is automatically generated from %s and %s.\n' ' * Do not edit this file -- edit the source and rerun gen-make.py */\n' '\n' - % (filename, token_map_filename)) + % (filename, os.path.basename(token_map_filename))) proc = Processor(os.path.dirname(input_filepath), output, var_name, token_map) proc.process_file(input) diff --git a/build/win32/vc6-build.bat.in b/build/win32/vc6-build.bat.in deleted file mode 100644 index 7bfce71..0000000 --- a/build/win32/vc6-build.bat.in +++ /dev/null @@ -1,176 +0,0 @@ -@echo off -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. - -rem ====== Environment change lives only for the duration of the script -setlocal - -rem ====== Set these shell variables before doing a build. -rem VER is used to name the output bin dir as svn-win32-%VER% -set VER=trunk -rem DIR is appended to src- to make the dir name, e.g., src-trunk -set DIR=trunk -set DRIVE=C -set PYTHONDIR=C:\Python22 -set AWKDIR=C:\SVN\awk -set NASMDIR=C:\SVN\nasm -set SDKINC=C:\Program Files\Microsoft SDK\include -set SDKLIB=C:\Program Files\Microsoft SDK\lib -set APACHEDIR=C:\Program Files\Apache Group\Apache2 -set GETTEXTINC=C:\SVN\gettext\include -set GETTEXTLIB=C:\SVN\gettext\lib -set GETTEXTBIN=C:\SVN\gettext\bin -rem ====== End of shell variables which need to be set. - -rem Set up path to include Python and BDB. -PATH=%PATH%;%DRIVE%:\SVN\src-%DIR%\db4-win32;%NASMDIR%;%PYTHONDIR%;%AWKDIR%;%GETTEXTBIN% - -rem Set INCLUDE and LIB for the msdev builds. -set INCLUDE=%SDKINC%;%INCLUDE%;%GETTEXTINC% -set LIB=%SDKLIB%;%LIB%;%GETTEXTLIB% - -rem Check that the subversion code exists here. -cd %DRIVE%:\SVN\src-%DIR% -if not exist subversion goto wrongstartdir -cd .. - -rem ====== Check the prerequisites are at least in the right place. -if not exist httpd-2.0.50 goto httpderr -if not exist nasm goto nasmerr -if not exist openssl-0.9.7d goto opensslerr -if not exist src-%DIR% goto svnerr -if not exist zlib goto zliberr -if not exist zlib\zlibstat.lib goto zlibstaterr -if not exist src-%DIR%\db4-win32 goto bdberr -if not exist gettext goto gettexterr -goto allok - -:wrongstartdir -echo Unable to find %DRIVE%:\SVN\src-%DIR%\subversion -goto theveryend -:httpderr -echo Unable to find httpd-2.0.50 -goto end -:nasmerr -echo Unable to find nasm -goto end -:opensslerr -echo Unable to find openssl-0.9.7d -goto end -:svnerr -echo Unable to find Subversion source in src-%DIR% -goto end -:zliberr -echo Unable to find zlib -goto end -:zlibstaterr -echo Please copy zlib\static32\zlibstat.lib to zlib\zlibstat.lib -goto end -:bdberr -echo Unable to find Berekely DB -goto end -:gettexterr -echo Unable to find gettext -goto end -:allok - -rem ====== Build openssl. -cd openssl-0.9.7d -perl Configure VC-WIN32 -call ms\do_nasm -nmake -f ms\ntdll.mak -cd out32dll -call ..\ms\test -cd ..\.. - -rem ====== Build Apache 2 -cd src-%DIR% -python gen-make.py -t dsp --with-httpd=..\httpd-2.0.50 --with-berkeley-db=db4-win32 --with-openssl=..\openssl-0.9.7d --with-zlib=..\zlib --enable-nls --enable-bdb-in-apr-util -cd .. -msdev httpd-2.0.50\apache.dsw /MAKE "BuildBin - Win32 Release" - -rem ====== Subversion -cd src-%DIR% -msdev subversion_msvc.dsw /USEENV /MAKE "__ALL_TESTS__ - Win32 Release" -mkdir Release\subversion\tests\cmdline -xcopy /S /Y subversion\tests\cmdline Release\subversion\tests\cmdline -copy Release\subversion\mod_dav_svn\mod_dav_svn.so "%APACHEDIR%"\modules -copy Release\subversion\mod_authz_svn\mod_authz_svn.so "%APACHEDIR%"\modules -cd .. - -rem ====== Copy the binaries into a tree suitable for zipping. -mkdir svn-win32-%VER% -mkdir svn-win32-%VER%\bin -mkdir svn-win32-%VER%\httpd -mkdir svn-win32-%VER%\iconv -copy src-%DIR%\db4-win32\bin\libdb42.dll svn-win32-%VER%\bin -copy openssl-0.9.7d\out32dll\libeay32.dll svn-win32-%VER%\bin -copy openssl-0.9.7d\out32dll\ssleay32.dll svn-win32-%VER%\bin -copy httpd-2.0.50\srclib\apr\Release\libapr.dll svn-win32-%VER%\bin -copy httpd-2.0.50\srclib\apr-iconv\Release\libapriconv.dll svn-win32-%VER%\bin -copy httpd-2.0.50\srclib\apr-iconv\Release\iconv\*.so svn-win32-%VER%\iconv -copy httpd-2.0.50\srclib\apr-util\Release\libaprutil.dll svn-win32-%VER%\bin -copy gettext\bin\intl.dll svn-win32-%VER%\bin -copy gettext\bin\iconv.dll svn-win32-%VER%\bin -copy src-%DIR%\Release\subversion\svn\svn.exe svn-win32-%VER%\bin -copy src-%DIR%\Release\subversion\svnadmin\svnadmin.exe svn-win32-%VER%\bin -copy src-%DIR%\Release\subversion\svndumpfilter\svndumpfilter.exe svn-win32-%VER%\bin -copy src-%DIR%\Release\subversion\svnlook\svnlook.exe svn-win32-%VER%\bin -copy src-%DIR%\Release\subversion\svnserve\svnserve.exe svn-win32-%VER%\bin -copy src-%DIR%\Release\subversion\svnversion\svnversion.exe svn-win32-%VER%\bin -copy src-%DIR%\Release\subversion\svnrdump\svnrdump.exe svn-win32-%VER%\bin -copy src-%DIR%\Release\subversion\svnmucc\svnmucc.exe svn-win32-%VER%\bin -copy src-%DIR%\Release\subversion\mod_authz_svn\mod_authz_svn.so svn-win32-%VER%\httpd -copy src-%DIR%\Release\subversion\mod_dav_svn\mod_dav_svn.so svn-win32-%VER%\httpd -copy svn-win32-%VER%\bin\intl.dll "%APACHEDIR%\bin" -copy svn-win32-%VER%\bin\iconv.dll "%APACHEDIR%\bin" -copy svn-win32-%VER%\bin\libdb42.dll "%APACHEDIR%\bin" - -rem ====== Configure Apache ready for doing tests. -@echo off -echo Configure Apache to use the mod_dav_svn and mod_authz_svn modules -echo by making sure these lines appear uncommented in httpd.conf: -echo LoadModule dav_module modules/mod_dav.so -echo LoadModule dav_fs_module modules/mod_dav_fs.so -echo LoadModule dav_svn_module modules/mod_dav_svn.so -echo LoadModule authz_svn_module modules/mod_authz_svn.so -echo And further down the file add: -echo ^ -echo DAV svn -echo SVNParentPath %DRIVE%:/SVN/src-%DIR%/Release/subversion/tests/cmdline/svn-test-work/repositories -echo ^ -echo ^ -echo DAV svn -echo SVNPath %DRIVE%:/SVN/src-%DIR%/Release/subversion/tests/cmdline/svn-test-work/local_tmp/repos -echo ^ -echo Then restart Apache. - -echo Please configure Apache and press enter: -pause -@echo on - -rem ====== Run the tests. -PATH=%DRIVE%:\SVN\svn-win32-%VER%\bin;%PATH% -cd src-%DIR% -python win-tests.py -c -r -v -python win-tests.py -c -r -v -u http://localhost -cd .. - -:end -cd src-%DIR% -endlocal -:theveryend diff --git a/configure b/configure index 580fef0..3417eeb 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for subversion 1.10.6. +# Generated by GNU Autoconf 2.69 for subversion 1.13.0. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='subversion' PACKAGE_TARNAME='subversion' -PACKAGE_VERSION='1.10.6' -PACKAGE_STRING='subversion 1.10.6' +PACKAGE_VERSION='1.13.0' +PACKAGE_STRING='subversion 1.13.0' PACKAGE_BUGREPORT='http://subversion.apache.org/' PACKAGE_URL='' @@ -642,6 +642,11 @@ LT_CXX_LIBADD FIX_JAVAHL_LIB JAVAHL_OBJDIR INSTALL_EXTRA_JAVAHL_LIB +SVN_BUILD_SVNXX_TESTS +SVN_BUILD_SVNXX +BOOST_LDFLAGS +BOOST_CPPFLAGS +BOOST_UNIT_TEST_FRAMEWORK_LIB SVN_FS_LIB_LINK SVN_FS_LIB_INSTALL_DEPS SVN_FS_LIB_DEPS @@ -723,12 +728,12 @@ SVN_INTL_LIBS XGETTEXT MSGMERGE MSGFMT -SVN_USE_GOOGLEMOCK -GOOGLEMOCK_SRCDIR SVN_GNOME_KEYRING_PCLIBS SVN_GNOME_KEYRING_LIBS SVN_GNOME_KEYRING_INCLUDES SVN_HAVE_GPG_AGENT +SVN_MACOS_KEYCHAIN_LIBS +SVN_MACOS_PLIST_LIBS SVN_SASL_LIBS SVN_SASL_INCLUDES SVN_DB_LIBS @@ -902,7 +907,6 @@ enable_keychain with_gpg_agent with_old_gnome_keyring with_gnome_keyring -enable_googlemock enable_ev2_impl enable_nls with_libmagic @@ -927,6 +931,11 @@ with_ruby_sitedir with_ruby_test_verbose with_ctypesgen enable_runtime_module_search +enable_svnxx +enable_svnxx_tests +with_boost +with_boost_libdir +with_boost_unit_test_framework enable_javahl with_junit ' @@ -1488,7 +1497,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures subversion 1.10.6 to adapt to many kinds of systems. +\`configure' configures subversion 1.13.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1554,7 +1563,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of subversion 1.10.6:";; + short | recursive ) echo "Configuration of subversion 1.13.0:";; esac cat <<\_ACEOF @@ -1593,16 +1602,15 @@ Optional Features: the Berkeley DB installation. Using BDB 6 will fail if this option is not used. --disable-keychain Disable use of Mac OS KeyChain for auth credentials - --disable-googlemock Do not use the Googlemock testing framework --enable-ev2-impl Use Ev2 implementations, where available [EXPERIMENTAL] --disable-nls Disable gettext functionality - --disable-plaintext-password-storage - Disable on-disk caching of plaintext passwords and - passphrases. (Leaving this functionality enabled - will not force Subversion to store passwords in - plaintext, but does permit users to explicitly allow - that behavior via runtime configuration.) + --enable-plaintext-password-storage + Enable on-disk caching of plaintext passwords and + passphrases. (Enabling this functionality will not + force Subversion to store passwords in plaintext, + but does permit users to explicitly allow that + behavior via runtime configuration.) --enable-debug Turn on debugging --enable-optimize Turn on optimizations --enable-disallowing-of-undefined-references @@ -1621,6 +1629,11 @@ Optional Features: --enable-runtime-module-search Turn on dynamic loading of RA/FS libraries including third-party FS libraries + --enable-svnxx Enable compilation of the C++ bindings (requires + C++) + --enable-svnxx-tests Enable compilation of tests for the C++ bindings + (implies --enable-svnxx, requires Boost and + Boost.Test) --enable-javahl Enable compilation of Java high-level bindings (requires C++) @@ -1699,6 +1712,20 @@ Optional Packages: the full path to a ctypesgen installation, the full path to a ctypesgen source tree or the full path to ctypesgen.py. + --with-boost[=ARG] use Boost library from a standard location + (ARG=yes), from the specified location (ARG=), + or disable it (ARG=no) [ARG=yes] + --with-boost-libdir=LIB_DIR + Force given directory for boost libraries. Note that + this will override library path detection, so use + this parameter only if default library detection + fails and you know exactly where your boost + libraries are located. + --with-boost-unit-test-framework[=special-lib] + use the Unit_Test_Framework library from boost - it + is possible to specify a certain library for the + linker e.g. + --with-boost-unit-test-framework=boost_unit_test_framework-gcc --with-junit=PATH Specify a path to the junit JAR file. Some influential environment variables: @@ -1790,7 +1817,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -subversion configure 1.10.6 +subversion configure 1.13.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2334,7 +2361,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by subversion $as_me 1.10.6, which was +It was created by subversion $as_me 1.13.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2714,8 +2741,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Subversion 1.10.6" >&5 -$as_echo "$as_me: Configuring Subversion 1.10.6" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Subversion 1.13.0" >&5 +$as_echo "$as_me: Configuring Subversion 1.13.0" >&6;} abs_srcdir="`cd $srcdir && pwd`" @@ -4036,9 +4063,9 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -std=c++98" >&5 -$as_echo_n "checking if $CXX accepts -std=c++98... " >&6; } - CXXFLAGS="-std=c++98 $CXXFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -std=c++11" >&5 +$as_echo_n "checking if $CXX accepts -std=c++11... " >&6; } + CXXFLAGS="-std=c++11 $CXXFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(){} @@ -5471,7 +5498,7 @@ $as_echo_n "checking serf version is suitable... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } serf_found=yes - SVN_SERF_INCLUDES=`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/ -D[^ ]*//g' -e 's/^-D[^ ]*//g'` + SVN_SERF_INCLUDES=`$PKG_CONFIG $serf_pc_arg --cflags-only-I` SVN_SERF_LIBS=`$PKG_CONFIG $serf_pc_arg --libs-only-l` LDFLAGS="$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`" break @@ -19388,8 +19415,8 @@ main () _ACEOF if ac_fn_c_try_compile "$LINENO"; then : + SVN_MACOS_PLIST_LIBS="-framework CoreFoundation" - LIBS="$LIBS -framework CoreFoundation" $as_echo "#define SVN_HAVE_MACOS_PLIST 1" >>confdefs.h @@ -19437,8 +19464,8 @@ main () _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - LIBS="$LIBS -framework Security" - LIBS="$LIBS -framework CoreServices" + SVN_MACOS_KEYCHAIN_LIBS="-framework Security -framework CoreServices" + $as_echo "#define SVN_HAVE_KEYCHAIN_SERVICES 1" >>confdefs.h @@ -19613,7 +19640,7 @@ $as_echo "#define SVN_HAVE_GNOME_KEYRING 1" >>confdefs.h CPPFLAGS="$old_CPPFLAGS" SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs glib-2.0 gnome-keyring-1`" - SVN_GNOME_KEYRING_PCLIBS="glib-2.0 gnome-keyring-1" + SVN_GNOME_KEYRING_PCLIBS="glib-2.0, gnome-keyring-1" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -19742,35 +19769,6 @@ $as_echo "no" >&6; } -# Check whether --enable-googlemock was given. -if test "${enable_googlemock+set}" = set; then : - enableval=$enable_googlemock; -else - enable_googlemock=yes -fi - - -GOOGLEMOCK_SRCDIR=$abs_srcdir/googlemock - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether use Googlemock" >&5 -$as_echo_n "checking whether use Googlemock... " >&6; } -if test "$enable_googlemock" != "no"; then - if test -d "$GOOGLEMOCK_SRCDIR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - SVN_USE_GOOGLEMOCK=true - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - SVN_USE_GOOGLEMOCK=false - fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - SVN_USE_GOOGLEMOCK=false -fi - - # Check whether --enable-ev2-impl was given. if test "${enable_ev2_impl+set}" = set; then : enableval=$enable_ev2_impl; enable_ev2_impl=$enableval @@ -20475,57 +20473,6 @@ fi fi fi if test -n "$KDE_CONFIG"; then - if test $kde_config_name = "kf5-config"; then - - CXXFLAGS_KEEP="$CXXFLAGS" - CXXFLAGS="" - - if test "$GXX" = "yes"; then - - _svn_xxflags__save="$CXXFLAGS" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -std=c++11" >&5 -$as_echo_n "checking if $CXX accepts -std=c++11... " >&6; } - CXXFLAGS="-std=c++11 $CXXFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(){} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - CXXFLAGS="$_svn_xxflags__save" - - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - fi - - CXXMODEFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS_KEEP" - - - fi old_CXXFLAGS="$CXXFLAGS" old_LDFLAGS="$LDFLAGS" old_LIBS="$LIBS" @@ -20646,19 +20593,24 @@ fi # Check whether --enable-plaintext-password-storage was given. if test "${enable_plaintext_password_storage+set}" = set; then : - enableval=$enable_plaintext_password_storage; - if test "$enableval" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Disabling plaintext password/passphrase storage" >&5 + enableval=$enable_plaintext_password_storage; plaintext_passwordd_storage="$enableval" +else + plaintext_passwordd_storage="no" +fi + + +if test "$plaintext_passwordd_storage" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling plaintext password/passphrase storage" >&5 +$as_echo "$as_me: WARNING: Enabling plaintext password/passphrase storage" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Disabling plaintext password/passphrase storage" >&5 $as_echo "$as_me: Disabling plaintext password/passphrase storage" >&6;} $as_echo "#define SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE 1" >>confdefs.h - fi - fi - INSTALL_STATIC_RULES="install-bin install-docs" INSTALL_RULES="install-fsmod-lib install-ramod-lib install-lib install-include install-static" INSTALL_RULES="$INSTALL_RULES $INSTALL_APACHE_RULE" @@ -21030,6 +20982,18 @@ fi done +for ac_header in elf.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "elf.h" "ac_cv_header_elf_h" "$ac_includes_default" +if test "x$ac_cv_header_elf_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ELF_H 1 +_ACEOF + +fi + +done + ac_fn_c_check_header_mongrel "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default" if test "x$ac_cv_header_termios_h" = xyes; then : @@ -22388,44 +22352,6 @@ if ac_fn_c_try_link "$LINENO"; then : $as_echo "yes" >&6; } -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - CFLAGS="$_svn_xxflags__save" - - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - _svn_xxflags__save="$CFLAGS" - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -flto" >&5 -$as_echo_n "checking if $CC accepts -flto... " >&6; } - CFLAGS="-flto $CFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(void){return 0;} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -22702,44 +22628,6 @@ if ac_fn_cxx_try_link "$LINENO"; then : $as_echo "yes" >&6; } -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - CXXFLAGS="$_svn_xxflags__save" - - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - _svn_xxflags__save="$CXXFLAGS" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -flto" >&5 -$as_echo_n "checking if $CXX accepts -flto... " >&6; } - CXXFLAGS="-flto $CXXFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(){} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -22770,12 +22658,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: C compiler flags: $CFLAGS" >&5 $as_echo "$as_me: C compiler flags: $CFLAGS" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: language-level: $CMODEFLAGS" >&5 +$as_echo "$as_me: language-level: $CMODEFLAGS" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: user-defined: $CUSERFLAGS" >&5 $as_echo "$as_me: user-defined: $CUSERFLAGS" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: maintainer-mode: $CMAINTAINERFLAGS" >&5 $as_echo "$as_me: maintainer-mode: $CMAINTAINERFLAGS" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: C++ compiler flags: $CXXFLAGS" >&5 $as_echo "$as_me: C++ compiler flags: $CXXFLAGS" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: language-level: $CXXMODEFLAGS" >&5 +$as_echo "$as_me: language-level: $CXXMODEFLAGS" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: user-defined: $CXXUSERFLAGS" >&5 $as_echo "$as_me: user-defined: $CXXUSERFLAGS" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: maintainer-mode: $CXXMAINTAINERFLAGS" >&5 @@ -23522,7 +23414,7 @@ test -n "$PYTHON" || PYTHON="none" # The minimum version for the JVM runtime for our Java bytecode. -JAVA_OLDEST_WORKING_VER='1.6' +JAVA_OLDEST_WORKING_VER='1.8' # SVN_CHECK_JDK sets $JAVA_CLASSPATH JAVA_OLDEST_WORKING_VER="$JAVA_OLDEST_WORKING_VER" @@ -23647,7 +23539,7 @@ fi # The release for "-source" could actually be greater than that # of "-target", if we want to cross-compile for lesser JVMs. if test -z "$JAVAC_FLAGS"; then - JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.6" + JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.8" if test "$enable_debugging" = "yes"; then JAVAC_FLAGS="-g -Xlint -Xlint:unchecked -Xlint:serial -Xlint:path $JAVAC_FLAGS" if test -z "$JAVAC_COMPAT_FLAGS"; then @@ -23787,7 +23679,7 @@ fi # The release for "-source" could actually be greater than that # of "-target", if we want to cross-compile for lesser JVMs. if test -z "$JAVAC_FLAGS"; then - JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.6" + JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.8" if test "$enable_debugging" = "yes"; then JAVAC_FLAGS="-g -Xlint -Xlint:unchecked -Xlint:serial -Xlint:path $JAVAC_FLAGS" if test -z "$JAVAC_COMPAT_FLAGS"; then @@ -23930,7 +23822,7 @@ fi # The release for "-source" could actually be greater than that # of "-target", if we want to cross-compile for lesser JVMs. if test -z "$JAVAC_FLAGS"; then - JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.6" + JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.8" if test "$enable_debugging" = "yes"; then JAVAC_FLAGS="-g -Xlint -Xlint:unchecked -Xlint:serial -Xlint:path $JAVAC_FLAGS" if test -z "$JAVAC_COMPAT_FLAGS"; then @@ -24476,6 +24368,12 @@ $as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;} SWIG_RB_COMPILE="none" SWIG_RB_LINK="none" if test "$RUBY" != "none"; then + if test x"$SWIG_VERSION" = x"3""00""008"; then + # Use a local variable to escape the '#' sign. + ruby_swig_issue_602='https://subversion.apache.org/docs/release-notes/1.11#ruby-swig-issue-602' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ruby bindings are known not to support swig 3.0.8; see $ruby_swig_issue_602" >&5 +$as_echo "$as_me: WARNING: Ruby bindings are known not to support swig 3.0.8; see $ruby_swig_issue_602" >&2;} + fi rbconfig="$RUBY -rrbconfig -e " for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \ @@ -24923,6 +24821,12 @@ $as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;} SWIG_RB_COMPILE="none" SWIG_RB_LINK="none" if test "$RUBY" != "none"; then + if test x"$SWIG_VERSION" = x"3""00""008"; then + # Use a local variable to escape the '#' sign. + ruby_swig_issue_602='https://subversion.apache.org/docs/release-notes/1.11#ruby-swig-issue-602' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ruby bindings are known not to support swig 3.0.8; see $ruby_swig_issue_602" >&5 +$as_echo "$as_me: WARNING: Ruby bindings are known not to support swig 3.0.8; see $ruby_swig_issue_602" >&2;} + fi rbconfig="$RUBY -rrbconfig -e " for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \ @@ -25370,6 +25274,12 @@ $as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;} SWIG_RB_COMPILE="none" SWIG_RB_LINK="none" if test "$RUBY" != "none"; then + if test x"$SWIG_VERSION" = x"3""00""008"; then + # Use a local variable to escape the '#' sign. + ruby_swig_issue_602='https://subversion.apache.org/docs/release-notes/1.11#ruby-swig-issue-602' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ruby bindings are known not to support swig 3.0.8; see $ruby_swig_issue_602" >&5 +$as_echo "$as_me: WARNING: Ruby bindings are known not to support swig 3.0.8; see $ruby_swig_issue_602" >&2;} + fi rbconfig="$RUBY -rrbconfig -e " for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \ @@ -25820,6 +25730,12 @@ $as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;} SWIG_RB_COMPILE="none" SWIG_RB_LINK="none" if test "$RUBY" != "none"; then + if test x"$SWIG_VERSION" = x"3""00""008"; then + # Use a local variable to escape the '#' sign. + ruby_swig_issue_602='https://subversion.apache.org/docs/release-notes/1.11#ruby-swig-issue-602' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ruby bindings are known not to support swig 3.0.8; see $ruby_swig_issue_602" >&5 +$as_echo "$as_me: WARNING: Ruby bindings are known not to support swig 3.0.8; see $ruby_swig_issue_602" >&2;} + fi rbconfig="$RUBY -rrbconfig -e " for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \ @@ -26451,6 +26367,578 @@ fi +# ==== SVN++ ================================================================= + +do_svnxx_build=no +# Check whether --enable-svnxx was given. +if test "${enable_svnxx+set}" = set; then : + enableval=$enable_svnxx; if test "$enableval" = "yes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Enabling the C++ bindings" >&5 +$as_echo "$as_me: Enabling the C++ bindings" >&6;} + do_svnxx_build=yes + fi + +fi + + +do_svnxx_test_build=no +# Check whether --enable-svnxx-tests was given. +if test "${enable_svnxx_tests+set}" = set; then : + enableval=$enable_svnxx_tests; if test "$enableval" = "yes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Enabling tests for the C++ bindings" >&5 +$as_echo "$as_me: Enabling tests for the C++ bindings" >&6;} + do_svnxx_test_build=yes + fi + +fi + + + + +# Check whether --with-boost was given. +if test "${with_boost+set}" = set; then : + withval=$with_boost; + case $withval in #( + no) : + want_boost="no";_AX_BOOST_BASE_boost_path="" ;; #( + yes) : + want_boost="yes";_AX_BOOST_BASE_boost_path="" ;; #( + *) : + want_boost="yes";_AX_BOOST_BASE_boost_path="$withval" ;; +esac + +else + want_boost="yes" +fi + + + + +# Check whether --with-boost-libdir was given. +if test "${with_boost_libdir+set}" = set; then : + withval=$with_boost_libdir; + if test -d "$withval"; then : + _AX_BOOST_BASE_boost_lib_path="$withval" +else + as_fn_error $? "--with-boost-libdir expected directory name" "$LINENO" 5 +fi + +else + _AX_BOOST_BASE_boost_lib_path="" +fi + + +BOOST_LDFLAGS="" +BOOST_CPPFLAGS="" +if test "x$want_boost" = "xyes"; then : + + + if test "x1.58" = "x"; then : + _AX_BOOST_BASE_TONUMERICVERSION_req="1.20.0" +else + _AX_BOOST_BASE_TONUMERICVERSION_req="1.58" +fi + _AX_BOOST_BASE_TONUMERICVERSION_req_shorten=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '\([0-9]*\.[0-9]*\)'` + _AX_BOOST_BASE_TONUMERICVERSION_req_major=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '\([0-9]*\)'` + if test "x$_AX_BOOST_BASE_TONUMERICVERSION_req_major" = "x"; then : + as_fn_error $? "You should at least specify libboost major version" "$LINENO" 5 +fi + _AX_BOOST_BASE_TONUMERICVERSION_req_minor=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '[0-9]*\.\([0-9]*\)'` + if test "x$_AX_BOOST_BASE_TONUMERICVERSION_req_minor" = "x"; then : + _AX_BOOST_BASE_TONUMERICVERSION_req_minor="0" +fi + _AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'` + if test "X$_AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor" = "X"; then : + _AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor="0" +fi + _AX_BOOST_BASE_TONUMERICVERSION_RET=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req_major \* 100000 \+ $_AX_BOOST_BASE_TONUMERICVERSION_req_minor \* 100 \+ $_AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor` + WANT_BOOST_VERSION=$_AX_BOOST_BASE_TONUMERICVERSION_RET + + succeeded=no + + + + case ${host_cpu} in #( + x86_64) : + libsubdirs="lib64 libx32 lib lib64" ;; #( + ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64) : + libsubdirs="lib64 lib lib64" ;; #( + *) : + libsubdirs="lib" + ;; +esac + + case ${host_cpu} in #( + i?86) : + multiarch_libsubdir="lib/i386-${host_os}" ;; #( + *) : + multiarch_libsubdir="lib/${host_cpu}-${host_os}" + ;; +esac + + if test "x$_AX_BOOST_BASE_boost_path" != "x"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boostlib >= 1.58 ($WANT_BOOST_VERSION) includes in \"$_AX_BOOST_BASE_boost_path/include\"" >&5 +$as_echo_n "checking for boostlib >= 1.58 ($WANT_BOOST_VERSION) includes in \"$_AX_BOOST_BASE_boost_path/include\"... " >&6; } + if test -d "$_AX_BOOST_BASE_boost_path/include" && test -r "$_AX_BOOST_BASE_boost_path/include"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + BOOST_CPPFLAGS="-I$_AX_BOOST_BASE_boost_path/include" + for _AX_BOOST_BASE_boost_path_tmp in $multiarch_libsubdir $libsubdirs; do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boostlib >= 1.58 ($WANT_BOOST_VERSION) lib path in \"$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp\"" >&5 +$as_echo_n "checking for boostlib >= 1.58 ($WANT_BOOST_VERSION) lib path in \"$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp\"... " >&6; } + if test -d "$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp" && test -r "$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp" ; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + BOOST_LDFLAGS="-L$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp"; + break; + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + done +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + +else + + if test X"$cross_compiling" = Xyes; then + search_libsubdirs=$multiarch_libsubdir + else + search_libsubdirs="$multiarch_libsubdir $libsubdirs" + fi + for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local ; do + if test -d "$_AX_BOOST_BASE_boost_path_tmp/include/boost" && test -r "$_AX_BOOST_BASE_boost_path_tmp/include/boost" ; then + for libsubdir in $search_libsubdirs ; do + if ls "$_AX_BOOST_BASE_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi + done + BOOST_LDFLAGS="-L$_AX_BOOST_BASE_boost_path_tmp/$libsubdir" + BOOST_CPPFLAGS="-I$_AX_BOOST_BASE_boost_path_tmp/include" + break; + fi + done + +fi + + if test "x$_AX_BOOST_BASE_boost_lib_path" != "x"; then : + BOOST_LDFLAGS="-L$_AX_BOOST_BASE_boost_lib_path" +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boostlib >= 1.58 ($WANT_BOOST_VERSION)" >&5 +$as_echo_n "checking for boostlib >= 1.58 ($WANT_BOOST_VERSION)... " >&6; } + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include + +int +main () +{ + +(void) ((void)sizeof(char[1 - 2*!!((BOOST_VERSION) < ($WANT_BOOST_VERSION))])); + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + succeeded=yes + found_system=yes + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + if test "x$succeeded" != "xyes" ; then + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + BOOST_CPPFLAGS= + if test -z "$_AX_BOOST_BASE_boost_lib_path" ; then + BOOST_LDFLAGS= + fi + _version=0 + if test -n "$_AX_BOOST_BASE_boost_path" ; then + if test -d "$_AX_BOOST_BASE_boost_path" && test -r "$_AX_BOOST_BASE_boost_path"; then + for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$_AX_BOOST_BASE_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "x$V_CHECK" = "x1" ; then + _version=$_version_tmp + fi + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$_AX_BOOST_BASE_boost_path/include/boost-$VERSION_UNDERSCORE" + done + if test -z "$BOOST_CPPFLAGS"; then + if test -d "$_AX_BOOST_BASE_boost_path/boost" && test -r "$_AX_BOOST_BASE_boost_path/boost"; then + BOOST_CPPFLAGS="-I$_AX_BOOST_BASE_boost_path" + fi + fi + if test -n "$BOOST_CPPFLAGS" && test -z "$BOOST_LDFLAGS"; then + for libsubdir in $libsubdirs ; do + if ls "$_AX_BOOST_BASE_boost_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi + done + BOOST_LDFLAGS="-L$_AX_BOOST_BASE_boost_path/$libsubdir" + fi + fi + else + if test "x$cross_compiling" != "xyes" ; then + for _AX_BOOST_BASE_boost_path in /usr /usr/local /opt /opt/local ; do + if test -d "$_AX_BOOST_BASE_boost_path" && test -r "$_AX_BOOST_BASE_boost_path" ; then + for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$_AX_BOOST_BASE_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "x$V_CHECK" = "x1" ; then + _version=$_version_tmp + best_path=$_AX_BOOST_BASE_boost_path + fi + done + fi + done + + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" + if test -z "$_AX_BOOST_BASE_boost_lib_path" ; then + for libsubdir in $libsubdirs ; do + if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi + done + BOOST_LDFLAGS="-L$best_path/$libsubdir" + fi + fi + + if test -n "$BOOST_ROOT" ; then + for libsubdir in $libsubdirs ; do + if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi + done + if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then + version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'` + stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'` + stage_version_shorten=`expr $stage_version : '\([0-9]*\.[0-9]*\)'` + V_CHECK=`expr $stage_version_shorten \>\= $_version` + if test "x$V_CHECK" = "x1" && test -z "$_AX_BOOST_BASE_boost_lib_path" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: We will use a staged boost library from $BOOST_ROOT" >&5 +$as_echo "$as_me: We will use a staged boost library from $BOOST_ROOT" >&6;} + BOOST_CPPFLAGS="-I$BOOST_ROOT" + BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir" + fi + fi + fi + fi + + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include + +int +main () +{ + +(void) ((void)sizeof(char[1 - 2*!!((BOOST_VERSION) < ($WANT_BOOST_VERSION))])); + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + succeeded=yes + found_system=yes + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi + + if test "x$succeeded" != "xyes" ; then + if test "x$_version" = "x0" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: We could not detect the boost libraries (version 1.58 or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&5 +$as_echo "$as_me: We could not detect the boost libraries (version 1.58 or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&6;} + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Your boost libraries seems to old (version $_version)." >&5 +$as_echo "$as_me: Your boost libraries seems to old (version $_version)." >&6;} + fi + # execute ACTION-IF-NOT-FOUND (if present): + + if test "$do_svnxx_test_build" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Tests for the C++ bindings require Boost and Boost.Test" >&5 +$as_echo "$as_me: WARNING: Tests for the C++ bindings require Boost and Boost.Test" >&2;} + do_svnxx_test_build=no + fi + + else + +$as_echo "#define HAVE_BOOST /**/" >>confdefs.h + + # execute ACTION-IF-FOUND (if present): + + if test "$do_svnxx_test_build" = "yes"; then + + +# Check whether --with-boost-unit-test-framework was given. +if test "${with_boost_unit_test_framework+set}" = set; then : + withval=$with_boost_unit_test_framework; + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_unit_test_framework_lib="" + else + want_boost="yes" + ax_boost_user_unit_test_framework_lib="$withval" + fi + +else + want_boost="yes" + +fi + + + if test "x$want_boost" = "xyes"; then + + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Unit_Test_Framework library is available" >&5 +$as_echo_n "checking whether the Boost::Unit_Test_Framework library is available... " >&6; } +if ${ax_cv_boost_unit_test_framework+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +using boost::unit_test::test_suite; + test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); if (test == NULL) { return 1; } else { return 0; } + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_boost_unit_test_framework=yes +else + ax_cv_boost_unit_test_framework=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_unit_test_framework" >&5 +$as_echo "$ax_cv_boost_unit_test_framework" >&6; } + if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then + +$as_echo "#define HAVE_BOOST_UNIT_TEST_FRAMEWORK /**/" >>confdefs.h + + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` + + if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then + saved_ldflags="${LDFLAGS}" + for monitor_library in `ls $BOOSTLIBDIR/libboost_unit_test_framework*.so* $BOOSTLIBDIR/libboost_unit_test_framework*.dylib* $BOOSTLIBDIR/libboost_unit_test_framework*.a* 2>/dev/null` ; do + if test -r $monitor_library ; then + libextension=`echo $monitor_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.a.*$;\1;'` + ax_lib=${libextension} + link_unit_test_framework="yes" + else + link_unit_test_framework="no" + fi + + if test "x$link_unit_test_framework" = "xyes"; then + BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib" + + break + fi + done + if test "x$link_unit_test_framework" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_unit_test_framework*.dll* $BOOSTLIBDIR/boost_unit_test_framework*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_unit_test_framework.*\)\.dll.*$;\1;' -e 's;^\(boost_unit_test_framework.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$ax_lib $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char exit (); +int +main () +{ +return exit (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"; link_unit_test_framework="yes"; break +else + link_unit_test_framework="no" +fi + + done + fi + else + link_unit_test_framework="no" + saved_ldflags="${LDFLAGS}" + for ax_lib in boost_unit_test_framework-$ax_boost_user_unit_test_framework_lib $ax_boost_user_unit_test_framework_lib ; do + if test "x$link_unit_test_framework" = "xyes"; then + break; + fi + for unittest_library in `ls $BOOSTLIBDIR/lib${ax_lib}.so* $BOOSTLIBDIR/lib${ax_lib}.a* 2>/dev/null` ; do + if test -r $unittest_library ; then + libextension=`echo $unittest_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.a*$;\1;'` + ax_lib=${libextension} + link_unit_test_framework="yes" + else + link_unit_test_framework="no" + fi + + if test "x$link_unit_test_framework" = "xyes"; then + BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib" + + break + fi + done + done + fi + if test "x$ax_lib" = "x"; then + as_fn_error $? "Could not find a version of the library!" "$LINENO" 5 + fi + if test "x$link_unit_test_framework" != "xyes"; then + as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5 + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi + + fi + + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + + +fi + + + + +if test "$do_svnxx_test_build" = "yes"; then + if test "$want_boost" != "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Tests for the C++ bindings require Boost and Boost.Test" >&5 +$as_echo "$as_me: WARNING: Tests for the C++ bindings require Boost and Boost.Test" >&2;} + do_svnxx_test_build=no + SVN_BUILD_SVNXX_TESTS=false + else + if test "$do_svnxx_build" != "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling the C++ bindings because their tests are enabled" >&5 +$as_echo "$as_me: WARNING: Enabling the C++ bindings because their tests are enabled" >&2;} + do_svnxx_build=yes + fi + SVN_BUILD_SVNXX_TESTS=true + fi +else + SVN_BUILD_SVNXX_TESTS=false +fi + +if test "$do_svnxx_build" = "yes"; then + SVN_BUILD_SVNXX=true +else + SVN_BUILD_SVNXX=false +fi + + + + # ==== JavaHL ================================================================ do_javahl_build=no @@ -27152,7 +27640,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by subversion $as_me 1.10.6, which was +This file was extended by subversion $as_me 1.13.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -27218,7 +27706,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -subversion config.status 1.10.6 +subversion config.status 1.13.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 8792adf..4a3683c 100644 --- a/configure.ac +++ b/configure.ac @@ -593,7 +593,7 @@ if test "$with_old_gnome_keyring" != "no"; then [Is GNOME Keyring support enabled?]) CPPFLAGS="$old_CPPFLAGS" SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs glib-2.0 gnome-keyring-1`" - SVN_GNOME_KEYRING_PCLIBS="glib-2.0 gnome-keyring-1" + SVN_GNOME_KEYRING_PCLIBS="glib-2.0, gnome-keyring-1" else AC_MSG_RESULT([no]) if test "$with_old_gnome_keyring" = "yes"; then @@ -640,29 +640,6 @@ AC_SUBST(SVN_GNOME_KEYRING_LIBS) dnl LibSecret ------------------- SVN_LIB_SECRET -dnl Googlemock ----------------- -AC_ARG_ENABLE([googlemock], - AS_HELP_STRING([--disable-googlemock], - [Do not use the Googlemock testing framework]), - [], - [enable_googlemock=yes]) - -AC_SUBST([GOOGLEMOCK_SRCDIR], [$abs_srcdir/googlemock]) -AC_MSG_CHECKING([whether use Googlemock]) -if test "$enable_googlemock" != "no"; then - if test -d "$GOOGLEMOCK_SRCDIR"; then - AC_MSG_RESULT([yes]) - SVN_USE_GOOGLEMOCK=true - else - AC_MSG_RESULT([no]) - SVN_USE_GOOGLEMOCK=false - fi -else - AC_MSG_RESULT([no]) - SVN_USE_GOOGLEMOCK=false -fi -AC_SUBST([SVN_USE_GOOGLEMOCK]) - dnl Ev2 experimental features ---------------------- dnl Note: The Ev2 implementations will be built unconditionally, but by dnl providing this flag, users can choose to use the currently-shimmed Ev2 @@ -867,18 +844,21 @@ fi dnl plaintext passwords ------------------- AC_ARG_ENABLE(plaintext-password-storage, -AS_HELP_STRING([--disable-plaintext-password-storage], - [Disable on-disk caching of plaintext passwords and passphrases. - (Leaving this functionality enabled will not force Subversion +AS_HELP_STRING([--enable-plaintext-password-storage], + [Enable on-disk caching of plaintext passwords and passphrases. + (Enabling this functionality will not force Subversion to store passwords in plaintext, but does permit users to explicitly allow that behavior via runtime configuration.)]), -[ - if test "$enableval" = "no"; then - AC_MSG_NOTICE([Disabling plaintext password/passphrase storage]) - AC_DEFINE(SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE, 1, - [Defined if plaintext password/passphrase storage is disabled]) - fi -]) +[plaintext_passwordd_storage="$enableval"], +[plaintext_passwordd_storage="no"]) + +if test "$plaintext_passwordd_storage" = "yes"; then + AC_MSG_WARN([Enabling plaintext password/passphrase storage]) +else + AC_MSG_NOTICE([Disabling plaintext password/passphrase storage]) + AC_DEFINE(SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE, 1, + [Defined if plaintext password/passphrase storage is disabled]) +fi dnl Build and install rules ------------------- @@ -948,8 +928,9 @@ AC_FUNC_VPRINTF dnl check for functions needed in special file handling AC_CHECK_FUNCS(symlink readlink) -dnl check for uname +dnl check for uname and ELF headers AC_CHECK_HEADERS(sys/utsname.h, [AC_CHECK_FUNCS(uname)], []) +AC_CHECK_HEADERS(elf.h) dnl check for termios AC_CHECK_HEADER(termios.h,[ @@ -1153,7 +1134,6 @@ if test "$enable_optimization" = "yes"; then SVN_CFLAGS_ADD_IFELSE([-O1],[],[ SVN_CFLAGS_ADD_IFELSE([-O])])])]) SVN_CFLAGS_ADD_IFELSE([-Wno-clobbered]) - SVN_CFLAGS_ADD_IFELSE([-flto]) fi fi if test -z ["`echo $CXXUSERFLAGS' ' | $EGREP -- '-O[^ ]* '`"]; then @@ -1169,7 +1149,6 @@ if test "$enable_optimization" = "yes"; then SVN_CXXFLAGS_ADD_IFELSE([-O1],[],[ SVN_CXXFLAGS_ADD_IFELSE([-O])])])]) SVN_CXXFLAGS_ADD_IFELSE([-Wno-clobbered]) - SVN_CXXFLAGS_ADD_IFELSE([-flto]) fi fi elif test "$enable_optimization" = "no"; then @@ -1183,9 +1162,11 @@ fi dnl Dump the current compiler options AC_MSG_NOTICE([C compiler flags: $CFLAGS]) +AC_MSG_NOTICE([ language-level: $CMODEFLAGS]) AC_MSG_NOTICE([ user-defined: $CUSERFLAGS]) AC_MSG_NOTICE([ maintainer-mode: $CMAINTAINERFLAGS]) AC_MSG_NOTICE([C++ compiler flags: $CXXFLAGS]) +AC_MSG_NOTICE([ language-level: $CXXMODEFLAGS]) AC_MSG_NOTICE([ user-defined: $CXXUSERFLAGS]) AC_MSG_NOTICE([ maintainer-mode: $CXXMAINTAINERFLAGS]) @@ -1306,7 +1287,7 @@ fi AC_PATH_PROGS(PYTHON, "$PYTHON", none) # The minimum version for the JVM runtime for our Java bytecode. -JAVA_OLDEST_WORKING_VER='1.6' +JAVA_OLDEST_WORKING_VER='1.8' # SVN_CHECK_JDK sets $JAVA_CLASSPATH SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER) @@ -1454,6 +1435,69 @@ AC_SUBST(SVN_FS_LIB_DEPS) AC_SUBST(SVN_FS_LIB_INSTALL_DEPS) AC_SUBST(SVN_FS_LIB_LINK) +# ==== SVN++ ================================================================= + +dnl Possibly compile SVN++ +do_svnxx_build=no +AC_ARG_ENABLE(svnxx, + AS_HELP_STRING([--enable-svnxx], + [Enable compilation of the C++ bindings (requires C++)]), + [ if test "$enableval" = "yes" ; then + AC_MSG_NOTICE([Enabling the C++ bindings]) + do_svnxx_build=yes + fi + ]) + +dnl Possibly compile SVN++ tests +do_svnxx_test_build=no +AC_ARG_ENABLE(svnxx-tests, + AS_HELP_STRING([--enable-svnxx-tests], + [Enable compilation of tests for the C++ bindings + (implies --enable-svnxx, requires Boost and Boost.Test)]), + [ if test "$enableval" = "yes" ; then + AC_MSG_NOTICE([Enabling tests for the C++ bindings]) + do_svnxx_test_build=yes + fi + ]) + +AX_BOOST_BASE([1.58], + [ + if test "$do_svnxx_test_build" = "yes"; then + AX_BOOST_UNIT_TEST_FRAMEWORK + fi + ], + [ + if test "$do_svnxx_test_build" = "yes"; then + AC_MSG_WARN([Tests for the C++ bindings require Boost and Boost.Test]) + do_svnxx_test_build=no + fi + ]) + +if test "$do_svnxx_test_build" = "yes"; then + if test "$want_boost" != "yes"; then + AC_MSG_WARN([Tests for the C++ bindings require Boost and Boost.Test]) + do_svnxx_test_build=no + SVN_BUILD_SVNXX_TESTS=false + else + if test "$do_svnxx_build" != "yes"; then + AC_MSG_WARN([Enabling the C++ bindings because their tests are enabled]) + do_svnxx_build=yes + fi + SVN_BUILD_SVNXX_TESTS=true + fi +else + SVN_BUILD_SVNXX_TESTS=false +fi + +if test "$do_svnxx_build" = "yes"; then + SVN_BUILD_SVNXX=true +else + SVN_BUILD_SVNXX=false +fi + +AC_SUBST(SVN_BUILD_SVNXX) +AC_SUBST(SVN_BUILD_SVNXX_TESTS) + # ==== JavaHL ================================================================ dnl Possibly compile JavaHL diff --git a/doc/doxygen.conf b/doc/doxygen.conf index adb7efb..b66d5ba 100644 --- a/doc/doxygen.conf +++ b/doc/doxygen.conf @@ -112,7 +112,7 @@ INLINE_INHERITED_MEMB = NO # path before files name in the file list and in the header files. If set # to NO the shortest path that makes the file name unique will be used. -FULL_PATH_NAMES = NO +FULL_PATH_NAMES = YES # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag # can be used to strip a user-defined part of the path. Stripping is @@ -121,7 +121,7 @@ FULL_PATH_NAMES = NO # If left blank the directory from which doxygen is run is used as the # path to strip. -STRIP_FROM_PATH = +STRIP_FROM_PATH = subversion/include subversion/bindings/cxx/include # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of # the path mentioned in the documentation of a class, which tells @@ -130,7 +130,7 @@ STRIP_FROM_PATH = # definition is used. Otherwise one should specify the include paths that # are normally passed to the compiler using the -I flag. -STRIP_FROM_INC_PATH = +STRIP_FROM_INC_PATH = subversion/include subversion/bindings/cxx/include # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter # (but less readable) file names. This can be useful is your file systems @@ -280,22 +280,6 @@ SUBGROUPING = YES TYPEDEF_HIDES_STRUCT = NO -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols - -SYMBOL_CACHE_SIZE = 0 - #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- @@ -478,12 +462,6 @@ MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = YES -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = NO - # Set the SHOW_FILES tag to NO to disable the generation of the Files page. # This will remove the Files entry from the Quick Index and from the # Folder Tree View (if specified). The default is YES. @@ -577,6 +555,10 @@ WARN_LOGFILE = # with spaces. INPUT = subversion/include \ + subversion/bindings/cxx/include \ + subversion/bindings/cxx/include/svnxx \ + subversion/bindings/cxx/include/svnxx/client \ + subversion/bindings/cxx/include/svnxx/detail \ subversion/include/private/svn_doxygen.h # This tag can be used to specify the character encoding of the source files @@ -594,7 +576,7 @@ INPUT_ENCODING = UTF-8 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 -FILE_PATTERNS = *.h +FILE_PATTERNS = *.h *.hpp # The RECURSIVE tag can be used to turn specify whether or not subdirectories # should be searched for input files as well. Possible values are YES and NO. @@ -805,12 +787,6 @@ HTML_FOOTER = HTML_STYLESHEET = -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. For this to work a browser that supports @@ -959,11 +935,6 @@ ENUM_VALUES_PER_LINE = 1 GENERATE_TREEVIEW = NO -# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, -# and Class Hierarchy pages using a tree view instead of an ordered list. - -USE_INLINE_TREES = NO - # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be # used to set the initial width (in pixels) of the frame in which the tree # is shown. @@ -1151,18 +1122,6 @@ GENERATE_XML = NO XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - # If the XML_PROGRAMLISTING tag is set to YES Doxygen will # dump the program listings (including syntax highlighting # and cross-referencing information) to the XML output. Note that @@ -1378,7 +1337,7 @@ HAVE_DOT = NO # DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory # containing the font. -DOT_FONTNAME = FreeSans +DOT_FONTNAME = # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. # The default size is 10pt. diff --git a/doc/programmer/gtest-guide.txt b/doc/programmer/gtest-guide.txt deleted file mode 100644 index 225690c..0000000 --- a/doc/programmer/gtest-guide.txt +++ /dev/null @@ -1,30 +0,0 @@ -Googlemock and Googletest Suite for Subversion ---------------------------------------------- - -Googlemock and Googletest are external packages that are downloaded -and compiled on request, as part of regular compilations. - -Googlemock is available here: - - https://code.google.com/p/googlemock/ - -The source packages already include Googletest, which is available -here: - - https://code.google.com/p/googletest/ - -Subversion uses Googlemock and Googletest for the C++HL test suite. - - - -To configure Subversion to use Googlemock, type - - ./get-dep.sh gmock - -This will download Googlemock and put the fused source into the -'gmock-fused' directory. Once it's there, configure will pick it up -automatically (but you do have to re-run autogen.sh and configure). - -You can disable building Googlemock (and hence the C++HL test suite) -with the --disable-gmock configure option. This will tell configure to -ignore the gmock-fused directory. diff --git a/doc/user/svn-best-practices.html b/doc/user/svn-best-practices.html index b168786..8bfa495 100644 --- a/doc/user/svn-best-practices.html +++ b/doc/user/svn-best-practices.html @@ -240,7 +240,7 @@ while somebody else is in the process of committing.

  • Users commit their day-to-day work on /trunk.
  • Rule #1: /trunk must compile and pass regression tests at -all times. Committers who violate this rule are publically +all times. Committers who violate this rule are publicly humiliated.
  • Rule #2: a single commit (changeset) must not be so large diff --git a/gen-make.py b/gen-make.py index 9e410c4..58fc8c2 100755 --- a/gen-make.py +++ b/gen-make.py @@ -48,7 +48,6 @@ sys.path.insert(1, 'build') gen_modules = { 'make' : ('gen_make', 'Makefiles for POSIX systems'), - 'dsp' : ('gen_msvc_dsp', 'MSVC 6.x project files'), 'vcproj' : ('gen_vcnet_vcproj', 'VC.Net project files'), } @@ -215,8 +214,6 @@ def _usage_exit(err=None): print("") print(" --with-apr_memcache=DIR") print(" the apr_memcache sources are in DIR") - print(" --disable-gmock") - print(" do not use Googlemock") sys.exit(1) @@ -264,7 +261,6 @@ if __name__ == '__main__': 'disable-shared', 'installed-libs=', 'vsnet-version=', - 'disable-gmock', ]) if len(args) > 1: _usage_exit("Too many arguments") diff --git a/get-deps.sh b/get-deps.sh index f41d37f..b499ff4 100755 --- a/get-deps.sh +++ b/get-deps.sh @@ -38,8 +38,6 @@ ZLIB_VERSION=${ZLIB_VERSION:-"1.2.8"} SQLITE_VERSION=${SQLITE_VERSION:-"3.8.11.1"} # Used to construct the SQLite download URL. SQLITE_VERSION_REL_YEAR=2015 -GTEST_VERSION=${GMOCK_VERSION:-"1.7.0"} -GMOCK_VERSION=${GMOCK_VERSION:-"1.7.0"} HTTPD_VERSION=${HTTPD_VERSION:-"2.4.10"} APR_ICONV_VERSION=${APR_ICONV_VERSION:-"1.2.1"} @@ -49,10 +47,6 @@ SERF=serf-${SERF_VERSION} ZLIB=zlib-${ZLIB_VERSION} SQLITE_VERSION_LIST=`echo $SQLITE_VERSION | sed -e 's/\./ /g'` SQLITE=sqlite-amalgamation-`printf %d%02d%02d%02d $SQLITE_VERSION_LIST` -GTEST=release-${GTEST_VERSION} -GTEST_URL=https://github.com/google/googletest/archive -GMOCK=release-${GMOCK_VERSION} -GMOCK_URL=https://github.com/google/googlemock/archive HTTPD=httpd-${HTTPD_VERSION} APR_ICONV=apr-iconv-${APR_ICONV_VERSION} @@ -67,12 +61,12 @@ HTTP_FETCH= # Need this uncommented if any of the specific versions of the ASF tarballs to # be downloaded are no longer available on the general mirrors. -APACHE_MIRROR=http://archive.apache.org/dist +APACHE_MIRROR=https://archive.apache.org/dist # helpers usage() { echo "Usage: $0" - echo "Usage: $0 [ apr | serf | zlib | sqlite | googlemock ] ..." + echo "Usage: $0 [ apr | serf | zlib | sqlite ] ..." exit $1 } @@ -106,7 +100,7 @@ get_zlib() { test -d $BASEDIR/zlib && return cd $TEMPDIR - $HTTP_FETCH http://sourceforge.net/projects/libpng/files/zlib/$ZLIB_VERSION/$ZLIB.tar.gz + $HTTP_FETCH https://sourceforge.net/projects/libpng/files/zlib/$ZLIB_VERSION/$ZLIB.tar.gz cd $BASEDIR gzip -dc $TEMPDIR/$ZLIB.tar.gz | tar -xf - @@ -127,29 +121,11 @@ get_sqlite() { } -get_googlemock() { - test -d $BASEDIR/googlemock && return - - cd $TEMPDIR - $HTTP_FETCH ${GTEST_URL}/${GTEST}.zip - unzip -q ${GTEST}.zip - rm -f ${GTEST}.zip - - $HTTP_FETCH ${GMOCK_URL}/${GMOCK}.zip - unzip -q ${GMOCK}.zip - rm -f ${GMOCK}.zip - - cd $BASEDIR - mkdir googlemock - mv $TEMPDIR/googletest-release-${GTEST_VERSION} googlemock/googletest - mv $TEMPDIR/googlemock-release-${GMOCK_VERSION} googlemock/googlemock -} - # main() get_deps() { mkdir -p $TEMPDIR - for i in zlib serf sqlite-amalgamation apr apr-util gmock-fused; do + for i in zlib serf sqlite-amalgamation apr apr-util; do if [ -d $i ]; then echo "Local directory '$i' already exists; the downloaded copy won't be used" >&2 fi diff --git a/subversion/bindings/cxx/README b/subversion/bindings/cxx/README new file mode 100644 index 0000000..6126c5a --- /dev/null +++ b/subversion/bindings/cxx/README @@ -0,0 +1,147 @@ +WORK IN PROGRESS +================ + +This directory contains an experimental implementation of SVN++, a +high-level Subversion C++ API. + +It is far from complete and may never see the light of day. + +On the other hand, one good reason for having a high-level C++ API is +to use it as a baseline for Swig-generated bindings. Our current set +of Perl, Python and Ruby bindings is too heterogenous in terms of +feature set, object and usage model. They're almost as hard to use as +the C API itself. + + +DESIGN GOALS +============ + +In no particular order: + + * Use modern C++ constructs (the current baseline is C++11). + + * Hide the dependency on APR that is exposed in Subversion's C API. + + * Use separate C++ types for different kinds of values returned + from the C API (e.g., dirent vs. property value vs. URL), to make + it easier to create generic typemaps for Swig. + + * Provide both synchronous and asynchronous interfaces. + + * Avoid unnecessary copies by defining strict lifetimes for + returned values. + + * Provide API variants that accept wide strings as well as + UTF-8-encoded narrow strings. + + * Provide high-level constructs for common parameter types; e.g., + revision ranges and lists for diff, merge, etc. + + * Provide optional header-only conversions and overload for Boost types (e.g., + boost::tribool, boost::filesystem::path), which can be enabled by users by + defining the SVNXX_USE_BOOST symbol. + + These convenience overloads and conversions must *not* make the SVN++ + library depend on any Boost runtime libraries. + + * API versioning (how?). + + +API COVERAGE +============ + +Planned: + + * libsvn_client (highest priority) + * svn_mtcc_* + * utilities (diff, revision ranges/lists, etc.) + * libsvn_ra + * libsvn_repos/libsvn_fs (lowest priority) + +Not planned: + * libsvn_subr + * libsvn_wc + + +C++ NAMESPACES AND SOURCE LAYOUT +================================ + +Public API +---------- + +The public API is in namespace apache::subversion::svnxx and we define +a namespace alias for that: + + namespace svn = ::apache::subversion::svnxx + +All elements of the public API are defined or declared in header files +in the directory + + .../include/svnxx/*.hpp + +with the single header file + + .../include/svnxx.hpp + +importing all relevant headers from that directory. + +Implementation details used by the public API and visible to user +code but that should not be directly used by user code are in the +namespace apache::subversion::svnxx::detail and should be defined +in header files in the directory: + + .../include/svnxx/detail/*.hpp + +Note on API versioning +---------------------- + +Version-specific elements of the public API should be defined in +namespaces within the public namespace; e.g., for version 1.13: + + apache::subversion::svnxx::v_1_13 + +and the default (or selected) version will be exposed in the +parent namespace by inlining the namespace declaration. +This versioning does not apply to things declared in svn::detail. + +Implementation +-------------- + +All entities that are private to the implementation should be +in the namespace apache::subversion::svnxx::impl and defined +in header files within the source directory tree: + + .../src/private/*_private.hpp + +with the single header file + + .../src/private.hpp + +importing all relevant headers from that directory. The exception to +this rule are C++ wrappers for APR types, which are defined in the +namespace apache::subversion::svnxx::apr in header files in the +directory: + + .../src/aprwrap/*.hpp + +with the single header file + + .../src/aprwrap.hpp + +importing all relevant headers from that directory. + +==================================================================== + +IMPLEMENTATION NOTES +==================== + +Asynchronous Operations (TODO) +------------------------------ + +In the current model of asyncrhonous operations, we do not protect +against using the same svn_client_ctx_t object from multiple +threads. This _should_ be safe as long as the callback +implementations are aware of it, but we should consider changing the +design so that whilst svn::client::context can be shared, we create +the actual svn_client_ctx_t on the fly for each operation -- +similarly to how we create a the scratch pool. diff --git a/subversion/bindings/cxx/include/svnxx.hpp b/subversion/bindings/cxx/include/svnxx.hpp new file mode 100644 index 0000000..959ce7d --- /dev/null +++ b/subversion/bindings/cxx/include/svnxx.hpp @@ -0,0 +1,39 @@ +/** + * @file svnxx.hpp + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_HPP +#define SVNXX_HPP + +// Expose the whole API and alias the default version namespace +#include "svnxx/depth.hpp" +#include "svnxx/init.hpp" +#include "svnxx/exception.hpp" +#include "svnxx/revision.hpp" +#include "svnxx/tristate.hpp" + +#include "svnxx/client.hpp" + +namespace svn = ::apache::subversion::svnxx; + +#endif // SVNXX_HPP diff --git a/subversion/bindings/cxx/include/svnxx/client.hpp b/subversion/bindings/cxx/include/svnxx/client.hpp new file mode 100644 index 0000000..78a4a37 --- /dev/null +++ b/subversion/bindings/cxx/include/svnxx/client.hpp @@ -0,0 +1,40 @@ +/** + * @file svnxx/client.hpp + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_CLIENT_HPP +#define SVNXX_CLIENT_HPP + +/** + * @defgroup svnxx_client SVN++ Client + * @brief Client Operations + * + * Client Operations + * ================= + * TODO: document this + */ + +#include "client/context.hpp" +#include "client/status.hpp" + +#endif // SVNXX_CLIENT_HPP diff --git a/subversion/bindings/cxx/include/svnxx/client/context.hpp b/subversion/bindings/cxx/include/svnxx/client/context.hpp new file mode 100644 index 0000000..d4ecc6e --- /dev/null +++ b/subversion/bindings/cxx/include/svnxx/client/context.hpp @@ -0,0 +1,60 @@ +/** + * @file svnxx/client/context.hpp + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_CLIENT_CONTEXT_HPP +#define SVNXX_CLIENT_CONTEXT_HPP + +#include + +namespace apache { +namespace subversion { +namespace svnxx { +namespace client { + +namespace detail { +class context; +using context_ptr = std::shared_ptr; +using weak_context_ptr = std::weak_ptr; +} // namespace detail + +/** + * @brief The context for client operations, see @ref svn_client_ctx_t. + * @warning TODO: Work in progress. + */ +class context : protected detail::context_ptr +{ +public: + context(); + ~context(); + +protected: + using inherited = detail::context_ptr; +}; + +} // namespace client +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_CLIENT_CONTEXT_HPP diff --git a/subversion/bindings/cxx/include/svnxx/client/status.hpp b/subversion/bindings/cxx/include/svnxx/client/status.hpp new file mode 100644 index 0000000..a571261 --- /dev/null +++ b/subversion/bindings/cxx/include/svnxx/client/status.hpp @@ -0,0 +1,138 @@ +/** + * @file svnxx/client/status.hpp + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_CLIENT_STATUS_HPP +#define SVNXX_CLIENT_STATUS_HPP + +#include +#include + +#include "svnxx/detail/future.hpp" +#include "svnxx/client/context.hpp" + +#include "svnxx/depth.hpp" +#include "svnxx/revision.hpp" + +namespace apache { +namespace subversion { +namespace svnxx { +namespace client { + +/** + * @warning TODO: Work in progress + */ +struct status_notification{}; + +/** + * @warning TODO: Work in progress + */ +using status_callback = std::function; + +/** + * @brief Flags that modify the behaviour of the status operation. + * @see svn_client_status6 + */ +enum class status_flags : std::uint_least32_t + { + empty = 0U, + get_all = 1U << 0, + check_out_of_date = 1U << 1, + check_working_copy = 1U << 2, + no_ignore = 1U << 3, + ignore_externals = 1U << 4, + depth_as_sticky = 1U << 5, + }; + +/** + * @brief Bitwise conjunction operator for @c status_flags. + */ +inline status_flags operator&(status_flags a, status_flags b) +{ + return status_flags(std::uint_least32_t(a) & std::uint_least32_t(b)); +} + +/** + * @brief Bitwise disjunction operator for @c status_flags. + */ +inline status_flags operator|(status_flags a, status_flags b) +{ + return status_flags(std::uint_least32_t(a) | std::uint_least32_t(b)); +} + +/** + * @ingroup svnxx_client + * @brief Perform a status operation on @a path. + * @param ctx the #context object to use for this operation + * @param path the (root) path for the status walk. + * @param rev the revision to use when @c check_out_of_date is set in @a flags + * @param depth the depth of the operation + * @param flags a combination of @c status_flags + * @param callback a function that will be called for each status target + * @warning TODO: Work in progress + * @see svn_client_status6 + */ +revision::number +status(context& ctx, const char* path, + const revision& rev, depth depth, status_flags flags, + status_callback callback); + +namespace async { + +/** + * @ingroup svnxx_client + * @brief Perform an asynchronous status operation on @a path. + * + * Behaves as if svn::client::status() were invoked through + * std::async(), but also maintains the lifetime of + * internal state relevant to the status operation. + * + * @warning Any callbacks regietered in @a ctx, as well as the + * status @a callback itself, may be called in the context + * of a different thread than the one that created this + * asynchronous operation. + */ +svnxx::detail::future +status(std::launch policy, context& ctx, const char* path, + const revision& rev, depth depth_, status_flags flags, + status_callback callback); + +/** + * @overload + * @ingroup svnxx_client + * @note Uses the std::launch @a policy set to + * std::launch::async|std::launch::deferred. + */ +svnxx::detail::future +status(context& ctx, const char* path, + const revision& rev, depth depth_, status_flags flags, + status_callback callback); + +} // namespace async +} // namespace client +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_CLIENT_STATUS_HPP diff --git a/subversion/bindings/cxx/include/svnxx/depth.hpp b/subversion/bindings/cxx/include/svnxx/depth.hpp new file mode 100644 index 0000000..d2468a7 --- /dev/null +++ b/subversion/bindings/cxx/include/svnxx/depth.hpp @@ -0,0 +1,79 @@ +/** + * @file svnxx/depth.hpp + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_DEPTH_HPP +#define SVNXX_DEPTH_HPP + +#include "svn_types_impl.h" + +#include +#include + +namespace apache { +namespace subversion { +namespace svnxx { + +/** + * @brief The concept of depth for directories (see @ref svn_depth_t). + */ +// NOTE: Keep these values identical to those in svn_depth_t! +enum class depth : std::int8_t + { + unknown = svn_depth_unknown, + exclude = svn_depth_exclude, + empty = svn_depth_empty, + files = svn_depth_files, + immediates = svn_depth_immediates, + infinity = svn_depth_infinity, + }; + +/** + * @brief Converts a depth constant to its string representation. + * @see svn_depth_to_word() + */ +std::string to_string(depth); + +/** + * @brief Converts a depth constant to its wide-string representation. + * @see svn_depth_to_word() + */ +std::wstring to_wstring(depth); + +/** + * @brief Converts a depth constant to its UTF-16 string representation. + * @see svn_depth_to_word() + */ +std::u16string to_u16string(depth); + +/** + * @brief Converts a depth constant to its UTF-32 string representation. + * @see svn_depth_to_word() + */ +std::u32string to_u32string(depth); + +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_DEPTH_HPP diff --git a/subversion/bindings/cxx/include/svnxx/detail/doxygen.hpp b/subversion/bindings/cxx/include/svnxx/detail/doxygen.hpp new file mode 100644 index 0000000..a29dc8e --- /dev/null +++ b/subversion/bindings/cxx/include/svnxx/detail/doxygen.hpp @@ -0,0 +1,51 @@ +/** + * @file svnxx/detail/doxygen.hpp + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifdef DOXYGEN + +namespace apache { +namespace subversion { +namespace svnxx { +namespace detail { + +/** + * @defgroup svnxx_detail SVN++ Implementation Details + * @brief The C++ API's Private Parts + * + * The C++ API's Private Parts + * =========================== + * + * Anything declared or defined in the namespace + * @c apache::subversion::svnxx::detail is an implementation detail + * of the SVN++ public API. User code @b should @b not use anything + * from this namespace, except as far as it's referenced from the + * public parts of the API. + */ + +} // namespace detail +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // DOXYGEN diff --git a/subversion/bindings/cxx/include/svnxx/detail/future.hpp b/subversion/bindings/cxx/include/svnxx/detail/future.hpp new file mode 100644 index 0000000..31032b3 --- /dev/null +++ b/subversion/bindings/cxx/include/svnxx/detail/future.hpp @@ -0,0 +1,175 @@ +/** + * @file svnxx/detail/future.hpp + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_DETAIL_FUTURE_HPP +#define SVNXX_DETAIL_FUTURE_HPP + +#include +#include + +namespace apache { +namespace subversion { +namespace svnxx { +namespace detail { +namespace future_ { + +// Forward delcaration of the future result context. +class result; +using shared_ptr = std::shared_ptr; +using unique_ptr = std::unique_ptr; + + +// Base class for template shared_future. +class shared_future_base +{ +protected: + shared_future_base() noexcept {} + + shared_future_base(const shared_future_base& that) + : shared_result(that.shared_result) + {} + + shared_future_base(shared_future_base&& that) + : shared_result(std::move(that.shared_result)) + {} + + explicit shared_future_base(shared_ptr shared_result_) + : shared_result(shared_result_) + {} + +private: + shared_ptr shared_result; +}; + +// Template forward declaration for shared_future constructor. +template class future; + +/** + * @ingroup svnxx_detail + * @brief like std::shared_future, but also maintains + * internal state relevant to the asynchronous SVN++ operation. + */ +template +class shared_future : private std::shared_future, + private shared_future_base +{ +protected: + using inherited = std::shared_future; + + shared_future(inherited&& that, shared_ptr shared_result_) noexcept + : inherited(that), shared_future_base(shared_result_) + {} + +public: + shared_future() noexcept {} + + shared_future(const shared_future& that) noexcept + : inherited(that), shared_future_base(that) + {} + + shared_future(shared_future&& that) noexcept + : inherited(std::move(that)), shared_future_base(std::move(that)) + {} + + shared_future(future&& that) noexcept; + + using inherited::get; + using inherited::valid; + using inherited::wait; + using inherited::wait_for; + using inherited::wait_until; +}; + + +// Base class for template future. +class future_base +{ +protected: + future_base() noexcept; + ~future_base() noexcept; + future_base(future_base&& that) noexcept; + future_base(const future_base&) = delete; + explicit future_base(unique_ptr&& unique_result_) noexcept; + + shared_ptr share() noexcept; + +private: + unique_ptr unique_result; +}; + +/** + * @ingroup svnxx_detail + * @brief like std::future, but also maintains internal + * state relevant to the asynchronous SVN++ operation. + */ +template +class future : private std::future, + private future_base +{ + // shared_future constructor must be able to access our base classes. + friend class shared_future; + +protected: + using inherited = std::future; + + future(inherited&& that, unique_ptr&& unique_result_) noexcept + : inherited(std::move(that)), future_base(std::move(unique_result_)) + {} + +public: + future() noexcept {} + + future(future&& that) noexcept + : inherited(std::move(that)), future_base(std::move(that)) + {} + + shared_future share() noexcept + { + return shared_future(std::move(*this)); + } + + using inherited::get; + using inherited::valid; + using inherited::wait; + using inherited::wait_for; + using inherited::wait_until; +}; + +// Implement the constructor here since it has to see the whole future class. +template +inline shared_future::shared_future(future&& that) noexcept + : inherited(std::move(that)), shared_future_base(that.future_base::share()) +{} + +} // namespace future_ + +template using future = future_::future; +template using shared_future = future_::shared_future; + +} // namespace detail +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_DETAIL_FUTURE_HPP diff --git a/subversion/bindings/cxx/include/svnxx/detail/noncopyable.hpp b/subversion/bindings/cxx/include/svnxx/detail/noncopyable.hpp new file mode 100644 index 0000000..15433e0 --- /dev/null +++ b/subversion/bindings/cxx/include/svnxx/detail/noncopyable.hpp @@ -0,0 +1,61 @@ +/** + * @file svnxx/detail/noncopyable.hpp + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_DETAIL_NONCOPYABLE_HPP +#define SVNXX_DETAIL_NONCOPYABLE_HPP + +namespace apache { +namespace subversion { +namespace svnxx { +namespace detail { + +namespace noncopyable_ { +/** + * @ingroup svnxx_detail + * @brief Base class for non-copyable objects. + * + * Objects of classes derived from @c noncopyable cannot be copied, + * but can used as rvalue references and with std::move. + * + * @note Use @e private inheritance to avoid polymorphism traps! + */ +class noncopyable +{ +protected: + constexpr noncopyable() = default; + ~noncopyable() = default; +private: + noncopyable(const noncopyable&) = delete; + noncopyable& operator=(const noncopyable&) = delete; +}; +} // namespace noncopyable_ + +using noncopyable = noncopyable_::noncopyable; + +} // namespace detail +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_DETAIL_NONCOPYABLE_HPP diff --git a/subversion/bindings/cxx/include/svnxx/exception.hpp b/subversion/bindings/cxx/include/svnxx/exception.hpp new file mode 100644 index 0000000..e01a32b --- /dev/null +++ b/subversion/bindings/cxx/include/svnxx/exception.hpp @@ -0,0 +1,254 @@ +/** + * @file svnxx/exception.hpp + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_EXCEPTION_HPP +#define SVNXX_EXCEPTION_HPP + +#include "svn_types_impl.h" + +#include +#include +#include +#include +#include +#include + +/** + * @defgroup svnxx_exceptions SVN++ Exceptions + * @brief Exceptions in SVN++ + * + * Exceptions in SVN++ + * =================== + * + * SVN++ uses exceptions for the following purposes: + * @li Reporting memory allocation failure; where Subversion's + * default hehaviour is to abort when an allocation from an APR + * pool fails, SVN++ throws an exception instead. + * @li Reporting errors; Subversion's error messages are wrapped in + * exceptions. + * @li Reporting cancelled operations; an operation that was + * cancelled from user code will report this by throwing a + * specific exception type. + * @li Terminating iteration; user-level callbacks may throw a + * specific exception type to cancel an ongoing operation that + * is generating the callback messages. Other exceptions from + * user-level callbacks will be propagated back to the calling + * application. + * + * The SVN++ implementation will also throw standard exceptions when + * appropriate. Their use is documented in the relevant modules. + * + * Exception Hierarchy + * ------------------- + * + * All SVN++ exceptions are ultimately derived from @c std::exception. + * + * * std::exception + * + std::bad_alloc + * - apache::subversion::svnxx::allocation_failed\n + * Thrown when memory cannot be allocated from an APR pool + * + std::runtime_error + * - apache::subversion::svnxx::error\n + * Thrown when an operation failed (see @ref svn_error_t) + * - apache::subversion::svnxx::cancelled\n + * Thrown when an operation was cancelled, including by the + * user code throwing a @c stop_iteration exception (see + * below) + * + apache::subversion::svnxx::stop_iteration\n + * Thrown by user callbacks to terminate iteration + * + * @{ + */ + +namespace apache { +namespace subversion { +namespace svnxx { + +/** + * @brief Exception type that will be thrown when memory allocation fails. + */ +class allocation_failed : public std::bad_alloc +{ +public: + virtual ~allocation_failed() noexcept {} + + virtual const char* what() const noexcept override + { + return reason; + } + +protected: + explicit allocation_failed(const char* what_arg) noexcept + : reason(what_arg) + {} + +private: + const char* reason; +}; + +namespace detail { +using error_ptr = std::shared_ptr; +} // namespace detail + +/** + * Encapsulate a stack of Subversion error codes and messages. + */ +class error : public std::exception, + protected detail::error_ptr +{ +public: + virtual ~error() {} + + /** + * Returns the message associated with the top-level error that + * caused the exception. + * + * @note the returned string is valid only as long as this @c error + * object is in scope. + */ + virtual const char* what() const noexcept override; + + /** + * Returns the error code associated with the top-level error that + * caused the exception. + */ + virtual int code() const noexcept; + + /** + * Returns the symbolic name of the error code associated with the + * top-level error that caused the exception. + * @note The returned value may be @c nullptr. + */ + virtual const char* name() const noexcept; + + /** + * Error message description. + */ + class message + { + public: + /** + * Return the error code. + */ + int code() const noexcept { return m_errno; } + + /** + * Return the error name. + * @note The returned value may be @c nullptr. + */ + const char* name() const noexcept { return m_errname; } + + /** + * Return the error message. + */ + const std::string& text() const noexcept { return m_message; } + + /** + * Return the generic error message associated with the error code. + */ + std::string generic_text() const; + + /** + * Check if this message is in fact a debugging traceback entry. + */ + bool trace() const noexcept { return m_trace; } + + protected: + message(int errval, const char* errname, + const std::string& message_, bool trace) + : m_errno(errval), + m_errname(errname), + m_message(message_), + m_trace(trace) + {} + + private: + int m_errno; + const char* m_errname; + std::string m_message; + bool m_trace; + }; + + /** + * Returns the complete list of error messages, including those from + * nested errors. + */ + virtual std::vector messages() const + { + return compile_messages(false); + } + + /** + * Like error::messages(), but includes debugging traceback. + * + * @note + * Traceback is only available if the Subversion libraries were + * compiled with tracing enabled. + */ + virtual std::vector traced_messages() const + { + return compile_messages(true); + } + +protected: + error(detail::error_ptr err); + const char* const m_message; + std::vector compile_messages(bool show_traces) const; +}; + +/** + * Thrown instead of Error when the error chain contains a + * @c SVN_ERR_CANCELLED error code. + */ +class cancelled : public error +{ +public: + virtual ~cancelled() {} + +protected: + cancelled(detail::error_ptr err) + : error(err) + {} +}; + +/** + * User code should throw this exception from callbacks to + * cancel an operation. + */ +class stop_iteration : public std::exception +{ +public: + stop_iteration() {} + virtual ~stop_iteration() {} + virtual const char* what() const noexcept override; +}; + +} // namespace svnxx +} // namespace subversion +} // namespace apache + +/** + * @} + */ +#endif // SVNXX_EXCEPTION_HPP diff --git a/subversion/bindings/cxx/include/svnxx/init.hpp b/subversion/bindings/cxx/include/svnxx/init.hpp new file mode 100644 index 0000000..eb2c64c --- /dev/null +++ b/subversion/bindings/cxx/include/svnxx/init.hpp @@ -0,0 +1,60 @@ +/** + * @file svnxx/init.hpp + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_INIT_HPP +#define SVNXX_INIT_HPP + +#include + +namespace apache { +namespace subversion { +namespace svnxx { + +namespace detail { +// Forward declaration of the private API context. +class global_state; +} // namespace detail + +/** + * @brief SVN++ initialization. + * + * The @c init class takes care of library initialization and + * teardown and maintains shared (global) internal state. You must + * create an @c init object before you can use the SVN++ API. It is + * safe to create create any number of these objects. + */ +class init : private std::shared_ptr +{ + using state = std::shared_ptr; + +public: + init(); + ~init() noexcept; +}; + +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_INIT_HPP diff --git a/subversion/bindings/cxx/include/svnxx/revision.hpp b/subversion/bindings/cxx/include/svnxx/revision.hpp new file mode 100644 index 0000000..a4032a9 --- /dev/null +++ b/subversion/bindings/cxx/include/svnxx/revision.hpp @@ -0,0 +1,386 @@ +/** + * @file svnxx/revision.hpp + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_REVISION_HPP +#define SVNXX_REVISION_HPP + +#include "svn_opt_impl.h" +#include "svn_types_impl.h" + +#include +#include +#include + +#include "tristate.hpp" + +namespace apache { +namespace subversion { +namespace svnxx { + +/** + * @brief A revision, see @ref svn_opt_revision_t. + * + * The @c revision can represent a revision number, a point in time + * in the repository or a property of the working copy or repository + * node (see revision::kind). + */ +class revision +{ +public: + /** + * @brief Revision number type. + */ + enum class number : svn_revnum_t + { + invalid = SVN_INVALID_REVNUM, ///< Invalid revision number. + }; + + /** + * @brief Revision by date/time uses the system clock. + */ + template + using time = std::chrono::time_point; + + /** + * @brief The resolution of the stored date/time. + */ + using usec = std::chrono::microseconds; + + /** + * @brief Revision kind discriminator (see @ref svn_opt_revision_kind). + */ + // NOTE: Keep these values identical to those in svn_opt_revision_kind! + enum class kind : std::int8_t + { + unspecified = svn_opt_revision_unspecified, + number = svn_opt_revision_number, + date = svn_opt_revision_date, + committed = svn_opt_revision_committed, + previous = svn_opt_revision_previous, + base = svn_opt_revision_base, + working = svn_opt_revision_working, + head = svn_opt_revision_head, + }; + + /** + * @brief Default constructor. + * @post get_kind() == kind::unspecified. + */ + revision() noexcept + : tag(kind::unspecified) + {} + + /** + * @brief Construct a revision of the given kind. + * @pre The @a revkind argument may be any @c kind value @b except + * kind::number or kind::date, which require additional + * parameters and therefore have their own constructors. + * @post get_kind() == @a revkind. + * @throw std::invalid_argument if the @a revkind value + * precondition is not met. + */ + explicit revision(kind revkind) + : tag(revkind) + { + if (revkind == kind::number || revkind == kind::date) + throw std::invalid_argument("invalid svn::revision::kind"); + } + + /** + * @brief Construct a numbered revision. + * @post get_kind() == kind::number. + */ + explicit revision(number revnum_) noexcept + : tag(kind::number), + revnum(revnum_) + {} + + /** + * @brief Construct a dated revision from a system clock time point. + * @post get_kind() == kind::date. + */ + template + explicit revision(time time_) noexcept + : tag(kind::date), + date(std::chrono::time_point_cast(time_)) + {} + + /** + * @brief Assignment operator. + * Uses in-place destruction/construction to maintain the immutability + * of the revision kind. + */ + revision& operator=(const revision& that) + { + this->~revision(); + new(this) revision(that); + return *this; + } + + /** + * @brief Return the revision kind. + */ + kind get_kind() const noexcept + { + return tag; + } + + /** + * @brief Return the revision number. + * @pre get_kind() == kind::number. + * @throw std::logic_error if the precondition is not met. + */ + number get_number() const + { + if (tag != kind::number) + throw std::logic_error("svn::revision kind != number"); + return revnum; + } + + /** + * @brief Return the revision date/time as a system clock time point. + * @pre get_kind() == kind::date. + * @throw std::logic_error if the precondition is not met. + */ + template + time get_date() const + { + if (tag != kind::date) + throw std::logic_error("svn::revision kind != date"); + return std::chrono::time_point_cast(date); + } + +private: + // Even if we were using C++17, we wouldn't use std::variant because we + // already maintain an explicit discriminator tag for the union. + const kind tag; // Union discriminator + union { + number revnum; // (tag == kind::number): revision number. + time date; // (tag == kind::date): microseconds from epoch. + }; +}; + +/** + * @related revision + * @brief revision::number alias for convenience. + */ +using revnum = revision::number; + +/** + * @related revision + * @brief Equality comparison. + */ +inline bool operator==(const revision& a, const revision& b) +{ + const auto kind = a.get_kind(); + if (kind != b.get_kind()) + return false; + else if (kind == revision::kind::number) + return a.get_number() == b.get_number(); + else if (kind == revision::kind::date) + return a.get_date() == b.get_date(); + else + return true; +} + +/** + * @related revision + * @brief Inequality comparison. + */ +inline bool operator!=(const revision& a, const revision& b) +{ + return !(a == b); +} + +/** + * @related revision + * @brief Ordering: less-than (operator @<). + * @returns a @c tristate result of comparing two @c revision values, + * according to the following table: + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    @<
    number
    date
    other
    number
    a.get_number() < b.get_number()
    unknown
    unknown
    date
    unknown
    a.get_date() < b.get_date()
    unknown
    other
    unknown
    unknown
    unknown
    + */ +inline tristate operator<(const revision& a, const revision& b) +{ + const auto kind = a.get_kind(); + if (kind != b.get_kind()) + return tristate::unknown(); + else if (kind == revision::kind::number) + return a.get_number() < b.get_number(); + else if (kind == revision::kind::date) + return a.get_date() < b.get_date(); + else + return tristate::unknown(); +} + +/** + * @related revision + * @brief Ordering: greater-than (operator @>). + * @returns a @c tristate result of comparing two @c revision values, + * according to the following table: + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    @>
    number
    date
    other
    number
    a.get_number() > b.get_number()
    unknown
    unknown
    date
    unknown
    a.get_date() > b.get_date()
    unknown
    other
    unknown
    unknown
    unknown
    + */ +inline tristate operator>(const revision& a, const revision& b) +{ + const auto kind = a.get_kind(); + if (kind != b.get_kind()) + return tristate::unknown(); + else if (kind == revision::kind::number) + return a.get_number() > b.get_number(); + else if (kind == revision::kind::date) + return a.get_date() > b.get_date(); + else + return tristate::unknown(); +} + +/** + * @related revision + * @brief Ordering: less-or-equal (operator @<=). + * @returns a @c tristate result of comparing two @c revision values, + * according to the following table: + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    @<=
    number
    date
    other
    number
    a.get_number() <= b.get_number()
    unknown
    unknown
    date
    unknown
    a.get_date() <= b.get_date()
    unknown
    other
    unknown
    unknown
    true† or unknown
    + * † true when a.get_kind() == b.get_kind(). + */ +inline tristate operator<=(const revision& a, const revision& b) +{ + return (a == b || !(a > b)); +} + +/** + * @related revision + * @brief Ordering: greater-or-equal (operator @>=). + * @returns a @c tristate result of comparing two @c revision values, + * according to the following table: + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    @>=
    number
    date
    other
    number
    a.get_number() >= b.get_number()
    unknown
    unknown
    date
    unknown
    a.get_date() >= b.get_date()
    unknown
    other
    unknown
    unknown
    true† or unknown
    + * † true when a.get_kind() == b.get_kind(). + */ +inline tristate operator>=(const revision& a, const revision& b) +{ + return (a == b || !(a < b)); +} + +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_REVISION_HPP diff --git a/subversion/bindings/cxx/include/svnxx/tristate.hpp b/subversion/bindings/cxx/include/svnxx/tristate.hpp new file mode 100644 index 0000000..0554e29 --- /dev/null +++ b/subversion/bindings/cxx/include/svnxx/tristate.hpp @@ -0,0 +1,501 @@ +/** + * @file svnxx/tristate.hpp + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_TRISTATE_HPP +#define SVNXX_TRISTATE_HPP + +#include "svn_types_impl.h" + +#include + +#if defined(SVNXX_USE_BOOST) || defined(DOXYGEN) +#include +#endif + +namespace apache { +namespace subversion { +namespace svnxx { + +/** + * @brief A three-state Boolean-like type. + * + * @c tristate values represent one of three states: + * @li the @e true state (equivalent to Boolean @c true); + * @li the @e false state (equivalent to Boolean @c false); + * @li the @e unknown state. + * + * @c tristate constructors, methods and operators are all + * compile-time constant expressions and can be used to initialize + * other @c constexpr values. And unlike most other types, + * comparisons and logical operations between @c tristate values + * return a @c tristate, not a @c bool. + * + * Given a @c tristate value @a t, the state it represents can be + * uniquely determined by the following coding pattern: + * @code{.cpp} + * if (t) { + * // t is true + * } + * else if (!t) { + * // t is false + * else { + * // t is unknown + * } + * @endcode + * + * @note Inspired by boost::tribool + */ +class tristate +{ + struct impl + { + void trueval() {}; + }; + using safe_bool = void (impl::*)(); + + // The default constructor creates the unkonwn state. + constexpr tristate() noexcept + : value(unknown_value) + {} + +public: + /** + * @brief Factory method for the @e unknown state. + */ + static constexpr tristate unknown() noexcept + { + return tristate(/*unknown_value*/); + } + + /** + * @brief Constructor for the @e true and @e false states. + */ + constexpr tristate(bool initial_value) noexcept + : value(initial_value ? true_value : false_value) + {} + + /** + * @brief Safe conversion to @c bool. + * @returns a @e true-like value only when this @c tristate is the + * @e true state. + */ + constexpr operator safe_bool() const noexcept + { + return value == true_value ? &impl::trueval : 0; + } + + /** + * @brief Logical negation. + * @returns the logical negation of a @c tristate, according to + * the following table: + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    !
    false
    true
    true
    false
    unknown
    unknown
    + */ + constexpr tristate operator!() const noexcept + { + return (value == false_value ? tristate(true) + : (value == true_value ? tristate(false) + : tristate::unknown())); + } + +private: + // NOTE: Keep these values identical to those in svn_tristate_t! + enum : std::uint8_t { + false_value = svn_tristate_false, + true_value = svn_tristate_true, + unknown_value = svn_tristate_unknown + } value; + +#if defined(SVNXX_USE_BOOST) || defined(DOXYGEN) +public: + /** + * @brief Conversion from boost::tribool. + * @returns a @c tribool value equivalent to the @a t. + * @note Avalible only if @c SVNXX_USE_BOOST is defined. + */ + constexpr tristate(boost::tribool t) noexcept + : value(boost::indeterminate(t) ? unknown_value + : (t ? true_value : false_value)) + {} + + /** + * @brief Conversion to boost::tribool. + * @returns a boost::tribool value equivalent to the @c + * tristate value. + * @note Avalible only if @c SVNXX_USE_BOOST is defined. + */ + constexpr operator boost::tribool() const noexcept + { + return (value == true_value ? boost::tribool(true) + : (value == false_value ? boost::tribool(false) + : boost::tribool(boost::indeterminate))); + } +#endif +}; + +/** + * @related tristate + * @brief Test for the @e unknown @c tristate state. + * @returns @c true only if @a t is the @e unknown state. + */ +constexpr inline bool unknown(tristate t) noexcept +{ + return bool(t) == bool(!t); +} + +/** + * @related tristate + * @brief Logical conjunction. + * @returns the result of a logical @c AND of two @c tristate + * values, according to the following table: + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    &&
    false
    true
    unknown
    false
    false
    false
    false
    true
    false
    true
    unknown
    unknown
    false
    unknown
    unknown
    + */ +constexpr inline tristate operator&&(tristate t, tristate u) noexcept +{ + return (bool(!t) || bool(!u) ? tristate(false) + : (bool(t) && bool(u) ? tristate(true) + : tristate::unknown())); +} + +/** + * @related tristate + * @overload + */ +constexpr inline tristate operator&&(tristate t, bool b) noexcept +{ + return b ? t : tristate(false); +} + +/** + * @related tristate + * @overload + */ +constexpr inline tristate operator&&(bool b, tristate t) noexcept +{ + return b ? t : tristate(false); +} + +#if defined(SVNXX_USE_BOOST) || defined(DOXYGEN) +/** + * @related tristate + * @overload + * @note Avalible only if @c SVNXX_USE_BOOST is defined. + */ +constexpr inline tristate operator&&(tristate t, boost::tribool b) noexcept +{ + return t && tristate(b); +} + +/** + * @related tristate + * @overload + * @note Avalible only if @c SVNXX_USE_BOOST is defined. + */ +constexpr inline tristate operator&&(boost::tribool b, tristate t) noexcept +{ + return tristate(b) && t; +} +#endif + +/** + * @related tristate + * @brief Logical disjunction. + * @returns the result of a logical @c OR of two @c tristate + * values, according to the following table: + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    ||
    false
    true
    unknown
    false
    false
    true
    unknown
    true
    true
    true
    true
    unknown
    unknown
    true
    unknown
    + */ +constexpr inline tristate operator||(tristate t, tristate u) noexcept +{ + return (bool(!t) && bool(!u) ? tristate(false) + : (bool(t) || bool(u) ? tristate(true) + : tristate::unknown())); +} + +/** + * @related tristate + * @overload + */ +constexpr inline tristate operator||(tristate t, bool b) noexcept +{ + return b ? tristate(true) : t; +} + +/** + * @related tristate + * @overload + */ +constexpr inline tristate operator||(bool b, tristate t) noexcept +{ + return b ? tristate(true) : t; +} + +#if defined(SVNXX_USE_BOOST) || defined(DOXYGEN) +/** + * @related tristate + * @overload + * @note Avalible only if @c SVNXX_USE_BOOST is defined. + */ +constexpr inline tristate operator||(tristate t, boost::tribool b) noexcept +{ + return t || tristate(b); +} + +/** + * @related tristate + * @overload + * @note Avalible only if @c SVNXX_USE_BOOST is defined. + */ +constexpr inline tristate operator||(boost::tribool b, tristate t) noexcept +{ + return tristate(b) || t; +} +#endif + +/** + * @related tristate + * @brief Equality comparison. + * @returns the result of comparing two @c tristate values for + * equality, according to the following table: + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    ==
    false
    true
    unknown
    false
    true
    false
    unknown
    true
    false
    true
    unknown
    unknown
    unknown
    unknown
    unknown
    + */ +constexpr inline tristate operator==(tristate t, tristate u) noexcept +{ + return (unknown(t) || unknown(u) ? tristate::unknown() + : ((t && u) || (!t && !u))); +} + +/** + * @related tristate + * @overload + */ +constexpr inline tristate operator==(tristate t, bool b) noexcept +{ + return t == tristate(b); +} + +/** + * @related tristate + * @overload + */ +constexpr inline tristate operator==(bool b, tristate t) noexcept +{ + return tristate(b) == t; +} + +#if defined(SVNXX_USE_BOOST) || defined(DOXYGEN) +/** + * @related tristate + * @overload + * @note Avalible only if @c SVNXX_USE_BOOST is defined. + */ +constexpr inline tristate operator==(tristate t, boost::tribool b) noexcept +{ + return t == tristate(b); +} + +/** + * @related tristate + * @overload + * @note Avalible only if @c SVNXX_USE_BOOST is defined. + */ +constexpr inline tristate operator==(boost::tribool b, tristate t) noexcept +{ + return tristate(b) == t; +} +#endif + +/** + * @related tristate + * @brief Inquality comparison. + * @returns the result of comparing two @c tristate values for + * inequality, according to the following table: + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    !=
    false
    true
    unknown
    false
    false
    true
    unknown
    true
    true
    false
    unknown
    unknown
    unknown
    unknown
    unknown
    + */ +constexpr inline tristate operator!=(tristate t, tristate u) noexcept +{ + return (unknown(t) || unknown(u) ? tristate::unknown() + : !((t && u) || (!t && !u))); +} + +/** + * @related tristate + * @overload + */ +constexpr inline tristate operator!=(tristate t, bool b) noexcept +{ + return t != tristate(b); +} + +/** + * @related tristate + * @overload + */ +constexpr inline tristate operator!=(bool b, tristate t) noexcept +{ + return tristate(b) != t; +} + +#if defined(SVNXX_USE_BOOST) || defined(DOXYGEN) +/** + * @related tristate + * @overload + * @note Avalible only if @c SVNXX_USE_BOOST is defined. + */ +constexpr inline tristate operator!=(tristate t, boost::tribool b) noexcept +{ + return t != tristate(b); +} + +/** + * @related tristate + * @overload + * @note Avalible only if @c SVNXX_USE_BOOST is defined. + */ +constexpr inline tristate operator!=(boost::tribool b, tristate t) noexcept +{ + return tristate(b) != t; +} +#endif + +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_TRISTATE_HPP diff --git a/subversion/bindings/cxx/src/aprwrap.hpp b/subversion/bindings/cxx/src/aprwrap.hpp new file mode 100644 index 0000000..da6a359 --- /dev/null +++ b/subversion/bindings/cxx/src/aprwrap.hpp @@ -0,0 +1,35 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_PRIVATE_APRWRAP_H +#define SVNXX_PRIVATE_APRWRAP_H + +// Expose the whole APR wrapper API and alias the namespace +#include "aprwrap/pool.hpp" +#include "aprwrap/hash.hpp" +#include "aprwrap/array.hpp" + +namespace apr = ::apache::subversion::svnxx::apr; +namespace APR = ::apache::subversion::svnxx::apr; + +#endif // SVNXX_PRIVATE_APRWRAP_H diff --git a/subversion/bindings/cxx/src/aprwrap/array.hpp b/subversion/bindings/cxx/src/aprwrap/array.hpp new file mode 100644 index 0000000..4969e19 --- /dev/null +++ b/subversion/bindings/cxx/src/aprwrap/array.hpp @@ -0,0 +1,208 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_PRIVATE_APRWRAP_ARRAY_H +#define SVNXX_PRIVATE_APRWRAP_ARRAY_H + +#include + +#include "pool.hpp" + +#include + +namespace apache { +namespace subversion { +namespace svnxx { +namespace apr { + +/** + * @brief Proxy for an APR array. + * + * This class does not own the array. The array's lifetime is tied to + * its pool. The caller is responsible for making sure that the + * array's lifetime is longer than this proxy object's. + */ +template class array +{ +public: + using value_type = T; + using size_type = int; + using iterator = value_type*; + using const_iterator = const value_type*; + + /** + * Create and proxy a new APR array allocated from @a result_pool. + * Reserve space for @a nelts array elements. + */ + explicit array(const pool& result_pool, size_type nelts = 0) + : proxied(apr_array_make(result_pool.get(), nelts, sizeof(value_type))) + {} + + /** + * Create a new proxy for the APR array @a array_. + */ + explicit array(apr_array_header_t* array_) + : proxied(array_) + { + if (proxied->elt_size != sizeof(value_type)) + throw std::invalid_argument("apr::array element size mismatch"); + } + + /** + * @return The wrapped APR array. + */ + apr_array_header_t* get_array() const noexcept + { + return proxied; + } + + /** + * @return the number of elements in the wrapped APR array. + */ + size_type size() const noexcept + { + return proxied->nelts; + } + + /** + * @return the reserved space in the wrapped APR array. + */ + size_type capacity() const noexcept + { + return proxied->nalloc; + } + + /** + * @return An immutable reference to the array element at @a index. + */ + const value_type& operator[](size_type index) const noexcept + { + return APR_ARRAY_IDX(proxied, index, value_type); + } + + /** + * @return An immutable reference to the array element at @a index. + * Like operator[] but perfoms a range check on the index. + */ + const value_type& at(size_type index) const + { + if (index < 0 || index >= size()) + throw std::out_of_range("apr::array index out of range"); + return (*this)[index]; + } + + /** + * @return A mutable reference to the array element at @a index. + */ + value_type& operator[](size_type index) noexcept + { + return APR_ARRAY_IDX(proxied, index, value_type); + } + + /** + * @return A mutable reference to the array element at @a index. + * Like operator[] but perfoms a range check on the index. + */ + value_type& at(size_type index) + { + if (index < 0 || index >= size()) + throw std::out_of_range("apr::array index out of range"); + return (*this)[index]; + } + + /** + * Push @a value onto the end of the APR array. + */ + void push(const value_type& value) + { + APR_ARRAY_PUSH(proxied, value_type) = value; + } + + /** + * Pop a value from the end of the array. + * @return A pointer to the value that was removed, or @c NULL if + * the array was empty. + */ + value_type* pop() noexcept + { + return static_cast(apr_array_pop(proxied)); + } + + /** + * @brief Return an interator to the beginning of the array. + */ + iterator begin() noexcept + { + return &APR_ARRAY_IDX(proxied, 0, value_type); + } + + /** + * @brief Return a constant interator to the beginning of the array. + */ + const_iterator begin() const noexcept + { + return &APR_ARRAY_IDX(proxied, 0, const value_type); + } + + /** + * @brief Return a constant interator to the beginning of the array. + */ + const_iterator cbegin() const noexcept + { + return begin(); + } + + /** + * @brief Return an interator to the end of the array. + */ + iterator end() noexcept + { + return &APR_ARRAY_IDX(proxied, size(), value_type); + } + + /** + * @brief Return a constant interator to the end of the array. + */ + const_iterator end() const noexcept + { + return &APR_ARRAY_IDX(proxied, size(), const value_type); + } + + /** + * @brief Return a constant interator to the end of the array. + */ + const_iterator cend() const noexcept + { + return end(); + } + +private: + apr_array_header_t* const proxied; ///< The wrapperd APR array. +}; + +} // namespace apr +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_PRIVATE_APRWRAP_HASH_H diff --git a/subversion/bindings/cxx/src/aprwrap/hash.hpp b/subversion/bindings/cxx/src/aprwrap/hash.hpp new file mode 100644 index 0000000..8272803 --- /dev/null +++ b/subversion/bindings/cxx/src/aprwrap/hash.hpp @@ -0,0 +1,373 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_PRIVATE_APRWRAP_HASH_H +#define SVNXX_PRIVATE_APRWRAP_HASH_H + +#include +#include "pool.hpp" + +namespace apache { +namespace subversion { +namespace svnxx { +namespace apr { + +// Template forward declaration +template +class Hash; + +/** + * Proxy for an APR hash table. + * This is a template specialization for the default hash type. + */ +template<> +class Hash +{ +public: + struct Iteration; + + /** + * Iterate over all the key-value pairs in the hash table, invoking + * @a callback for each pair. + * Uses @a scratch_pool for temporary allocations. + * + * FIXME: should use std::function instead. + */ + void iterate(Iteration& callback, const pool& scratch_pool); + +public: + /** + * Proxy for a key in an APR hash table. + * This is a template specialization for the default hash key type. + */ + class Key + { + public: + typedef const void* key_type; + typedef apr_ssize_t size_type; + + /** + * Public constructor. Uses the template @a Size parameter. + */ + Key(key_type key) throw() + : m_key(key), m_size(APR_HASH_KEY_STRING) + {} + + /** + * Get the value of the key. + */ + key_type get() const throw() { return m_key; } + + /** + * Get the size of the key. + */ + size_type size() const throw() { return m_size; } + + protected: + /** + * Constructor used by the generic template, specializations and + * hash table wrapper. Does not make assumptions about the key size. + */ + Key(key_type key, size_type size) throw() + : m_key(key), m_size(size) + {} + + /** + * The hash table wrapper must be able to call the protected constructor. + */ + friend void Hash::iterate(Hash::Iteration&, const pool&); + + private: + const key_type m_key; ///< Immutable reference to the key + const size_type m_size; ///< The size of the key + }; + +public: + typedef Key::key_type key_type; + typedef void* value_type; + typedef unsigned int size_type; + + /** + * Create and proxy a new APR hash table in @a result_pool. + */ + explicit Hash(const pool& result_pool) throw() + : m_hash(apr_hash_make(result_pool.get())) + {} + + /** + * Create and proxy a new APR hash table in @a result_pool, using @a + * hash_func as the hash function. + */ + explicit Hash(const pool& result_pool, apr_hashfunc_t hash_func) throw() + : m_hash(apr_hash_make_custom(result_pool.get(), hash_func)) + {} + + /** + * Create a proxy for the APR hash table @a hash. + */ + explicit Hash(apr_hash_t* hash) + : m_hash(hash) + {} + + /** + * Return the wrapped APR hash table. + */ + apr_hash_t* hash() const throw() + { + return m_hash; + } + + /** + * Return the number of key-value pairs in the wrapped hash table. + */ + size_type size() const throw() + { + return apr_hash_count(m_hash); + } + + /** + * Set @a key = @a value in the wrapped hash table. + */ + void set(const Key& key, value_type value) throw() + { + apr_hash_set(m_hash, key.get(), key.size(), value); + } + + /** + * Retrieve the value associated with @a key. + */ + value_type get(const Key& key) const throw() + { + return apr_hash_get(m_hash, key.get(), key.size()); + } + + /** + * Delete the entry for @a key. + */ + void del(const Key& key) throw() + { + apr_hash_set(m_hash, key.get(), key.size(), NULL); + } + + /** + * Abstract base class for iteration callback functors. + */ + struct Iteration + { + /** + * Called by Hash::iterate for every key-value pair in the hash table. + * @return @c false to terminate the iteration, @c true otherwise. + */ + virtual bool operator() (const Key& key, value_type value) = 0; + }; + +protected: + typedef const void* const_value_type; + + /** + * Set @a key = @a value in the wrapped hash table. Overloaded for + * deroved template instantiations with constant values; for + * example, Hash. + */ + void set(const Key& key, const_value_type const_value) throw() + { + set(key, const_cast(const_value)); + } + +private: + apr_hash_t* const m_hash; ///< The wrapped APR hash table. +}; + + +/** + * Proxy for an APR hash table: the template. + * + * This class does not own the hash table. The hash table's lifetime + * is tied to its pool. The caller is responsible for making sure that + * the hash table's lifetime is longer than this proxy object's. + */ +template +class Hash : private Hash +{ + typedef Hash inherited; + +public: + /** + * Proxy for a key in an APR hash table. + * + * This class does not own the key; it is the caller's responsibility + * to make sure that the key's lifetime is longer than the proxy + * object's. + */ + class Key : private inherited::Key + { + typedef Hash::Key inherited; + + /** + * The wrapper must be able to call the private constructor and + * convert references to the base class. + */ + friend class Hash; + + public: + typedef const K* key_type; + typedef inherited::size_type size_type; + + Key(key_type key) throw() + : inherited(key, KeySize) + {} + + /** + * Get the value of the key. + */ + key_type get() const throw() + { + return static_cast(inherited::get()); + } + + /** + * Get the size of the key. + */ + size_type size() const throw() + { + return inherited::size(); + } + + private: + /** + * Conversion constructor used by the derived iteration class. + */ + explicit Key(const inherited& that) throw() + : inherited(that) + {} + }; + +public: + typedef typename Key::key_type key_type; + typedef V* value_type; + + /** + * Create and proxy a new APR hash table allocated from @a result_pool. + */ + explicit Hash(const pool& result_pool) throw() + : inherited(result_pool) + {} + + /** + * Create and proxy a new APR hash table allocated from @a result_pool, + * using @a hash_func as the hash function. + */ + explicit Hash(const pool& result_pool, apr_hashfunc_t hash_func) throw() + : inherited(result_pool, hash_func) + {} + + /** + * Create a proxy for the APR hash table @a hash. + */ + explicit Hash(apr_hash_t* hash) + : inherited(hash) + {} + + /** + * @return The wrapped APR hash table. + */ + apr_hash_t* hash() const throw() + { + return inherited::hash(); + } + + /** + * Return the number of key-value pairs in the wrapped hash table. + */ + size_type size() const throw() + { + return inherited::size(); + } + + /** + * Set @a key = @a value in the wrapped hash table. + */ + void set(const Key& key, value_type value) throw() + { + inherited::set(inherited::Key(key), value); + } + + /** + * Retrieve the value associated with @a key. + */ + value_type get(const Key& key) const throw() + { + return static_cast(inherited::get(inherited::Key(key))); + } + + /** + * Delete the entry for @a key. + */ + void del(const Key& key) throw() + { + inherited::del(inherited::Key(key)); + } + + /** + * Abstract base class for iteration callback functors. + */ + struct Iteration : protected inherited::Iteration + { + /** + * Called by Hash::iterate for every key-value pair in the hash table. + * @return @c false to terminate the iteration, @c true otherwise. + */ + virtual bool operator() (const Key& key, value_type value) = 0; + + private: + friend void Hash::iterate(Iteration& callback, const pool& scratch_pool); + + /** + * Implementation of the derived virtual operator(). + * Adapts the callback to the instantiated types. + */ + virtual bool operator() (const inherited::Key& raw_key, + inherited::value_type raw_value) + { + return (*this)(Key(raw_key), static_cast(raw_value)); + } + }; + + /** + * Iterate over all the key-value pairs in the hash table, invoking + * @a callback for each pair. + * Uses @a scratch_pool for temporary allocations. + */ + void iterate(Iteration& callback, const pool& scratch_pool) + { + inherited::iterate(callback, scratch_pool); + } +}; + + +} // namespace apr +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_PRIVATE_APRWRAP_HASH_H diff --git a/subversion/bindings/cxx/src/aprwrap/impl.cpp b/subversion/bindings/cxx/src/aprwrap/impl.cpp new file mode 100644 index 0000000..b423dd4 --- /dev/null +++ b/subversion/bindings/cxx/src/aprwrap/impl.cpp @@ -0,0 +1,67 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#include "pool.hpp" +#include "hash.hpp" + +#include "../private/init_private.hpp" + +namespace apache { +namespace subversion { +namespace svnxx { +namespace apr { + +// +// Pool implementation +// + +apr_pool_t* pool::get_root_pool() +{ + auto state = detail::global_state::get(); + return state->get_root_pool(); +} + +// +// Hash implementation +// + +void Hash::iterate(Hash::Iteration& callback, + const pool& scratch_pool) +{ + for (apr_hash_index_t* hi = apr_hash_first(scratch_pool.get(), m_hash); + hi; hi = apr_hash_next(hi)) + { + key_type key; + value_type val; + Key::size_type klen; + + apr_hash_this(hi, &key, &klen, &val); + if (!callback(Key(key, klen), val)) + break; + } +} + +} // namespace apr +} // namespace svnxx +} // namespace subversion +} // namespace apache diff --git a/subversion/bindings/cxx/src/aprwrap/pool.hpp b/subversion/bindings/cxx/src/aprwrap/pool.hpp new file mode 100644 index 0000000..adb6c03 --- /dev/null +++ b/subversion/bindings/cxx/src/aprwrap/pool.hpp @@ -0,0 +1,218 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_PRIVATE_APRWRAP_POOL_H +#define SVNXX_PRIVATE_APRWRAP_POOL_H + +#include +#include +#include + +#include "svnxx/exception.hpp" +#include "svnxx/detail/noncopyable.hpp" + +#include "../private/init_private.hpp" + +#include "svn_pools.h" + +namespace apache { +namespace subversion { +namespace svnxx { +namespace apr { + +struct delete_pool +{ + void operator() (apr_pool_t* pool) + { + svn_pool_destroy(pool); + } +}; + +using pool_ptr = std::unique_ptr; + +/** + * Encapsulates an APR pool. + */ +class pool : pool_ptr +{ + friend class iteration; + struct iteration_proxy + { + pool& proxied_pool; + }; + + static apr_pool_t* get_root_pool(); + + struct allocation_size_overflowed final : public allocation_failed + { + allocation_size_overflowed() noexcept + : allocation_failed("svn++ allocation size overflowed") + {} + }; + + using allocator = std::function; + template + T* safe_alloc(std::size_t count, allocator allocate) + { + if (count > APR_SIZE_MAX / sizeof(T)) + throw allocation_size_overflowed(); + return static_cast(allocate(get(), count * sizeof(T))); + } + +public: + /** + * Create a pool as a child of the application's root pool. + */ + pool() + : pool_ptr(svn_pool_create(get_root_pool())) + {} + + /** + * Return a pool pointer that can be used by the C APIs. + */ + apr_pool_t* get() const noexcept + { + return pool_ptr::get(); + } + + /** + * Create a pool as a child of @a parent. + */ + explicit pool(const pool* parent) + : pool_ptr(svn_pool_create(parent->get())) + {} + + /** + * Create a pool as a child of the global pool in @a state. + */ + explicit pool(const detail::global_state::ptr& state) + : pool_ptr(svn_pool_create(state->get_root_pool())) + {} + + /** + * Clear the pool. + */ + void clear() + { + apr_pool_clear(get()); + } + + /** + * Allocate space for @a count elements of type @a T from the pool. + * The contents of the allocated buffer will contain unspecified data. + */ + template + T* alloc(std::size_t count) + { + // apr_palloc may be a macro, so wrap it in a closure. + static const auto palloc = [](apr_pool_t* p, apr_size_t size) + { + return apr_palloc(p, size); + }; + return safe_alloc(count, palloc); + } + + /** + * Allocate space for @a count elements of type @a T from the pool. + * The contents of the allocated buffer will be initialized to zero. + */ + template + T* allocz(std::size_t count) + { + // apr_pcalloc may be a macro, so wrap it in a closure. + static const auto pcalloc = [](apr_pool_t* p, apr_size_t size) + { + return apr_pcalloc(p, size); + }; + return safe_alloc(count, pcalloc); + } + + operator iteration_proxy() noexcept + { + return iteration_proxy{*this}; + } + +public: + /** + * Pool proxy used for iteration scratch pools. + * + * Construct this object inside a loop body in order to clear the + * proxied pool on every iteration. + */ + class iteration : detail::noncopyable + { + public: + /** + * The constructor clears the proxied pool. + */ + explicit iteration(pool::iteration_proxy iterbase) + : proxied(iterbase.proxied_pool) + { + proxied.clear(); + } + + /** + * Returns a reference to the proxied pool. + */ + apr::pool& get_pool() const noexcept + { + return proxied; + } + + /** + * proxy method for pool::get() + */ + apr_pool_t* get() const noexcept + { + return proxied.get(); + } + + /** + * Proxy method for pool::alloc() + */ + template + T* alloc(std::size_t count) + { + return proxied.alloc(count); + } + + /** + * Proxy method for pool::allocz() + */ + template + T* allocz(std::size_t count) + { + return proxied.allocz(count); + } + + private: + apr::pool& proxied; + }; +}; + +} // namespace apr +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_PRIVATE_APRWRAP_POOL_H diff --git a/subversion/bindings/cxx/src/client_context.cpp b/subversion/bindings/cxx/src/client_context.cpp new file mode 100644 index 0000000..2c2ef97 --- /dev/null +++ b/subversion/bindings/cxx/src/client_context.cpp @@ -0,0 +1,60 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#include "private.hpp" + +namespace apache { +namespace subversion { +namespace svnxx { +namespace client { + +// +// class detail::context +// + +namespace detail { + +svn_client_ctx_t* context::create_ctx(const apr::pool& pool) +{ + svn_client_ctx_t* ctx; + impl::checked_call(svn_client_create_context2(&ctx, nullptr, pool.get())); + return ctx; +} + +} // namespace detail + +// +// class context +// + +context::context() + : inherited(new detail::context) +{} + +context::~context() +{} + +} // namespace client +} // namespace svnxx +} // namespace subversion +} // namespace apache diff --git a/subversion/bindings/cxx/src/client_status.cpp b/subversion/bindings/cxx/src/client_status.cpp new file mode 100644 index 0000000..7172941 --- /dev/null +++ b/subversion/bindings/cxx/src/client_status.cpp @@ -0,0 +1,143 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#include "svnxx/client/status.hpp" + +#include "aprwrap.hpp" +#include "private.hpp" + +#include "svn_client.h" + +namespace apache { +namespace subversion { +namespace svnxx { + +namespace impl { +namespace { +using status_notification = client::status_notification; +using status_callback = client::status_callback; +using status_flags = client::status_flags; + +struct status_func +{ + status_callback& proxy; + static svn_error_t* callback(void* baton, + const char *path, + const svn_client_status_t* /*status*/, + apr_pool_t* /*scratch_pool*/) + { + const auto self = static_cast(baton); + if (self->proxy) + { + try + { + self->proxy(path, status_notification{}); + } + catch (const stop_iteration&) + { + return impl::iteration_stopped(); + } + } + return SVN_NO_ERROR; + } +}; +} // anonymous namespace + +revision::number +status(svn_client_ctx_t* ctx, const char* path, + const svn_opt_revision_t* rev, depth depth_, status_flags flags, + status_callback callback_, apr_pool_t* scratch_pool) +{ + status_func callback{callback_}; + svn_revnum_t result; + + impl::checked_call( + svn_client_status6(&result, ctx, path, rev, + impl::convert(depth_), + bool(flags & status_flags::get_all), + bool(flags & status_flags::check_out_of_date), + bool(flags & status_flags::check_working_copy), + bool(flags & status_flags::no_ignore), + bool(flags & status_flags::ignore_externals), + bool(flags & status_flags::depth_as_sticky), + nullptr, // TODO: changelists, + status_func::callback, &callback, + scratch_pool)); + return revision::number(result); +} + +} // namespace impl +namespace client { + +revision::number +status(context& ctx_, const char* path, + const revision& rev_, depth depth_, status_flags flags, + status_callback callback) +{ + const auto ctx = impl::unwrap(ctx_); + const auto rev = impl::convert(rev_); + const auto scratch_pool = apr::pool(&ctx->get_pool()); + return impl::status(ctx->get_ctx(), path, &rev, depth_, flags, + callback, scratch_pool.get()); +} + +namespace async { + +svnxx::detail::future +status(std::launch policy, context& ctx_, const char* path, + const revision& rev_, depth depth_, status_flags flags, + status_callback callback) +{ + detail::weak_context_ptr weak_ctx = impl::unwrap(ctx_); + return impl::future( + std::async( + policy, + [weak_ctx, path, rev_, depth_, flags, callback] + { + auto ctx = weak_ctx.lock(); + if (!ctx) + return revision::number::invalid; + + const auto rev = impl::convert(rev_); + const auto scratch_pool = apr::pool(&ctx->get_pool()); + + return impl::status(ctx->get_ctx(), path, &rev, depth_, flags, + callback, scratch_pool.get()); + }), + impl::make_future_result()); +} + +svnxx::detail::future +status(context& ctx_, const char* path, + const revision& rev_, depth depth_, status_flags flags, + status_callback callback) +{ + constexpr std::launch policy = std::launch::async | std::launch::deferred; + return status(policy, ctx_, path, rev_, depth_, flags, callback); +} + +} // namespace async +} // namespace client +} // namespace svnxx +} // namespace subversion +} // namespace apache diff --git a/subversion/bindings/cxx/src/debug.cpp b/subversion/bindings/cxx/src/debug.cpp new file mode 100644 index 0000000..4e7c340 --- /dev/null +++ b/subversion/bindings/cxx/src/debug.cpp @@ -0,0 +1,37 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#include "private/debug_private.hpp" + +namespace apache { +namespace subversion { +namespace svnxx { +namespace impl { + +const char root_pool_tag[] = "svn++ root pool"; +const char root_pool_key[] = "SVN++ 30F4B67A-CAB4-1337-F00D-DEADBEEFA78F"; + +} // namespace impl +} // namespace svnxx +} // namespace subversion +} // namespace apache diff --git a/subversion/bindings/cxx/src/depth.cpp b/subversion/bindings/cxx/src/depth.cpp new file mode 100644 index 0000000..ca4db5e --- /dev/null +++ b/subversion/bindings/cxx/src/depth.cpp @@ -0,0 +1,55 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#include "private/depth_private.hpp" +#include "private/strings_private.hpp" + +#include "svn_types.h" + +namespace apache { +namespace subversion { +namespace svnxx { + +std::string to_string(depth d) +{ + return std::string(svn_depth_to_word(impl::convert(d))); +} + +std::wstring to_wstring(depth d) +{ + return impl::convert(svn_depth_to_word(impl::convert(d))); +} + +std::u16string to_u16string(depth d) +{ + return impl::convert(svn_depth_to_word(impl::convert(d))); +} + +std::u32string to_u32string(depth d) +{ + return impl::convert(svn_depth_to_word(impl::convert(d))); +} + +} // namespace svnxx +} // namespace subversion +} // namespace apache diff --git a/subversion/bindings/cxx/src/exception.cpp b/subversion/bindings/cxx/src/exception.cpp new file mode 100644 index 0000000..90ff198 --- /dev/null +++ b/subversion/bindings/cxx/src/exception.cpp @@ -0,0 +1,251 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#include +#include +#include + +#include "svnxx/exception.hpp" +#include "private.hpp" +#include "aprwrap.hpp" + +#include "svn_error.h" +#include "svn_utf.h" +#include "private/svn_error_private.h" + +namespace apache { +namespace subversion { +namespace svnxx { + +// +// checked_call +// + +namespace impl { + +void checked_call(svn_error_t* const err) +{ + using error_ptr = detail::error_ptr; + + if (!err) + return; + + struct error_builder final : public error + { + explicit error_builder(error_ptr ptr) + : error(ptr) + {} + }; + + struct cancelled_builder final : public cancelled + { + explicit cancelled_builder(error_ptr ptr) + : cancelled(ptr) + {} + }; + + static const auto error_deleter = + [](svn_error_t* err_) noexcept + { + svn_error_clear(err_); + }; + + for (auto next = err; next; next = next->child) + { + if (next->apr_err == SVN_ERR_CANCELLED + || next->apr_err == SVN_ERR_ITER_BREAK) + throw cancelled_builder(error_ptr(err, error_deleter)); + } + throw error_builder(error_ptr(err, error_deleter)); +} + +} // namespace impl + +// +// Class error +// + +namespace { +inline const char* best_message(const detail::error_ptr& err) +{ + if (!err) + return ""; + + const apr_size_t bufsize = 512; + char* buf = static_cast(apr_palloc(err->pool, bufsize)); + return svn_err_best_message(err.get(), buf, bufsize); +} +} // anonymous namspace + +error::error(detail::error_ptr err) + : detail::error_ptr(err), + m_message(best_message(err)) +{} + +const char* error::what() const noexcept +{ + return m_message; +} + +int error::code() const noexcept +{ + const auto err = detail::error_ptr::get(); + if (!err) + return 0; + + return static_cast(err->apr_err); +} + +const char* error::name() const noexcept +{ + const auto err = detail::error_ptr::get(); + return svn_error_symbolic_name(!err ? 0 : err->apr_err); +} + +namespace { +const char* get_generic_message(apr_status_t error_code, + apr::pool& result_pool) +{ + const std::size_t errorbuf_size = 512; + const auto errorbuf = result_pool.alloc(errorbuf_size); + + // Wondering about what's in UTF-8? Yes, do keep on wondering ... + return svn_strerror(error_code, errorbuf, errorbuf_size); +} + +// +// Class error::message +// + +void handle_one_error(std::vector& messages, + bool show_traces, + const svn_error_t* err, + apr::pool& scratch_pool) +{ + struct message_builder final : public error::message + { + message_builder(apr_status_t errval, const char* errname, + const std::string& message_, bool trace) + : error::message(static_cast(errval), errname, message_, trace) + {} + }; + + const char* const symbolic_name = svn_error_symbolic_name(err->apr_err); + const bool tracing_link = svn_error__is_tracing_link(err); + + if (show_traces && err->file) + { + const char* file_utf8 = nullptr; + svn_error_t* inner_err = + svn_utf_cstring_to_utf8(&file_utf8, err->file, scratch_pool.get()); + if (inner_err) + { + svn_error_clear(inner_err); + file_utf8 = nullptr; + } + + std::ostringstream buffer; + if (file_utf8) + buffer << file_utf8 << ':' << err->line; + else + buffer << "svn:"; + + if (tracing_link) + buffer << ','; + else + { + if (symbolic_name) + buffer << ": (apr_err=" << symbolic_name << ')'; + else + buffer << ": (apr_err=" << err->apr_err << ')'; + } + messages.emplace_back(message_builder(err->apr_err, symbolic_name, + buffer.str(), true)); + } + + if (tracing_link) + return; + + const char* description = err->message; + if (!description) + description = get_generic_message(err->apr_err, scratch_pool); + messages.emplace_back(message_builder(err->apr_err, symbolic_name, + description, false)); +} +} // anonymous namespace + +std::vector error::compile_messages(bool show_traces) const +{ + // Determine the maximum size of the returned list + std::vector::size_type max_length = 0; + for (svn_error_t* err = detail::error_ptr::get(); err; err = err->child) + { + if (show_traces && err->file) + ++max_length; // We will display an error location + if (!svn_error__is_tracing_link(err)) + ++max_length; // Traces do not emit a message line + } + + std::vector messages; + messages.reserve(max_length); + + // This the set of error codes that we've printed the generic + // description for. See svn_handle_error2 for details. + std::unordered_set empties; + empties.reserve(max_length); + + apr::pool iterbase; + for (svn_error_t* err = detail::error_ptr::get(); err; err = err->child) + { + apr::pool::iteration iterpool(iterbase); + + if (!err->message) + { + // Non-specific messages are printed only once. + if (empties.count(err->apr_err)) + continue; + empties.emplace(err->apr_err); + } + handle_one_error(messages, show_traces, err, iterpool.get_pool()); + } + return messages; +} + +std::string error::message::generic_text() const +{ + apr::pool scratch_pool; + return get_generic_message(m_errno, scratch_pool); +} + +// +// Class stop_iteration +// + +const char* stop_iteration::what() const noexcept +{ + return "svn::stop_iteration"; +} + +} // namespace svnxx +} // namespace subversion +} // namespace apache diff --git a/subversion/bindings/cxx/src/future.cpp b/subversion/bindings/cxx/src/future.cpp new file mode 100644 index 0000000..0b318fb --- /dev/null +++ b/subversion/bindings/cxx/src/future.cpp @@ -0,0 +1,52 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#include "private/future_private.hpp" + +namespace apache { +namespace subversion { +namespace svnxx { +namespace detail { +namespace future_ { + +future_base::future_base() noexcept {} +future_base::~future_base() noexcept {} + +future_base::future_base(future_base&& that) noexcept + : future_base(std::move(that.unique_result)) +{} + +future_base::future_base(unique_ptr&& unique_result_) noexcept + : unique_result(std::move(unique_result_)) +{} + +shared_ptr future_base::share() noexcept +{ + return shared_ptr(unique_result.release()); +} + +} // namespace future_ +} // namespace detail +} // namespace svnxx +} // namespace subversion +} // namespace apache diff --git a/subversion/bindings/cxx/src/init.cpp b/subversion/bindings/cxx/src/init.cpp new file mode 100644 index 0000000..439dcb8 --- /dev/null +++ b/subversion/bindings/cxx/src/init.cpp @@ -0,0 +1,172 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#include + +#include "svnxx/exception.hpp" +#include "private/debug_private.hpp" +#include "private/init_private.hpp" + +#include +#include + +namespace apache { +namespace subversion { +namespace svnxx { + +init::init() + : state(detail::global_state::create()) +{ +#ifdef SVNXX_POOL_DEBUG + SVN_DBG(("svn++ created init object %pp", static_cast(this))); +#endif +} + +init::~init() noexcept +{ +#ifdef SVNXX_POOL_DEBUG + SVN_DBG(("svn++ destroyed init object %pp", static_cast(this))); +#endif +} + +namespace detail { + +namespace { +struct allocation_failed_builder final : public allocation_failed +{ + explicit allocation_failed_builder(const char* what_arg) noexcept + : allocation_failed(what_arg) + {} +}; + +int handle_failed_allocation(int) +{ + throw allocation_failed_builder("svn::allocation_failed"); +} + +#ifdef SVNXX_POOL_DEBUG +apr_status_t notify_root_pool_cleanup(void* key) +{ + if (key == impl::root_pool_key) + SVN_DBG(("svn++ destroyed root pool")); + return APR_SUCCESS; +} +#endif + +apr_pool_t* create_root_pool() +{ + // Create the root pool's allocator. + apr_allocator_t *allocator = nullptr; + auto status = apr_allocator_create(&allocator); + if (status || !allocator) + throw allocation_failed_builder("svn++ creating pool allocator"); + + // Create the root pool. + apr_pool_t* root_pool = nullptr; + status = apr_pool_create_ex(&root_pool, nullptr, + handle_failed_allocation, allocator); + if (status || !root_pool) + throw allocation_failed_builder("svn++ creating root pool"); + +#if APR_POOL_DEBUG + apr_pool_tag(root_pool, impl::root_pool_tag); +#endif + +#if APR_HAS_THREADS + // SVN++ pools are always as thread safe as APR can make them. + apr_thread_mutex_t *mutex = nullptr; + status = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, root_pool); + if (mutex && !status) + apr_allocator_mutex_set(allocator, mutex); + else + { +#ifdef SVNXX_POOL_DEBUG + SVN_DBG(("svn++ could not create allocator mutex, apr_err=%d", status)); +#endif + apr_pool_destroy(root_pool); // Don't leak the global pool. + throw allocation_failed_builder("svn++ creating allocator mutex"); + } +#endif + +#ifdef SVNXX_POOL_DEBUG + apr_pool_cleanup_register(root_pool, impl::root_pool_key, + notify_root_pool_cleanup, + apr_pool_cleanup_null); + SVN_DBG(("svn++ created root pool")); +#endif + + return root_pool; +} +} // anonymous namespace + +std::mutex global_state::guard; +global_state::weak_ptr global_state::self; + +global_state::ptr global_state::create() +{ + std::unique_lock lock(guard); + auto state = self.lock(); + if (!state) + { + // Work around the private constructor: since this struct is + // defined within a class member, the the private constructor + // is accessible and std::make_shared won't complain about it. + struct global_state_builder final : public global_state {}; + state = std::make_shared(); + self = state; + } + return state; +} + +global_state::global_state() +{ + const auto status = apr_initialize(); + if (status) + { + char errbuf[120]; + std::stringstream message; + message << "APR initialization failed: " + << apr_strerror(status, errbuf, sizeof(errbuf) - 1); + throw std::runtime_error(message.str()); + } + + root_pool = create_root_pool(); +#ifdef SVNXX_POOL_DEBUG + SVN_DBG(("svn++ created global state")); +#endif +} + +global_state::~global_state() +{ +#ifdef SVNXX_POOL_DEBUG + SVN_DBG(("svn++ destroyed global state")); +#endif + std::unique_lock lock(guard); + apr_terminate(); + root_pool = nullptr; +} + +} // namespace detail +} // namespace svnxx +} // namespace subversion +} // namespace apache diff --git a/subversion/bindings/cxx/src/private.hpp b/subversion/bindings/cxx/src/private.hpp new file mode 100644 index 0000000..cd79d30 --- /dev/null +++ b/subversion/bindings/cxx/src/private.hpp @@ -0,0 +1,36 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_PRIVATE_PRIVATE_HPP +#define SVNXX_PRIVATE_PRIVATE_HPP + +#include "private/depth_private.hpp" +#include "private/exception_private.hpp" +#include "private/future_private.hpp" +#include "private/revision_private.hpp" +#include "private/strings_private.hpp" +#include "private/tristate_private.hpp" + +#include "private/client_context_private.hpp" + +#endif // SVNXX_PRIVATE_PRIVATE_HPP diff --git a/subversion/bindings/cxx/src/private/client_context_private.hpp b/subversion/bindings/cxx/src/private/client_context_private.hpp new file mode 100644 index 0000000..0eae401 --- /dev/null +++ b/subversion/bindings/cxx/src/private/client_context_private.hpp @@ -0,0 +1,87 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_PRIVATE_CLIENT_CONTEXT_HPP +#define SVNXX_PRIVATE_CLIENT_CONTEXT_HPP + +#include "svnxx/client/context.hpp" + +#include "../private/init_private.hpp" +#include "../aprwrap.hpp" + +#include "svn_client.h" + +namespace apache { +namespace subversion { +namespace svnxx { +namespace client { +namespace detail { + +// TODO: document this +class context +{ + using global_state = svnxx::detail::global_state; + +public: + context() + : state(global_state::get()), + ctx_pool(state), + ctx(create_ctx(ctx_pool)) + {} + + const global_state::ptr& get_state() const noexcept { return state; } + const apr::pool& get_pool() const noexcept { return ctx_pool; } + svn_client_ctx_t* get_ctx() const noexcept { return ctx; }; + +private: + const global_state::ptr state; + apr::pool ctx_pool; + svn_client_ctx_t* const ctx; + + static svn_client_ctx_t* create_ctx(const apr::pool& pool); +}; + +} // namespace detail +} // namespace client +namespace impl { + +// TODO: document this +inline client::detail::context_ptr unwrap(client::context& ctx) +{ + struct context_wrapper final : public client::context + { + inherited get() const noexcept + { + return *this; + } + }; + + return static_cast(ctx).get(); +} + +} // namesapce impl +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_PRIVATE_CLIENT_CONTEXT_HPP diff --git a/subversion/bindings/cxx/src/private/debug_private.hpp b/subversion/bindings/cxx/src/private/debug_private.hpp new file mode 100644 index 0000000..ba4b160 --- /dev/null +++ b/subversion/bindings/cxx/src/private/debug_private.hpp @@ -0,0 +1,49 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_PRIVATE_DEBUG_HPP +#define SVNXX_PRIVATE_DEBUG_HPP + +// We can only write pool debug logs with SVN_DEBUG enabled. +#if defined(SVNXX_POOL_DEBUG) && !defined(SVN_DEBUG) +# undef SVNXX_POOL_DEBUG +#endif + +#ifdef SVNXX_POOL_DEBUG +#include "private/svn_debug.h" +#endif + +namespace apache { +namespace subversion { +namespace svnxx { +namespace impl { + +extern const char root_pool_tag[]; +extern const char root_pool_key[]; + +} // namespace impl +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_PRIVATE_DEBUG_HPP diff --git a/subversion/bindings/cxx/src/private/depth_private.hpp b/subversion/bindings/cxx/src/private/depth_private.hpp new file mode 100644 index 0000000..9d52eb1 --- /dev/null +++ b/subversion/bindings/cxx/src/private/depth_private.hpp @@ -0,0 +1,129 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_PRIVATE_DEPTH_HPP +#define SVNXX_PRIVATE_DEPTH_HPP + +#include + +#include "svnxx/depth.hpp" + +namespace apache { +namespace subversion { +namespace svnxx { +namespace impl { + +/** + * Convert @a d to an svn_depth_t. + */ +inline constexpr svn_depth_t convert(depth d) +{ +#ifndef SVN_DEBUG + return svn_depth_t(d); +#else + // switch in constexpr is allowed in C++14 but not in C++11, so we + // have to use a series of ternary operators. + return (d == depth::unknown + ? (svn_depth_t(d) != svn_depth_unknown + ? throw std::range_error("convert(svn::depth::unknown)") + : svn_depth_t(d)) + : + d == depth::exclude + ? (svn_depth_t(d) != svn_depth_exclude + ? throw std::range_error("convert(svn::depth::exclude)") + : svn_depth_t(d)) + : + d == depth::empty + ? (svn_depth_t(d) != svn_depth_empty + ? throw std::range_error("convert(svn::depth::empty)") + : svn_depth_t(d)) + : + d == depth::files + ? (svn_depth_t(d) != svn_depth_files + ? throw std::range_error("convert(svn::depth::files)") + : svn_depth_t(d)) + : + d == depth::immediates + ? (svn_depth_t(d) != svn_depth_immediates + ? throw std::range_error("convert(svn::depth::immediates)") + : svn_depth_t(d)) + : + d == depth::infinity + ? (svn_depth_t(d) != svn_depth_infinity + ? throw std::range_error("convert(svn::depth::infinity)") + : svn_depth_t(d)) + : + throw std::range_error("convert: unknown svn::depth")); +#endif +} + +/** + * Convert @a d to an svn::depth. + */ +inline constexpr depth convert(svn_depth_t d) +{ +#ifndef SVN_DEBUG + return depth(d); +#else + // switch in constexpr is allowed in C++14 but not in C++11, so we + // have to use a series of ternary operators. + return (d == svn_depth_unknown + ? (d != svn_depth_t(depth::unknown) + ? throw std::range_error("convert(svn_depth_unknown)") + : depth(d)) + : + d == svn_depth_exclude + ? (d != svn_depth_t(depth::exclude) + ? throw std::range_error("convert(svn_depth_exclude)") + : depth(d)) + : + d == svn_depth_empty + ? (d != svn_depth_t(depth::empty) + ? throw std::range_error("convert(svn_depth_empty)") + : depth(d)) + : + d == svn_depth_files + ? (d != svn_depth_t(depth::files) + ? throw std::range_error("convert(svn_depth_files)") + : depth(d)) + : + d == svn_depth_immediates + ? (d != svn_depth_t(depth::immediates) + ? throw std::range_error("convert(svn_depth_immediates)") + : depth(d)) + : + d == svn_depth_infinity + ? (d != svn_depth_t(depth::infinity) + ? throw std::range_error("convert(svn_depth_infinity)") + : depth(d)) + : + throw std::range_error("convert: unknown svn_depth_t")); +#endif +} + +} // namespace impl +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_PRIVATE_DEPTH_HPP diff --git a/subversion/bindings/cxx/src/private/exception_private.hpp b/subversion/bindings/cxx/src/private/exception_private.hpp new file mode 100644 index 0000000..a3cfea1 --- /dev/null +++ b/subversion/bindings/cxx/src/private/exception_private.hpp @@ -0,0 +1,60 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef __cplusplus +#error "This is a C++ header file." +#endif + +#ifndef SVNXX_PRIVATE_EXCEPTION_HPP +#define SVNXX_PRIVATE_EXCEPTION_HPP + +#include "svnxx/exception.hpp" + +#include "svn_error.h" + +namespace apache { +namespace subversion { +namespace svnxx { +namespace impl { + +/** + * Given a @a err, if it is not @c nullptr, convert it to a and throw an + * svn::error or svn::cancelled exception; otherwise do nothing. + */ +void checked_call(svn_error_t* const err); + +/** + * Call this when a callback throws svn::stop_iteration to return + * an appropriate error. + */ +inline svn_error_t* iteration_stopped() +{ + return svn_error_create(SVN_ERR_ITER_BREAK, nullptr, nullptr); +} + +} // namespace impl +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_PRIVATE_EXCEPTION_HPP diff --git a/subversion/bindings/cxx/src/private/future_private.hpp b/subversion/bindings/cxx/src/private/future_private.hpp new file mode 100644 index 0000000..667e0f2 --- /dev/null +++ b/subversion/bindings/cxx/src/private/future_private.hpp @@ -0,0 +1,110 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_PRIVATE_FUTURE_HPP +#define SVNXX_PRIVATE_FUTURE_HPP + +#include "svnxx/detail/future.hpp" + +#include "../private/init_private.hpp" +#include "../aprwrap.hpp" + +namespace apache { +namespace subversion { +namespace svnxx { +namespace detail { +namespace future_ { + + +// Encapsulates a result pool that will contain pool-allocated +// objects returned from asynchronous operations. Consequently, +// keeps a reference to the global state that holds the root pool +// that is the parent of this result pool. +class result +{ +public: + explicit result(const detail::global_state::ptr& state_) + : state(state_), + result_pool(state_) + {} + + apr::pool& get_pool() noexcept + { + return result_pool; + } + +private: + const detail::global_state::ptr state; + apr::pool result_pool; +}; + +} // namespace future_ +} // namespace detail +namespace impl { + + +// Creates a detail::future_::result pointer for initializing +// detail::future objects. +inline detail::future_::unique_ptr +make_future_result(const detail::global_state::ptr& state) +{ + using namespace detail::future_; + return unique_ptr(new result(state)); +} + +// Creates a null detail::future_::result pointer for cases where we +// do not need a result pool. +inline detail::future_::unique_ptr +make_future_result() +{ + return detail::future_::unique_ptr(); +} + + +// Wrapper for detail::future with public constructor. +template +struct future final : public detail::future_::future +{ + using inherited = typename detail::future_::future::inherited; + future(inherited that, detail::future_::unique_ptr&& ctx) noexcept + : detail::future_::future(std::move(that), std::move(ctx)) + {} +}; + + +// Wrapper for detail::shared_future with public constructor. +template +struct shared_future final : public detail::future_::shared_future +{ + using inherited = typename detail::future_::shared_future::inherited; + shared_future(inherited that, detail::future_::shared_ptr ctx) noexcept + : detail::future_::shared_future(std::move(that), ctx) + {} +}; + +} // namespace impl +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_PRIVATE_FUTURE_HPP diff --git a/subversion/bindings/cxx/src/private/init_private.hpp b/subversion/bindings/cxx/src/private/init_private.hpp new file mode 100644 index 0000000..5cd86b8 --- /dev/null +++ b/subversion/bindings/cxx/src/private/init_private.hpp @@ -0,0 +1,83 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_PRIVATE_INIT_HPP +#define SVNXX_PRIVATE_INIT_HPP + +#include +#include +#include + +#include + +#include "svnxx/init.hpp" +#include "svnxx/detail/noncopyable.hpp" + +namespace apache { +namespace subversion { +namespace svnxx { +namespace detail { + +class global_state : noncopyable +{ +public: + using ptr = std::shared_ptr; + using weak_ptr = std::weak_ptr; + + ~global_state(); + + static ptr create(); + static ptr get() + { + auto state = self.lock(); + if (!state) + { + throw std::logic_error( + "The SVN++ library is not initialized." + " Did you forget to create an instance of " + " the apache::subversion::svnxx::init class?"); + } + return state; + } + + apr_pool_t* get_root_pool() const noexcept + { + return root_pool; + } + +private: + // Thou shalt not create global_states other than through the factory. + global_state(); + + apr_pool_t* root_pool{nullptr}; + + static std::mutex guard; + static weak_ptr self; +}; + +} // namespace detail +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_PRIVATE_INIT_HPP diff --git a/subversion/bindings/cxx/src/private/revision_private.hpp b/subversion/bindings/cxx/src/private/revision_private.hpp new file mode 100644 index 0000000..1132928 --- /dev/null +++ b/subversion/bindings/cxx/src/private/revision_private.hpp @@ -0,0 +1,161 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_PRIVATE_REVISION_HPP +#define SVNXX_PRIVATE_REVISION_HPP + +#include + +#include "svnxx/revision.hpp" + +#include "svn_opt.h" + +namespace apache { +namespace subversion { +namespace svnxx { +namespace impl { + +/** + * Convert @a kind to an svn_opt_revision_kind. + */ +inline constexpr svn_opt_revision_kind convert(revision::kind kind) +{ +#ifndef SVN_DEBUG + return svn_opt_revision_kind(kind); +#else + // switch in constexpr is allowed in C++14 but not in C++11, + // so we have to use a series of ternary operators. + return (kind == revision::kind::unspecified + ? (svn_opt_revision_kind(kind) != svn_opt_revision_unspecified + ? throw std::range_error("convert(svn::revision::kind::unspecified)") + : svn_opt_revision_kind(kind)) + : + kind == revision::kind::number + ? (svn_opt_revision_kind(kind) != svn_opt_revision_number + ? throw std::range_error("convert(svn::revision::kind::number)") + : svn_opt_revision_kind(kind)) + : + kind == revision::kind::date + ? (svn_opt_revision_kind(kind) != svn_opt_revision_date + ? throw std::range_error("convert(svn::revision::kind::date)") + : svn_opt_revision_kind(kind)) + : + kind == revision::kind::committed + ? (svn_opt_revision_kind(kind) != svn_opt_revision_committed + ? throw std::range_error("convert(svn::revision::kind::committed)") + : svn_opt_revision_kind(kind)) + : + kind == revision::kind::previous + ? (svn_opt_revision_kind(kind) != svn_opt_revision_previous + ? throw std::range_error("convert(svn::revision::kind::previous)") + : svn_opt_revision_kind(kind)) + : + kind == revision::kind::base + ? (svn_opt_revision_kind(kind) != svn_opt_revision_base + ? throw std::range_error("convert(svn::revision::kind::base)") + : svn_opt_revision_kind(kind)) + : + kind == revision::kind::working + ? (svn_opt_revision_kind(kind) != svn_opt_revision_working + ? throw std::range_error("convert(svn::revision::kind::working)") + : svn_opt_revision_kind(kind)) + : + kind == revision::kind::head + ? (svn_opt_revision_kind(kind) != svn_opt_revision_head + ? throw std::range_error("convert(svn::revision::kind::head)") + : svn_opt_revision_kind(kind)) + : + throw std::range_error("convert: unknown svn::revision::kind")); +#endif +} + +/** + * Convert @a kind to an svn::revision::kind. + */ +inline constexpr revision::kind convert(svn_opt_revision_kind kind) +{ +#ifndef SVN_DEBUG + return revision::kind(kind); +#else + // switch in constexpr is allowed in C++14 but not in C++11, + // so we have to use a series of ternary operators. + return (kind ==svn_opt_revision_unspecified + ? (kind != svn_opt_revision_kind(revision::kind::unspecified) + ? throw std::range_error("convert(svn_opt_revision_unspecified)") + : revision::kind(kind)) + : + kind == svn_opt_revision_number + ? (kind != svn_opt_revision_kind(revision::kind::number) + ? throw std::range_error("convert(svn_opt_revision_number)") + : revision::kind(kind)) + : + kind == svn_opt_revision_date + ? (kind != svn_opt_revision_kind(revision::kind::date) + ? throw std::range_error("convert(svn_opt_revision_date)") + : revision::kind(kind)) + : + kind == svn_opt_revision_committed + ? (kind != svn_opt_revision_kind(revision::kind::committed) + ? throw std::range_error("convert(svn_opt_revision_committed)") + : revision::kind(kind)) + : + kind == svn_opt_revision_previous + ? (kind != svn_opt_revision_kind(revision::kind::previous) + ? throw std::range_error("convert(svn_opt_revision_previous)") + : revision::kind(kind)) + : + kind == svn_opt_revision_base + ? (kind != svn_opt_revision_kind(revision::kind::base) + ? throw std::range_error("convert(svn_opt_revision_base)") + : revision::kind(kind)) + : + kind == svn_opt_revision_working + ? (kind != svn_opt_revision_kind(revision::kind::working) + ? throw std::range_error("convert(svn_opt_revision_working)") + : revision::kind(kind)) + : + kind == svn_opt_revision_head + ? (kind != svn_opt_revision_kind(revision::kind::head) + ? throw std::range_error("convert(svn_opt_revision_head)") + : revision::kind(kind)) + : + throw std::range_error("convert: unknown svn_opt_revision_kind")); +#endif +} + +/** + * Convert @a rev to an svn_opt_revision_t. + */ +svn_opt_revision_t convert(const revision& rev); + +/** + * Convert @a rev to an svn::revision. + */ +revision convert(const svn_opt_revision_t& rev); + +} // namespace impl +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_PRIVATE_REVISION_HPP diff --git a/subversion/bindings/cxx/src/private/strings_private.hpp b/subversion/bindings/cxx/src/private/strings_private.hpp new file mode 100644 index 0000000..5b87ab2 --- /dev/null +++ b/subversion/bindings/cxx/src/private/strings_private.hpp @@ -0,0 +1,106 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVNXX_PRIVATE_STRINGS_HPP +#define SVNXX_PRIVATE_STRINGS_HPP + +#include +#include +#include +#include + +namespace apache { +namespace subversion { +namespace svnxx { +namespace impl { + +namespace { +// Define codecvt types for our various converters. +template struct codecvt; +template<> struct codecvt : public std::codecvt_utf8 {}; +template<> struct codecvt : public std::codecvt_utf8_utf16 {}; +template<> struct codecvt : public std::codecvt_utf8 {}; + +template using converter = std::wstring_convert, C>; +} // anonymous namespace + +/** + * Convert a sequence of @c char's encoded as UTF-8 to a not-narroe string. + */ +template +inline std::basic_string convert(const char* cstr, std::size_t size) +{ + return converter().from_bytes(cstr, cstr + size); +} + +/** + * Convert a nul-terminated string encoded as UTF-8 to a not-narrow string. + */ +template +inline std::basic_string convert(const char* cstr) +{ + return converter().from_bytes(cstr); +} + +/** + * Convert a string encoded as UTF-8 to a not-narrow string. + */ +template +inline std::basic_string convert(const std::string& str) +{ + return converter().from_bytes(str); +} + +/** + * Convert a sequence of @c C's to a string encoded as UTF-8. + */ +template +inline std::string convert(const C* cstr, std::size_t size) +{ + return converter().to_bytes(cstr, size); +} + +/** + * Convert a nul-terminated not-narrow string to a string encoded as UTF-8. + */ +template +inline std::string convert(const C* cstr) +{ + return converter().to_bytes(cstr); +} + +/** + * Convert a not-narrow string to a string encoded as UTF-8. + */ +template +inline std::string convert(const std::basic_string& str) +{ + return converter().to_bytes(str); +} + +} // namespace impl +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_PRIVATE_STRINGS_HPP diff --git a/subversion/bindings/cxx/src/private/tristate_private.hpp b/subversion/bindings/cxx/src/private/tristate_private.hpp new file mode 100644 index 0000000..f24988b --- /dev/null +++ b/subversion/bindings/cxx/src/private/tristate_private.hpp @@ -0,0 +1,63 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef __cplusplus +#error "This is a C++ header file." +#endif + +#ifndef SVNXX_PRIVATE_TRISTATE_HPP +#define SVNXX_PRIVATE_TRISTATE_HPP + +#include "svnxx/tristate.hpp" +#include "svn_types.h" + +namespace apache { +namespace subversion { +namespace svnxx { +namespace impl { + +/** + * Converts an @c svn_tristate_t value to a @c tristate value. + */ +inline constexpr tristate convert(svn_tristate_t x) +{ + return (x == svn_tristate_true ? tristate(true) + : (x == svn_tristate_false ? tristate(false) + : tristate::unknown())); +} + +/** + * Converts a @c tristate value to an @c svn_tristate_t value. + */ +inline constexpr svn_tristate_t convert(tristate t) +{ + return (t ? svn_tristate_true + : (!t ? svn_tristate_false : svn_tristate_unknown)); +} + +} // namespace impl +} // namespace svnxx +} // namespace subversion +} // namespace apache + +#endif // SVNXX_PRIVATE_TRISTATE_HPP diff --git a/subversion/bindings/cxx/src/revision.cpp b/subversion/bindings/cxx/src/revision.cpp new file mode 100644 index 0000000..6a9feaf --- /dev/null +++ b/subversion/bindings/cxx/src/revision.cpp @@ -0,0 +1,69 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#include "private/revision_private.hpp" + +namespace apache { +namespace subversion { +namespace svnxx { +namespace impl { + +svn_opt_revision_t convert(const revision& rev) +{ + svn_opt_revision_t result; + result.kind = convert(rev.get_kind()); + if (result.kind == svn_opt_revision_number) + result.value.number = svn_revnum_t(rev.get_number()); + else if (result.kind == svn_opt_revision_date) + { + // NOTE: We're assuming that the APR and C++ system_clock epochs + // are the same. This will be standardized in C++20. + using usec = revision::usec; + const auto usecs = (rev.get_date() - revision::time()); + result.value.date = usecs.count(); + } + return result; +} + +revision convert(const svn_opt_revision_t& rev) +{ + switch (rev.kind) + { + case svn_opt_revision_number: + return revision(revision::number(rev.value.number)); + case svn_opt_revision_date: + { + // NOTE: We're assuming that the APR and C++ system_clock epochs + // are the same. This will be standardized in C++20. + using usec = revision::usec; + return revision(revision::time(usec{rev.value.date})); + } + default: + return revision(convert(rev.kind)); + } +} + +} // namespace impl +} // namespace svnxx +} // namespace subversion +} // namespace apache diff --git a/subversion/bindings/cxx/tests/fixture_init.hpp b/subversion/bindings/cxx/tests/fixture_init.hpp new file mode 100644 index 0000000..6def2fd --- /dev/null +++ b/subversion/bindings/cxx/tests/fixture_init.hpp @@ -0,0 +1,38 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ + +#ifndef __cplusplus +#error "This is a C++ header file." +#endif + +#ifndef SVNXX_TEST_FIXTURE_INIT_HPP +#define SVNXX_TEST_FIXTURE_INIT_HPP + +#include "svnxx/init.hpp" + +namespace { +struct init +{ + apache::subversion::svnxx::init fixturizer; +}; +} // anonymous namespace + +#endif // SVNXX_TEST_FIXTURE_INIT_HPP diff --git a/subversion/bindings/cxx/tests/svnxx-tests.cpp b/subversion/bindings/cxx/tests/svnxx-tests.cpp new file mode 100644 index 0000000..c1f1e9c --- /dev/null +++ b/subversion/bindings/cxx/tests/svnxx-tests.cpp @@ -0,0 +1,28 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ + +#define BOOST_TEST_MODULE svnxx +#include + +int main (int argc, char* argv[]) +{ + return boost::unit_test::unit_test_main(&init_unit_test, argc, argv); +} diff --git a/subversion/bindings/cxx/tests/test_aprwrap_arrays.cpp b/subversion/bindings/cxx/tests/test_aprwrap_arrays.cpp new file mode 100644 index 0000000..97c5b1b --- /dev/null +++ b/subversion/bindings/cxx/tests/test_aprwrap_arrays.cpp @@ -0,0 +1,197 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ + +#include + +#include +#include + +#include "../src/aprwrap.hpp" + +#include "fixture_init.hpp" + +BOOST_AUTO_TEST_SUITE(aprwrap_arrays, + * boost::unit_test::fixture()); + +namespace { +// Create a randomly-ordered array of constant strings. +apr_array_header_t* fill_array(apr::pool& pool) +{ + apr_array_header_t* a = apr_array_make(pool.get(), 0, sizeof(const char*)); + APR_ARRAY_PUSH(a, const char*) = "primus"; + APR_ARRAY_PUSH(a, const char*) = "secundus"; + APR_ARRAY_PUSH(a, const char*) = "tertius"; + APR_ARRAY_PUSH(a, const char*) = "quartus"; + APR_ARRAY_PUSH(a, const char*) = "quintus"; + APR_ARRAY_PUSH(a, const char*) = "sextus"; + APR_ARRAY_PUSH(a, const char*) = "septimus"; + std::random_shuffle(&APR_ARRAY_IDX(a, 0, const char*), + &APR_ARRAY_IDX(a, a->nelts, const char*)); + return a; +} +} // anonymous namespace + +BOOST_AUTO_TEST_CASE(create_array) +{ + typedef apr::array array; + + apr::pool pool; + array a(pool); + + BOOST_TEST(a.get_array() != nullptr); + BOOST_TEST(a.size() == 0); + BOOST_TEST(sizeof(array::value_type) == sizeof(unsigned char)); + BOOST_TEST(a.get_array()->elt_size == sizeof(array::value_type)); +} + +BOOST_AUTO_TEST_CASE(wrap_array) +{ + typedef apr::array array; + + apr::pool pool; + apr_array_header_t* apr_array = + apr_array_make(pool.get(), 0, sizeof(array::value_type)); + BOOST_TEST_REQUIRE(apr_array != nullptr); + + array a(apr_array); + BOOST_TEST(a.get_array() == apr_array); + BOOST_TEST(a.size() == 0); +} + +BOOST_AUTO_TEST_CASE(rewrap_type_mismatch) +{ + typedef apr::array byte_array; + typedef apr::array int_array; + + apr::pool pool; + BOOST_CHECK_THROW(byte_array{int_array(pool).get_array()}, + std::invalid_argument); +} + +BOOST_AUTO_TEST_CASE(out_of_bounds) +{ + typedef apr::array array; + + apr::pool pool; + array a(pool); + + BOOST_CHECK_THROW(a.at(-1), std::out_of_range); + BOOST_CHECK_THROW(a.at(a.size()), std::out_of_range); +} + +BOOST_AUTO_TEST_CASE(indexing) +{ + typedef apr::array array; + + apr::pool pool; + array a(fill_array(pool)); + + BOOST_TEST(a[0] == APR_ARRAY_IDX(a.get_array(), 0, array::value_type)); + BOOST_TEST(a[a.size() - 1] == APR_ARRAY_IDX(a.get_array(), + a.get_array()->nelts - 1, + array::value_type)); +} + +BOOST_AUTO_TEST_CASE(checked_indexing) +{ + typedef apr::array array; + + apr::pool pool; + array a(fill_array(pool)); + + BOOST_TEST(a.at(0) == APR_ARRAY_IDX(a.get_array(), 0, array::value_type)); + BOOST_TEST(a.at(a.size() - 1) == APR_ARRAY_IDX(a.get_array(), + a.get_array()->nelts - 1, + array::value_type)); +} + +BOOST_AUTO_TEST_CASE(iteration) +{ + typedef apr::array array; + + apr::pool pool; + array a(fill_array(pool)); + + const auto raw_array = a.get_array(); + array::size_type index = 0; + for (auto& value : a) + { + BOOST_TEST(value == APR_ARRAY_IDX(raw_array, index, array::value_type)); + ++index; + } +} + +BOOST_AUTO_TEST_CASE(const_iteration) +{ + typedef apr::array array; + + apr::pool pool; + const array a(fill_array(pool)); + + const auto raw_array = a.get_array(); + array::size_type index = 0; + for (const auto& value : a) + { + BOOST_TEST(value == APR_ARRAY_IDX(raw_array, index, array::value_type)); + ++index; + } +} + +BOOST_AUTO_TEST_CASE(push) +{ + typedef apr::array array; + + apr::pool pool; + array a(fill_array(pool)); + + const array::size_type point = a.size(); + const array::value_type first = a[0]; + const array::value_type last = a[point - 1]; + + a.push("octavius"); + a.push("nonus"); + a.push("decimus"); + + BOOST_TEST(a.size() == point + 3); + BOOST_TEST(a[0] == first); + BOOST_TEST(a[point - 1] == last); + BOOST_TEST(a[point] == "octavius"); + BOOST_TEST(a[a.size() - 1] == "decimus"); +} + +BOOST_AUTO_TEST_CASE(pop) +{ + typedef apr::array array; + + apr::pool pool; + array a(fill_array(pool)); + + for (array::size_type i = 0, z = a.size(); i <= z; ++i) + { + const char** last = (!a.get_array()->nelts ? nullptr + : &APR_ARRAY_IDX(a.get_array(), + a.get_array()->nelts - 1, + array::value_type)); + BOOST_TEST(a.pop() == last); + } +} + +BOOST_AUTO_TEST_SUITE_END(); diff --git a/subversion/bindings/cxx/tests/test_aprwrap_hashes.cpp b/subversion/bindings/cxx/tests/test_aprwrap_hashes.cpp new file mode 100644 index 0000000..2ecffbb --- /dev/null +++ b/subversion/bindings/cxx/tests/test_aprwrap_hashes.cpp @@ -0,0 +1,110 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ + +#include + +#include +#include + +#include "../src/aprwrap.hpp" + +#include "fixture_init.hpp" + +BOOST_AUTO_TEST_SUITE(aprwrap_hashes, + * boost::unit_test::fixture()); + +BOOST_AUTO_TEST_CASE(string_hash) +{ + typedef APR::Hash H; + + apr::pool pool; + H hash(pool); + hash.set("aa", "a"); + hash.set("bbb", "b"); + hash.set("cccc", "c"); + + BOOST_TEST(hash.size() == 3); + BOOST_TEST(hash.get("aa") == "a"); + BOOST_TEST(hash.get("bbb") == "b"); + BOOST_TEST(hash.get("cccc") == "c"); +} + +BOOST_AUTO_TEST_CASE(fixed_string_hash) +{ + // The point of this test is to verify that the key-length parameter + // of the template actually limits the length of the keys. + typedef APR::Hash H; + + apr::pool pool; + H hash(pool); + hash.set("aa&qux", "a"); + hash.set("bb#foo", "b"); + hash.set("cc@bar", "c"); + + BOOST_TEST(hash.size() == 3); + BOOST_TEST(hash.get("aa%foo") == "a"); + BOOST_TEST(hash.get("bb*bar") == "b"); + BOOST_TEST(hash.get("cc$qux") == "c"); +} + +BOOST_AUTO_TEST_CASE(delete_element) +{ + typedef APR::Hash H; + + apr::pool pool; + H hash(pool); + hash.set("aa", "a"); + hash.set("bbb", "b"); + hash.set("cccc", "c"); + + hash.del("bbb"); + + BOOST_TEST(hash.size() == 2); + BOOST_TEST(hash.get("aa") == "a"); + BOOST_TEST(hash.get("cccc") == "c"); +} + +BOOST_AUTO_TEST_CASE(iterate) +{ + typedef APR::Hash H; + + apr::pool pool; + H hash(pool); + hash.set("aa", "a"); + hash.set("bbb", "b"); + hash.set("cccc", "c"); + + struct C : public H::Iteration + { + H& m_hash; + explicit C(H& hashref) : m_hash(hashref) {} + + bool operator()(const H::Key& key, H::value_type value) + { + BOOST_TEST(value == m_hash.get(key)); + return true; + } + } callback(hash); + + hash.iterate(callback, pool); +} + +BOOST_AUTO_TEST_SUITE_END(); diff --git a/subversion/bindings/cxx/tests/test_aprwrap_pools.cpp b/subversion/bindings/cxx/tests/test_aprwrap_pools.cpp new file mode 100644 index 0000000..9ca1702 --- /dev/null +++ b/subversion/bindings/cxx/tests/test_aprwrap_pools.cpp @@ -0,0 +1,76 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ + +#include + +#include + +#include "svnxx/exception.hpp" +#include "../src/aprwrap.hpp" + +#include "fixture_init.hpp" + +namespace svn = ::apache::subversion::svnxx; + +BOOST_AUTO_TEST_SUITE(aprwrap_pools, + * boost::unit_test::fixture()); + +BOOST_AUTO_TEST_CASE(initialize_global_pool) +{ + apr::pool pool; + BOOST_TEST(pool.get() != nullptr); + BOOST_TEST(apr_pool_parent_get(pool.get()) != nullptr); +} + +BOOST_AUTO_TEST_CASE(create_subpool) +{ + apr::pool pool; + apr::pool subpool(&pool); + BOOST_TEST(pool.get() == apr_pool_parent_get(subpool.get())); +} + +BOOST_AUTO_TEST_CASE(typed_allocate) +{ + apr::pool pool; + const unsigned char* buffer = pool.alloc(1); + BOOST_TEST(buffer != nullptr); +} + +// N.B.: This test may pass randomly even if zero-filled allocation +// does not work correctly, since we cannot make assumptions about the +// values of uninitialized memory. +BOOST_AUTO_TEST_CASE(typed_allocate_zerofill) +{ + apr::pool pool; + static const std::size_t size = 32757; + const unsigned char* buffer = pool.allocz(size); + BOOST_TEST_REQUIRE(buffer != nullptr); + BOOST_TEST(std::count(buffer, buffer + size, 0) == size); +} + +BOOST_AUTO_TEST_CASE(overflow) +{ + apr::pool pool; + BOOST_CHECK_THROW(pool.alloc(~std::size_t(0)), svn::allocation_failed); + BOOST_CHECK_THROW(pool.allocz(~std::size_t(0)), svn::allocation_failed); +} + +BOOST_AUTO_TEST_SUITE_END(); diff --git a/subversion/bindings/cxx/tests/test_client_status.cpp b/subversion/bindings/cxx/tests/test_client_status.cpp new file mode 100644 index 0000000..b3364bc --- /dev/null +++ b/subversion/bindings/cxx/tests/test_client_status.cpp @@ -0,0 +1,71 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ + +#include + +#include "fixture_init.hpp" + +#include + +#include "svnxx/client/status.hpp" + +namespace svn = ::apache::subversion::svnxx; + +BOOST_AUTO_TEST_SUITE(client_status, + * boost::unit_test::fixture()); + +namespace { +const char working_copy_root[] = "/Users/brane/src/svn/repos/trunk"; + +const auto status_callback = [](const char* path, + const svn::client::status_notification&) + { + std::cout << "status on: " << path << std::endl; + }; +} + +BOOST_AUTO_TEST_CASE(example, + * boost::unit_test::disabled()) +{ + svn::client::context ctx; + const auto revnum = svn::client::status(ctx, working_copy_root, + svn::revision(), + svn::depth::unknown, + svn::client::status_flags::empty, + status_callback); + std::cout << "got revision: " << long(revnum) << std::endl; +} + +BOOST_AUTO_TEST_CASE(async_example, + * boost::unit_test::disabled()) +{ + svn::client::context ctx; + auto future = svn::client::async::status(ctx, working_copy_root, + svn::revision(), + svn::depth::unknown, + svn::client::status_flags::empty, + status_callback); + BOOST_TEST(future.valid()); + future.wait(); + std::cout << "got revision: " << long(future.get()) << std::endl; +} + +BOOST_AUTO_TEST_SUITE_END(); diff --git a/subversion/bindings/cxx/tests/test_depth.cpp b/subversion/bindings/cxx/tests/test_depth.cpp new file mode 100644 index 0000000..151c2d9 --- /dev/null +++ b/subversion/bindings/cxx/tests/test_depth.cpp @@ -0,0 +1,91 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ + +#include + +#include "../src/private/depth_private.hpp" + +namespace svn = ::apache::subversion::svnxx; +namespace impl = ::apache::subversion::svnxx::impl; + +BOOST_AUTO_TEST_SUITE(depth); + +BOOST_AUTO_TEST_CASE(convert_to) +{ + BOOST_TEST((impl::convert(svn::depth::unknown) == svn_depth_unknown)); + BOOST_TEST((impl::convert(svn::depth::exclude) == svn_depth_exclude)); + BOOST_TEST((impl::convert(svn::depth::empty) == svn_depth_empty)); + BOOST_TEST((impl::convert(svn::depth::files) == svn_depth_files)); + BOOST_TEST((impl::convert(svn::depth::immediates) == svn_depth_immediates)); + BOOST_TEST((impl::convert(svn::depth::infinity) == svn_depth_infinity)); +} + +BOOST_AUTO_TEST_CASE(convert_from) +{ + BOOST_TEST((impl::convert(svn_depth_unknown) == svn::depth::unknown)); + BOOST_TEST((impl::convert(svn_depth_exclude) == svn::depth::exclude)); + BOOST_TEST((impl::convert(svn_depth_empty) == svn::depth::empty)); + BOOST_TEST((impl::convert(svn_depth_files) == svn::depth::files)); + BOOST_TEST((impl::convert(svn_depth_immediates) == svn::depth::immediates)); + BOOST_TEST((impl::convert(svn_depth_infinity) == svn::depth::infinity)); +} + +BOOST_AUTO_TEST_CASE(char_names) +{ + BOOST_TEST((to_string(svn::depth::unknown) == "unknown")); + BOOST_TEST((to_string(svn::depth::exclude) == "exclude")); + BOOST_TEST((to_string(svn::depth::empty) == "empty")); + BOOST_TEST((to_string(svn::depth::files) == "files")); + BOOST_TEST((to_string(svn::depth::immediates) == "immediates")); + BOOST_TEST((to_string(svn::depth::infinity) == "infinity")); +} + +BOOST_AUTO_TEST_CASE(wchar_names) +{ + BOOST_TEST((to_wstring(svn::depth::unknown) == L"unknown")); + BOOST_TEST((to_wstring(svn::depth::exclude) == L"exclude")); + BOOST_TEST((to_wstring(svn::depth::empty) == L"empty")); + BOOST_TEST((to_wstring(svn::depth::files) == L"files")); + BOOST_TEST((to_wstring(svn::depth::immediates) == L"immediates")); + BOOST_TEST((to_wstring(svn::depth::infinity) == L"infinity")); +} + +BOOST_AUTO_TEST_CASE(char16_names) +{ + BOOST_TEST((to_u16string(svn::depth::unknown) == u"unknown")); + BOOST_TEST((to_u16string(svn::depth::exclude) == u"exclude")); + BOOST_TEST((to_u16string(svn::depth::empty) == u"empty")); + BOOST_TEST((to_u16string(svn::depth::files) == u"files")); + BOOST_TEST((to_u16string(svn::depth::immediates) == u"immediates")); + BOOST_TEST((to_u16string(svn::depth::infinity) == u"infinity")); +} + +BOOST_AUTO_TEST_CASE(char32_names) +{ + BOOST_TEST((to_u32string(svn::depth::unknown) == U"unknown")); + BOOST_TEST((to_u32string(svn::depth::exclude) == U"exclude")); + BOOST_TEST((to_u32string(svn::depth::empty) == U"empty")); + BOOST_TEST((to_u32string(svn::depth::files) == U"files")); + BOOST_TEST((to_u32string(svn::depth::immediates) == U"immediates")); + BOOST_TEST((to_u32string(svn::depth::infinity) == U"infinity")); +} + +BOOST_AUTO_TEST_SUITE_END(); diff --git a/subversion/bindings/cxx/tests/test_exceptions.cpp b/subversion/bindings/cxx/tests/test_exceptions.cpp new file mode 100644 index 0000000..eadb513 --- /dev/null +++ b/subversion/bindings/cxx/tests/test_exceptions.cpp @@ -0,0 +1,229 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +#include + +#include +#include +#include +#include +#include + +#include "../src/private/exception_private.hpp" + +namespace svn = ::apache::subversion::svnxx; +namespace impl = ::apache::subversion::svnxx::impl; + +#include "fixture_init.hpp" + +BOOST_AUTO_TEST_SUITE(exceptions, + * boost::unit_test::fixture()); + +namespace { +svn_error_t* make_error_test_error() +{ + svn_error_t* err; + err = svn_error_create(SVN_ERR_TEST_FAILED, NULL, "original message"); + err = svn_error_create(SVN_ERR_BASE, err, "wrapper message"); + err = svn_error_trace(err); + err = svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, err, NULL); + err = svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, err, NULL); + err = svn_error_trace(err); + return err; +} +} // anonymous namespace + +BOOST_AUTO_TEST_CASE(thrown_error) +{ + BOOST_CHECK_THROW( + impl::checked_call(make_error_test_error()), + svn::error); +} + +BOOST_AUTO_TEST_CASE(catch_error) +{ + BOOST_CHECK_THROW( + impl::checked_call(make_error_test_error()), + svn::error); + + try + { + impl::checked_call(make_error_test_error()); + } + catch (const svn::error& err) + { + BOOST_TEST(err.code() == SVN_ERR_UNSUPPORTED_FEATURE); + BOOST_TEST(err.name() == "SVN_ERR_UNSUPPORTED_FEATURE"); + BOOST_TEST(err.what() == "Trying to use an unsupported feature"); + + auto ml = err.messages(); + BOOST_TEST(ml.size() == 3); + BOOST_TEST(ml[0].code() == SVN_ERR_UNSUPPORTED_FEATURE); + BOOST_TEST(ml[0].name() == "SVN_ERR_UNSUPPORTED_FEATURE"); + BOOST_TEST(ml[1].code() == SVN_ERR_BASE); + BOOST_TEST(ml[1].name() == "SVN_ERR_BASE"); + BOOST_TEST(ml[1].text() == "wrapper message"); + BOOST_TEST(ml[2].code() == SVN_ERR_TEST_FAILED); + BOOST_TEST(ml[2].name() == "SVN_ERR_TEST_FAILED"); + BOOST_TEST(ml[2].text() == "original message"); + + auto tml = err.traced_messages(); +#ifdef SVN_DEBUG + BOOST_TEST(tml.size() == 8); + BOOST_TEST(tml[0].code() == SVN_ERR_UNSUPPORTED_FEATURE); + BOOST_TEST(tml[1].code() == SVN_ERR_UNSUPPORTED_FEATURE); + BOOST_TEST(tml[2].code() == SVN_ERR_UNSUPPORTED_FEATURE); + BOOST_TEST(tml[3].code() == SVN_ERR_BASE); + BOOST_TEST(tml[4].code() == SVN_ERR_BASE); + BOOST_TEST(tml[5].code() == SVN_ERR_BASE); + BOOST_TEST(tml[6].code() == SVN_ERR_TEST_FAILED); + BOOST_TEST(tml[7].code() == SVN_ERR_TEST_FAILED); +#else // !SVN_DEBUG + BOOST_TEST(tml.size() == 3); + BOOST_TEST(tml[0].code() == SVN_ERR_UNSUPPORTED_FEATURE); + BOOST_TEST(tml[1].code() == SVN_ERR_BASE); + BOOST_TEST(tml[2].code() == SVN_ERR_TEST_FAILED); +#endif // SVN_DEBUG + } +} + +BOOST_AUTO_TEST_CASE(propagate_error) +{ + std::exception_ptr xptr; + try + { + impl::checked_call(make_error_test_error()); + } + catch (...) + { + xptr = std::current_exception(); + } + BOOST_REQUIRE(xptr); + BOOST_CHECK_THROW(std::rethrow_exception(xptr), svn::error); +} + + +namespace { +svn_error_t* make_cancel_test_error() +{ + svn_error_t* err; + err = svn_error_create(SVN_ERR_CANCELLED, NULL, NULL); + err = svn_error_create(SVN_ERR_CANCELLED, err, NULL); + err = svn_error_trace(err); + err = svn_error_create(SVN_ERR_TEST_FAILED, err, "original message"); + err = svn_error_create(SVN_ERR_BASE, err, "wrapper message"); + err = svn_error_trace(err); + return err; +} +} // anonymous namespace + +BOOST_AUTO_TEST_CASE(thtrown_cancelled) +{ + BOOST_CHECK_THROW( + impl::checked_call(make_cancel_test_error()), + svn::cancelled); +} + +BOOST_AUTO_TEST_CASE(catch_cancelled) +{ + try + { + impl::checked_call(make_cancel_test_error()); + } + catch (const svn::cancelled& err) + { + BOOST_TEST(err.code() == SVN_ERR_BASE); + BOOST_TEST(err.name() == "SVN_ERR_BASE"); + BOOST_TEST(err.what() == "wrapper message"); + + auto ml = err.messages(); + BOOST_TEST(ml.size() == 3); + BOOST_TEST(ml[0].code() == SVN_ERR_BASE); + BOOST_TEST(ml[0].name() == "SVN_ERR_BASE"); + BOOST_TEST(ml[0].text() == "wrapper message"); + BOOST_TEST(ml[1].code() == SVN_ERR_TEST_FAILED); + BOOST_TEST(ml[1].name() == "SVN_ERR_TEST_FAILED"); + BOOST_TEST(ml[1].text() == "original message"); + BOOST_TEST(ml[2].code() == SVN_ERR_CANCELLED); + BOOST_TEST(ml[2].name() == "SVN_ERR_CANCELLED"); + + auto tml = err.traced_messages(); +#ifdef SVN_DEBUG + BOOST_TEST(tml.size() == 8); + BOOST_TEST(tml[0].code() == SVN_ERR_BASE); + BOOST_TEST(tml[1].code() == SVN_ERR_BASE); + BOOST_TEST(tml[2].code() == SVN_ERR_BASE); + BOOST_TEST(tml[3].code() == SVN_ERR_TEST_FAILED); + BOOST_TEST(tml[4].code() == SVN_ERR_TEST_FAILED); + BOOST_TEST(tml[5].code() == SVN_ERR_CANCELLED); + BOOST_TEST(tml[6].code() == SVN_ERR_CANCELLED); + BOOST_TEST(tml[7].code() == SVN_ERR_CANCELLED); +#else // !SVN_DEBUG + BOOST_TEST(tml.size() == 3); + BOOST_TEST(tml[0].code() == SVN_ERR_BASE); + BOOST_TEST(tml[1].code() == SVN_ERR_TEST_FAILED); + BOOST_TEST(tml[2].code() == SVN_ERR_CANCELLED); +#endif // SVN_DEBUG + } +} + +BOOST_AUTO_TEST_CASE(propagate_cancelled) +{ + std::exception_ptr xptr; + try + { + impl::checked_call(make_cancel_test_error()); + } + catch (...) + { + xptr = std::current_exception(); + } + BOOST_REQUIRE(xptr); + BOOST_CHECK_THROW(std::rethrow_exception(xptr), svn::cancelled); +} + +BOOST_AUTO_TEST_CASE(iteration_stopped_cancels) +{ + BOOST_CHECK_THROW( + impl::checked_call(impl::iteration_stopped()), + svn::cancelled); +} + +BOOST_AUTO_TEST_CASE(iteration_stopped) +{ + try + { + impl::checked_call(impl::iteration_stopped()); + } + catch (const svn::cancelled& err) + { + BOOST_TEST(err.code() == SVN_ERR_ITER_BREAK); + BOOST_TEST(err.name() == "SVN_ERR_ITER_BREAK"); + BOOST_TEST(err.what() == "Iteration terminated before completion"); + + auto ml = err.messages(); + BOOST_TEST(ml.size() == 1); + BOOST_TEST(ml[0].code() == SVN_ERR_ITER_BREAK); + BOOST_TEST(ml[0].name() == "SVN_ERR_ITER_BREAK"); + BOOST_TEST(ml[0].text() == "Iteration terminated before completion"); + } +} + +BOOST_AUTO_TEST_SUITE_END(); diff --git a/subversion/bindings/cxx/tests/test_init.cpp b/subversion/bindings/cxx/tests/test_init.cpp new file mode 100644 index 0000000..7db7609 --- /dev/null +++ b/subversion/bindings/cxx/tests/test_init.cpp @@ -0,0 +1,64 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +#include + +#include "../src/private/init_private.hpp" + +namespace svn = ::apache::subversion::svnxx; +namespace detail = ::apache::subversion::svnxx::detail; + +BOOST_AUTO_TEST_SUITE(init); + +BOOST_AUTO_TEST_CASE(state_with_init) +{ + svn::init svnxx_initialized; + BOOST_TEST(detail::global_state::get()); +} + +BOOST_AUTO_TEST_CASE(state_without_init) +{ + BOOST_CHECK_THROW(detail::global_state::get(), std::logic_error); +} + +BOOST_AUTO_TEST_CASE(init_scope) +{ + { + svn::init svnxx_initialized; + BOOST_TEST(detail::global_state::get()); + } + BOOST_CHECK_THROW(detail::global_state::get(), std::logic_error); +} + +BOOST_AUTO_TEST_CASE(multi_init_same_state) +{ + svn::init svnxx_initialized_first; + const auto state = detail::global_state::get(); + BOOST_REQUIRE(state); + + { + svn::init svnxx_initialized_second; + BOOST_TEST(state == detail::global_state::get()); + } + + BOOST_TEST(state == detail::global_state::get()); +} + +BOOST_AUTO_TEST_SUITE_END(); diff --git a/subversion/bindings/cxx/tests/test_revision.cpp b/subversion/bindings/cxx/tests/test_revision.cpp new file mode 100644 index 0000000..2754c65 --- /dev/null +++ b/subversion/bindings/cxx/tests/test_revision.cpp @@ -0,0 +1,157 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ + +#include + +#include + +#include "../src/private/revision_private.hpp" + +namespace svn = ::apache::subversion::svnxx; +namespace impl = ::apache::subversion::svnxx::impl; + +BOOST_AUTO_TEST_SUITE(revision); + +BOOST_AUTO_TEST_CASE(convert_to_kind) +{ + using kind = svn::revision::kind; + BOOST_TEST((impl::convert(kind::unspecified) == svn_opt_revision_unspecified)); + BOOST_TEST((impl::convert(kind::number) == svn_opt_revision_number)); + BOOST_TEST((impl::convert(kind::date) == svn_opt_revision_date)); + BOOST_TEST((impl::convert(kind::committed) == svn_opt_revision_committed)); + BOOST_TEST((impl::convert(kind::previous) == svn_opt_revision_previous)); + BOOST_TEST((impl::convert(kind::base) == svn_opt_revision_base)); + BOOST_TEST((impl::convert(kind::working) == svn_opt_revision_working)); + BOOST_TEST((impl::convert(kind::head) == svn_opt_revision_head)); +} + +BOOST_AUTO_TEST_CASE(convert_from_kind) +{ + using kind = svn::revision::kind; + BOOST_TEST((impl::convert(svn_opt_revision_unspecified) == kind::unspecified)); + BOOST_TEST((impl::convert(svn_opt_revision_number) == kind::number)); + BOOST_TEST((impl::convert(svn_opt_revision_date) == kind::date)); + BOOST_TEST((impl::convert(svn_opt_revision_committed) == kind::committed)); + BOOST_TEST((impl::convert(svn_opt_revision_previous) == kind::previous)); + BOOST_TEST((impl::convert(svn_opt_revision_base) == kind::base)); + BOOST_TEST((impl::convert(svn_opt_revision_working) == kind::working)); + BOOST_TEST((impl::convert(svn_opt_revision_head) == kind::head)); +} + +BOOST_AUTO_TEST_CASE(roundtrip_conversions) +{ + using kind = svn::revision::kind; + using usec = svn::revision::usec; + + std::array data = { + svn::revision(), + svn::revision(kind::unspecified), + svn::revision(kind::committed), + svn::revision(kind::previous), + svn::revision(kind::base), + svn::revision(kind::working), + svn::revision(kind::head), + svn::revision(svn::revnum::invalid), + svn::revision(svn::revnum(7)), + svn::revision(svn::revision::time()), + svn::revision(svn::revision::time(usec{11})), + }; + + for (const auto& r : data) + BOOST_TEST((impl::convert(impl::convert(r)) == r)); +} + +BOOST_AUTO_TEST_CASE(preconditions) +{ + using kind = svn::revision::kind; + BOOST_CHECK_THROW(svn::revision{kind::number}, std::invalid_argument); + BOOST_CHECK_THROW(svn::revision{kind::date}, std::invalid_argument); +} + +BOOST_AUTO_TEST_CASE(postconditions_kind) +{ + using kind = svn::revision::kind; + BOOST_TEST((svn::revision(kind::unspecified).get_kind() == kind::unspecified)); + BOOST_TEST((svn::revision(kind::committed) .get_kind() == kind::committed)); + BOOST_TEST((svn::revision(kind::previous) .get_kind() == kind::previous)); + BOOST_TEST((svn::revision(kind::base) .get_kind() == kind::base)); + BOOST_TEST((svn::revision(kind::working) .get_kind() == kind::working)); + BOOST_TEST((svn::revision(kind::head) .get_kind() == kind::head)); +} + +BOOST_AUTO_TEST_CASE(postconditions_default) +{ + using kind = svn::revision::kind; + using usec = svn::revision::usec; + + const auto r = svn::revision(); + BOOST_TEST((r.get_kind() == kind::unspecified)); + BOOST_CHECK_THROW(r.get_number(), std::logic_error); + BOOST_CHECK_THROW(r.get_date(), std::logic_error); +} + +BOOST_AUTO_TEST_CASE(postconditions_number) +{ + using kind = svn::revision::kind; + using usec = svn::revision::usec; + + const auto r = svn::revision(svn::revnum::invalid); + BOOST_TEST((r.get_kind() == kind::number)); + BOOST_TEST((r.get_number() == svn::revnum::invalid)); + BOOST_CHECK_THROW(r.get_date(), std::logic_error); +} + +BOOST_AUTO_TEST_CASE(postconditions_date) +{ + using kind = svn::revision::kind; + using usec = svn::revision::usec; + + const auto r = svn::revision(svn::revision::time()); + BOOST_TEST((r.get_kind() == kind::date)); + BOOST_TEST((r.get_date() == svn::revision::time())); + BOOST_CHECK_THROW(r.get_number(), std::logic_error); +} + +BOOST_AUTO_TEST_CASE(assignment) +{ + using namespace std::chrono; + using kind = svn::revision::kind; + const auto timestamp = time_point_cast(system_clock::now()); + + svn::revision r; + BOOST_TEST((r.get_kind() == kind::unspecified)); + + r = svn::revision(kind::previous); + BOOST_TEST((r.get_kind() == kind::previous)); + + r = svn::revision(svn::revnum(0)); + BOOST_TEST((r.get_kind() == kind::number)); + BOOST_TEST((r.get_number() == svn::revnum(0))); + + r = svn::revision(timestamp); + BOOST_TEST((r.get_kind() == kind::date)); + BOOST_TEST((r.get_date() == timestamp)); + BOOST_TEST((r.get_date() == timestamp)); +} + +// TODO: Add tests for !=, <, >, <= and >= + +BOOST_AUTO_TEST_SUITE_END(); diff --git a/subversion/bindings/cxx/tests/test_strings.cpp b/subversion/bindings/cxx/tests/test_strings.cpp new file mode 100644 index 0000000..87d054f --- /dev/null +++ b/subversion/bindings/cxx/tests/test_strings.cpp @@ -0,0 +1,218 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ + +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "private/svn_utf_private.h" +#include "../src/aprwrap.hpp" + +namespace { +std::string to_utf8(const std::u32string& str) +{ + static const int32_t endiancheck = 0xa5cbbc5a; + static const bool arch_big_endian = + (reinterpret_cast(&endiancheck)[sizeof(endiancheck) - 1] == '\x5a'); + + apr::pool scratch_pool; + const svn_string_t* utf8_string; + + auto err = svn_utf__utf32_to_utf8( + &utf8_string, + reinterpret_cast(str.c_str()), + str.size(), arch_big_endian, scratch_pool.get(), scratch_pool.get()); + if (err) + { + svn_error_clear(err); + throw std::range_error("bad unicode code point"); + } + return std::string(utf8_string->data, utf8_string->len); +} + +template struct codepoint; +template<> struct codepoint +{ + using src_type = char32_t; + static constexpr std::uint_least32_t min = 0; + static constexpr std::uint_least32_t max = 0x10ffff; + static constexpr std::uint_least32_t surrogate_min = 0xd800; + static constexpr std::uint_least32_t surrogate_max = 0xdfff; +}; + +template<> struct codepoint : public codepoint +{ + using dst_type = char32_t; + static std::u32string convert(const std::u32string& str) + { + return str; + }; +}; + +template<> struct codepoint : public codepoint +{ + using dst_type = char16_t; + static std::u16string convert(const std::u32string& str) + { + std::wstring_convert, dst_type> u; + return u.from_bytes(to_utf8(str)); + } +}; + +template<> struct codepoint : public codepoint +{ + using dst_type = wchar_t; + +#ifdef WIN32 + // Be conservative, use UCS-2 for wchar_t on Windows + static_assert(sizeof(wchar_t) == sizeof(char16_t), + "I thought we had 2-byte wide chars on Windows"); + static constexpr std::uint_least32_t max = 0xffff; +#endif + + static std::wstring convert(const std::u32string& str) + { +#ifdef WIN32 + const auto from_utf8 = + [](const std::string& sstr) + { + apr::pool scratch_pool; + const wchar_t* result; + auto err = svn_utf__win32_utf8_to_utf16( + &result, sstr.c_str(), nullptr, scratch_pool.get()); + if (err) + { + svn_error_clear(err); + throw std::range_error("bad conversion to utf16"); + } + return std::wstring(result); + } +#else + std::wstring_convert, dst_type> u; + const auto from_utf8 = [&u](const std::string& sstr) + { + return u.from_bytes(sstr); + }; +#endif + return from_utf8(to_utf8(str)); + } +}; + +// Generate random strings. +template +inline std::vector> generate_string_data(int count) +{ + using cp = codepoint; + std::mt19937 mt{std::random_device()()}; + std::uniform_int_distribution<> cgen{typename cp::src_type(cp::min), + typename cp::src_type(cp::max)}; + std::uniform_int_distribution<> lgen{7U, 31U}; + + std::vector> result; + result.reserve(count); + + for (int i = 0; i < count; ++i) + { + const unsigned len = lgen(mt); + + std::u32string val; + val.reserve(len); + + for (unsigned j = 0; j < len; ++j) + { + repeat: + auto c = cgen(mt); + if (uint_least32_t(c) >= cp::surrogate_min + && uint_least32_t(c) <= cp::surrogate_max) + goto repeat; + val.push_back(c); + } + result.emplace_back(cp::convert(val)); + } + return result; +} +} // anonymous namespace + + +#include "../src/private/strings_private.hpp" + +#include "fixture_init.hpp" + +namespace svn = ::apache::subversion::svnxx; +namespace impl = ::apache::subversion::svnxx::impl; + +BOOST_AUTO_TEST_SUITE(strings, + * boost::unit_test::fixture()); + +BOOST_AUTO_TEST_CASE(wstring_conversion_roundtrip) +{ + for (const auto& sample : generate_string_data(100)) + BOOST_TEST((sample == impl::convert(impl::convert(sample)))); +} + +BOOST_AUTO_TEST_CASE(u16string_conversion_roundtrip) +{ + for (const auto& sample : generate_string_data(100)) + BOOST_TEST((sample == impl::convert(impl::convert(sample)))); +} + +BOOST_AUTO_TEST_CASE(u32string_conversion_roundtrip) +{ + for (const auto& sample : generate_string_data(100)) + BOOST_TEST((sample == impl::convert(impl::convert(sample)))); +} + +BOOST_AUTO_TEST_CASE(nulchar) +{ + const std::string nulstr("\0", 1); + const std::wstring wnulstr(L"\0", 1); + const std::u16string u16nulstr(u"\0", 1); + const std::u32string u32nulstr(U"\0", 1); + + BOOST_TEST(nulstr.size() == 1); + BOOST_TEST(wnulstr.size() == 1); + BOOST_TEST(u16nulstr.size() == 1); + BOOST_TEST(u32nulstr.size() == 1); + + BOOST_TEST(impl::convert(nulstr).size() == 1); + BOOST_TEST(impl::convert(nulstr).size() == 1); + BOOST_TEST(impl::convert(nulstr).size() == 1); + + BOOST_TEST((impl::convert(nulstr) == wnulstr)); + BOOST_TEST((impl::convert(nulstr) == u16nulstr)); + BOOST_TEST((impl::convert(nulstr) == u32nulstr)); + + BOOST_TEST(impl::convert(wnulstr).size() == 1); + BOOST_TEST(impl::convert(u16nulstr).size() == 1); + BOOST_TEST(impl::convert(u32nulstr).size() == 1); + + BOOST_TEST((impl::convert(wnulstr) == nulstr)); + BOOST_TEST((impl::convert(u16nulstr) == nulstr)); + BOOST_TEST((impl::convert(u32nulstr) == nulstr)); +} + +BOOST_AUTO_TEST_SUITE_END(); diff --git a/subversion/bindings/cxx/tests/test_tristate.cpp b/subversion/bindings/cxx/tests/test_tristate.cpp new file mode 100644 index 0000000..3d14a8f --- /dev/null +++ b/subversion/bindings/cxx/tests/test_tristate.cpp @@ -0,0 +1,368 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ +#include + +#include "../src/private/tristate_private.hpp" + +namespace svn = ::apache::subversion::svnxx; +namespace impl = ::apache::subversion::svnxx::impl; + +namespace { +constexpr auto T = svn::tristate(true); +constexpr auto F = svn::tristate(false); +constexpr auto X = svn::tristate::unknown(); +} // anonymous namespace + +BOOST_AUTO_TEST_SUITE(tristate); + +BOOST_AUTO_TEST_CASE(constants) +{ + BOOST_TEST(!svn::unknown(T)); + BOOST_TEST(!svn::unknown(F)); + BOOST_TEST(svn::unknown(X)); + + BOOST_TEST(bool(T)); + BOOST_TEST(!bool(!T)); + + BOOST_TEST(!bool(F)); + BOOST_TEST(bool(!F)); + + BOOST_TEST(!bool(X)); + BOOST_TEST(!bool(!X)); +} + +BOOST_AUTO_TEST_CASE(conversions) +{ + BOOST_TEST(impl::convert(T) == svn_tristate_true); + BOOST_TEST(impl::convert(F) == svn_tristate_false); + BOOST_TEST(impl::convert(X) == svn_tristate_unknown); + + BOOST_TEST(impl::convert(svn_tristate_true) == T); + BOOST_TEST(impl::convert(svn_tristate_false) == F); + BOOST_TEST(svn::unknown(impl::convert(svn_tristate_unknown))); +} + +BOOST_AUTO_TEST_CASE(construct_true) +{ + constexpr auto state = svn::tristate(true); + BOOST_TEST(!svn::unknown(state)); + BOOST_TEST(bool(state)); + BOOST_TEST(!bool(!state)); +} + +BOOST_AUTO_TEST_CASE(construct_false) +{ + constexpr auto state = svn::tristate(false); + BOOST_TEST(!svn::unknown(state)); + BOOST_TEST(!bool(state)); + BOOST_TEST(bool(!state)); +} + +BOOST_AUTO_TEST_CASE(construct_unknown) +{ + constexpr auto state = svn::tristate::unknown(); + BOOST_TEST(svn::unknown(state)); + BOOST_TEST(!bool(state)); + BOOST_TEST(!bool(!state)); +} + +BOOST_AUTO_TEST_CASE(tristate_and_tristate) +{ + BOOST_TEST((T && T) == T); + BOOST_TEST((T && F) == F); + BOOST_TEST((F && T) == F); + BOOST_TEST((F && F) == F); + BOOST_TEST(svn::unknown(T && X)); + BOOST_TEST(svn::unknown(X && T)); + BOOST_TEST((F && X) == F); + BOOST_TEST((X && F) == F); + BOOST_TEST(svn::unknown(X && X)); +} + +BOOST_AUTO_TEST_CASE(tristate_and_bool) +{ + BOOST_TEST((T && true) == T); + BOOST_TEST((T && false) == F); + BOOST_TEST((F && true) == F); + BOOST_TEST((F && false) == F); + BOOST_TEST(svn::unknown(X && true)); + BOOST_TEST((X && false) == F); +} + +BOOST_AUTO_TEST_CASE(bool_and_tristate) +{ + BOOST_TEST((true && T) == T); + BOOST_TEST((false && T) == F); + BOOST_TEST((true && F) == F); + BOOST_TEST((false && F) == F); + BOOST_TEST(svn::unknown(true && X)); + BOOST_TEST((false && X) == F); +} + +BOOST_AUTO_TEST_CASE(tristate_and_number) +{ + BOOST_TEST((T && 1) == T); + BOOST_TEST((T && 0) == F); + BOOST_TEST((F && -1) == F); + BOOST_TEST((F && 0) == F); + BOOST_TEST(svn::unknown(X && 5)); + BOOST_TEST((X && 0) == F); +} + +BOOST_AUTO_TEST_CASE(number_and_tristate) +{ + + BOOST_TEST((77 && T) == T); + BOOST_TEST(( 0 && T) == F); + BOOST_TEST((~0 && F) == F); + BOOST_TEST(( 0 && F) == F); + BOOST_TEST(svn::unknown(07 && X)); + BOOST_TEST(( 0 && X) == F); +} + +BOOST_AUTO_TEST_CASE(tristate_or_tristate) +{ + BOOST_TEST((T || T) == T); + BOOST_TEST((T || F) == T); + BOOST_TEST((F || T) == T); + BOOST_TEST((F || F) == F); + BOOST_TEST((T || X) == T); + BOOST_TEST((X || T) == T); + BOOST_TEST(svn::unknown(F || X)); + BOOST_TEST(svn::unknown(X || F)); + BOOST_TEST(svn::unknown(X || X)); +} + +BOOST_AUTO_TEST_CASE(tristate_or_bool) +{ + BOOST_TEST((T || true) == T); + BOOST_TEST((T || false) == T); + BOOST_TEST((F || true) == T); + BOOST_TEST((F || false) == F); + BOOST_TEST((X || true) == T); + BOOST_TEST(svn::unknown(X || false)); +} + +BOOST_AUTO_TEST_CASE(bool_or_tristate) +{ + BOOST_TEST((true || T) == T); + BOOST_TEST((false || T) == T); + BOOST_TEST((true || F) == T); + BOOST_TEST((false || F) == F); + BOOST_TEST((true || X) == T); + BOOST_TEST(svn::unknown(false || X)); +} + +BOOST_AUTO_TEST_CASE(tristate_or_number) +{ + BOOST_TEST((T || 1) == T); + BOOST_TEST((T || 0) == T); + BOOST_TEST((F || -1) == T); + BOOST_TEST((F || 0) == F); + BOOST_TEST((X || 5) == T); + BOOST_TEST(svn::unknown(X || 0)); +} + +BOOST_AUTO_TEST_CASE(number_or_tristate) +{ + + BOOST_TEST((77 || T) == T); + BOOST_TEST(( 0 || T) == T); + BOOST_TEST((~0 || F) == T); + BOOST_TEST(( 0 || F) == F); + BOOST_TEST((07 || X) == T); + BOOST_TEST(svn::unknown(0 || X)); +} + +BOOST_AUTO_TEST_CASE(tristate_eq_tristate) +{ + BOOST_TEST((T == T) == T); + BOOST_TEST((T == F) == F); + BOOST_TEST(svn::unknown(T == X)); + BOOST_TEST((F == T) == F); + BOOST_TEST((F == F) == T); + BOOST_TEST(svn::unknown(F == X)); + BOOST_TEST(svn::unknown(X == T)); + BOOST_TEST(svn::unknown(X == F)); + BOOST_TEST(svn::unknown(X == X)); +} + +BOOST_AUTO_TEST_CASE(tristate_eq_bool) +{ + BOOST_TEST((T == true) == T); + BOOST_TEST((T == false) == F); + BOOST_TEST((F == true) == F); + BOOST_TEST((F == false) == T); + BOOST_TEST(svn::unknown(X == true)); + BOOST_TEST(svn::unknown(X == false)); +} + +BOOST_AUTO_TEST_CASE(bool_eq_tristate) +{ + BOOST_TEST((true == T) == T); + BOOST_TEST((false == T) == F); + BOOST_TEST((true == F) == F); + BOOST_TEST((false == F) == T); + BOOST_TEST(svn::unknown(true == X)); + BOOST_TEST(svn::unknown(false == X)); +} + +BOOST_AUTO_TEST_CASE(tristate_neq_tristate) +{ + BOOST_TEST((T != T) == F); + BOOST_TEST((T != F) == T); + BOOST_TEST(svn::unknown(T != X)); + BOOST_TEST((F != T) == T); + BOOST_TEST((F != F) == F); + BOOST_TEST(svn::unknown(F != X)); + BOOST_TEST(svn::unknown(X != T)); + BOOST_TEST(svn::unknown(X != F)); + BOOST_TEST(svn::unknown(X != X)); +} + +BOOST_AUTO_TEST_CASE(tristate_neq_bool) +{ + BOOST_TEST((T != true) == F); + BOOST_TEST((T != false) == T); + BOOST_TEST((F != true) == T); + BOOST_TEST((F != false) == F); + BOOST_TEST(svn::unknown(X != true)); + BOOST_TEST(svn::unknown(X != false)); +} + +BOOST_AUTO_TEST_CASE(bool_neq_tristate) +{ + BOOST_TEST((true != T) == F); + BOOST_TEST((false != T) == T); + BOOST_TEST((true != F) == T); + BOOST_TEST((false != F) == F); + BOOST_TEST(svn::unknown(true != X)); + BOOST_TEST(svn::unknown(false != X)); +} + +BOOST_AUTO_TEST_SUITE_END(); + + +#ifdef SVNXX_USE_BOOST +namespace { +constexpr auto boost_T = boost::tribool(true); +constexpr auto boost_F = boost::tribool(false); +constexpr auto boost_X = boost::tribool(boost::indeterminate); +} // anonymous namespace + +BOOST_AUTO_TEST_SUITE(tristate_tribool); + +BOOST_AUTO_TEST_CASE(conversion_to_tribool) +{ + boost::tribool state; + BOOST_TEST((state = T) == boost_T); + BOOST_TEST((state = F) == boost_F); + BOOST_TEST(boost::indeterminate(X)); +} + +BOOST_AUTO_TEST_CASE(conversion_from_tribool) +{ + svn::tristate state(false); // Note: no public default constructor. + BOOST_TEST((state = boost_T) == T); + BOOST_TEST((state = boost_F) == F); + BOOST_TEST(svn::unknown(boost_X)); +} + +BOOST_AUTO_TEST_CASE(tristate_and_tribool) +{ + BOOST_TEST((T && boost_T) == T); + BOOST_TEST((T && boost_F) == F); + BOOST_TEST((F && boost_T) == F); + BOOST_TEST((F && boost_F) == F); + BOOST_TEST(svn::unknown(T && boost_X)); + BOOST_TEST(svn::unknown(X && boost_T)); + BOOST_TEST((F && boost_X) == F); + BOOST_TEST((X && boost_F) == F); + BOOST_TEST(svn::unknown(X && boost_X)); +} + +BOOST_AUTO_TEST_CASE(tribool_and_tristate) +{ + BOOST_TEST((boost_T && T) == T); + BOOST_TEST((boost_T && F) == F); + BOOST_TEST((boost_F && T) == F); + BOOST_TEST((boost_F && F) == F); + BOOST_TEST(svn::unknown(boost_T && X)); + BOOST_TEST(svn::unknown(boost_X && T)); + BOOST_TEST((boost_F && X) == F); + BOOST_TEST((boost_X && F) == F); + BOOST_TEST(svn::unknown(boost_X && X)); +} + +BOOST_AUTO_TEST_CASE(tristate_or_tribool) +{ + BOOST_TEST((T || boost_T) == T); + BOOST_TEST((T || boost_F) == T); + BOOST_TEST((F || boost_T) == T); + BOOST_TEST((F || boost_F) == F); + BOOST_TEST((T || boost_X) == T); + BOOST_TEST((X || boost_T) == T); + BOOST_TEST(svn::unknown(F || boost_X)); + BOOST_TEST(svn::unknown(X || boost_F)); + BOOST_TEST(svn::unknown(X || boost_X)); +} + +BOOST_AUTO_TEST_CASE(tribool_or_tristate) +{ + BOOST_TEST((boost_T || T) == T); + BOOST_TEST((boost_T || F) == T); + BOOST_TEST((boost_F || T) == T); + BOOST_TEST((boost_F || F) == F); + BOOST_TEST((boost_T || X) == T); + BOOST_TEST((boost_X || T) == T); + BOOST_TEST(svn::unknown(boost_F || X)); + BOOST_TEST(svn::unknown(boost_X || F)); + BOOST_TEST(svn::unknown(boost_X || X)); +} + +BOOST_AUTO_TEST_CASE(tristate_eq_tribool) +{ + BOOST_TEST((T == boost_T) == T); + BOOST_TEST((T == boost_F) == F); + BOOST_TEST(svn::unknown(T == boost_X)); + BOOST_TEST((F == boost_T) == F); + BOOST_TEST((F == boost_F) == T); + BOOST_TEST(svn::unknown(F == boost_X)); + BOOST_TEST(svn::unknown(X == boost_T)); + BOOST_TEST(svn::unknown(X == boost_F)); + BOOST_TEST(svn::unknown(X == boost_X)); +} + +BOOST_AUTO_TEST_CASE(tribool_eq_tristate) +{ + BOOST_TEST((boost_T == T) == T); + BOOST_TEST((boost_T == F) == F); + BOOST_TEST(svn::unknown(boost_T == X)); + BOOST_TEST((boost_F == T) == F); + BOOST_TEST((boost_F == F) == T); + BOOST_TEST(svn::unknown(boost_F == X)); + BOOST_TEST(svn::unknown(boost_X == T)); + BOOST_TEST(svn::unknown(boost_X == F)); + BOOST_TEST(svn::unknown(boost_X == X)); +} + +BOOST_AUTO_TEST_SUITE_END(); +#endif // SVNXX_USE_BOOST diff --git a/subversion/bindings/cxxhl/README b/subversion/bindings/cxxhl/README deleted file mode 100644 index 6bb2a1d..0000000 --- a/subversion/bindings/cxxhl/README +++ /dev/null @@ -1,13 +0,0 @@ -WORK IN PROGRESS -================ - -This directory contains an experimental implementation of a C++HL, a -high-level Subversion C++ API, modeled along the lines of JavaHL. - -It is far from complete and may never see the light of day. - -On the other hand, one good reason for having a high-level C++ API is -to use it as a baseline for Swig-generated binadings. Our current set -of Perl, Python and Ruby bindings is too heterogenous in terms of -feature set, object and usage model. They're almost as hard to use as -the C API itself. \ No newline at end of file diff --git a/subversion/bindings/cxxhl/include/svncxxhl.hpp b/subversion/bindings/cxxhl/include/svncxxhl.hpp deleted file mode 100644 index 0175bdf..0000000 --- a/subversion/bindings/cxxhl/include/svncxxhl.hpp +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @copyright - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * @endcopyright - */ - -#ifndef __cplusplus -#error "This is a C++ header file." -#endif - -#ifndef SVN_CXXHL_HPP -#define SVN_CXXHL_HPP - -// Expose the whole API and alias the default version namespace -#include "svncxxhl/exception.hpp" -#include "svncxxhl/tristate.hpp" - -namespace SVN = ::apache::subversion::cxxhl; - -#endif // SVN_CXXHL_HPP diff --git a/subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp b/subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp deleted file mode 100644 index 28c99f1..0000000 --- a/subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp +++ /dev/null @@ -1,144 +0,0 @@ -/** - * @copyright - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * @endcopyright - */ - -#ifndef __cplusplus -#error "This is a C++ header file." -#endif - -#ifndef SVN_CXXHL_COMPAT_HPP -#define SVN_CXXHL_COMPAT_HPP - -// Configuration test: std::shared_ptr<> and friends -// Currently detects: clang++, g++, msvc-2010+ -#ifndef SVN_CXXHL_HAVE_STD_SMART_PTRS -# if (defined(__clang__) && __cplusplus >= 201103L) \ - || (defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__)) \ - || (defined(_MSC_VER) && _MSC_VER >= 1600) -# define SVN_CXXHL_HAVE_STD_SMART_PTRS -# endif // config test: std::shared_ptr<> -#endif // SVN_CXXHL_HAVE_STD_SMART_PTRS - -// Configuration test: std::tr1::shared_ptr<> and friends -// Currently detects: clang++, g++ -#ifndef SVN_CXXHL_HAVE_STD_SMART_PTRS -# ifndef SVN_CXXHL_HAVE_STD_TR1_SMART_PTRS -# if defined(__GNUC__) \ - && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 1) -# define SVN_CXXHL_HAVE_STD_TR1_SMART_PTRS -# endif // config test: std::tr1::shared_ptr<> -# endif // SVN_CXXHL_HAVE_STD_TR1_SMART_PTRS -#endif // SVN_CXXHL_HAVE_STD_SMART_PTRS - - -#if defined(SVN_CXXHL_HAVE_STD_SMART_PTRS) - -#include -namespace apache { -namespace subversion { -namespace cxxhl { -namespace compat { -using std::weak_ptr; -using std::shared_ptr; -using std::enable_shared_from_this; -} // namespace compat -} // namespace cxxhl -} // namespace subversion -} // namespace apache - -#elif defined(SVN_CXXHL_HAVE_STD_TR1_SMART_PTRS) - -#include -namespace apache { -namespace subversion { -namespace cxxhl { -namespace compat { -using std::tr1::weak_ptr; -using std::tr1::shared_ptr; -using std::tr1::enable_shared_from_this; -} // namespace compat -} // namespace cxxhl -} // namespace subversion -} // namespace apache - -#else -// We need smart pointers from somewhere. If we cannot find them in -// ::std given known compiler characteristics, then try Boost as a -// last resort. - -#define SVN_CXXHL_USING_BOOST -#include -namespace apache { -namespace subversion { -namespace cxxhl { -namespace compat { -using boost::weak_ptr; -using boost::shared_ptr; -using boost::enable_shared_from_this; -} // namespace compat -} // namespace cxxhl -} // namespace subversion -} // namespace apache - -#endif // SVN_CXXHL_HAVE_STD_SMART_PTRS - -// Configuration test: noncopyable mixin. -#ifdef SVN_CXXHL_USING_BOOST - -#include -namespace apache { -namespace subversion { -namespace cxxhl { -namespace compat { -using boost::noncopyable; -} // namespace compat -} // namespace cxxhl -} // namespace subversion -} // namespace apache - -#else // !SVN_CXXHL_USING_BOOST - -namespace apache { -namespace subversion { -namespace cxxhl { -namespace compat { -namespace noncopyable_ -{ -class noncopyable -{ -protected: - noncopyable() {} - ~noncopyable() {} -private: - noncopyable(const noncopyable&); - noncopyable& operator=(const noncopyable&); -}; -} // namespace noncopyable_ -typedef noncopyable_::noncopyable noncopyable; -} // namespace compat -} // namespace cxxhl -} // namespace subversion -} // namespace apache - -#endif // SVN_CXXHL_USING_BOOST - -#endif // SVN_CXXHL_COMPAT_HPP diff --git a/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp b/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp deleted file mode 100644 index 13e5fbd..0000000 --- a/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp +++ /dev/null @@ -1,188 +0,0 @@ -/** - * @copyright - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * @endcopyright - */ - -#ifndef __cplusplus -#error "This is a C++ header file." -#endif - -#ifndef SVN_CXXHL_EXCEPTION_HPP -#define SVN_CXXHL_EXCEPTION_HPP - -#include -#include -#include -#include - -#include "svncxxhl/_compat.hpp" - -namespace apache { -namespace subversion { -namespace cxxhl { - -namespace compat {} // Announce the compat namespace for shared_ptr lookup - -namespace detail { -// Forward declaration of implementation-specific structure -class ErrorDescription; -} // namespace detail - -/** - * Exceptions generated by the C++HL implementation. - */ -class InternalError : public std::exception -{ -public: - explicit InternalError(const char* description); - - InternalError(const InternalError& that) throw(); - InternalError& operator= (const InternalError& that) throw(); - virtual ~InternalError() throw(); - - /** - * Returns the message associated with this exception object. - */ - virtual const char* what() const throw(); - -protected: - typedef compat::shared_ptr description_ptr; - explicit InternalError(description_ptr description) throw(); - description_ptr m_description; -}; - -/** - * Encapsulate a stack of Subversion error codes and messages. - */ -class Error : public InternalError -{ -public: - Error(const Error& that) throw(); - Error& operator=(const Error& that) throw(); - virtual ~Error() throw(); - - /** - * Returns the error code associated with the top-level error that - * caused the exception. - */ - virtual int code() const throw(); - - /** - * Error message description. - */ - class Message - { - public: - /** - * Create a message object given an error code and error message. - */ - Message(int errval, const std::string& message) - : m_errno(errval), - m_message(message), - m_trace(false) - {} - - /** - * Create a message object given an error code and error message, - * and set the flag that tells if this is a debugging traceback entry. - */ - Message(int errval, const std::string& message, bool trace) - : m_errno(errval), - m_message(message), - m_trace(trace) - {} - - /** - * Return the error code. - */ - int code() const throw() { return m_errno; } - - /** - * Return the error message. - */ - const std::string& message() const throw() { return m_message; } - - /** - * Return the generic error message associated with the error code. - */ - const char* generic_message() const; - - /** - * Check if this message is in fact a debugging traceback entry. - */ - bool trace() const throw() { return m_trace; } - - private: - int m_errno; - std::string m_message; - bool m_trace; - }; - - /** - * The list of messages associated with an error. - */ - typedef std::vector MessageList; - - /** - * Returns the complete list of error messages, including those from - * nested errors. - */ - virtual MessageList messages() const - { - return compile_messages(false); - } - - /** - * Like error::messages(), but includes debugging traceback. - * - * @note - * Traceback is only available if the Subversion libraries were - * compiled with tracing enabled. - */ - virtual MessageList traced_messages() const - { - return compile_messages(true); - } - -protected: - explicit Error(description_ptr description) throw() - : InternalError(description) - {} - MessageList compile_messages(bool show_traces) const; -}; - -/** - * Thrown instead of Error when the error chain contains a - * @c SVN_ERR_CANCELLED error code. - */ -class Cancelled : public Error -{ -protected: - explicit Cancelled(description_ptr description) throw() - : Error(description) - {} -}; - -} // namespace cxxhl -} // namespace subversion -} // namespace apache - -#endif // SVN_CXXHL_EXCEPTION_HPP diff --git a/subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp b/subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp deleted file mode 100644 index 2b52ef1..0000000 --- a/subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp +++ /dev/null @@ -1,64 +0,0 @@ -/** - * @copyright - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * @endcopyright - */ - -#ifndef __cplusplus -#error "This is a C++ header file." -#endif - -#ifndef SVN_CXXHL_TRISTATE_HPP -#define SVN_CXXHL_TRISTATE_HPP - -namespace apache { -namespace subversion { -namespace cxxhl { - -class Tristate -{ -public: - static const Tristate TRUE; - static const Tristate FALSE; - static const Tristate UNKNOWN; - - Tristate(const Tristate& that) throw() - : m_value(that.m_value) - {} - - bool operator==(const Tristate& that) const throw() - { return m_value == that.m_value; } - - bool operator!=(const Tristate& that) const throw() - { return !(*this == that); } - - bool known() const throw() - { return *this != UNKNOWN; } - -private: - explicit Tristate(short int value) throw(); - short int m_value; -}; - -} // namespace cxxhl -} // namespace subversion -} // namespace apache - -#endif // SVN_CXXHL_TRISTATE_HPP diff --git a/subversion/bindings/cxxhl/src/aprwrap.hpp b/subversion/bindings/cxxhl/src/aprwrap.hpp deleted file mode 100644 index f1525f3..0000000 --- a/subversion/bindings/cxxhl/src/aprwrap.hpp +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @copyright - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * @endcopyright - */ - -#ifndef SVN_CXXHL_PRIVATE_APRWRAP_H -#define SVN_CXXHL_PRIVATE_APRWRAP_H - -// Expose the whole APR wrapper API and alias the namespace -#include "aprwrap/pool.hpp" -#include "aprwrap/hash.hpp" -#include "aprwrap/array.hpp" - -namespace APR = ::apache::subversion::cxxhl::apr; - -#endif // SVN_CXXHL_PRIVATE_APRWRAP_H diff --git a/subversion/bindings/cxxhl/src/aprwrap/array.hpp b/subversion/bindings/cxxhl/src/aprwrap/array.hpp deleted file mode 100644 index 681489e..0000000 --- a/subversion/bindings/cxxhl/src/aprwrap/array.hpp +++ /dev/null @@ -1,280 +0,0 @@ -/** - * @copyright - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * @endcopyright - */ - -#ifndef SVN_CXXHL_PRIVATE_APRWRAP_ARRAY_H -#define SVN_CXXHL_PRIVATE_APRWRAP_ARRAY_H - -#include - -#include -#include "pool.hpp" - -#include "svn_private_config.h" - -namespace apache { -namespace subversion { -namespace cxxhl { -namespace apr { - -/** - * Proxy for an APR array. - * - * This class does not own the array. The array's lifetime is tied to - * its pool. The caller is responsible for making sure that the - * array's lifetime is longer than this proxy object's. - */ -template class Array -{ -public: - typedef T value_type; - typedef int size_type; - - /** - * Create and proxy a new APR array allocated from @a pool. - * Reserve space for @a nelts array elements. - */ - explicit Array(const Pool& pool, size_type nelts = 0) throw() - : m_array(apr_array_make(pool.get(), nelts, sizeof(value_type))) - {} - - /** - * Create a new proxy for the APR array @a array. - */ - explicit Array(apr_array_header_t* array) - : m_array(array) - { - if (m_array->elt_size != sizeof(value_type)) - throw std::invalid_argument( - _("APR array element size does not match template parameter")); - } - - /** - * @return The wrapped APR array. - */ - apr_array_header_t* array() const throw() - { - return m_array; - } - - /** - * @return the number of elements in the wrapped APR array. - */ - size_type size() const throw() - { - return m_array->nelts; - } - - /** - * @return An immutable reference to the array element at @a index. - */ - const value_type& operator[](size_type index) const throw() - { - return APR_ARRAY_IDX(m_array, index, value_type); - } - - /** - * @return An immutable reference to the array element at @a index. - * Like operator[] but perfoms a range check on the index. - */ - const value_type& at(size_type index) const - { - if (index < 0 || index >= size()) - throw std::out_of_range(_("APR array index is out of range")); - return (*this)[index]; - } - - /** - * @return A mutable reference to the array element at @a index. - */ - value_type& operator[](size_type index) throw() - { - return APR_ARRAY_IDX(m_array, index, value_type); - } - - /** - * @return A mutable reference to the array element at @a index. - * Like operator[] but perfoms a range check on the index. - */ - value_type& at(size_type index) - { - if (index < 0 || index >= size()) - throw std::out_of_range(_("APR array index is out of range")); - return (*this)[index]; - } - - /** - * Push @a value onto the end of the APR array. - */ - void push(const value_type& value) throw() - { - APR_ARRAY_PUSH(m_array, value_type) = value; - } - - /** - * Pop a value from the end of the array. - * @return A pointer to the value that was removed, or @c NULL if - * the array was empty. - */ - value_type* pop() throw() - { - return static_cast(apr_array_pop(m_array)); - } - - /** - * Abstract base class for mutable iteration callback functors. - */ - struct Iteration - { - /** - * Called by Array::iterate for every value in the array. - * @return @c false to terminate the iteration, @c true otherwise. - */ - virtual bool operator() (value_type& value) = 0; - }; - - /** - * Iterate over all the values pairs in the array, invoking - * @a callback for each one. - */ - void iterate(Iteration& callback) - { - for (size_type n = 0; n < size(); ++n) - if (!callback((*this)[n])) - break; - } - - /** - * Abstract base class for immutable iteration callback functors. - */ - struct ConstIteration - { - /** - * Called by Array::iterate for every value in the array. - * @return @c false to terminate the iteration, @c true otherwise. - */ - virtual bool operator() (const value_type& value) = 0; - }; - - /** - * Iterate over all the values pairs in the array, invoking - * @a callback for each one. - */ - void iterate(ConstIteration& callback) const - { - for (size_type n = 0; n < size(); ++n) - if (!callback((*this)[n])) - break; - } - -private: - apr_array_header_t* const m_array; ///< The wrapperd APR array. -}; - - -/** - * Proxy for an immutable APR array. - */ -template -class ConstArray : private Array -{ - typedef Array inherited; - -public: - typedef typename inherited::value_type value_type; - typedef typename inherited::size_type size_type; - - /** - * Create a new proxy for the APR array wrapped by @a that. - */ - ConstArray(const ConstArray& that) throw() - : inherited(that) - {} - - /** - * Create a new proxy for the APR array wrapped by @a that. - */ - explicit ConstArray(const inherited& that) throw() - : inherited(that) - {} - - /** - * Create a new proxy for the APR array @a array. - */ - explicit ConstArray(const apr_array_header_t* array) - : inherited(const_cast(array)) - {} - - /** - * @return The wrapped APR array. - */ - const apr_array_header_t* array() const throw() - { - return inherited::array(); - } - - /** - * @return The number of elements in the wrapped APR array. - */ - size_type size() const throw() - { - return inherited::size(); - } - - /** - * @return An immutable reference to the array element at @a index. - */ - const value_type& operator[](size_type index) const throw() - { - return inherited::operator[](index); - } - - /** - * @return An immutable reference to the array element at @a index. - * Like operator[] but perfoms a range check on the index. - */ - const value_type& at(size_type index) const - { - return inherited::at(index); - } - - /** - * Abstract base class for immutable iteration callback functors. - */ - typedef typename inherited::ConstIteration Iteration; - - /** - * Iterate over all the values pairs in the array, invoking - * @a callback for each one. - */ - void iterate(Iteration& callback) const - { - inherited::iterate(callback); - } -}; - -} // namespace apr -} // namespace cxxhl -} // namespace subversion -} // namespace apache - -#endif // SVN_CXXHL_PRIVATE_APRWRAP_HASH_H diff --git a/subversion/bindings/cxxhl/src/aprwrap/hash.hpp b/subversion/bindings/cxxhl/src/aprwrap/hash.hpp deleted file mode 100644 index d779cb3..0000000 --- a/subversion/bindings/cxxhl/src/aprwrap/hash.hpp +++ /dev/null @@ -1,371 +0,0 @@ -/** - * @copyright - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * @endcopyright - */ - -#ifndef SVN_CXXHL_PRIVATE_APRWRAP_HASH_H -#define SVN_CXXHL_PRIVATE_APRWRAP_HASH_H - -#include -#include "pool.hpp" - -namespace apache { -namespace subversion { -namespace cxxhl { -namespace apr { - -// Template forward declaration -template -class Hash; - -/** - * Proxy for an APR hash table. - * This is a template specialization for the default hash type. - */ -template<> -class Hash -{ -public: - struct Iteration; - - /** - * Iterate over all the key-value pairs in the hash table, invoking - * @a callback for each pair. - * Uses @a scratch_pool for temporary allocations. - */ - void iterate(Iteration& callback, const Pool& scratch_pool); - -public: - /** - * Proxy for a key in an APR hash table. - * This is a template specialization for the default hash key type. - */ - class Key - { - public: - typedef const void* key_type; - typedef apr_ssize_t size_type; - - /** - * Public constructor. Uses the template @a Size parameter. - */ - Key(key_type key) throw() - : m_key(key), m_size(APR_HASH_KEY_STRING) - {} - - /** - * Get the value of the key. - */ - key_type get() const throw() { return m_key; } - - /** - * Get the size of the key. - */ - size_type size() const throw() { return m_size; } - - protected: - /** - * Constructor used by the generic template, specializations and - * hash table wrapper. Does not make assumptions about the key size. - */ - Key(key_type key, size_type size) throw() - : m_key(key), m_size(size) - {} - - /** - * The hash table wrapper must be able to call the protected constructor. - */ - friend void Hash::iterate(Hash::Iteration&, const Pool&); - - private: - const key_type m_key; ///< Immutable reference to the key - const size_type m_size; ///< The size of the key - }; - -public: - typedef Key::key_type key_type; - typedef void* value_type; - typedef unsigned int size_type; - - /** - * Create and proxy a new APR hash table in @a pool. - */ - explicit Hash(const Pool& pool) throw() - : m_hash(apr_hash_make(pool.get())) - {} - - /** - * Create and proxy a new APR hash table in @a pool, using @a - * hash_func as the hash function. - */ - explicit Hash(const Pool& pool, apr_hashfunc_t hash_func) throw() - : m_hash(apr_hash_make_custom(pool.get(), hash_func)) - {} - - /** - * Create a proxy for the APR hash table @a hash. - */ - explicit Hash(apr_hash_t* hash) - : m_hash(hash) - {} - - /** - * Return the wrapped APR hash table. - */ - apr_hash_t* hash() const throw() - { - return m_hash; - } - - /** - * Return the number of key-value pairs in the wrapped hash table. - */ - size_type size() const throw() - { - return apr_hash_count(m_hash); - } - - /** - * Set @a key = @a value in the wrapped hash table. - */ - void set(const Key& key, value_type value) throw() - { - apr_hash_set(m_hash, key.get(), key.size(), value); - } - - /** - * Retrieve the value associated with @a key. - */ - value_type get(const Key& key) const throw() - { - return apr_hash_get(m_hash, key.get(), key.size()); - } - - /** - * Delete the entry for @a key. - */ - void del(const Key& key) throw() - { - apr_hash_set(m_hash, key.get(), key.size(), NULL); - } - - /** - * Abstract base class for iteration callback functors. - */ - struct Iteration - { - /** - * Called by Hash::iterate for every key-value pair in the hash table. - * @return @c false to terminate the iteration, @c true otherwise. - */ - virtual bool operator() (const Key& key, value_type value) = 0; - }; - -protected: - typedef const void* const_value_type; - - /** - * Set @a key = @a value in the wrapped hash table. Overloaded for - * deroved template instantiations with constant values; for - * example, Hash. - */ - void set(const Key& key, const_value_type const_value) throw() - { - set(key, const_cast(const_value)); - } - -private: - apr_hash_t* const m_hash; ///< The wrapped APR hash table. -}; - - -/** - * Proxy for an APR hash table: the template. - * - * This class does not own the hash table. The hash table's lifetime - * is tied to its pool. The caller is responsible for making sure that - * the hash table's lifetime is longer than this proxy object's. - */ -template -class Hash : private Hash -{ - typedef Hash inherited; - -public: - /** - * Proxy for a key in an APR hash table. - * - * This class does not own the key; it is the caller's responsibility - * to make sure that the key's lifetime is longer than the proxy - * object's. - */ - class Key : private inherited::Key - { - typedef Hash::Key inherited; - - /** - * The wrapper must be able to call the private constructor and - * convert references to the base class. - */ - friend class Hash; - - public: - typedef const K* key_type; - typedef inherited::size_type size_type; - - Key(key_type key) throw() - : inherited(key, KeySize) - {} - - /** - * Get the value of the key. - */ - key_type get() const throw() - { - return static_cast(inherited::get()); - } - - /** - * Get the size of the key. - */ - size_type size() const throw() - { - return inherited::size(); - } - - private: - /** - * Conversion constructor used by the derived iteration class. - */ - explicit Key(const inherited& that) throw() - : inherited(that) - {} - }; - -public: - typedef typename Key::key_type key_type; - typedef V* value_type; - - /** - * Create and proxy a new APR hash table allocated from @a pool. - */ - explicit Hash(const Pool& pool) throw() - : inherited(pool) - {} - - /** - * Create and proxy a new APR hash table allocated from @a pool, - * using @a hash_func as the hash function. - */ - explicit Hash(const Pool& pool, apr_hashfunc_t hash_func) throw() - : inherited(pool, hash_func) - {} - - /** - * Create a proxy for the APR hash table @a hash. - */ - explicit Hash(apr_hash_t* hash) - : inherited(hash) - {} - - /** - * @return The wrapped APR hash table. - */ - apr_hash_t* hash() const throw() - { - return inherited::hash(); - } - - /** - * Return the number of key-value pairs in the wrapped hash table. - */ - size_type size() const throw() - { - return inherited::size(); - } - - /** - * Set @a key = @a value in the wrapped hash table. - */ - void set(const Key& key, value_type value) throw() - { - inherited::set(inherited::Key(key), value); - } - - /** - * Retrieve the value associated with @a key. - */ - value_type get(const Key& key) const throw() - { - return static_cast(inherited::get(inherited::Key(key))); - } - - /** - * Delete the entry for @a key. - */ - void del(const Key& key) throw() - { - inherited::del(inherited::Key(key)); - } - - /** - * Abstract base class for iteration callback functors. - */ - struct Iteration : protected inherited::Iteration - { - /** - * Called by Hash::iterate for every key-value pair in the hash table. - * @return @c false to terminate the iteration, @c true otherwise. - */ - virtual bool operator() (const Key& key, value_type value) = 0; - - private: - friend void Hash::iterate(Iteration& callback, const Pool& scratch_pool); - - /** - * Implementation of the derived virtual operator(). - * Adapts the callback to the instantiated types. - */ - virtual bool operator() (const inherited::Key& raw_key, - inherited::value_type raw_value) - { - return (*this)(Key(raw_key), static_cast(raw_value)); - } - }; - - /** - * Iterate over all the key-value pairs in the hash table, invoking - * @a callback for each pair. - * Uses @a scratch_pool for temporary allocations. - */ - void iterate(Iteration& callback, const Pool& scratch_pool) - { - inherited::iterate(callback, scratch_pool); - } -}; - - -} // namespace apr -} // namespace cxxhl -} // namespace subversion -} // namespace apache - -#endif // SVN_CXXHL_PRIVATE_APRWRAP_HASH_H diff --git a/subversion/bindings/cxxhl/src/aprwrap/impl.cpp b/subversion/bindings/cxxhl/src/aprwrap/impl.cpp deleted file mode 100644 index 01a4ac0..0000000 --- a/subversion/bindings/cxxhl/src/aprwrap/impl.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/** - * @copyright - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * @endcopyright - */ - -#include - -#include "private/svn_atomic.h" -#include "svn_private_config.h" -#undef TRUE -#undef FALSE - -#include "pool.hpp" -#include "hash.hpp" - -namespace apache { -namespace subversion { -namespace cxxhl { -namespace apr { - -// -// Pool implementation -// - -apr_pool_t* Pool::get_root_pool() -{ - static const svn_atomic_t NONE = 0; - static const svn_atomic_t START = 1; - static const svn_atomic_t DONE = 2; - - static volatile svn_atomic_t init_state = NONE; - static apr_pool_t* root_pool = NULL; - - svn_atomic_t state = svn_atomic_cas(&init_state, START, NONE); - - switch (state) - { - case DONE: - // The root pool has already been initialized. - return root_pool; - - case START: - // Another thread is currently initializing the pool; Spin and - // wait for it to finish, with exponential backoff, but no - // longer than half a second. - for (unsigned shift = 0; state == START && shift < 8; ++shift) - { - apr_sleep((APR_USEC_PER_SEC / 1000) << shift); - state = svn_atomic_cas(&init_state, NONE, NONE); - } - if (state == START) - throw cxxhl::InternalError( - _("APR pool initialization failed: Timed out")); - return root_pool; - - case NONE: - // Initialize the root pool and release the lock. - // We'll assume that we always need thread-safe allocation. - root_pool = svn_pool_create_ex(NULL, svn_pool_create_allocator(true)); - svn_atomic_cas(&init_state, DONE, START); - return root_pool; - - default: - throw cxxhl::InternalError( - _("APR pool initialization failed: Invalid state")); - } -} - -// -// Hash implementation -// - -void Hash::iterate(Hash::Iteration& callback, - const Pool& scratch_pool) -{ - for (apr_hash_index_t* hi = apr_hash_first(scratch_pool.get(), m_hash); - hi; hi = apr_hash_next(hi)) - { - key_type key; - value_type val; - Key::size_type klen; - - apr_hash_this(hi, &key, &klen, &val); - if (!callback(Key(key, klen), val)) - break; - } -} - -} // namespace apr -} // namespace cxxhl -} // namespace subversion -} // namespace apache diff --git a/subversion/bindings/cxxhl/src/aprwrap/pool.hpp b/subversion/bindings/cxxhl/src/aprwrap/pool.hpp deleted file mode 100644 index c253a6a..0000000 --- a/subversion/bindings/cxxhl/src/aprwrap/pool.hpp +++ /dev/null @@ -1,198 +0,0 @@ -/** - * @copyright - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * @endcopyright - */ - -#ifndef SVN_CXXHL_PRIVATE_APRWRAP_POOL_H -#define SVN_CXXHL_PRIVATE_APRWRAP_POOL_H - -#include - -#include "svncxxhl/exception.hpp" -#include "svncxxhl/_compat.hpp" - -#include "svn_pools.h" -#undef TRUE -#undef FALSE - -namespace apache { -namespace subversion { -namespace cxxhl { -namespace apr { - -// Forward declaration -class IterationPool; - -/** - * Encapsulates an APR pool. - */ -class Pool : compat::noncopyable -{ -public: - /** - * Create a pool as a child of the applications' root pool. - */ - Pool() - : m_pool(svn_pool_create(get_root_pool())) - {} - - /** - * Create a pool as a child of @a parent. - */ - explicit Pool(Pool* parent) throw() - : m_pool(svn_pool_create(parent->m_pool)) - {} - - /** - * Destroy the pool. - */ - ~Pool() throw() - { - svn_pool_destroy(m_pool); - } - - /** - * Clear the pool. - */ - void clear() throw() - { - apr_pool_clear(m_pool); - } - - /** - * Retuurn a pool pointer that can be used by the C APIs. - */ - apr_pool_t* get() const throw() - { - return m_pool; - } - - /** - * Allocate space for @a count elements of type @a T from the pool. - * The contents of the allocated buffer will contain unspecified data. - */ - template - T* alloc(std::size_t count) throw() - { - return static_cast(apr_palloc(m_pool, count * sizeof(T))); - } - - /** - * Allocate space for @a count elements of type @a T from the pool. - * The contents of the allocated buffer will be initialized to zero. - */ - template - T* allocz(std::size_t count) throw() - { - return static_cast(apr_pcalloc(m_pool, count * sizeof(T))); - } - -private: - static apr_pool_t* get_root_pool(); - apr_pool_t* const m_pool; - -public: - /** - * Pool proxy used for iteration scratch pools. - * - * Construct this object inside a loop body in order to clear the - * proxied pool on every iteration. - */ - class Iteration : compat::noncopyable - { - public: - /** - * The constructor clears the proxied pool. - */ - explicit Iteration(IterationPool& iterbase) throw(); - - /** - * Returns a reference to the proxied pool. - */ - Pool& pool() const throw() - { - return m_pool; - } - - /** - * Proxy method for Pool::get - */ - apr_pool_t* get() const throw() - { - return m_pool.get(); - } - - /** - * Proxy method for Pool::alloc - */ - template - T* alloc(std::size_t count) throw() - { - return m_pool.alloc(count); - } - - /** - * Proxy method for Pool::allocz - */ - template - T* allocz(std::size_t count) throw() - { - return m_pool.allocz(count); - } - - private: - Pool& m_pool; - }; -}; - -/** - * Pool wrapper that hides the pool implementation, except for construction. - * - * Construct this object outside a loop body, then within the body, - * use Pool::Iteration to access the wrapped pool. - */ -class IterationPool : compat::noncopyable -{ -public: - IterationPool() {} - - explicit IterationPool(Pool* parent) throw() - : m_pool(parent) - {} - -private: - friend class Pool::Iteration; - Pool m_pool; -}; - -// Pool::Iteration constructor implementation -inline Pool::Iteration::Iteration(IterationPool& iterbase) throw() - : m_pool(iterbase.m_pool) -{ - m_pool.clear(); -} - -} // namespace apr -} // namespace cxxhl -} // namespace subversion -} // namespace apache - -#endif // SVN_CXXHL_PRIVATE_APRWRAP_POOL_H diff --git a/subversion/bindings/cxxhl/src/exception.cpp b/subversion/bindings/cxxhl/src/exception.cpp deleted file mode 100644 index 0f0ee3f..0000000 --- a/subversion/bindings/cxxhl/src/exception.cpp +++ /dev/null @@ -1,331 +0,0 @@ -/** - * @copyright - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * @endcopyright - */ - -#include -#include -#include -#include -#include - -#include "svncxxhl/exception.hpp" -#include "private.hpp" -#include "aprwrap.hpp" - -#include "svn_error.h" -#include "svn_utf.h" -#include "private/svn_atomic.h" -#include "private/svn_error_private.h" -#include "svn_private_config.h" -#undef TRUE -#undef FALSE - -namespace apache { -namespace subversion { -namespace cxxhl { - -namespace detail { - -class ErrorDescription -{ -public: - typedef compat::shared_ptr shared_ptr; - - static shared_ptr create(const char* message, int error_code, - const char *loc_file, long loc_line, - bool trace_link) - { - const bool empty_message = (message == NULL); - const std::size_t length = (empty_message ? 0 : std::strlen(message)); - void* memblock = ::operator new(length + sizeof(ErrorDescription)); - - ErrorDescription* description = new(memblock) ErrorDescription( - error_code, loc_file, loc_line, trace_link, empty_message); - if (length) - std::memcpy(description->m_message, message, length); - description->m_message[length] = 0; - return shared_ptr(description); - } - - static shared_ptr create(const char* message, int error_code) - { - return create(message, error_code, NULL, 0, false); - } - - ~ErrorDescription() throw() {} - - const char* what() const throw() { return (m_empty ? NULL : m_message); } - int code() const throw() { return m_errno; } - const char* file() const throw() { return m_loc_file; } - long line() const throw() { return m_loc_line; } - bool trace() const throw() { return m_trace; } - shared_ptr& nested() throw() { return m_nested; } - const shared_ptr& nested() const throw() { return m_nested; } - -private: - ErrorDescription(int error_code, - const char *loc_file, long loc_line, - bool trace_link, bool empty_message) throw() - : m_loc_file(loc_file), - m_loc_line(loc_line), - m_trace(trace_link), - m_empty(empty_message), - m_errno(error_code) - {} - - const char* m_loc_file; - long m_loc_line; - bool m_trace; - bool m_empty; - - shared_ptr m_nested; - - int m_errno; ///< The (SVN or APR) error code. - char m_message[1]; ///< The error message -}; - -} // namespace detail - -// -// Class InternalError -// - -InternalError::InternalError(const char* description) - : m_description(detail::ErrorDescription::create(description, 0)) -{} - -InternalError::InternalError(const InternalError& that) throw() - : m_description(that.m_description) -{} - -InternalError& InternalError::operator=(const InternalError& that) throw() -{ - if (this == &that) - return *this; - - // This in-place destroy+copy implementation of the assignment - // operator is safe because both the destructor and the copy - // constructor do not throw exceptions. - this->~InternalError(); - return *new(this) InternalError(that); -} - -InternalError::~InternalError() throw() {} - -const char* InternalError::what() const throw() -{ - return m_description->what(); -} - -InternalError::InternalError(description_ptr description) throw() - : m_description(description) -{} - -// -// Class Error -// - -Error::Error(const Error& that) throw() - : InternalError(that.m_description) -{} - -Error& Error::operator=(const Error& that) throw() -{ - if (this == &that) - return *this; - - // This in-place destroy+copy implementation of the assignment - // operator is safe because both the destructor and the copy - // constructor do not throw exceptions. - this->~Error(); - return *new(this) Error(that); -} - -Error::~Error() throw() {} - -int Error::code() const throw() -{ - return m_description->code(); -} - -namespace { -const char* get_generic_message(apr_status_t error_code, - const APR::Pool& scratch_pool) -{ - char errorbuf[512]; - - // Is this a Subversion-specific error code? - if (error_code > APR_OS_START_USEERR && error_code <= APR_OS_START_CANONERR) - return svn_strerror(error_code, errorbuf, sizeof(errorbuf)); - // Otherwise, this must be an APR error code. - else - { - const char* generic; - svn_error_t* err = svn_utf_cstring_to_utf8( - &generic, - apr_strerror(error_code, errorbuf, sizeof(errorbuf)), - scratch_pool.get()); - if (!err) - return generic; - - // Use fuzzy transliteration instead. - svn_error_clear(err); - return svn_utf_cstring_from_utf8_fuzzy(errorbuf, scratch_pool.get()); - } -} - -void handle_one_error(Error::MessageList& ml, bool show_traces, - const detail::ErrorDescription* descr, - const APR::Pool& pool) -{ - const int error_code = descr->code(); - - if (show_traces && descr->file()) - { - const char* file_utf8 = NULL; - svn_error_t* err = - svn_utf_cstring_to_utf8(&file_utf8, descr->file(), pool.get()); - if (err) - { - svn_error_clear(err); - file_utf8 = NULL; - } - std::ostringstream buffer; - if (file_utf8) - buffer << file_utf8 << ':' << descr->line(); - else - buffer << "svn:"; - if (descr->trace()) - buffer << ','; - else - { -#ifdef SVN_DEBUG - if (const char* symbolic_name = svn_error_symbolic_name(error_code)) - buffer << ": (apr_err=" << symbolic_name << ')'; - else -#endif - buffer << ": (apr_err=" << error_code << ')'; - } - ml.push_back(Error::Message(error_code, buffer.str(), true)); - } - - if (descr->trace()) - return; - - const char *description = descr->what(); - if (!description) - description = get_generic_message(error_code, pool); - ml.push_back(Error::Message(error_code, std::string(description), false)); -} -} // anonymous namespace - -Error::MessageList Error::compile_messages(bool show_traces) const -{ - // Determine the maximum size of the returned list - MessageList::size_type max_length = 0; - for (const detail::ErrorDescription* description = m_description.get(); - description; description = description->nested().get()) - { - if (show_traces && description->file()) - ++max_length; // We will display an error location - if (!description->trace()) - ++max_length; // Traces do not emit a message line - } - MessageList ml; - ml.reserve(max_length); - - // This vector holds a list of all error codes that we've printed - // the generic description for. See svn_handle_error2 for details. - std::vector empties; - empties.reserve(max_length); - - APR::IterationPool iterbase; - for (const detail::ErrorDescription* description = m_description.get(); - description; description = description->nested().get()) - { - APR::Pool::Iteration iterpool(iterbase); - - if (!description->what()) - { - // Non-specific messages are printed only once. - std::vector::iterator it = std::find( - empties.begin(), empties.end(), description->code()); - if (it != empties.end()) - continue; - empties.push_back(description->code()); - } - handle_one_error(ml, show_traces, description, iterpool.pool()); - } - return ml; -} - -const char* Error::Message::generic_message() const -{ - APR::Pool pool; - return get_generic_message(m_errno, pool); -} - -namespace detail { -void checked_call(svn_error_t* err) -{ - if (!err) - return; - - struct ErrorBuilder : public Error - { - explicit ErrorBuilder (ErrorDescription::shared_ptr description) - : Error(description) - {} - }; - - struct CancelledBuilder : public Cancelled - { - explicit CancelledBuilder (ErrorDescription::shared_ptr description) - : Cancelled(description) - {} - }; - - ErrorDescription::shared_ptr description; - ErrorDescription::shared_ptr* current = &description; - - bool cancelled = false; - for (svn_error_t* next = err; next; next = next->child) - { - *current = ErrorDescription::create(next->message, next->apr_err, - next->file, next->line, - svn_error__is_tracing_link(next)); - current = &(*current)->nested(); - if (next->apr_err == SVN_ERR_CANCELLED) - cancelled = true; - } - svn_error_clear(err); - - if (cancelled) - throw CancelledBuilder(description); - else - throw ErrorBuilder(description); -} -} // namespace detail - -} // namespace cxxhl -} // namespace subversion -} // namespace apache diff --git a/subversion/bindings/cxxhl/src/private.hpp b/subversion/bindings/cxxhl/src/private.hpp deleted file mode 100644 index bb61012..0000000 --- a/subversion/bindings/cxxhl/src/private.hpp +++ /dev/null @@ -1,29 +0,0 @@ -/** - * @copyright - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * @endcopyright - */ - -#ifndef SVN_CXXHL_PRIVATE_PRIVATE_H -#define SVN_CXXHL_PRIVATE_PRIVATE_H - -#include "private/exception-private.hpp" - -#endif // SVN_CXXHL_PRIVATE_PRIVATE_H diff --git a/subversion/bindings/cxxhl/src/private/exception-private.hpp b/subversion/bindings/cxxhl/src/private/exception-private.hpp deleted file mode 100644 index 34ffdfd..0000000 --- a/subversion/bindings/cxxhl/src/private/exception-private.hpp +++ /dev/null @@ -1,49 +0,0 @@ -/** - * @copyright - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * @endcopyright - */ - -#ifndef __cplusplus -#error "This is a C++ header file." -#endif - -#ifndef SVN_CXXHL_PRIVATE_EXCEPTION_HPP -#define SVN_CXXHL_PRIVATE_EXCEPTION_HPP - -#include "svn_error.h" - -namespace apache { -namespace subversion { -namespace cxxhl { -namespace detail { - -/** - * Given a @a err, if it is not @c NULL, convert it to a and throw an - * Error exception; otherwise do nothing. - */ -void checked_call(svn_error_t* err); - -} // namespace detail -} // namespace cxxhl -} // namespace subversion -} // namespace apache - -#endif // SVN_CXXHL_PRIVATE_EXCEPTION_HPP diff --git a/subversion/bindings/cxxhl/src/tristate.cpp b/subversion/bindings/cxxhl/src/tristate.cpp deleted file mode 100644 index 75a8142..0000000 --- a/subversion/bindings/cxxhl/src/tristate.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/** - * @copyright - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * @endcopyright - */ - -#include "svncxxhl/tristate.hpp" - -#include "svn_types.h" -#undef TRUE -#undef FALSE - -namespace apache { -namespace subversion { -namespace cxxhl { - -Tristate::Tristate(short value) throw() - : m_value(value) -{} - -const Tristate Tristate::TRUE = Tristate(svn_tristate_true); -const Tristate Tristate::FALSE = Tristate(svn_tristate_false); -const Tristate Tristate::UNKNOWN = Tristate(svn_tristate_unknown); - -} // namespace cxxhl -} // namespace subversion -} // namespace apache diff --git a/subversion/bindings/cxxhl/tests/cxxhl-tests.cpp b/subversion/bindings/cxxhl/tests/cxxhl-tests.cpp deleted file mode 100644 index 5589aac..0000000 --- a/subversion/bindings/cxxhl/tests/cxxhl-tests.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ - -#include -#include - -#include -#include - -#include -#include - -int main(int argc, char** argv) -{ - apr_status_t status = apr_initialize(); - if (status) - { - char errbuf[512]; - std::cerr << "APR initialization failed: " - << apr_strerror(status, errbuf, sizeof(errbuf) - 1) - << std::endl; - return 7; - } - std::atexit(apr_terminate); - - testing::InitGoogleMock(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/subversion/bindings/cxxhl/tests/test_aprwrap.cpp b/subversion/bindings/cxxhl/tests/test_aprwrap.cpp deleted file mode 100644 index bf3f180..0000000 --- a/subversion/bindings/cxxhl/tests/test_aprwrap.cpp +++ /dev/null @@ -1,435 +0,0 @@ -/* - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ - -#include -#include - -#include "../src/aprwrap.hpp" - -#include - -// -// Pools -// - -TEST(Pools, InitializeGlobalPool) -{ - APR::Pool pool; - EXPECT_THAT(pool.get(), testing::NotNull()); - EXPECT_THAT(apr_pool_parent_get(pool.get()), testing::NotNull()); -} - -TEST(Pools, CreateSubpool) -{ - APR::Pool pool; - APR::Pool subpool(&pool); - EXPECT_EQ(pool.get(), apr_pool_parent_get(subpool.get())); -} - -TEST(Pools, TypedAllocate) -{ - APR::Pool pool; - const unsigned char* buffer = pool.alloc(1); - EXPECT_THAT(buffer, testing::NotNull()); -} - -// N.B.: This test may pass randomly even if zero-filled allocation -// does not work correctly, since we cannot make assumptions about the -// values of uninitialized memory. -TEST(Pools, TypedAllocateZerofill) -{ - APR::Pool pool; - static const std::size_t size = 32757; - const unsigned char* buffer = pool.allocz(size); - ASSERT_THAT(buffer, testing::NotNull()); - EXPECT_EQ(size, std::count(buffer, buffer + size, 0)); -} - -// -// Array helper functions -// - -namespace { -// Create a randomly-ordered array of constant strings. -apr_array_header_t* fill_array(APR::Pool& pool) -{ - apr_array_header_t* a = apr_array_make(pool.get(), 0, sizeof(const char*)); - APR_ARRAY_PUSH(a, const char*) = "primus"; - APR_ARRAY_PUSH(a, const char*) = "secundus"; - APR_ARRAY_PUSH(a, const char*) = "tertius"; - APR_ARRAY_PUSH(a, const char*) = "quartus"; - APR_ARRAY_PUSH(a, const char*) = "quintus"; - APR_ARRAY_PUSH(a, const char*) = "sextus"; - APR_ARRAY_PUSH(a, const char*) = "septimus"; - std::random_shuffle(&APR_ARRAY_IDX(a, 0, const char*), - &APR_ARRAY_IDX(a, a->nelts, const char*)); - return a; -} -} // anonymous namespace - -// -// Arrays -// - -TEST(Arrays, CreateArray) -{ - typedef APR::Array Array; - - APR::Pool pool; - Array array(pool); - - EXPECT_THAT(array.array(), testing::NotNull()); - EXPECT_EQ(0, array.size()); - EXPECT_EQ(sizeof(unsigned char), sizeof(Array::value_type)); - EXPECT_EQ(sizeof(Array::value_type), array.array()->elt_size); -} - -TEST(Arrays, WrapArray) -{ - typedef APR::Array Array; - - APR::Pool pool; - apr_array_header_t* apr_array = - apr_array_make(pool.get(), 0, sizeof(Array::value_type)); - ASSERT_THAT(apr_array, testing::NotNull()); - - Array array(apr_array); - EXPECT_EQ(apr_array, array.array()); - EXPECT_EQ(0, array.size()); -} - -TEST(Arrays, RewrapTypeMismatch) -{ - typedef APR::Array ByteArray; - typedef APR::Array IntArray; - - APR::Pool pool; - EXPECT_THROW(ByteArray array(IntArray(pool).array()), - std::invalid_argument); -} - -TEST(Arrays, OutOfBounds) -{ - typedef APR::Array Array; - - APR::Pool pool; - Array array(pool); - - EXPECT_THROW(array.at(-1), std::out_of_range); - EXPECT_THROW(array.at(array.size()), std::out_of_range); -} - -TEST(Arrays, Indexing) -{ - typedef APR::Array Array; - - APR::Pool pool; - Array array(fill_array(pool)); - - EXPECT_STREQ(array[0], APR_ARRAY_IDX(array.array(), 0, Array::value_type)); - EXPECT_STREQ(array[array.size() - 1], APR_ARRAY_IDX(array.array(), - array.array()->nelts - 1, - Array::value_type)); -} - -TEST(Arrays, CheckedIndexing) -{ - typedef APR::Array Array; - - APR::Pool pool; - Array array(fill_array(pool)); - - EXPECT_STREQ(array.at(0), APR_ARRAY_IDX(array.array(), 0, Array::value_type)); - EXPECT_STREQ(array.at(array.size() - 1), - APR_ARRAY_IDX(array.array(), array.array()->nelts - 1, - Array::value_type)); -} - -TEST(Arrays, Iteration) -{ - typedef APR::Array Array; - - APR::Pool pool; - Array array(fill_array(pool)); - - struct Iteration : public Array::Iteration - { - Iteration(apr_array_header_t* raw_array) - : m_index(0), m_raw_array(raw_array) - {} - - bool operator()(Array::value_type& value) - { - EXPECT_STREQ(value, APR_ARRAY_IDX(m_raw_array, m_index, - Array::value_type)); - ++m_index; - return true; - } - - private: - Array::size_type m_index; - apr_array_header_t* m_raw_array; - } callback(array.array()); - - array.iterate(callback); -} - -TEST(Arrays, ConstIteration) -{ - typedef APR::Array Array; - - APR::Pool pool; - Array array(fill_array(pool)); - - struct Iteration : public Array::ConstIteration - { - Iteration(const apr_array_header_t* raw_array) - : m_index(0), m_raw_array(raw_array) - {} - - bool operator()(const Array::value_type& value) - { - EXPECT_STREQ(value, APR_ARRAY_IDX(m_raw_array, m_index, - Array::value_type)); - ++m_index; - return true; - } - - private: - Array::size_type m_index; - const apr_array_header_t* m_raw_array; - } callback(array.array()); - - array.iterate(callback); -} - -TEST(Arrays, Push) -{ - typedef APR::Array Array; - - APR::Pool pool; - Array array(fill_array(pool)); - - const Array::size_type point = array.size(); - const Array::value_type first = array[0]; - const Array::value_type last = array[point - 1]; - - array.push("octavius"); - array.push("nonus"); - array.push("decimus"); - - EXPECT_EQ(point + 3, array.size()); - EXPECT_STREQ(first, array[0]); - EXPECT_STREQ(last, array[point - 1]); - EXPECT_STREQ("octavius", array[point]); - EXPECT_STREQ("decimus", array[array.size() - 1]); -} - -TEST(Arrays, Pop) -{ - typedef APR::Array Array; - - APR::Pool pool; - Array array(fill_array(pool)); - - for (Array::size_type i = 0, z = array.size(); i <= z; ++i) - { - const char** last = (!array.array()->nelts ? NULL - : &APR_ARRAY_IDX(array.array(), - array.array()->nelts - 1, - const char*)); - EXPECT_EQ(last, array.pop()); - } -} - -// -// ConstArrays -// - -TEST(ConstArrays, WrapArray) -{ - typedef APR::ConstArray Array; - - APR::Pool pool; - const apr_array_header_t* apr_array = - apr_array_make(pool.get(), 0, sizeof(Array::value_type)); - ASSERT_THAT(apr_array, testing::NotNull()); - - Array array(apr_array); - EXPECT_EQ(apr_array, array.array()); - EXPECT_EQ(0, array.size()); -} - -TEST(ConstArrays, RewrapTypeMismatch) -{ - typedef APR::ConstArray ByteArray; - typedef APR::Array IntArray; - - APR::Pool pool; - EXPECT_THROW(ByteArray array(IntArray(pool).array()), - std::invalid_argument); -} - -TEST(ConstArrays, OutOfBounds) -{ - typedef APR::ConstArray Array; - - APR::Pool pool; - Array array = Array(APR::Array(pool)); - - EXPECT_THROW(array.at(-1), std::out_of_range); - EXPECT_THROW(array.at(array.size()), std::out_of_range); -} - -TEST(ConstArrays, Indexing) -{ - typedef APR::ConstArray Array; - - APR::Pool pool; - Array array(fill_array(pool)); - - EXPECT_STREQ(array[0], APR_ARRAY_IDX(array.array(), 0, Array::value_type)); - EXPECT_STREQ(array[array.size() - 1], APR_ARRAY_IDX(array.array(), - array.array()->nelts - 1, - Array::value_type)); -} - -TEST(ConstArrays, CheckedIndexing) -{ - typedef APR::ConstArray Array; - - APR::Pool pool; - Array array(fill_array(pool)); - - EXPECT_STREQ(array.at(0), APR_ARRAY_IDX(array.array(), 0, Array::value_type)); - EXPECT_STREQ(array.at(array.size() - 1), - APR_ARRAY_IDX(array.array(), array.array()->nelts - 1, - Array::value_type)); -} - -TEST(ConstArrays, Iteration) -{ - typedef APR::ConstArray Array; - - APR::Pool pool; - Array array(fill_array(pool)); - - struct Iteration : public Array::Iteration - { - Iteration(const apr_array_header_t* raw_array) - : m_index(0), m_raw_array(raw_array) - {} - - bool operator()(const Array::value_type& value) - { - EXPECT_STREQ(value, APR_ARRAY_IDX(m_raw_array, m_index, - Array::value_type)); - ++m_index; - return true; - } - - private: - Array::size_type m_index; - const apr_array_header_t* m_raw_array; - } callback(array.array()); - - array.iterate(callback); -} - -// -// Hash tables -// - -TEST(Hashes, StringHash) -{ - typedef APR::Hash H; - - APR::Pool pool; - H hash(pool); - hash.set("aa", "a"); - hash.set("bbb", "b"); - hash.set("cccc", "c"); - - EXPECT_EQ(3, hash.size()); - EXPECT_STREQ("a", hash.get("aa")); - EXPECT_STREQ("b", hash.get("bbb")); - EXPECT_STREQ("c", hash.get("cccc")); -} - -TEST(Hashes, FixedStringHash) -{ - // The point of this test is to verify that the key-length parameter - // of the template actually limits the length of the keys. - typedef APR::Hash H; - - APR::Pool pool; - H hash(pool); - hash.set("aa&qux", "a"); - hash.set("bb#foo", "b"); - hash.set("cc@bar", "c"); - - EXPECT_EQ(3, hash.size()); - EXPECT_STREQ("a", hash.get("aa%foo")); - EXPECT_STREQ("b", hash.get("bb*bar")); - EXPECT_STREQ("c", hash.get("cc$qux")); -} - -TEST(Hashes, Delete) -{ - typedef APR::Hash H; - - APR::Pool pool; - H hash(pool); - hash.set("aa", "a"); - hash.set("bbb", "b"); - hash.set("cccc", "c"); - - hash.del("bbb"); - - EXPECT_EQ(2, hash.size()); - EXPECT_STREQ("a", hash.get("aa")); - EXPECT_STREQ("c", hash.get("cccc")); -} - -TEST(Hashes, Iterate) -{ - typedef APR::Hash H; - - APR::Pool pool; - H hash(pool); - hash.set("aa", "a"); - hash.set("bbb", "b"); - hash.set("cccc", "c"); - - struct C : public H::Iteration - { - H& m_hash; - explicit C(H& hashref) : m_hash(hashref) {} - - bool operator()(const H::Key& key, H::value_type value) - { - EXPECT_STREQ(value, m_hash.get(key)); - return true; - } - } callback(hash); - - hash.iterate(callback, pool); -} diff --git a/subversion/bindings/cxxhl/tests/test_exception.cpp b/subversion/bindings/cxxhl/tests/test_exception.cpp deleted file mode 100644 index 7c0637c..0000000 --- a/subversion/bindings/cxxhl/tests/test_exception.cpp +++ /dev/null @@ -1,133 +0,0 @@ -/* - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ - -#include -#include -#include -#include -#include - -#include "svncxxhl.hpp" -#include "../src/private.hpp" - -#include -#include "svn_error.h" -#undef TRUE -#undef FALSE - -#include - -namespace { -svn_error_t* make_error_test_error() -{ - svn_error_t* err; - err = svn_error_create(SVN_ERR_TEST_FAILED, NULL, "original message"); - err = svn_error_create(SVN_ERR_BASE, err, "wrapper message"); - err = svn_error_trace(err); - err = svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, err, NULL); - err = svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, err, NULL); - err = svn_error_trace(err); - return err; -} -} // anonymous namespace - -TEST(Exceptions, CatchError) -{ - try - { - SVN::detail::checked_call(make_error_test_error()); - } - catch (const SVN::Error& err) - { - SVN::Error::MessageList ml = err.messages(); - EXPECT_EQ(3, ml.size()); - EXPECT_EQ(SVN_ERR_UNSUPPORTED_FEATURE, ml[0].code()); - EXPECT_EQ(SVN_ERR_BASE, ml[1].code()); - EXPECT_EQ(SVN_ERR_TEST_FAILED, ml[2].code()); - - SVN::Error::MessageList tml = err.traced_messages(); -#ifdef SVN_DEBUG - EXPECT_EQ(8, tml.size()); - EXPECT_EQ(SVN_ERR_UNSUPPORTED_FEATURE, tml[0].code()); - EXPECT_EQ(SVN_ERR_UNSUPPORTED_FEATURE, tml[1].code()); - EXPECT_EQ(SVN_ERR_UNSUPPORTED_FEATURE, tml[2].code()); - EXPECT_EQ(SVN_ERR_BASE, tml[3].code()); - EXPECT_EQ(SVN_ERR_BASE, tml[4].code()); - EXPECT_EQ(SVN_ERR_BASE, tml[5].code()); - EXPECT_EQ(SVN_ERR_TEST_FAILED, tml[6].code()); - EXPECT_EQ(SVN_ERR_TEST_FAILED, tml[7].code()); -#else // !SVN_DEBUG - EXPECT_EQ(3, tml.size()); - EXPECT_EQ(SVN_ERR_UNSUPPORTED_FEATURE, tml[0].code()); - EXPECT_EQ(SVN_ERR_BASE, tml[1].code()); - EXPECT_EQ(SVN_ERR_TEST_FAILED, tml[2].code()); -#endif // SVN_DEBUG - } -} - - -namespace { -svn_error_t* make_cancel_test_error() -{ - svn_error_t* err; - err = svn_error_create(SVN_ERR_CANCELLED, NULL, NULL); - err = svn_error_create(SVN_ERR_CANCELLED, err, NULL); - err = svn_error_trace(err); - err = svn_error_create(SVN_ERR_TEST_FAILED, err, "original message"); - err = svn_error_create(SVN_ERR_BASE, err, "wrapper message"); - err = svn_error_trace(err); - return err; -} -} // anonymous namespace - -TEST(Exceptions, CatchCancelled) -{ - try - { - SVN::detail::checked_call(make_cancel_test_error()); - } - catch (const SVN::Cancelled& err) - { - SVN::Error::MessageList ml = err.messages(); - EXPECT_EQ(3, ml.size()); - EXPECT_EQ(SVN_ERR_BASE, ml[0].code()); - EXPECT_EQ(SVN_ERR_TEST_FAILED, ml[1].code()); - EXPECT_EQ(SVN_ERR_CANCELLED, ml[2].code()); - - SVN::Error::MessageList tml = err.traced_messages(); -#ifdef SVN_DEBUG - EXPECT_EQ(8, tml.size()); - EXPECT_EQ(SVN_ERR_BASE, tml[0].code()); - EXPECT_EQ(SVN_ERR_BASE, tml[1].code()); - EXPECT_EQ(SVN_ERR_BASE, tml[2].code()); - EXPECT_EQ(SVN_ERR_TEST_FAILED, tml[3].code()); - EXPECT_EQ(SVN_ERR_TEST_FAILED, tml[4].code()); - EXPECT_EQ(SVN_ERR_CANCELLED, tml[5].code()); - EXPECT_EQ(SVN_ERR_CANCELLED, tml[6].code()); - EXPECT_EQ(SVN_ERR_CANCELLED, tml[7].code()); -#else // !SVN_DEBUG - EXPECT_EQ(3, tml.size()); - EXPECT_EQ(SVN_ERR_BASE, tml[0].code()); - EXPECT_EQ(SVN_ERR_TEST_FAILED, tml[1].code()); - EXPECT_EQ(SVN_ERR_CANCELLED, tml[2].code()); -#endif // SVN_DEBUG - } -} diff --git a/subversion/bindings/javahl/README b/subversion/bindings/javahl/README index ca7b9f4..cb12998 100644 --- a/subversion/bindings/javahl/README +++ b/subversion/bindings/javahl/README @@ -5,7 +5,7 @@ JavaHL provides a (mostly native, using JNI and javah) implementation of a high level Java API for Subversion, which was originally targeted for implementors of GUI clients and IDE plug-ins for Subversion. JavaHL currently provides a minimal-but-complete set of APIs which expose the -core Subversion C API to Java. It requires a JRE 1.6+ (runtime). +core Subversion C API to Java. It requires a JRE 1.8+ (runtime). It is currently quite mature, and can be considered for production use. @@ -14,7 +14,7 @@ Build system ------------ JavaHL should compile and run under Linux, Win32, and Mac OS X with -JDK 1.6+ and a C++ compiler with a complete implementation of +JDK 1.8+ and a C++ compiler with a complete implementation of C++98 (for example, GCC 3.2 and older cannot compile JavaHL 1.9+). Its build will produce both a native library (libsvnjavahl-1.so on Unix diff --git a/subversion/bindings/javahl/native/BlameCallback.cpp b/subversion/bindings/javahl/native/BlameCallback.cpp index 10a8ff7..0a9750b 100644 --- a/subversion/bindings/javahl/native/BlameCallback.cpp +++ b/subversion/bindings/javahl/native/BlameCallback.cpp @@ -28,14 +28,20 @@ #include "CreateJ.h" #include "JNIUtil.h" #include "svn_time.h" + +#include "svn_private_config.h" + /** * Create a BlameCallback object * @param jcallback the Java callback object. */ -BlameCallback::BlameCallback(jobject jcallback) -{ - m_callback = jcallback; -} +BlameCallback::BlameCallback(jobject jrangeCallback, jobject jlineCallback) + : m_start_revnum(SVN_INVALID_REVNUM), + m_end_revnum(SVN_INVALID_REVNUM), + m_range_callback_invoked(false), + m_range_callback(jrangeCallback), + m_line_callback(jlineCallback) +{} /** * Destroy a BlameCallback object */ @@ -48,36 +54,84 @@ BlameCallback::~BlameCallback() /* implements svn_client_blame_receiver3_t */ svn_error_t * BlameCallback::callback(void *baton, - svn_revnum_t start_revnum, - svn_revnum_t end_revnum, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, - const char *line, + const svn_string_t *line, svn_boolean_t local_change, apr_pool_t *pool) { - if (baton) - return static_cast(baton)->singleLine(start_revnum, - end_revnum, line_no, revision, rev_props, merged_revision, - merged_rev_props, merged_path, line, local_change, pool); + BlameCallback *const self = static_cast(baton); + svn_error_t *err = SVN_NO_ERROR; + + if (self) + { + if (self->m_range_callback && !self->m_range_callback_invoked) + { + self->m_range_callback_invoked = true; + err = self->setRange(); + } + + if (self->m_line_callback && err == SVN_NO_ERROR) + { + err = self->singleLine( + line_no, revision, rev_props, merged_revision, + merged_rev_props, merged_path, line, local_change, pool); + } + } + + return err; +} + +svn_error_t * +BlameCallback::setRange() +{ + if (m_start_revnum == SVN_INVALID_REVNUM + || m_end_revnum == SVN_INVALID_REVNUM) + return svn_error_create(SVN_ERR_CLIENT_BAD_REVISION, NULL, + _("Blame revision range was not resolved")); + + 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; + if (mid == 0) + { + jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/BlameRangeCallback")); + if (JNIUtil::isJavaExceptionThrown()) + POP_AND_RETURN(SVN_NO_ERROR); + + mid = env->GetMethodID(clazz, "setRange", "(JJ)V"); + if (JNIUtil::isJavaExceptionThrown() || mid == 0) + POP_AND_RETURN(SVN_NO_ERROR); + } - return SVN_NO_ERROR; + // call the Java method + env->CallVoidMethod(m_range_callback, mid, + (jlong)m_start_revnum, (jlong)m_end_revnum); + + POP_AND_RETURN_EXCEPTION_AS_SVNERROR(); } + /** * Callback called for a single line in the file, for which the blame * information was requested. See the Java-doc for more information. */ svn_error_t * -BlameCallback::singleLine(svn_revnum_t start_revnum, svn_revnum_t end_revnum, - apr_int64_t line_no, svn_revnum_t revision, +BlameCallback::singleLine(apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *revProps, svn_revnum_t mergedRevision, apr_hash_t *mergedRevProps, const char *mergedPath, - const char *line, svn_boolean_t localChange, + const svn_string_t *line, svn_boolean_t localChange, apr_pool_t *pool) { JNIEnv *env = JNIUtil::getEnv(); @@ -92,13 +146,13 @@ BlameCallback::singleLine(svn_revnum_t start_revnum, svn_revnum_t end_revnum, static jmethodID mid = 0; if (mid == 0) { - jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/BlameCallback")); + jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/BlameLineCallback")); if (JNIUtil::isJavaExceptionThrown()) 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"); + "Ljava/lang/String;Z[B)V"); if (JNIUtil::isJavaExceptionThrown() || mid == 0) POP_AND_RETURN(SVN_NO_ERROR); } @@ -120,14 +174,14 @@ BlameCallback::singleLine(svn_revnum_t start_revnum, svn_revnum_t end_revnum, if (JNIUtil::isJavaExceptionThrown()) POP_AND_RETURN(SVN_NO_ERROR); - jstring jline = JNIUtil::makeJString(line); + jbyteArray jline = JNIUtil::makeJByteArray(line); if (JNIUtil::isJavaExceptionThrown()) POP_AND_RETURN(SVN_NO_ERROR); // call the Java method - env->CallVoidMethod(m_callback, mid, (jlong)line_no, (jlong)revision, + env->CallVoidMethod(m_line_callback, mid, (jlong)line_no, (jlong)revision, jrevProps, (jlong)mergedRevision, jmergedRevProps, - jmergedPath, jline, (jboolean)localChange); + jmergedPath, (jboolean)localChange, jline); POP_AND_RETURN_EXCEPTION_AS_SVNERROR(); } diff --git a/subversion/bindings/javahl/native/BlameCallback.h b/subversion/bindings/javahl/native/BlameCallback.h index 0dc7e05..4ed9714 100644 --- a/subversion/bindings/javahl/native/BlameCallback.h +++ b/subversion/bindings/javahl/native/BlameCallback.h @@ -37,40 +37,44 @@ class BlameCallback { public: - BlameCallback(jobject jcallback); + BlameCallback(jobject jrangeCallback, jobject jlineCallback); ~BlameCallback(); static svn_error_t *callback(void *baton, - svn_revnum_t start_revnum, - svn_revnum_t end_revnum, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, - const char *line, + const svn_string_t *line, svn_boolean_t local_change, apr_pool_t *pool); + svn_revnum_t *get_start_revnum_p() { return &m_start_revnum; } + svn_revnum_t *get_end_revnum_p() { return &m_end_revnum; } + protected: - svn_error_t *singleLine(svn_revnum_t start_revnum, - svn_revnum_t end_revnum, - apr_int64_t line_no, + svn_error_t *setRange(); + svn_error_t *singleLine(apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, - const char *line, + const svn_string_t *line, svn_boolean_t local_change, apr_pool_t *pool); private: - /** - * This a local reference to the Java object. - */ - jobject m_callback; + // Arguments for svn_client_blame6 + svn_revnum_t m_start_revnum; + svn_revnum_t m_end_revnum; + bool m_range_callback_invoked; + + // These are local references to the Java objects. + jobject m_range_callback; + jobject m_line_callback; }; #endif // BLAMECALLBACK_H diff --git a/subversion/bindings/javahl/native/CxxCompat.hpp b/subversion/bindings/javahl/native/CxxCompat.hpp new file mode 100644 index 0000000..1bf4e7c --- /dev/null +++ b/subversion/bindings/javahl/native/CxxCompat.hpp @@ -0,0 +1,97 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +#ifndef SVN_JAVAHL_CXX_COMPAT_HPP +#define SVN_JAVAHL_CXX_COMPAT_HPP + +#include + +namespace JavaHL { +namespace cxx { + +#if defined(__cplusplus) && __cplusplus >= 201103L +/* + * C++11 and later + */ + +// Use std::unique_ptr for exclusive ownership. +template< + typename T, + typename D = ::std::default_delete + > +using owned_ptr = ::std::unique_ptr; + +// Use std::move for transfering ownership of owned pointers. +using ::std::move; + +#else +/* + * C++03 and earlier + */ + +// Use a dumbed-down std::auto_ptr for exclusive ownership. +template +class owned_ptr : public ::std::auto_ptr +{ + typedef ::std::auto_ptr auto_ptr; + typedef ::std::auto_ptr_ref auto_ptr_ref; + +public: + explicit owned_ptr(T *p = 0) throw() + : auto_ptr(p) + {} + + owned_ptr(owned_ptr& r) throw() + : auto_ptr(r) + {} + + owned_ptr(auto_ptr_ref r) throw() + : auto_ptr(r) + {} + + owned_ptr& operator=(owned_ptr& r) throw() + { + static_cast(*this) = r; + return *this; + } + + owned_ptr& operator=(auto_ptr_ref r) throw() + { + static_cast(*this) = r; + return *this; + } +}; + +// Fake std::move since there are no rvalue references. +template +T& move(T& t) +{ + return t; +} + +#endif + +} // namespace cxx +} // namespace JavaHL + +#endif // SVN_JAVAHL_CXX_COMPAT_HPP diff --git a/subversion/bindings/javahl/native/EditorProxy.cpp b/subversion/bindings/javahl/native/EditorProxy.cpp index 5985c00..83792ab 100644 --- a/subversion/bindings/javahl/native/EditorProxy.cpp +++ b/subversion/bindings/javahl/native/EditorProxy.cpp @@ -132,7 +132,7 @@ get_editor_method(jmethodID& mid, const char* name, const char* sig) jobject wrap_input_stream(svn_stream_t* stream) { - std::auto_ptr + JavaHL::cxx::owned_ptr wrapped(new JavaHL::NativeInputStream()); apr_pool_t* const wrapped_pool = wrapped->get_pool().getPool(); wrapped->set_stream(svn_stream_disown(stream, wrapped_pool)); diff --git a/subversion/bindings/javahl/native/EditorProxy.h b/subversion/bindings/javahl/native/EditorProxy.h index e47ab37..bea62c3 100644 --- a/subversion/bindings/javahl/native/EditorProxy.h +++ b/subversion/bindings/javahl/native/EditorProxy.h @@ -33,6 +33,8 @@ #include "private/svn_editor.h" #include "private/svn_delta_private.h" +#include "CxxCompat.hpp" + /** * These callbacks are needed by the delta-to-Ev2 shims. */ @@ -53,7 +55,7 @@ struct EditorProxyCallbacks class EditorProxy { public: - typedef std::auto_ptr UniquePtr; + typedef ::JavaHL::cxx::owned_ptr UniquePtr; EditorProxy(jobject jeditor, apr_pool_t* edit_pool, const char* repos_root_url, const char* base_relpath, diff --git a/subversion/bindings/javahl/native/JNIUtil.cpp b/subversion/bindings/javahl/native/JNIUtil.cpp index e5b7a5d..f62b4f1 100644 --- a/subversion/bindings/javahl/native/JNIUtil.cpp +++ b/subversion/bindings/javahl/native/JNIUtil.cpp @@ -578,16 +578,17 @@ jthrowable JNIUtil::wrappedCreateClientException(svn_error_t *err, jthrowable jc if (JNIUtil::isJavaExceptionThrown()) return NULL; - const char *source = NULL; + std::string source; #ifdef SVN_DEBUG #ifndef SVN_ERR__TRACING if (err->file) { - std::ostringstream buf; - buf << err->file; + source = err->file; if (err->line > 0) - buf << ':' << err->line; - source = buf.str().c_str(); + { + source += ':'; + source += err->line; + } } #endif #endif @@ -615,7 +616,7 @@ jthrowable JNIUtil::wrappedCreateClientException(svn_error_t *err, jthrowable jc JNICriticalSection cs(*g_logMutex); g_logStream << "Subversion JavaHL exception thrown, message:<"; g_logStream << msg << ">"; - if (source) + if (!source.empty()) g_logStream << " source:<" << source << ">"; if (err->apr_err != -1) g_logStream << " apr-err:<" << err->apr_err << ">"; @@ -624,7 +625,7 @@ jthrowable JNIUtil::wrappedCreateClientException(svn_error_t *err, jthrowable jc if (isJavaExceptionThrown()) POP_AND_RETURN_NULL; - jstring jsource = makeJString(source); + jstring jsource = (source.empty() ? NULL : makeJString(source.c_str())); if (isJavaExceptionThrown()) POP_AND_RETURN_NULL; diff --git a/subversion/bindings/javahl/native/OperationContext.cpp b/subversion/bindings/javahl/native/OperationContext.cpp index 917c3be..d9c0543 100644 --- a/subversion/bindings/javahl/native/OperationContext.cpp +++ b/subversion/bindings/javahl/native/OperationContext.cpp @@ -43,7 +43,7 @@ OperationContext::OperationContext(SVN::Pool &pool) : m_config(NULL), - m_prompter(NULL), + m_prompter(), m_cancelOperation(0), m_pool(&pool), m_jctx(NULL), @@ -253,7 +253,7 @@ OperationContext::password(const char *pi_password) void OperationContext::setPrompt(Prompter::UniquePtr prompter) { - m_prompter = prompter; + m_prompter = JavaHL::cxx::move(prompter); } void @@ -311,7 +311,7 @@ Prompter::UniquePtr OperationContext::clonePrompter() const { if (m_prompter.get()) return m_prompter->clone(); - return Prompter::UniquePtr(NULL); + return Prompter::UniquePtr(); } void OperationContext::setTunnelCallback(jobject jtunnelcb) diff --git a/subversion/bindings/javahl/native/OperationContext.h b/subversion/bindings/javahl/native/OperationContext.h index b0d82c2..db618c6 100644 --- a/subversion/bindings/javahl/native/OperationContext.h +++ b/subversion/bindings/javahl/native/OperationContext.h @@ -37,6 +37,7 @@ #include #include "Pool.h" #include "JNIStringHolder.h" +#include "CxxCompat.hpp" class Prompter; @@ -52,7 +53,7 @@ class OperationContext apr_hash_t * m_config; - std::auto_ptr m_prompter; + JavaHL::cxx::owned_ptr m_prompter; svn_atomic_t m_cancelOperation; protected: @@ -90,7 +91,7 @@ class OperationContext virtual void username(const char *pi_username); virtual void password(const char *pi_password); - virtual void setPrompt(std::auto_ptr prompter); + virtual void setPrompt(JavaHL::cxx::owned_ptr prompter); svn_auth_baton_t *getAuthBaton(SVN::Pool &in_pool); void cancelOperation(); @@ -100,7 +101,7 @@ class OperationContext const char *getConfigDirectory() const; const char *getUsername() const; const char *getPassword() const; - std::auto_ptr clonePrompter() const; + JavaHL::cxx::owned_ptr clonePrompter() const; /** * Set the configuration directory, taking the usual steps to diff --git a/subversion/bindings/javahl/native/Path.cpp b/subversion/bindings/javahl/native/Path.cpp index c1a1fec..625634e 100644 --- a/subversion/bindings/javahl/native/Path.cpp +++ b/subversion/bindings/javahl/native/Path.cpp @@ -28,11 +28,12 @@ #include "Path.h" #include "svn_path.h" #include "svn_dirent_uri.h" +#include "private/svn_dirent_uri_private.h" #include "JNIUtil.h" #include "JNIStringHolder.h" #include "Pool.h" #include "svn_private_config.h" - + /** * Constructor * @@ -164,6 +165,6 @@ URL::initfunc(const char*& path, SVN::Pool& pool) svn_error_t* Relpath::initfunc(const char*& path, SVN::Pool& pool) { - path = svn_relpath__internal_style(path, pool.getPool()); - return SVN_NO_ERROR; + apr_pool_t *const p = pool.getPool(); + return svn_error_trace(svn_relpath__make_internal(&path, path, p, p)); } diff --git a/subversion/bindings/javahl/native/Prompter.cpp b/subversion/bindings/javahl/native/Prompter.cpp index 46e0e4c..2a1a704 100644 --- a/subversion/bindings/javahl/native/Prompter.cpp +++ b/subversion/bindings/javahl/native/Prompter.cpp @@ -45,7 +45,7 @@ Prompter::UniquePtr Prompter::create(jobject jprompter) { if (!jprompter) - return UniquePtr(NULL); + return UniquePtr(); // Make sure no C++ exceptions are propagated from here. const ::Java::Env jenv; @@ -53,12 +53,12 @@ Prompter::UniquePtr Prompter::create(jobject jprompter) { const jclass cls = ::Java::ClassCache::get_authn_cb(jenv)->get_class(); if (!jenv.IsInstanceOf(jprompter, cls)) - return UniquePtr(NULL); + return UniquePtr(); return UniquePtr(new Prompter(jenv, jprompter)); } SVN_JAVAHL_JNI_CATCH; - return UniquePtr(NULL); + return UniquePtr(); } Prompter::UniquePtr Prompter::clone() const @@ -431,7 +431,7 @@ svn_error_t *Prompter::dispatch_plaintext_passphrase_prompt( Prompter::UniquePtr CompatPrompter::create(jobject jprompter) { if (!jprompter) - return UniquePtr(NULL); + return UniquePtr(); // Make sure no C++ exceptions are propagated from here. const ::Java::Env jenv; @@ -440,12 +440,12 @@ Prompter::UniquePtr CompatPrompter::create(jobject jprompter) const jclass cls = ::Java::ClassCache::get_user_passwd_cb(jenv)->get_class(); if (!jenv.IsInstanceOf(jprompter, cls)) - return UniquePtr(NULL); + return UniquePtr(); return UniquePtr(new CompatPrompter(jenv, jprompter)); } SVN_JAVAHL_JNI_CATCH; - return UniquePtr(NULL); + return UniquePtr(); } Prompter::UniquePtr CompatPrompter::clone() const diff --git a/subversion/bindings/javahl/native/Prompter.h b/subversion/bindings/javahl/native/Prompter.h index 06a7f2d..7782f9e 100644 --- a/subversion/bindings/javahl/native/Prompter.h +++ b/subversion/bindings/javahl/native/Prompter.h @@ -35,10 +35,13 @@ #include "jniwrapper/jni_globalref.hpp" +#include "CxxCompat.hpp" + + class Prompter { public: - typedef ::std::auto_ptr UniquePtr; + typedef ::JavaHL::cxx::owned_ptr UniquePtr; /** * Factory method; @a prompter is a local reference to the Java diff --git a/subversion/bindings/javahl/native/RemoteSession.cpp b/subversion/bindings/javahl/native/RemoteSession.cpp index ec17374..57e4a91 100644 --- a/subversion/bindings/javahl/native/RemoteSession.cpp +++ b/subversion/bindings/javahl/native/RemoteSession.cpp @@ -104,7 +104,9 @@ RemoteSession::open(jint jretryAttempts, jobject jremoteSession = open( jretryAttempts, url.c_str(), uuid, (jconfigDirectory ? configDirectory.c_str() : NULL), - usernameStr, passwordStr, prompter, jprogress, jcfgcb, jtunnelcb); + usernameStr, passwordStr, + JavaHL::cxx::move(prompter), + jprogress, jcfgcb, jtunnelcb); if (JNIUtil::isExceptionThrown() || !jremoteSession) jremoteSession = NULL; return jremoteSession; @@ -120,7 +122,9 @@ RemoteSession::open(jint jretryAttempts, { RemoteSession* session = new RemoteSession( jretryAttempts, url, uuid, configDirectory, - usernameStr, passwordStr, prompter, jcfgcb, jtunnelcb); + usernameStr, passwordStr, + JavaHL::cxx::move(prompter), + jcfgcb, jtunnelcb); if (JNIUtil::isJavaExceptionThrown() || !session) { delete session; @@ -169,7 +173,7 @@ RemoteSession::open(jint jretryAttempts, namespace{ struct compare_c_strings { - bool operator()(const char* a, const char* b) + bool operator()(const char* a, const char* b) const { return (0 < std::strcmp(a, b)); } @@ -187,7 +191,9 @@ RemoteSession::RemoteSession(int retryAttempts, : m_session(NULL), m_context(NULL) { m_context = new RemoteSessionContext( - pool, configDirectory, username, password, prompter, jcfgcb, jtunnelcb); + pool, configDirectory, username, password, + JavaHL::cxx::move(prompter), + jcfgcb, jtunnelcb); if (JNIUtil::isJavaExceptionThrown()) return; @@ -421,31 +427,31 @@ byte_array_to_svn_string(JNIByteArray& ary, SVN::Pool& scratch_pool) void RemoteSession::changeRevisionProperty( jlong jrevision, jstring jname, - jbyteArray jold_value, jbyteArray jvalue) + jbyteArray jold_propval, jbyteArray jpropval) { JNIStringHolder name(jname); if (JNIUtil::isExceptionThrown()) return; - JNIByteArray old_value(jold_value); + JNIByteArray old_propval(jold_propval); if (JNIUtil::isExceptionThrown()) return; - JNIByteArray value(jvalue); + JNIByteArray propval(jpropval); if (JNIUtil::isExceptionThrown()) return; SVN::Pool subPool(pool); - svn_string_t* const* p_old_value = NULL; - svn_string_t* const str_old_value = - byte_array_to_svn_string(old_value, subPool); - if (str_old_value) - p_old_value = &str_old_value; + svn_string_t* const* p_old_propval = NULL; + svn_string_t* const str_old_propval = + byte_array_to_svn_string(old_propval, subPool); + if (str_old_propval) + p_old_propval = &str_old_propval; SVN_JNI_ERR(svn_ra_change_rev_prop2(m_session, svn_revnum_t(jrevision), - name, p_old_value, - byte_array_to_svn_string(value, subPool), + name, p_old_propval, + byte_array_to_svn_string(propval, subPool), subPool.getPool()), ); } @@ -856,7 +862,8 @@ RemoteSession::status(jobject jthis, jstring jstatus_target, editor->delta_editor(), editor->delta_baton(), report_pool),); - rp->set_reporter_data(raw_reporter, report_baton, editor); + rp->set_reporter_data(raw_reporter, report_baton, + JavaHL::cxx::move(editor)); } // TODO: diff diff --git a/subversion/bindings/javahl/native/RemoteSession.h b/subversion/bindings/javahl/native/RemoteSession.h index dac5581..e3117b3 100644 --- a/subversion/bindings/javahl/native/RemoteSession.h +++ b/subversion/bindings/javahl/native/RemoteSession.h @@ -71,8 +71,8 @@ class RemoteSession : public SVNBase jlong getLatestRevision(); jlong getRevisionByTimestamp(jlong jtimestamp); void changeRevisionProperty(jlong jrevision, jstring jname, - jbyteArray jold_value, - jbyteArray jvalue); + jbyteArray jold_propval, + jbyteArray jpropval); jobject getRevisionProperties(jlong jrevision); jbyteArray getRevisionProperty(jlong jrevision, jstring jname); jlong getFile(jlong jrevision, jstring jpath, diff --git a/subversion/bindings/javahl/native/RemoteSessionContext.cpp b/subversion/bindings/javahl/native/RemoteSessionContext.cpp index e4b86e1..10ac745 100644 --- a/subversion/bindings/javahl/native/RemoteSessionContext.cpp +++ b/subversion/bindings/javahl/native/RemoteSessionContext.cpp @@ -43,7 +43,7 @@ RemoteSessionContext::RemoteSessionContext( if (passwordStr != NULL) password(passwordStr); - setPrompt(prompter); + setPrompt(JavaHL::cxx::move(prompter)); setConfigEventHandler(jcfgcb); setTunnelCallback(jtunnelcb); diff --git a/subversion/bindings/javahl/native/RemoteSessionContext.h b/subversion/bindings/javahl/native/RemoteSessionContext.h index 8c569a1..3b90c7e 100644 --- a/subversion/bindings/javahl/native/RemoteSessionContext.h +++ b/subversion/bindings/javahl/native/RemoteSessionContext.h @@ -30,6 +30,7 @@ #include "svn_ra.h" #include "OperationContext.h" +#include "CxxCompat.hpp" class RemoteSessionContext : public OperationContext { @@ -37,7 +38,7 @@ class RemoteSessionContext : public OperationContext RemoteSessionContext(SVN::Pool &pool, const char* jconfigDirectory, const char* jusername, const char* jpassword, - std::auto_ptr prompter, + JavaHL::cxx::owned_ptr prompter, jobject jcfgcb, jobject jtunnelcb); virtual ~RemoteSessionContext(); void activate(jobject jremoteSession, jobject jprogress); diff --git a/subversion/bindings/javahl/native/SVNClient.cpp b/subversion/bindings/javahl/native/SVNClient.cpp index de46330..2c83f56 100644 --- a/subversion/bindings/javahl/native/SVNClient.cpp +++ b/subversion/bindings/javahl/native/SVNClient.cpp @@ -1284,7 +1284,9 @@ void SVNClient::blame(const char *path, Revision &pegRevision, if (ctx == NULL) return; - SVN_JNI_ERR(svn_client_blame5( + SVN_JNI_ERR(svn_client_blame6( + callback->get_start_revnum_p(), + callback->get_end_revnum_p(), intPath.c_str(), pegRevision.revision(), revisionStart.revision(), revisionEnd.revision(), options.fileOptions(subPool), ignoreMimeType, diff --git a/subversion/bindings/javahl/native/StateReporter.cpp b/subversion/bindings/javahl/native/StateReporter.cpp index beec38e..5ce207b 100644 --- a/subversion/bindings/javahl/native/StateReporter.cpp +++ b/subversion/bindings/javahl/native/StateReporter.cpp @@ -38,7 +38,7 @@ StateReporter::StateReporter() : m_valid(false), m_raw_reporter(NULL), m_report_baton(NULL), - m_editor(NULL), + m_editor(), m_target_revision(SVN_INVALID_REVNUM) {} @@ -182,7 +182,7 @@ StateReporter::set_reporter_data(const svn_ra_reporter3_t* raw_reporter, { //DEBUG:fprintf(stderr, " (n) StateReporter::set_reporter_data()\n"); - m_editor = editor; + m_editor = JavaHL::cxx::move(editor); m_raw_reporter = raw_reporter; m_report_baton = report_baton; m_valid = true; diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp b/subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp index 9e533db..43fd506 100644 --- a/subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp +++ b/subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp @@ -42,10 +42,11 @@ #include "../Credential.hpp" #include "../ExternalItem.hpp" #include "../EditorCallbacks.hpp" +#include "../CxxCompat.hpp" namespace { -/* This class behaves like a dumbed-down std:auto_ptr, but it +/* This class behaves like a dumbed-down std:unique_ptr, but it implements atomic access and modification of the wrapped pointer. */ class ClassImplPtr @@ -132,11 +133,11 @@ class ClassCacheImpl // The statically initialized calss wrappers are always defined and // therefore do not need atomic access. -#define JNIWRAPPER_DEFINE_CACHED_CLASS(M, C) \ - std::auto_ptr m_impl_##M; \ - const Object::ClassImpl* get_##M(Env) \ - { \ - return m_impl_##M.get(); \ +#define JNIWRAPPER_DEFINE_CACHED_CLASS(M, C) \ + JavaHL::cxx::owned_ptr m_impl_##M; \ + const Object::ClassImpl* get_##M(Env) \ + { \ + return m_impl_##M.get(); \ } JNIWRAPPER_DEFINE_CACHED_CLASS(object, Object) @@ -153,7 +154,7 @@ class ClassCacheImpl Object::ClassImpl* pimpl = m_impl_##M.get(); \ if (!pimpl) \ { \ - std::auto_ptr tmp( \ + JavaHL::cxx::owned_ptr tmp( \ new C::ClassImpl( \ env, env.FindClass(C::m_class_name))); \ pimpl = m_impl_##M.test_and_set(tmp.get()); \ diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_io_stream.cpp b/subversion/bindings/javahl/native/jniwrapper/jni_io_stream.cpp index 3c055ca..c2f96ba 100644 --- a/subversion/bindings/javahl/native/jniwrapper/jni_io_stream.cpp +++ b/subversion/bindings/javahl/native/jniwrapper/jni_io_stream.cpp @@ -27,6 +27,8 @@ #include "svn_private_config.h" +#include "../CxxCompat.hpp" + // Stream-wrapper-specific mark object type struct svn_stream_mark_t { @@ -197,7 +199,7 @@ InputStream::get_global_stream(Env env, jobject jstream, const bool has_mark = InputStream(env, jstream).mark_supported(); - std::auto_ptr baton(new GlobalObject(env, jstream)); + JavaHL::cxx::owned_ptr baton(new GlobalObject(env, jstream)); svn_stream_t* const stream = svn_stream_create(baton.get(), pool.getPool()); svn_stream_set_read2(stream, global_stream_read, @@ -268,7 +270,7 @@ OutputStream::get_global_stream(Env env, jobject jstream, if (!jstream) return NULL; - std::auto_ptr baton(new GlobalObject(env, jstream)); + JavaHL::cxx::owned_ptr baton(new GlobalObject(env, jstream)); svn_stream_t* const stream = svn_stream_create(baton.get(), pool.getPool()); svn_stream_set_write(stream, global_stream_write); diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp index 6c12935..da7bb21 100644 --- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp +++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp @@ -280,7 +280,7 @@ Java_org_apache_subversion_javahl_SVNClient_setPrompt__Lorg_apache_subversion_ja if (JNIUtil::isExceptionThrown()) return; - cl->getClientContext().setPrompt(prompter); + cl->getClientContext().setPrompt(JavaHL::cxx::move(prompter)); } JNIEXPORT void JNICALL @@ -298,7 +298,7 @@ Java_org_apache_subversion_javahl_SVNClient_setPrompt__Lorg_apache_subversion_ja if (JNIUtil::isExceptionThrown()) return; - cl->getClientContext().setPrompt(prompter); + cl->getClientContext().setPrompt(JavaHL::cxx::move(prompter)); } JNIEXPORT void JNICALL @@ -1656,10 +1656,11 @@ Java_org_apache_subversion_javahl_SVNClient_relocate JNIEXPORT void JNICALL Java_org_apache_subversion_javahl_SVNClient_blame -(JNIEnv *env, jobject jthis, jstring jpath, jobject jpegRevision, +(JNIEnv *env, jobject jthis, + jstring jpath, jobject jpegRevision, jobject jrevisionStart, jobject jrevisionEnd, jboolean jignoreMimeType, - jboolean jincludeMergedRevisions, jobject jblameCallback, - jobject jdiffOptions) + jboolean jincludeMergedRevisions, jobject jdiffOptions, + jobject jrangeCallback, jobject jlineCallback) { JNIEntry(SVNClient, blame); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -1688,7 +1689,7 @@ Java_org_apache_subversion_javahl_SVNClient_blame if (JNIUtil::isExceptionThrown()) return; - BlameCallback callback(jblameCallback); + BlameCallback callback(jrangeCallback, jlineCallback); cl->blame(path, pegRevision, revisionStart, revisionEnd, jignoreMimeType ? true : false, jincludeMergedRevisions ? true : false, &callback, diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp index 125b88d..fcea536 100644 --- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp +++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp @@ -157,13 +157,13 @@ Java_org_apache_subversion_javahl_remote_RemoteSession_getRevisionByTimestamp( JNIEXPORT void JNICALL Java_org_apache_subversion_javahl_remote_RemoteSession_nativeChangeRevisionProperty( JNIEnv *env, jobject jthis, jlong jrevision, jstring jname, - jbyteArray jold_value, jbyteArray jvalue) + jbyteArray jold_propval, jbyteArray jpropval) { JNIEntry(RemoteSession, nativeChangeRevisionProperty); RemoteSession *ras = RemoteSession::getCppObject(jthis); CPPADDR_NULL_PTR(ras, ); - return ras->changeRevisionProperty(jrevision, jname, jold_value, jvalue); + return ras->changeRevisionProperty(jrevision, jname, jold_propval, jpropval); } JNIEXPORT jobject JNICALL diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp index 1f056bd..7849eeb 100644 --- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp +++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp @@ -185,12 +185,12 @@ Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_get_1yna( JNIEXPORT void JNICALL Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_set_1str( JNIEnv* env, jobject jthis, jstring jcategory, jlong jcontext, - jstring jsection, jstring joption, jstring jvalue) + jstring jsection, jstring joption, jstring jconfigval) { JNIEntry(ConfigImpl$Category, set_str); const ImplContext ctx(env, jthis, jcategory, jcontext, jsection, joption); - JNIStringHolder value(jvalue); + JNIStringHolder value(jconfigval); if (JNIUtil::isJavaExceptionThrown()) return; @@ -202,27 +202,27 @@ Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_set_1str( JNIEXPORT void JNICALL Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_set_1bool( JNIEnv* env, jobject jthis, jstring jcategory, jlong jcontext, - jstring jsection, jstring joption, jboolean jvalue) + jstring jsection, jstring joption, jboolean jconfigval) { JNIEntry(ConfigImpl$Category, set_bool); const ImplContext ctx(env, jthis, jcategory, jcontext, jsection, joption); svn_config_set_bool(ctx.m_config, ctx.m_section.c_str(), ctx.m_option.c_str(), - bool(jvalue)); + bool(jconfigval)); } JNIEXPORT void JNICALL Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_set_1long( JNIEnv* env, jobject jthis, jstring jcategory, jlong jcontext, - jstring jsection, jstring joption, jlong jvalue) + jstring jsection, jstring joption, jlong jconfigval) { JNIEntry(ConfigImpl$Category, set_long); const ImplContext ctx(env, jthis, jcategory, jcontext, jsection, joption); svn_config_set_int64(ctx.m_config, ctx.m_section.c_str(), ctx.m_option.c_str(), - apr_int64_t(jvalue)); + apr_int64_t(jconfigval)); } JNIEXPORT jobject JNICALL @@ -287,16 +287,16 @@ Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_enumerate( jstring jname = JNIUtil::makeJString(name); if (JNIUtil::isJavaExceptionThrown()) return false; - jstring jvalue = JNIUtil::makeJString(value); + jstring jconfigval = JNIUtil::makeJString(value); if (JNIUtil::isJavaExceptionThrown()) return false; - e->CallVoidMethod(jh, mid, jname, jvalue); + e->CallVoidMethod(jh, mid, jname, jconfigval); if (JNIUtil::isJavaExceptionThrown()) return false; e->DeleteLocalRef(jname); - e->DeleteLocalRef(jvalue); + e->DeleteLocalRef(jconfigval); return true; } diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp index 3456dea..d133f82 100644 --- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp +++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp @@ -216,7 +216,7 @@ private: JNIEXPORT jbyteArray JNICALL Java_org_apache_subversion_javahl_util_PropLib_checkNodeProp( JNIEnv* jenv, jobject jthis, - jstring jname, jbyteArray jvalue, jstring jpath, jobject jkind, + jstring jname, jbyteArray jpropval, jstring jpath, jobject jkind, jstring jmime_type, jobject jfile_contents, jboolean jskip_some_checks) { @@ -228,7 +228,7 @@ Java_org_apache_subversion_javahl_util_PropLib_checkNodeProp( SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env); const Java::String name_str(env, jname); - const Java::ByteArray value(env, jvalue); + const Java::ByteArray value(env, jpropval); const Java::String path_str(env, jpath); const Java::String mime_type_str(env, jmime_type); Java::InputStream file_contents(env, jfile_contents); diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp index ce507e5..e4bb8c8 100644 --- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp +++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp @@ -37,6 +37,7 @@ #include "JNIUtil.h" #include "NativeStream.hpp" #include "Utility.hpp" +#include "CxxCompat.hpp" #include @@ -165,7 +166,7 @@ Java_org_apache_subversion_javahl_util_SubstLib_translateInputStream( const Java::Env env(jenv); // We'll allocate the stream in the bound object's pool. - std::auto_ptr + JavaHL::cxx::owned_ptr translated(new JavaHL::NativeInputStream()); svn_stream_t* source = Java::InputStream::get_global_stream( env, jsource, translated->get_pool()); @@ -199,7 +200,7 @@ Java_org_apache_subversion_javahl_util_SubstLib_translateOutputStream( const Java::Env env(jenv); // We'll allocate the stream in the bound object's pool. - std::auto_ptr + JavaHL::cxx::owned_ptr translated(new JavaHL::NativeOutputStream()); svn_stream_t* destination = Java::OutputStream::get_global_stream( env, jdestination, translated->get_pool()); diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java index 6e8f593..d07452c 100644 --- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java +++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java @@ -23,6 +23,8 @@ package org.apache.subversion.javahl; +import java.lang.annotation.*; + /** * The constants in this interface describe the changes to an item to * be committed. @@ -32,36 +34,43 @@ public interface CommitItemStateFlags /** * the item has been added */ + @Native public static final int Add=1; /** * the item has been deleted */ + @Native public static final int Delete=2; /** * the item has text modifications */ + @Native public static final int TextMods=4; /** * the item has property modifications */ + @Native public static final int PropMods=8; /** * the item has been copied */ + @Native public static final int IsCopy=16; /** * the item has a lock token */ + @Native public static final int LockToken = 32; /** * the item was moved to this location * @since 1.8 */ + @Native public static int MovedHere = 64; } diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java index 93e9130..aade3b5 100644 --- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java +++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java @@ -1386,7 +1386,7 @@ public interface ISVNClient /** * Retrieve the content together with the author, the revision and the date - * of the last change of each line + * of the last change of each line. * @param path the path * @param pegRevision the revision to interpret the path * @param revisionStart the first revision to show @@ -1394,17 +1394,37 @@ public interface ISVNClient * @param ignoreMimeType whether or not to ignore the mime-type * @param includeMergedRevisions whether or not to include extra merge * information - * @param callback callback to receive the file content and the other - * information * @param options additional options for controlling the output + * @param rangeCallback receives the resolved revision range; called + * exactly once before #lineCallback + * @param lineCallback callback to receive the file content and the other + * information for every line in the file * @throws ClientException - * @since 1.9 + * @since 1.12 + */ + void blame(String path, Revision pegRevision, Revision revisionStart, + Revision revisionEnd, boolean ignoreMimeType, + boolean includeMergedRevisions, DiffOptions options, + BlameRangeCallback rangeCallback, + BlameLineCallback lineCallback) + throws ClientException; + + /** + * Retrieve the content together with the author, the revision and the date + * of the last change of each line + *

    + * Behaves like the 1.12 version but uses BlameCallback instead of + * BlameLineCallback. The former expects that file contents can be + * converted from UTF-8 to a String, which is not true in general + * and may throw exceptions. + * @deprecated Use the 1.12 version with BlameLineCallback */ + @Deprecated void blame(String path, Revision pegRevision, Revision revisionStart, Revision revisionEnd, boolean ignoreMimeType, boolean includeMergedRevisions, BlameCallback callback, DiffOptions options) - throws ClientException; + throws ClientException; /** * Retrieve the content together with the author, the revision and the date @@ -1412,12 +1432,14 @@ public interface ISVNClient *

    * Behaves like the 1.9 version with options set to * their default values. + * @deprecated Use the 1.12 version with BlameLineCallback */ + @Deprecated void blame(String path, Revision pegRevision, Revision revisionStart, Revision revisionEnd, boolean ignoreMimeType, boolean includeMergedRevisions, BlameCallback callback) - throws ClientException; + throws ClientException; /** * Set directory for the configuration information, taking the diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java index af1f45b..7cce9f6 100644 --- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java +++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java @@ -141,12 +141,15 @@ public class NativeResources */ private static final void init() { + final int SVN_VER_MAJOR = 1; + final int SVN_VER_MINOR = 13; initNativeLibrary(); version = new Version(); - if (!version.isAtLeast(1, 10, 0)) + if (!version.isAtLeast(SVN_VER_MAJOR, SVN_VER_MINOR, 0)) { throw new LinkageError("Native library version must be at least " + - "1.10.0, but is only " + version); + SVN_VER_MAJOR + "." + SVN_VER_MINOR + ".0," + + "but is only " + version); } runtimeVersion = new RuntimeVersion(); diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java index b93cb9c..aaef8f8 100644 --- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java +++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java @@ -30,6 +30,7 @@ import java.io.OutputStream; import java.io.FileOutputStream; import java.io.FileNotFoundException; import java.io.ByteArrayOutputStream; +import java.io.UnsupportedEncodingException; import java.util.Collection; import java.util.Collections; @@ -705,6 +706,7 @@ public class SVNClient implements ISVNClient boolean ignoreExternals) throws ClientException; + @Deprecated public void blame(String path, Revision pegRevision, Revision revisionStart, Revision revisionEnd, boolean ignoreMimeType, @@ -716,13 +718,28 @@ public class SVNClient implements ISVNClient includeMergedRevisions, callback, null); } + @Deprecated + public void blame(String path, Revision pegRevision, + Revision revisionStart, + Revision revisionEnd, boolean ignoreMimeType, + boolean includeMergedRevisions, + BlameCallback callback, + DiffOptions options) + throws ClientException + { + blame(path, pegRevision, revisionStart, revisionEnd, + ignoreMimeType, includeMergedRevisions, options, + null, new BlameCallbackAdapter(callback)); + } + public native void blame(String path, Revision pegRevision, Revision revisionStart, Revision revisionEnd, boolean ignoreMimeType, boolean includeMergedRevisions, - BlameCallback callback, - DiffOptions options) - throws ClientException; + DiffOptions options, + BlameRangeCallback rangeCallback, + BlameLineCallback lineCallback) + throws ClientException; public native void setConfigDirectory(String configDir) throws ClientException; @@ -897,4 +914,42 @@ public class SVNClient implements ISVNClient null); } } + + /** + * A private class that adapts from BlameLineCallback to BlameCallback. + */ + @Deprecated + private class BlameCallbackAdapter implements BlameLineCallback + { + private BlameCallback wrappedCallback = null; + + public BlameCallbackAdapter(BlameCallback callback) + { + wrappedCallback = callback; + } + + // Implementation of BlameLineCallback + public void singleLine(long lineNum, long revision, + Map revProps, long mergedRevision, + Map mergedRevProps, + String mergedPath, boolean localChange, + byte[] line) + throws ClientException + { + if (wrappedCallback == null) + return; + + String convertedLine = null; + try { + convertedLine = new String(line, "UTF-8"); + } + catch (UnsupportedEncodingException ex) { + throw ClientException.fromException(ex); + } + + wrappedCallback.singleLine(lineNum, revision, + revProps, mergedRevision, mergedRevProps, + mergedPath, convertedLine, localChange); + } + } } diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java index 38e4b91..d025a89 100644 --- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java +++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java @@ -31,7 +31,9 @@ import org.apache.subversion.javahl.ISVNClient; /** * This interface is used to receive every single line for a file on a * the {@link ISVNClient#blame} call. + * @deprecated use {@link BlameLineCallback} instead. */ +@Deprecated public interface BlameCallback { /** diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameLineCallback.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameLineCallback.java new file mode 100644 index 0000000..8247e73 --- /dev/null +++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameLineCallback.java @@ -0,0 +1,55 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +package org.apache.subversion.javahl.callback; + +import org.apache.subversion.javahl.ClientException; + +import java.util.Map; + +/** + * This interface is used to receive every single line for a file on a + * the {@link ISVNClient#blame} call. + * @since 1.12 + */ +public interface BlameLineCallback +{ + /** + * the method will be called for every line in a file. + * @param lineNum the line number for this line + * @param revision the revision of the last change. + * @param revProps the revision properties for this revision. + * @param mergedRevision the revision of the last merged change. + * @param mergedRevProps the revision properties for the last merged + * change. + * @param mergedPath the path of the last merged change. + * @param localChange true if the line was locally modified. + * @param line the line in the file. + */ + public void singleLine(long lineNum, long revision, + Map revProps, long mergedRevision, + Map mergedRevProps, + String mergedPath, boolean localChange, + byte[] line) + throws ClientException; +} diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameRangeCallback.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameRangeCallback.java new file mode 100644 index 0000000..725a9ef --- /dev/null +++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameRangeCallback.java @@ -0,0 +1,43 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + */ + +package org.apache.subversion.javahl.callback; + +import org.apache.subversion.javahl.ClientException; + +/** + * This interface is used to the resolved revision range + * the {@link ISVNClient#blame} call. + * @since 1.12 + */ +public interface BlameRangeCallback +{ + /** + * This method will be called once before #{BlameLineCallback.singleLine} + * is called for the first time. + * @param startRevision the resolved start of the blame range. + * @param endRevision the resolved end of the blame range. + */ + public void setRange(long startRevision, long endRevision) + throws ClientException; +} diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java index a89f219..215c041 100644 --- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java +++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java @@ -23,6 +23,8 @@ package org.apache.subversion.javahl.callback; +import java.lang.annotation.*; + /** *

    The interface for requesting authentication credentials from the * user. Should the javahl bindings need the matching information, @@ -40,16 +42,19 @@ public interface UserPasswordCallback /** * Reject the connection to the server. */ + @Native public static final int Reject = 0; /** * Accept the connection to the server once. */ + @Native public static final int AcceptTemporary = 1; /** * Accept the connection to the server forever. */ + @Native public static final int AcceptPermanently = 2; /** diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java index 675737d..9a80778 100644 --- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java +++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java @@ -23,6 +23,7 @@ package org.apache.subversion.javahl.types; +import java.lang.annotation.*; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; @@ -179,6 +180,7 @@ public class Revision implements java.io.Serializable /** * Marker revision number for no real revision */ + @Native public static final int SVN_INVALID_REVNUM = -1; /** diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java index ae9ecd1..4a1eaec 100644 --- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java +++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java @@ -160,7 +160,7 @@ public class RevisionRange implements Comparable, java.io.Seriali { val = ((Revision.Number) rev).getNumber(); } - return new Long(val); + return Long.valueOf(val); } public int hashCode() diff --git a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java index 9b629be..30f5e9e 100644 --- a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java +++ b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java @@ -22,6 +22,8 @@ */ package org.apache.subversion.javahl; +import static org.junit.Assert.*; + import org.apache.subversion.javahl.callback.*; import org.apache.subversion.javahl.types.*; @@ -2736,7 +2738,7 @@ public class BasicTests extends SVNTests public void singleMessage(Set changedPaths, long revision, Map revprops, boolean hasChildren) - { revList.add(new Long(revision)); } + { revList.add(Long.valueOf(revision)); } }); long[] revisions = new long[revList.size()]; @@ -3930,7 +3932,7 @@ public class BasicTests extends SVNTests /* This is currently commented out, because we don't have an XFail method for JavaHL. The resolution is pending the result of issue #3680: - http://subversion.tigris.org/issues/show_bug.cgi?id=3680 + https://issues.apache.org/jira/browse/SVN-3680 public void testObstructionTolerance() throws SubversionException, IOException @@ -4093,6 +4095,7 @@ public class BasicTests extends SVNTests * @throws Throwable * @since 1.5 */ + @SuppressWarnings("deprecation") public void testBasicBlame() throws Throwable { OneTest thisTest = new OneTest(); @@ -4122,6 +4125,7 @@ public class BasicTests extends SVNTests * Test blame with diff options. * @since 1.9 */ + @SuppressWarnings("deprecation") public void testBlameWithDiffOptions() throws Throwable { OneTest thisTest = new OneTest(); @@ -4154,6 +4158,49 @@ public class BasicTests extends SVNTests assertEquals("This is the file 'iota'.\t", line.getLine()); } + /** + * Test the new 1.12 blame interface on a file with null bytes. + * @throws Throwable + * @since 1.12 + */ + public void testBinaryBlame() throws Throwable + { + final byte[] lineIn = {0x0, 0x0, 0x0, 0xa}; + final byte[] lineOut = {0x0, 0x0, 0x0}; + + OneTest thisTest = new OneTest(); + // Modify the file iota, adding null bytes. + File iota = new File(thisTest.getWorkingCopy(), "iota"); + FileOutputStream stream = new FileOutputStream(iota, false); + stream.write(lineIn); + stream.close(); + Set srcPaths = new HashSet(1); + srcPaths.add(thisTest.getWCPath()); + try { + client.username("rayjandom"); + client.commit(srcPaths, Depth.infinity, false, false, null, null, + new ConstMsg("NUL bytes written to /iota"), null); + } finally { + client.username("jrandom"); + } + + // Test the current interface + BlameRangeCallbackImpl rangeCallback = new BlameRangeCallbackImpl(); + BlameLineCallbackImpl lineCallback = new BlameLineCallbackImpl(); + client.blame(thisTest.getWCPath() + "/iota", Revision.HEAD, + Revision.getInstance(0), Revision.HEAD, + false, false, null, rangeCallback, lineCallback); + assertEquals(0, rangeCallback.startRevnum); + assertEquals(2, rangeCallback.endRevnum); + assertEquals(1, lineCallback.numberOfLines()); + + BlameLineCallbackImpl.BlameLine line = lineCallback.getBlameLine(0); + assertNotNull(line); + assertEquals(2, line.getRevision()); + assertEquals("rayjandom", line.getAuthor()); + assertArrayEquals(lineOut, line.getLine()); + } + /** * Test commit of arbitrary revprops. * @throws Throwable @@ -4679,6 +4726,7 @@ public class BasicTests extends SVNTests return callback.getMessages(); } + @SuppressWarnings("deprecation") private byte[] collectBlameLines(String path, Revision pegRevision, Revision revisionStart, Revision revisionEnd, @@ -4766,6 +4814,7 @@ public class BasicTests extends SVNTests } /* A blame callback implementation. */ + @SuppressWarnings("deprecation") protected class BlameCallbackImpl implements BlameCallback { @@ -4979,6 +5028,158 @@ public class BasicTests extends SVNTests } } + /* A blame range callback implementation. */ + protected class BlameRangeCallbackImpl implements BlameRangeCallback + { + public long startRevnum = -1; + public long endRevnum = -1; + public void setRange(long start, long end) + { + startRevnum = start; + endRevnum = end; + } + } + + /* A blame line callback implementation. */ + protected class BlameLineCallbackImpl implements BlameLineCallback + { + + /** list of blame records (lines) */ + private List lines = new ArrayList(); + + public void singleLine(long lineNum, long rev, + Map revProps, + long mergedRevision, + Map mergedRevProps, + String mergedPath, boolean localChange, + byte[] line) + throws ClientException + { + DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS"); + + try { + insertLine( + df.parse(new String(revProps.get("svn:date"))), + rev, + new String(revProps.get("svn:author")), + mergedRevProps == null ? null + : df.parse(new String(mergedRevProps.get("svn:date"))), + mergedRevision, + mergedRevProps == null ? null + : new String(mergedRevProps.get("svn:author")), + mergedPath, line); + } catch (ParseException e) { + throw ClientException.fromException(e); + } + } + + private Date getDate(Date date, Date merged_date) { + return (merged_date == null ? date : merged_date); + } + + private String getAuthor(String author, String merged_author) { + return (merged_author == null ? author : merged_author); + } + + private long getRevision(long revision, long merged_revision) { + return (merged_revision == -1 ? revision : merged_revision); + } + + private void insertLine(Date date, long revision, String author, + Date merged_date, long merged_revision, + String merged_author, String merged_path, + byte[] line) + { + this.lines.add(new BlameLine(getRevision(revision, merged_revision), + getAuthor(author, merged_author), + getDate(date, merged_date), + line)); + } + + /** + * Retrieve the number of line of blame information + * @return number of lines of blame information + */ + public int numberOfLines() + { + return this.lines.size(); + } + + /** + * Retrieve blame information for specified line number + * @param i the line number to retrieve blame information about + * @return Returns object with blame information for line + */ + public BlameLine getBlameLine(int i) + { + if (i >= this.lines.size()) + { + return null; + } + return this.lines.get(i); + } + + /** + * Class represeting one line of the lines, i.e. a blame record + */ + public final class BlameLine + { + private long revision; + private String author; + private Date changed; + private byte[] line; + + /** + * Constructor + * + * @param revision + * @param author + * @param changed + * @param line + */ + public BlameLine(long revision, String author, + Date changed, byte[] line) + { + this.revision = revision; + this.author = author; + this.changed = changed; + this.line = line; + } + + /** + * @return Returns the author. + */ + public String getAuthor() + { + return author; + } + + /** + * @return Returns the date changed. + */ + public Date getChanged() + { + return changed; + } + + /** + * @return Returns the source line content. + */ + public byte[] getLine() + { + return line; + } + + /** + * @return Returns the revision. + */ + public long getRevision() + { + return revision; + } + } + } + /** A helper which calls update with a bunch of default args. */ private long update(OneTest thisTest) throws ClientException diff --git a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/ExceptionTests.java b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/ExceptionTests.java index 270648f..bfad926 100644 --- a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/ExceptionTests.java +++ b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/ExceptionTests.java @@ -206,18 +206,17 @@ public class ExceptionTests extends SVNTests { client.blame(thisTest.getWorkingCopy() + "/iota", Revision.getInstance(1), Revision.getInstance(1), - Revision.getInstance(1), false, false, - new BlameCallback() - { - public void singleLine(long lineNum, long revision, - Map revProps, long mergedRevision, - Map mergedRevProps, - String mergedPath, String line, - boolean localChange) - { - throw new TestException("inner", theException); - } - }); + Revision.getInstance(1), false, false, null, null, + new BlameLineCallback() { + public void singleLine(long lineNum, long revision, + Map revProps, long mergedRevision, + Map mergedRevProps, + String mergedPath, boolean localChange, + byte[] line) + { + throw new TestException("inner", theException); + } + }); } catch (ClientException e) { diff --git a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java index 942dc83..35f3820 100644 --- a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java +++ b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java @@ -1383,9 +1383,9 @@ public class SVNRemoteTests extends SVNTests { ISVNRemote session = getSession(); - Long expected = new Long(1L); + Long expected = Long.valueOf(1L); ArrayList revs = new ArrayList(3); - revs.add(new Long(0L)); + revs.add(Long.valueOf(0L)); revs.add(expected); Map locs = session.getLocations("A", 1, revs); diff --git a/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java b/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java index 5d5e022..62a881f 100644 --- a/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java +++ b/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java @@ -3066,7 +3066,7 @@ public class BasicTests extends SVNTests /* This is currently commented out, because we don't have an XFail method for JavaHL. The resolution is pending the result of issue #3680: - http://subversion.tigris.org/issues/show_bug.cgi?id=3680 + https://issues.apache.org/jira/browse/SVN-3680 public void testObstructionTolerance() throws SubversionException, IOException { diff --git a/subversion/bindings/swig/core.i b/subversion/bindings/swig/core.i index 4e6742a..2689a93 100644 --- a/subversion/bindings/swig/core.i +++ b/subversion/bindings/swig/core.i @@ -816,6 +816,7 @@ core_set_current_pool (apr_pool_t *pool) %include svn_error_codes_h.swg %include svn_time_h.swg +%include svn_types_impl_h.swg %include svn_types_h.swg %include svn_pools_h.swg %include svn_version_h.swg @@ -827,6 +828,7 @@ core_set_current_pool (apr_pool_t *pool) %include svn_props_h.swg #pragma SWIG nowarn=+305 +%include svn_opt_impl_h.swg %include svn_opt_h.swg %include svn_cmdline_h.swg %include svn_auth_h.swg diff --git a/subversion/bindings/swig/include/svn_types.swg b/subversion/bindings/swig/include/svn_types.swg index 17770d1..ad66cb1 100644 --- a/subversion/bindings/swig/include/svn_types.swg +++ b/subversion/bindings/swig/include/svn_types.swg @@ -44,6 +44,7 @@ Known instances of "type **" which are *not* OUTPUT parameters are: - svn_stream_checksummed(..., const unsigned char **read_digest, const unsigned char **write_digest, ...) + - svn_*_change_rev_prop2(..., const svn_string_t *const *old_value_p, ...) */ %typemap(in, numinputs=0) SWIGTYPE ** ($*1_ltype temp) "$1 = &temp;"; @@ -940,7 +941,15 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self) #ifdef SWIGPYTHON %typemap(in) svn_stream_t *WRAPPED_STREAM { - $1 = svn_swig_py_make_stream ($input, _global_pool); + if ($input == Py_None) { + $1 = NULL; + } + else { + $1 = svn_swig_py_make_stream ($input, _global_pool); + if ($1 == NULL) { + SWIG_fail; + } + } } #endif diff --git a/subversion/bindings/swig/perl/native/core.c b/subversion/bindings/swig/perl/native/core.c index c363bbc..0390652 100644 --- a/subversion/bindings/swig/perl/native/core.c +++ b/subversion/bindings/swig/perl/native/core.c @@ -1641,29 +1641,31 @@ SWIG_Perl_SetModule(swig_module_info *module) { #define SWIGTYPE_p_svn_opt_revision_value_t swig_types[129] #define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[130] #define SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides swig_types[131] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[132] -#define SWIGTYPE_p_svn_patch_file_t swig_types[133] -#define SWIGTYPE_p_svn_patch_t swig_types[134] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[135] -#define SWIGTYPE_p_svn_prop_kind swig_types[136] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[137] -#define SWIGTYPE_p_svn_prop_t swig_types[138] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[139] -#define SWIGTYPE_p_svn_stream_t swig_types[140] -#define SWIGTYPE_p_svn_string_t swig_types[141] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[142] -#define SWIGTYPE_p_svn_tristate_t swig_types[143] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[144] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[145] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[146] -#define SWIGTYPE_p_svn_version_extended_t swig_types[147] -#define SWIGTYPE_p_svn_version_t swig_types[148] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[149] -#define SWIGTYPE_p_unsigned_char swig_types[150] -#define SWIGTYPE_p_unsigned_long swig_types[151] -#define SWIGTYPE_p_void swig_types[152] -static swig_type_info *swig_types[154]; -static swig_module_info swig_module = {swig_types, 153, 0, 0, 0, 0}; +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[132] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides swig_types[133] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[134] +#define SWIGTYPE_p_svn_patch_file_t swig_types[135] +#define SWIGTYPE_p_svn_patch_t swig_types[136] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[137] +#define SWIGTYPE_p_svn_prop_kind swig_types[138] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[139] +#define SWIGTYPE_p_svn_prop_t swig_types[140] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[141] +#define SWIGTYPE_p_svn_stream_t swig_types[142] +#define SWIGTYPE_p_svn_string_t swig_types[143] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[144] +#define SWIGTYPE_p_svn_tristate_t swig_types[145] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[146] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[147] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[148] +#define SWIGTYPE_p_svn_version_extended_t swig_types[149] +#define SWIGTYPE_p_svn_version_t swig_types[150] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[151] +#define SWIGTYPE_p_unsigned_char swig_types[152] +#define SWIGTYPE_p_unsigned_long swig_types[153] +#define SWIGTYPE_p_void swig_types[154] +static swig_type_info *swig_types[156]; +static swig_module_info swig_module = {swig_types, 155, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2029,6 +2031,11 @@ SWIG_AsCharPtrAndSize(SV *obj, char** cptr, size_t* psize, int *alloc) +#include "svn_types_impl.h" + + + + #include "svn_types.h" @@ -2156,8 +2163,17 @@ static const svn_version_t * svn_version_invoke_func( +#include "svn_opt_impl.h" + + + + #include "svn_opt.h" +typedef struct { + int optch; const char *desc; +} svn_opt_subcommand_desc3_t_desc_overrides; + typedef struct { int optch; const char *desc; } svn_opt_subcommand_desc2_t_desc_overrides; @@ -5897,7 +5913,7 @@ XS(_wrap_svn_log_entry_t_changed_paths2_get) { arg1 = (struct svn_log_entry_t *)(argp1); result = (apr_hash_t *) ((arg1)->changed_paths2); { - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = (result) ? svn_swig_pl_convert_hash(result, SWIGTYPE_p_svn_log_changed_path2_t) + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = (result) ? svn_swig_pl_convert_hash(result, SWIGTYPE_p_svn_log_changed_path2_t) :&PL_sv_undef; argvi++ /*@SWIG@*/ /*@SWIG@*/ @@ -10795,9 +10811,9 @@ XS(_wrap_svn_prop_name_is_valid) { } -XS(_wrap_svn_opt_subcommand_desc2_t_name_set) { +XS(_wrap_svn_opt_subcommand_desc3_t_name_set) { { - struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; char *arg2 = (char *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -10808,16 +10824,16 @@ XS(_wrap_svn_opt_subcommand_desc2_t_name_set) { dXSARGS; if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: svn_opt_subcommand_desc2_t_name_set(self,name);"); + SWIG_croak("Usage: svn_opt_subcommand_desc3_t_name_set(self,name);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_name_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc3_t_name_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc3_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc2_t_name_set" "', argument " "2"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc3_t_name_set" "', argument " "2"" of type '" "char const *""'"); } arg2 = (char *)(buf2); { @@ -10840,9 +10856,9 @@ XS(_wrap_svn_opt_subcommand_desc2_t_name_set) { } -XS(_wrap_svn_opt_subcommand_desc2_t_name_get) { +XS(_wrap_svn_opt_subcommand_desc3_t_name_get) { { - struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; @@ -10850,13 +10866,13 @@ XS(_wrap_svn_opt_subcommand_desc2_t_name_get) { dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: svn_opt_subcommand_desc2_t_name_get(self);"); + SWIG_croak("Usage: svn_opt_subcommand_desc3_t_name_get(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_name_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc3_t_name_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc3_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); result = (char *) ((arg1)->name); ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; @@ -10868,9 +10884,9 @@ XS(_wrap_svn_opt_subcommand_desc2_t_name_get) { } -XS(_wrap_svn_opt_subcommand_desc2_t_cmd_func_set) { +XS(_wrap_svn_opt_subcommand_desc3_t_cmd_func_set) { { - struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; svn_opt_subcommand_t *arg2 = (svn_opt_subcommand_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -10878,17 +10894,17 @@ XS(_wrap_svn_opt_subcommand_desc2_t_cmd_func_set) { dXSARGS; if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: svn_opt_subcommand_desc2_t_cmd_func_set(self,cmd_func);"); + SWIG_croak("Usage: svn_opt_subcommand_desc3_t_cmd_func_set(self,cmd_func);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_cmd_func_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc3_t_cmd_func_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc3_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); { int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t); if (!SWIG_IsOK(res)) { - SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_opt_subcommand_desc2_t_cmd_func_set" "', argument " "2"" of type '" "svn_opt_subcommand_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_opt_subcommand_desc3_t_cmd_func_set" "', argument " "2"" of type '" "svn_opt_subcommand_t *""'"); } } if (arg1) (arg1)->cmd_func = arg2; @@ -10904,9 +10920,9 @@ XS(_wrap_svn_opt_subcommand_desc2_t_cmd_func_set) { } -XS(_wrap_svn_opt_subcommand_desc2_t_cmd_func_get) { +XS(_wrap_svn_opt_subcommand_desc3_t_cmd_func_get) { { - struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; @@ -10914,13 +10930,13 @@ XS(_wrap_svn_opt_subcommand_desc2_t_cmd_func_get) { dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: svn_opt_subcommand_desc2_t_cmd_func_get(self);"); + SWIG_croak("Usage: svn_opt_subcommand_desc3_t_cmd_func_get(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_cmd_func_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc3_t_cmd_func_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc3_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); result = (svn_opt_subcommand_t *) ((arg1)->cmd_func); ST(argvi) = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t); argvi++ ; @@ -10932,9 +10948,9 @@ XS(_wrap_svn_opt_subcommand_desc2_t_cmd_func_get) { } -XS(_wrap_svn_opt_subcommand_desc2_t_aliases_set) { +XS(_wrap_svn_opt_subcommand_desc3_t_aliases_set) { { - struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; char **arg2 ; void *argp1 = 0 ; int res1 = 0 ; @@ -10944,16 +10960,16 @@ XS(_wrap_svn_opt_subcommand_desc2_t_aliases_set) { dXSARGS; if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: svn_opt_subcommand_desc2_t_aliases_set(self,aliases);"); + SWIG_croak("Usage: svn_opt_subcommand_desc3_t_aliases_set(self,aliases);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_aliases_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc3_t_aliases_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc3_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_p_char, 0 | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc2_t_aliases_set" "', argument " "2"" of type '" "char const *[3]""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc3_t_aliases_set" "', argument " "2"" of type '" "char const *[3]""'"); } arg2 = (char **)(argp2); { @@ -10976,9 +10992,9 @@ XS(_wrap_svn_opt_subcommand_desc2_t_aliases_set) { } -XS(_wrap_svn_opt_subcommand_desc2_t_aliases_get) { +XS(_wrap_svn_opt_subcommand_desc3_t_aliases_get) { { - struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; @@ -10986,13 +11002,13 @@ XS(_wrap_svn_opt_subcommand_desc2_t_aliases_get) { dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: svn_opt_subcommand_desc2_t_aliases_get(self);"); + SWIG_croak("Usage: svn_opt_subcommand_desc3_t_aliases_get(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_aliases_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc3_t_aliases_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc3_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); result = (char **)(char **) ((arg1)->aliases); ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_p_char, 0 | 0); argvi++ ; @@ -11004,70 +11020,69 @@ XS(_wrap_svn_opt_subcommand_desc2_t_aliases_get) { } -XS(_wrap_svn_opt_subcommand_desc2_t_help_set) { +XS(_wrap_svn_opt_subcommand_desc3_t_help_set) { { - struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; - char *arg2 = (char *) 0 ; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + char **arg2 ; void *argp1 = 0 ; int res1 = 0 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; int argvi = 0; dXSARGS; if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: svn_opt_subcommand_desc2_t_help_set(self,help);"); + SWIG_croak("Usage: svn_opt_subcommand_desc3_t_help_set(self,help);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_help_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc3_t_help_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc3_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); - res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); + res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_p_char, 0 | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc2_t_help_set" "', argument " "2"" of type '" "char const *""'"); - } - arg2 = (char *)(buf2); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc3_t_help_set" "', argument " "2"" of type '" "char const *[100]""'"); + } + arg2 = (char **)(argp2); { - apr_size_t len = strlen(arg2) + 1; - char *copied; - if (arg1->help) free((char *)arg1->help); - copied = malloc(len); - memcpy(copied, arg2, len); - arg1->help = copied; + if (arg2) { + size_t ii = 0; + for (; ii < (size_t)100; ++ii) *(char const * *)&arg1->help[ii] = *((char const * *)arg2 + ii); + } else { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""help""' of type '""char const *[100]""'"); + } } ST(argvi) = sv_newmortal(); - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + XSRETURN(argvi); fail: - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + SWIG_croak_null(); } } -XS(_wrap_svn_opt_subcommand_desc2_t_help_get) { +XS(_wrap_svn_opt_subcommand_desc3_t_help_get) { { - struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; - char *result = 0 ; + char **result = 0 ; dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: svn_opt_subcommand_desc2_t_help_get(self);"); + SWIG_croak("Usage: svn_opt_subcommand_desc3_t_help_get(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_help_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc3_t_help_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc3_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); - result = (char *) ((arg1)->help); - ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); + result = (char **)(char **) ((arg1)->help); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_p_char, 0 | 0); argvi++ ; XSRETURN(argvi); fail: @@ -11077,9 +11092,9 @@ XS(_wrap_svn_opt_subcommand_desc2_t_help_get) { } -XS(_wrap_svn_opt_subcommand_desc2_t_valid_options_set) { +XS(_wrap_svn_opt_subcommand_desc3_t_valid_options_set) { { - struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; int *arg2 ; void *argp1 = 0 ; int res1 = 0 ; @@ -11089,16 +11104,16 @@ XS(_wrap_svn_opt_subcommand_desc2_t_valid_options_set) { dXSARGS; if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: svn_opt_subcommand_desc2_t_valid_options_set(self,valid_options);"); + SWIG_croak("Usage: svn_opt_subcommand_desc3_t_valid_options_set(self,valid_options);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_valid_options_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc3_t_valid_options_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc3_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_int, 0 | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc2_t_valid_options_set" "', argument " "2"" of type '" "int [50]""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc3_t_valid_options_set" "', argument " "2"" of type '" "int [50]""'"); } arg2 = (int *)(argp2); { @@ -11121,9 +11136,9 @@ XS(_wrap_svn_opt_subcommand_desc2_t_valid_options_set) { } -XS(_wrap_svn_opt_subcommand_desc2_t_valid_options_get) { +XS(_wrap_svn_opt_subcommand_desc3_t_valid_options_get) { { - struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; @@ -11131,13 +11146,13 @@ XS(_wrap_svn_opt_subcommand_desc2_t_valid_options_get) { dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: svn_opt_subcommand_desc2_t_valid_options_get(self);"); + SWIG_croak("Usage: svn_opt_subcommand_desc3_t_valid_options_get(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_valid_options_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc3_t_valid_options_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc3_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); result = (int *)(int *) ((arg1)->valid_options); ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 | 0); argvi++ ; @@ -11149,25 +11164,25 @@ XS(_wrap_svn_opt_subcommand_desc2_t_valid_options_get) { } -XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_get) { +XS(_wrap_svn_opt_subcommand_desc3_t_desc_overrides_get) { { - struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; - svn_opt_subcommand_desc2_t_desc_overrides *result = 0 ; + svn_opt_subcommand_desc3_t_desc_overrides *result = 0 ; dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: svn_opt_subcommand_desc2_t_desc_overrides_get(self);"); + SWIG_croak("Usage: svn_opt_subcommand_desc3_t_desc_overrides_get(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_desc_overrides_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc3_t_desc_overrides_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc3_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); - result = (svn_opt_subcommand_desc2_t_desc_overrides *)(svn_opt_subcommand_desc2_t_desc_overrides *) ((arg1)->desc_overrides); - ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, 0 | SWIG_SHADOW); argvi++ ; + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); + result = (svn_opt_subcommand_desc3_t_desc_overrides *)(svn_opt_subcommand_desc3_t_desc_overrides *) ((arg1)->desc_overrides); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, 0 | SWIG_SHADOW); argvi++ ; XSRETURN(argvi); fail: @@ -11177,22 +11192,22 @@ XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_get) { } -XS(_wrap_new_svn_opt_subcommand_desc2_t) { +XS(_wrap_new_svn_opt_subcommand_desc3_t) { { int argvi = 0; - struct svn_opt_subcommand_desc2_t *result = 0 ; + struct svn_opt_subcommand_desc3_t *result = 0 ; dXSARGS; if ((items < 0) || (items > 0)) { - SWIG_croak("Usage: new_svn_opt_subcommand_desc2_t();"); + SWIG_croak("Usage: new_svn_opt_subcommand_desc3_t();"); } { - result = (struct svn_opt_subcommand_desc2_t *)calloc(1, sizeof(struct svn_opt_subcommand_desc2_t)); + result = (struct svn_opt_subcommand_desc3_t *)calloc(1, sizeof(struct svn_opt_subcommand_desc3_t)); } - ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_opt_subcommand_desc2_t, SWIG_OWNER | SWIG_SHADOW); argvi++ ; + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_opt_subcommand_desc3_t, SWIG_OWNER | SWIG_SHADOW); argvi++ ; XSRETURN(argvi); fail: SWIG_croak_null(); @@ -11200,22 +11215,22 @@ XS(_wrap_new_svn_opt_subcommand_desc2_t) { } -XS(_wrap_delete_svn_opt_subcommand_desc2_t) { +XS(_wrap_delete_svn_opt_subcommand_desc3_t) { { - struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: delete_svn_opt_subcommand_desc2_t(self);"); + SWIG_croak("Usage: delete_svn_opt_subcommand_desc3_t(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, SWIG_POINTER_DISOWN | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, SWIG_POINTER_DISOWN | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_svn_opt_subcommand_desc2_t" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_svn_opt_subcommand_desc3_t" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc3_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); { free((char *) arg1); @@ -11232,9 +11247,9 @@ XS(_wrap_delete_svn_opt_subcommand_desc2_t) { } -XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_optch_set) { +XS(_wrap_svn_opt_subcommand_desc3_t_desc_overrides_optch_set) { { - svn_opt_subcommand_desc2_t_desc_overrides *arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *) 0 ; + svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *) 0 ; int arg2 ; void *argp1 = 0 ; int res1 = 0 ; @@ -11244,16 +11259,16 @@ XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_optch_set) { dXSARGS; if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: svn_opt_subcommand_desc2_t_desc_overrides_optch_set(self,optch);"); + SWIG_croak("Usage: svn_opt_subcommand_desc3_t_desc_overrides_optch_set(self,optch);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_desc_overrides_optch_set" "', argument " "1"" of type '" "svn_opt_subcommand_desc2_t_desc_overrides *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc3_t_desc_overrides_optch_set" "', argument " "1"" of type '" "svn_opt_subcommand_desc3_t_desc_overrides *""'"); } - arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)(argp1); + arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)(argp1); ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_opt_subcommand_desc2_t_desc_overrides_optch_set" "', argument " "2"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_opt_subcommand_desc3_t_desc_overrides_optch_set" "', argument " "2"" of type '" "int""'"); } arg2 = (int)(val2); if (arg1) (arg1)->optch = arg2; @@ -11269,9 +11284,9 @@ XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_optch_set) { } -XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_optch_get) { +XS(_wrap_svn_opt_subcommand_desc3_t_desc_overrides_optch_get) { { - svn_opt_subcommand_desc2_t_desc_overrides *arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *) 0 ; + svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; @@ -11279,13 +11294,13 @@ XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_optch_get) { dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: svn_opt_subcommand_desc2_t_desc_overrides_optch_get(self);"); + SWIG_croak("Usage: svn_opt_subcommand_desc3_t_desc_overrides_optch_get(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_desc_overrides_optch_get" "', argument " "1"" of type '" "svn_opt_subcommand_desc2_t_desc_overrides *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc3_t_desc_overrides_optch_get" "', argument " "1"" of type '" "svn_opt_subcommand_desc3_t_desc_overrides *""'"); } - arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)(argp1); + arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)(argp1); result = (int) ((arg1)->optch); ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ; @@ -11297,9 +11312,9 @@ XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_optch_get) { } -XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_desc_set) { +XS(_wrap_svn_opt_subcommand_desc3_t_desc_overrides_desc_set) { { - svn_opt_subcommand_desc2_t_desc_overrides *arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *) 0 ; + svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *) 0 ; char *arg2 = (char *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -11310,16 +11325,16 @@ XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_desc_set) { dXSARGS; if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: svn_opt_subcommand_desc2_t_desc_overrides_desc_set(self,desc);"); + SWIG_croak("Usage: svn_opt_subcommand_desc3_t_desc_overrides_desc_set(self,desc);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_desc_overrides_desc_set" "', argument " "1"" of type '" "svn_opt_subcommand_desc2_t_desc_overrides *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc3_t_desc_overrides_desc_set" "', argument " "1"" of type '" "svn_opt_subcommand_desc3_t_desc_overrides *""'"); } - arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)(argp1); + arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)(argp1); res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc2_t_desc_overrides_desc_set" "', argument " "2"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc3_t_desc_overrides_desc_set" "', argument " "2"" of type '" "char const *""'"); } arg2 = (char *)(buf2); { @@ -11342,9 +11357,9 @@ XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_desc_set) { } -XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_desc_get) { +XS(_wrap_svn_opt_subcommand_desc3_t_desc_overrides_desc_get) { { - svn_opt_subcommand_desc2_t_desc_overrides *arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *) 0 ; + svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; @@ -11352,13 +11367,13 @@ XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_desc_get) { dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: svn_opt_subcommand_desc2_t_desc_overrides_desc_get(self);"); + SWIG_croak("Usage: svn_opt_subcommand_desc3_t_desc_overrides_desc_get(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_desc_overrides_desc_get" "', argument " "1"" of type '" "svn_opt_subcommand_desc2_t_desc_overrides *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc3_t_desc_overrides_desc_get" "', argument " "1"" of type '" "svn_opt_subcommand_desc3_t_desc_overrides *""'"); } - arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)(argp1); + arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)(argp1); result = (char *) ((arg1)->desc); ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; @@ -11370,22 +11385,22 @@ XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_desc_get) { } -XS(_wrap_new_svn_opt_subcommand_desc2_t_desc_overrides) { +XS(_wrap_new_svn_opt_subcommand_desc3_t_desc_overrides) { { int argvi = 0; - svn_opt_subcommand_desc2_t_desc_overrides *result = 0 ; + svn_opt_subcommand_desc3_t_desc_overrides *result = 0 ; dXSARGS; if ((items < 0) || (items > 0)) { - SWIG_croak("Usage: new_svn_opt_subcommand_desc2_t_desc_overrides();"); + SWIG_croak("Usage: new_svn_opt_subcommand_desc3_t_desc_overrides();"); } { - result = (svn_opt_subcommand_desc2_t_desc_overrides *)calloc(1, sizeof(svn_opt_subcommand_desc2_t_desc_overrides)); + result = (svn_opt_subcommand_desc3_t_desc_overrides *)calloc(1, sizeof(svn_opt_subcommand_desc3_t_desc_overrides)); } - ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, SWIG_OWNER | SWIG_SHADOW); argvi++ ; + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, SWIG_OWNER | SWIG_SHADOW); argvi++ ; XSRETURN(argvi); fail: SWIG_croak_null(); @@ -11393,22 +11408,22 @@ XS(_wrap_new_svn_opt_subcommand_desc2_t_desc_overrides) { } -XS(_wrap_delete_svn_opt_subcommand_desc2_t_desc_overrides) { +XS(_wrap_delete_svn_opt_subcommand_desc3_t_desc_overrides) { { - svn_opt_subcommand_desc2_t_desc_overrides *arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *) 0 ; + svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: delete_svn_opt_subcommand_desc2_t_desc_overrides(self);"); + SWIG_croak("Usage: delete_svn_opt_subcommand_desc3_t_desc_overrides(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, SWIG_POINTER_DISOWN | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, SWIG_POINTER_DISOWN | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_svn_opt_subcommand_desc2_t_desc_overrides" "', argument " "1"" of type '" "svn_opt_subcommand_desc2_t_desc_overrides *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_svn_opt_subcommand_desc3_t_desc_overrides" "', argument " "1"" of type '" "svn_opt_subcommand_desc3_t_desc_overrides *""'"); } - arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)(argp1); + arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)(argp1); { free((char *) arg1); @@ -11425,9 +11440,9 @@ XS(_wrap_delete_svn_opt_subcommand_desc2_t_desc_overrides) { } -XS(_wrap_svn_opt_subcommand_desc_t_name_set) { +XS(_wrap_svn_opt_subcommand_desc2_t_name_set) { { - struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ; + struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; char *arg2 = (char *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -11438,16 +11453,16 @@ XS(_wrap_svn_opt_subcommand_desc_t_name_set) { dXSARGS; if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: svn_opt_subcommand_desc_t_name_set(self,name);"); + SWIG_croak("Usage: svn_opt_subcommand_desc2_t_name_set(self,name);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc_t_name_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_name_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc_t *)(argp1); + arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc_t_name_set" "', argument " "2"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc2_t_name_set" "', argument " "2"" of type '" "char const *""'"); } arg2 = (char *)(buf2); { @@ -11470,9 +11485,9 @@ XS(_wrap_svn_opt_subcommand_desc_t_name_set) { } -XS(_wrap_svn_opt_subcommand_desc_t_name_get) { +XS(_wrap_svn_opt_subcommand_desc2_t_name_get) { { - struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ; + struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; @@ -11480,13 +11495,13 @@ XS(_wrap_svn_opt_subcommand_desc_t_name_get) { dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: svn_opt_subcommand_desc_t_name_get(self);"); + SWIG_croak("Usage: svn_opt_subcommand_desc2_t_name_get(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc_t_name_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_name_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc_t *)(argp1); + arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); result = (char *) ((arg1)->name); ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; @@ -11498,9 +11513,9 @@ XS(_wrap_svn_opt_subcommand_desc_t_name_get) { } -XS(_wrap_svn_opt_subcommand_desc_t_cmd_func_set) { +XS(_wrap_svn_opt_subcommand_desc2_t_cmd_func_set) { { - struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ; + struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; svn_opt_subcommand_t *arg2 = (svn_opt_subcommand_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -11508,17 +11523,17 @@ XS(_wrap_svn_opt_subcommand_desc_t_cmd_func_set) { dXSARGS; if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: svn_opt_subcommand_desc_t_cmd_func_set(self,cmd_func);"); + SWIG_croak("Usage: svn_opt_subcommand_desc2_t_cmd_func_set(self,cmd_func);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc_t_cmd_func_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_cmd_func_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc_t *)(argp1); + arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); { int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t); if (!SWIG_IsOK(res)) { - SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_opt_subcommand_desc_t_cmd_func_set" "', argument " "2"" of type '" "svn_opt_subcommand_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_opt_subcommand_desc2_t_cmd_func_set" "', argument " "2"" of type '" "svn_opt_subcommand_t *""'"); } } if (arg1) (arg1)->cmd_func = arg2; @@ -11534,9 +11549,9 @@ XS(_wrap_svn_opt_subcommand_desc_t_cmd_func_set) { } -XS(_wrap_svn_opt_subcommand_desc_t_cmd_func_get) { +XS(_wrap_svn_opt_subcommand_desc2_t_cmd_func_get) { { - struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ; + struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; @@ -11544,13 +11559,13 @@ XS(_wrap_svn_opt_subcommand_desc_t_cmd_func_get) { dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: svn_opt_subcommand_desc_t_cmd_func_get(self);"); + SWIG_croak("Usage: svn_opt_subcommand_desc2_t_cmd_func_get(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc_t_cmd_func_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_cmd_func_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc_t *)(argp1); + arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); result = (svn_opt_subcommand_t *) ((arg1)->cmd_func); ST(argvi) = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t); argvi++ ; @@ -11562,9 +11577,9 @@ XS(_wrap_svn_opt_subcommand_desc_t_cmd_func_get) { } -XS(_wrap_svn_opt_subcommand_desc_t_aliases_set) { +XS(_wrap_svn_opt_subcommand_desc2_t_aliases_set) { { - struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ; + struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; char **arg2 ; void *argp1 = 0 ; int res1 = 0 ; @@ -11574,16 +11589,16 @@ XS(_wrap_svn_opt_subcommand_desc_t_aliases_set) { dXSARGS; if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: svn_opt_subcommand_desc_t_aliases_set(self,aliases);"); + SWIG_croak("Usage: svn_opt_subcommand_desc2_t_aliases_set(self,aliases);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc_t_aliases_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_aliases_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc_t *)(argp1); + arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_p_char, 0 | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc_t_aliases_set" "', argument " "2"" of type '" "char const *[3]""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc2_t_aliases_set" "', argument " "2"" of type '" "char const *[3]""'"); } arg2 = (char **)(argp2); { @@ -11606,9 +11621,9 @@ XS(_wrap_svn_opt_subcommand_desc_t_aliases_set) { } -XS(_wrap_svn_opt_subcommand_desc_t_aliases_get) { +XS(_wrap_svn_opt_subcommand_desc2_t_aliases_get) { { - struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ; + struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; @@ -11616,13 +11631,13 @@ XS(_wrap_svn_opt_subcommand_desc_t_aliases_get) { dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: svn_opt_subcommand_desc_t_aliases_get(self);"); + SWIG_croak("Usage: svn_opt_subcommand_desc2_t_aliases_get(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc_t_aliases_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_aliases_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc_t *)(argp1); + arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); result = (char **)(char **) ((arg1)->aliases); ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_p_char, 0 | 0); argvi++ ; @@ -11634,9 +11649,9 @@ XS(_wrap_svn_opt_subcommand_desc_t_aliases_get) { } -XS(_wrap_svn_opt_subcommand_desc_t_help_set) { +XS(_wrap_svn_opt_subcommand_desc2_t_help_set) { { - struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ; + struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; char *arg2 = (char *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -11647,16 +11662,646 @@ XS(_wrap_svn_opt_subcommand_desc_t_help_set) { dXSARGS; if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: svn_opt_subcommand_desc_t_help_set(self,help);"); + SWIG_croak("Usage: svn_opt_subcommand_desc2_t_help_set(self,help);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc_t_help_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_help_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); } - arg1 = (struct svn_opt_subcommand_desc_t *)(argp1); + arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc_t_help_set" "', argument " "2"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc2_t_help_set" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + { + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->help) free((char *)arg1->help); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->help = copied; + } + ST(argvi) = sv_newmortal(); + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_subcommand_desc2_t_help_get) { + { + struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + char *result = 0 ; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_opt_subcommand_desc2_t_help_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_help_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + } + arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); + result = (char *) ((arg1)->help); + ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_subcommand_desc2_t_valid_options_set) { + { + struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; + int *arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_opt_subcommand_desc2_t_valid_options_set(self,valid_options);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_valid_options_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + } + arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); + res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_int, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc2_t_valid_options_set" "', argument " "2"" of type '" "int [50]""'"); + } + arg2 = (int *)(argp2); + { + if (arg2) { + size_t ii = 0; + for (; ii < (size_t)50; ++ii) *(int *)&arg1->valid_options[ii] = *((int *)arg2 + ii); + } else { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""valid_options""' of type '""int [50]""'"); + } + } + ST(argvi) = sv_newmortal(); + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_subcommand_desc2_t_valid_options_get) { + { + struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + int *result = 0 ; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_opt_subcommand_desc2_t_valid_options_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_valid_options_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + } + arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); + result = (int *)(int *) ((arg1)->valid_options); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 | 0); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_get) { + { + struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + svn_opt_subcommand_desc2_t_desc_overrides *result = 0 ; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_opt_subcommand_desc2_t_desc_overrides_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_desc_overrides_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + } + arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); + result = (svn_opt_subcommand_desc2_t_desc_overrides *)(svn_opt_subcommand_desc2_t_desc_overrides *) ((arg1)->desc_overrides); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, 0 | SWIG_SHADOW); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_new_svn_opt_subcommand_desc2_t) { + { + int argvi = 0; + struct svn_opt_subcommand_desc2_t *result = 0 ; + dXSARGS; + + if ((items < 0) || (items > 0)) { + SWIG_croak("Usage: new_svn_opt_subcommand_desc2_t();"); + } + { + result = (struct svn_opt_subcommand_desc2_t *)calloc(1, sizeof(struct svn_opt_subcommand_desc2_t)); + + + + } + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_opt_subcommand_desc2_t, SWIG_OWNER | SWIG_SHADOW); argvi++ ; + XSRETURN(argvi); + fail: + SWIG_croak_null(); + } +} + + +XS(_wrap_delete_svn_opt_subcommand_desc2_t) { + { + struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: delete_svn_opt_subcommand_desc2_t(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_svn_opt_subcommand_desc2_t" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc2_t *""'"); + } + arg1 = (struct svn_opt_subcommand_desc2_t *)(argp1); + { + free((char *) arg1); + + + + } + ST(argvi) = sv_newmortal(); + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_optch_set) { + { + svn_opt_subcommand_desc2_t_desc_overrides *arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *) 0 ; + int arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_opt_subcommand_desc2_t_desc_overrides_optch_set(self,optch);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_desc_overrides_optch_set" "', argument " "1"" of type '" "svn_opt_subcommand_desc2_t_desc_overrides *""'"); + } + arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)(argp1); + ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_opt_subcommand_desc2_t_desc_overrides_optch_set" "', argument " "2"" of type '" "int""'"); + } + arg2 = (int)(val2); + if (arg1) (arg1)->optch = arg2; + ST(argvi) = sv_newmortal(); + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_optch_get) { + { + svn_opt_subcommand_desc2_t_desc_overrides *arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + int result; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_opt_subcommand_desc2_t_desc_overrides_optch_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_desc_overrides_optch_get" "', argument " "1"" of type '" "svn_opt_subcommand_desc2_t_desc_overrides *""'"); + } + arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)(argp1); + result = (int) ((arg1)->optch); + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_desc_set) { + { + svn_opt_subcommand_desc2_t_desc_overrides *arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *) 0 ; + char *arg2 = (char *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_opt_subcommand_desc2_t_desc_overrides_desc_set(self,desc);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_desc_overrides_desc_set" "', argument " "1"" of type '" "svn_opt_subcommand_desc2_t_desc_overrides *""'"); + } + arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc2_t_desc_overrides_desc_set" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + { + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->desc) free((char *)arg1->desc); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->desc = copied; + } + ST(argvi) = sv_newmortal(); + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_subcommand_desc2_t_desc_overrides_desc_get) { + { + svn_opt_subcommand_desc2_t_desc_overrides *arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + char *result = 0 ; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_opt_subcommand_desc2_t_desc_overrides_desc_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc2_t_desc_overrides_desc_get" "', argument " "1"" of type '" "svn_opt_subcommand_desc2_t_desc_overrides *""'"); + } + arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)(argp1); + result = (char *) ((arg1)->desc); + ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_new_svn_opt_subcommand_desc2_t_desc_overrides) { + { + int argvi = 0; + svn_opt_subcommand_desc2_t_desc_overrides *result = 0 ; + dXSARGS; + + if ((items < 0) || (items > 0)) { + SWIG_croak("Usage: new_svn_opt_subcommand_desc2_t_desc_overrides();"); + } + { + result = (svn_opt_subcommand_desc2_t_desc_overrides *)calloc(1, sizeof(svn_opt_subcommand_desc2_t_desc_overrides)); + + + + } + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, SWIG_OWNER | SWIG_SHADOW); argvi++ ; + XSRETURN(argvi); + fail: + SWIG_croak_null(); + } +} + + +XS(_wrap_delete_svn_opt_subcommand_desc2_t_desc_overrides) { + { + svn_opt_subcommand_desc2_t_desc_overrides *arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: delete_svn_opt_subcommand_desc2_t_desc_overrides(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_svn_opt_subcommand_desc2_t_desc_overrides" "', argument " "1"" of type '" "svn_opt_subcommand_desc2_t_desc_overrides *""'"); + } + arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)(argp1); + { + free((char *) arg1); + + + + } + ST(argvi) = sv_newmortal(); + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_subcommand_desc_t_name_set) { + { + struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ; + char *arg2 = (char *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_opt_subcommand_desc_t_name_set(self,name);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc_t_name_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc_t *""'"); + } + arg1 = (struct svn_opt_subcommand_desc_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc_t_name_set" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + { + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->name) free((char *)arg1->name); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->name = copied; + } + ST(argvi) = sv_newmortal(); + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_subcommand_desc_t_name_get) { + { + struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + char *result = 0 ; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_opt_subcommand_desc_t_name_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc_t_name_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc_t *""'"); + } + arg1 = (struct svn_opt_subcommand_desc_t *)(argp1); + result = (char *) ((arg1)->name); + ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_subcommand_desc_t_cmd_func_set) { + { + struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ; + svn_opt_subcommand_t *arg2 = (svn_opt_subcommand_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_opt_subcommand_desc_t_cmd_func_set(self,cmd_func);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc_t_cmd_func_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc_t *""'"); + } + arg1 = (struct svn_opt_subcommand_desc_t *)(argp1); + { + int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_opt_subcommand_desc_t_cmd_func_set" "', argument " "2"" of type '" "svn_opt_subcommand_t *""'"); + } + } + if (arg1) (arg1)->cmd_func = arg2; + ST(argvi) = sv_newmortal(); + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_subcommand_desc_t_cmd_func_get) { + { + struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + svn_opt_subcommand_t *result = 0 ; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_opt_subcommand_desc_t_cmd_func_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc_t_cmd_func_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc_t *""'"); + } + arg1 = (struct svn_opt_subcommand_desc_t *)(argp1); + result = (svn_opt_subcommand_t *) ((arg1)->cmd_func); + ST(argvi) = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_subcommand_desc_t_aliases_set) { + { + struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ; + char **arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_opt_subcommand_desc_t_aliases_set(self,aliases);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc_t_aliases_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc_t *""'"); + } + arg1 = (struct svn_opt_subcommand_desc_t *)(argp1); + res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_p_char, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc_t_aliases_set" "', argument " "2"" of type '" "char const *[3]""'"); + } + arg2 = (char **)(argp2); + { + if (arg2) { + size_t ii = 0; + for (; ii < (size_t)3; ++ii) *(char const * *)&arg1->aliases[ii] = *((char const * *)arg2 + ii); + } else { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""aliases""' of type '""char const *[3]""'"); + } + } + ST(argvi) = sv_newmortal(); + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_subcommand_desc_t_aliases_get) { + { + struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + char **result = 0 ; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_opt_subcommand_desc_t_aliases_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc_t_aliases_get" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc_t *""'"); + } + arg1 = (struct svn_opt_subcommand_desc_t *)(argp1); + result = (char **)(char **) ((arg1)->aliases); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_p_char, 0 | 0); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_subcommand_desc_t_help_set) { + { + struct svn_opt_subcommand_desc_t *arg1 = (struct svn_opt_subcommand_desc_t *) 0 ; + char *arg2 = (char *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_opt_subcommand_desc_t_help_set(self,help);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_desc_t_help_set" "', argument " "1"" of type '" "struct svn_opt_subcommand_desc_t *""'"); + } + arg1 = (struct svn_opt_subcommand_desc_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_desc_t_help_set" "', argument " "2"" of type '" "char const *""'"); } arg2 = (char *)(buf2); { @@ -11834,6 +12479,50 @@ XS(_wrap_delete_svn_opt_subcommand_desc_t) { } +XS(_wrap_svn_opt_get_canonical_subcommand3) { + { + svn_opt_subcommand_desc3_t *arg1 = (svn_opt_subcommand_desc3_t *) 0 ; + char *arg2 = (char *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int argvi = 0; + svn_opt_subcommand_desc3_t *result = 0 ; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_opt_get_canonical_subcommand3(table,cmd_name);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_get_canonical_subcommand3" "', argument " "1"" of type '" "svn_opt_subcommand_desc3_t const *""'"); + } + arg1 = (svn_opt_subcommand_desc3_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_get_canonical_subcommand3" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + { + result = (svn_opt_subcommand_desc3_t *)svn_opt_get_canonical_subcommand3((struct svn_opt_subcommand_desc3_t const *)arg1,(char const *)arg2); + + + + } + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | SWIG_SHADOW); argvi++ ; + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + SWIG_croak_null(); + } +} + + XS(_wrap_svn_opt_get_canonical_subcommand2) { { svn_opt_subcommand_desc2_t *arg1 = (svn_opt_subcommand_desc2_t *) 0 ; @@ -11922,6 +12611,70 @@ XS(_wrap_svn_opt_get_canonical_subcommand) { } +XS(_wrap_svn_opt_get_option_from_code3) { + { + int arg1 ; + apr_getopt_option_t *arg2 = (apr_getopt_option_t *) 0 ; + svn_opt_subcommand_desc3_t *arg3 = (svn_opt_subcommand_desc3_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + int val1 ; + int ecode1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + int argvi = 0; + apr_getopt_option_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 3) || (items > 4)) { + SWIG_croak("Usage: svn_opt_get_option_from_code3(code,option_table,command,pool);"); + } + ecode1 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(0), &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "svn_opt_get_option_from_code3" "', argument " "1"" of type '" "int""'"); + } + arg1 = (int)(val1); + res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_apr_getopt_option_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_get_option_from_code3" "', argument " "2"" of type '" "apr_getopt_option_t const *""'"); + } + arg2 = (apr_getopt_option_t *)(argp2); + res3 = SWIG_ConvertPtr(ST(2), &argp3,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_opt_get_option_from_code3" "', argument " "3"" of type '" "svn_opt_subcommand_desc3_t const *""'"); + } + arg3 = (svn_opt_subcommand_desc3_t *)(argp3); + if (items > 3) { + + } + { + result = (apr_getopt_option_t *)svn_opt_get_option_from_code3(arg1,(apr_getopt_option_t const *)arg2,(struct svn_opt_subcommand_desc3_t const *)arg3,arg4); + + + + } + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_apr_getopt_option_t, 0 | 0); argvi++ ; + + + + + XSRETURN(argvi); + fail: + + + + + SWIG_croak_null(); + } +} + + XS(_wrap_svn_opt_get_option_from_code2) { { int arg1 ; @@ -12029,6 +12782,61 @@ XS(_wrap_svn_opt_get_option_from_code) { } +XS(_wrap_svn_opt_subcommand_takes_option4) { + { + svn_opt_subcommand_desc3_t *arg1 = (svn_opt_subcommand_desc3_t *) 0 ; + int arg2 ; + int *arg3 = (int *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + int temp3 ; + int res3 = SWIG_TMPOBJ ; + int argvi = 0; + svn_boolean_t result; + dXSARGS; + + arg3 = &temp3; + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_opt_subcommand_takes_option4(command,option_code);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_takes_option4" "', argument " "1"" of type '" "svn_opt_subcommand_desc3_t const *""'"); + } + arg1 = (svn_opt_subcommand_desc3_t *)(argp1); + ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_opt_subcommand_takes_option4" "', argument " "2"" of type '" "int""'"); + } + arg2 = (int)(val2); + { + result = (svn_boolean_t)svn_opt_subcommand_takes_option4((struct svn_opt_subcommand_desc3_t const *)arg1,arg2,(int const *)arg3); + + + + } + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ; + if (SWIG_IsTmpObj(res3)) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1((*arg3)); argvi++ ; + } else { + int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN | 0) : 0; + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, new_flags); argvi++ ; + } + + + + XSRETURN(argvi); + fail: + + + + SWIG_croak_null(); + } +} + + XS(_wrap_svn_opt_subcommand_takes_option3) { { svn_opt_subcommand_desc2_t *arg1 = (svn_opt_subcommand_desc2_t *) 0 ; @@ -12170,6 +12978,89 @@ XS(_wrap_svn_opt_subcommand_takes_option) { } +XS(_wrap_svn_opt_print_generic_help3) { + { + char *arg1 = (char *) 0 ; + svn_opt_subcommand_desc3_t *arg2 = (svn_opt_subcommand_desc3_t *) 0 ; + apr_getopt_option_t *arg3 = (apr_getopt_option_t *) 0 ; + char *arg4 = (char *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + FILE *arg6 = (FILE *) 0 ; + apr_pool_t *_global_pool ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + int res4 ; + char *buf4 = 0 ; + int alloc4 = 0 ; + int argvi = 0; + dXSARGS; + + { + _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 4) || (items > 6)) { + SWIG_croak("Usage: svn_opt_print_generic_help3(header,cmd_table,opt_table,footer,pool,stream);"); + } + res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_print_generic_help3" "', argument " "1"" of type '" "char const *""'"); + } + arg1 = (char *)(buf1); + res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_print_generic_help3" "', argument " "2"" of type '" "svn_opt_subcommand_desc3_t const *""'"); + } + arg2 = (svn_opt_subcommand_desc3_t *)(argp2); + res3 = SWIG_ConvertPtr(ST(2), &argp3,SWIGTYPE_p_apr_getopt_option_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_opt_print_generic_help3" "', argument " "3"" of type '" "apr_getopt_option_t const *""'"); + } + arg3 = (apr_getopt_option_t *)(argp3); + res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_opt_print_generic_help3" "', argument " "4"" of type '" "char const *""'"); + } + arg4 = (char *)(buf4); + if (items > 4) { + + } + if (items > 5) { + { + arg6 = PerlIO_exportFILE (IoIFP (sv_2io (ST(5))), NULL); + } + } + { + svn_opt_print_generic_help3((char const *)arg1,(struct svn_opt_subcommand_desc3_t const *)arg2,(apr_getopt_option_t const *)arg3,(char const *)arg4,arg5,arg6); + + + + } + ST(argvi) = sv_newmortal(); + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + + + if (alloc4 == SWIG_NEWOBJ) free((char*)buf4); + + + XSRETURN(argvi); + fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + + + if (alloc4 == SWIG_NEWOBJ) free((char*)buf4); + + + SWIG_croak_null(); + } +} + + XS(_wrap_svn_opt_print_generic_help2) { { char *arg1 = (char *) 0 ; @@ -12313,6 +13204,82 @@ XS(_wrap_svn_opt_format_option) { + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_subcommand_help4) { + { + char *arg1 = (char *) 0 ; + svn_opt_subcommand_desc3_t *arg2 = (svn_opt_subcommand_desc3_t *) 0 ; + apr_getopt_option_t *arg3 = (apr_getopt_option_t *) 0 ; + int *arg4 = (int *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + int temp4 ; + int res4 = SWIG_TMPOBJ ; + int argvi = 0; + dXSARGS; + + { + _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg4 = &temp4; + if ((items < 3) || (items > 4)) { + SWIG_croak("Usage: svn_opt_subcommand_help4(subcommand,table,options_table,pool);"); + } + res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_subcommand_help4" "', argument " "1"" of type '" "char const *""'"); + } + arg1 = (char *)(buf1); + res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_subcommand_help4" "', argument " "2"" of type '" "svn_opt_subcommand_desc3_t const *""'"); + } + arg2 = (svn_opt_subcommand_desc3_t *)(argp2); + res3 = SWIG_ConvertPtr(ST(2), &argp3,SWIGTYPE_p_apr_getopt_option_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_opt_subcommand_help4" "', argument " "3"" of type '" "apr_getopt_option_t const *""'"); + } + arg3 = (apr_getopt_option_t *)(argp3); + if (items > 3) { + + } + { + svn_opt_subcommand_help4((char const *)arg1,(struct svn_opt_subcommand_desc3_t const *)arg2,(apr_getopt_option_t const *)arg3,(int const *)arg4,arg5); + + + + } + ST(argvi) = sv_newmortal(); + if (SWIG_IsTmpObj(res4)) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1((*arg4)); argvi++ ; + } else { + int new_flags = SWIG_IsNewObj(res4) ? (SWIG_POINTER_OWN | 0) : 0; + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, new_flags); argvi++ ; + } + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + + + + + XSRETURN(argvi); + fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + + + + SWIG_croak_null(); } } @@ -13703,101 +14670,268 @@ XS(_wrap_svn_opt_parse_all_args) { } } } - { - if (argvi >= items) EXTEND(sp,1); ST(argvi) = svn_swig_pl_array_to_list(*arg1); argvi++ ; + { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = svn_swig_pl_array_to_list(*arg1); argvi++ ; + } + + + + XSRETURN(argvi); + fail: + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_parse_path) { + { + svn_opt_revision_t *arg1 = (svn_opt_revision_t *) 0 ; + char **arg2 = (char **) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + svn_opt_revision_t rev1 ; + char *temp2 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg2 = &temp2; + if ((items < 2) || (items > 3)) { + SWIG_croak("Usage: svn_opt_parse_path(rev,path,pool);"); + } + { + if (_global_pool == NULL) { + _global_pool = svn_swig_pl_make_pool((SV *)NULL); + SPAGAIN; + } + arg1 = svn_swig_pl_set_revision(&rev1, ST(0), TRUE, _global_pool); + } + res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_opt_parse_path" "', argument " "3"" of type '" "char const *""'"); + } + arg3 = (char *)(buf3); + if (items > 2) { + + } + { + result = (svn_error_t *)svn_opt_parse_path(arg1,(char const **)arg2,(char const *)arg3,arg4); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + if (*arg2 == NULL) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = &PL_sv_undef; argvi++ ; + } else { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(*arg2, 0)); argvi++ ; + } + } + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + XSRETURN(argvi); + fail: + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_opt_print_help5) { + { + apr_getopt_t *arg1 = (apr_getopt_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_boolean_t arg3 ; + svn_boolean_t arg4 ; + svn_boolean_t arg5 ; + char *arg6 = (char *) 0 ; + char *arg7 = (char *) 0 ; + svn_opt_subcommand_desc3_t *arg8 = (svn_opt_subcommand_desc3_t *) 0 ; + apr_getopt_option_t *arg9 = (apr_getopt_option_t *) 0 ; + int *arg10 = (int *) 0 ; + char *arg11 = (char *) 0 ; + apr_pool_t *arg12 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int val3 ; + int ecode3 = 0 ; + int val4 ; + int ecode4 = 0 ; + int val5 ; + int ecode5 = 0 ; + int res6 ; + char *buf6 = 0 ; + int alloc6 = 0 ; + int res7 ; + char *buf7 = 0 ; + int alloc7 = 0 ; + void *argp8 = 0 ; + int res8 = 0 ; + void *argp9 = 0 ; + int res9 = 0 ; + int temp10 ; + int res10 = SWIG_TMPOBJ ; + int res11 ; + char *buf11 = 0 ; + int alloc11 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg10 = &temp10; + if ((items < 10) || (items > 11)) { + SWIG_croak("Usage: svn_opt_print_help5(os,pgm_name,print_version,quiet,verbose,version_footer,header,cmd_table,option_table,footer,pool);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_apr_getopt_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_opt_print_help5" "', argument " "1"" of type '" "apr_getopt_t *""'"); + } + arg1 = (apr_getopt_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_opt_print_help5" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_opt_print_help5" "', argument " "3"" of type '" "svn_boolean_t""'"); + } + arg3 = (svn_boolean_t)(val3); + ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_opt_print_help5" "', argument " "4"" of type '" "svn_boolean_t""'"); + } + arg4 = (svn_boolean_t)(val4); + ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_opt_print_help5" "', argument " "5"" of type '" "svn_boolean_t""'"); + } + arg5 = (svn_boolean_t)(val5); + res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6); + if (!SWIG_IsOK(res6)) { + SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_opt_print_help5" "', argument " "6"" of type '" "char const *""'"); + } + arg6 = (char *)(buf6); + res7 = SWIG_AsCharPtrAndSize(ST(6), &buf7, NULL, &alloc7); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_opt_print_help5" "', argument " "7"" of type '" "char const *""'"); + } + arg7 = (char *)(buf7); + res8 = SWIG_ConvertPtr(ST(7), &argp8,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res8)) { + SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_opt_print_help5" "', argument " "8"" of type '" "svn_opt_subcommand_desc3_t const *""'"); + } + arg8 = (svn_opt_subcommand_desc3_t *)(argp8); + res9 = SWIG_ConvertPtr(ST(8), &argp9,SWIGTYPE_p_apr_getopt_option_t, 0 | 0 ); + if (!SWIG_IsOK(res9)) { + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_opt_print_help5" "', argument " "9"" of type '" "apr_getopt_option_t const *""'"); + } + arg9 = (apr_getopt_option_t *)(argp9); + res11 = SWIG_AsCharPtrAndSize(ST(9), &buf11, NULL, &alloc11); + if (!SWIG_IsOK(res11)) { + SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_opt_print_help5" "', argument " "11"" of type '" "char const *""'"); + } + arg11 = (char *)(buf11); + if (items > 10) { + + } + { + result = (svn_error_t *)svn_opt_print_help5(arg1,(char const *)arg2,arg3,arg4,arg5,(char const *)arg6,(char const *)arg7,(struct svn_opt_subcommand_desc3_t const *)arg8,(apr_getopt_option_t const *)arg9,(int const *)arg10,(char const *)arg11,arg12); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + if (SWIG_IsTmpObj(res10)) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1((*arg10)); argvi++ ; + } else { + int new_flags = SWIG_IsNewObj(res10) ? (SWIG_POINTER_OWN | 0) : 0; + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_NewPointerObj((void*)(arg10), SWIGTYPE_p_int, new_flags); argvi++ ; } - - - XSRETURN(argvi); - fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - SWIG_croak_null(); - } -} - - -XS(_wrap_svn_opt_parse_path) { - { - svn_opt_revision_t *arg1 = (svn_opt_revision_t *) 0 ; - char **arg2 = (char **) 0 ; - char *arg3 = (char *) 0 ; - apr_pool_t *arg4 = (apr_pool_t *) 0 ; - apr_pool_t *_global_pool ; - svn_opt_revision_t rev1 ; - char *temp2 ; - int res3 ; - char *buf3 = 0 ; - int alloc3 = 0 ; - int argvi = 0; - svn_error_t *result = 0 ; - dXSARGS; + if (alloc6 == SWIG_NEWOBJ) free((char*)buf6); + if (alloc7 == SWIG_NEWOBJ) free((char*)buf7); - { - _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); - SPAGAIN; - } - arg2 = &temp2; - if ((items < 2) || (items > 3)) { - SWIG_croak("Usage: svn_opt_parse_path(rev,path,pool);"); - } - { - if (_global_pool == NULL) { - _global_pool = svn_swig_pl_make_pool((SV *)NULL); - SPAGAIN; - } - arg1 = svn_swig_pl_set_revision(&rev1, ST(0), TRUE, _global_pool); - } - res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_opt_parse_path" "', argument " "3"" of type '" "char const *""'"); - } - arg3 = (char *)(buf3); - if (items > 2) { - - } - { - result = (svn_error_t *)svn_opt_parse_path(arg1,(char const **)arg2,(char const *)arg3,arg4); - - - - } - { - if (result) { - SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); - - if (SvOK(exception_handler)) { - SV *callback_result; - - PUTBACK; - svn_swig_pl_callback_thunk (CALL_SV, exception_handler, - &callback_result, "S", result, - SWIGTYPE_p_svn_error_t); - SPAGAIN; - } else { - ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); - argvi++; - } - } - } - { - if (*arg2 == NULL) { - if (argvi >= items) EXTEND(sp,1); ST(argvi) = &PL_sv_undef; argvi++ ; - } else { - if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(*arg2, 0)); argvi++ ; - } - } - if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + if (alloc11 == SWIG_NEWOBJ) free((char*)buf11); XSRETURN(argvi); fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + + + if (alloc6 == SWIG_NEWOBJ) free((char*)buf6); + if (alloc7 == SWIG_NEWOBJ) free((char*)buf7); - if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + + if (alloc11 == SWIG_NEWOBJ) free((char*)buf11); SWIG_croak_null(); } @@ -17624,7 +18758,7 @@ XS(_wrap_svn_auth_get_platform_specific_client_providers) { } } { - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1, + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1, SWIGTYPE_p_svn_auth_provider_object_t); argvi++ /*@SWIG@*/ /*@SWIG@*/ ; @@ -23963,52 +25097,103 @@ XS(_wrap_svn_dirent_internal_style) { } -XS(_wrap_svn_dirent_local_style) { +XS(_wrap_svn_dirent_internal_style_safe) { { - char *arg1 = (char *) 0 ; - apr_pool_t *arg2 = (apr_pool_t *) 0 ; + char **arg1 = (char **) 0 ; + char **arg2 = (char **) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; + char *temp1 ; + char *temp2 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; int argvi = 0; - char *result = 0 ; + svn_error_t *result = 0 ; dXSARGS; { - _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1)); + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); SPAGAIN; } - if ((items < 1) || (items > 2)) { - SWIG_croak("Usage: svn_dirent_local_style(dirent,result_pool);"); + { + _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; } - res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_dirent_local_style" "', argument " "1"" of type '" "char const *""'"); + arg1 = &temp1; + arg2 = &temp2; + if ((items < 1) || (items > 3)) { + SWIG_croak("Usage: svn_dirent_internal_style_safe(dirent,result_pool,scratch_pool);"); } - arg1 = (char *)(buf1); + res3 = SWIG_AsCharPtrAndSize(ST(0), &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_dirent_internal_style_safe" "', argument " "3"" of type '" "char const *""'"); + } + arg3 = (char *)(buf3); if (items > 1) { + } + if (items > 2) { + } { - result = (char *)svn_dirent_local_style((char const *)arg1,arg2); + result = (svn_error_t *)svn_dirent_internal_style_safe((char const **)arg1,(char const **)arg2,(char const *)arg3,arg4,arg5); } - ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + if (*arg1 == NULL) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = &PL_sv_undef; argvi++ ; + } else { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(*arg1, 0)); argvi++ ; + } + } + { + if (*arg2 == NULL) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = &PL_sv_undef; argvi++ ; + } else { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(*arg2, 0)); argvi++ ; + } + } + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + XSRETURN(argvi); fail: - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + SWIG_croak_null(); } } -XS(_wrap_svn_relpath__internal_style) { +XS(_wrap_svn_dirent_local_style) { { char *arg1 = (char *) 0 ; apr_pool_t *arg2 = (apr_pool_t *) 0 ; @@ -24025,18 +25210,18 @@ XS(_wrap_svn_relpath__internal_style) { SPAGAIN; } if ((items < 1) || (items > 2)) { - SWIG_croak("Usage: svn_relpath__internal_style(relpath,result_pool);"); + SWIG_croak("Usage: svn_dirent_local_style(dirent,result_pool);"); } res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_relpath__internal_style" "', argument " "1"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_dirent_local_style" "', argument " "1"" of type '" "char const *""'"); } arg1 = (char *)(buf1); if (items > 1) { } { - result = (char *)svn_relpath__internal_style((char const *)arg1,arg2); + result = (char *)svn_dirent_local_style((char const *)arg1,arg2); @@ -24817,6 +26002,102 @@ XS(_wrap_svn_dirent_canonicalize) { } +XS(_wrap_svn_dirent_canonicalize_safe) { + { + char **arg1 = (char **) 0 ; + char **arg2 = (char **) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + char *temp1 ; + char *temp2 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + { + _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + arg2 = &temp2; + if ((items < 1) || (items > 3)) { + SWIG_croak("Usage: svn_dirent_canonicalize_safe(dirent,result_pool,scratch_pool);"); + } + res3 = SWIG_AsCharPtrAndSize(ST(0), &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_dirent_canonicalize_safe" "', argument " "3"" of type '" "char const *""'"); + } + arg3 = (char *)(buf3); + if (items > 1) { + + } + if (items > 2) { + + } + { + result = (svn_error_t *)svn_dirent_canonicalize_safe((char const **)arg1,(char const **)arg2,(char const *)arg3,arg4,arg5); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + if (*arg1 == NULL) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = &PL_sv_undef; argvi++ ; + } else { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(*arg1, 0)); argvi++ ; + } + } + { + if (*arg2 == NULL) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = &PL_sv_undef; argvi++ ; + } else { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(*arg2, 0)); argvi++ ; + } + } + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + + XSRETURN(argvi); + fail: + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + + SWIG_croak_null(); + } +} + + XS(_wrap_svn_relpath_canonicalize) { { char *arg1 = (char *) 0 ; @@ -24862,6 +26143,102 @@ XS(_wrap_svn_relpath_canonicalize) { } +XS(_wrap_svn_relpath_canonicalize_safe) { + { + char **arg1 = (char **) 0 ; + char **arg2 = (char **) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + char *temp1 ; + char *temp2 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + { + _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + arg2 = &temp2; + if ((items < 1) || (items > 3)) { + SWIG_croak("Usage: svn_relpath_canonicalize_safe(relpath,result_pool,scratch_pool);"); + } + res3 = SWIG_AsCharPtrAndSize(ST(0), &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_relpath_canonicalize_safe" "', argument " "3"" of type '" "char const *""'"); + } + arg3 = (char *)(buf3); + if (items > 1) { + + } + if (items > 2) { + + } + { + result = (svn_error_t *)svn_relpath_canonicalize_safe((char const **)arg1,(char const **)arg2,(char const *)arg3,arg4,arg5); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + if (*arg1 == NULL) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = &PL_sv_undef; argvi++ ; + } else { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(*arg1, 0)); argvi++ ; + } + } + { + if (*arg2 == NULL) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = &PL_sv_undef; argvi++ ; + } else { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(*arg2, 0)); argvi++ ; + } + } + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + + XSRETURN(argvi); + fail: + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + + SWIG_croak_null(); + } +} + + XS(_wrap_svn_uri_canonicalize) { { char *arg1 = (char *) 0 ; @@ -24907,6 +26284,102 @@ XS(_wrap_svn_uri_canonicalize) { } +XS(_wrap_svn_uri_canonicalize_safe) { + { + char **arg1 = (char **) 0 ; + char **arg2 = (char **) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + char *temp1 ; + char *temp2 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + { + _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + arg2 = &temp2; + if ((items < 1) || (items > 3)) { + SWIG_croak("Usage: svn_uri_canonicalize_safe(uri,result_pool,scratch_pool);"); + } + res3 = SWIG_AsCharPtrAndSize(ST(0), &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_uri_canonicalize_safe" "', argument " "3"" of type '" "char const *""'"); + } + arg3 = (char *)(buf3); + if (items > 1) { + + } + if (items > 2) { + + } + { + result = (svn_error_t *)svn_uri_canonicalize_safe((char const **)arg1,(char const **)arg2,(char const *)arg3,arg4,arg5); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + if (*arg1 == NULL) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = &PL_sv_undef; argvi++ ; + } else { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(*arg1, 0)); argvi++ ; + } + } + { + if (*arg2 == NULL) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = &PL_sv_undef; argvi++ ; + } else { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(*arg2, 0)); argvi++ ; + } + } + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + + XSRETURN(argvi); + fail: + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + + SWIG_croak_null(); + } +} + + XS(_wrap_svn_dirent_is_canonical) { { char *arg1 = (char *) 0 ; @@ -29122,7 +30595,7 @@ XS(_wrap_svn_io_file_checksum) { } } { - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg1, + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg1, _global_pool), 0)); argvi++ /*@SWIG@*/ @@ -46745,7 +48218,7 @@ XS(_wrap_svn_err_best_message) { } arg1 = (svn_error_t *)(argp1); { - result = (char *)svn_err_best_message((struct svn_error_t const *)arg1,arg2,arg3); + result = (char *)svn_err_best_message((svn_error_t const *)arg1,arg2,arg3); @@ -47320,7 +48793,7 @@ XS(_wrap_svn_error_dup) { } arg1 = (svn_error_t *)(argp1); { - result = (svn_error_t *)svn_error_dup((struct svn_error_t const *)arg1); + result = (svn_error_t *)svn_error_dup((svn_error_t const *)arg1); @@ -47521,7 +48994,7 @@ XS(_wrap_svn_handle_warning2) { } arg3 = (char *)(buf3); { - svn_handle_warning2(arg1,(struct svn_error_t const *)arg2,(char const *)arg3); + svn_handle_warning2(arg1,(svn_error_t const *)arg2,(char const *)arg3); @@ -48040,48 +49513,48 @@ static swig_type_info _swigt__p_apr_proc_t = {"_p_apr_proc_t", "apr_proc_t *", 0 static swig_type_info _swigt__p_apr_size_t = {"_p_apr_size_t", "apr_size_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_uint32_t = {"_p_apr_uint32_t", "apr_uint32_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t = {"_p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t", "struct svn_error_t *(*)(apr_uint32_t *,void **,void *,svn_diff_datasource_e)|svn_error_t *(*)(apr_uint32_t *,void **,void *,svn_diff_datasource_e)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_auth_gnome_keyring_unlock_prompt_func_t|struct svn_error_t *(*)(char **,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t = {"_p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t", "svn_error_t *(*)(apr_uint32_t *,void **,void *,svn_diff_datasource_e)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_auth_gnome_keyring_unlock_prompt_func_t|svn_error_t *(*)(char **,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void = {"_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void", "svn_auth_simple_provider_func_t|svn_auth_ssl_client_cert_pw_provider_func_t|void (*)(struct svn_auth_provider_object_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_simple_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_pw_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_username_prompt_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_stream_t **,void *,apr_pool_t *,apr_pool_t *)|svn_stream_lazyopen_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void **,void **,void *,apr_hash_t *,char const *,apr_pool_t *)|svn_error_t *(*)(void **,void **,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void **,void *,void *,apr_hash_t *,char const *,apr_pool_t *)|struct svn_error_t *(*)(void **,void *,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_simple_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_pw_prompt_func_t|svn_error_t *(*)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_client_cert_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_username_prompt_func_t|svn_error_t *(*)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_stream_lazyopen_func_t|svn_error_t *(*)(svn_stream_t **,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void **,void **,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void **,void *,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__char_p_void__int = {"_p_f_p_q_const__char_p_q_const__char_p_void__int", "svn_config_enumerator_t|int (*)(char const *,char const *,void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int = {"_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int", "svn_config_enumerator2_t|int (*)(char const *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_q_const__char_p_void__int = {"_p_f_p_q_const__char_p_void__int", "svn_config_section_enumerator_t|int (*)(char const *,void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__int = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__int", "int (*)(char const *,void *,apr_pool_t *)|svn_config_section_enumerator2_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int = {"_p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int", "svn_boolean_t (*)(svn_version_t const *,svn_version_t const *)|int (*)(struct svn_version_t const *,struct svn_version_t const *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_boolean_t *,char const *,void *,apr_pool_t *)|svn_auth_plaintext_prompt_func_t|svn_auth_plaintext_passphrase_prompt_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_boolean_t *,void *,char const *,char const *,apr_hash_t *,apr_pool_t *)|svn_config_auth_walk_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,void *,void *,apr_hash_t *,char const *,apr_pool_t *)|struct svn_error_t *(*)(svn_boolean_t *,void *,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_close_fn_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)|svn_commit_callback2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,char const *,void *,apr_pool_t *)|svn_auth_plaintext_prompt_func_t|svn_auth_plaintext_passphrase_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,void *,char const *,char const *,apr_hash_t *,apr_pool_t *)|svn_config_auth_walk_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,void *,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_close_fn_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void__void = {"_p_f_p_void__void", "void (*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t = {"_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t)|svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t = {"_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,svn_diff_t *)|svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,svn_diff_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_size_t__p_svn_error_t = {"_p_f_p_void_apr_size_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_size_t)|svn_stream_skip_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_off_t_p_apr_off_t_p_q_const__svn_diff_datasource_e_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_apr_off_t_p_apr_off_t_p_q_const__svn_diff_datasource_e_apr_size_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_off_t *,apr_off_t *,svn_diff_datasource_e const *,apr_size_t)|struct svn_error_t *(*)(void *,apr_off_t *,apr_off_t *,svn_diff_datasource_e const *,apr_size_t)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_char_p_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char *,apr_size_t *)|svn_read_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_stream_mark_t **,apr_pool_t *)|svn_stream_mark_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_stringbuf_t **,char const *,svn_boolean_t *,apr_pool_t *)|svn_stream_readline_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_size_t *)|svn_write_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_finfo_t const *,apr_pool_t *)|svn_io_walk_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t = {"_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t", "svn_stream_seek_fn_t|struct svn_error_t *(*)(void *,svn_stream_mark_t const *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t__p_svn_error_t", "svn_stream_data_available_fn_t|struct svn_error_t *(*)(void *,svn_boolean_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t = {"_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t = {"_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,svn_diff_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_size_t__p_svn_error_t = {"_p_f_p_void_apr_size_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_size_t)|svn_stream_skip_fn_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_off_t_p_apr_off_t_p_q_const__svn_diff_datasource_e_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_apr_off_t_p_apr_off_t_p_q_const__svn_diff_datasource_e_apr_size_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_off_t *,apr_off_t *,svn_diff_datasource_e const *,apr_size_t)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_char_p_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t", "svn_read_fn_t|svn_error_t *(*)(void *,char *,apr_size_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t", "svn_stream_mark_fn_t|svn_error_t *(*)(void *,svn_stream_mark_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_stringbuf_t **,char const *,svn_boolean_t *,apr_pool_t *)|svn_stream_readline_fn_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_size_t *)|svn_write_fn_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_finfo_t const *,apr_pool_t *)|svn_io_walk_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t = {"_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_stream_mark_t const *)|svn_stream_seek_fn_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t__p_svn_error_t", "svn_stream_data_available_fn_t|svn_error_t *(*)(void *,svn_boolean_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_void__void = {"_p_f_p_void_p_void__void", "void (*)(void *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_void_p_void_p_int__p_svn_error_t = {"_p_f_p_void_p_void_p_void_p_int__p_svn_error_t", "svn_error_t *(*)(void *,void *,void *,int *)|struct svn_error_t *(*)(void *,void *,void *,int *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_diff_datasource_e__p_svn_error_t = {"_p_f_p_void_svn_diff_datasource_e__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_diff_datasource_e)|svn_error_t *(*)(void *,svn_diff_datasource_e)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_boolean_t_p_q_const__char_int_p_q_const__char__p_svn_error_t = {"_p_f_svn_boolean_t_p_q_const__char_int_p_q_const__char__p_svn_error_t", "struct svn_error_t *(*)(svn_boolean_t,char const *,int,char const *)|svn_error_malfunction_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_void_p_void_p_int__p_svn_error_t = {"_p_f_p_void_p_void_p_void_p_int__p_svn_error_t", "svn_error_t *(*)(void *,void *,void *,int *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_diff_datasource_e__p_svn_error_t = {"_p_f_p_void_svn_diff_datasource_e__p_svn_error_t", "svn_error_t *(*)(void *,svn_diff_datasource_e)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_boolean_t_p_q_const__char_int_p_q_const__char__p_svn_error_t = {"_p_f_svn_boolean_t_p_q_const__char_int_p_q_const__char__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t,char const *,int,char const *)|svn_error_malfunction_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_void__p_svn_version_t = {"_p_f_void__p_svn_version_t", "svn_version_func_t|struct svn_version_t *(*)(void)|svn_version_t *(*)(void)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; @@ -48138,7 +49611,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *|struct svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0}; @@ -48155,6 +49628,8 @@ static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", " static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t_desc_overrides = {"_p_svn_opt_subcommand_desc2_t_desc_overrides", "svn_opt_subcommand_desc2_t_desc_overrides *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t_desc_overrides = {"_p_svn_opt_subcommand_desc3_t_desc_overrides", "svn_opt_subcommand_desc3_t_desc_overrides *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -48310,6 +49785,8 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, &_swigt__p_svn_opt_subcommand_desc2_t_desc_overrides, + &_swigt__p_svn_opt_subcommand_desc3_t, + &_swigt__p_svn_opt_subcommand_desc3_t_desc_overrides, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -48465,6 +49942,8 @@ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_re static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t_desc_overrides[] = { {&_swigt__p_svn_opt_subcommand_desc2_t_desc_overrides, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t_desc_overrides[] = { {&_swigt__p_svn_opt_subcommand_desc3_t_desc_overrides, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -48620,6 +50099,8 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, _swigc__p_svn_opt_subcommand_desc2_t_desc_overrides, + _swigc__p_svn_opt_subcommand_desc3_t, + _swigc__p_svn_opt_subcommand_desc3_t_desc_overrides, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, @@ -48878,6 +50359,25 @@ static swig_command_info swig_commands[] = { {"SVN::_Core::svn_categorize_props", _wrap_svn_categorize_props}, {"SVN::_Core::svn_prop_diffs", _wrap_svn_prop_diffs}, {"SVN::_Core::svn_prop_name_is_valid", _wrap_svn_prop_name_is_valid}, +{"SVN::_Core::svn_opt_subcommand_desc3_t_name_set", _wrap_svn_opt_subcommand_desc3_t_name_set}, +{"SVN::_Core::svn_opt_subcommand_desc3_t_name_get", _wrap_svn_opt_subcommand_desc3_t_name_get}, +{"SVN::_Core::svn_opt_subcommand_desc3_t_cmd_func_set", _wrap_svn_opt_subcommand_desc3_t_cmd_func_set}, +{"SVN::_Core::svn_opt_subcommand_desc3_t_cmd_func_get", _wrap_svn_opt_subcommand_desc3_t_cmd_func_get}, +{"SVN::_Core::svn_opt_subcommand_desc3_t_aliases_set", _wrap_svn_opt_subcommand_desc3_t_aliases_set}, +{"SVN::_Core::svn_opt_subcommand_desc3_t_aliases_get", _wrap_svn_opt_subcommand_desc3_t_aliases_get}, +{"SVN::_Core::svn_opt_subcommand_desc3_t_help_set", _wrap_svn_opt_subcommand_desc3_t_help_set}, +{"SVN::_Core::svn_opt_subcommand_desc3_t_help_get", _wrap_svn_opt_subcommand_desc3_t_help_get}, +{"SVN::_Core::svn_opt_subcommand_desc3_t_valid_options_set", _wrap_svn_opt_subcommand_desc3_t_valid_options_set}, +{"SVN::_Core::svn_opt_subcommand_desc3_t_valid_options_get", _wrap_svn_opt_subcommand_desc3_t_valid_options_get}, +{"SVN::_Core::svn_opt_subcommand_desc3_t_desc_overrides_get", _wrap_svn_opt_subcommand_desc3_t_desc_overrides_get}, +{"SVN::_Core::new_svn_opt_subcommand_desc3_t", _wrap_new_svn_opt_subcommand_desc3_t}, +{"SVN::_Core::delete_svn_opt_subcommand_desc3_t", _wrap_delete_svn_opt_subcommand_desc3_t}, +{"SVN::_Core::svn_opt_subcommand_desc3_t_desc_overrides_optch_set", _wrap_svn_opt_subcommand_desc3_t_desc_overrides_optch_set}, +{"SVN::_Core::svn_opt_subcommand_desc3_t_desc_overrides_optch_get", _wrap_svn_opt_subcommand_desc3_t_desc_overrides_optch_get}, +{"SVN::_Core::svn_opt_subcommand_desc3_t_desc_overrides_desc_set", _wrap_svn_opt_subcommand_desc3_t_desc_overrides_desc_set}, +{"SVN::_Core::svn_opt_subcommand_desc3_t_desc_overrides_desc_get", _wrap_svn_opt_subcommand_desc3_t_desc_overrides_desc_get}, +{"SVN::_Core::new_svn_opt_subcommand_desc3_t_desc_overrides", _wrap_new_svn_opt_subcommand_desc3_t_desc_overrides}, +{"SVN::_Core::delete_svn_opt_subcommand_desc3_t_desc_overrides", _wrap_delete_svn_opt_subcommand_desc3_t_desc_overrides}, {"SVN::_Core::svn_opt_subcommand_desc2_t_name_set", _wrap_svn_opt_subcommand_desc2_t_name_set}, {"SVN::_Core::svn_opt_subcommand_desc2_t_name_get", _wrap_svn_opt_subcommand_desc2_t_name_get}, {"SVN::_Core::svn_opt_subcommand_desc2_t_cmd_func_set", _wrap_svn_opt_subcommand_desc2_t_cmd_func_set}, @@ -48909,15 +50409,20 @@ static swig_command_info swig_commands[] = { {"SVN::_Core::svn_opt_subcommand_desc_t_valid_options_get", _wrap_svn_opt_subcommand_desc_t_valid_options_get}, {"SVN::_Core::new_svn_opt_subcommand_desc_t", _wrap_new_svn_opt_subcommand_desc_t}, {"SVN::_Core::delete_svn_opt_subcommand_desc_t", _wrap_delete_svn_opt_subcommand_desc_t}, +{"SVN::_Core::svn_opt_get_canonical_subcommand3", _wrap_svn_opt_get_canonical_subcommand3}, {"SVN::_Core::svn_opt_get_canonical_subcommand2", _wrap_svn_opt_get_canonical_subcommand2}, {"SVN::_Core::svn_opt_get_canonical_subcommand", _wrap_svn_opt_get_canonical_subcommand}, +{"SVN::_Core::svn_opt_get_option_from_code3", _wrap_svn_opt_get_option_from_code3}, {"SVN::_Core::svn_opt_get_option_from_code2", _wrap_svn_opt_get_option_from_code2}, {"SVN::_Core::svn_opt_get_option_from_code", _wrap_svn_opt_get_option_from_code}, +{"SVN::_Core::svn_opt_subcommand_takes_option4", _wrap_svn_opt_subcommand_takes_option4}, {"SVN::_Core::svn_opt_subcommand_takes_option3", _wrap_svn_opt_subcommand_takes_option3}, {"SVN::_Core::svn_opt_subcommand_takes_option2", _wrap_svn_opt_subcommand_takes_option2}, {"SVN::_Core::svn_opt_subcommand_takes_option", _wrap_svn_opt_subcommand_takes_option}, +{"SVN::_Core::svn_opt_print_generic_help3", _wrap_svn_opt_print_generic_help3}, {"SVN::_Core::svn_opt_print_generic_help2", _wrap_svn_opt_print_generic_help2}, {"SVN::_Core::svn_opt_format_option", _wrap_svn_opt_format_option}, +{"SVN::_Core::svn_opt_subcommand_help4", _wrap_svn_opt_subcommand_help4}, {"SVN::_Core::svn_opt_subcommand_help3", _wrap_svn_opt_subcommand_help3}, {"SVN::_Core::svn_opt_subcommand_help2", _wrap_svn_opt_subcommand_help2}, {"SVN::_Core::svn_opt_subcommand_help", _wrap_svn_opt_subcommand_help}, @@ -48949,6 +50454,7 @@ static swig_command_info swig_commands[] = { {"SVN::_Core::svn_opt_parse_num_args", _wrap_svn_opt_parse_num_args}, {"SVN::_Core::svn_opt_parse_all_args", _wrap_svn_opt_parse_all_args}, {"SVN::_Core::svn_opt_parse_path", _wrap_svn_opt_parse_path}, +{"SVN::_Core::svn_opt_print_help5", _wrap_svn_opt_print_help5}, {"SVN::_Core::svn_opt_print_help4", _wrap_svn_opt_print_help4}, {"SVN::_Core::svn_opt_print_help3", _wrap_svn_opt_print_help3}, {"SVN::_Core::svn_opt_print_help2", _wrap_svn_opt_print_help2}, @@ -49122,8 +50628,8 @@ static swig_command_info swig_commands[] = { {"SVN::_Core::svn_path_resolve_repos_relative_url", _wrap_svn_path_resolve_repos_relative_url}, {"SVN::_Core::svn_path_illegal_path_escape", _wrap_svn_path_illegal_path_escape}, {"SVN::_Core::svn_dirent_internal_style", _wrap_svn_dirent_internal_style}, +{"SVN::_Core::svn_dirent_internal_style_safe", _wrap_svn_dirent_internal_style_safe}, {"SVN::_Core::svn_dirent_local_style", _wrap_svn_dirent_local_style}, -{"SVN::_Core::svn_relpath__internal_style", _wrap_svn_relpath__internal_style}, {"SVN::_Core::svn_dirent_join", _wrap_svn_dirent_join}, {"SVN::_Core::svn_relpath_join", _wrap_svn_relpath_join}, {"SVN::_Core::svn_dirent_basename", _wrap_svn_dirent_basename}, @@ -49139,8 +50645,11 @@ static swig_command_info swig_commands[] = { {"SVN::_Core::svn_dirent_is_absolute", _wrap_svn_dirent_is_absolute}, {"SVN::_Core::svn_uri_is_root", _wrap_svn_uri_is_root}, {"SVN::_Core::svn_dirent_canonicalize", _wrap_svn_dirent_canonicalize}, +{"SVN::_Core::svn_dirent_canonicalize_safe", _wrap_svn_dirent_canonicalize_safe}, {"SVN::_Core::svn_relpath_canonicalize", _wrap_svn_relpath_canonicalize}, +{"SVN::_Core::svn_relpath_canonicalize_safe", _wrap_svn_relpath_canonicalize_safe}, {"SVN::_Core::svn_uri_canonicalize", _wrap_svn_uri_canonicalize}, +{"SVN::_Core::svn_uri_canonicalize_safe", _wrap_svn_uri_canonicalize_safe}, {"SVN::_Core::svn_dirent_is_canonical", _wrap_svn_dirent_is_canonical}, {"SVN::_Core::svn_relpath_is_canonical", _wrap_svn_relpath_is_canonical}, {"SVN::_Core::svn_uri_is_canonical", _wrap_svn_uri_is_canonical}, @@ -49816,3057 +51325,3072 @@ XS(SWIG_init) { SvREADONLY_on(sv); } - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SWIG_SVN_INVALID_REVNUM", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_long SWIG_PERL_CALL_ARGS_1((long)(-1))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SWIG_SVN_IGNORED_REVNUM", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_long SWIG_PERL_CALL_ARGS_1((long)(-1))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CATEGORY_SIZE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(5000))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_WARNING", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_WARNING))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_CONTAINING_POOL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_CONTAINING_POOL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_FILENAME", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_FILENAME))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_URL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_URL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_DATE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_DATE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_MIME_TYPE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_MIME_TYPE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_PROPERTY_VALUE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_PROPERTY_VALUE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_VERSION_FILE_FORMAT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_VERSION_FILE_FORMAT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_RELATIVE_PATH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_RELATIVE_PATH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_UUID", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_UUID))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_CONFIG_VALUE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_CONFIG_VALUE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_SERVER_SPECIFICATION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_SERVER_SPECIFICATION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_CHECKSUM_KIND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_CHECKSUM_KIND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_CHECKSUM_PARSE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_CHECKSUM_PARSE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_TOKEN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_TOKEN))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_CHANGELIST_NAME", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_CHANGELIST_NAME))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_ATOMIC", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_ATOMIC))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_COMPRESSION_METHOD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_COMPRESSION_METHOD))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_PROPERTY_VALUE_EOL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_PROPERTY_VALUE_EOL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_ATTRIB_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_ATTRIB_NOT_FOUND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_MISSING_ANCESTRY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_MISSING_ANCESTRY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_UNKNOWN_ENCODING", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_UNKNOWN_ENCODING))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_MALFORMED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_MALFORMED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_UNESCAPABLE_DATA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_UNESCAPABLE_DATA))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_UNEXPECTED_ELEMENT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_UNEXPECTED_ELEMENT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_INCONSISTENT_EOL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_INCONSISTENT_EOL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_UNKNOWN_EOL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_UNKNOWN_EOL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_CORRUPT_EOL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_CORRUPT_EOL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_UNIQUE_NAMES_EXHAUSTED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_UNIQUE_NAMES_EXHAUSTED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_PIPE_FRAME_ERROR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_PIPE_FRAME_ERROR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_PIPE_READ_ERROR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_PIPE_READ_ERROR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_WRITE_ERROR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_WRITE_ERROR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_PIPE_WRITE_ERROR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_PIPE_WRITE_ERROR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_STREAM_UNEXPECTED_EOF", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_STREAM_UNEXPECTED_EOF))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_STREAM_MALFORMED_DATA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_STREAM_MALFORMED_DATA))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_STREAM_UNRECOGNIZED_DATA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_STREAM_UNRECOGNIZED_DATA))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_STREAM_SEEK_NOT_SUPPORTED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_STREAM_SEEK_NOT_SUPPORTED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_STREAM_NOT_SUPPORTED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_STREAM_NOT_SUPPORTED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_NODE_UNKNOWN_KIND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_NODE_UNKNOWN_KIND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_NODE_UNEXPECTED_KIND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_NODE_UNEXPECTED_KIND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_NOT_FOUND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_EXISTS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_EXISTS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_MISSING_REVISION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_MISSING_REVISION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_MISSING_URL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_MISSING_URL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_ATTRIBUTE_INVALID", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_ATTRIBUTE_INVALID))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_FORBIDDEN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_FORBIDDEN))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_OBSTRUCTED_UPDATE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_OBSTRUCTED_UPDATE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_UNWIND_MISMATCH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_UNWIND_MISMATCH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_UNWIND_EMPTY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_UNWIND_EMPTY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_UNWIND_NOT_EMPTY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_UNWIND_NOT_EMPTY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_LOCKED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_LOCKED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_LOCKED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_LOCKED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_LOCK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_LOCK))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_WORKING_COPY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_WORKING_COPY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_DIRECTORY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_DIRECTORY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_FILE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_FILE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_BAD_ADM_LOG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_BAD_ADM_LOG))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_PATH_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_PATH_NOT_FOUND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_UP_TO_DATE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_UP_TO_DATE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_LEFT_LOCAL_MOD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_LEFT_LOCAL_MOD))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_SCHEDULE_CONFLICT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_SCHEDULE_CONFLICT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_PATH_FOUND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_PATH_FOUND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_FOUND_CONFLICT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_FOUND_CONFLICT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CORRUPT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CORRUPT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CORRUPT_TEXT_BASE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CORRUPT_TEXT_BASE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NODE_KIND_CHANGE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NODE_KIND_CHANGE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_OP_ON_CWD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_OP_ON_CWD))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_BAD_ADM_LOG_START", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_BAD_ADM_LOG_START))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_UNSUPPORTED_FORMAT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_UNSUPPORTED_FORMAT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_BAD_PATH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_BAD_PATH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_SCHEDULE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_SCHEDULE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_RELOCATION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_RELOCATION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_SWITCH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_SWITCH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_MISMATCHED_CHANGELIST", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_MISMATCHED_CHANGELIST))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_COPYFROM_PATH_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_COPYFROM_PATH_NOT_FOUND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CHANGELIST_MOVE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CHANGELIST_MOVE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CANNOT_DELETE_FILE_EXTERNAL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CANNOT_DELETE_FILE_EXTERNAL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CANNOT_MOVE_FILE_EXTERNAL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CANNOT_MOVE_FILE_EXTERNAL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_DB_ERROR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_DB_ERROR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_MISSING", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_MISSING))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_SYMLINK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_SYMLINK))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_PATH_UNEXPECTED_STATUS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_PATH_UNEXPECTED_STATUS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_UPGRADE_REQUIRED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_UPGRADE_REQUIRED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CLEANUP_REQUIRED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CLEANUP_REQUIRED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_OPERATION_DEPTH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_OPERATION_DEPTH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_PATH_ACCESS_DENIED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_PATH_ACCESS_DENIED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_MIXED_REVISIONS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_MIXED_REVISIONS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_DUPLICATE_EXTERNALS_TARGET", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_DUPLICATE_EXTERNALS_TARGET))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_GENERAL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_GENERAL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CLEANUP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CLEANUP))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_ALREADY_OPEN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_ALREADY_OPEN))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_OPEN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_OPEN))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CORRUPT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CORRUPT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_PATH_SYNTAX", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_PATH_SYNTAX))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_REVISION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_REVISION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_TRANSACTION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_TRANSACTION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_ENTRY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_ENTRY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_REPRESENTATION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_REPRESENTATION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_STRING", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_STRING))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_COPY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_COPY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_TRANSACTION_NOT_MUTABLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_TRANSACTION_NOT_MUTABLE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_FOUND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_ID_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_ID_NOT_FOUND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_ID", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_ID))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_DIRECTORY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_DIRECTORY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_FILE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_FILE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_MUTABLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_MUTABLE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_ALREADY_EXISTS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_ALREADY_EXISTS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_ROOT_DIR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_ROOT_DIR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_TXN_ROOT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_TXN_ROOT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_REVISION_ROOT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_REVISION_ROOT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CONFLICT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CONFLICT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_REP_CHANGED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_REP_CHANGED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_REP_NOT_MUTABLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_REP_NOT_MUTABLE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_MALFORMED_SKEL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_MALFORMED_SKEL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_TXN_OUT_OF_DATE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_TXN_OUT_OF_DATE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_BERKELEY_DB", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_BERKELEY_DB))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_BERKELEY_DB_DEADLOCK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_BERKELEY_DB_DEADLOCK))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_TRANSACTION_DEAD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_TRANSACTION_DEAD))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_TRANSACTION_NOT_DEAD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_TRANSACTION_NOT_DEAD))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_UNKNOWN_FS_TYPE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_UNKNOWN_FS_TYPE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_USER", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_USER))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_PATH_ALREADY_LOCKED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_PATH_ALREADY_LOCKED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_PATH_NOT_LOCKED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_PATH_NOT_LOCKED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_BAD_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_BAD_LOCK_TOKEN))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_LOCK_TOKEN))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_LOCK_OWNER_MISMATCH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_LOCK_OWNER_MISMATCH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_LOCK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_LOCK))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_LOCK_EXPIRED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_LOCK_EXPIRED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_OUT_OF_DATE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_OUT_OF_DATE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_UNSUPPORTED_FORMAT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_UNSUPPORTED_FORMAT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_REP_BEING_WRITTEN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_REP_BEING_WRITTEN))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_TXN_NAME_TOO_LONG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_TXN_NAME_TOO_LONG))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_NODE_ORIGIN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_NODE_ORIGIN))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_UNSUPPORTED_UPGRADE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_UNSUPPORTED_UPGRADE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_CHECKSUM_REP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_CHECKSUM_REP))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_PROP_BASEVALUE_MISMATCH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_PROP_BASEVALUE_MISMATCH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_PACKED_REVPROP_READ_FAILURE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_PACKED_REVPROP_READ_FAILURE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_REVPROP_CACHE_INIT_FAILURE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_REVPROP_CACHE_INIT_FAILURE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_MALFORMED_TXN_ID", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_MALFORMED_TXN_ID))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_INDEX_CORRUPTION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_INDEX_CORRUPTION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_INDEX_REVISION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_INDEX_REVISION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_INDEX_OVERFLOW", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_INDEX_OVERFLOW))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CONTAINER_INDEX", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CONTAINER_INDEX))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_INDEX_INCONSISTENT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_INDEX_INCONSISTENT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_LOCK_OPERATION_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_LOCK_OPERATION_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_UNSUPPORTED_TYPE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_UNSUPPORTED_TYPE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CONTAINER_SIZE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CONTAINER_SIZE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_MALFORMED_NODEREV_ID", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_MALFORMED_NODEREV_ID))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_INVALID_GENERATION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_INVALID_GENERATION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CORRUPT_REVPROP_MANIFEST", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CORRUPT_REVPROP_MANIFEST))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CORRUPT_PROPLIST", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CORRUPT_PROPLIST))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_AMBIGUOUS_CHECKSUM_REP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_AMBIGUOUS_CHECKSUM_REP))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_LOCKED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_LOCKED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_HOOK_FAILURE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_HOOK_FAILURE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_BAD_ARGS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_BAD_ARGS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_NO_DATA_FOR_REPORT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_NO_DATA_FOR_REPORT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_BAD_REVISION_REPORT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_BAD_REVISION_REPORT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_UNSUPPORTED_VERSION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_UNSUPPORTED_VERSION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_DISABLED_FEATURE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_DISABLED_FEATURE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_POST_COMMIT_HOOK_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_POST_COMMIT_HOOK_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_POST_LOCK_HOOK_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_POST_LOCK_HOOK_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_POST_UNLOCK_HOOK_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_POST_UNLOCK_HOOK_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_UNSUPPORTED_UPGRADE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_UNSUPPORTED_UPGRADE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_ILLEGAL_URL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_ILLEGAL_URL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_NOT_AUTHORIZED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_NOT_AUTHORIZED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_UNKNOWN_AUTH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_UNKNOWN_AUTH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_NOT_IMPLEMENTED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_NOT_IMPLEMENTED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_OUT_OF_DATE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_OUT_OF_DATE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_NO_REPOS_UUID", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_NO_REPOS_UUID))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_UNSUPPORTED_ABI_VERSION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_UNSUPPORTED_ABI_VERSION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_NOT_LOCKED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_NOT_LOCKED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_PARTIAL_REPLAY_NOT_SUPPORTED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_PARTIAL_REPLAY_NOT_SUPPORTED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_UUID_MISMATCH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_UUID_MISMATCH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_REPOS_ROOT_URL_MISMATCH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_REPOS_ROOT_URL_MISMATCH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SESSION_URL_MISMATCH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SESSION_URL_MISMATCH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_CANNOT_CREATE_TUNNEL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_CANNOT_CREATE_TUNNEL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_CANNOT_CREATE_SESSION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_CANNOT_CREATE_SESSION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_SOCK_INIT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_SOCK_INIT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_CREATING_REQUEST", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_CREATING_REQUEST))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_REQUEST_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_REQUEST_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_OPTIONS_REQ_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_OPTIONS_REQ_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_PROPS_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_PROPS_NOT_FOUND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_ALREADY_EXISTS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_ALREADY_EXISTS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_INVALID_CONFIG_VALUE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_INVALID_CONFIG_VALUE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_PATH_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_PATH_NOT_FOUND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_PROPPATCH_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_PROPPATCH_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_MALFORMED_DATA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_MALFORMED_DATA))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_RESPONSE_HEADER_BADNESS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_RESPONSE_HEADER_BADNESS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_RELOCATED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_RELOCATED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_CONN_TIMEOUT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_CONN_TIMEOUT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_FORBIDDEN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_FORBIDDEN))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_PRECONDITION_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_PRECONDITION_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_METHOD_NOT_ALLOWED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_METHOD_NOT_ALLOWED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_LOCAL_REPOS_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_LOCAL_REPOS_NOT_FOUND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_LOCAL_REPOS_OPEN_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_LOCAL_REPOS_OPEN_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_INVALID_HEADER", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_INVALID_HEADER))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_CORRUPT_WINDOW", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_CORRUPT_WINDOW))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_BACKWARD_VIEW", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_BACKWARD_VIEW))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_INVALID_OPS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_INVALID_OPS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_UNEXPECTED_END", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_UNEXPECTED_END))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_INVALID_COMPRESSED_DATA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_INVALID_COMPRESSED_DATA))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_APMOD_MISSING_PATH_TO_FS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_APMOD_MISSING_PATH_TO_FS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_APMOD_MALFORMED_URI", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_APMOD_MALFORMED_URI))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_APMOD_ACTIVITY_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_APMOD_ACTIVITY_NOT_FOUND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_APMOD_BAD_BASELINE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_APMOD_BAD_BASELINE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_APMOD_CONNECTION_ABORTED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_APMOD_CONNECTION_ABORTED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_VERSIONED_PATH_REQUIRED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_VERSIONED_PATH_REQUIRED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_RA_ACCESS_REQUIRED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_RA_ACCESS_REQUIRED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_BAD_REVISION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_BAD_REVISION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_DUPLICATE_COMMIT_URL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_DUPLICATE_COMMIT_URL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_IS_BINARY_FILE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_IS_BINARY_FILE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_INVALID_EXTERNALS_DESCRIPTION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_INVALID_EXTERNALS_DESCRIPTION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_MODIFIED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_MODIFIED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_IS_DIRECTORY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_IS_DIRECTORY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_REVISION_RANGE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_REVISION_RANGE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_INVALID_RELOCATION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_INVALID_RELOCATION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_REVISION_AUTHOR_CONTAINS_NEWLINE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_REVISION_AUTHOR_CONTAINS_NEWLINE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_PROPERTY_NAME", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_PROPERTY_NAME))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_UNRELATED_RESOURCES", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_UNRELATED_RESOURCES))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_MISSING_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_MISSING_LOCK_TOKEN))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_MULTIPLE_SOURCES_DISALLOWED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_MULTIPLE_SOURCES_DISALLOWED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_NO_VERSIONED_PARENT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_NO_VERSIONED_PARENT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_NOT_READY_TO_MERGE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_NOT_READY_TO_MERGE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_FILE_EXTERNAL_OVERWRITE_VERSIONED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_FILE_EXTERNAL_OVERWRITE_VERSIONED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_PATCH_BAD_STRIP_COUNT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_PATCH_BAD_STRIP_COUNT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_CYCLE_DETECTED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_CYCLE_DETECTED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_MERGE_UPDATE_REQUIRED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_MERGE_UPDATE_REQUIRED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_INVALID_MERGEINFO_NO_MERGETRACKING", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_INVALID_MERGEINFO_NO_MERGETRACKING))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_NO_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_NO_LOCK_TOKEN))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_FORBIDDEN_BY_SERVER", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_FORBIDDEN_BY_SERVER))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BASE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BASE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_PLUGIN_LOAD_FAILURE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_PLUGIN_LOAD_FAILURE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_MALFORMED_FILE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_MALFORMED_FILE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_INCOMPLETE_DATA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_INCOMPLETE_DATA))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_INCORRECT_PARAMS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_INCORRECT_PARAMS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_UNVERSIONED_RESOURCE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_UNVERSIONED_RESOURCE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_TEST_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_TEST_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_UNSUPPORTED_FEATURE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_UNSUPPORTED_FEATURE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_PROP_KIND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_PROP_KIND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ILLEGAL_TARGET", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ILLEGAL_TARGET))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_DELTA_MD5_CHECKSUM_ABSENT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_DELTA_MD5_CHECKSUM_ABSENT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_DIR_NOT_EMPTY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_DIR_NOT_EMPTY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_EXTERNAL_PROGRAM", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_EXTERNAL_PROGRAM))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SWIG_PY_EXCEPTION_SET", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SWIG_PY_EXCEPTION_SET))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CHECKSUM_MISMATCH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CHECKSUM_MISMATCH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CANCELLED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CANCELLED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_INVALID_DIFF_OPTION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_INVALID_DIFF_OPTION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_PROPERTY_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_PROPERTY_NOT_FOUND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_NO_AUTH_FILE_PATH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_NO_AUTH_FILE_PATH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_VERSION_MISMATCH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_VERSION_MISMATCH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_MERGEINFO_PARSE_ERROR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_MERGEINFO_PARSE_ERROR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CEASE_INVOCATION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CEASE_INVOCATION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REVNUM_PARSE_FAILURE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REVNUM_PARSE_FAILURE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ITER_BREAK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ITER_BREAK))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_UNKNOWN_CHANGELIST", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_UNKNOWN_CHANGELIST))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RESERVED_FILENAME_SPECIFIED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RESERVED_FILENAME_SPECIFIED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_UNKNOWN_CAPABILITY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_UNKNOWN_CAPABILITY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_TEST_SKIPPED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_TEST_SKIPPED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_NO_APR_MEMCACHE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_NO_APR_MEMCACHE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ATOMIC_INIT_FAILURE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ATOMIC_INIT_FAILURE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_ERROR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_ERROR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_READONLY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_READONLY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_UNSUPPORTED_SCHEMA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_UNSUPPORTED_SCHEMA))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_BUSY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_BUSY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_RESETTING_FOR_ROLLBACK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_RESETTING_FOR_ROLLBACK))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_CONSTRAINT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_CONSTRAINT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_TOO_MANY_MEMCACHED_SERVERS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_TOO_MANY_MEMCACHED_SERVERS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_MALFORMED_VERSION_STRING", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_MALFORMED_VERSION_STRING))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CORRUPTED_ATOMIC_STORAGE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CORRUPTED_ATOMIC_STORAGE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_UTF8PROC_ERROR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_UTF8PROC_ERROR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_UTF8_GLOB", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_UTF8_GLOB))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CORRUPT_PACKED_DATA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CORRUPT_PACKED_DATA))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_COMPOSED_ERROR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_COMPOSED_ERROR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_INVALID_INPUT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_INVALID_INPUT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_ROLLBACK_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_ROLLBACK_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_LZ4_COMPRESSION_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_LZ4_COMPRESSION_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_LZ4_DECOMPRESSION_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_LZ4_DECOMPRESSION_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CANONICALIZATION_FAILED", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CANONICALIZATION_FAILED))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_ARG_PARSING_ERROR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_ARG_PARSING_ERROR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_INSUFFICIENT_ARGS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_INSUFFICIENT_ARGS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_ADM_DIR_RESERVED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_ADM_DIR_RESERVED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_LOG_MESSAGE_IS_VERSIONED_FILE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_LOG_MESSAGE_IS_VERSIONED_FILE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_LOG_MESSAGE_IS_PATHNAME", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_LOG_MESSAGE_IS_PATHNAME))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_COMMIT_IN_ADDED_DIR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_COMMIT_IN_ADDED_DIR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_NO_EXTERNAL_EDITOR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_NO_EXTERNAL_EDITOR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_BAD_LOG_MESSAGE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_BAD_LOG_MESSAGE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_UNNECESSARY_LOG_MESSAGE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_UNNECESSARY_LOG_MESSAGE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_NO_EXTERNAL_MERGE_TOOL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_NO_EXTERNAL_MERGE_TOOL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_REPOS_VERIFY_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_REPOS_VERIFY_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_CMD_ERR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_CMD_ERR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_UNKNOWN_CMD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_UNKNOWN_CMD))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_CONNECTION_CLOSED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_CONNECTION_CLOSED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_IO_ERROR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_IO_ERROR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_MALFORMED_DATA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_MALFORMED_DATA))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_REPOS_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_REPOS_NOT_FOUND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_BAD_VERSION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_BAD_VERSION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_NO_MECHANISMS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_NO_MECHANISMS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_EDIT_ABORTED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_EDIT_ABORTED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_REQUEST_SIZE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_REQUEST_SIZE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_RESPONSE_SIZE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_RESPONSE_SIZE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHN_CREDS_UNAVAILABLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHN_CREDS_UNAVAILABLE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHN_NO_PROVIDER", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHN_NO_PROVIDER))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHN_PROVIDERS_EXHAUSTED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHN_PROVIDERS_EXHAUSTED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHN_CREDS_NOT_SAVED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHN_CREDS_NOT_SAVED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHN_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHN_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHZ_ROOT_UNREADABLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHZ_ROOT_UNREADABLE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHZ_UNREADABLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHZ_UNREADABLE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHZ_PARTIALLY_READABLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHZ_PARTIALLY_READABLE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHZ_INVALID_CONFIG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHZ_INVALID_CONFIG))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHZ_UNWRITABLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHZ_UNWRITABLE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_DIFF_DATASOURCE_MODIFIED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_DIFF_DATASOURCE_MODIFIED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_DIFF_UNEXPECTED_DATA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_DIFF_UNEXPECTED_DATA))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SERF_SSPI_INITIALISATION_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SERF_SSPI_INITIALISATION_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SERF_GSSAPI_INITIALISATION_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SERF_GSSAPI_INITIALISATION_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SERF_WRAPPED_ERROR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SERF_WRAPPED_ERROR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SERF_STREAM_BUCKET_READ_ERROR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SERF_STREAM_BUCKET_READ_ERROR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ASSERTION_FAIL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ASSERTION_FAIL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ASSERTION_ONLY_TRACING_LINKS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ASSERTION_ONLY_TRACING_LINKS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ASN1_OUT_OF_DATA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ASN1_OUT_OF_DATA))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ASN1_UNEXPECTED_TAG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ASN1_UNEXPECTED_TAG))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ASN1_INVALID_LENGTH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ASN1_INVALID_LENGTH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ASN1_LENGTH_MISMATCH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ASN1_LENGTH_MISMATCH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ASN1_INVALID_DATA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ASN1_INVALID_DATA))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_FEATURE_UNAVAILABLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_FEATURE_UNAVAILABLE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_PEM", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_PEM))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_FORMAT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_FORMAT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_VERSION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_VERSION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_SERIAL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_SERIAL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_ALG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_ALG))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_NAME", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_NAME))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_DATE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_DATE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_PUBKEY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_PUBKEY))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_SIGNATURE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_SIGNATURE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_EXTENSIONS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_EXTENSIONS))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_UNKNOWN_VERSION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_UNKNOWN_VERSION))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_UNKNOWN_PK_ALG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_UNKNOWN_PK_ALG))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_SIG_MISMATCH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_SIG_MISMATCH))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_VERIFY_FAILED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_VERIFY_FAILED))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_LAST", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_LAST))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { - SV *sv = get_sv((char*) SWIG_prefix "SVN_UNALIGNED_ACCESS_IS_OK", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0))); - SvREADONLY_on(sv); - } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { - SV *sv = get_sv((char*) SWIG_prefix "TRUE", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1))); - SvREADONLY_on(sv); - } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { - SV *sv = get_sv((char*) SWIG_prefix "FALSE", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0))); - SvREADONLY_on(sv); - } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_node_none", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_none))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_node_file", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_file))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_node_dir", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_dir))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_node_unknown", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_unknown))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_node_symlink", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_symlink))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_tristate_false", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_tristate_false))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_tristate_true", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_tristate_true))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_tristate_unknown", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_tristate_unknown))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { - SV *sv = get_sv((char*) SWIG_prefix "SVN_REVNUM_T_FMT", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_FromCharPtr("ld")); - SvREADONLY_on(sv); - } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { - SV *sv = get_sv((char*) SWIG_prefix "svn_nonrecursive", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_nonrecursive))); - SvREADONLY_on(sv); - } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { - SV *sv = get_sv((char*) SWIG_prefix "svn_recursive", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_recursive))); - SvREADONLY_on(sv); - } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_depth_unknown", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_depth_unknown))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_depth_exclude", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_depth_exclude))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_depth_empty", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_depth_empty))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_depth_files", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_depth_files))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_depth_immediates", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_depth_immediates))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_depth_infinity", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_depth_infinity))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "SVN_UNALIGNED_ACCESS_IS_OK", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "TRUE", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "FALSE", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "SVN_REVNUM_T_FMT", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_FromCharPtr("ld")); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "svn_nonrecursive", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_nonrecursive))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "svn_recursive", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_recursive))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_KIND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00001))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_SIZE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00002))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_HAS_PROPS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00004))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_CREATED_REV", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00008))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_TIME", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00010))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_LAST_AUTHOR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00020))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_MAX_LEN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(255))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_REVISION_LONG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("LastChangedRevision")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_REVISION_SHORT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Rev")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_REVISION_MEDIUM", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Revision")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_DATE_LONG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("LastChangedDate")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_DATE_SHORT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Date")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_AUTHOR_LONG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("LastChangedBy")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_AUTHOR_SHORT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Author")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_URL_LONG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("HeadURL")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_URL_SHORT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("URL")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_ID", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Id")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_HEADER", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Header")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_STREAM_CHUNK_SIZE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(102400))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN__STREAM_CHUNK_SIZE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(16384))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_ALLOCATOR_RECOMMENDED_MAX_FREE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)((4096*1024)))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_MAJOR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_MINOR", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(10))); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(13))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_PATCH", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(6))); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_MICRO", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(6))); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_LIBRARY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_TAG", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_FromCharPtr(" (r1863367)")); + sv_setsv(sv, SWIG_FromCharPtr(" (r1867053)")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_NUMTAG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_REVISION", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1863367))); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1867053))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_NUM", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_FromCharPtr("1.10.6")); + sv_setsv(sv, SWIG_FromCharPtr("1.13.0")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_NUMBER", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_FromCharPtr("1.10.6")); + sv_setsv(sv, SWIG_FromCharPtr("1.13.0")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_VERSION", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_FromCharPtr("1.10.6 (r1863367)")); + sv_setsv(sv, SWIG_FromCharPtr("1.13.0 (r1867053)")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_prop_entry_kind", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_prop_entry_kind))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_prop_wc_kind", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_prop_wc_kind))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_prop_regular_kind", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_prop_regular_kind))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_PREFIX", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_BOOLEAN_TRUE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("*")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_MIME_TYPE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:mime-type")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_IGNORE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:ignore")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_EOL_STYLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:eol-style")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_KEYWORDS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:keywords")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_EXECUTABLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:executable")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_EXECUTABLE_VALUE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("*")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_NEEDS_LOCK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:needs-lock")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_NEEDS_LOCK_VALUE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("*")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_SPECIAL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:special")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_SPECIAL_VALUE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("*")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_EXTERNALS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:externals")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_MERGEINFO", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:mergeinfo")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_INHERITABLE_AUTO_PROPS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auto-props")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_INHERITABLE_IGNORES", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:global-ignores")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_TEXT_TIME", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:text-time")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_OWNER", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:owner")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_GROUP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:group")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_UNIX_MODE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:unix-mode")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_WC_PREFIX", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:wc:")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_PREFIX", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:entry:")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_COMMITTED_REV", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:entry:committed-rev")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_COMMITTED_DATE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:entry:committed-date")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_LAST_AUTHOR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:entry:last-author")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_UUID", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:entry:uuid")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:entry:lock-token")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_CUSTOM_PREFIX", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:custom:")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_AUTHOR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:author")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_LOG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:log")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_DATE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:date")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_ORIG_DATE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:original-date")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_AUTOVERSIONED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:autoversioned")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_PREFIX", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:sync-")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_LOCK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:sync-lock")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_FROM_URL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:sync-from-url")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_FROM_UUID", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:sync-from-uuid")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_LAST_MERGED_REV", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:sync-last-merged-rev")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_CURRENTLY_COPYING", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:sync-currently-copying")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_TXN_PREFIX", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:txn-")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_TXN_CLIENT_COMPAT_VERSION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:txn-client-compat-version")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_TXN_USER_AGENT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:txn-user-agent")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_PREFIX", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:revision-")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { - SV *sv = get_sv((char*) SWIG_prefix "SVN_OPT_MAX_ALIASES", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(3))); - SvREADONLY_on(sv); - } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { - SV *sv = get_sv((char*) SWIG_prefix "SVN_OPT_MAX_OPTIONS", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(50))); - SvREADONLY_on(sv); - } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { - SV *sv = get_sv((char*) SWIG_prefix "SVN_OPT_FIRST_LONGOPT_ID", TRUE | 0x2 | GV_ADDMULTI); - sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(256))); - SvREADONLY_on(sv); - } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_unspecified", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_unspecified))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_number", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_number))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_date", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_date))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_committed", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_committed))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_previous", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_previous))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_base", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_base))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_working", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_working))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_head", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_head))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "SVN_OPT_MAX_ALIASES", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(3))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "SVN_OPT_MAX_OPTIONS", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(50))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "SVN_OPT_MAX_PARAGRAPHS", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(100))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "SVN_OPT_FIRST_LONGOPT_ID", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(256))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_CRED_SIMPLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn.simple")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_CRED_USERNAME", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn.username")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_CRED_SSL_CLIENT_CERT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn.ssl.client-cert")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_CRED_SSL_CLIENT_CERT_PW", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn.ssl.client-passphrase")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_CRED_SSL_SERVER_TRUST", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn.ssl.server")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_SSL_NOTYETVALID", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000001))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_SSL_EXPIRED", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000002))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_SSL_CNMISMATCH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000004))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_SSL_UNKNOWNCA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000008))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_SSL_OTHER", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x40000000))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_PREFIX", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auth:")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_DEFAULT_USERNAME", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auth:username")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_DEFAULT_PASSWORD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auth:password")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_NON_INTERACTIVE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auth:non-interactive")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_DONT_STORE_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auth:dont-store-passwords")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_STORE_PLAINTEXT_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auth:store-plaintext-passwords")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_DONT_STORE_SSL_CLIENT_CERT_PP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auth:dont-store-ssl-client-cert-pp")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auth:store-ssl-client-cert-pp-plaintext")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_NO_AUTH_CACHE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auth:no-auth-cache")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_SSL_SERVER_FAILURES", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auth:ssl:failures")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_SSL_SERVER_CERT_INFO", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auth:ssl:cert-info")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_CONFIG_CATEGORY_CONFIG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auth:config-category-config")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_CONFIG_CATEGORY_SERVERS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auth:config-category-servers")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_CONFIG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auth:config-category-servers")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_SERVER_GROUP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auth:server-group")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_CONFIG_DIR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:auth:config-dir")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("gnome-keyring-unlock-prompt-func")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("gnome-keyring-unlock-prompt-baton")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_CATEGORY_SERVERS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("servers")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_GROUPS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("groups")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_GLOBAL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("global")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_PROXY_HOST", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("http-proxy-host")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_PROXY_PORT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("http-proxy-port")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_PROXY_USERNAME", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("http-proxy-username")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_PROXY_PASSWORD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("http-proxy-password")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_PROXY_EXCEPTIONS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("http-proxy-exceptions")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_TIMEOUT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("http-timeout")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_COMPRESSION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("http-compression")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_NEON_DEBUG_MASK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("neon-debug-mask")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_AUTH_TYPES", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("http-auth-types")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_AUTHORITY_FILES", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("ssl-authority-files")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_TRUST_DEFAULT_CA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("ssl-trust-default-ca")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_CLIENT_CERT_FILE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("ssl-client-cert-file")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_CLIENT_CERT_PASSWORD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("ssl-client-cert-password")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_PKCS11_PROVIDER", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("ssl-pkcs11-provider")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_LIBRARY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("http-library")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_STORE_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("store-passwords")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_STORE_PLAINTEXT_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("store-plaintext-passwords")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_STORE_AUTH_CREDS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("store-auth-creds")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_STORE_SSL_CLIENT_CERT_PP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("store-ssl-client-cert-pp")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("store-ssl-client-cert-pp-plaintext")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_USERNAME", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("username")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_BULK_UPDATES", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("http-bulk-updates")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_MAX_CONNECTIONS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("http-max-connections")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_CHUNKED_REQUESTS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("http-chunked-requests")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SERF_LOG_COMPONENTS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("serf-log-components")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SERF_LOG_LEVEL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("serf-log-level")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_CATEGORY_CONFIG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("config")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_AUTH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("auth")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_PASSWORD_STORES", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("password-stores")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_KWALLET_WALLET", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("kwallet-wallet")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_KWALLET_SVN_APPLICATION_NAME_WITH_PID", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("kwallet-svn-application-name-with-pid")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_CLIENT_CERT_FILE_PROMPT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("ssl-client-cert-file-prompt")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_HELPERS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("helpers")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_EDITOR_CMD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("editor-cmd")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_DIFF_CMD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("diff-cmd")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_DIFF_EXTENSIONS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("diff-extensions")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_DIFF3_CMD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("diff3-cmd")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_DIFF3_HAS_PROGRAM_ARG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("diff3-has-program-arg")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_MERGE_TOOL_CMD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("merge-tool-cmd")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_MISCELLANY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("miscellany")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_GLOBAL_IGNORES", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("global-ignores")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_LOG_ENCODING", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("log-encoding")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_USE_COMMIT_TIMES", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("use-commit-times")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_TEMPLATE_ROOT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("template-root")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("enable-auto-props")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_ENABLE_MAGIC_FILE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("enable-magic-file")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_NO_UNLOCK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("no-unlock")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_MIMETYPES_FILE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("mime-types-file")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_PRESERVED_CF_EXTS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("preserved-conflict-file-exts")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_INTERACTIVE_CONFLICTS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("interactive-conflicts")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_MEMORY_CACHE_SIZE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("memory-cache-size")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_DIFF_IGNORE_CONTENT_TYPE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("diff-ignore-content-type")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_TUNNELS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("tunnels")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_AUTO_PROPS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("auto-props")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_WORKING_COPY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("working-copy")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("exclusive-locking")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE_CLIENTS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("exclusive-locking-clients")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SQLITE_BUSY_TIMEOUT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("busy-timeout")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_GENERAL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("general")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_ANON_ACCESS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("anon-access")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_AUTH_ACCESS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("auth-access")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_PASSWORD_DB", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("password-db")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_REALM", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("realm")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_AUTHZ_DB", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("authz-db")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_GROUPS_DB", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("groups-db")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_FORCE_USERNAME_CASE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("force-username-case")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HOOKS_ENV", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("hooks-env")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_SASL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("sasl")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_USE_SASL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("use-sasl")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_MIN_SSF", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("min-encryption")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_MAX_SSF", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("max-encryption")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_USERS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("users")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_1", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_2", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("*.rej *~ #*# .#* .*.swp .DS_Store [Tt]humbs.db")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_GLOBAL_IGNORES", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__ *.rej *~ #*# .#* .*.swp .DS_Store [Tt]humbs.db")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_TRUE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("TRUE")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_FALSE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("FALSE")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_ASK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("ASK")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_STORE_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_STORE_PLAINTEXT_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("ASK")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_STORE_AUTH_CREDS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_STORE_SSL_CLIENT_CERT_PP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("ASK")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_HTTP_MAX_CONNECTIONS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(4))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_REALMSTRING_KEY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("svn:realmstring")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_AUTHN_USERNAME_KEY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("username")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_AUTHN_PASSWORD_KEY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("password")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_AUTHN_PASSPHRASE_KEY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("passphrase")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_AUTHN_PASSTYPE_KEY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("passtype")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_AUTHN_ASCII_CERT_KEY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("ascii_cert")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_AUTHN_FAILURES_KEY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("failures")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_MERGEINFO_NONINHERITABLE_STR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("*")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_mergeinfo_explicit", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_mergeinfo_explicit))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_mergeinfo_inherited", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_mergeinfo_inherited))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_mergeinfo_nearest_ancestor", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_mergeinfo_nearest_ancestor))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_io_file_del_none", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_io_file_del_none))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_io_file_del_on_close", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_io_file_del_on_close))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_io_file_del_on_pool_cleanup", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_io_file_del_on_pool_cleanup))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_checksum_md5", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_checksum_md5))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_checksum_sha1", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_checksum_sha1))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_checksum_fnv1a_32", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_checksum_fnv1a_32))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_checksum_fnv1a_32x4", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_checksum_fnv1a_32x4))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_datasource_original", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_datasource_original))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_datasource_modified", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_datasource_modified))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_datasource_latest", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_datasource_latest))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_datasource_ancestor", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_datasource_ancestor))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_modified_latest", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_modified_latest))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_resolved_modified_latest", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_resolved_modified_latest))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_modified_original_latest", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_modified_original_latest))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_modified", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_modified))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_latest", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_latest))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_only_conflicts", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_only_conflicts))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_file_ignore_space_none", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_file_ignore_space_none))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_file_ignore_space_change", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_file_ignore_space_change))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_file_ignore_space_all", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_file_ignore_space_all))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_unchanged", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_unchanged))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_added", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_added))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_deleted", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_deleted))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_copied", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_copied))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_moved", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_moved))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_modified", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_modified))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_NO_ERROR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0))); SvREADONLY_on(sv); diff --git a/subversion/bindings/swig/perl/native/svn_client.c b/subversion/bindings/swig/perl/native/svn_client.c index 555d889..9ae8488 100644 --- a/subversion/bindings/swig/perl/native/svn_client.c +++ b/subversion/bindings/swig/perl/native/svn_client.c @@ -1532,166 +1532,177 @@ SWIG_Perl_SetModule(swig_module_info *module) { #define SWIGTYPE_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[20] #define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[21] #define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[22] -#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[23] -#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[24] -#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[25] -#define SWIGTYPE_p_f_p_void_p_q_const__char__int swig_types[26] -#define SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void swig_types[27] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[28] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[29] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[30] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[31] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[32] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[33] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[34] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t swig_types[35] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[36] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[37] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t swig_types[38] -#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[39] -#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[40] -#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t swig_types[41] -#define SWIGTYPE_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t swig_types[42] -#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[43] -#define SWIGTYPE_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[44] -#define SWIGTYPE_p_int swig_types[45] -#define SWIGTYPE_p_long swig_types[46] -#define SWIGTYPE_p_p_apr_array_header_t swig_types[47] -#define SWIGTYPE_p_p_apr_hash_t swig_types[48] -#define SWIGTYPE_p_p_char swig_types[49] -#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[50] -#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[51] -#define SWIGTYPE_p_p_svn_client_commit_item3_t swig_types[52] -#define SWIGTYPE_p_p_svn_client_conflict_t swig_types[53] -#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[54] -#define SWIGTYPE_p_p_svn_commit_info_t swig_types[55] -#define SWIGTYPE_p_p_svn_ra_session_t swig_types[56] -#define SWIGTYPE_p_p_svn_string_t swig_types[57] -#define SWIGTYPE_p_svn_auth_baton_t swig_types[58] -#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[59] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[60] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[61] -#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[62] -#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[63] -#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[64] -#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[65] -#define SWIGTYPE_p_svn_auth_provider_t swig_types[66] -#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[67] -#define SWIGTYPE_p_svn_cache_config_t swig_types[68] -#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[69] -#define SWIGTYPE_p_svn_checksum_kind_t swig_types[70] -#define SWIGTYPE_p_svn_checksum_t swig_types[71] -#define SWIGTYPE_p_svn_client_commit_info_t swig_types[72] -#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[73] -#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[74] -#define SWIGTYPE_p_svn_client_commit_item_t swig_types[75] -#define SWIGTYPE_p_svn_client_conflict_option_id_t swig_types[76] -#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[77] -#define SWIGTYPE_p_svn_client_conflict_t swig_types[78] -#define SWIGTYPE_p_svn_client_copy_source_t swig_types[79] -#define SWIGTYPE_p_svn_client_ctx_t swig_types[80] -#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[81] -#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[82] -#define SWIGTYPE_p_svn_client_info2_t swig_types[83] -#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[84] -#define SWIGTYPE_p_svn_client_shelved_patch_info_t swig_types[85] -#define SWIGTYPE_p_svn_client_status_t swig_types[86] -#define SWIGTYPE_p_svn_commit_info_t swig_types[87] -#define SWIGTYPE_p_svn_config_t swig_types[88] -#define SWIGTYPE_p_svn_delta_editor_t swig_types[89] -#define SWIGTYPE_p_svn_depth_t swig_types[90] -#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[91] -#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[92] -#define SWIGTYPE_p_svn_diff_datasource_e swig_types[93] -#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[94] -#define SWIGTYPE_p_svn_diff_file_options_t swig_types[95] -#define SWIGTYPE_p_svn_diff_fns2_t swig_types[96] -#define SWIGTYPE_p_svn_diff_fns_t swig_types[97] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[98] -#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[99] -#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[100] -#define SWIGTYPE_p_svn_diff_t swig_types[101] -#define SWIGTYPE_p_svn_dirent_t swig_types[102] -#define SWIGTYPE_p_svn_errno_t swig_types[103] -#define SWIGTYPE_p_svn_error_t swig_types[104] -#define SWIGTYPE_p_svn_info_t swig_types[105] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[106] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[107] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[108] -#define SWIGTYPE_p_svn_location_segment_t swig_types[109] -#define SWIGTYPE_p_svn_lock_t swig_types[110] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[111] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[112] -#define SWIGTYPE_p_svn_log_entry_t swig_types[113] -#define SWIGTYPE_p_svn_merge_range_t swig_types[114] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[115] -#define SWIGTYPE_p_svn_node_kind_t swig_types[116] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[117] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[118] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[119] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[120] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[121] -#define SWIGTYPE_p_svn_patch_file_t swig_types[122] -#define SWIGTYPE_p_svn_patch_t swig_types[123] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[124] -#define SWIGTYPE_p_svn_prop_kind swig_types[125] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[126] -#define SWIGTYPE_p_svn_prop_t swig_types[127] -#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[128] -#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[129] -#define SWIGTYPE_p_svn_ra_plugin_t swig_types[130] -#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[131] -#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[132] -#define SWIGTYPE_p_svn_ra_reporter_t swig_types[133] -#define SWIGTYPE_p_svn_ra_session_t swig_types[134] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[135] -#define SWIGTYPE_p_svn_stream_t swig_types[136] -#define SWIGTYPE_p_svn_string_t swig_types[137] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[138] -#define SWIGTYPE_p_svn_tristate_t swig_types[139] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[140] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[141] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[142] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[143] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[144] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[145] -#define SWIGTYPE_p_svn_version_extended_t swig_types[146] -#define SWIGTYPE_p_svn_version_t swig_types[147] -#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[148] -#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[149] -#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[150] -#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[151] -#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[152] -#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[153] -#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[154] -#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[155] -#define SWIGTYPE_p_svn_wc_context_t swig_types[156] -#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[157] -#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[158] -#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[159] -#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[160] -#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[161] -#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[162] -#define SWIGTYPE_p_svn_wc_entry_t swig_types[163] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[164] -#define SWIGTYPE_p_svn_wc_external_item_t swig_types[165] -#define SWIGTYPE_p_svn_wc_info_t swig_types[166] -#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[167] -#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[168] -#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[169] -#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[170] -#define SWIGTYPE_p_svn_wc_notify_t swig_types[171] -#define SWIGTYPE_p_svn_wc_operation_t swig_types[172] -#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[173] -#define SWIGTYPE_p_svn_wc_schedule_t swig_types[174] -#define SWIGTYPE_p_svn_wc_status2_t swig_types[175] -#define SWIGTYPE_p_svn_wc_status3_t swig_types[176] -#define SWIGTYPE_p_svn_wc_status_t swig_types[177] -#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[178] -#define SWIGTYPE_p_unsigned_long swig_types[179] -#define SWIGTYPE_p_void swig_types[180] -static swig_type_info *swig_types[182]; -static swig_module_info swig_module = {swig_types, 181, 0, 0, 0, 0}; +#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[23] +#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[24] +#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[25] +#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[26] +#define SWIGTYPE_p_f_p_void_p_q_const__char__int swig_types[27] +#define SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void swig_types[28] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[29] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[30] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[31] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t swig_types[32] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[33] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[34] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[35] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[36] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t swig_types[37] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t swig_types[38] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[39] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[40] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t swig_types[41] +#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[42] +#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[43] +#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t swig_types[44] +#define SWIGTYPE_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t swig_types[45] +#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[46] +#define SWIGTYPE_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[47] +#define SWIGTYPE_p_int swig_types[48] +#define SWIGTYPE_p_long swig_types[49] +#define SWIGTYPE_p_p_apr_array_header_t swig_types[50] +#define SWIGTYPE_p_p_apr_hash_t swig_types[51] +#define SWIGTYPE_p_p_char swig_types[52] +#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[53] +#define SWIGTYPE_p_p_svn_client__shelf_t swig_types[54] +#define SWIGTYPE_p_p_svn_client__shelf_version_t swig_types[55] +#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[56] +#define SWIGTYPE_p_p_svn_client_commit_item3_t swig_types[57] +#define SWIGTYPE_p_p_svn_client_conflict_t swig_types[58] +#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[59] +#define SWIGTYPE_p_p_svn_commit_info_t swig_types[60] +#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[61] +#define SWIGTYPE_p_p_svn_ra_session_t swig_types[62] +#define SWIGTYPE_p_p_svn_string_t swig_types[63] +#define SWIGTYPE_p_p_void swig_types[64] +#define SWIGTYPE_p_svn_auth_baton_t swig_types[65] +#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[66] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[67] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[68] +#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[69] +#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[70] +#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[71] +#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[72] +#define SWIGTYPE_p_svn_auth_provider_t swig_types[73] +#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[74] +#define SWIGTYPE_p_svn_cache_config_t swig_types[75] +#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[76] +#define SWIGTYPE_p_svn_checksum_kind_t swig_types[77] +#define SWIGTYPE_p_svn_checksum_t swig_types[78] +#define SWIGTYPE_p_svn_client__shelf_info_t swig_types[79] +#define SWIGTYPE_p_svn_client__shelf_t swig_types[80] +#define SWIGTYPE_p_svn_client__shelf_version_t swig_types[81] +#define SWIGTYPE_p_svn_client_commit_info_t swig_types[82] +#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[83] +#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[84] +#define SWIGTYPE_p_svn_client_commit_item_t swig_types[85] +#define SWIGTYPE_p_svn_client_conflict_option_id_t swig_types[86] +#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[87] +#define SWIGTYPE_p_svn_client_conflict_t swig_types[88] +#define SWIGTYPE_p_svn_client_copy_source_t swig_types[89] +#define SWIGTYPE_p_svn_client_ctx_t swig_types[90] +#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[91] +#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[92] +#define SWIGTYPE_p_svn_client_info2_t swig_types[93] +#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[94] +#define SWIGTYPE_p_svn_client_status_t swig_types[95] +#define SWIGTYPE_p_svn_commit_info_t swig_types[96] +#define SWIGTYPE_p_svn_config_t swig_types[97] +#define SWIGTYPE_p_svn_delta_editor_t swig_types[98] +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[99] +#define SWIGTYPE_p_svn_depth_t swig_types[100] +#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[101] +#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[102] +#define SWIGTYPE_p_svn_diff_datasource_e swig_types[103] +#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[104] +#define SWIGTYPE_p_svn_diff_file_options_t swig_types[105] +#define SWIGTYPE_p_svn_diff_fns2_t swig_types[106] +#define SWIGTYPE_p_svn_diff_fns_t swig_types[107] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[108] +#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[109] +#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[110] +#define SWIGTYPE_p_svn_diff_t swig_types[111] +#define SWIGTYPE_p_svn_dirent_t swig_types[112] +#define SWIGTYPE_p_svn_errno_t swig_types[113] +#define SWIGTYPE_p_svn_error_t swig_types[114] +#define SWIGTYPE_p_svn_info_t swig_types[115] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[116] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[117] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[118] +#define SWIGTYPE_p_svn_location_segment_t swig_types[119] +#define SWIGTYPE_p_svn_lock_t swig_types[120] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[121] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[122] +#define SWIGTYPE_p_svn_log_entry_t swig_types[123] +#define SWIGTYPE_p_svn_merge_range_t swig_types[124] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[125] +#define SWIGTYPE_p_svn_node_kind_t swig_types[126] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[127] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[128] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[129] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[130] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[131] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[132] +#define SWIGTYPE_p_svn_patch_file_t swig_types[133] +#define SWIGTYPE_p_svn_patch_t swig_types[134] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[135] +#define SWIGTYPE_p_svn_prop_kind swig_types[136] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[137] +#define SWIGTYPE_p_svn_prop_t swig_types[138] +#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[139] +#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[140] +#define SWIGTYPE_p_svn_ra_plugin_t swig_types[141] +#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[142] +#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[143] +#define SWIGTYPE_p_svn_ra_reporter_t swig_types[144] +#define SWIGTYPE_p_svn_ra_session_t swig_types[145] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[146] +#define SWIGTYPE_p_svn_stream_t swig_types[147] +#define SWIGTYPE_p_svn_string_t swig_types[148] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[149] +#define SWIGTYPE_p_svn_tristate_t swig_types[150] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[151] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[152] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[153] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[154] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[155] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[156] +#define SWIGTYPE_p_svn_version_extended_t swig_types[157] +#define SWIGTYPE_p_svn_version_t swig_types[158] +#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[159] +#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[160] +#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[161] +#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[162] +#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[163] +#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[164] +#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[165] +#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[166] +#define SWIGTYPE_p_svn_wc_context_t swig_types[167] +#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[168] +#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[169] +#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[170] +#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[171] +#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[172] +#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[173] +#define SWIGTYPE_p_svn_wc_entry_t swig_types[174] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[175] +#define SWIGTYPE_p_svn_wc_external_item_t swig_types[176] +#define SWIGTYPE_p_svn_wc_info_t swig_types[177] +#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[178] +#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[179] +#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[180] +#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[181] +#define SWIGTYPE_p_svn_wc_notify_t swig_types[182] +#define SWIGTYPE_p_svn_wc_operation_t swig_types[183] +#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[184] +#define SWIGTYPE_p_svn_wc_schedule_t swig_types[185] +#define SWIGTYPE_p_svn_wc_status2_t swig_types[186] +#define SWIGTYPE_p_svn_wc_status3_t swig_types[187] +#define SWIGTYPE_p_svn_wc_status_t swig_types[188] +#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[189] +#define SWIGTYPE_p_unsigned_long swig_types[190] +#define SWIGTYPE_p_void swig_types[191] +static swig_type_info *swig_types[193]; +static swig_module_info swig_module = {swig_types, 192, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2124,6 +2135,11 @@ static svn_error_t * svn_client_invoke_get_commit_log( return _obj(log_msg, tmp_file, commit_items, baton, pool); } +static svn_error_t * svn_client_invoke_blame_receiver4( + svn_client_blame_receiver4_t _obj, void *baton, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, const svn_string_t *line, svn_boolean_t local_change, apr_pool_t *pool) { + return _obj(baton, line_no, revision, rev_props, merged_revision, merged_rev_props, merged_path, line, local_change, pool); +} + static svn_error_t * svn_client_invoke_blame_receiver3( svn_client_blame_receiver3_t _obj, void *baton, svn_revnum_t start_revnum, svn_revnum_t end_revnum, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, const char *line, svn_boolean_t local_change, apr_pool_t *pool) { return _obj(baton, start_revnum, end_revnum, line_no, revision, rev_props, merged_revision, merged_rev_props, merged_path, line, local_change, pool); @@ -2144,6 +2160,11 @@ static svn_error_t * svn_client_invoke_diff_summarize_func( return _obj(diff, baton, pool); } +static svn_error_t * svn_client_invoke__layout_func( + svn_client__layout_func_t _obj, void *layout_baton, const char *local_abspath, const char *repos_root_url, svn_boolean_t not_present, svn_boolean_t url_changed, const char *url, svn_boolean_t revision_changed, svn_revnum_t revision, svn_boolean_t depth_changed, svn_depth_t depth, apr_pool_t *scratch_pool) { + return _obj(layout_baton, local_abspath, repos_root_url, not_present, url_changed, url, revision_changed, revision, depth_changed, depth, scratch_pool); +} + static svn_error_t * svn_client_invoke_import_filter_func( svn_client_import_filter_func_t _obj, void *baton, svn_boolean_t *filtered, const char *local_abspath, const svn_io_dirent2_t *dirent, apr_pool_t *scratch_pool) { return _obj(baton, filtered, local_abspath, dirent, scratch_pool); @@ -9217,6 +9238,95 @@ XS(_wrap_svn_client_switch) { + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__layout_list) { + { + char *arg1 = (char *) 0 ; + svn_client__layout_func_t arg2 = (svn_client__layout_func_t) 0 ; + void *arg3 = (void *) 0 ; + svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + int res3 ; + void *argp4 = 0 ; + int res4 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 4) || (items > 5)) { + SWIG_croak("Usage: svn_client__layout_list(local_abspath,layout,layout_baton,ctx,scratch_pool);"); + } + res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__layout_list" "', argument " "1"" of type '" "char const *""'"); + } + arg1 = (char *)(buf1); + { + int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client__layout_list" "', argument " "2"" of type '" "svn_client__layout_func_t""'"); + } + } + res3 = SWIG_ConvertPtr(ST(2),SWIG_as_voidptrptr(&arg3), 0, 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client__layout_list" "', argument " "3"" of type '" "void *""'"); + } + res4 = SWIG_ConvertPtr(ST(3), &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client__layout_list" "', argument " "4"" of type '" "svn_client_ctx_t *""'"); + } + arg4 = (svn_client_ctx_t *)(argp4); + if (items > 4) { + + } + { + result = (svn_error_t *)svn_client__layout_list((char const *)arg1,arg2,arg3,arg4,arg5); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + + + + + XSRETURN(argvi); + fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + + + + SWIG_croak_null(); } } @@ -15806,112 +15916,120 @@ XS(_wrap_svn_client_log) { } -XS(_wrap_svn_client_blame5) { +XS(_wrap_svn_client_blame6) { { - char *arg1 = (char *) 0 ; - svn_opt_revision_t *arg2 = (svn_opt_revision_t *) 0 ; - svn_opt_revision_t *arg3 = (svn_opt_revision_t *) 0 ; + svn_revnum_t *arg1 = (svn_revnum_t *) 0 ; + svn_revnum_t *arg2 = (svn_revnum_t *) 0 ; + char *arg3 = (char *) 0 ; svn_opt_revision_t *arg4 = (svn_opt_revision_t *) 0 ; - svn_diff_file_options_t *arg5 = (svn_diff_file_options_t *) 0 ; - svn_boolean_t arg6 ; - svn_boolean_t arg7 ; - svn_client_blame_receiver3_t arg8 = (svn_client_blame_receiver3_t) 0 ; - void *arg9 = (void *) 0 ; - svn_client_ctx_t *arg10 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg11 = (apr_pool_t *) 0 ; + svn_opt_revision_t *arg5 = (svn_opt_revision_t *) 0 ; + svn_opt_revision_t *arg6 = (svn_opt_revision_t *) 0 ; + svn_diff_file_options_t *arg7 = (svn_diff_file_options_t *) 0 ; + svn_boolean_t arg8 ; + svn_boolean_t arg9 ; + svn_client_blame_receiver4_t arg10 = (svn_client_blame_receiver4_t) 0 ; + void *arg11 = (void *) 0 ; + svn_client_ctx_t *arg12 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg13 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; - svn_opt_revision_t rev2 ; - svn_opt_revision_t rev3 ; + svn_revnum_t temp1 ; + int res1 = SWIG_TMPOBJ ; + svn_revnum_t temp2 ; + int res2 = SWIG_TMPOBJ ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; svn_opt_revision_t rev4 ; - void *argp5 = 0 ; - int res5 = 0 ; - int val6 ; - int ecode6 = 0 ; - int val7 ; - int ecode7 = 0 ; - int res9 ; - void *argp10 = 0 ; - int res10 = 0 ; + svn_opt_revision_t rev5 ; + svn_opt_revision_t rev6 ; + void *argp7 = 0 ; + int res7 = 0 ; + int val8 ; + int ecode8 = 0 ; + int val9 ; + int ecode9 = 0 ; + int res11 ; + void *argp12 = 0 ; + int res12 = 0 ; int argvi = 0; svn_error_t *result = 0 ; dXSARGS; { - _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1)); + _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1)); SPAGAIN; } + arg1 = &temp1; + arg2 = &temp2; if ((items < 10) || (items > 11)) { - SWIG_croak("Usage: svn_client_blame5(path_or_url,peg_revision,start,end,diff_options,ignore_mime_type,include_merged_revisions,receiver,receiver_baton,ctx,pool);"); + SWIG_croak("Usage: svn_client_blame6(path_or_url,peg_revision,start,end,diff_options,ignore_mime_type,include_merged_revisions,receiver,receiver_baton,ctx,pool);"); } - res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_blame5" "', argument " "1"" of type '" "char const *""'"); + res3 = SWIG_AsCharPtrAndSize(ST(0), &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client_blame6" "', argument " "3"" of type '" "char const *""'"); } - arg1 = (char *)(buf1); + arg3 = (char *)(buf3); { if (_global_pool == NULL) { _global_pool = svn_swig_pl_make_pool((SV *)NULL); SPAGAIN; } - arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool); + arg4 = svn_swig_pl_set_revision(&rev4, ST(1), TRUE, _global_pool); } { if (_global_pool == NULL) { _global_pool = svn_swig_pl_make_pool((SV *)NULL); SPAGAIN; } - arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool); + arg5 = svn_swig_pl_set_revision(&rev5, ST(2), TRUE, _global_pool); } { if (_global_pool == NULL) { _global_pool = svn_swig_pl_make_pool((SV *)NULL); SPAGAIN; } - arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool); + arg6 = svn_swig_pl_set_revision(&rev6, ST(3), TRUE, _global_pool); } - res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_svn_diff_file_options_t, 0 | 0 ); - if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_client_blame5" "', argument " "5"" of type '" "svn_diff_file_options_t const *""'"); + res7 = SWIG_ConvertPtr(ST(4), &argp7,SWIGTYPE_p_svn_diff_file_options_t, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_client_blame6" "', argument " "7"" of type '" "svn_diff_file_options_t const *""'"); } - arg5 = (svn_diff_file_options_t *)(argp5); - ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6); - if (!SWIG_IsOK(ecode6)) { - SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_client_blame5" "', argument " "6"" of type '" "svn_boolean_t""'"); + arg7 = (svn_diff_file_options_t *)(argp7); + ecode8 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val8); + if (!SWIG_IsOK(ecode8)) { + SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "svn_client_blame6" "', argument " "8"" of type '" "svn_boolean_t""'"); } - arg6 = (svn_boolean_t)(val6); - ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val7); - if (!SWIG_IsOK(ecode7)) { - SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_client_blame5" "', argument " "7"" of type '" "svn_boolean_t""'"); + arg8 = (svn_boolean_t)(val8); + ecode9 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val9); + if (!SWIG_IsOK(ecode9)) { + SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "svn_client_blame6" "', argument " "9"" of type '" "svn_boolean_t""'"); } - arg7 = (svn_boolean_t)(val7); + arg9 = (svn_boolean_t)(val9); { - int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg8), SWIGTYPE_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t); + int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg10), SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t); if (!SWIG_IsOK(res)) { - SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client_blame5" "', argument " "8"" of type '" "svn_client_blame_receiver3_t""'"); + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client_blame6" "', argument " "10"" of type '" "svn_client_blame_receiver4_t""'"); } } - res9 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg9), 0, 0); - if (!SWIG_IsOK(res9)) { - SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_client_blame5" "', argument " "9"" of type '" "void *""'"); + res11 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg11), 0, 0); + if (!SWIG_IsOK(res11)) { + SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_client_blame6" "', argument " "11"" of type '" "void *""'"); } - res10 = SWIG_ConvertPtr(ST(9), &argp10,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res10)) { - SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_client_blame5" "', argument " "10"" of type '" "svn_client_ctx_t *""'"); + res12 = SWIG_ConvertPtr(ST(9), &argp12,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res12)) { + SWIG_exception_fail(SWIG_ArgError(res12), "in method '" "svn_client_blame6" "', argument " "12"" of type '" "svn_client_ctx_t *""'"); } - arg10 = (svn_client_ctx_t *)(argp10); + arg12 = (svn_client_ctx_t *)(argp12); if (items > 10) { } { - if (!arg2) { + if (!arg4) { SWIG_exception(SWIG_ValueError,"Received a NULL pointer."); } } { - result = (svn_error_t *)svn_client_blame5((char const *)arg1,(struct svn_opt_revision_t const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_diff_file_options_t const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11); + result = (svn_error_t *)svn_client_blame6(arg1,arg2,(char const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_opt_revision_t const *)arg5,(struct svn_opt_revision_t const *)arg6,(struct svn_diff_file_options_t const *)arg7,arg8,arg9,arg10,arg11,arg12,arg13); @@ -15934,7 +16052,21 @@ XS(_wrap_svn_client_blame5) { } } } - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + if (SWIG_IsTmpObj(res1)) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_From_long SWIG_PERL_CALL_ARGS_1((*arg1)); argvi++ ; + } else { + int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN | 0) : 0; + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_long, new_flags); argvi++ ; + } + if (SWIG_IsTmpObj(res2)) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_From_long SWIG_PERL_CALL_ARGS_1((*arg2)); argvi++ ; + } else { + int new_flags = SWIG_IsNewObj(res2) ? (SWIG_POINTER_OWN | 0) : 0; + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_long, new_flags); argvi++ ; + } + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); @@ -15947,7 +16079,9 @@ XS(_wrap_svn_client_blame5) { XSRETURN(argvi); fail: - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); @@ -15963,7 +16097,7 @@ XS(_wrap_svn_client_blame5) { } -XS(_wrap_svn_client_blame4) { +XS(_wrap_svn_client_blame5) { { char *arg1 = (char *) 0 ; svn_opt_revision_t *arg2 = (svn_opt_revision_t *) 0 ; @@ -15972,7 +16106,7 @@ XS(_wrap_svn_client_blame4) { svn_diff_file_options_t *arg5 = (svn_diff_file_options_t *) 0 ; svn_boolean_t arg6 ; svn_boolean_t arg7 ; - svn_client_blame_receiver2_t arg8 = (svn_client_blame_receiver2_t) 0 ; + svn_client_blame_receiver3_t arg8 = (svn_client_blame_receiver3_t) 0 ; void *arg9 = (void *) 0 ; svn_client_ctx_t *arg10 = (svn_client_ctx_t *) 0 ; apr_pool_t *arg11 = (apr_pool_t *) 0 ; @@ -16001,11 +16135,11 @@ XS(_wrap_svn_client_blame4) { SPAGAIN; } if ((items < 10) || (items > 11)) { - SWIG_croak("Usage: svn_client_blame4(path_or_url,peg_revision,start,end,diff_options,ignore_mime_type,include_merged_revisions,receiver,receiver_baton,ctx,pool);"); + SWIG_croak("Usage: svn_client_blame5(path_or_url,peg_revision,start,end,diff_options,ignore_mime_type,include_merged_revisions,receiver,receiver_baton,ctx,pool);"); } res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_blame4" "', argument " "1"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_blame5" "', argument " "1"" of type '" "char const *""'"); } arg1 = (char *)(buf1); { @@ -16031,32 +16165,32 @@ XS(_wrap_svn_client_blame4) { } res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_svn_diff_file_options_t, 0 | 0 ); if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_client_blame4" "', argument " "5"" of type '" "svn_diff_file_options_t const *""'"); + SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_client_blame5" "', argument " "5"" of type '" "svn_diff_file_options_t const *""'"); } arg5 = (svn_diff_file_options_t *)(argp5); ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6); if (!SWIG_IsOK(ecode6)) { - SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_client_blame4" "', argument " "6"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_client_blame5" "', argument " "6"" of type '" "svn_boolean_t""'"); } arg6 = (svn_boolean_t)(val6); ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val7); if (!SWIG_IsOK(ecode7)) { - SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_client_blame4" "', argument " "7"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_client_blame5" "', argument " "7"" of type '" "svn_boolean_t""'"); } arg7 = (svn_boolean_t)(val7); { - int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg8), SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t); + int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg8), SWIGTYPE_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t); if (!SWIG_IsOK(res)) { - SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client_blame4" "', argument " "8"" of type '" "svn_client_blame_receiver2_t""'"); + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client_blame5" "', argument " "8"" of type '" "svn_client_blame_receiver3_t""'"); } } res9 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg9), 0, 0); if (!SWIG_IsOK(res9)) { - SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_client_blame4" "', argument " "9"" of type '" "void *""'"); + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_client_blame5" "', argument " "9"" of type '" "void *""'"); } res10 = SWIG_ConvertPtr(ST(9), &argp10,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); if (!SWIG_IsOK(res10)) { - SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_client_blame4" "', argument " "10"" of type '" "svn_client_ctx_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_client_blame5" "', argument " "10"" of type '" "svn_client_ctx_t *""'"); } arg10 = (svn_client_ctx_t *)(argp10); if (items > 10) { @@ -16068,7 +16202,7 @@ XS(_wrap_svn_client_blame4) { } } { - result = (svn_error_t *)svn_client_blame4((char const *)arg1,(struct svn_opt_revision_t const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_diff_file_options_t const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11); + result = (svn_error_t *)svn_client_blame5((char const *)arg1,(struct svn_opt_revision_t const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_diff_file_options_t const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11); @@ -16120,7 +16254,7 @@ XS(_wrap_svn_client_blame4) { } -XS(_wrap_svn_client_blame3) { +XS(_wrap_svn_client_blame4) { { char *arg1 = (char *) 0 ; svn_opt_revision_t *arg2 = (svn_opt_revision_t *) 0 ; @@ -16128,10 +16262,11 @@ XS(_wrap_svn_client_blame3) { svn_opt_revision_t *arg4 = (svn_opt_revision_t *) 0 ; svn_diff_file_options_t *arg5 = (svn_diff_file_options_t *) 0 ; svn_boolean_t arg6 ; - svn_client_blame_receiver_t arg7 = (svn_client_blame_receiver_t) 0 ; - void *arg8 = (void *) 0 ; - svn_client_ctx_t *arg9 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg10 = (apr_pool_t *) 0 ; + svn_boolean_t arg7 ; + svn_client_blame_receiver2_t arg8 = (svn_client_blame_receiver2_t) 0 ; + void *arg9 = (void *) 0 ; + svn_client_ctx_t *arg10 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg11 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool ; int res1 ; char *buf1 = 0 ; @@ -16143,22 +16278,178 @@ XS(_wrap_svn_client_blame3) { int res5 = 0 ; int val6 ; int ecode6 = 0 ; - void *argp9 = 0 ; - int res9 = 0 ; + int val7 ; + int ecode7 = 0 ; + int res9 ; + void *argp10 = 0 ; + int res10 = 0 ; int argvi = 0; svn_error_t *result = 0 ; dXSARGS; { - _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1)); + _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1)); SPAGAIN; } - if ((items < 8) || (items > 9)) { - SWIG_croak("Usage: svn_client_blame3(path_or_url,peg_revision,start,end,diff_options,ignore_mime_type,receiver,receiver_baton,ctx,pool);"); + if ((items < 10) || (items > 11)) { + SWIG_croak("Usage: svn_client_blame4(path_or_url,peg_revision,start,end,diff_options,ignore_mime_type,include_merged_revisions,receiver,receiver_baton,ctx,pool);"); } res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_blame3" "', argument " "1"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_blame4" "', argument " "1"" of type '" "char const *""'"); + } + arg1 = (char *)(buf1); + { + if (_global_pool == NULL) { + _global_pool = svn_swig_pl_make_pool((SV *)NULL); + SPAGAIN; + } + arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool); + } + { + if (_global_pool == NULL) { + _global_pool = svn_swig_pl_make_pool((SV *)NULL); + SPAGAIN; + } + arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool); + } + { + if (_global_pool == NULL) { + _global_pool = svn_swig_pl_make_pool((SV *)NULL); + SPAGAIN; + } + arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool); + } + res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_svn_diff_file_options_t, 0 | 0 ); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_client_blame4" "', argument " "5"" of type '" "svn_diff_file_options_t const *""'"); + } + arg5 = (svn_diff_file_options_t *)(argp5); + ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_client_blame4" "', argument " "6"" of type '" "svn_boolean_t""'"); + } + arg6 = (svn_boolean_t)(val6); + ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_client_blame4" "', argument " "7"" of type '" "svn_boolean_t""'"); + } + arg7 = (svn_boolean_t)(val7); + { + int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg8), SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client_blame4" "', argument " "8"" of type '" "svn_client_blame_receiver2_t""'"); + } + } + res9 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg9), 0, 0); + if (!SWIG_IsOK(res9)) { + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_client_blame4" "', argument " "9"" of type '" "void *""'"); + } + res10 = SWIG_ConvertPtr(ST(9), &argp10,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res10)) { + SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_client_blame4" "', argument " "10"" of type '" "svn_client_ctx_t *""'"); + } + arg10 = (svn_client_ctx_t *)(argp10); + if (items > 10) { + + } + { + if (!arg2) { + SWIG_exception(SWIG_ValueError,"Received a NULL pointer."); + } + } + { + result = (svn_error_t *)svn_client_blame4((char const *)arg1,(struct svn_opt_revision_t const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_diff_file_options_t const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + + + + + + + + + + + XSRETURN(argvi); + fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + + + + + + + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client_blame3) { + { + char *arg1 = (char *) 0 ; + svn_opt_revision_t *arg2 = (svn_opt_revision_t *) 0 ; + svn_opt_revision_t *arg3 = (svn_opt_revision_t *) 0 ; + svn_opt_revision_t *arg4 = (svn_opt_revision_t *) 0 ; + svn_diff_file_options_t *arg5 = (svn_diff_file_options_t *) 0 ; + svn_boolean_t arg6 ; + svn_client_blame_receiver_t arg7 = (svn_client_blame_receiver_t) 0 ; + void *arg8 = (void *) 0 ; + svn_client_ctx_t *arg9 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg10 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + svn_opt_revision_t rev2 ; + svn_opt_revision_t rev3 ; + svn_opt_revision_t rev4 ; + void *argp5 = 0 ; + int res5 = 0 ; + int val6 ; + int ecode6 = 0 ; + void *argp9 = 0 ; + int res9 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 8) || (items > 9)) { + SWIG_croak("Usage: svn_client_blame3(path_or_url,peg_revision,start,end,diff_options,ignore_mime_type,receiver,receiver_baton,ctx,pool);"); + } + res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_blame3" "', argument " "1"" of type '" "char const *""'"); } arg1 = (char *)(buf1); { @@ -16472,7 +16763,7 @@ XS(_wrap_svn_client_blame) { } -XS(_wrap_svn_client_diff6) { +XS(_wrap_svn_client_diff7) { { apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; char *arg2 = (char *) 0 ; @@ -16489,12 +16780,13 @@ XS(_wrap_svn_client_diff6) { svn_boolean_t arg13 ; svn_boolean_t arg14 ; svn_boolean_t arg15 ; - char *arg16 = (char *) 0 ; - svn_stream_t *arg17 = (svn_stream_t *) 0 ; + svn_boolean_t arg16 ; + char *arg17 = (char *) 0 ; svn_stream_t *arg18 = (svn_stream_t *) 0 ; - apr_array_header_t *arg19 = (apr_array_header_t *) 0 ; - svn_client_ctx_t *arg20 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg21 = (apr_pool_t *) 0 ; + svn_stream_t *arg19 = (svn_stream_t *) 0 ; + apr_array_header_t *arg20 = (apr_array_header_t *) 0 ; + svn_client_ctx_t *arg21 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg22 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool ; int res2 ; char *buf2 = 0 ; @@ -16525,21 +16817,23 @@ XS(_wrap_svn_client_diff6) { int ecode14 = 0 ; int val15 ; int ecode15 = 0 ; - int res16 ; - char *buf16 = 0 ; - int alloc16 = 0 ; - void *argp20 = 0 ; - int res20 = 0 ; + int val16 ; + int ecode16 = 0 ; + int res17 ; + char *buf17 = 0 ; + int alloc17 = 0 ; + void *argp21 = 0 ; + int res21 = 0 ; int argvi = 0; svn_error_t *result = 0 ; dXSARGS; { - _global_pool = arg21 = svn_swig_pl_make_pool (ST(items-1)); + _global_pool = arg22 = svn_swig_pl_make_pool (ST(items-1)); SPAGAIN; } - if ((items < 20) || (items > 21)) { - SWIG_croak("Usage: svn_client_diff6(diff_options,path_or_url1,revision1,path_or_url2,revision2,relative_to_dir,depth,ignore_ancestry,no_diff_added,no_diff_deleted,show_copies_as_adds,ignore_content_type,ignore_properties,properties_only,use_git_diff_format,header_encoding,outstream,errstream,changelists,ctx,pool);"); + if ((items < 21) || (items > 22)) { + SWIG_croak("Usage: svn_client_diff7(diff_options,path_or_url1,revision1,path_or_url2,revision2,relative_to_dir,depth,ignore_ancestry,no_diff_added,no_diff_deleted,show_copies_as_adds,ignore_content_type,ignore_properties,properties_only,use_git_diff_format,pretty_print_mergeinfo,header_encoding,outstream,errstream,changelists,ctx,pool);"); } { arg1 = svn_swig_pl_strings_to_array(ST(0), @@ -16547,7 +16841,7 @@ XS(_wrap_svn_client_diff6) { } res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_diff6" "', argument " "2"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_diff7" "', argument " "2"" of type '" "char const *""'"); } arg2 = (char *)(buf2); { @@ -16559,7 +16853,7 @@ XS(_wrap_svn_client_diff6) { } res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4); if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client_diff6" "', argument " "4"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client_diff7" "', argument " "4"" of type '" "char const *""'"); } arg4 = (char *)(buf4); { @@ -16571,81 +16865,86 @@ XS(_wrap_svn_client_diff6) { } res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6); if (!SWIG_IsOK(res6)) { - SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_client_diff6" "', argument " "6"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_client_diff7" "', argument " "6"" of type '" "char const *""'"); } arg6 = (char *)(buf6); ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val7); if (!SWIG_IsOK(ecode7)) { - SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_client_diff6" "', argument " "7"" of type '" "svn_depth_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_client_diff7" "', argument " "7"" of type '" "svn_depth_t""'"); } arg7 = (svn_depth_t)(val7); ecode8 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(7), &val8); if (!SWIG_IsOK(ecode8)) { - SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "svn_client_diff6" "', argument " "8"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "svn_client_diff7" "', argument " "8"" of type '" "svn_boolean_t""'"); } arg8 = (svn_boolean_t)(val8); ecode9 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(8), &val9); if (!SWIG_IsOK(ecode9)) { - SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "svn_client_diff6" "', argument " "9"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "svn_client_diff7" "', argument " "9"" of type '" "svn_boolean_t""'"); } arg9 = (svn_boolean_t)(val9); ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(9), &val10); if (!SWIG_IsOK(ecode10)) { - SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_client_diff6" "', argument " "10"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_client_diff7" "', argument " "10"" of type '" "svn_boolean_t""'"); } arg10 = (svn_boolean_t)(val10); ecode11 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(10), &val11); if (!SWIG_IsOK(ecode11)) { - SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "svn_client_diff6" "', argument " "11"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "svn_client_diff7" "', argument " "11"" of type '" "svn_boolean_t""'"); } arg11 = (svn_boolean_t)(val11); ecode12 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(11), &val12); if (!SWIG_IsOK(ecode12)) { - SWIG_exception_fail(SWIG_ArgError(ecode12), "in method '" "svn_client_diff6" "', argument " "12"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode12), "in method '" "svn_client_diff7" "', argument " "12"" of type '" "svn_boolean_t""'"); } arg12 = (svn_boolean_t)(val12); ecode13 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(12), &val13); if (!SWIG_IsOK(ecode13)) { - SWIG_exception_fail(SWIG_ArgError(ecode13), "in method '" "svn_client_diff6" "', argument " "13"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode13), "in method '" "svn_client_diff7" "', argument " "13"" of type '" "svn_boolean_t""'"); } arg13 = (svn_boolean_t)(val13); ecode14 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(13), &val14); if (!SWIG_IsOK(ecode14)) { - SWIG_exception_fail(SWIG_ArgError(ecode14), "in method '" "svn_client_diff6" "', argument " "14"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode14), "in method '" "svn_client_diff7" "', argument " "14"" of type '" "svn_boolean_t""'"); } arg14 = (svn_boolean_t)(val14); ecode15 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(14), &val15); if (!SWIG_IsOK(ecode15)) { - SWIG_exception_fail(SWIG_ArgError(ecode15), "in method '" "svn_client_diff6" "', argument " "15"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode15), "in method '" "svn_client_diff7" "', argument " "15"" of type '" "svn_boolean_t""'"); } arg15 = (svn_boolean_t)(val15); - res16 = SWIG_AsCharPtrAndSize(ST(15), &buf16, NULL, &alloc16); - if (!SWIG_IsOK(res16)) { - SWIG_exception_fail(SWIG_ArgError(res16), "in method '" "svn_client_diff6" "', argument " "16"" of type '" "char const *""'"); + ecode16 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(15), &val16); + if (!SWIG_IsOK(ecode16)) { + SWIG_exception_fail(SWIG_ArgError(ecode16), "in method '" "svn_client_diff7" "', argument " "16"" of type '" "svn_boolean_t""'"); + } + arg16 = (svn_boolean_t)(val16); + res17 = SWIG_AsCharPtrAndSize(ST(16), &buf17, NULL, &alloc17); + if (!SWIG_IsOK(res17)) { + SWIG_exception_fail(SWIG_ArgError(res17), "in method '" "svn_client_diff7" "', argument " "17"" of type '" "char const *""'"); } - arg16 = (char *)(buf16); + arg17 = (char *)(buf17); { - svn_swig_pl_make_stream (&arg17, ST(16)); + svn_swig_pl_make_stream (&arg18, ST(17)); SPAGAIN; } { - svn_swig_pl_make_stream (&arg18, ST(17)); + svn_swig_pl_make_stream (&arg19, ST(18)); SPAGAIN; } { - arg19 = SvOK(ST(18)) ? svn_swig_pl_strings_to_array( - ST(18), _global_pool) : NULL; + arg20 = SvOK(ST(19)) ? svn_swig_pl_strings_to_array( + ST(19), _global_pool) : NULL; } - res20 = SWIG_ConvertPtr(ST(19), &argp20,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res20)) { - SWIG_exception_fail(SWIG_ArgError(res20), "in method '" "svn_client_diff6" "', argument " "20"" of type '" "svn_client_ctx_t *""'"); + res21 = SWIG_ConvertPtr(ST(20), &argp21,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res21)) { + SWIG_exception_fail(SWIG_ArgError(res21), "in method '" "svn_client_diff7" "', argument " "21"" of type '" "svn_client_ctx_t *""'"); } - arg20 = (svn_client_ctx_t *)(argp20); - if (items > 20) { + arg21 = (svn_client_ctx_t *)(argp21); + if (items > 21) { } { - result = (svn_error_t *)svn_client_diff6((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(char const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,(char const *)arg16,arg17,arg18,(apr_array_header_t const *)arg19,arg20,arg21); + result = (svn_error_t *)svn_client_diff7((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(char const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,arg16,(char const *)arg17,arg18,arg19,(apr_array_header_t const *)arg20,arg21,arg22); @@ -16683,7 +16982,8 @@ XS(_wrap_svn_client_diff6) { - if (alloc16 == SWIG_NEWOBJ) free((char*)buf16); + + if (alloc17 == SWIG_NEWOBJ) free((char*)buf17); @@ -16706,7 +17006,8 @@ XS(_wrap_svn_client_diff6) { - if (alloc16 == SWIG_NEWOBJ) free((char*)buf16); + + if (alloc17 == SWIG_NEWOBJ) free((char*)buf17); @@ -16717,7 +17018,7 @@ XS(_wrap_svn_client_diff6) { } -XS(_wrap_svn_client_diff5) { +XS(_wrap_svn_client_diff6) { { apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; char *arg2 = (char *) 0 ; @@ -16731,12 +17032,15 @@ XS(_wrap_svn_client_diff5) { svn_boolean_t arg10 ; svn_boolean_t arg11 ; svn_boolean_t arg12 ; - char *arg13 = (char *) 0 ; - apr_file_t *arg14 = (apr_file_t *) 0 ; - apr_file_t *arg15 = (apr_file_t *) 0 ; - apr_array_header_t *arg16 = (apr_array_header_t *) 0 ; - svn_client_ctx_t *arg17 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg18 = (apr_pool_t *) 0 ; + svn_boolean_t arg13 ; + svn_boolean_t arg14 ; + svn_boolean_t arg15 ; + char *arg16 = (char *) 0 ; + svn_stream_t *arg17 = (svn_stream_t *) 0 ; + svn_stream_t *arg18 = (svn_stream_t *) 0 ; + apr_array_header_t *arg19 = (apr_array_header_t *) 0 ; + svn_client_ctx_t *arg20 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg21 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool ; int res2 ; char *buf2 = 0 ; @@ -16761,21 +17065,27 @@ XS(_wrap_svn_client_diff5) { int ecode11 = 0 ; int val12 ; int ecode12 = 0 ; - int res13 ; - char *buf13 = 0 ; - int alloc13 = 0 ; - void *argp17 = 0 ; - int res17 = 0 ; + int val13 ; + int ecode13 = 0 ; + int val14 ; + int ecode14 = 0 ; + int val15 ; + int ecode15 = 0 ; + int res16 ; + char *buf16 = 0 ; + int alloc16 = 0 ; + void *argp20 = 0 ; + int res20 = 0 ; int argvi = 0; svn_error_t *result = 0 ; dXSARGS; { - _global_pool = arg18 = svn_swig_pl_make_pool (ST(items-1)); + _global_pool = arg21 = svn_swig_pl_make_pool (ST(items-1)); SPAGAIN; } - if ((items < 17) || (items > 18)) { - SWIG_croak("Usage: svn_client_diff5(diff_options,path1,revision1,path2,revision2,relative_to_dir,depth,ignore_ancestry,no_diff_deleted,show_copies_as_adds,ignore_content_type,use_git_diff_format,header_encoding,outfile,errfile,changelists,ctx,pool);"); + if ((items < 20) || (items > 21)) { + SWIG_croak("Usage: svn_client_diff6(diff_options,path_or_url1,revision1,path_or_url2,revision2,relative_to_dir,depth,ignore_ancestry,no_diff_added,no_diff_deleted,show_copies_as_adds,ignore_content_type,ignore_properties,properties_only,use_git_diff_format,header_encoding,outstream,errstream,changelists,ctx,pool);"); } { arg1 = svn_swig_pl_strings_to_array(ST(0), @@ -16783,7 +17093,7 @@ XS(_wrap_svn_client_diff5) { } res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_diff5" "', argument " "2"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_diff6" "', argument " "2"" of type '" "char const *""'"); } arg2 = (char *)(buf2); { @@ -16795,7 +17105,7 @@ XS(_wrap_svn_client_diff5) { } res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4); if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client_diff5" "', argument " "4"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client_diff6" "', argument " "4"" of type '" "char const *""'"); } arg4 = (char *)(buf4); { @@ -16807,64 +17117,300 @@ XS(_wrap_svn_client_diff5) { } res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6); if (!SWIG_IsOK(res6)) { - SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_client_diff5" "', argument " "6"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_client_diff6" "', argument " "6"" of type '" "char const *""'"); } arg6 = (char *)(buf6); ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val7); if (!SWIG_IsOK(ecode7)) { - SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_client_diff5" "', argument " "7"" of type '" "svn_depth_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_client_diff6" "', argument " "7"" of type '" "svn_depth_t""'"); } arg7 = (svn_depth_t)(val7); ecode8 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(7), &val8); if (!SWIG_IsOK(ecode8)) { - SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "svn_client_diff5" "', argument " "8"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "svn_client_diff6" "', argument " "8"" of type '" "svn_boolean_t""'"); } arg8 = (svn_boolean_t)(val8); ecode9 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(8), &val9); if (!SWIG_IsOK(ecode9)) { - SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "svn_client_diff5" "', argument " "9"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "svn_client_diff6" "', argument " "9"" of type '" "svn_boolean_t""'"); } arg9 = (svn_boolean_t)(val9); ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(9), &val10); if (!SWIG_IsOK(ecode10)) { - SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_client_diff5" "', argument " "10"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_client_diff6" "', argument " "10"" of type '" "svn_boolean_t""'"); } arg10 = (svn_boolean_t)(val10); ecode11 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(10), &val11); if (!SWIG_IsOK(ecode11)) { - SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "svn_client_diff5" "', argument " "11"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "svn_client_diff6" "', argument " "11"" of type '" "svn_boolean_t""'"); } arg11 = (svn_boolean_t)(val11); ecode12 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(11), &val12); if (!SWIG_IsOK(ecode12)) { - SWIG_exception_fail(SWIG_ArgError(ecode12), "in method '" "svn_client_diff5" "', argument " "12"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode12), "in method '" "svn_client_diff6" "', argument " "12"" of type '" "svn_boolean_t""'"); } arg12 = (svn_boolean_t)(val12); - res13 = SWIG_AsCharPtrAndSize(ST(12), &buf13, NULL, &alloc13); - if (!SWIG_IsOK(res13)) { - SWIG_exception_fail(SWIG_ArgError(res13), "in method '" "svn_client_diff5" "', argument " "13"" of type '" "char const *""'"); + ecode13 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(12), &val13); + if (!SWIG_IsOK(ecode13)) { + SWIG_exception_fail(SWIG_ArgError(ecode13), "in method '" "svn_client_diff6" "', argument " "13"" of type '" "svn_boolean_t""'"); + } + arg13 = (svn_boolean_t)(val13); + ecode14 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(13), &val14); + if (!SWIG_IsOK(ecode14)) { + SWIG_exception_fail(SWIG_ArgError(ecode14), "in method '" "svn_client_diff6" "', argument " "14"" of type '" "svn_boolean_t""'"); + } + arg14 = (svn_boolean_t)(val14); + ecode15 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(14), &val15); + if (!SWIG_IsOK(ecode15)) { + SWIG_exception_fail(SWIG_ArgError(ecode15), "in method '" "svn_client_diff6" "', argument " "15"" of type '" "svn_boolean_t""'"); + } + arg15 = (svn_boolean_t)(val15); + res16 = SWIG_AsCharPtrAndSize(ST(15), &buf16, NULL, &alloc16); + if (!SWIG_IsOK(res16)) { + SWIG_exception_fail(SWIG_ArgError(res16), "in method '" "svn_client_diff6" "', argument " "16"" of type '" "char const *""'"); } - arg13 = (char *)(buf13); + arg16 = (char *)(buf16); { - arg14 = svn_swig_pl_make_file(ST(13), _global_pool); + svn_swig_pl_make_stream (&arg17, ST(16)); + SPAGAIN; } { - arg15 = svn_swig_pl_make_file(ST(14), _global_pool); + svn_swig_pl_make_stream (&arg18, ST(17)); + SPAGAIN; } { - arg16 = SvOK(ST(15)) ? svn_swig_pl_strings_to_array( - ST(15), _global_pool) : NULL; + arg19 = SvOK(ST(18)) ? svn_swig_pl_strings_to_array( + ST(18), _global_pool) : NULL; } - res17 = SWIG_ConvertPtr(ST(16), &argp17,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res17)) { - SWIG_exception_fail(SWIG_ArgError(res17), "in method '" "svn_client_diff5" "', argument " "17"" of type '" "svn_client_ctx_t *""'"); + res20 = SWIG_ConvertPtr(ST(19), &argp20,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res20)) { + SWIG_exception_fail(SWIG_ArgError(res20), "in method '" "svn_client_diff6" "', argument " "20"" of type '" "svn_client_ctx_t *""'"); } - arg17 = (svn_client_ctx_t *)(argp17); - if (items > 17) { + arg20 = (svn_client_ctx_t *)(argp20); + if (items > 20) { } { - result = (svn_error_t *)svn_client_diff5((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(char const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,(char const *)arg13,arg14,arg15,(apr_array_header_t const *)arg16,arg17,arg18); + result = (svn_error_t *)svn_client_diff6((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(char const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,(char const *)arg16,arg17,arg18,(apr_array_header_t const *)arg19,arg20,arg21); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + if (alloc4 == SWIG_NEWOBJ) free((char*)buf4); + + if (alloc6 == SWIG_NEWOBJ) free((char*)buf6); + + + + + + + + + + if (alloc16 == SWIG_NEWOBJ) free((char*)buf16); + + + + + + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + if (alloc4 == SWIG_NEWOBJ) free((char*)buf4); + + if (alloc6 == SWIG_NEWOBJ) free((char*)buf6); + + + + + + + + + + if (alloc16 == SWIG_NEWOBJ) free((char*)buf16); + + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client_diff5) { + { + apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_opt_revision_t *arg3 = (svn_opt_revision_t *) 0 ; + char *arg4 = (char *) 0 ; + svn_opt_revision_t *arg5 = (svn_opt_revision_t *) 0 ; + char *arg6 = (char *) 0 ; + svn_depth_t arg7 ; + svn_boolean_t arg8 ; + svn_boolean_t arg9 ; + svn_boolean_t arg10 ; + svn_boolean_t arg11 ; + svn_boolean_t arg12 ; + char *arg13 = (char *) 0 ; + apr_file_t *arg14 = (apr_file_t *) 0 ; + apr_file_t *arg15 = (apr_file_t *) 0 ; + apr_array_header_t *arg16 = (apr_array_header_t *) 0 ; + svn_client_ctx_t *arg17 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg18 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + svn_opt_revision_t rev3 ; + int res4 ; + char *buf4 = 0 ; + int alloc4 = 0 ; + svn_opt_revision_t rev5 ; + int res6 ; + char *buf6 = 0 ; + int alloc6 = 0 ; + int val7 ; + int ecode7 = 0 ; + int val8 ; + int ecode8 = 0 ; + int val9 ; + int ecode9 = 0 ; + int val10 ; + int ecode10 = 0 ; + int val11 ; + int ecode11 = 0 ; + int val12 ; + int ecode12 = 0 ; + int res13 ; + char *buf13 = 0 ; + int alloc13 = 0 ; + void *argp17 = 0 ; + int res17 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg18 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 17) || (items > 18)) { + SWIG_croak("Usage: svn_client_diff5(diff_options,path1,revision1,path2,revision2,relative_to_dir,depth,ignore_ancestry,no_diff_deleted,show_copies_as_adds,ignore_content_type,use_git_diff_format,header_encoding,outfile,errfile,changelists,ctx,pool);"); + } + { + arg1 = svn_swig_pl_strings_to_array(ST(0), + _global_pool); + } + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_diff5" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + { + if (_global_pool == NULL) { + _global_pool = svn_swig_pl_make_pool((SV *)NULL); + SPAGAIN; + } + arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool); + } + res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client_diff5" "', argument " "4"" of type '" "char const *""'"); + } + arg4 = (char *)(buf4); + { + if (_global_pool == NULL) { + _global_pool = svn_swig_pl_make_pool((SV *)NULL); + SPAGAIN; + } + arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool); + } + res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6); + if (!SWIG_IsOK(res6)) { + SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_client_diff5" "', argument " "6"" of type '" "char const *""'"); + } + arg6 = (char *)(buf6); + ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_client_diff5" "', argument " "7"" of type '" "svn_depth_t""'"); + } + arg7 = (svn_depth_t)(val7); + ecode8 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(7), &val8); + if (!SWIG_IsOK(ecode8)) { + SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "svn_client_diff5" "', argument " "8"" of type '" "svn_boolean_t""'"); + } + arg8 = (svn_boolean_t)(val8); + ecode9 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(8), &val9); + if (!SWIG_IsOK(ecode9)) { + SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "svn_client_diff5" "', argument " "9"" of type '" "svn_boolean_t""'"); + } + arg9 = (svn_boolean_t)(val9); + ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(9), &val10); + if (!SWIG_IsOK(ecode10)) { + SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_client_diff5" "', argument " "10"" of type '" "svn_boolean_t""'"); + } + arg10 = (svn_boolean_t)(val10); + ecode11 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(10), &val11); + if (!SWIG_IsOK(ecode11)) { + SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "svn_client_diff5" "', argument " "11"" of type '" "svn_boolean_t""'"); + } + arg11 = (svn_boolean_t)(val11); + ecode12 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(11), &val12); + if (!SWIG_IsOK(ecode12)) { + SWIG_exception_fail(SWIG_ArgError(ecode12), "in method '" "svn_client_diff5" "', argument " "12"" of type '" "svn_boolean_t""'"); + } + arg12 = (svn_boolean_t)(val12); + res13 = SWIG_AsCharPtrAndSize(ST(12), &buf13, NULL, &alloc13); + if (!SWIG_IsOK(res13)) { + SWIG_exception_fail(SWIG_ArgError(res13), "in method '" "svn_client_diff5" "', argument " "13"" of type '" "char const *""'"); + } + arg13 = (char *)(buf13); + { + arg14 = svn_swig_pl_make_file(ST(13), _global_pool); + } + { + arg15 = svn_swig_pl_make_file(ST(14), _global_pool); + } + { + arg16 = SvOK(ST(15)) ? svn_swig_pl_strings_to_array( + ST(15), _global_pool) : NULL; + } + res17 = SWIG_ConvertPtr(ST(16), &argp17,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res17)) { + SWIG_exception_fail(SWIG_ArgError(res17), "in method '" "svn_client_diff5" "', argument " "17"" of type '" "svn_client_ctx_t *""'"); + } + arg17 = (svn_client_ctx_t *)(argp17); + if (items > 17) { + + } + { + result = (svn_error_t *)svn_client_diff5((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(char const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,(char const *)arg13,arg14,arg15,(apr_array_header_t const *)arg16,arg17,arg18); @@ -17616,7 +18162,7 @@ XS(_wrap_svn_client_diff) { } -XS(_wrap_svn_client_diff_peg6) { +XS(_wrap_svn_client_diff_peg7) { { apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; char *arg2 = (char *) 0 ; @@ -17633,12 +18179,13 @@ XS(_wrap_svn_client_diff_peg6) { svn_boolean_t arg13 ; svn_boolean_t arg14 ; svn_boolean_t arg15 ; - char *arg16 = (char *) 0 ; - svn_stream_t *arg17 = (svn_stream_t *) 0 ; + svn_boolean_t arg16 ; + char *arg17 = (char *) 0 ; svn_stream_t *arg18 = (svn_stream_t *) 0 ; - apr_array_header_t *arg19 = (apr_array_header_t *) 0 ; - svn_client_ctx_t *arg20 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg21 = (apr_pool_t *) 0 ; + svn_stream_t *arg19 = (svn_stream_t *) 0 ; + apr_array_header_t *arg20 = (apr_array_header_t *) 0 ; + svn_client_ctx_t *arg21 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg22 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool ; int res2 ; char *buf2 = 0 ; @@ -17667,21 +18214,23 @@ XS(_wrap_svn_client_diff_peg6) { int ecode14 = 0 ; int val15 ; int ecode15 = 0 ; - int res16 ; - char *buf16 = 0 ; - int alloc16 = 0 ; - void *argp20 = 0 ; - int res20 = 0 ; + int val16 ; + int ecode16 = 0 ; + int res17 ; + char *buf17 = 0 ; + int alloc17 = 0 ; + void *argp21 = 0 ; + int res21 = 0 ; int argvi = 0; svn_error_t *result = 0 ; dXSARGS; { - _global_pool = arg21 = svn_swig_pl_make_pool (ST(items-1)); + _global_pool = arg22 = svn_swig_pl_make_pool (ST(items-1)); SPAGAIN; } - if ((items < 20) || (items > 21)) { - SWIG_croak("Usage: svn_client_diff_peg6(diff_options,path_or_url,peg_revision,start_revision,end_revision,relative_to_dir,depth,ignore_ancestry,no_diff_added,no_diff_deleted,show_copies_as_adds,ignore_content_type,ignore_properties,properties_only,use_git_diff_format,header_encoding,outstream,errstream,changelists,ctx,pool);"); + if ((items < 21) || (items > 22)) { + SWIG_croak("Usage: svn_client_diff_peg7(diff_options,path_or_url,peg_revision,start_revision,end_revision,relative_to_dir,depth,ignore_ancestry,no_diff_added,no_diff_deleted,show_copies_as_adds,ignore_content_type,ignore_properties,properties_only,use_git_diff_format,pretty_print_mergeinfo,header_encoding,outstream,errstream,changelists,ctx,pool);"); } { arg1 = svn_swig_pl_strings_to_array(ST(0), @@ -17689,7 +18238,7 @@ XS(_wrap_svn_client_diff_peg6) { } res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_diff_peg6" "', argument " "2"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_diff_peg7" "', argument " "2"" of type '" "char const *""'"); } arg2 = (char *)(buf2); { @@ -17715,77 +18264,82 @@ XS(_wrap_svn_client_diff_peg6) { } res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6); if (!SWIG_IsOK(res6)) { - SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_client_diff_peg6" "', argument " "6"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_client_diff_peg7" "', argument " "6"" of type '" "char const *""'"); } arg6 = (char *)(buf6); ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val7); if (!SWIG_IsOK(ecode7)) { - SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_client_diff_peg6" "', argument " "7"" of type '" "svn_depth_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_client_diff_peg7" "', argument " "7"" of type '" "svn_depth_t""'"); } arg7 = (svn_depth_t)(val7); ecode8 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(7), &val8); if (!SWIG_IsOK(ecode8)) { - SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "svn_client_diff_peg6" "', argument " "8"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "svn_client_diff_peg7" "', argument " "8"" of type '" "svn_boolean_t""'"); } arg8 = (svn_boolean_t)(val8); ecode9 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(8), &val9); if (!SWIG_IsOK(ecode9)) { - SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "svn_client_diff_peg6" "', argument " "9"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "svn_client_diff_peg7" "', argument " "9"" of type '" "svn_boolean_t""'"); } arg9 = (svn_boolean_t)(val9); ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(9), &val10); if (!SWIG_IsOK(ecode10)) { - SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_client_diff_peg6" "', argument " "10"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_client_diff_peg7" "', argument " "10"" of type '" "svn_boolean_t""'"); } arg10 = (svn_boolean_t)(val10); ecode11 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(10), &val11); if (!SWIG_IsOK(ecode11)) { - SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "svn_client_diff_peg6" "', argument " "11"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "svn_client_diff_peg7" "', argument " "11"" of type '" "svn_boolean_t""'"); } arg11 = (svn_boolean_t)(val11); ecode12 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(11), &val12); if (!SWIG_IsOK(ecode12)) { - SWIG_exception_fail(SWIG_ArgError(ecode12), "in method '" "svn_client_diff_peg6" "', argument " "12"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode12), "in method '" "svn_client_diff_peg7" "', argument " "12"" of type '" "svn_boolean_t""'"); } arg12 = (svn_boolean_t)(val12); ecode13 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(12), &val13); if (!SWIG_IsOK(ecode13)) { - SWIG_exception_fail(SWIG_ArgError(ecode13), "in method '" "svn_client_diff_peg6" "', argument " "13"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode13), "in method '" "svn_client_diff_peg7" "', argument " "13"" of type '" "svn_boolean_t""'"); } arg13 = (svn_boolean_t)(val13); ecode14 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(13), &val14); if (!SWIG_IsOK(ecode14)) { - SWIG_exception_fail(SWIG_ArgError(ecode14), "in method '" "svn_client_diff_peg6" "', argument " "14"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode14), "in method '" "svn_client_diff_peg7" "', argument " "14"" of type '" "svn_boolean_t""'"); } arg14 = (svn_boolean_t)(val14); ecode15 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(14), &val15); if (!SWIG_IsOK(ecode15)) { - SWIG_exception_fail(SWIG_ArgError(ecode15), "in method '" "svn_client_diff_peg6" "', argument " "15"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode15), "in method '" "svn_client_diff_peg7" "', argument " "15"" of type '" "svn_boolean_t""'"); } arg15 = (svn_boolean_t)(val15); - res16 = SWIG_AsCharPtrAndSize(ST(15), &buf16, NULL, &alloc16); - if (!SWIG_IsOK(res16)) { - SWIG_exception_fail(SWIG_ArgError(res16), "in method '" "svn_client_diff_peg6" "', argument " "16"" of type '" "char const *""'"); + ecode16 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(15), &val16); + if (!SWIG_IsOK(ecode16)) { + SWIG_exception_fail(SWIG_ArgError(ecode16), "in method '" "svn_client_diff_peg7" "', argument " "16"" of type '" "svn_boolean_t""'"); + } + arg16 = (svn_boolean_t)(val16); + res17 = SWIG_AsCharPtrAndSize(ST(16), &buf17, NULL, &alloc17); + if (!SWIG_IsOK(res17)) { + SWIG_exception_fail(SWIG_ArgError(res17), "in method '" "svn_client_diff_peg7" "', argument " "17"" of type '" "char const *""'"); } - arg16 = (char *)(buf16); + arg17 = (char *)(buf17); { - svn_swig_pl_make_stream (&arg17, ST(16)); + svn_swig_pl_make_stream (&arg18, ST(17)); SPAGAIN; } { - svn_swig_pl_make_stream (&arg18, ST(17)); + svn_swig_pl_make_stream (&arg19, ST(18)); SPAGAIN; } { - arg19 = SvOK(ST(18)) ? svn_swig_pl_strings_to_array( - ST(18), _global_pool) : NULL; + arg20 = SvOK(ST(19)) ? svn_swig_pl_strings_to_array( + ST(19), _global_pool) : NULL; } - res20 = SWIG_ConvertPtr(ST(19), &argp20,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res20)) { - SWIG_exception_fail(SWIG_ArgError(res20), "in method '" "svn_client_diff_peg6" "', argument " "20"" of type '" "svn_client_ctx_t *""'"); + res21 = SWIG_ConvertPtr(ST(20), &argp21,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res21)) { + SWIG_exception_fail(SWIG_ArgError(res21), "in method '" "svn_client_diff_peg7" "', argument " "21"" of type '" "svn_client_ctx_t *""'"); } - arg20 = (svn_client_ctx_t *)(argp20); - if (items > 20) { + arg21 = (svn_client_ctx_t *)(argp21); + if (items > 21) { } { @@ -17794,7 +18348,259 @@ XS(_wrap_svn_client_diff_peg6) { } } { - result = (svn_error_t *)svn_client_diff_peg6((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,(char const *)arg16,arg17,arg18,(apr_array_header_t const *)arg19,arg20,arg21); + result = (svn_error_t *)svn_client_diff_peg7((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,arg16,(char const *)arg17,arg18,arg19,(apr_array_header_t const *)arg20,arg21,arg22); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + + + if (alloc6 == SWIG_NEWOBJ) free((char*)buf6); + + + + + + + + + + + if (alloc17 == SWIG_NEWOBJ) free((char*)buf17); + + + + + + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + + + if (alloc6 == SWIG_NEWOBJ) free((char*)buf6); + + + + + + + + + + + if (alloc17 == SWIG_NEWOBJ) free((char*)buf17); + + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client_diff_peg6) { + { + apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_opt_revision_t *arg3 = (svn_opt_revision_t *) 0 ; + svn_opt_revision_t *arg4 = (svn_opt_revision_t *) 0 ; + svn_opt_revision_t *arg5 = (svn_opt_revision_t *) 0 ; + char *arg6 = (char *) 0 ; + svn_depth_t arg7 ; + svn_boolean_t arg8 ; + svn_boolean_t arg9 ; + svn_boolean_t arg10 ; + svn_boolean_t arg11 ; + svn_boolean_t arg12 ; + svn_boolean_t arg13 ; + svn_boolean_t arg14 ; + svn_boolean_t arg15 ; + char *arg16 = (char *) 0 ; + svn_stream_t *arg17 = (svn_stream_t *) 0 ; + svn_stream_t *arg18 = (svn_stream_t *) 0 ; + apr_array_header_t *arg19 = (apr_array_header_t *) 0 ; + svn_client_ctx_t *arg20 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg21 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + svn_opt_revision_t rev3 ; + svn_opt_revision_t rev4 ; + svn_opt_revision_t rev5 ; + int res6 ; + char *buf6 = 0 ; + int alloc6 = 0 ; + int val7 ; + int ecode7 = 0 ; + int val8 ; + int ecode8 = 0 ; + int val9 ; + int ecode9 = 0 ; + int val10 ; + int ecode10 = 0 ; + int val11 ; + int ecode11 = 0 ; + int val12 ; + int ecode12 = 0 ; + int val13 ; + int ecode13 = 0 ; + int val14 ; + int ecode14 = 0 ; + int val15 ; + int ecode15 = 0 ; + int res16 ; + char *buf16 = 0 ; + int alloc16 = 0 ; + void *argp20 = 0 ; + int res20 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg21 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 20) || (items > 21)) { + SWIG_croak("Usage: svn_client_diff_peg6(diff_options,path_or_url,peg_revision,start_revision,end_revision,relative_to_dir,depth,ignore_ancestry,no_diff_added,no_diff_deleted,show_copies_as_adds,ignore_content_type,ignore_properties,properties_only,use_git_diff_format,header_encoding,outstream,errstream,changelists,ctx,pool);"); + } + { + arg1 = svn_swig_pl_strings_to_array(ST(0), + _global_pool); + } + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_diff_peg6" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + { + if (_global_pool == NULL) { + _global_pool = svn_swig_pl_make_pool((SV *)NULL); + SPAGAIN; + } + arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool); + } + { + if (_global_pool == NULL) { + _global_pool = svn_swig_pl_make_pool((SV *)NULL); + SPAGAIN; + } + arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool); + } + { + if (_global_pool == NULL) { + _global_pool = svn_swig_pl_make_pool((SV *)NULL); + SPAGAIN; + } + arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool); + } + res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6); + if (!SWIG_IsOK(res6)) { + SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_client_diff_peg6" "', argument " "6"" of type '" "char const *""'"); + } + arg6 = (char *)(buf6); + ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_client_diff_peg6" "', argument " "7"" of type '" "svn_depth_t""'"); + } + arg7 = (svn_depth_t)(val7); + ecode8 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(7), &val8); + if (!SWIG_IsOK(ecode8)) { + SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "svn_client_diff_peg6" "', argument " "8"" of type '" "svn_boolean_t""'"); + } + arg8 = (svn_boolean_t)(val8); + ecode9 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(8), &val9); + if (!SWIG_IsOK(ecode9)) { + SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "svn_client_diff_peg6" "', argument " "9"" of type '" "svn_boolean_t""'"); + } + arg9 = (svn_boolean_t)(val9); + ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(9), &val10); + if (!SWIG_IsOK(ecode10)) { + SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_client_diff_peg6" "', argument " "10"" of type '" "svn_boolean_t""'"); + } + arg10 = (svn_boolean_t)(val10); + ecode11 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(10), &val11); + if (!SWIG_IsOK(ecode11)) { + SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "svn_client_diff_peg6" "', argument " "11"" of type '" "svn_boolean_t""'"); + } + arg11 = (svn_boolean_t)(val11); + ecode12 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(11), &val12); + if (!SWIG_IsOK(ecode12)) { + SWIG_exception_fail(SWIG_ArgError(ecode12), "in method '" "svn_client_diff_peg6" "', argument " "12"" of type '" "svn_boolean_t""'"); + } + arg12 = (svn_boolean_t)(val12); + ecode13 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(12), &val13); + if (!SWIG_IsOK(ecode13)) { + SWIG_exception_fail(SWIG_ArgError(ecode13), "in method '" "svn_client_diff_peg6" "', argument " "13"" of type '" "svn_boolean_t""'"); + } + arg13 = (svn_boolean_t)(val13); + ecode14 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(13), &val14); + if (!SWIG_IsOK(ecode14)) { + SWIG_exception_fail(SWIG_ArgError(ecode14), "in method '" "svn_client_diff_peg6" "', argument " "14"" of type '" "svn_boolean_t""'"); + } + arg14 = (svn_boolean_t)(val14); + ecode15 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(14), &val15); + if (!SWIG_IsOK(ecode15)) { + SWIG_exception_fail(SWIG_ArgError(ecode15), "in method '" "svn_client_diff_peg6" "', argument " "15"" of type '" "svn_boolean_t""'"); + } + arg15 = (svn_boolean_t)(val15); + res16 = SWIG_AsCharPtrAndSize(ST(15), &buf16, NULL, &alloc16); + if (!SWIG_IsOK(res16)) { + SWIG_exception_fail(SWIG_ArgError(res16), "in method '" "svn_client_diff_peg6" "', argument " "16"" of type '" "char const *""'"); + } + arg16 = (char *)(buf16); + { + svn_swig_pl_make_stream (&arg17, ST(16)); + SPAGAIN; + } + { + svn_swig_pl_make_stream (&arg18, ST(17)); + SPAGAIN; + } + { + arg19 = SvOK(ST(18)) ? svn_swig_pl_strings_to_array( + ST(18), _global_pool) : NULL; + } + res20 = SWIG_ConvertPtr(ST(19), &argp20,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res20)) { + SWIG_exception_fail(SWIG_ArgError(res20), "in method '" "svn_client_diff_peg6" "', argument " "20"" of type '" "svn_client_ctx_t *""'"); + } + arg20 = (svn_client_ctx_t *)(argp20); + if (items > 20) { + + } + { + if (!arg3) { + SWIG_exception(SWIG_ValueError,"Received a NULL pointer."); + } + } + { + result = (svn_error_t *)svn_client_diff_peg6((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,(char const *)arg16,arg17,arg18,(apr_array_header_t const *)arg19,arg20,arg21); @@ -22792,15 +23598,16 @@ XS(_wrap_svn_client_relocate) { } -XS(_wrap_svn_client_revert3) { +XS(_wrap_svn_client_revert4) { { apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; svn_depth_t arg2 ; apr_array_header_t *arg3 = (apr_array_header_t *) 0 ; svn_boolean_t arg4 ; svn_boolean_t arg5 ; - svn_client_ctx_t *arg6 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg7 = (apr_pool_t *) 0 ; + svn_boolean_t arg6 ; + svn_client_ctx_t *arg7 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg8 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool ; int val2 ; int ecode2 = 0 ; @@ -22808,18 +23615,20 @@ XS(_wrap_svn_client_revert3) { int ecode4 = 0 ; int val5 ; int ecode5 = 0 ; - void *argp6 = 0 ; - int res6 = 0 ; + int val6 ; + int ecode6 = 0 ; + void *argp7 = 0 ; + int res7 = 0 ; int argvi = 0; svn_error_t *result = 0 ; dXSARGS; { - _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1)); + _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1)); SPAGAIN; } - if ((items < 6) || (items > 7)) { - SWIG_croak("Usage: svn_client_revert3(paths,depth,changelists,clear_changelists,metadata_only,ctx,pool);"); + if ((items < 7) || (items > 8)) { + SWIG_croak("Usage: svn_client_revert4(paths,depth,changelists,clear_changelists,metadata_only,added_keep_local,ctx,scratch_pool);"); } { arg1 = svn_swig_pl_strings_to_array(ST(0), @@ -22827,7 +23636,7 @@ XS(_wrap_svn_client_revert3) { } ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client_revert3" "', argument " "2"" of type '" "svn_depth_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client_revert4" "', argument " "2"" of type '" "svn_depth_t""'"); } arg2 = (svn_depth_t)(val2); { @@ -22836,24 +23645,136 @@ XS(_wrap_svn_client_revert3) { } ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4); if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_client_revert3" "', argument " "4"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_client_revert4" "', argument " "4"" of type '" "svn_boolean_t""'"); } arg4 = (svn_boolean_t)(val4); ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5); if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_client_revert3" "', argument " "5"" of type '" "svn_boolean_t""'"); + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_client_revert4" "', argument " "5"" of type '" "svn_boolean_t""'"); } arg5 = (svn_boolean_t)(val5); - res6 = SWIG_ConvertPtr(ST(5), &argp6,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res6)) { - SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_client_revert3" "', argument " "6"" of type '" "svn_client_ctx_t *""'"); + ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_client_revert4" "', argument " "6"" of type '" "svn_boolean_t""'"); + } + arg6 = (svn_boolean_t)(val6); + res7 = SWIG_ConvertPtr(ST(6), &argp7,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_client_revert4" "', argument " "7"" of type '" "svn_client_ctx_t *""'"); } - arg6 = (svn_client_ctx_t *)(argp6); - if (items > 6) { + arg7 = (svn_client_ctx_t *)(argp7); + if (items > 7) { } { - result = (svn_error_t *)svn_client_revert3((apr_array_header_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5,arg6,arg7); + result = (svn_error_t *)svn_client_revert4((apr_array_header_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5,arg6,arg7,arg8); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + + + + + + + + XSRETURN(argvi); + fail: + + + + + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client_revert3) { + { + apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; + svn_depth_t arg2 ; + apr_array_header_t *arg3 = (apr_array_header_t *) 0 ; + svn_boolean_t arg4 ; + svn_boolean_t arg5 ; + svn_client_ctx_t *arg6 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + int val2 ; + int ecode2 = 0 ; + int val4 ; + int ecode4 = 0 ; + int val5 ; + int ecode5 = 0 ; + void *argp6 = 0 ; + int res6 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 6) || (items > 7)) { + SWIG_croak("Usage: svn_client_revert3(paths,depth,changelists,clear_changelists,metadata_only,ctx,pool);"); + } + { + arg1 = svn_swig_pl_strings_to_array(ST(0), + _global_pool); + } + ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client_revert3" "', argument " "2"" of type '" "svn_depth_t""'"); + } + arg2 = (svn_depth_t)(val2); + { + arg3 = SvOK(ST(2)) ? svn_swig_pl_strings_to_array( + ST(2), _global_pool) : NULL; + } + ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_client_revert3" "', argument " "4"" of type '" "svn_boolean_t""'"); + } + arg4 = (svn_boolean_t)(val4); + ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_client_revert3" "', argument " "5"" of type '" "svn_boolean_t""'"); + } + arg5 = (svn_boolean_t)(val5); + res6 = SWIG_ConvertPtr(ST(5), &argp6,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res6)) { + SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_client_revert3" "', argument " "6"" of type '" "svn_client_ctx_t *""'"); + } + arg6 = (svn_client_ctx_t *)(argp6); + if (items > 6) { + + } + { + result = (svn_error_t *)svn_client_revert3((apr_array_header_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5,arg6,arg7); @@ -23105,7 +24026,7 @@ XS(_wrap_svn_client_conflict_option_set_merged_propval) { } -XS(_wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates) { +XS(_wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates2) { { apr_array_header_t **arg1 = (apr_array_header_t **) 0 ; svn_client_conflict_option_t *arg2 = (svn_client_conflict_option_t *) 0 ; @@ -23129,11 +24050,11 @@ XS(_wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates) { } arg1 = &temp1; if ((items < 1) || (items > 3)) { - SWIG_croak("Usage: svn_client_conflict_option_get_moved_to_repos_relpath_candidates(option,result_pool,scratch_pool);"); + SWIG_croak("Usage: svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(option,result_pool,scratch_pool);"); } res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client_conflict_option_t, 0 | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_conflict_option_get_moved_to_repos_relpath_candidates" "', argument " "2"" of type '" "svn_client_conflict_option_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_conflict_option_get_moved_to_repos_relpath_candidates2" "', argument " "2"" of type '" "svn_client_conflict_option_t *""'"); } arg2 = (svn_client_conflict_option_t *)(argp2); if (items > 1) { @@ -23143,7 +24064,7 @@ XS(_wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates) { } { - result = (svn_error_t *)svn_client_conflict_option_get_moved_to_repos_relpath_candidates(arg1,arg2,arg3,arg4); + result = (svn_error_t *)svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(arg1,arg2,arg3,arg4); @@ -23167,12 +24088,12 @@ XS(_wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates) { } } { - /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_repos_relpath_candidates arg 1 (apr_array_header_t **) */ + /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_repos_relpath_candidates2 arg 1 (apr_array_header_t **) */ - SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_repos_relpath_candidates is not implemented yet"); + SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_repos_relpath_candidates2 is not implemented yet"); } @@ -23190,88 +24111,7 @@ XS(_wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates) { } -XS(_wrap_svn_client_conflict_option_set_moved_to_repos_relpath) { - { - svn_client_conflict_option_t *arg1 = (svn_client_conflict_option_t *) 0 ; - int arg2 ; - svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg4 = (apr_pool_t *) 0 ; - apr_pool_t *_global_pool ; - void *argp1 = 0 ; - int res1 = 0 ; - int val2 ; - int ecode2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; - int argvi = 0; - svn_error_t *result = 0 ; - dXSARGS; - - { - _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); - SPAGAIN; - } - if ((items < 3) || (items > 4)) { - SWIG_croak("Usage: svn_client_conflict_option_set_moved_to_repos_relpath(option,preferred_move_target_idx,ctx,scratch_pool);"); - } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_conflict_option_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_conflict_option_set_moved_to_repos_relpath" "', argument " "1"" of type '" "svn_client_conflict_option_t *""'"); - } - arg1 = (svn_client_conflict_option_t *)(argp1); - ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client_conflict_option_set_moved_to_repos_relpath" "', argument " "2"" of type '" "int""'"); - } - arg2 = (int)(val2); - res3 = SWIG_ConvertPtr(ST(2), &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client_conflict_option_set_moved_to_repos_relpath" "', argument " "3"" of type '" "svn_client_ctx_t *""'"); - } - arg3 = (svn_client_ctx_t *)(argp3); - if (items > 3) { - - } - { - result = (svn_error_t *)svn_client_conflict_option_set_moved_to_repos_relpath(arg1,arg2,arg3,arg4); - - - - } - { - if (result) { - SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); - - if (SvOK(exception_handler)) { - SV *callback_result; - - PUTBACK; - svn_swig_pl_callback_thunk (CALL_SV, exception_handler, - &callback_result, "S", result, - SWIGTYPE_p_svn_error_t); - SPAGAIN; - } else { - ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); - argvi++; - } - } - } - - - - - XSRETURN(argvi); - fail: - - - - - SWIG_croak_null(); - } -} - - -XS(_wrap_svn_client_conflict_option_get_moved_to_abspath_candidates) { +XS(_wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates) { { apr_array_header_t **arg1 = (apr_array_header_t **) 0 ; svn_client_conflict_option_t *arg2 = (svn_client_conflict_option_t *) 0 ; @@ -23295,11 +24135,11 @@ XS(_wrap_svn_client_conflict_option_get_moved_to_abspath_candidates) { } arg1 = &temp1; if ((items < 1) || (items > 3)) { - SWIG_croak("Usage: svn_client_conflict_option_get_moved_to_abspath_candidates(option,result_pool,scratch_pool);"); + SWIG_croak("Usage: svn_client_conflict_option_get_moved_to_repos_relpath_candidates(option,result_pool,scratch_pool);"); } res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client_conflict_option_t, 0 | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_conflict_option_get_moved_to_abspath_candidates" "', argument " "2"" of type '" "svn_client_conflict_option_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_conflict_option_get_moved_to_repos_relpath_candidates" "', argument " "2"" of type '" "svn_client_conflict_option_t *""'"); } arg2 = (svn_client_conflict_option_t *)(argp2); if (items > 1) { @@ -23309,7 +24149,7 @@ XS(_wrap_svn_client_conflict_option_get_moved_to_abspath_candidates) { } { - result = (svn_error_t *)svn_client_conflict_option_get_moved_to_abspath_candidates(arg1,arg2,arg3,arg4); + result = (svn_error_t *)svn_client_conflict_option_get_moved_to_repos_relpath_candidates(arg1,arg2,arg3,arg4); @@ -23333,12 +24173,12 @@ XS(_wrap_svn_client_conflict_option_get_moved_to_abspath_candidates) { } } { - /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_abspath_candidates arg 1 (apr_array_header_t **) */ + /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_repos_relpath_candidates arg 1 (apr_array_header_t **) */ - SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_abspath_candidates is not implemented yet"); + SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_repos_relpath_candidates is not implemented yet"); } @@ -23356,7 +24196,7 @@ XS(_wrap_svn_client_conflict_option_get_moved_to_abspath_candidates) { } -XS(_wrap_svn_client_conflict_option_set_moved_to_abspath) { +XS(_wrap_svn_client_conflict_option_set_moved_to_repos_relpath2) { { svn_client_conflict_option_t *arg1 = (svn_client_conflict_option_t *) 0 ; int arg2 ; @@ -23378,28 +24218,28 @@ XS(_wrap_svn_client_conflict_option_set_moved_to_abspath) { SPAGAIN; } if ((items < 3) || (items > 4)) { - SWIG_croak("Usage: svn_client_conflict_option_set_moved_to_abspath(option,preferred_move_target_idx,ctx,scratch_pool);"); + SWIG_croak("Usage: svn_client_conflict_option_set_moved_to_repos_relpath2(option,preferred_move_target_idx,ctx,scratch_pool);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_conflict_option_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_conflict_option_set_moved_to_abspath" "', argument " "1"" of type '" "svn_client_conflict_option_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_conflict_option_set_moved_to_repos_relpath2" "', argument " "1"" of type '" "svn_client_conflict_option_t *""'"); } arg1 = (svn_client_conflict_option_t *)(argp1); ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client_conflict_option_set_moved_to_abspath" "', argument " "2"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client_conflict_option_set_moved_to_repos_relpath2" "', argument " "2"" of type '" "int""'"); } arg2 = (int)(val2); res3 = SWIG_ConvertPtr(ST(2), &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client_conflict_option_set_moved_to_abspath" "', argument " "3"" of type '" "svn_client_ctx_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client_conflict_option_set_moved_to_repos_relpath2" "', argument " "3"" of type '" "svn_client_ctx_t *""'"); } arg3 = (svn_client_ctx_t *)(argp3); if (items > 3) { } { - result = (svn_error_t *)svn_client_conflict_option_set_moved_to_abspath(arg1,arg2,arg3,arg4); + result = (svn_error_t *)svn_client_conflict_option_set_moved_to_repos_relpath2(arg1,arg2,arg3,arg4); @@ -23437,61 +24277,17 @@ XS(_wrap_svn_client_conflict_option_set_moved_to_abspath) { } -XS(_wrap_svn_client_conflict_option_find_by_id) { +XS(_wrap_svn_client_conflict_option_set_moved_to_repos_relpath) { { - apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; - svn_client_conflict_option_id_t arg2 ; + svn_client_conflict_option_t *arg1 = (svn_client_conflict_option_t *) 0 ; + int arg2 ; + svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; void *argp1 = 0 ; int res1 = 0 ; int val2 ; int ecode2 = 0 ; - int argvi = 0; - svn_client_conflict_option_t *result = 0 ; - dXSARGS; - - if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: svn_client_conflict_option_find_by_id(options,option_id);"); - } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_apr_array_header_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_conflict_option_find_by_id" "', argument " "1"" of type '" "apr_array_header_t *""'"); - } - arg1 = (apr_array_header_t *)(argp1); - ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client_conflict_option_find_by_id" "', argument " "2"" of type '" "svn_client_conflict_option_id_t""'"); - } - arg2 = (svn_client_conflict_option_id_t)(val2); - { - result = (svn_client_conflict_option_t *)svn_client_conflict_option_find_by_id(arg1,arg2); - - - - } - ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client_conflict_option_t, 0 | 0); argvi++ ; - - - XSRETURN(argvi); - fail: - - - SWIG_croak_null(); - } -} - - -XS(_wrap_svn_client_conflict_get) { - { - svn_client_conflict_t **arg1 = (svn_client_conflict_t **) 0 ; - char *arg2 = (char *) 0 ; - svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg4 = (apr_pool_t *) 0 ; - apr_pool_t *arg5 = (apr_pool_t *) 0 ; - apr_pool_t *_global_pool ; - svn_client_conflict_t *temp1 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; void *argp3 = 0 ; int res3 = 0 ; int argvi = 0; @@ -23502,32 +24298,489 @@ XS(_wrap_svn_client_conflict_get) { _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); SPAGAIN; } - { - _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); - SPAGAIN; - } - arg1 = &temp1; - if ((items < 2) || (items > 4)) { - SWIG_croak("Usage: svn_client_conflict_get(local_abspath,ctx,result_pool,scratch_pool);"); + if ((items < 3) || (items > 4)) { + SWIG_croak("Usage: svn_client_conflict_option_set_moved_to_repos_relpath(option,preferred_move_target_idx,ctx,scratch_pool);"); } - res2 = SWIG_AsCharPtrAndSize(ST(0), &buf2, NULL, &alloc2); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_conflict_get" "', argument " "2"" of type '" "char const *""'"); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_conflict_option_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_conflict_option_set_moved_to_repos_relpath" "', argument " "1"" of type '" "svn_client_conflict_option_t *""'"); } - arg2 = (char *)(buf2); - res3 = SWIG_ConvertPtr(ST(1), &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + arg1 = (svn_client_conflict_option_t *)(argp1); + ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client_conflict_option_set_moved_to_repos_relpath" "', argument " "2"" of type '" "int""'"); + } + arg2 = (int)(val2); + res3 = SWIG_ConvertPtr(ST(2), &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client_conflict_get" "', argument " "3"" of type '" "svn_client_ctx_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client_conflict_option_set_moved_to_repos_relpath" "', argument " "3"" of type '" "svn_client_ctx_t *""'"); } arg3 = (svn_client_ctx_t *)(argp3); - if (items > 2) { - - } if (items > 3) { } { - result = (svn_error_t *)svn_client_conflict_get(arg1,(char const *)arg2,arg3,arg4,arg5); + result = (svn_error_t *)svn_client_conflict_option_set_moved_to_repos_relpath(arg1,arg2,arg3,arg4); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + + + + XSRETURN(argvi); + fail: + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client_conflict_option_get_moved_to_abspath_candidates2) { + { + apr_array_header_t **arg1 = (apr_array_header_t **) 0 ; + svn_client_conflict_option_t *arg2 = (svn_client_conflict_option_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + apr_array_header_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + if ((items < 1) || (items > 3)) { + SWIG_croak("Usage: svn_client_conflict_option_get_moved_to_abspath_candidates2(option,result_pool,scratch_pool);"); + } + res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client_conflict_option_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_conflict_option_get_moved_to_abspath_candidates2" "', argument " "2"" of type '" "svn_client_conflict_option_t *""'"); + } + arg2 = (svn_client_conflict_option_t *)(argp2); + if (items > 1) { + + } + if (items > 2) { + + } + { + result = (svn_error_t *)svn_client_conflict_option_get_moved_to_abspath_candidates2(arg1,arg2,arg3,arg4); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_abspath_candidates2 arg 1 (apr_array_header_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_abspath_candidates2 is not implemented yet"); + + } + + + + + XSRETURN(argvi); + fail: + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client_conflict_option_get_moved_to_abspath_candidates) { + { + apr_array_header_t **arg1 = (apr_array_header_t **) 0 ; + svn_client_conflict_option_t *arg2 = (svn_client_conflict_option_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + apr_array_header_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + if ((items < 1) || (items > 3)) { + SWIG_croak("Usage: svn_client_conflict_option_get_moved_to_abspath_candidates(option,result_pool,scratch_pool);"); + } + res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client_conflict_option_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_conflict_option_get_moved_to_abspath_candidates" "', argument " "2"" of type '" "svn_client_conflict_option_t *""'"); + } + arg2 = (svn_client_conflict_option_t *)(argp2); + if (items > 1) { + + } + if (items > 2) { + + } + { + result = (svn_error_t *)svn_client_conflict_option_get_moved_to_abspath_candidates(arg1,arg2,arg3,arg4); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_abspath_candidates arg 1 (apr_array_header_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_abspath_candidates is not implemented yet"); + + } + + + + + XSRETURN(argvi); + fail: + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client_conflict_option_set_moved_to_abspath2) { + { + svn_client_conflict_option_t *arg1 = (svn_client_conflict_option_t *) 0 ; + int arg2 ; + svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 3) || (items > 4)) { + SWIG_croak("Usage: svn_client_conflict_option_set_moved_to_abspath2(option,preferred_move_target_idx,ctx,scratch_pool);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_conflict_option_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_conflict_option_set_moved_to_abspath2" "', argument " "1"" of type '" "svn_client_conflict_option_t *""'"); + } + arg1 = (svn_client_conflict_option_t *)(argp1); + ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client_conflict_option_set_moved_to_abspath2" "', argument " "2"" of type '" "int""'"); + } + arg2 = (int)(val2); + res3 = SWIG_ConvertPtr(ST(2), &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client_conflict_option_set_moved_to_abspath2" "', argument " "3"" of type '" "svn_client_ctx_t *""'"); + } + arg3 = (svn_client_ctx_t *)(argp3); + if (items > 3) { + + } + { + result = (svn_error_t *)svn_client_conflict_option_set_moved_to_abspath2(arg1,arg2,arg3,arg4); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + + + + XSRETURN(argvi); + fail: + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client_conflict_option_set_moved_to_abspath) { + { + svn_client_conflict_option_t *arg1 = (svn_client_conflict_option_t *) 0 ; + int arg2 ; + svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 3) || (items > 4)) { + SWIG_croak("Usage: svn_client_conflict_option_set_moved_to_abspath(option,preferred_move_target_idx,ctx,scratch_pool);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_conflict_option_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_conflict_option_set_moved_to_abspath" "', argument " "1"" of type '" "svn_client_conflict_option_t *""'"); + } + arg1 = (svn_client_conflict_option_t *)(argp1); + ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client_conflict_option_set_moved_to_abspath" "', argument " "2"" of type '" "int""'"); + } + arg2 = (int)(val2); + res3 = SWIG_ConvertPtr(ST(2), &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client_conflict_option_set_moved_to_abspath" "', argument " "3"" of type '" "svn_client_ctx_t *""'"); + } + arg3 = (svn_client_ctx_t *)(argp3); + if (items > 3) { + + } + { + result = (svn_error_t *)svn_client_conflict_option_set_moved_to_abspath(arg1,arg2,arg3,arg4); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + + + + XSRETURN(argvi); + fail: + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client_conflict_option_find_by_id) { + { + apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; + svn_client_conflict_option_id_t arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + int argvi = 0; + svn_client_conflict_option_t *result = 0 ; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_client_conflict_option_find_by_id(options,option_id);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_apr_array_header_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_conflict_option_find_by_id" "', argument " "1"" of type '" "apr_array_header_t *""'"); + } + arg1 = (apr_array_header_t *)(argp1); + ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client_conflict_option_find_by_id" "', argument " "2"" of type '" "svn_client_conflict_option_id_t""'"); + } + arg2 = (svn_client_conflict_option_id_t)(val2); + { + result = (svn_client_conflict_option_t *)svn_client_conflict_option_find_by_id(arg1,arg2); + + + + } + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client_conflict_option_t, 0 | 0); argvi++ ; + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client_conflict_get) { + { + svn_client_conflict_t **arg1 = (svn_client_conflict_t **) 0 ; + char *arg2 = (char *) 0 ; + svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + svn_client_conflict_t *temp1 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + { + _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + if ((items < 2) || (items > 4)) { + SWIG_croak("Usage: svn_client_conflict_get(local_abspath,ctx,result_pool,scratch_pool);"); + } + res2 = SWIG_AsCharPtrAndSize(ST(0), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_conflict_get" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + res3 = SWIG_ConvertPtr(ST(1), &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client_conflict_get" "', argument " "3"" of type '" "svn_client_ctx_t *""'"); + } + arg3 = (svn_client_ctx_t *)(argp3); + if (items > 2) { + + } + if (items > 3) { + + } + { + result = (svn_error_t *)svn_client_conflict_get(arg1,(char const *)arg2,arg3,arg4,arg5); @@ -30119,7 +31372,7 @@ XS(_wrap_svn_client_proplist2) { } } { - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1, + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1, SWIGTYPE_p_svn_client_proplist_item_t); argvi++ /*@SWIG@*/ /*@SWIG@*/ ; @@ -30230,7 +31483,7 @@ XS(_wrap_svn_client_proplist) { } } { - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1, + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1, SWIGTYPE_p_svn_client_proplist_item_t); argvi++ /*@SWIG@*/ /*@SWIG@*/ ; @@ -32451,218 +33704,109 @@ XS(_wrap_svn_client_cat) { } -XS(_wrap_svn_client_shelve) { +XS(_wrap_svn_client__shelf_t_name_set) { { - char *arg1 = (char *) 0 ; - apr_array_header_t *arg2 = (apr_array_header_t *) 0 ; - svn_depth_t arg3 ; - apr_array_header_t *arg4 = (apr_array_header_t *) 0 ; - svn_boolean_t arg5 ; - svn_boolean_t arg6 ; - svn_client_ctx_t *arg7 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg8 = (apr_pool_t *) 0 ; - apr_pool_t *_global_pool ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; - int val3 ; - int ecode3 = 0 ; - int val5 ; - int ecode5 = 0 ; - int val6 ; - int ecode6 = 0 ; - void *argp7 = 0 ; - int res7 = 0 ; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + char *arg2 = (char *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; int argvi = 0; - svn_error_t *result = 0 ; dXSARGS; - { - _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1)); - SPAGAIN; - } - if ((items < 7) || (items > 8)) { - SWIG_croak("Usage: svn_client_shelve(name,paths,depth,changelists,keep_local,dry_run,ctx,pool);"); + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_client__shelf_t_name_set(self,name);"); } - res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_shelve" "', argument " "1"" of type '" "char const *""'"); - } - arg1 = (char *)(buf1); - { - arg2 = svn_swig_pl_strings_to_array(ST(1), - _global_pool); - } - ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_client_shelve" "', argument " "3"" of type '" "svn_depth_t""'"); - } - arg3 = (svn_depth_t)(val3); - { - arg4 = SvOK(ST(3)) ? svn_swig_pl_strings_to_array( - ST(3), _global_pool) : NULL; - } - ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5); - if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_client_shelve" "', argument " "5"" of type '" "svn_boolean_t""'"); - } - arg5 = (svn_boolean_t)(val5); - ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6); - if (!SWIG_IsOK(ecode6)) { - SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_client_shelve" "', argument " "6"" of type '" "svn_boolean_t""'"); - } - arg6 = (svn_boolean_t)(val6); - res7 = SWIG_ConvertPtr(ST(6), &argp7,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res7)) { - SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_client_shelve" "', argument " "7"" of type '" "svn_client_ctx_t *""'"); - } - arg7 = (svn_client_ctx_t *)(argp7); - if (items > 7) { - + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_name_set" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); } - { - result = (svn_error_t *)svn_client_shelve((char const *)arg1,(apr_array_header_t const *)arg2,arg3,(apr_array_header_t const *)arg4,arg5,arg6,arg7,arg8); - - - + arg1 = (struct svn_client__shelf_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_t_name_set" "', argument " "2"" of type '" "char const *""'"); } + arg2 = (char *)(buf2); { - if (result) { - SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); - - if (SvOK(exception_handler)) { - SV *callback_result; - - PUTBACK; - svn_swig_pl_callback_thunk (CALL_SV, exception_handler, - &callback_result, "S", result, - SWIGTYPE_p_svn_error_t); - SPAGAIN; - } else { - ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); - argvi++; - } - } + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->name) free((char *)arg1->name); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->name = copied; } - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); - - - - - - + ST(argvi) = sv_newmortal(); + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); XSRETURN(argvi); fail: - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); - - - + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_t_name_get) { + { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + char *result = 0 ; + dXSARGS; + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_client__shelf_t_name_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_name_get" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); + } + arg1 = (struct svn_client__shelf_t *)(argp1); + result = (char *) ((arg1)->name); + ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; + XSRETURN(argvi); + fail: SWIG_croak_null(); } } -XS(_wrap_svn_client_unshelve) { +XS(_wrap_svn_client__shelf_t_max_version_set) { { - char *arg1 = (char *) 0 ; - char *arg2 = (char *) 0 ; - svn_boolean_t arg3 ; - svn_boolean_t arg4 ; - svn_client_ctx_t *arg5 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg6 = (apr_pool_t *) 0 ; - apr_pool_t *_global_pool ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; - int val3 ; - int ecode3 = 0 ; - int val4 ; - int ecode4 = 0 ; - void *argp5 = 0 ; - int res5 = 0 ; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + int arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; int argvi = 0; - svn_error_t *result = 0 ; dXSARGS; - { - _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1)); - SPAGAIN; - } - if ((items < 5) || (items > 6)) { - SWIG_croak("Usage: svn_client_unshelve(name,local_abspath,keep,dry_run,ctx,pool);"); + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_client__shelf_t_max_version_set(self,max_version);"); } - res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_unshelve" "', argument " "1"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_max_version_set" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); } - arg1 = (char *)(buf1); - res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_unshelve" "', argument " "2"" of type '" "char const *""'"); - } - arg2 = (char *)(buf2); - ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_client_unshelve" "', argument " "3"" of type '" "svn_boolean_t""'"); - } - arg3 = (svn_boolean_t)(val3); - ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4); - if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_client_unshelve" "', argument " "4"" of type '" "svn_boolean_t""'"); + arg1 = (struct svn_client__shelf_t *)(argp1); + ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client__shelf_t_max_version_set" "', argument " "2"" of type '" "int""'"); } - arg4 = (svn_boolean_t)(val4); - res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_client_unshelve" "', argument " "5"" of type '" "svn_client_ctx_t *""'"); - } - arg5 = (svn_client_ctx_t *)(argp5); - if (items > 5) { - - } - { - result = (svn_error_t *)svn_client_unshelve((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6); - - - - } - { - if (result) { - SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); - - if (SvOK(exception_handler)) { - SV *callback_result; - - PUTBACK; - svn_swig_pl_callback_thunk (CALL_SV, exception_handler, - &callback_result, "S", result, - SWIGTYPE_p_svn_error_t); - SPAGAIN; - } else { - ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); - argvi++; - } - } - } - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - - + arg2 = (int)(val2); + if (arg1) (arg1)->max_version = arg2; + ST(argvi) = sv_newmortal(); XSRETURN(argvi); fail: - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - - SWIG_croak_null(); @@ -32670,102 +33814,37 @@ XS(_wrap_svn_client_unshelve) { } -XS(_wrap_svn_client_shelves_delete) { +XS(_wrap_svn_client__shelf_t_max_version_get) { { - char *arg1 = (char *) 0 ; - char *arg2 = (char *) 0 ; - svn_boolean_t arg3 ; - svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg5 = (apr_pool_t *) 0 ; - apr_pool_t *_global_pool ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; - int val3 ; - int ecode3 = 0 ; - void *argp4 = 0 ; - int res4 = 0 ; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; int argvi = 0; - svn_error_t *result = 0 ; + int result; dXSARGS; - { - _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); - SPAGAIN; - } - if ((items < 4) || (items > 5)) { - SWIG_croak("Usage: svn_client_shelves_delete(name,local_abspath,dry_run,ctx,pool);"); + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_client__shelf_t_max_version_get(self);"); } - res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_shelves_delete" "', argument " "1"" of type '" "char const *""'"); - } - arg1 = (char *)(buf1); - res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_shelves_delete" "', argument " "2"" of type '" "char const *""'"); - } - arg2 = (char *)(buf2); - ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_client_shelves_delete" "', argument " "3"" of type '" "svn_boolean_t""'"); - } - arg3 = (svn_boolean_t)(val3); - res4 = SWIG_ConvertPtr(ST(3), &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client_shelves_delete" "', argument " "4"" of type '" "svn_client_ctx_t *""'"); - } - arg4 = (svn_client_ctx_t *)(argp4); - if (items > 4) { - - } - { - result = (svn_error_t *)svn_client_shelves_delete((char const *)arg1,(char const *)arg2,arg3,arg4,arg5); - - - - } - { - if (result) { - SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); - - if (SvOK(exception_handler)) { - SV *callback_result; - - PUTBACK; - svn_swig_pl_callback_thunk (CALL_SV, exception_handler, - &callback_result, "S", result, - SWIGTYPE_p_svn_error_t); - SPAGAIN; - } else { - ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); - argvi++; - } - } + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_max_version_get" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); } - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - - + arg1 = (struct svn_client__shelf_t *)(argp1); + result = (int) ((arg1)->max_version); + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ; XSRETURN(argvi); fail: - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - - SWIG_croak_null(); } } -XS(_wrap_svn_client_shelved_patch_info_t_message_set) { +XS(_wrap_svn_client__shelf_t_wc_root_abspath_set) { { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; char *arg2 = (char *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -32776,25 +33855,25 @@ XS(_wrap_svn_client_shelved_patch_info_t_message_set) { dXSARGS; if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: svn_client_shelved_patch_info_t_message_set(self,message);"); + SWIG_croak("Usage: svn_client__shelf_t_wc_root_abspath_set(self,wc_root_abspath);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_shelved_patch_info_t_message_set" "', argument " "1"" of type '" "struct svn_client_shelved_patch_info_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_wc_root_abspath_set" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); + arg1 = (struct svn_client__shelf_t *)(argp1); res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_shelved_patch_info_t_message_set" "', argument " "2"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_t_wc_root_abspath_set" "', argument " "2"" of type '" "char const *""'"); } arg2 = (char *)(buf2); { apr_size_t len = strlen(arg2) + 1; char *copied; - if (arg1->message) free((char *)arg1->message); + if (arg1->wc_root_abspath) free((char *)arg1->wc_root_abspath); copied = malloc(len); memcpy(copied, arg2, len); - arg1->message = copied; + arg1->wc_root_abspath = copied; } ST(argvi) = sv_newmortal(); @@ -32808,9 +33887,9 @@ XS(_wrap_svn_client_shelved_patch_info_t_message_set) { } -XS(_wrap_svn_client_shelved_patch_info_t_message_get) { +XS(_wrap_svn_client__shelf_t_wc_root_abspath_get) { { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; @@ -32818,14 +33897,14 @@ XS(_wrap_svn_client_shelved_patch_info_t_message_get) { dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: svn_client_shelved_patch_info_t_message_get(self);"); + SWIG_croak("Usage: svn_client__shelf_t_wc_root_abspath_get(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_shelved_patch_info_t_message_get" "', argument " "1"" of type '" "struct svn_client_shelved_patch_info_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_wc_root_abspath_get" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); - result = (char *) ((arg1)->message); + arg1 = (struct svn_client__shelf_t *)(argp1); + result = (char *) ((arg1)->wc_root_abspath); ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; XSRETURN(argvi); @@ -32836,9 +33915,9 @@ XS(_wrap_svn_client_shelved_patch_info_t_message_get) { } -XS(_wrap_svn_client_shelved_patch_info_t_patch_path_set) { +XS(_wrap_svn_client__shelf_t_shelves_dir_set) { { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; char *arg2 = (char *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -32849,25 +33928,25 @@ XS(_wrap_svn_client_shelved_patch_info_t_patch_path_set) { dXSARGS; if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: svn_client_shelved_patch_info_t_patch_path_set(self,patch_path);"); + SWIG_croak("Usage: svn_client__shelf_t_shelves_dir_set(self,shelves_dir);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_shelved_patch_info_t_patch_path_set" "', argument " "1"" of type '" "struct svn_client_shelved_patch_info_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_shelves_dir_set" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); + arg1 = (struct svn_client__shelf_t *)(argp1); res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_shelved_patch_info_t_patch_path_set" "', argument " "2"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_t_shelves_dir_set" "', argument " "2"" of type '" "char const *""'"); } arg2 = (char *)(buf2); { apr_size_t len = strlen(arg2) + 1; char *copied; - if (arg1->patch_path) free((char *)arg1->patch_path); + if (arg1->shelves_dir) free((char *)arg1->shelves_dir); copied = malloc(len); memcpy(copied, arg2, len); - arg1->patch_path = copied; + arg1->shelves_dir = copied; } ST(argvi) = sv_newmortal(); @@ -32881,9 +33960,9 @@ XS(_wrap_svn_client_shelved_patch_info_t_patch_path_set) { } -XS(_wrap_svn_client_shelved_patch_info_t_patch_path_get) { +XS(_wrap_svn_client__shelf_t_shelves_dir_get) { { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; @@ -32891,14 +33970,14 @@ XS(_wrap_svn_client_shelved_patch_info_t_patch_path_get) { dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: svn_client_shelved_patch_info_t_patch_path_get(self);"); + SWIG_croak("Usage: svn_client__shelf_t_shelves_dir_get(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_shelved_patch_info_t_patch_path_get" "', argument " "1"" of type '" "struct svn_client_shelved_patch_info_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_shelves_dir_get" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); - result = (char *) ((arg1)->patch_path); + arg1 = (struct svn_client__shelf_t *)(argp1); + result = (char *) ((arg1)->shelves_dir); ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; XSRETURN(argvi); @@ -32909,31 +33988,32 @@ XS(_wrap_svn_client_shelved_patch_info_t_patch_path_get) { } -XS(_wrap_svn_client_shelved_patch_info_t_dirent_set) { +XS(_wrap_svn_client__shelf_t_revprops_set) { { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; - svn_io_dirent2_t *arg2 = (svn_io_dirent2_t *) 0 ; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + apr_hash_t *arg2 = (apr_hash_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; + apr_pool_t *_global_pool = NULL ; int argvi = 0; dXSARGS; if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: svn_client_shelved_patch_info_t_dirent_set(self,dirent);"); + SWIG_croak("Usage: svn_client__shelf_t_revprops_set(self,revprops);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_shelved_patch_info_t_dirent_set" "', argument " "1"" of type '" "struct svn_client_shelved_patch_info_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_revprops_set" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); - res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_io_dirent2_t, SWIG_POINTER_DISOWN | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_shelved_patch_info_t_dirent_set" "', argument " "2"" of type '" "svn_io_dirent2_t *""'"); + arg1 = (struct svn_client__shelf_t *)(argp1); + { + if (_global_pool == NULL) { + _global_pool = svn_swig_pl_make_pool((SV *)NULL); + SPAGAIN; + } + arg2 = svn_swig_pl_hash_to_prophash(ST(1), _global_pool); } - arg2 = (svn_io_dirent2_t *)(argp2); - if (arg1) (arg1)->dirent = arg2; + if (arg1) (arg1)->revprops = arg2; ST(argvi) = sv_newmortal(); @@ -32946,25 +34026,27 @@ XS(_wrap_svn_client_shelved_patch_info_t_dirent_set) { } -XS(_wrap_svn_client_shelved_patch_info_t_dirent_get) { +XS(_wrap_svn_client__shelf_t_revprops_get) { { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; - svn_io_dirent2_t *result = 0 ; + apr_hash_t *result = 0 ; dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: svn_client_shelved_patch_info_t_dirent_get(self);"); + SWIG_croak("Usage: svn_client__shelf_t_revprops_get(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_shelved_patch_info_t_dirent_get" "', argument " "1"" of type '" "struct svn_client_shelved_patch_info_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_revprops_get" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); + } + arg1 = (struct svn_client__shelf_t *)(argp1); + result = (apr_hash_t *) ((arg1)->revprops); + { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = svn_swig_pl_prophash_to_hash(result); argvi++ ; } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); - result = (svn_io_dirent2_t *) ((arg1)->dirent); - ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_io_dirent2_t, 0 | SWIG_SHADOW); argvi++ ; XSRETURN(argvi); fail: @@ -32974,31 +34056,31 @@ XS(_wrap_svn_client_shelved_patch_info_t_dirent_get) { } -XS(_wrap_svn_client_shelved_patch_info_t_mtime_set) { +XS(_wrap_svn_client__shelf_t_ctx_set) { { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; - apr_time_t arg2 ; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + svn_client_ctx_t *arg2 = (svn_client_ctx_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - long long val2 ; - int ecode2 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; int argvi = 0; dXSARGS; if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: svn_client_shelved_patch_info_t_mtime_set(self,mtime);"); + SWIG_croak("Usage: svn_client__shelf_t_ctx_set(self,ctx);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_shelved_patch_info_t_mtime_set" "', argument " "1"" of type '" "struct svn_client_shelved_patch_info_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_ctx_set" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); - ecode2 = SWIG_AsVal_long_SS_long SWIG_PERL_CALL_ARGS_2(ST(1), &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client_shelved_patch_info_t_mtime_set" "', argument " "2"" of type '" "apr_time_t""'"); - } - arg2 = (apr_time_t)(val2); - if (arg1) (arg1)->mtime = arg2; + arg1 = (struct svn_client__shelf_t *)(argp1); + res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_client_ctx_t, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_t_ctx_set" "', argument " "2"" of type '" "svn_client_ctx_t *""'"); + } + arg2 = (svn_client_ctx_t *)(argp2); + if (arg1) (arg1)->ctx = arg2; ST(argvi) = sv_newmortal(); @@ -33011,29 +34093,91 @@ XS(_wrap_svn_client_shelved_patch_info_t_mtime_set) { } -XS(_wrap_svn_client_shelved_patch_info_t_mtime_get) { +XS(_wrap_svn_client__shelf_t_ctx_get) { { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; - apr_time_t result; + svn_client_ctx_t *result = 0 ; dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: svn_client_shelved_patch_info_t_mtime_get(self);"); + SWIG_croak("Usage: svn_client__shelf_t_ctx_get(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_shelved_patch_info_t_mtime_get" "', argument " "1"" of type '" "struct svn_client_shelved_patch_info_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_ctx_get" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); - result = ((arg1)->mtime); + arg1 = (struct svn_client__shelf_t *)(argp1); + result = (svn_client_ctx_t *) ((arg1)->ctx); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client_ctx_t, 0 | SWIG_SHADOW); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_t_pool_set) { + { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + { - char temp[30]; - sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result); - if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++ ; + _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 1) || (items > 2)) { + SWIG_croak("Usage: svn_client__shelf_t_pool_set(self,pool);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_pool_set" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); + } + arg1 = (struct svn_client__shelf_t *)(argp1); + if (items > 1) { + + } + if (arg1) (arg1)->pool = arg2; + ST(argvi) = sv_newmortal(); + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_t_pool_get) { + { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + apr_pool_t *result = 0 ; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_client__shelf_t_pool_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_t_pool_get" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); } + arg1 = (struct svn_client__shelf_t *)(argp1); + result = (apr_pool_t *) ((arg1)->pool); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_apr_pool_t, 0 | 0); argvi++ ; XSRETURN(argvi); fail: @@ -33043,22 +34187,22 @@ XS(_wrap_svn_client_shelved_patch_info_t_mtime_get) { } -XS(_wrap_new_svn_client_shelved_patch_info_t) { +XS(_wrap_new_svn_client__shelf_t) { { int argvi = 0; - struct svn_client_shelved_patch_info_t *result = 0 ; + struct svn_client__shelf_t *result = 0 ; dXSARGS; if ((items < 0) || (items > 0)) { - SWIG_croak("Usage: new_svn_client_shelved_patch_info_t();"); + SWIG_croak("Usage: new_svn_client__shelf_t();"); } { - result = (struct svn_client_shelved_patch_info_t *)calloc(1, sizeof(struct svn_client_shelved_patch_info_t)); + result = (struct svn_client__shelf_t *)calloc(1, sizeof(struct svn_client__shelf_t)); } - ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client_shelved_patch_info_t, SWIG_OWNER | SWIG_SHADOW); argvi++ ; + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client__shelf_t, SWIG_OWNER | SWIG_SHADOW); argvi++ ; XSRETURN(argvi); fail: SWIG_croak_null(); @@ -33066,22 +34210,22 @@ XS(_wrap_new_svn_client_shelved_patch_info_t) { } -XS(_wrap_delete_svn_client_shelved_patch_info_t) { +XS(_wrap_delete_svn_client__shelf_t) { { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int argvi = 0; dXSARGS; if ((items < 1) || (items > 1)) { - SWIG_croak("Usage: delete_svn_client_shelved_patch_info_t(self);"); + SWIG_croak("Usage: delete_svn_client__shelf_t(self);"); } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, SWIG_POINTER_DISOWN | 0 ); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, SWIG_POINTER_DISOWN | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_svn_client_shelved_patch_info_t" "', argument " "1"" of type '" "struct svn_client_shelved_patch_info_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_svn_client__shelf_t" "', argument " "1"" of type '" "struct svn_client__shelf_t *""'"); } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); + arg1 = (struct svn_client__shelf_t *)(argp1); { free((char *) arg1); @@ -33098,143 +34242,2089 @@ XS(_wrap_delete_svn_client_shelved_patch_info_t) { } -XS(_wrap_svn_client_shelves_list) { +XS(_wrap_svn_client__shelf_version_t_shelf_set) { { - apr_hash_t **arg1 = (apr_hash_t **) 0 ; - char *arg2 = (char *) 0 ; - svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg4 = (apr_pool_t *) 0 ; - apr_pool_t *arg5 = (apr_pool_t *) 0 ; - apr_pool_t *_global_pool ; - apr_hash_t *temp1 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; int argvi = 0; - svn_error_t *result = 0 ; dXSARGS; - { - _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); - SPAGAIN; - } - { - _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); - SPAGAIN; + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_client__shelf_version_t_shelf_set(self,shelf);"); } - arg1 = &temp1; - if ((items < 2) || (items > 4)) { - SWIG_croak("Usage: svn_client_shelves_list(local_abspath,ctx,result_pool,scratch_pool);"); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_t_shelf_set" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); } - res2 = SWIG_AsCharPtrAndSize(ST(0), &buf2, NULL, &alloc2); + arg1 = (struct svn_client__shelf_version_t *)(argp1); + res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_client__shelf_t, SWIG_POINTER_DISOWN | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_shelves_list" "', argument " "2"" of type '" "char const *""'"); - } - arg2 = (char *)(buf2); - res3 = SWIG_ConvertPtr(ST(1), &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client_shelves_list" "', argument " "3"" of type '" "svn_client_ctx_t *""'"); - } - arg3 = (svn_client_ctx_t *)(argp3); - if (items > 2) { - - } - if (items > 3) { - + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_version_t_shelf_set" "', argument " "2"" of type '" "svn_client__shelf_t *""'"); } - { - result = (svn_error_t *)svn_client_shelves_list(arg1,(char const *)arg2,arg3,arg4,arg5); - - - - } - { - if (result) { - SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); - - if (SvOK(exception_handler)) { - SV *callback_result; - - PUTBACK; - svn_swig_pl_callback_thunk (CALL_SV, exception_handler, - &callback_result, "S", result, - SWIGTYPE_p_svn_error_t); - SPAGAIN; - } else { - ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); - argvi++; - } - } + arg2 = (svn_client__shelf_t *)(argp2); + if (arg1) (arg1)->shelf = arg2; + ST(argvi) = sv_newmortal(); + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_version_t_shelf_get) { + { + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + svn_client__shelf_t *result = 0 ; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_client__shelf_version_t_shelf_get(self);"); } - { - /* FIXME: Missing argout typemap: svn_client_shelves_list arg 1 (apr_hash_t **) */ - - - - - SWIG_exception(SWIG_ValueError, "svn_client_shelves_list is not implemented yet"); - + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_t_shelf_get" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); } + arg1 = (struct svn_client__shelf_version_t *)(argp1); + result = (svn_client__shelf_t *) ((arg1)->shelf); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client__shelf_t, 0 | SWIG_SHADOW); argvi++ ; - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_version_t_mtime_set) { + { + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + apr_time_t arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + long long val2 ; + int ecode2 = 0 ; + int argvi = 0; + dXSARGS; + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_client__shelf_version_t_mtime_set(self,mtime);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_t_mtime_set" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); + } + arg1 = (struct svn_client__shelf_version_t *)(argp1); + ecode2 = SWIG_AsVal_long_SS_long SWIG_PERL_CALL_ARGS_2(ST(1), &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client__shelf_version_t_mtime_set" "', argument " "2"" of type '" "apr_time_t""'"); + } + arg2 = (apr_time_t)(val2); + if (arg1) (arg1)->mtime = arg2; + ST(argvi) = sv_newmortal(); XSRETURN(argvi); fail: - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_version_t_mtime_get) { + { + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + apr_time_t result; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_client__shelf_version_t_mtime_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_t_mtime_get" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); + } + arg1 = (struct svn_client__shelf_version_t *)(argp1); + result = ((arg1)->mtime); + { + char temp[30]; + sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result); + if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++ ; + } + XSRETURN(argvi); + fail: SWIG_croak_null(); } } -XS(_wrap_svn_client_shelves_any) { +XS(_wrap_svn_client__shelf_version_t_files_dir_abspath_set) { { - svn_boolean_t *arg1 = (svn_boolean_t *) 0 ; + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; char *arg2 = (char *) 0 ; - svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg4 = (apr_pool_t *) 0 ; - apr_pool_t *_global_pool ; - svn_boolean_t temp1 ; - int res1 = SWIG_TMPOBJ ; + void *argp1 = 0 ; + int res1 = 0 ; int res2 ; char *buf2 = 0 ; int alloc2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; int argvi = 0; - svn_error_t *result = 0 ; dXSARGS; - { + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_client__shelf_version_t_files_dir_abspath_set(self,files_dir_abspath);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_t_files_dir_abspath_set" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); + } + arg1 = (struct svn_client__shelf_version_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_version_t_files_dir_abspath_set" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + { + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->files_dir_abspath) free((char *)arg1->files_dir_abspath); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->files_dir_abspath = copied; + } + ST(argvi) = sv_newmortal(); + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_version_t_files_dir_abspath_get) { + { + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + char *result = 0 ; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_client__shelf_version_t_files_dir_abspath_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_t_files_dir_abspath_get" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); + } + arg1 = (struct svn_client__shelf_version_t *)(argp1); + result = (char *) ((arg1)->files_dir_abspath); + ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_version_t_version_number_set) { + { + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + int arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_client__shelf_version_t_version_number_set(self,version_number);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_t_version_number_set" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); + } + arg1 = (struct svn_client__shelf_version_t *)(argp1); + ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client__shelf_version_t_version_number_set" "', argument " "2"" of type '" "int""'"); + } + arg2 = (int)(val2); + if (arg1) (arg1)->version_number = arg2; + ST(argvi) = sv_newmortal(); + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_version_t_version_number_get) { + { + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + int result; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_client__shelf_version_t_version_number_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_t_version_number_get" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); + } + arg1 = (struct svn_client__shelf_version_t *)(argp1); + result = (int) ((arg1)->version_number); + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_new_svn_client__shelf_version_t) { + { + int argvi = 0; + struct svn_client__shelf_version_t *result = 0 ; + dXSARGS; + + if ((items < 0) || (items > 0)) { + SWIG_croak("Usage: new_svn_client__shelf_version_t();"); + } + { + result = (struct svn_client__shelf_version_t *)calloc(1, sizeof(struct svn_client__shelf_version_t)); + + + + } + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client__shelf_version_t, SWIG_OWNER | SWIG_SHADOW); argvi++ ; + XSRETURN(argvi); + fail: + SWIG_croak_null(); + } +} + + +XS(_wrap_delete_svn_client__shelf_version_t) { + { + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: delete_svn_client__shelf_version_t(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_svn_client__shelf_version_t" "', argument " "1"" of type '" "struct svn_client__shelf_version_t *""'"); + } + arg1 = (struct svn_client__shelf_version_t *)(argp1); + { + free((char *) arg1); + + + + } + ST(argvi) = sv_newmortal(); + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_open_or_create) { + { + svn_client__shelf_t **arg1 = (svn_client__shelf_t **) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + svn_client__shelf_t *temp1 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + void *argp4 = 0 ; + int res4 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + if ((items < 3) || (items > 4)) { + SWIG_croak("Usage: svn_client__shelf_open_or_create(name,local_abspath,ctx,result_pool);"); + } + res2 = SWIG_AsCharPtrAndSize(ST(0), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_open_or_create" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client__shelf_open_or_create" "', argument " "3"" of type '" "char const *""'"); + } + arg3 = (char *)(buf3); + res4 = SWIG_ConvertPtr(ST(2), &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client__shelf_open_or_create" "', argument " "4"" of type '" "svn_client_ctx_t *""'"); + } + arg4 = (svn_client_ctx_t *)(argp4); + if (items > 3) { + + } + { + result = (svn_error_t *)svn_client__shelf_open_or_create(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_open_or_create arg 1 (svn_client__shelf_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_open_or_create is not implemented yet"); + + } + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_open_existing) { + { + svn_client__shelf_t **arg1 = (svn_client__shelf_t **) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + svn_client__shelf_t *temp1 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + void *argp4 = 0 ; + int res4 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + if ((items < 3) || (items > 4)) { + SWIG_croak("Usage: svn_client__shelf_open_existing(name,local_abspath,ctx,result_pool);"); + } + res2 = SWIG_AsCharPtrAndSize(ST(0), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_open_existing" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client__shelf_open_existing" "', argument " "3"" of type '" "char const *""'"); + } + arg3 = (char *)(buf3); + res4 = SWIG_ConvertPtr(ST(2), &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client__shelf_open_existing" "', argument " "4"" of type '" "svn_client_ctx_t *""'"); + } + arg4 = (svn_client_ctx_t *)(argp4); + if (items > 3) { + + } + { + result = (svn_error_t *)svn_client__shelf_open_existing(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_open_existing arg 1 (svn_client__shelf_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_open_existing is not implemented yet"); + + } + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_close) { + { + svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 1) || (items > 2)) { + SWIG_croak("Usage: svn_client__shelf_close(shelf,scratch_pool);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_close" "', argument " "1"" of type '" "svn_client__shelf_t *""'"); + } + arg1 = (svn_client__shelf_t *)(argp1); + if (items > 1) { + + } + { + result = (svn_error_t *)svn_client__shelf_close(arg1,arg2); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_delete) { + { + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + svn_boolean_t arg3 ; + svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int val3 ; + int ecode3 = 0 ; + void *argp4 = 0 ; + int res4 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 4) || (items > 5)) { + SWIG_croak("Usage: svn_client__shelf_delete(name,local_abspath,dry_run,ctx,scratch_pool);"); + } + res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_delete" "', argument " "1"" of type '" "char const *""'"); + } + arg1 = (char *)(buf1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_delete" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_client__shelf_delete" "', argument " "3"" of type '" "svn_boolean_t""'"); + } + arg3 = (svn_boolean_t)(val3); + res4 = SWIG_ConvertPtr(ST(3), &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client__shelf_delete" "', argument " "4"" of type '" "svn_client_ctx_t *""'"); + } + arg4 = (svn_client_ctx_t *)(argp4); + if (items > 4) { + + } + { + result = (svn_error_t *)svn_client__shelf_delete((char const *)arg1,(char const *)arg2,arg3,arg4,arg5); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + + + XSRETURN(argvi); + fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_mods_editor) { + { + svn_delta_editor_t **arg1 = (svn_delta_editor_t **) 0 ; + void **arg2 = (void **) 0 ; + svn_client__shelf_version_t *arg3 = (svn_client__shelf_version_t *) 0 ; + svn_wc_notify_func2_t arg4 = (svn_wc_notify_func2_t) 0 ; + void *arg5 = (void *) 0 ; + svn_client_ctx_t *arg6 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + svn_delta_editor_t *temp1 ; + void *temp2 ; + void *argp3 = 0 ; + int res3 = 0 ; + SV *_global_callback ; + void *argp6 = 0 ; + int res6 = 0 ; + int argvi = 0; + SV * _saved[1] ; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + arg2 = &temp2; + if ((items < 4) || (items > 5)) { + SWIG_croak("Usage: svn_client__shelf_mods_editor(shelf_version,notify_func,notify_baton,ctx,result_pool);"); + } + res3 = SWIG_ConvertPtr(ST(0), &argp3,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client__shelf_mods_editor" "', argument " "3"" of type '" "svn_client__shelf_version_t *""'"); + } + arg3 = (svn_client__shelf_version_t *)(argp3); + { + int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg4), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client__shelf_mods_editor" "', argument " "4"" of type '" "svn_wc_notify_func2_t""'"); + } + } + { + _global_callback = ST(2); + arg5 = (void *) _global_callback; + } + res6 = SWIG_ConvertPtr(ST(3), &argp6,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res6)) { + SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_client__shelf_mods_editor" "', argument " "6"" of type '" "svn_client_ctx_t *""'"); + } + arg6 = (svn_client_ctx_t *)(argp6); + if (items > 4) { + + } + _saved[0] = ST(2); + { + result = (svn_error_t *)svn_client__shelf_mods_editor((struct svn_delta_editor_t const **)arg1,arg2,arg3,arg4,arg5,arg6,arg7); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t, 0); argvi++ ; + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_mods_editor arg 2 (void **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_mods_editor is not implemented yet"); + + } + { + /* callback baton */ + if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newRV_inc(_global_callback)); argvi++ ; + } + + + + + + + + XSRETURN(argvi); + fail: + + + + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_save_new_version3) { + { + svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + apr_array_header_t *arg3 = (apr_array_header_t *) 0 ; + svn_depth_t arg4 ; + apr_array_header_t *arg5 = (apr_array_header_t *) 0 ; + svn_client_status_func_t arg6 = (svn_client_status_func_t) 0 ; + void *arg7 = (void *) 0 ; + svn_client_status_func_t arg8 = (svn_client_status_func_t) 0 ; + void *arg9 = (void *) 0 ; + apr_pool_t *arg10 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + svn_client__shelf_version_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + int val4 ; + int ecode4 = 0 ; + int res7 ; + int res9 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + if ((items < 8) || (items > 9)) { + SWIG_croak("Usage: svn_client__shelf_save_new_version3(shelf,paths,depth,changelists,shelved_func,shelved_baton,not_shelved_func,not_shelved_baton,scratch_pool);"); + } + res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_save_new_version3" "', argument " "2"" of type '" "svn_client__shelf_t *""'"); + } + arg2 = (svn_client__shelf_t *)(argp2); + { + arg3 = svn_swig_pl_strings_to_array(ST(1), + _global_pool); + } + ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_client__shelf_save_new_version3" "', argument " "4"" of type '" "svn_depth_t""'"); + } + arg4 = (svn_depth_t)(val4); + { + arg5 = SvOK(ST(3)) ? svn_swig_pl_strings_to_array( + ST(3), _global_pool) : NULL; + } + { + int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg6), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client__shelf_save_new_version3" "', argument " "6"" of type '" "svn_client_status_func_t""'"); + } + } + res7 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg7), 0, 0); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_client__shelf_save_new_version3" "', argument " "7"" of type '" "void *""'"); + } + { + int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg8), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client__shelf_save_new_version3" "', argument " "8"" of type '" "svn_client_status_func_t""'"); + } + } + res9 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg9), 0, 0); + if (!SWIG_IsOK(res9)) { + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_client__shelf_save_new_version3" "', argument " "9"" of type '" "void *""'"); + } + if (items > 8) { + + } + { + result = (svn_error_t *)svn_client__shelf_save_new_version3(arg1,arg2,(apr_array_header_t const *)arg3,arg4,(apr_array_header_t const *)arg5,arg6,arg7,arg8,arg9,arg10); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_save_new_version3 arg 1 (svn_client__shelf_version_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_save_new_version3 is not implemented yet"); + + } + + + + + + + + + + + XSRETURN(argvi); + fail: + + + + + + + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_delete_newer_versions) { + { + svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ; + svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 2) || (items > 3)) { + SWIG_croak("Usage: svn_client__shelf_delete_newer_versions(shelf,shelf_version,scratch_pool);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_delete_newer_versions" "', argument " "1"" of type '" "svn_client__shelf_t *""'"); + } + arg1 = (svn_client__shelf_t *)(argp1); + res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_delete_newer_versions" "', argument " "2"" of type '" "svn_client__shelf_version_t *""'"); + } + arg2 = (svn_client__shelf_version_t *)(argp2); + if (items > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_delete_newer_versions(arg1,arg2,arg3); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + + + XSRETURN(argvi); + fail: + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_version_open) { + { + svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + int arg3 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + svn_client__shelf_version_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + int val3 ; + int ecode3 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + { + _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + if ((items < 2) || (items > 4)) { + SWIG_croak("Usage: svn_client__shelf_version_open(shelf,version_number,result_pool,scratch_pool);"); + } + res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_version_open" "', argument " "2"" of type '" "svn_client__shelf_t *""'"); + } + arg2 = (svn_client__shelf_t *)(argp2); + ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_client__shelf_version_open" "', argument " "3"" of type '" "int""'"); + } + arg3 = (int)(val3); + if (items > 2) { + + } + if (items > 3) { + + } + { + result = (svn_error_t *)svn_client__shelf_version_open(arg1,arg2,arg3,arg4,arg5); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_version_open arg 1 (svn_client__shelf_version_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_version_open is not implemented yet"); + + } + + + + + + XSRETURN(argvi); + fail: + + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_get_newest_version) { + { + svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + svn_client__shelf_version_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + if ((items < 1) || (items > 3)) { + SWIG_croak("Usage: svn_client__shelf_get_newest_version(shelf,result_pool,scratch_pool);"); + } + res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_get_newest_version" "', argument " "2"" of type '" "svn_client__shelf_t *""'"); + } + arg2 = (svn_client__shelf_t *)(argp2); + if (items > 1) { + + } + if (items > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_get_newest_version(arg1,arg2,arg3,arg4); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_get_newest_version arg 1 (svn_client__shelf_version_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_newest_version is not implemented yet"); + + } + + + + + XSRETURN(argvi); + fail: + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_get_all_versions) { + { + apr_array_header_t **arg1 = (apr_array_header_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + apr_array_header_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + if ((items < 1) || (items > 3)) { + SWIG_croak("Usage: svn_client__shelf_get_all_versions(shelf,result_pool,scratch_pool);"); + } + res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_get_all_versions" "', argument " "2"" of type '" "svn_client__shelf_t *""'"); + } + arg2 = (svn_client__shelf_t *)(argp2); + if (items > 1) { + + } + if (items > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_get_all_versions(arg1,arg2,arg3,arg4); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_get_all_versions arg 1 (apr_array_header_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_all_versions is not implemented yet"); + + } + + + + + XSRETURN(argvi); + fail: + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_apply) { + { + svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ; + svn_boolean_t arg2 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 2) || (items > 3)) { + SWIG_croak("Usage: svn_client__shelf_apply(shelf_version,dry_run,scratch_pool);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_apply" "', argument " "1"" of type '" "svn_client__shelf_version_t *""'"); + } + arg1 = (svn_client__shelf_version_t *)(argp1); + ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client__shelf_apply" "', argument " "2"" of type '" "svn_boolean_t""'"); + } + arg2 = (svn_boolean_t)(val2); + if (items > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_apply(arg1,arg2,arg3); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + + + XSRETURN(argvi); + fail: + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_test_apply_file) { + { + svn_boolean_t *arg1 = (svn_boolean_t *) 0 ; + svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_t *) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + svn_boolean_t temp1 ; + int res1 = SWIG_TMPOBJ ; + void *argp2 = 0 ; + int res2 = 0 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + if ((items < 2) || (items > 3)) { + SWIG_croak("Usage: svn_client__shelf_test_apply_file(shelf_version,file_relpath,scratch_pool);"); + } + res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_test_apply_file" "', argument " "2"" of type '" "svn_client__shelf_version_t *""'"); + } + arg2 = (svn_client__shelf_version_t *)(argp2); + res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client__shelf_test_apply_file" "', argument " "3"" of type '" "char const *""'"); + } + arg3 = (char *)(buf3); + if (items > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_test_apply_file(arg1,arg2,(char const *)arg3,arg4); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + if (SWIG_IsTmpObj(res1)) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1((*arg1)); argvi++ ; + } else { + int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN | 0) : 0; + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags); argvi++ ; + } + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + XSRETURN(argvi); + fail: + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_unapply) { + { + svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ; + svn_boolean_t arg2 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 2) || (items > 3)) { + SWIG_croak("Usage: svn_client__shelf_unapply(shelf_version,dry_run,scratch_pool);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_unapply" "', argument " "1"" of type '" "svn_client__shelf_version_t *""'"); + } + arg1 = (svn_client__shelf_version_t *)(argp1); + ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client__shelf_unapply" "', argument " "2"" of type '" "svn_boolean_t""'"); + } + arg2 = (svn_boolean_t)(val2); + if (items > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_unapply(arg1,arg2,arg3); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + + + XSRETURN(argvi); + fail: + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_replay) { + { + svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_delta_editor_t *arg3 = (svn_delta_editor_t *) 0 ; + void *arg4 = (void *) 0 ; + svn_wc_notify_func2_t arg5 = (svn_wc_notify_func2_t) 0 ; + void *arg6 = (void *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + SV *_global_callback ; + int argvi = 0; + SV * _saved[1] ; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 5) || (items > 6)) { + SWIG_croak("Usage: svn_client__shelf_replay(shelf_version,top_relpath,editor,edit_baton,notify_func,notify_baton,scratch_pool);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_replay" "', argument " "1"" of type '" "svn_client__shelf_version_t *""'"); + } + arg1 = (svn_client__shelf_version_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_replay" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + { + svn_swig_pl_make_editor(&arg3, &arg4, ST(2), _global_pool); + } + { + int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg5), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client__shelf_replay" "', argument " "5"" of type '" "svn_wc_notify_func2_t""'"); + } + } + { + _global_callback = ST(4); + arg6 = (void *) _global_callback; + } + if (items > 5) { + + } + _saved[0] = ST(4); + { + result = (svn_error_t *)svn_client__shelf_replay(arg1,(char const *)arg2,(struct svn_delta_editor_t const *)arg3,arg4,arg5,arg6,arg7); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + /* callback baton */ + if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newRV_inc(_global_callback)); argvi++ ; + } + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + + + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_paths_changed) { + { + apr_hash_t **arg1 = (apr_hash_t **) 0 ; + svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + apr_hash_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + { _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); SPAGAIN; } arg1 = &temp1; - if ((items < 2) || (items > 3)) { - SWIG_croak("Usage: svn_client_shelves_any(local_abspath,ctx,scratch_pool);"); + if ((items < 1) || (items > 3)) { + SWIG_croak("Usage: svn_client__shelf_paths_changed(shelf_version,result_pool,scratch_pool);"); } - res2 = SWIG_AsCharPtrAndSize(ST(0), &buf2, NULL, &alloc2); + res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_paths_changed" "', argument " "2"" of type '" "svn_client__shelf_version_t *""'"); + } + arg2 = (svn_client__shelf_version_t *)(argp2); + if (items > 1) { + + } + if (items > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_paths_changed(arg1,arg2,arg3,arg4); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_paths_changed arg 1 (apr_hash_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_paths_changed is not implemented yet"); + + } + + + + + XSRETURN(argvi); + fail: + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_revprop_set) { + { + svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_string_t *arg3 = (svn_string_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + svn_string_t value3 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 3) || (items > 4)) { + SWIG_croak("Usage: svn_client__shelf_revprop_set(shelf,prop_name,prop_val,scratch_pool);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_revprop_set" "', argument " "1"" of type '" "svn_client__shelf_t *""'"); + } + arg1 = (svn_client__shelf_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_shelves_any" "', argument " "2"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_revprop_set" "', argument " "2"" of type '" "char const *""'"); } arg2 = (char *)(buf2); - res3 = SWIG_ConvertPtr(ST(1), &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + { + if (SvOK(ST(2))) { + value3.data = SvPV(ST(2), value3.len); + arg3 = &value3; + } + else { + arg3 = NULL; + } + } + if (items > 3) { + + } + { + result = (svn_error_t *)svn_client__shelf_revprop_set(arg1,(char const *)arg2,(struct svn_string_t const *)arg3,arg4); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_revprop_set_all) { + { + svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ; + apr_hash_t *arg2 = (apr_hash_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 2) || (items > 3)) { + SWIG_croak("Usage: svn_client__shelf_revprop_set_all(shelf,revprop_table,scratch_pool);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_revprop_set_all" "', argument " "1"" of type '" "svn_client__shelf_t *""'"); + } + arg1 = (svn_client__shelf_t *)(argp1); + { + if (_global_pool == NULL) { + _global_pool = svn_swig_pl_make_pool((SV *)NULL); + SPAGAIN; + } + arg2 = svn_swig_pl_hash_to_prophash(ST(1), _global_pool); + } + if (items > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_revprop_set_all(arg1,arg2,arg3); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + + + XSRETURN(argvi); + fail: + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_revprop_get) { + { + svn_string_t **arg1 = (svn_string_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + svn_string_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + if ((items < 2) || (items > 3)) { + SWIG_croak("Usage: svn_client__shelf_revprop_get(shelf,prop_name,result_pool);"); + } + res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_revprop_get" "', argument " "2"" of type '" "svn_client__shelf_t *""'"); + } + arg2 = (svn_client__shelf_t *)(argp2); + res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client_shelves_any" "', argument " "3"" of type '" "svn_client_ctx_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client__shelf_revprop_get" "', argument " "3"" of type '" "char const *""'"); } - arg3 = (svn_client_ctx_t *)(argp3); + arg3 = (char *)(buf3); + if (items > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_revprop_get(arg1,arg2,(char const *)arg3,arg4); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + if (*arg1) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpvn((*arg1)->data, (*arg1)->len)); argvi++ ; + } else { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = &PL_sv_undef; argvi++ ; + } + } + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + XSRETURN(argvi); + fail: + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_revprop_list) { + { + apr_hash_t **arg1 = (apr_hash_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + apr_hash_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + if ((items < 1) || (items > 2)) { + SWIG_croak("Usage: svn_client__shelf_revprop_list(shelf,result_pool);"); + } + res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_revprop_list" "', argument " "2"" of type '" "svn_client__shelf_t *""'"); + } + arg2 = (svn_client__shelf_t *)(argp2); + if (items > 1) { + + } + { + result = (svn_error_t *)svn_client__shelf_revprop_list(arg1,arg2,arg3); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = svn_swig_pl_prophash_to_hash(*arg1); argvi++ ; + } + + + + XSRETURN(argvi); + fail: + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_set_log_message) { + { + svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ; + char *arg2 = (char *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 2) || (items > 3)) { + SWIG_croak("Usage: svn_client__shelf_set_log_message(shelf,log_message,scratch_pool);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_set_log_message" "', argument " "1"" of type '" "svn_client__shelf_t *""'"); + } + arg1 = (svn_client__shelf_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_set_log_message" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); if (items > 2) { } { - result = (svn_error_t *)svn_client_shelves_any(arg1,(char const *)arg2,arg3,arg4); + result = (svn_error_t *)svn_client__shelf_set_log_message(arg1,(char const *)arg2,arg3); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_get_log_message) { + { + char **arg1 = (char **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + char *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + if ((items < 1) || (items > 2)) { + SWIG_croak("Usage: svn_client__shelf_get_log_message(shelf,result_pool);"); + } + res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_get_log_message" "', argument " "2"" of type '" "svn_client__shelf_t *""'"); + } + arg2 = (svn_client__shelf_t *)(argp2); + if (items > 1) { + + } + { + result = (svn_error_t *)svn_client__shelf_get_log_message(arg1,arg2,arg3); @@ -33257,20 +36347,21 @@ XS(_wrap_svn_client_shelves_any) { } } } - if (SWIG_IsTmpObj(res1)) { - if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1((*arg1)); argvi++ ; - } else { - int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN | 0) : 0; - if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags); argvi++ ; + { + /* FIXME: Missing argout typemap: svn_client__shelf_get_log_message arg 1 (char **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_log_message is not implemented yet"); + } - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); XSRETURN(argvi); fail: - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); SWIG_croak_null(); @@ -33278,63 +36369,178 @@ XS(_wrap_svn_client_shelves_any) { } -XS(_wrap_svn_client_shelf_get_paths) { +XS(_wrap_svn_client__shelf_info_t_mtime_set) { + { + struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *) 0 ; + apr_time_t arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + long long val2 ; + int ecode2 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_client__shelf_info_t_mtime_set(self,mtime);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_info_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_info_t_mtime_set" "', argument " "1"" of type '" "struct svn_client__shelf_info_t *""'"); + } + arg1 = (struct svn_client__shelf_info_t *)(argp1); + ecode2 = SWIG_AsVal_long_SS_long SWIG_PERL_CALL_ARGS_2(ST(1), &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client__shelf_info_t_mtime_set" "', argument " "2"" of type '" "apr_time_t""'"); + } + arg2 = (apr_time_t)(val2); + if (arg1) (arg1)->mtime = arg2; + ST(argvi) = sv_newmortal(); + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_info_t_mtime_get) { + { + struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + apr_time_t result; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_client__shelf_info_t_mtime_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_info_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_info_t_mtime_get" "', argument " "1"" of type '" "struct svn_client__shelf_info_t *""'"); + } + arg1 = (struct svn_client__shelf_info_t *)(argp1); + result = ((arg1)->mtime); + { + char temp[30]; + sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result); + if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++ ; + } + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_new_svn_client__shelf_info_t) { + { + int argvi = 0; + struct svn_client__shelf_info_t *result = 0 ; + dXSARGS; + + if ((items < 0) || (items > 0)) { + SWIG_croak("Usage: new_svn_client__shelf_info_t();"); + } + { + result = (struct svn_client__shelf_info_t *)calloc(1, sizeof(struct svn_client__shelf_info_t)); + + + + } + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client__shelf_info_t, SWIG_OWNER | SWIG_SHADOW); argvi++ ; + XSRETURN(argvi); + fail: + SWIG_croak_null(); + } +} + + +XS(_wrap_delete_svn_client__shelf_info_t) { + { + struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: delete_svn_client__shelf_info_t(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_info_t, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_svn_client__shelf_info_t" "', argument " "1"" of type '" "struct svn_client__shelf_info_t *""'"); + } + arg1 = (struct svn_client__shelf_info_t *)(argp1); + { + free((char *) arg1); + + + + } + ST(argvi) = sv_newmortal(); + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client__shelf_list) { { apr_hash_t **arg1 = (apr_hash_t **) 0 ; char *arg2 = (char *) 0 ; - char *arg3 = (char *) 0 ; - svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; apr_pool_t *arg5 = (apr_pool_t *) 0 ; - apr_pool_t *arg6 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool ; apr_hash_t *temp1 ; int res2 ; char *buf2 = 0 ; int alloc2 = 0 ; - int res3 ; - char *buf3 = 0 ; - int alloc3 = 0 ; - void *argp4 = 0 ; - int res4 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; int argvi = 0; svn_error_t *result = 0 ; dXSARGS; { - _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); SPAGAIN; } { - _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1)); + _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); SPAGAIN; } arg1 = &temp1; - if ((items < 3) || (items > 5)) { - SWIG_croak("Usage: svn_client_shelf_get_paths(name,local_abspath,ctx,result_pool,scratch_pool);"); + if ((items < 2) || (items > 4)) { + SWIG_croak("Usage: svn_client__shelf_list(local_abspath,ctx,result_pool,scratch_pool);"); } res2 = SWIG_AsCharPtrAndSize(ST(0), &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_shelf_get_paths" "', argument " "2"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_list" "', argument " "2"" of type '" "char const *""'"); } arg2 = (char *)(buf2); - res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3); + res3 = SWIG_ConvertPtr(ST(1), &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client_shelf_get_paths" "', argument " "3"" of type '" "char const *""'"); - } - arg3 = (char *)(buf3); - res4 = SWIG_ConvertPtr(ST(2), &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client_shelf_get_paths" "', argument " "4"" of type '" "svn_client_ctx_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client__shelf_list" "', argument " "3"" of type '" "svn_client_ctx_t *""'"); } - arg4 = (svn_client_ctx_t *)(argp4); - if (items > 3) { + arg3 = (svn_client_ctx_t *)(argp3); + if (items > 2) { } - if (items > 4) { + if (items > 3) { } { - result = (svn_error_t *)svn_client_shelf_get_paths(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6); + result = (svn_error_t *)svn_client__shelf_list(arg1,(char const *)arg2,arg3,arg4,arg5); @@ -33358,17 +36564,16 @@ XS(_wrap_svn_client_shelf_get_paths) { } } { - /* FIXME: Missing argout typemap: svn_client_shelf_get_paths arg 1 (apr_hash_t **) */ + /* FIXME: Missing argout typemap: svn_client__shelf_list arg 1 (apr_hash_t **) */ - SWIG_exception(SWIG_ValueError, "svn_client_shelf_get_paths is not implemented yet"); + SWIG_exception(SWIG_ValueError, "svn_client__shelf_list is not implemented yet"); } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); @@ -33376,7 +36581,6 @@ XS(_wrap_svn_client_shelf_get_paths) { fail: if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); @@ -33385,24 +36589,20 @@ XS(_wrap_svn_client_shelf_get_paths) { } -XS(_wrap_svn_client_shelf_has_changes) { +XS(_wrap_svn_client__shelf_version_status_walk) { { - svn_boolean_t *arg1 = (svn_boolean_t *) 0 ; + svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ; char *arg2 = (char *) 0 ; - char *arg3 = (char *) 0 ; - svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + svn_wc_status_func4_t arg3 = (svn_wc_status_func4_t) 0 ; + void *arg4 = (void *) 0 ; apr_pool_t *arg5 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool ; - svn_boolean_t temp1 ; - int res1 = SWIG_TMPOBJ ; + void *argp1 = 0 ; + int res1 = 0 ; int res2 ; char *buf2 = 0 ; int alloc2 = 0 ; - int res3 ; - char *buf3 = 0 ; - int alloc3 = 0 ; - void *argp4 = 0 ; - int res4 = 0 ; + int res4 ; int argvi = 0; svn_error_t *result = 0 ; dXSARGS; @@ -33411,30 +36611,34 @@ XS(_wrap_svn_client_shelf_has_changes) { _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1)); SPAGAIN; } - arg1 = &temp1; - if ((items < 3) || (items > 4)) { - SWIG_croak("Usage: svn_client_shelf_has_changes(name,local_abspath,ctx,scratch_pool);"); + if ((items < 4) || (items > 5)) { + SWIG_croak("Usage: svn_client__shelf_version_status_walk(shelf_version,wc_relpath,walk_func,walk_baton,scratch_pool);"); } - res2 = SWIG_AsCharPtrAndSize(ST(0), &buf2, NULL, &alloc2); + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client__shelf_version_status_walk" "', argument " "1"" of type '" "svn_client__shelf_version_t *""'"); + } + arg1 = (svn_client__shelf_version_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_shelf_has_changes" "', argument " "2"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client__shelf_version_status_walk" "', argument " "2"" of type '" "char const *""'"); } arg2 = (char *)(buf2); - res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client_shelf_has_changes" "', argument " "3"" of type '" "char const *""'"); + { + int res = SWIG_ConvertFunctionPtr(ST(2), (void**)(&arg3), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client__shelf_version_status_walk" "', argument " "3"" of type '" "svn_wc_status_func4_t""'"); + } } - arg3 = (char *)(buf3); - res4 = SWIG_ConvertPtr(ST(2), &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + res4 = SWIG_ConvertPtr(ST(3),SWIG_as_voidptrptr(&arg4), 0, 0); if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client_shelf_has_changes" "', argument " "4"" of type '" "svn_client_ctx_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client__shelf_version_status_walk" "', argument " "4"" of type '" "void *""'"); } - arg4 = (svn_client_ctx_t *)(argp4); - if (items > 3) { + if (items > 4) { } { - result = (svn_error_t *)svn_client_shelf_has_changes(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5); + result = (svn_error_t *)svn_client__shelf_version_status_walk(arg1,(char const *)arg2,arg3,arg4,arg5); @@ -33457,22 +36661,16 @@ XS(_wrap_svn_client_shelf_has_changes) { } } } - if (SWIG_IsTmpObj(res1)) { - if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1((*arg1)); argvi++ ; - } else { - int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN | 0) : 0; - if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags); argvi++ ; - } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + XSRETURN(argvi); fail: if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + SWIG_croak_null(); @@ -38874,53 +42072,209 @@ XS(_wrap_svn_client_invoke_get_commit_log2) { } -XS(_wrap_svn_client_invoke_get_commit_log) { +XS(_wrap_svn_client_invoke_get_commit_log) { + { + svn_client_get_commit_log_t arg1 = (svn_client_get_commit_log_t) 0 ; + char **arg2 = (char **) 0 ; + char **arg3 = (char **) 0 ; + apr_array_header_t *arg4 = (apr_array_header_t *) 0 ; + void *arg5 = (void *) 0 ; + apr_pool_t *arg6 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + char *temp2 ; + char *temp3 ; + void *argp4 = 0 ; + int res4 = 0 ; + int res5 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg2 = &temp2; + arg3 = &temp3; + if ((items < 3) || (items > 4)) { + SWIG_croak("Usage: svn_client_invoke_get_commit_log(_obj,commit_items,baton,pool);"); + } + { + int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client_invoke_get_commit_log" "', argument " "1"" of type '" "svn_client_get_commit_log_t""'"); + } + } + res4 = SWIG_ConvertPtr(ST(1), &argp4,SWIGTYPE_p_apr_array_header_t, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client_invoke_get_commit_log" "', argument " "4"" of type '" "apr_array_header_t *""'"); + } + arg4 = (apr_array_header_t *)(argp4); + res5 = SWIG_ConvertPtr(ST(2),SWIG_as_voidptrptr(&arg5), 0, 0); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_client_invoke_get_commit_log" "', argument " "5"" of type '" "void *""'"); + } + if (items > 3) { + + } + { + result = (svn_error_t *)svn_client_invoke_get_commit_log(arg1,(char const **)arg2,(char const **)arg3,arg4,arg5,arg6); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + if (*arg2 == NULL) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = &PL_sv_undef; argvi++ ; + } else { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(*arg2, 0)); argvi++ ; + } + } + { + if (*arg3 == NULL) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = &PL_sv_undef; argvi++ ; + } else { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(*arg3, 0)); argvi++ ; + } + } + + + + + + + XSRETURN(argvi); + fail: + + + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client_invoke_blame_receiver4) { { - svn_client_get_commit_log_t arg1 = (svn_client_get_commit_log_t) 0 ; - char **arg2 = (char **) 0 ; - char **arg3 = (char **) 0 ; - apr_array_header_t *arg4 = (apr_array_header_t *) 0 ; - void *arg5 = (void *) 0 ; - apr_pool_t *arg6 = (apr_pool_t *) 0 ; + svn_client_blame_receiver4_t arg1 = (svn_client_blame_receiver4_t) 0 ; + void *arg2 = (void *) 0 ; + apr_int64_t arg3 ; + svn_revnum_t arg4 ; + apr_hash_t *arg5 = (apr_hash_t *) 0 ; + svn_revnum_t arg6 ; + apr_hash_t *arg7 = (apr_hash_t *) 0 ; + char *arg8 = (char *) 0 ; + svn_string_t *arg9 = (svn_string_t *) 0 ; + svn_boolean_t arg10 ; + apr_pool_t *arg11 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool ; - char *temp2 ; - char *temp3 ; - void *argp4 = 0 ; - int res4 = 0 ; - int res5 ; + int res2 ; + long long val3 ; + int ecode3 = 0 ; + long val4 ; + int ecode4 = 0 ; + void *argp5 = 0 ; + int res5 = 0 ; + long val6 ; + int ecode6 = 0 ; + void *argp7 = 0 ; + int res7 = 0 ; + int res8 ; + char *buf8 = 0 ; + int alloc8 = 0 ; + svn_string_t value9 ; + int val10 ; + int ecode10 = 0 ; int argvi = 0; svn_error_t *result = 0 ; dXSARGS; { - _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1)); + _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1)); SPAGAIN; } - arg2 = &temp2; - arg3 = &temp3; - if ((items < 3) || (items > 4)) { - SWIG_croak("Usage: svn_client_invoke_get_commit_log(_obj,commit_items,baton,pool);"); + if ((items < 10) || (items > 11)) { + SWIG_croak("Usage: svn_client_invoke_blame_receiver4(_obj,baton,line_no,revision,rev_props,merged_revision,merged_rev_props,merged_path,line,local_change,pool);"); } { - int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t); + int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t); if (!SWIG_IsOK(res)) { - SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client_invoke_get_commit_log" "', argument " "1"" of type '" "svn_client_get_commit_log_t""'"); + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client_invoke_blame_receiver4" "', argument " "1"" of type '" "svn_client_blame_receiver4_t""'"); } } - res4 = SWIG_ConvertPtr(ST(1), &argp4,SWIGTYPE_p_apr_array_header_t, 0 | 0 ); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client_invoke_get_commit_log" "', argument " "4"" of type '" "apr_array_header_t *""'"); + res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_invoke_blame_receiver4" "', argument " "2"" of type '" "void *""'"); } - arg4 = (apr_array_header_t *)(argp4); - res5 = SWIG_ConvertPtr(ST(2),SWIG_as_voidptrptr(&arg5), 0, 0); + ecode3 = SWIG_AsVal_long_SS_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_client_invoke_blame_receiver4" "', argument " "3"" of type '" "apr_int64_t""'"); + } + arg3 = (apr_int64_t)(val3); + ecode4 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(3), &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_client_invoke_blame_receiver4" "', argument " "4"" of type '" "svn_revnum_t""'"); + } + arg4 = (svn_revnum_t)(val4); + res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_apr_hash_t, 0 | 0 ); if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_client_invoke_get_commit_log" "', argument " "5"" of type '" "void *""'"); + SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_client_invoke_blame_receiver4" "', argument " "5"" of type '" "apr_hash_t *""'"); } - if (items > 3) { + arg5 = (apr_hash_t *)(argp5); + ecode6 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(5), &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_client_invoke_blame_receiver4" "', argument " "6"" of type '" "svn_revnum_t""'"); + } + arg6 = (svn_revnum_t)(val6); + res7 = SWIG_ConvertPtr(ST(6), &argp7,SWIGTYPE_p_apr_hash_t, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_client_invoke_blame_receiver4" "', argument " "7"" of type '" "apr_hash_t *""'"); + } + arg7 = (apr_hash_t *)(argp7); + res8 = SWIG_AsCharPtrAndSize(ST(7), &buf8, NULL, &alloc8); + if (!SWIG_IsOK(res8)) { + SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_client_invoke_blame_receiver4" "', argument " "8"" of type '" "char const *""'"); + } + arg8 = (char *)(buf8); + { + if (SvOK(ST(8))) { + value9.data = SvPV(ST(8), value9.len); + arg9 = &value9; + } + else { + arg9 = NULL; + } + } + ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(9), &val10); + if (!SWIG_IsOK(ecode10)) { + SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_client_invoke_blame_receiver4" "', argument " "10"" of type '" "svn_boolean_t""'"); + } + arg10 = (svn_boolean_t)(val10); + if (items > 10) { } { - result = (svn_error_t *)svn_client_invoke_get_commit_log(arg1,(char const **)arg2,(char const **)arg3,arg4,arg5,arg6); + result = (svn_error_t *)svn_client_invoke_blame_receiver4(arg1,arg2,arg3,arg4,arg5,arg6,arg7,(char const *)arg8,(struct svn_string_t const *)arg9,arg10,arg11); @@ -38943,26 +42297,17 @@ XS(_wrap_svn_client_invoke_get_commit_log) { } } } - { - if (*arg2 == NULL) { - if (argvi >= items) EXTEND(sp,1); ST(argvi) = &PL_sv_undef; argvi++ ; - } else { - if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(*arg2, 0)); argvi++ ; - } - } - { - if (*arg3 == NULL) { - if (argvi >= items) EXTEND(sp,1); ST(argvi) = &PL_sv_undef; argvi++ ; - } else { - if (argvi >= items) EXTEND(sp,1); ST(argvi) = sv_2mortal(newSVpv(*arg3, 0)); argvi++ ; - } - } + + if (alloc8 == SWIG_NEWOBJ) free((char*)buf8); + + + XSRETURN(argvi); fail: @@ -38971,6 +42316,11 @@ XS(_wrap_svn_client_invoke_get_commit_log) { + + if (alloc8 == SWIG_NEWOBJ) free((char*)buf8); + + + SWIG_croak_null(); } } @@ -39504,6 +42854,167 @@ XS(_wrap_svn_client_invoke_diff_summarize_func) { + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_client_invoke__layout_func) { + { + svn_client__layout_func_t arg1 = (svn_client__layout_func_t) 0 ; + void *arg2 = (void *) 0 ; + char *arg3 = (char *) 0 ; + char *arg4 = (char *) 0 ; + svn_boolean_t arg5 ; + svn_boolean_t arg6 ; + char *arg7 = (char *) 0 ; + svn_boolean_t arg8 ; + svn_revnum_t arg9 ; + svn_boolean_t arg10 ; + svn_depth_t arg11 ; + apr_pool_t *arg12 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + int res2 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + int res4 ; + char *buf4 = 0 ; + int alloc4 = 0 ; + int val5 ; + int ecode5 = 0 ; + int val6 ; + int ecode6 = 0 ; + int res7 ; + char *buf7 = 0 ; + int alloc7 = 0 ; + int val8 ; + int ecode8 = 0 ; + long val9 ; + int ecode9 = 0 ; + int val10 ; + int ecode10 = 0 ; + int val11 ; + int ecode11 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 11) || (items > 12)) { + SWIG_croak("Usage: svn_client_invoke__layout_func(_obj,layout_baton,local_abspath,repos_root_url,not_present,url_changed,url,revision_changed,revision,depth_changed,depth,scratch_pool);"); + } + { + int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client_invoke__layout_func" "', argument " "1"" of type '" "svn_client__layout_func_t""'"); + } + } + res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_invoke__layout_func" "', argument " "2"" of type '" "void *""'"); + } + res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client_invoke__layout_func" "', argument " "3"" of type '" "char const *""'"); + } + arg3 = (char *)(buf3); + res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_client_invoke__layout_func" "', argument " "4"" of type '" "char const *""'"); + } + arg4 = (char *)(buf4); + ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_client_invoke__layout_func" "', argument " "5"" of type '" "svn_boolean_t""'"); + } + arg5 = (svn_boolean_t)(val5); + ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_client_invoke__layout_func" "', argument " "6"" of type '" "svn_boolean_t""'"); + } + arg6 = (svn_boolean_t)(val6); + res7 = SWIG_AsCharPtrAndSize(ST(6), &buf7, NULL, &alloc7); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_client_invoke__layout_func" "', argument " "7"" of type '" "char const *""'"); + } + arg7 = (char *)(buf7); + ecode8 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(7), &val8); + if (!SWIG_IsOK(ecode8)) { + SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "svn_client_invoke__layout_func" "', argument " "8"" of type '" "svn_boolean_t""'"); + } + arg8 = (svn_boolean_t)(val8); + ecode9 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(8), &val9); + if (!SWIG_IsOK(ecode9)) { + SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "svn_client_invoke__layout_func" "', argument " "9"" of type '" "svn_revnum_t""'"); + } + arg9 = (svn_revnum_t)(val9); + ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(9), &val10); + if (!SWIG_IsOK(ecode10)) { + SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_client_invoke__layout_func" "', argument " "10"" of type '" "svn_boolean_t""'"); + } + arg10 = (svn_boolean_t)(val10); + ecode11 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(10), &val11); + if (!SWIG_IsOK(ecode11)) { + SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "svn_client_invoke__layout_func" "', argument " "11"" of type '" "svn_depth_t""'"); + } + arg11 = (svn_depth_t)(val11); + if (items > 11) { + + } + { + result = (svn_error_t *)svn_client_invoke__layout_func(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,(char const *)arg7,arg8,arg9,arg10,arg11,arg12); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + if (alloc4 == SWIG_NEWOBJ) free((char*)buf4); + + + if (alloc7 == SWIG_NEWOBJ) free((char*)buf7); + + + + + + XSRETURN(argvi); + fail: + + + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + if (alloc4 == SWIG_NEWOBJ) free((char*)buf4); + + + if (alloc7 == SWIG_NEWOBJ) free((char*)buf7); + + + + + SWIG_croak_null(); } } @@ -40322,55 +43833,62 @@ static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *| static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void = {"_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void", "void (*)(apr_off_t,apr_off_t,void *,apr_pool_t *)|svn_ra_progress_notify_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const **,char const **,apr_array_header_t *,void *,apr_pool_t *)|svn_client_get_commit_log_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const **,char const **,apr_array_header_t const *,void *,apr_pool_t *)|svn_client_get_commit_log3_t|svn_client_get_commit_log2_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_simple_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_pw_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_username_prompt_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|struct svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_client_diff_summarize_func_t|struct svn_error_t *(*)(svn_client_diff_summarize_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_client_blame_receiver2_t|struct svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,svn_revnum_t,char const *,char const *,char const *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const **,char const **,apr_array_header_t *,void *,apr_pool_t *)|svn_client_get_commit_log_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_client_get_commit_log3_t|svn_error_t *(*)(char const **,char const **,apr_array_header_t const *,void *,apr_pool_t *)|svn_client_get_commit_log2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_simple_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_pw_prompt_func_t|svn_error_t *(*)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_client_cert_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_username_prompt_func_t|svn_error_t *(*)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t|svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t|svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_client_diff_summarize_t const *,void *,apr_pool_t *)|svn_client_diff_summarize_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)|svn_commit_callback2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_client_blame_receiver4_t|svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,apr_hash_t *,svn_revnum_t,apr_hash_t *,char const *,svn_string_t const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,svn_revnum_t,char const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char__int = {"_p_f_p_void_p_q_const__char__int", "int (*)(void *,char const *)|svn_ra_check_tunnel_func_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void = {"_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void", "void (*)(void *,char const *,enum svn_wc_notify_action_t,enum svn_node_kind_t,char const *,enum svn_wc_notify_state_t,enum svn_wc_notify_state_t,long)|svn_wc_notify_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_array_header_t *,apr_pool_t *)|svn_proplist_receiver2_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_pool_t *)|svn_proplist_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_changelist_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t", "svn_client_info_receiver2_t|struct svn_error_t *(*)(void *,char const *,svn_client_info2_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t", "svn_client_status_func_t|struct svn_error_t *(*)(void *,char const *,svn_client_status_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,apr_pool_t *)|svn_client_list_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_list_func2_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_info_t const *,apr_pool_t *)|svn_info_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_proplist_receiver2_t|svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_pool_t *)|svn_proplist_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_changelist_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t", "svn_client__layout_func_t|svn_error_t *(*)(void *,char const *,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_boolean_t,svn_revnum_t,svn_boolean_t,svn_depth_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t", "svn_client_info_receiver2_t|svn_error_t *(*)(void *,char const *,svn_client_info2_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_client_status_t const *,apr_pool_t *)|svn_client_status_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,apr_pool_t *)|svn_client_list_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_list_func2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_info_t const *,apr_pool_t *)|svn_info_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status3_t const *,apr_pool_t *)|svn_wc_status_func4_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void", "void (*)(void *,char const *,struct svn_wc_status2_t *)|svn_wc_status_func2_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void", "void (*)(void *,char const *,struct svn_wc_status_t *)|svn_wc_status_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)|svn_wc_status_func3_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)|svn_wc_status_func3_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void = {"_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void", "svn_wc_notify_func2_t|void (*)(void *,struct svn_wc_notify_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_boolean_t *,char const *,char const *,char const *,apr_pool_t *)|svn_client_patch_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_boolean_t *,char const *,svn_io_dirent2_t const *,apr_pool_t *)|svn_client_import_filter_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t", "svn_client_conflict_walk_func_t|struct svn_error_t *(*)(void *,svn_client_conflict_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,svn_revnum_t,apr_int64_t,svn_revnum_t,apr_hash_t *,svn_revnum_t,apr_hash_t *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_client_blame_receiver3_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_boolean_t *,char const *,char const *,char const *,apr_pool_t *)|svn_client_patch_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_boolean_t *,char const *,svn_io_dirent2_t const *,apr_pool_t *)|svn_client_import_filter_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_client_conflict_t *,apr_pool_t *)|svn_client_conflict_walk_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,svn_revnum_t,apr_int64_t,svn_revnum_t,apr_hash_t *,svn_revnum_t,apr_hash_t *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_client_blame_receiver3_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_array_header_t = {"_p_p_apr_array_header_t", "apr_array_header_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_auth_provider_object_t = {"_p_p_svn_auth_provider_object_t", "struct svn_auth_provider_object_t **|svn_auth_provider_object_t **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_svn_client__shelf_t = {"_p_p_svn_client__shelf_t", "struct svn_client__shelf_t **|svn_client__shelf_t **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_svn_client__shelf_version_t = {"_p_p_svn_client__shelf_version_t", "struct svn_client__shelf_version_t **|svn_client__shelf_version_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_client_commit_info_t = {"_p_p_svn_client_commit_info_t", "struct svn_client_commit_info_t **|svn_client_commit_info_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_client_commit_item3_t = {"_p_p_svn_client_commit_item3_t", "struct svn_client_commit_item3_t **|svn_client_commit_item3_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_client_conflict_t = {"_p_p_svn_client_conflict_t", "struct svn_client_conflict_t **|svn_client_conflict_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_client_ctx_t = {"_p_p_svn_client_ctx_t", "struct svn_client_ctx_t **|svn_client_ctx_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_commit_info_t = {"_p_p_svn_commit_info_t", "struct svn_commit_info_t **|svn_commit_info_t **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_ra_session_t = {"_p_p_svn_ra_session_t", "struct svn_ra_session_t **|svn_ra_session_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_string_t = {"_p_p_svn_string_t", "struct svn_string_t **|svn_string_t **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_auth_baton_t = {"_p_svn_auth_baton_t", "struct svn_auth_baton_t *|svn_auth_baton_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_auth_cred_simple_t = {"_p_svn_auth_cred_simple_t", "struct svn_auth_cred_simple_t *|svn_auth_cred_simple_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_auth_cred_ssl_client_cert_pw_t = {"_p_svn_auth_cred_ssl_client_cert_pw_t", "struct svn_auth_cred_ssl_client_cert_pw_t *|svn_auth_cred_ssl_client_cert_pw_t *", 0, 0, (void*)0, 0}; @@ -40385,6 +43903,9 @@ static swig_type_info _swigt__p_svn_cache_config_t = {"_p_svn_cache_config_t", " static swig_type_info _swigt__p_svn_checksum_ctx_t = {"_p_svn_checksum_ctx_t", "struct svn_checksum_ctx_t *|svn_checksum_ctx_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_checksum_kind_t = {"_p_svn_checksum_kind_t", "enum svn_checksum_kind_t *|svn_checksum_kind_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct svn_checksum_t *|svn_checksum_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_client__shelf_info_t = {"_p_svn_client__shelf_info_t", "struct svn_client__shelf_info_t *|svn_client__shelf_info_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_client__shelf_t = {"_p_svn_client__shelf_t", "struct svn_client__shelf_t *|svn_client__shelf_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_client__shelf_version_t = {"_p_svn_client__shelf_version_t", "struct svn_client__shelf_version_t *|svn_client__shelf_version_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_commit_info_t = {"_p_svn_client_commit_info_t", "struct svn_client_commit_info_t *|svn_client_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_commit_item2_t = {"_p_svn_client_commit_item2_t", "struct svn_client_commit_item2_t *|svn_client_commit_item2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_commit_item3_t = {"_p_svn_client_commit_item3_t", "struct svn_client_commit_item3_t *|svn_client_commit_item3_t *", 0, 0, (void*)0, 0}; @@ -40398,11 +43919,11 @@ static swig_type_info _swigt__p_svn_client_diff_summarize_kind_t = {"_p_svn_clie static swig_type_info _swigt__p_svn_client_diff_summarize_t = {"_p_svn_client_diff_summarize_t", "struct svn_client_diff_summarize_t *|svn_client_diff_summarize_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_info2_t = {"_p_svn_client_info2_t", "struct svn_client_info2_t *|svn_client_info2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_proplist_item_t = {"_p_svn_client_proplist_item_t", "struct svn_client_proplist_item_t *|svn_client_proplist_item_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_client_shelved_patch_info_t = {"_p_svn_client_shelved_patch_info_t", "struct svn_client_shelved_patch_info_t *|svn_client_shelved_patch_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_status_t = {"_p_svn_client_status_t", "struct svn_client_status_t *|svn_client_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_binary_patch_t = {"_p_svn_diff_binary_patch_t", "struct svn_diff_binary_patch_t *|svn_diff_binary_patch_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_conflict_display_style_t = {"_p_svn_diff_conflict_display_style_t", "enum svn_diff_conflict_display_style_t *|svn_diff_conflict_display_style_t *", 0, 0, (void*)0, 0}; @@ -40417,7 +43938,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_info_t = {"_p_svn_info_t", "struct svn_info_t *|svn_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; @@ -40434,6 +43955,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -40519,6 +44041,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void__p_svn_error_t, + &_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, @@ -40527,11 +44050,13 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, + &_swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t, + &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void, &_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void, &_swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, @@ -40547,13 +44072,17 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_p_apr_hash_t, &_swigt__p_p_char, &_swigt__p_p_svn_auth_provider_object_t, + &_swigt__p_p_svn_client__shelf_t, + &_swigt__p_p_svn_client__shelf_version_t, &_swigt__p_p_svn_client_commit_info_t, &_swigt__p_p_svn_client_commit_item3_t, &_swigt__p_p_svn_client_conflict_t, &_swigt__p_p_svn_client_ctx_t, &_swigt__p_p_svn_commit_info_t, + &_swigt__p_p_svn_delta_editor_t, &_swigt__p_p_svn_ra_session_t, &_swigt__p_p_svn_string_t, + &_swigt__p_p_void, &_swigt__p_svn_auth_baton_t, &_swigt__p_svn_auth_cred_simple_t, &_swigt__p_svn_auth_cred_ssl_client_cert_pw_t, @@ -40568,6 +44097,9 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_checksum_ctx_t, &_swigt__p_svn_checksum_kind_t, &_swigt__p_svn_checksum_t, + &_swigt__p_svn_client__shelf_info_t, + &_swigt__p_svn_client__shelf_t, + &_swigt__p_svn_client__shelf_version_t, &_swigt__p_svn_client_commit_info_t, &_swigt__p_svn_client_commit_item2_t, &_swigt__p_svn_client_commit_item3_t, @@ -40581,11 +44113,11 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_client_diff_summarize_t, &_swigt__p_svn_client_info2_t, &_swigt__p_svn_client_proplist_item_t, - &_swigt__p_svn_client_shelved_patch_info_t, &_swigt__p_svn_client_status_t, &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_binary_patch_t, &_swigt__p_svn_diff_conflict_display_style_t, @@ -40617,6 +44149,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -40702,6 +44235,7 @@ static swig_cast_info _swigc__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc static swig_cast_info _swigc__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void__p_svn_error_t[] = { {&_swigt__p_f_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -40710,11 +44244,13 @@ static swig_cast_info _swigc__p_f_p_void_p_q_const__char_enum_svn_wc_notify_acti static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void[] = { {&_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void[] = { {&_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -40730,13 +44266,17 @@ static swig_cast_info _swigc__p_p_apr_array_header_t[] = { {&_swigt__p_p_apr_ar static swig_cast_info _swigc__p_p_apr_hash_t[] = { {&_swigt__p_p_apr_hash_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_char[] = { {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_auth_provider_object_t[] = { {&_swigt__p_p_svn_auth_provider_object_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_svn_client__shelf_t[] = { {&_swigt__p_p_svn_client__shelf_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_svn_client__shelf_version_t[] = { {&_swigt__p_p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_client_commit_info_t[] = { {&_swigt__p_p_svn_client_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_client_commit_item3_t[] = { {&_swigt__p_p_svn_client_commit_item3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_client_conflict_t[] = { {&_swigt__p_p_svn_client_conflict_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_client_ctx_t[] = { {&_swigt__p_p_svn_client_ctx_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_commit_info_t[] = { {&_swigt__p_p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_svn_delta_editor_t[] = { {&_swigt__p_p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_ra_session_t[] = { {&_swigt__p_p_svn_ra_session_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_string_t[] = { {&_swigt__p_p_svn_string_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_void[] = { {&_swigt__p_p_void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_auth_baton_t[] = { {&_swigt__p_svn_auth_baton_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_auth_cred_simple_t[] = { {&_swigt__p_svn_auth_cred_simple_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_auth_cred_ssl_client_cert_pw_t[] = { {&_swigt__p_svn_auth_cred_ssl_client_cert_pw_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -40751,6 +44291,9 @@ static swig_cast_info _swigc__p_svn_cache_config_t[] = { {&_swigt__p_svn_cache_ static swig_cast_info _swigc__p_svn_checksum_ctx_t[] = { {&_swigt__p_svn_checksum_ctx_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_checksum_kind_t[] = { {&_swigt__p_svn_checksum_kind_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_client__shelf_info_t[] = { {&_swigt__p_svn_client__shelf_info_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_client__shelf_t[] = { {&_swigt__p_svn_client__shelf_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_client__shelf_version_t[] = { {&_swigt__p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_commit_info_t[] = { {&_swigt__p_svn_client_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_commit_item2_t[] = { {&_swigt__p_svn_client_commit_item2_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_commit_item3_t[] = { {&_swigt__p_svn_client_commit_item3_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -40764,11 +44307,11 @@ static swig_cast_info _swigc__p_svn_client_diff_summarize_kind_t[] = { {&_swigt static swig_cast_info _swigc__p_svn_client_diff_summarize_t[] = { {&_swigt__p_svn_client_diff_summarize_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_info2_t[] = { {&_swigt__p_svn_client_info2_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_proplist_item_t[] = { {&_swigt__p_svn_client_proplist_item_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_svn_client_shelved_patch_info_t[] = { {&_swigt__p_svn_client_shelved_patch_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_status_t[] = { {&_swigt__p_svn_client_status_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_binary_patch_t[] = { {&_swigt__p_svn_diff_binary_patch_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_conflict_display_style_t[] = { {&_swigt__p_svn_diff_conflict_display_style_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -40800,6 +44343,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -40885,6 +44429,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void__p_svn_error_t, + _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, @@ -40893,11 +44438,13 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, + _swigc__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t, + _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void, _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void, _swigc__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, @@ -40913,13 +44460,17 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_p_apr_hash_t, _swigc__p_p_char, _swigc__p_p_svn_auth_provider_object_t, + _swigc__p_p_svn_client__shelf_t, + _swigc__p_p_svn_client__shelf_version_t, _swigc__p_p_svn_client_commit_info_t, _swigc__p_p_svn_client_commit_item3_t, _swigc__p_p_svn_client_conflict_t, _swigc__p_p_svn_client_ctx_t, _swigc__p_p_svn_commit_info_t, + _swigc__p_p_svn_delta_editor_t, _swigc__p_p_svn_ra_session_t, _swigc__p_p_svn_string_t, + _swigc__p_p_void, _swigc__p_svn_auth_baton_t, _swigc__p_svn_auth_cred_simple_t, _swigc__p_svn_auth_cred_ssl_client_cert_pw_t, @@ -40934,6 +44485,9 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_checksum_ctx_t, _swigc__p_svn_checksum_kind_t, _swigc__p_svn_checksum_t, + _swigc__p_svn_client__shelf_info_t, + _swigc__p_svn_client__shelf_t, + _swigc__p_svn_client__shelf_version_t, _swigc__p_svn_client_commit_info_t, _swigc__p_svn_client_commit_item2_t, _swigc__p_svn_client_commit_item3_t, @@ -40947,11 +44501,11 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_client_diff_summarize_t, _swigc__p_svn_client_info2_t, _swigc__p_svn_client_proplist_item_t, - _swigc__p_svn_client_shelved_patch_info_t, _swigc__p_svn_client_status_t, _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_binary_patch_t, _swigc__p_svn_diff_conflict_display_style_t, @@ -40983,6 +44537,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, @@ -41225,6 +44780,7 @@ static swig_command_info swig_commands[] = { {"SVN::_Client::svn_client_switch3", _wrap_svn_client_switch3}, {"SVN::_Client::svn_client_switch2", _wrap_svn_client_switch2}, {"SVN::_Client::svn_client_switch", _wrap_svn_client_switch}, +{"SVN::_Client::svn_client__layout_list", _wrap_svn_client__layout_list}, {"SVN::_Client::svn_client_add5", _wrap_svn_client_add5}, {"SVN::_Client::svn_client_add4", _wrap_svn_client_add4}, {"SVN::_Client::svn_client_add3", _wrap_svn_client_add3}, @@ -41329,17 +44885,20 @@ static swig_command_info swig_commands[] = { {"SVN::_Client::svn_client_log3", _wrap_svn_client_log3}, {"SVN::_Client::svn_client_log2", _wrap_svn_client_log2}, {"SVN::_Client::svn_client_log", _wrap_svn_client_log}, +{"SVN::_Client::svn_client_blame6", _wrap_svn_client_blame6}, {"SVN::_Client::svn_client_blame5", _wrap_svn_client_blame5}, {"SVN::_Client::svn_client_blame4", _wrap_svn_client_blame4}, {"SVN::_Client::svn_client_blame3", _wrap_svn_client_blame3}, {"SVN::_Client::svn_client_blame2", _wrap_svn_client_blame2}, {"SVN::_Client::svn_client_blame", _wrap_svn_client_blame}, +{"SVN::_Client::svn_client_diff7", _wrap_svn_client_diff7}, {"SVN::_Client::svn_client_diff6", _wrap_svn_client_diff6}, {"SVN::_Client::svn_client_diff5", _wrap_svn_client_diff5}, {"SVN::_Client::svn_client_diff4", _wrap_svn_client_diff4}, {"SVN::_Client::svn_client_diff3", _wrap_svn_client_diff3}, {"SVN::_Client::svn_client_diff2", _wrap_svn_client_diff2}, {"SVN::_Client::svn_client_diff", _wrap_svn_client_diff}, +{"SVN::_Client::svn_client_diff_peg7", _wrap_svn_client_diff_peg7}, {"SVN::_Client::svn_client_diff_peg6", _wrap_svn_client_diff_peg6}, {"SVN::_Client::svn_client_diff_peg5", _wrap_svn_client_diff_peg5}, {"SVN::_Client::svn_client_diff_peg4", _wrap_svn_client_diff_peg4}, @@ -41374,13 +44933,18 @@ static swig_command_info swig_commands[] = { {"SVN::_Client::svn_client_upgrade", _wrap_svn_client_upgrade}, {"SVN::_Client::svn_client_relocate2", _wrap_svn_client_relocate2}, {"SVN::_Client::svn_client_relocate", _wrap_svn_client_relocate}, +{"SVN::_Client::svn_client_revert4", _wrap_svn_client_revert4}, {"SVN::_Client::svn_client_revert3", _wrap_svn_client_revert3}, {"SVN::_Client::svn_client_revert2", _wrap_svn_client_revert2}, {"SVN::_Client::svn_client_revert", _wrap_svn_client_revert}, {"SVN::_Client::svn_client_conflict_option_set_merged_propval", _wrap_svn_client_conflict_option_set_merged_propval}, +{"SVN::_Client::svn_client_conflict_option_get_moved_to_repos_relpath_candidates2", _wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates2}, {"SVN::_Client::svn_client_conflict_option_get_moved_to_repos_relpath_candidates", _wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates}, +{"SVN::_Client::svn_client_conflict_option_set_moved_to_repos_relpath2", _wrap_svn_client_conflict_option_set_moved_to_repos_relpath2}, {"SVN::_Client::svn_client_conflict_option_set_moved_to_repos_relpath", _wrap_svn_client_conflict_option_set_moved_to_repos_relpath}, +{"SVN::_Client::svn_client_conflict_option_get_moved_to_abspath_candidates2", _wrap_svn_client_conflict_option_get_moved_to_abspath_candidates2}, {"SVN::_Client::svn_client_conflict_option_get_moved_to_abspath_candidates", _wrap_svn_client_conflict_option_get_moved_to_abspath_candidates}, +{"SVN::_Client::svn_client_conflict_option_set_moved_to_abspath2", _wrap_svn_client_conflict_option_set_moved_to_abspath2}, {"SVN::_Client::svn_client_conflict_option_set_moved_to_abspath", _wrap_svn_client_conflict_option_set_moved_to_abspath}, {"SVN::_Client::svn_client_conflict_option_find_by_id", _wrap_svn_client_conflict_option_find_by_id}, {"SVN::_Client::svn_client_conflict_get", _wrap_svn_client_conflict_get}, @@ -41474,23 +45038,59 @@ static swig_command_info swig_commands[] = { {"SVN::_Client::svn_client_cat3", _wrap_svn_client_cat3}, {"SVN::_Client::svn_client_cat2", _wrap_svn_client_cat2}, {"SVN::_Client::svn_client_cat", _wrap_svn_client_cat}, -{"SVN::_Client::svn_client_shelve", _wrap_svn_client_shelve}, -{"SVN::_Client::svn_client_unshelve", _wrap_svn_client_unshelve}, -{"SVN::_Client::svn_client_shelves_delete", _wrap_svn_client_shelves_delete}, -{"SVN::_Client::svn_client_shelved_patch_info_t_message_set", _wrap_svn_client_shelved_patch_info_t_message_set}, -{"SVN::_Client::svn_client_shelved_patch_info_t_message_get", _wrap_svn_client_shelved_patch_info_t_message_get}, -{"SVN::_Client::svn_client_shelved_patch_info_t_patch_path_set", _wrap_svn_client_shelved_patch_info_t_patch_path_set}, -{"SVN::_Client::svn_client_shelved_patch_info_t_patch_path_get", _wrap_svn_client_shelved_patch_info_t_patch_path_get}, -{"SVN::_Client::svn_client_shelved_patch_info_t_dirent_set", _wrap_svn_client_shelved_patch_info_t_dirent_set}, -{"SVN::_Client::svn_client_shelved_patch_info_t_dirent_get", _wrap_svn_client_shelved_patch_info_t_dirent_get}, -{"SVN::_Client::svn_client_shelved_patch_info_t_mtime_set", _wrap_svn_client_shelved_patch_info_t_mtime_set}, -{"SVN::_Client::svn_client_shelved_patch_info_t_mtime_get", _wrap_svn_client_shelved_patch_info_t_mtime_get}, -{"SVN::_Client::new_svn_client_shelved_patch_info_t", _wrap_new_svn_client_shelved_patch_info_t}, -{"SVN::_Client::delete_svn_client_shelved_patch_info_t", _wrap_delete_svn_client_shelved_patch_info_t}, -{"SVN::_Client::svn_client_shelves_list", _wrap_svn_client_shelves_list}, -{"SVN::_Client::svn_client_shelves_any", _wrap_svn_client_shelves_any}, -{"SVN::_Client::svn_client_shelf_get_paths", _wrap_svn_client_shelf_get_paths}, -{"SVN::_Client::svn_client_shelf_has_changes", _wrap_svn_client_shelf_has_changes}, +{"SVN::_Client::svn_client__shelf_t_name_set", _wrap_svn_client__shelf_t_name_set}, +{"SVN::_Client::svn_client__shelf_t_name_get", _wrap_svn_client__shelf_t_name_get}, +{"SVN::_Client::svn_client__shelf_t_max_version_set", _wrap_svn_client__shelf_t_max_version_set}, +{"SVN::_Client::svn_client__shelf_t_max_version_get", _wrap_svn_client__shelf_t_max_version_get}, +{"SVN::_Client::svn_client__shelf_t_wc_root_abspath_set", _wrap_svn_client__shelf_t_wc_root_abspath_set}, +{"SVN::_Client::svn_client__shelf_t_wc_root_abspath_get", _wrap_svn_client__shelf_t_wc_root_abspath_get}, +{"SVN::_Client::svn_client__shelf_t_shelves_dir_set", _wrap_svn_client__shelf_t_shelves_dir_set}, +{"SVN::_Client::svn_client__shelf_t_shelves_dir_get", _wrap_svn_client__shelf_t_shelves_dir_get}, +{"SVN::_Client::svn_client__shelf_t_revprops_set", _wrap_svn_client__shelf_t_revprops_set}, +{"SVN::_Client::svn_client__shelf_t_revprops_get", _wrap_svn_client__shelf_t_revprops_get}, +{"SVN::_Client::svn_client__shelf_t_ctx_set", _wrap_svn_client__shelf_t_ctx_set}, +{"SVN::_Client::svn_client__shelf_t_ctx_get", _wrap_svn_client__shelf_t_ctx_get}, +{"SVN::_Client::svn_client__shelf_t_pool_set", _wrap_svn_client__shelf_t_pool_set}, +{"SVN::_Client::svn_client__shelf_t_pool_get", _wrap_svn_client__shelf_t_pool_get}, +{"SVN::_Client::new_svn_client__shelf_t", _wrap_new_svn_client__shelf_t}, +{"SVN::_Client::delete_svn_client__shelf_t", _wrap_delete_svn_client__shelf_t}, +{"SVN::_Client::svn_client__shelf_version_t_shelf_set", _wrap_svn_client__shelf_version_t_shelf_set}, +{"SVN::_Client::svn_client__shelf_version_t_shelf_get", _wrap_svn_client__shelf_version_t_shelf_get}, +{"SVN::_Client::svn_client__shelf_version_t_mtime_set", _wrap_svn_client__shelf_version_t_mtime_set}, +{"SVN::_Client::svn_client__shelf_version_t_mtime_get", _wrap_svn_client__shelf_version_t_mtime_get}, +{"SVN::_Client::svn_client__shelf_version_t_files_dir_abspath_set", _wrap_svn_client__shelf_version_t_files_dir_abspath_set}, +{"SVN::_Client::svn_client__shelf_version_t_files_dir_abspath_get", _wrap_svn_client__shelf_version_t_files_dir_abspath_get}, +{"SVN::_Client::svn_client__shelf_version_t_version_number_set", _wrap_svn_client__shelf_version_t_version_number_set}, +{"SVN::_Client::svn_client__shelf_version_t_version_number_get", _wrap_svn_client__shelf_version_t_version_number_get}, +{"SVN::_Client::new_svn_client__shelf_version_t", _wrap_new_svn_client__shelf_version_t}, +{"SVN::_Client::delete_svn_client__shelf_version_t", _wrap_delete_svn_client__shelf_version_t}, +{"SVN::_Client::svn_client__shelf_open_or_create", _wrap_svn_client__shelf_open_or_create}, +{"SVN::_Client::svn_client__shelf_open_existing", _wrap_svn_client__shelf_open_existing}, +{"SVN::_Client::svn_client__shelf_close", _wrap_svn_client__shelf_close}, +{"SVN::_Client::svn_client__shelf_delete", _wrap_svn_client__shelf_delete}, +{"SVN::_Client::svn_client__shelf_mods_editor", _wrap_svn_client__shelf_mods_editor}, +{"SVN::_Client::svn_client__shelf_save_new_version3", _wrap_svn_client__shelf_save_new_version3}, +{"SVN::_Client::svn_client__shelf_delete_newer_versions", _wrap_svn_client__shelf_delete_newer_versions}, +{"SVN::_Client::svn_client__shelf_version_open", _wrap_svn_client__shelf_version_open}, +{"SVN::_Client::svn_client__shelf_get_newest_version", _wrap_svn_client__shelf_get_newest_version}, +{"SVN::_Client::svn_client__shelf_get_all_versions", _wrap_svn_client__shelf_get_all_versions}, +{"SVN::_Client::svn_client__shelf_apply", _wrap_svn_client__shelf_apply}, +{"SVN::_Client::svn_client__shelf_test_apply_file", _wrap_svn_client__shelf_test_apply_file}, +{"SVN::_Client::svn_client__shelf_unapply", _wrap_svn_client__shelf_unapply}, +{"SVN::_Client::svn_client__shelf_replay", _wrap_svn_client__shelf_replay}, +{"SVN::_Client::svn_client__shelf_paths_changed", _wrap_svn_client__shelf_paths_changed}, +{"SVN::_Client::svn_client__shelf_revprop_set", _wrap_svn_client__shelf_revprop_set}, +{"SVN::_Client::svn_client__shelf_revprop_set_all", _wrap_svn_client__shelf_revprop_set_all}, +{"SVN::_Client::svn_client__shelf_revprop_get", _wrap_svn_client__shelf_revprop_get}, +{"SVN::_Client::svn_client__shelf_revprop_list", _wrap_svn_client__shelf_revprop_list}, +{"SVN::_Client::svn_client__shelf_set_log_message", _wrap_svn_client__shelf_set_log_message}, +{"SVN::_Client::svn_client__shelf_get_log_message", _wrap_svn_client__shelf_get_log_message}, +{"SVN::_Client::svn_client__shelf_info_t_mtime_set", _wrap_svn_client__shelf_info_t_mtime_set}, +{"SVN::_Client::svn_client__shelf_info_t_mtime_get", _wrap_svn_client__shelf_info_t_mtime_get}, +{"SVN::_Client::new_svn_client__shelf_info_t", _wrap_new_svn_client__shelf_info_t}, +{"SVN::_Client::delete_svn_client__shelf_info_t", _wrap_delete_svn_client__shelf_info_t}, +{"SVN::_Client::svn_client__shelf_list", _wrap_svn_client__shelf_list}, +{"SVN::_Client::svn_client__shelf_version_status_walk", _wrap_svn_client__shelf_version_status_walk}, {"SVN::_Client::svn_client_add_to_changelist", _wrap_svn_client_add_to_changelist}, {"SVN::_Client::svn_client_remove_from_changelists", _wrap_svn_client_remove_from_changelists}, {"SVN::_Client::svn_client_get_changelists", _wrap_svn_client_get_changelists}, @@ -41599,10 +45199,12 @@ static swig_command_info swig_commands[] = { {"SVN::_Client::svn_client_invoke_get_commit_log3", _wrap_svn_client_invoke_get_commit_log3}, {"SVN::_Client::svn_client_invoke_get_commit_log2", _wrap_svn_client_invoke_get_commit_log2}, {"SVN::_Client::svn_client_invoke_get_commit_log", _wrap_svn_client_invoke_get_commit_log}, +{"SVN::_Client::svn_client_invoke_blame_receiver4", _wrap_svn_client_invoke_blame_receiver4}, {"SVN::_Client::svn_client_invoke_blame_receiver3", _wrap_svn_client_invoke_blame_receiver3}, {"SVN::_Client::svn_client_invoke_blame_receiver2", _wrap_svn_client_invoke_blame_receiver2}, {"SVN::_Client::svn_client_invoke_blame_receiver", _wrap_svn_client_invoke_blame_receiver}, {"SVN::_Client::svn_client_invoke_diff_summarize_func", _wrap_svn_client_invoke_diff_summarize_func}, +{"SVN::_Client::svn_client_invoke__layout_func", _wrap_svn_client_invoke__layout_func}, {"SVN::_Client::svn_client_invoke_import_filter_func", _wrap_svn_client_invoke_import_filter_func}, {"SVN::_Client::svn_client_invoke_status_func", _wrap_svn_client_invoke_status_func}, {"SVN::_Client::svn_client_invoke_conflict_walk_func", _wrap_svn_client_invoke_conflict_walk_func}, @@ -41905,187 +45507,222 @@ XS(SWIG_init) { SvREADONLY_on(sv); } - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_ADD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x01))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_DELETE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x02))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_TEXT_MODS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x04))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_PROP_MODS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x08))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_IS_COPY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x10))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x20))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_MOVED_HERE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x40))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_diff_summarize_kind_normal", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_diff_summarize_kind_normal))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_diff_summarize_kind_added", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_diff_summarize_kind_added))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_diff_summarize_kind_modified", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_diff_summarize_kind_modified))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_diff_summarize_kind_deleted", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_diff_summarize_kind_deleted))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_AUTH_USERNAME", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("username")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_AUTH_PASSWORD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("password")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_undefined", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_undefined))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_postpone", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_postpone))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_base_text", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_base_text))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_text", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_text))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_working_text", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_working_text))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_text_where_conflicted", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_text_where_conflicted))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_working_text_where_conflicted", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_working_text_where_conflicted))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_merged_text", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_merged_text))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_unspecified", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_unspecified))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_accept_current_wc_state", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_accept_current_wc_state))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_update_move_destination", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_update_move_destination))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_update_any_moved_away_children", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_update_any_moved_away_children))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_add_ignore", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_add_ignore))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_added_file_text_merge", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_added_file_text_merge))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_added_file_replace_and_merge", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_added_file_replace_and_merge))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_added_dir_merge", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_added_dir_merge))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_added_dir_replace", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_added_dir_replace))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_added_dir_replace_and_merge", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_added_dir_replace_and_merge))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_delete_ignore", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_delete_ignore))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_delete_accept", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_delete_accept))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_move_file_text_merge", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_move_file_text_merge))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_incoming_move_dir_merge", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_incoming_move_dir_merge))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_local_move_file_text_merge", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_local_move_file_text_merge))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_local_move_dir_merge", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_local_move_dir_merge))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_sibling_move_file_text_merge", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_sibling_move_file_text_merge))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_sibling_move_dir_merge", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_sibling_move_dir_merge))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_both_moved_file_merge", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_both_moved_file_merge))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_both_moved_file_move_merge", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_both_moved_file_move_merge))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_both_moved_dir_merge", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_both_moved_dir_merge))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "svn_client_conflict_option_both_moved_dir_move_merge", TRUE | 0x2 | GV_ADDMULTI); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_conflict_option_both_moved_dir_move_merge))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SWIG_SVN_INFO_SIZE_UNKNOWN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_unsigned_SS_long SWIG_PERL_CALL_ARGS_1((unsigned long)(-1))); SvREADONLY_on(sv); diff --git a/subversion/bindings/swig/perl/native/svn_delta.c b/subversion/bindings/swig/perl/native/svn_delta.c index 5a095de..2650fc2 100644 --- a/subversion/bindings/swig/perl/native/svn_delta.c +++ b/subversion/bindings/swig/perl/native/svn_delta.c @@ -1520,104 +1520,108 @@ SWIG_Perl_SetModule(swig_module_info *module) { #define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[8] #define SWIGTYPE_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[9] #define SWIGTYPE_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[10] -#define SWIGTYPE_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[11] -#define SWIGTYPE_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[12] -#define SWIGTYPE_p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[13] -#define SWIGTYPE_p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[14] -#define SWIGTYPE_p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[15] -#define SWIGTYPE_p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[16] -#define SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[17] -#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[18] -#define SWIGTYPE_p_f_p_void__p_unsigned_char swig_types[19] -#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[20] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[21] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t swig_types[22] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[23] -#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[24] -#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[25] -#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[26] -#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[27] -#define SWIGTYPE_p_int swig_types[28] -#define SWIGTYPE_p_long swig_types[29] -#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[30] -#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[31] -#define SWIGTYPE_p_p_svn_checksum_t swig_types[32] -#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[33] -#define SWIGTYPE_p_p_svn_txdelta_stream_t swig_types[34] -#define SWIGTYPE_p_p_svn_txdelta_window_t swig_types[35] -#define SWIGTYPE_p_p_void swig_types[36] -#define SWIGTYPE_p_svn_auth_baton_t swig_types[37] -#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[38] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[39] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[40] -#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[41] -#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[42] -#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[43] -#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[44] -#define SWIGTYPE_p_svn_auth_provider_t swig_types[45] -#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[46] -#define SWIGTYPE_p_svn_cache_config_t swig_types[47] -#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[48] -#define SWIGTYPE_p_svn_checksum_kind_t swig_types[49] -#define SWIGTYPE_p_svn_checksum_t swig_types[50] -#define SWIGTYPE_p_svn_commit_info_t swig_types[51] -#define SWIGTYPE_p_svn_config_t swig_types[52] -#define SWIGTYPE_p_svn_delta_editor_t swig_types[53] -#define SWIGTYPE_p_svn_depth_t swig_types[54] -#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[55] -#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[56] -#define SWIGTYPE_p_svn_diff_datasource_e swig_types[57] -#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[58] -#define SWIGTYPE_p_svn_diff_file_options_t swig_types[59] -#define SWIGTYPE_p_svn_diff_fns2_t swig_types[60] -#define SWIGTYPE_p_svn_diff_fns_t swig_types[61] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[62] -#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[63] -#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[64] -#define SWIGTYPE_p_svn_diff_t swig_types[65] -#define SWIGTYPE_p_svn_dirent_t swig_types[66] -#define SWIGTYPE_p_svn_errno_t swig_types[67] -#define SWIGTYPE_p_svn_error_t swig_types[68] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[69] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[70] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[71] -#define SWIGTYPE_p_svn_location_segment_t swig_types[72] -#define SWIGTYPE_p_svn_lock_t swig_types[73] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[74] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[75] -#define SWIGTYPE_p_svn_log_entry_t swig_types[76] -#define SWIGTYPE_p_svn_merge_range_t swig_types[77] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[78] -#define SWIGTYPE_p_svn_node_kind_t swig_types[79] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[80] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[81] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[82] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[83] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[84] -#define SWIGTYPE_p_svn_patch_file_t swig_types[85] -#define SWIGTYPE_p_svn_patch_t swig_types[86] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[87] -#define SWIGTYPE_p_svn_prop_kind swig_types[88] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[89] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[90] -#define SWIGTYPE_p_svn_stream_t swig_types[91] -#define SWIGTYPE_p_svn_string_t swig_types[92] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[93] -#define SWIGTYPE_p_svn_tristate_t swig_types[94] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[95] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[96] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[97] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[98] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[99] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[100] -#define SWIGTYPE_p_svn_version_extended_t swig_types[101] -#define SWIGTYPE_p_svn_version_t swig_types[102] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[103] -#define SWIGTYPE_p_unsigned_char swig_types[104] -#define SWIGTYPE_p_unsigned_long swig_types[105] -#define SWIGTYPE_p_void swig_types[106] -static swig_type_info *swig_types[108]; -static swig_module_info swig_module = {swig_types, 107, 0, 0, 0, 0}; +#define SWIGTYPE_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[11] +#define SWIGTYPE_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[12] +#define SWIGTYPE_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[13] +#define SWIGTYPE_p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[14] +#define SWIGTYPE_p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[15] +#define SWIGTYPE_p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[16] +#define SWIGTYPE_p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[17] +#define SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[18] +#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[19] +#define SWIGTYPE_p_f_p_void__p_unsigned_char swig_types[20] +#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[21] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[22] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t swig_types[23] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[24] +#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[25] +#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[26] +#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[27] +#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[28] +#define SWIGTYPE_p_int swig_types[29] +#define SWIGTYPE_p_long swig_types[30] +#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[31] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[32] +#define SWIGTYPE_p_p_svn_checksum_t swig_types[33] +#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[34] +#define SWIGTYPE_p_p_svn_delta_path_driver_state_t swig_types[35] +#define SWIGTYPE_p_p_svn_txdelta_stream_t swig_types[36] +#define SWIGTYPE_p_p_svn_txdelta_window_t swig_types[37] +#define SWIGTYPE_p_p_void swig_types[38] +#define SWIGTYPE_p_svn_auth_baton_t swig_types[39] +#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[40] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[41] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[42] +#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[43] +#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[44] +#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[45] +#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[46] +#define SWIGTYPE_p_svn_auth_provider_t swig_types[47] +#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[48] +#define SWIGTYPE_p_svn_cache_config_t swig_types[49] +#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[50] +#define SWIGTYPE_p_svn_checksum_kind_t swig_types[51] +#define SWIGTYPE_p_svn_checksum_t swig_types[52] +#define SWIGTYPE_p_svn_commit_info_t swig_types[53] +#define SWIGTYPE_p_svn_config_t swig_types[54] +#define SWIGTYPE_p_svn_delta_editor_t swig_types[55] +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[56] +#define SWIGTYPE_p_svn_depth_t swig_types[57] +#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[58] +#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[59] +#define SWIGTYPE_p_svn_diff_datasource_e swig_types[60] +#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[61] +#define SWIGTYPE_p_svn_diff_file_options_t swig_types[62] +#define SWIGTYPE_p_svn_diff_fns2_t swig_types[63] +#define SWIGTYPE_p_svn_diff_fns_t swig_types[64] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[65] +#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[66] +#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[67] +#define SWIGTYPE_p_svn_diff_t swig_types[68] +#define SWIGTYPE_p_svn_dirent_t swig_types[69] +#define SWIGTYPE_p_svn_errno_t swig_types[70] +#define SWIGTYPE_p_svn_error_t swig_types[71] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[72] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[73] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[74] +#define SWIGTYPE_p_svn_location_segment_t swig_types[75] +#define SWIGTYPE_p_svn_lock_t swig_types[76] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[77] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[78] +#define SWIGTYPE_p_svn_log_entry_t swig_types[79] +#define SWIGTYPE_p_svn_merge_range_t swig_types[80] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[81] +#define SWIGTYPE_p_svn_node_kind_t swig_types[82] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[83] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[84] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[85] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[86] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[87] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[88] +#define SWIGTYPE_p_svn_patch_file_t swig_types[89] +#define SWIGTYPE_p_svn_patch_t swig_types[90] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[91] +#define SWIGTYPE_p_svn_prop_kind swig_types[92] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[93] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[94] +#define SWIGTYPE_p_svn_stream_t swig_types[95] +#define SWIGTYPE_p_svn_string_t swig_types[96] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[97] +#define SWIGTYPE_p_svn_tristate_t swig_types[98] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[99] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[100] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[101] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[102] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[103] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[104] +#define SWIGTYPE_p_svn_version_extended_t swig_types[105] +#define SWIGTYPE_p_svn_version_t swig_types[106] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[107] +#define SWIGTYPE_p_unsigned_char swig_types[108] +#define SWIGTYPE_p_unsigned_long swig_types[109] +#define SWIGTYPE_p_void swig_types[110] +static swig_type_info *swig_types[112]; +static swig_module_info swig_module = {swig_types, 111, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2114,6 +2118,11 @@ static svn_error_t * svn_txdelta_invoke_stream_open_func( return _obj(txdelta_stream, baton, result_pool, scratch_pool); } +static svn_error_t * svn_delta_invoke_path_driver_cb_func2( + svn_delta_path_driver_cb_func2_t _obj, void **dir_baton, const svn_delta_editor_t *editor, void *edit_baton, void *parent_baton, void *callback_baton, const char *relpath, apr_pool_t *pool) { + return _obj(dir_baton, editor, edit_baton, parent_baton, callback_baton, relpath, pool); +} + static svn_error_t * svn_delta_invoke_path_driver_cb_func( svn_delta_path_driver_cb_func_t _obj, void **dir_baton, void *parent_baton, void *callback_baton, const char *path, apr_pool_t *pool) { return _obj(dir_baton, parent_baton, callback_baton, path, pool); @@ -3690,7 +3699,7 @@ XS(_wrap_svn_txdelta_send_stream) { } } { - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg4, + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg4, _global_pool), 0)); argvi++ /*@SWIG@*/ @@ -5874,6 +5883,99 @@ XS(_wrap_svn_delta_depth_filter_editor) { + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_delta_path_driver3) { + { + svn_delta_editor_t *arg1 = (svn_delta_editor_t *) 0 ; + void *arg2 = (void *) 0 ; + apr_array_header_t *arg3 = (apr_array_header_t *) 0 ; + svn_boolean_t arg4 ; + svn_delta_path_driver_cb_func2_t arg5 = (svn_delta_path_driver_cb_func2_t) 0 ; + void *arg6 = (void *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp3 = 0 ; + int res3 = 0 ; + int val4 ; + int ecode4 = 0 ; + int res6 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 5) || (items > 6)) { + SWIG_croak("Usage: svn_delta_path_driver3(editor,edit_baton,relpaths,sort_paths,callback_func,callback_baton,pool);"); + } + { + svn_swig_pl_make_editor(&arg1, &arg2, ST(0), _global_pool); + } + res3 = SWIG_ConvertPtr(ST(1), &argp3,SWIGTYPE_p_apr_array_header_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_delta_path_driver3" "', argument " "3"" of type '" "apr_array_header_t const *""'"); + } + arg3 = (apr_array_header_t *)(argp3); + ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_delta_path_driver3" "', argument " "4"" of type '" "svn_boolean_t""'"); + } + arg4 = (svn_boolean_t)(val4); + { + int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg5), SWIGTYPE_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_delta_path_driver3" "', argument " "5"" of type '" "svn_delta_path_driver_cb_func2_t""'"); + } + } + res6 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg6), 0, 0); + if (!SWIG_IsOK(res6)) { + SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_delta_path_driver3" "', argument " "6"" of type '" "void *""'"); + } + if (items > 5) { + + } + { + result = (svn_error_t *)svn_delta_path_driver3((struct svn_delta_editor_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5,arg6,arg7); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + + + + + XSRETURN(argvi); + fail: + + + + + SWIG_croak_null(); } } @@ -6054,6 +6156,226 @@ XS(_wrap_svn_delta_path_driver) { + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_delta_path_driver_start) { + { + svn_delta_path_driver_state_t **arg1 = (svn_delta_path_driver_state_t **) 0 ; + svn_delta_editor_t *arg2 = (svn_delta_editor_t *) 0 ; + void *arg3 = (void *) 0 ; + svn_delta_path_driver_cb_func2_t arg4 = (svn_delta_path_driver_cb_func2_t) 0 ; + void *arg5 = (void *) 0 ; + apr_pool_t *arg6 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + svn_delta_path_driver_state_t *temp1 ; + int res5 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + if ((items < 3) || (items > 4)) { + SWIG_croak("Usage: svn_delta_path_driver_start(editor,edit_baton,callback_func,callback_baton,result_pool);"); + } + { + svn_swig_pl_make_editor(&arg2, &arg3, ST(0), _global_pool); + } + { + int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg4), SWIGTYPE_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_delta_path_driver_start" "', argument " "4"" of type '" "svn_delta_path_driver_cb_func2_t""'"); + } + } + res5 = SWIG_ConvertPtr(ST(2),SWIG_as_voidptrptr(&arg5), 0, 0); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_delta_path_driver_start" "', argument " "5"" of type '" "void *""'"); + } + if (items > 3) { + + } + { + result = (svn_error_t *)svn_delta_path_driver_start(arg1,(struct svn_delta_editor_t const *)arg2,arg3,arg4,arg5,arg6); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + /* FIXME: Missing argout typemap: svn_delta_path_driver_start arg 1 (svn_delta_path_driver_state_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_delta_path_driver_start is not implemented yet"); + + } + + + + + XSRETURN(argvi); + fail: + + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_delta_path_driver_step) { + { + svn_delta_path_driver_state_t *arg1 = (svn_delta_path_driver_state_t *) 0 ; + char *arg2 = (char *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 2) || (items > 3)) { + SWIG_croak("Usage: svn_delta_path_driver_step(state,relpath,scratch_pool);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_delta_path_driver_state_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_delta_path_driver_step" "', argument " "1"" of type '" "svn_delta_path_driver_state_t *""'"); + } + arg1 = (svn_delta_path_driver_state_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_delta_path_driver_step" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + if (items > 2) { + + } + { + result = (svn_error_t *)svn_delta_path_driver_step(arg1,(char const *)arg2,arg3); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_delta_path_driver_finish) { + { + svn_delta_path_driver_state_t *arg1 = (svn_delta_path_driver_state_t *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 1) || (items > 2)) { + SWIG_croak("Usage: svn_delta_path_driver_finish(state,scratch_pool);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_delta_path_driver_state_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_delta_path_driver_finish" "', argument " "1"" of type '" "svn_delta_path_driver_state_t *""'"); + } + arg1 = (svn_delta_path_driver_state_t *)(argp1); + if (items > 1) { + + } + { + result = (svn_error_t *)svn_delta_path_driver_finish(arg1,arg2); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); } } @@ -7912,6 +8234,106 @@ XS(_wrap_svn_txdelta_invoke_stream_open_func) { } +XS(_wrap_svn_delta_invoke_path_driver_cb_func2) { + { + svn_delta_path_driver_cb_func2_t arg1 = (svn_delta_path_driver_cb_func2_t) 0 ; + void **arg2 = (void **) 0 ; + svn_delta_editor_t *arg3 = (svn_delta_editor_t *) 0 ; + void *arg4 = (void *) 0 ; + void *arg5 = (void *) 0 ; + void *arg6 = (void *) 0 ; + char *arg7 = (char *) 0 ; + apr_pool_t *arg8 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *temp2 ; + int res5 ; + int res6 ; + int res7 ; + char *buf7 = 0 ; + int alloc7 = 0 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg2 = &temp2; + if ((items < 5) || (items > 6)) { + SWIG_croak("Usage: svn_delta_invoke_path_driver_cb_func2(_obj,editor,edit_baton,parent_baton,callback_baton,relpath,pool);"); + } + { + int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_delta_invoke_path_driver_cb_func2" "', argument " "1"" of type '" "svn_delta_path_driver_cb_func2_t""'"); + } + } + { + svn_swig_pl_make_editor(&arg3, &arg4, ST(1), _global_pool); + } + res5 = SWIG_ConvertPtr(ST(2),SWIG_as_voidptrptr(&arg5), 0, 0); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_delta_invoke_path_driver_cb_func2" "', argument " "5"" of type '" "void *""'"); + } + res6 = SWIG_ConvertPtr(ST(3),SWIG_as_voidptrptr(&arg6), 0, 0); + if (!SWIG_IsOK(res6)) { + SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_delta_invoke_path_driver_cb_func2" "', argument " "6"" of type '" "void *""'"); + } + res7 = SWIG_AsCharPtrAndSize(ST(4), &buf7, NULL, &alloc7); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_delta_invoke_path_driver_cb_func2" "', argument " "7"" of type '" "char const *""'"); + } + arg7 = (char *)(buf7); + if (items > 5) { + + } + { + result = (svn_error_t *)svn_delta_invoke_path_driver_cb_func2(arg1,arg2,(struct svn_delta_editor_t const *)arg3,arg4,arg5,arg6,(char const *)arg7,arg8); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_NewPointerObj(*arg2, SWIGTYPE_p_void, 0); argvi++ ; + } + + + + + if (alloc7 == SWIG_NEWOBJ) free((char*)buf7); + + XSRETURN(argvi); + fail: + + + + + if (alloc7 == SWIG_NEWOBJ) free((char*)buf7); + + SWIG_croak_null(); + } +} + + XS(_wrap_svn_delta_invoke_path_driver_cb_func) { { svn_delta_path_driver_cb_func_t arg1 = (svn_delta_path_driver_cb_func_t) 0 ; @@ -8278,32 +8700,34 @@ static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *| static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_size_t = {"_p_apr_size_t", "apr_size_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_stream_t **,void *,apr_pool_t *,apr_pool_t *)|svn_txdelta_stream_open_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_t **,void *,apr_pool_t *)|svn_txdelta_next_window_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_delta_path_driver_cb_func_t|struct svn_error_t *(*)(void **,void *,void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,void *,apr_pool_t *)|struct svn_error_t *(*)(char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "struct svn_error_t *(*)(char const *,void *,char const *,svn_revnum_t,apr_pool_t *,void **)|svn_error_t *(*)(char const *,void *,char const *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "svn_error_t *(*)(char const *,void *,svn_revnum_t,apr_pool_t *,void **)|struct svn_error_t *(*)(char const *,void *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_revnum_t,void *,apr_pool_t *)|struct svn_error_t *(*)(char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(struct svn_delta_editor_t const *,void *,char const *,svn_txdelta_stream_open_func_t,void *,apr_pool_t *)|struct svn_error_t *(*)(struct svn_delta_editor_t const *,void *,char const *,svn_txdelta_stream_open_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_stream_t **,void *,apr_pool_t *,apr_pool_t *)|svn_txdelta_stream_open_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_window_t **,void *,apr_pool_t *)|svn_txdelta_next_window_fn_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_delta_path_driver_cb_func2_t|svn_error_t *(*)(void **,svn_delta_editor_t const *,void *,void *,void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_delta_path_driver_cb_func_t|svn_error_t *(*)(void **,void *,void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "svn_error_t *(*)(char const *,void *,char const *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "svn_error_t *(*)(char const *,void *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(struct svn_delta_editor_t const *,void *,char const *,svn_txdelta_stream_open_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void__p_unsigned_char = {"_p_f_p_void__p_unsigned_char", "unsigned char *(*)(void *)|svn_txdelta_md5_digest_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_error_t *(*)(void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_pool_t *,svn_txdelta_window_handler_t *,void **)|svn_error_t *(*)(void *,char const *,apr_pool_t *,svn_txdelta_window_handler_t *,void **)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_string_t const *,apr_pool_t *)|svn_error_t *(*)(void *,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_file_rev_handler_old_t|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *,void **)|svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *,svn_txdelta_window_handler_t *,void **)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_file_rev_handler_old_t|svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_txdelta_window_handler_t *|struct svn_error_t *(**)(svn_txdelta_window_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(**)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_file_rev_handler_t *|svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_checksum_t = {"_p_p_svn_checksum_t", "struct svn_checksum_t **|svn_checksum_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_svn_delta_path_driver_state_t = {"_p_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t **|svn_delta_path_driver_state_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_txdelta_stream_t = {"_p_p_svn_txdelta_stream_t", "struct svn_txdelta_stream_t **|svn_txdelta_stream_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_txdelta_window_t = {"_p_p_svn_txdelta_window_t", "struct svn_txdelta_window_t **|svn_txdelta_window_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **", 0, 0, (void*)0, 0}; @@ -8324,6 +8748,7 @@ static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct s static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_binary_patch_t = {"_p_svn_diff_binary_patch_t", "struct svn_diff_binary_patch_t *|svn_diff_binary_patch_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_conflict_display_style_t = {"_p_svn_diff_conflict_display_style_t", "enum svn_diff_conflict_display_style_t *|svn_diff_conflict_display_style_t *", 0, 0, (void*)0, 0}; @@ -8338,7 +8763,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0}; @@ -8354,6 +8779,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -8390,6 +8816,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, + &_swigt__p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t, @@ -8413,6 +8840,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_svn_checksum_t, &_swigt__p_p_svn_delta_editor_t, + &_swigt__p_p_svn_delta_path_driver_state_t, &_swigt__p_p_svn_txdelta_stream_t, &_swigt__p_p_svn_txdelta_window_t, &_swigt__p_p_void, @@ -8433,6 +8861,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_binary_patch_t, &_swigt__p_svn_diff_conflict_display_style_t, @@ -8463,6 +8892,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -8499,6 +8929,7 @@ static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, static swig_cast_info _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t[] = { {&_swigt__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -8522,6 +8953,7 @@ static swig_cast_info _swigc__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_checksum_t[] = { {&_swigt__p_p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_delta_editor_t[] = { {&_swigt__p_p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_svn_delta_path_driver_state_t[] = { {&_swigt__p_p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_txdelta_stream_t[] = { {&_swigt__p_p_svn_txdelta_stream_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_txdelta_window_t[] = { {&_swigt__p_p_svn_txdelta_window_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_void[] = { {&_swigt__p_p_void, 0, 0, 0},{0, 0, 0, 0}}; @@ -8542,6 +8974,7 @@ static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_binary_patch_t[] = { {&_swigt__p_svn_diff_binary_patch_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_conflict_display_style_t[] = { {&_swigt__p_svn_diff_conflict_display_style_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -8572,6 +9005,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -8608,6 +9042,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, + _swigc__p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t, @@ -8631,6 +9066,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_svn_checksum_t, _swigc__p_p_svn_delta_editor_t, + _swigc__p_p_svn_delta_path_driver_state_t, _swigc__p_p_svn_txdelta_stream_t, _swigc__p_p_svn_txdelta_window_t, _swigc__p_p_void, @@ -8651,6 +9087,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_binary_patch_t, _swigc__p_svn_diff_conflict_display_style_t, @@ -8681,6 +9118,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, @@ -8805,8 +9243,12 @@ static swig_command_info swig_commands[] = { {"SVN::_Delta::svn_delta_noop_window_handler", _wrap_svn_delta_noop_window_handler}, {"SVN::_Delta::svn_delta_get_cancellation_editor", _wrap_svn_delta_get_cancellation_editor}, {"SVN::_Delta::svn_delta_depth_filter_editor", _wrap_svn_delta_depth_filter_editor}, +{"SVN::_Delta::svn_delta_path_driver3", _wrap_svn_delta_path_driver3}, {"SVN::_Delta::svn_delta_path_driver2", _wrap_svn_delta_path_driver2}, {"SVN::_Delta::svn_delta_path_driver", _wrap_svn_delta_path_driver}, +{"SVN::_Delta::svn_delta_path_driver_start", _wrap_svn_delta_path_driver_start}, +{"SVN::_Delta::svn_delta_path_driver_step", _wrap_svn_delta_path_driver_step}, +{"SVN::_Delta::svn_delta_path_driver_finish", _wrap_svn_delta_path_driver_finish}, {"SVN::_Delta::svn_compat_wrap_file_rev_handler", _wrap_svn_compat_wrap_file_rev_handler}, {"SVN::_Delta::svn_delta_editor_invoke_set_target_revision", _wrap_svn_delta_editor_invoke_set_target_revision}, {"SVN::_Delta::svn_delta_editor_invoke_open_root", _wrap_svn_delta_editor_invoke_open_root}, @@ -8829,6 +9271,7 @@ static swig_command_info swig_commands[] = { {"SVN::_Delta::svn_txdelta_invoke_next_window_fn", _wrap_svn_txdelta_invoke_next_window_fn}, {"SVN::_Delta::svn_txdelta_invoke_md5_digest_fn", _wrap_svn_txdelta_invoke_md5_digest_fn}, {"SVN::_Delta::svn_txdelta_invoke_stream_open_func", _wrap_svn_txdelta_invoke_stream_open_func}, +{"SVN::_Delta::svn_delta_invoke_path_driver_cb_func2", _wrap_svn_delta_invoke_path_driver_cb_func2}, {"SVN::_Delta::svn_delta_invoke_path_driver_cb_func", _wrap_svn_delta_invoke_path_driver_cb_func}, {"SVN::_Delta::svn_file_invoke_rev_handler", _wrap_svn_file_invoke_rev_handler}, {"SVN::_Delta::svn_file_invoke_rev_handler_old", _wrap_svn_file_invoke_rev_handler_old}, @@ -9126,32 +9569,32 @@ XS(SWIG_init) { SvREADONLY_on(sv); } - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_DELTA_COMPRESSION_LEVEL_NONE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_DELTA_COMPRESSION_LEVEL_MAX", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(9))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_DELTA_COMPRESSION_LEVEL_DEFAULT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(5))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_txdelta_source", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_txdelta_source))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_txdelta_target", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_txdelta_target))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_txdelta_new", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_txdelta_new))); SvREADONLY_on(sv); diff --git a/subversion/bindings/swig/perl/native/svn_diff.c b/subversion/bindings/swig/perl/native/svn_diff.c index 91fafd1..5df1ac7 100644 --- a/subversion/bindings/swig/perl/native/svn_diff.c +++ b/subversion/bindings/swig/perl/native/svn_diff.c @@ -1562,26 +1562,27 @@ SWIG_Perl_SetModule(swig_module_info *module) { #define SWIGTYPE_p_svn_opt_revision_t swig_types[50] #define SWIGTYPE_p_svn_opt_revision_value_t swig_types[51] #define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[52] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[53] -#define SWIGTYPE_p_svn_patch_file_t swig_types[54] -#define SWIGTYPE_p_svn_patch_t swig_types[55] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[56] -#define SWIGTYPE_p_svn_prop_kind swig_types[57] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[58] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[59] -#define SWIGTYPE_p_svn_stream_t swig_types[60] -#define SWIGTYPE_p_svn_string_t swig_types[61] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[62] -#define SWIGTYPE_p_svn_tristate_t swig_types[63] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[64] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[65] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[66] -#define SWIGTYPE_p_svn_version_extended_t swig_types[67] -#define SWIGTYPE_p_svn_version_t swig_types[68] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[69] -#define SWIGTYPE_p_unsigned_long swig_types[70] -static swig_type_info *swig_types[72]; -static swig_module_info swig_module = {swig_types, 71, 0, 0, 0, 0}; +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[53] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[54] +#define SWIGTYPE_p_svn_patch_file_t swig_types[55] +#define SWIGTYPE_p_svn_patch_t swig_types[56] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[57] +#define SWIGTYPE_p_svn_prop_kind swig_types[58] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[59] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[60] +#define SWIGTYPE_p_svn_stream_t swig_types[61] +#define SWIGTYPE_p_svn_string_t swig_types[62] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[63] +#define SWIGTYPE_p_svn_tristate_t swig_types[64] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[65] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[66] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[67] +#define SWIGTYPE_p_svn_version_extended_t swig_types[68] +#define SWIGTYPE_p_svn_version_t swig_types[69] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[70] +#define SWIGTYPE_p_unsigned_long swig_types[71] +static swig_type_info *swig_types[73]; +static swig_module_info swig_module = {swig_types, 72, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -1656,7 +1657,7 @@ static swig_type_info _swigt__p_apr_array_header_t = {"_p_apr_array_header_t", " static swig_type_info _swigt__p_apr_int32_t = {"_p_apr_int32_t", "apr_int32_t *|time_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *|svn_filesize_t *|apr_time_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_auth_baton_t = {"_p_svn_auth_baton_t", "struct svn_auth_baton_t *|svn_auth_baton_t *", 0, 0, (void*)0, 0}; @@ -1689,7 +1690,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0}; @@ -1705,6 +1706,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -1778,6 +1780,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -1851,6 +1854,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -1924,6 +1928,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, diff --git a/subversion/bindings/swig/perl/native/svn_fs.c b/subversion/bindings/swig/perl/native/svn_fs.c index 433dd0b..d92e8a9 100644 --- a/subversion/bindings/swig/perl/native/svn_fs.c +++ b/subversion/bindings/swig/perl/native/svn_fs.c @@ -1526,7 +1526,7 @@ SWIG_Perl_SetModule(swig_module_info *module) { #define SWIGTYPE_p_f_p_void_long_long_p_apr_pool_t__void swig_types[14] #define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[15] #define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[16] -#define SWIGTYPE_p_f_p_void_p_struct_svn_error_t__void swig_types[17] +#define SWIGTYPE_p_f_p_void_p_svn_error_t__void swig_types[17] #define SWIGTYPE_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t swig_types[18] #define SWIGTYPE_p_int swig_types[19] #define SWIGTYPE_p_long swig_types[20] @@ -1567,80 +1567,83 @@ SWIG_Perl_SetModule(swig_module_info *module) { #define SWIGTYPE_p_svn_commit_info_t swig_types[55] #define SWIGTYPE_p_svn_config_t swig_types[56] #define SWIGTYPE_p_svn_delta_editor_t swig_types[57] -#define SWIGTYPE_p_svn_depth_t swig_types[58] -#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[59] -#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[60] -#define SWIGTYPE_p_svn_diff_datasource_e swig_types[61] -#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[62] -#define SWIGTYPE_p_svn_diff_file_options_t swig_types[63] -#define SWIGTYPE_p_svn_diff_fns2_t swig_types[64] -#define SWIGTYPE_p_svn_diff_fns_t swig_types[65] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[66] -#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[67] -#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[68] -#define SWIGTYPE_p_svn_diff_t swig_types[69] -#define SWIGTYPE_p_svn_dirent_t swig_types[70] -#define SWIGTYPE_p_svn_errno_t swig_types[71] -#define SWIGTYPE_p_svn_error_t swig_types[72] -#define SWIGTYPE_p_svn_fs_access_t swig_types[73] -#define SWIGTYPE_p_svn_fs_dirent_t swig_types[74] -#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[75] -#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[76] -#define SWIGTYPE_p_svn_fs_history_t swig_types[77] -#define SWIGTYPE_p_svn_fs_id_t swig_types[78] -#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[79] -#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[80] -#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[81] -#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[82] -#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[83] -#define SWIGTYPE_p_svn_fs_path_change3_t swig_types[84] -#define SWIGTYPE_p_svn_fs_path_change_iterator_t swig_types[85] -#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[86] -#define SWIGTYPE_p_svn_fs_path_change_t swig_types[87] -#define SWIGTYPE_p_svn_fs_root_t swig_types[88] -#define SWIGTYPE_p_svn_fs_t swig_types[89] -#define SWIGTYPE_p_svn_fs_txn_t swig_types[90] -#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[91] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[92] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[93] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[94] -#define SWIGTYPE_p_svn_location_segment_t swig_types[95] -#define SWIGTYPE_p_svn_lock_t swig_types[96] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[97] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[98] -#define SWIGTYPE_p_svn_log_entry_t swig_types[99] -#define SWIGTYPE_p_svn_merge_range_t swig_types[100] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[101] -#define SWIGTYPE_p_svn_node_kind_t swig_types[102] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[103] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[104] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[105] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[106] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[107] -#define SWIGTYPE_p_svn_patch_file_t swig_types[108] -#define SWIGTYPE_p_svn_patch_t swig_types[109] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[110] -#define SWIGTYPE_p_svn_prop_kind swig_types[111] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[112] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[113] -#define SWIGTYPE_p_svn_stream_t swig_types[114] -#define SWIGTYPE_p_svn_string_t swig_types[115] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[116] -#define SWIGTYPE_p_svn_tristate_t swig_types[117] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[118] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[119] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[120] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[121] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[122] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[123] -#define SWIGTYPE_p_svn_version_extended_t swig_types[124] -#define SWIGTYPE_p_svn_version_t swig_types[125] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[126] -#define SWIGTYPE_p_unsigned_char swig_types[127] -#define SWIGTYPE_p_unsigned_long swig_types[128] -#define SWIGTYPE_p_void swig_types[129] -static swig_type_info *swig_types[131]; -static swig_module_info swig_module = {swig_types, 130, 0, 0, 0, 0}; +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[58] +#define SWIGTYPE_p_svn_depth_t swig_types[59] +#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[60] +#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[61] +#define SWIGTYPE_p_svn_diff_datasource_e swig_types[62] +#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[63] +#define SWIGTYPE_p_svn_diff_file_options_t swig_types[64] +#define SWIGTYPE_p_svn_diff_fns2_t swig_types[65] +#define SWIGTYPE_p_svn_diff_fns_t swig_types[66] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[67] +#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[68] +#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[69] +#define SWIGTYPE_p_svn_diff_t swig_types[70] +#define SWIGTYPE_p_svn_dirent_t swig_types[71] +#define SWIGTYPE_p_svn_errno_t swig_types[72] +#define SWIGTYPE_p_svn_error_t swig_types[73] +#define SWIGTYPE_p_svn_fs_access_t swig_types[74] +#define SWIGTYPE_p_svn_fs_dirent_t swig_types[75] +#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[76] +#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[77] +#define SWIGTYPE_p_svn_fs_history_t swig_types[78] +#define SWIGTYPE_p_svn_fs_id_t swig_types[79] +#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[80] +#define SWIGTYPE_p_svn_fs_ioctl_code_t swig_types[81] +#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[82] +#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[83] +#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[84] +#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[85] +#define SWIGTYPE_p_svn_fs_path_change3_t swig_types[86] +#define SWIGTYPE_p_svn_fs_path_change_iterator_t swig_types[87] +#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[88] +#define SWIGTYPE_p_svn_fs_path_change_t swig_types[89] +#define SWIGTYPE_p_svn_fs_root_t swig_types[90] +#define SWIGTYPE_p_svn_fs_t swig_types[91] +#define SWIGTYPE_p_svn_fs_txn_t swig_types[92] +#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[93] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[94] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[95] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[96] +#define SWIGTYPE_p_svn_location_segment_t swig_types[97] +#define SWIGTYPE_p_svn_lock_t swig_types[98] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[99] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[100] +#define SWIGTYPE_p_svn_log_entry_t swig_types[101] +#define SWIGTYPE_p_svn_merge_range_t swig_types[102] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[103] +#define SWIGTYPE_p_svn_node_kind_t swig_types[104] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[105] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[106] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[107] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[108] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[109] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[110] +#define SWIGTYPE_p_svn_patch_file_t swig_types[111] +#define SWIGTYPE_p_svn_patch_t swig_types[112] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[113] +#define SWIGTYPE_p_svn_prop_kind swig_types[114] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[115] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[116] +#define SWIGTYPE_p_svn_stream_t swig_types[117] +#define SWIGTYPE_p_svn_string_t swig_types[118] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[119] +#define SWIGTYPE_p_svn_tristate_t swig_types[120] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[121] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[122] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[123] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[124] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[125] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[126] +#define SWIGTYPE_p_svn_version_extended_t swig_types[127] +#define SWIGTYPE_p_svn_version_t swig_types[128] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[129] +#define SWIGTYPE_p_unsigned_char swig_types[130] +#define SWIGTYPE_p_unsigned_long swig_types[131] +#define SWIGTYPE_p_void swig_types[132] +static swig_type_info *swig_types[134]; +static swig_module_info swig_module = {swig_types, 133, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -10935,7 +10938,7 @@ XS(_wrap_svn_fs_file_md5_checksum) { } } { - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg1, + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg1, _global_pool), 0)); argvi++ /*@SWIG@*/ @@ -14782,6 +14785,257 @@ XS(_wrap_svn_fs_info_dup) { + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_fs_ioctl_code_t_fs_type_set) { + { + struct svn_fs_ioctl_code_t *arg1 = (struct svn_fs_ioctl_code_t *) 0 ; + char *arg2 = (char *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_fs_ioctl_code_t_fs_type_set(self,fs_type);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_ioctl_code_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_ioctl_code_t_fs_type_set" "', argument " "1"" of type '" "struct svn_fs_ioctl_code_t *""'"); + } + arg1 = (struct svn_fs_ioctl_code_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_ioctl_code_t_fs_type_set" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + { + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->fs_type) free((char *)arg1->fs_type); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->fs_type = copied; + } + ST(argvi) = sv_newmortal(); + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_fs_ioctl_code_t_fs_type_get) { + { + struct svn_fs_ioctl_code_t *arg1 = (struct svn_fs_ioctl_code_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + char *result = 0 ; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_fs_ioctl_code_t_fs_type_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_ioctl_code_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_ioctl_code_t_fs_type_get" "', argument " "1"" of type '" "struct svn_fs_ioctl_code_t *""'"); + } + arg1 = (struct svn_fs_ioctl_code_t *)(argp1); + result = (char *) ((arg1)->fs_type); + ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_fs_ioctl_code_t_code_set) { + { + struct svn_fs_ioctl_code_t *arg1 = (struct svn_fs_ioctl_code_t *) 0 ; + int arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: svn_fs_ioctl_code_t_code_set(self,code);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_ioctl_code_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_ioctl_code_t_code_set" "', argument " "1"" of type '" "struct svn_fs_ioctl_code_t *""'"); + } + arg1 = (struct svn_fs_ioctl_code_t *)(argp1); + ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_fs_ioctl_code_t_code_set" "', argument " "2"" of type '" "int""'"); + } + arg2 = (int)(val2); + if (arg1) (arg1)->code = arg2; + ST(argvi) = sv_newmortal(); + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_fs_ioctl_code_t_code_get) { + { + struct svn_fs_ioctl_code_t *arg1 = (struct svn_fs_ioctl_code_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + int result; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: svn_fs_ioctl_code_t_code_get(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_ioctl_code_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_ioctl_code_t_code_get" "', argument " "1"" of type '" "struct svn_fs_ioctl_code_t *""'"); + } + arg1 = (struct svn_fs_ioctl_code_t *)(argp1); + result = (int) ((arg1)->code); + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_fs_ioctl) { + { + svn_fs_t *arg1 = (svn_fs_t *) 0 ; + svn_fs_ioctl_code_t arg2 ; + void *arg3 = (void *) 0 ; + void **arg4 = (void **) 0 ; + svn_cancel_func_t arg5 = (svn_cancel_func_t) 0 ; + void *arg6 = (void *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; + apr_pool_t *arg8 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 ; + int res2 = 0 ; + int res3 ; + void *temp4 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + { + _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg4 = &temp4; + if ((items < 4) || (items > 6)) { + SWIG_croak("Usage: svn_fs_ioctl(fs,ctlcode,input,cancel_func,cancel_baton,result_pool,scratch_pool);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_ioctl" "', argument " "1"" of type '" "svn_fs_t *""'"); + } + arg1 = (svn_fs_t *)(argp1); + { + res2 = SWIG_ConvertPtr(ST(1), &argp2, SWIGTYPE_p_svn_fs_ioctl_code_t, 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_ioctl" "', argument " "2"" of type '" "svn_fs_ioctl_code_t""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "svn_fs_ioctl" "', argument " "2"" of type '" "svn_fs_ioctl_code_t""'"); + } else { + arg2 = *((svn_fs_ioctl_code_t *)(argp2)); + } + } + res3 = SWIG_ConvertPtr(ST(2),SWIG_as_voidptrptr(&arg3), 0, 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_fs_ioctl" "', argument " "3"" of type '" "void *""'"); + } + { + arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func; + arg6 = ST(3); + } + if (items > 4) { + + } + if (items > 5) { + + } + { + result = (svn_error_t *)svn_fs_ioctl(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + /* FIXME: Missing argout typemap: svn_fs_ioctl arg 4 (void **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_fs_ioctl is not implemented yet"); + + } + + + + + + XSRETURN(argvi); + fail: + + + + + SWIG_croak_null(); } } @@ -14802,7 +15056,7 @@ XS(_wrap_svn_fs_invoke_warning_callback) { SWIG_croak("Usage: svn_fs_invoke_warning_callback(_obj,baton,err);"); } { - int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_p_struct_svn_error_t__void); + int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_p_svn_error_t__void); if (!SWIG_IsOK(res)) { SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_fs_invoke_warning_callback" "', argument " "1"" of type '" "svn_fs_warning_callback_t""'"); } @@ -15574,24 +15828,24 @@ static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *| static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_long_p_void_p_apr_pool_t__void = {"_p_f_long_p_void_p_apr_pool_t__void", "void (*)(long,void *,apr_pool_t *)|svn_fs_progress_notify_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)|svn_fs_mergeinfo_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_fs_process_contents_func_t|struct svn_error_t *(*)(unsigned char const *,apr_size_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_uint64_t,svn_fs_upgrade_notify_action_t,apr_pool_t *)|svn_fs_upgrade_notify_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)|svn_fs_mergeinfo_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(unsigned char const *,apr_size_t,void *,apr_pool_t *)|svn_fs_process_contents_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_uint64_t,svn_fs_upgrade_notify_action_t,apr_pool_t *)|svn_fs_upgrade_notify_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_long_long_p_apr_pool_t__void = {"_p_f_p_void_long_long_p_apr_pool_t__void", "void (*)(void *,long,long,apr_pool_t *)|svn_fs_hotcopy_notify_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_fs_freeze_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_struct_svn_error_t__void = {"_p_f_p_void_p_struct_svn_error_t__void", "void (*)(void *,struct svn_error_t *)|svn_fs_warning_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_lock_t *,apr_pool_t *)|svn_fs_get_locks_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_pool_t *)|svn_fs_freeze_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_error_t__void = {"_p_f_p_void_p_svn_error_t__void", "void (*)(void *,svn_error_t *)|svn_fs_warning_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_lock_t *,apr_pool_t *)|svn_fs_get_locks_callback_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_array_header_t = {"_p_p_apr_array_header_t", "apr_array_header_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **|svn_mergeinfo_catalog_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_txdelta_window_handler_t *|struct svn_error_t *(**)(svn_txdelta_window_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(**)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_checksum_t = {"_p_p_svn_checksum_t", "struct svn_checksum_t **|svn_checksum_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_fs_access_t = {"_p_p_svn_fs_access_t", "struct svn_fs_access_t **|svn_fs_access_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_fs_history_t = {"_p_p_svn_fs_history_t", "struct svn_fs_history_t **|svn_fs_history_t **", 0, 0, (void*)0, 0}; @@ -15625,6 +15879,7 @@ static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct s static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_binary_patch_t = {"_p_svn_diff_binary_patch_t", "struct svn_diff_binary_patch_t *|svn_diff_binary_patch_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_conflict_display_style_t = {"_p_svn_diff_conflict_display_style_t", "enum svn_diff_conflict_display_style_t *|svn_diff_conflict_display_style_t *", 0, 0, (void*)0, 0}; @@ -15639,7 +15894,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_access_t = {"_p_svn_fs_access_t", "struct svn_fs_access_t *|svn_fs_access_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_dirent_t = {"_p_svn_fs_dirent_t", "struct svn_fs_dirent_t *|svn_fs_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_fsfs_info_t = {"_p_svn_fs_fsfs_info_t", "struct svn_fs_fsfs_info_t *|svn_fs_fsfs_info_t *", 0, 0, (void*)0, 0}; @@ -15647,6 +15902,7 @@ static swig_type_info _swigt__p_svn_fs_fsx_info_t = {"_p_svn_fs_fsx_info_t", "st static swig_type_info _swigt__p_svn_fs_history_t = {"_p_svn_fs_history_t", "struct svn_fs_history_t *|svn_fs_history_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_id_t = {"_p_svn_fs_id_t", "struct svn_fs_id_t *|svn_fs_id_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_info_placeholder_t = {"_p_svn_fs_info_placeholder_t", "struct svn_fs_info_placeholder_t *|svn_fs_info_placeholder_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_fs_ioctl_code_t = {"_p_svn_fs_ioctl_code_t", "struct svn_fs_ioctl_code_t *|svn_fs_ioctl_code_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "struct svn_fs_lock_target_t *|svn_fs_lock_target_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_node_relation_t = {"_p_svn_fs_node_relation_t", "enum svn_fs_node_relation_t *|svn_fs_node_relation_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_pack_notify_action_t = {"_p_svn_fs_pack_notify_action_t", "enum svn_fs_pack_notify_action_t *|svn_fs_pack_notify_action_t *", 0, 0, (void*)0, 0}; @@ -15674,6 +15930,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -15716,7 +15973,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_f_p_void_long_long_p_apr_pool_t__void, &_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, - &_swigt__p_f_p_void_p_struct_svn_error_t__void, + &_swigt__p_f_p_void_p_svn_error_t__void, &_swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_int, &_swigt__p_long, @@ -15757,6 +16014,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_binary_patch_t, &_swigt__p_svn_diff_conflict_display_style_t, @@ -15779,6 +16037,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_fs_history_t, &_swigt__p_svn_fs_id_t, &_swigt__p_svn_fs_info_placeholder_t, + &_swigt__p_svn_fs_ioctl_code_t, &_swigt__p_svn_fs_lock_target_t, &_swigt__p_svn_fs_node_relation_t, &_swigt__p_svn_fs_pack_notify_action_t, @@ -15806,6 +16065,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -15848,7 +16108,7 @@ static swig_cast_info _swigc__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_acti static swig_cast_info _swigc__p_f_p_void_long_long_p_apr_pool_t__void[] = { {&_swigt__p_f_p_void_long_long_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_f_p_void_p_struct_svn_error_t__void[] = { {&_swigt__p_f_p_void_p_struct_svn_error_t__void, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_void_p_svn_error_t__void[] = { {&_swigt__p_f_p_void_p_svn_error_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_long[] = { {&_swigt__p_long, 0, 0, 0},{0, 0, 0, 0}}; @@ -15889,6 +16149,7 @@ static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_binary_patch_t[] = { {&_swigt__p_svn_diff_binary_patch_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_conflict_display_style_t[] = { {&_swigt__p_svn_diff_conflict_display_style_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -15911,6 +16172,7 @@ static swig_cast_info _swigc__p_svn_fs_fsx_info_t[] = { {&_swigt__p_svn_fs_fsx_ static swig_cast_info _swigc__p_svn_fs_history_t[] = { {&_swigt__p_svn_fs_history_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_id_t[] = { {&_swigt__p_svn_fs_id_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_info_placeholder_t[] = { {&_swigt__p_svn_fs_info_placeholder_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_fs_ioctl_code_t[] = { {&_swigt__p_svn_fs_ioctl_code_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = { {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_node_relation_t[] = { {&_swigt__p_svn_fs_node_relation_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_pack_notify_action_t[] = { {&_swigt__p_svn_fs_pack_notify_action_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -15938,6 +16200,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -15980,7 +16243,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_f_p_void_long_long_p_apr_pool_t__void, _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, - _swigc__p_f_p_void_p_struct_svn_error_t__void, + _swigc__p_f_p_void_p_svn_error_t__void, _swigc__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, _swigc__p_int, _swigc__p_long, @@ -16021,6 +16284,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_binary_patch_t, _swigc__p_svn_diff_conflict_display_style_t, @@ -16043,6 +16307,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_fs_history_t, _swigc__p_svn_fs_id_t, _swigc__p_svn_fs_info_placeholder_t, + _swigc__p_svn_fs_ioctl_code_t, _swigc__p_svn_fs_lock_target_t, _swigc__p_svn_fs_node_relation_t, _swigc__p_svn_fs_pack_notify_action_t, @@ -16070,6 +16335,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, @@ -16309,6 +16575,11 @@ static swig_command_info swig_commands[] = { {"SVN::_Fs::svn_fs_info_placeholder_t_fs_type_get", _wrap_svn_fs_info_placeholder_t_fs_type_get}, {"SVN::_Fs::svn_fs_info", _wrap_svn_fs_info}, {"SVN::_Fs::svn_fs_info_dup", _wrap_svn_fs_info_dup}, +{"SVN::_Fs::svn_fs_ioctl_code_t_fs_type_set", _wrap_svn_fs_ioctl_code_t_fs_type_set}, +{"SVN::_Fs::svn_fs_ioctl_code_t_fs_type_get", _wrap_svn_fs_ioctl_code_t_fs_type_get}, +{"SVN::_Fs::svn_fs_ioctl_code_t_code_set", _wrap_svn_fs_ioctl_code_t_code_set}, +{"SVN::_Fs::svn_fs_ioctl_code_t_code_get", _wrap_svn_fs_ioctl_code_t_code_get}, +{"SVN::_Fs::svn_fs_ioctl", _wrap_svn_fs_ioctl}, {"SVN::_Fs::svn_fs_invoke_warning_callback", _wrap_svn_fs_invoke_warning_callback}, {"SVN::_Fs::svn_fs_invoke_upgrade_notify", _wrap_svn_fs_invoke_upgrade_notify}, {"SVN::_Fs::svn_fs_invoke_progress_notify_func", _wrap_svn_fs_invoke_progress_notify_func}, @@ -16613,197 +16884,197 @@ XS(SWIG_init) { SvREADONLY_on(sv); } - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TYPE_BDB", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("bdb")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TYPE_FSFS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("fsfs")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TYPE_FSX", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("fsx")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_BDB_TXN_NOSYNC", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("bdb-txn-nosync")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_BDB_LOG_AUTOREMOVE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("bdb-log-autoremove")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_CACHE_DELTAS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("fsfs-cache-deltas")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_CACHE_FULLTEXTS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("fsfs-cache-fulltexts")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_CACHE_REVPROPS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("fsfs-cache-revprops")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_CACHE_NS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("fsfs-cache-namespace")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_CACHE_NODEPROPS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("fsfs-cache-nodeprops")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_BLOCK_READ", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("fsfs-block-read")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_SHARD_SIZE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("fsfs-shard-size")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_LOG_ADDRESSING", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("fsfs-log-addressing")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FS_TYPE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("fs-type")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_PRE_1_4_COMPATIBLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("pre-1.4-compatible")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_PRE_1_5_COMPATIBLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("pre-1.5-compatible")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_PRE_1_6_COMPATIBLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("pre-1.6-compatible")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_PRE_1_8_COMPATIBLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("pre-1.8-compatible")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_COMPATIBLE_VERSION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("compatible-version")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_NO_FLUSH_TO_DISK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("no-flush-to-disk")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_fs_upgrade_pack_revprops", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_upgrade_pack_revprops))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_fs_upgrade_cleanup_revprops", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_upgrade_cleanup_revprops))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_fs_upgrade_format_bumped", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_upgrade_format_bumped))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_fs_node_unrelated", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_node_unrelated))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_fs_node_unchanged", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_node_unchanged))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_fs_node_common_ancestor", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_node_common_ancestor))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TXN_CHECK_OOD", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00001))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TXN_CHECK_LOCKS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00002))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TXN_CLIENT_DATE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00004))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_fs_path_change_modify", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_path_change_modify))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_fs_path_change_add", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_path_change_add))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_fs_path_change_delete", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_path_change_delete))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_fs_path_change_replace", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_path_change_replace))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_fs_path_change_reset", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_path_change_reset))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_fs_pack_notify_start", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_pack_notify_start))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_fs_pack_notify_end", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_pack_notify_end))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_fs_pack_notify_start_revprop", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_pack_notify_start_revprop))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_fs_pack_notify_end_revprop", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_pack_notify_end_revprop))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_fs_pack_notify_noop", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_pack_notify_noop))); SvREADONLY_on(sv); diff --git a/subversion/bindings/swig/perl/native/svn_ra.c b/subversion/bindings/swig/perl/native/svn_ra.c index 85f2fe1..36362e2 100644 --- a/subversion/bindings/swig/perl/native/svn_ra.c +++ b/subversion/bindings/swig/perl/native/svn_ra.c @@ -1606,67 +1606,69 @@ SWIG_Perl_SetModule(swig_module_info *module) { #define SWIGTYPE_p_svn_commit_info_t swig_types[94] #define SWIGTYPE_p_svn_config_t swig_types[95] #define SWIGTYPE_p_svn_delta_editor_t swig_types[96] -#define SWIGTYPE_p_svn_depth_t swig_types[97] -#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[98] -#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[99] -#define SWIGTYPE_p_svn_diff_datasource_e swig_types[100] -#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[101] -#define SWIGTYPE_p_svn_diff_file_options_t swig_types[102] -#define SWIGTYPE_p_svn_diff_fns2_t swig_types[103] -#define SWIGTYPE_p_svn_diff_fns_t swig_types[104] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[105] -#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[106] -#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[107] -#define SWIGTYPE_p_svn_diff_t swig_types[108] -#define SWIGTYPE_p_svn_dirent_t swig_types[109] -#define SWIGTYPE_p_svn_errno_t swig_types[110] -#define SWIGTYPE_p_svn_error_t swig_types[111] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[112] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[113] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[114] -#define SWIGTYPE_p_svn_location_segment_t swig_types[115] -#define SWIGTYPE_p_svn_lock_t swig_types[116] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[117] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[118] -#define SWIGTYPE_p_svn_log_entry_t swig_types[119] -#define SWIGTYPE_p_svn_merge_range_t swig_types[120] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[121] -#define SWIGTYPE_p_svn_node_kind_t swig_types[122] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[123] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[124] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[125] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[126] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[127] -#define SWIGTYPE_p_svn_patch_file_t swig_types[128] -#define SWIGTYPE_p_svn_patch_t swig_types[129] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[130] -#define SWIGTYPE_p_svn_prop_kind swig_types[131] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[132] -#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[133] -#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[134] -#define SWIGTYPE_p_svn_ra_plugin_t swig_types[135] -#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[136] -#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[137] -#define SWIGTYPE_p_svn_ra_reporter_t swig_types[138] -#define SWIGTYPE_p_svn_ra_session_t swig_types[139] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[140] -#define SWIGTYPE_p_svn_stream_t swig_types[141] -#define SWIGTYPE_p_svn_string_t swig_types[142] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[143] -#define SWIGTYPE_p_svn_tristate_t swig_types[144] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[145] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[146] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[147] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[148] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[149] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[150] -#define SWIGTYPE_p_svn_version_extended_t swig_types[151] -#define SWIGTYPE_p_svn_version_t swig_types[152] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[153] -#define SWIGTYPE_p_unsigned_long swig_types[154] -#define SWIGTYPE_p_void swig_types[155] -static swig_type_info *swig_types[157]; -static swig_module_info swig_module = {swig_types, 156, 0, 0, 0, 0}; +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[97] +#define SWIGTYPE_p_svn_depth_t swig_types[98] +#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[99] +#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[100] +#define SWIGTYPE_p_svn_diff_datasource_e swig_types[101] +#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[102] +#define SWIGTYPE_p_svn_diff_file_options_t swig_types[103] +#define SWIGTYPE_p_svn_diff_fns2_t swig_types[104] +#define SWIGTYPE_p_svn_diff_fns_t swig_types[105] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[106] +#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[107] +#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[108] +#define SWIGTYPE_p_svn_diff_t swig_types[109] +#define SWIGTYPE_p_svn_dirent_t swig_types[110] +#define SWIGTYPE_p_svn_errno_t swig_types[111] +#define SWIGTYPE_p_svn_error_t swig_types[112] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[113] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[114] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[115] +#define SWIGTYPE_p_svn_location_segment_t swig_types[116] +#define SWIGTYPE_p_svn_lock_t swig_types[117] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[118] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[119] +#define SWIGTYPE_p_svn_log_entry_t swig_types[120] +#define SWIGTYPE_p_svn_merge_range_t swig_types[121] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[122] +#define SWIGTYPE_p_svn_node_kind_t swig_types[123] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[124] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[125] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[126] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[127] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[128] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[129] +#define SWIGTYPE_p_svn_patch_file_t swig_types[130] +#define SWIGTYPE_p_svn_patch_t swig_types[131] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[132] +#define SWIGTYPE_p_svn_prop_kind swig_types[133] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[134] +#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[135] +#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[136] +#define SWIGTYPE_p_svn_ra_plugin_t swig_types[137] +#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[138] +#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[139] +#define SWIGTYPE_p_svn_ra_reporter_t swig_types[140] +#define SWIGTYPE_p_svn_ra_session_t swig_types[141] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[142] +#define SWIGTYPE_p_svn_stream_t swig_types[143] +#define SWIGTYPE_p_svn_string_t swig_types[144] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[145] +#define SWIGTYPE_p_svn_tristate_t swig_types[146] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[147] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[148] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[149] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[150] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[151] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[152] +#define SWIGTYPE_p_svn_version_extended_t swig_types[153] +#define SWIGTYPE_p_svn_version_t swig_types[154] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[155] +#define SWIGTYPE_p_unsigned_long swig_types[156] +#define SWIGTYPE_p_void swig_types[157] +static swig_type_info *swig_types[159]; +static swig_module_info swig_module = {swig_types, 158, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -17575,56 +17577,56 @@ static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *| static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void = {"_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void", "void (*)(apr_off_t,apr_off_t,void *,apr_pool_t *)|svn_ra_progress_notify_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t = {"_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t", "struct svn_error_t *(*)(int,apr_pool_t *,apr_hash_t *)|svn_ra_init_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(apr_file_t **,void *,apr_pool_t *)|struct svn_error_t *(*)(apr_file_t **,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|struct svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void **,char const *,svn_ra_callbacks_t const *,void *,apr_hash_t *,apr_pool_t *)|svn_error_t *(*)(void **,char const *,svn_ra_callbacks_t const *,void *,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_dirent_t *,void *,apr_pool_t *)|svn_ra_dirent_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_error_t *(*)(void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t **,char const *,svn_revnum_t,apr_array_header_t *,apr_pool_t *)|struct svn_error_t *(*)(void *,apr_hash_t **,char const *,svn_revnum_t,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const **,apr_pool_t *)|svn_ra_get_client_string_func_t|struct svn_error_t *(*)(void *,char const **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_delta_editor_t const **,void **,char const *,svn_commit_callback_t,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_delta_editor_t const **,void **,char const *,svn_commit_callback_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,char const *,svn_revnum_t,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,char const *,svn_revnum_t,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_stream_t **,svn_checksum_t const *,apr_pool_t *)|svn_ra_get_wc_contents_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_array_header_t const *,svn_revnum_t,svn_revnum_t,svn_boolean_t,svn_boolean_t,svn_log_message_receiver_t,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,apr_array_header_t const *,svn_revnum_t,svn_revnum_t,svn_boolean_t,svn_boolean_t,svn_log_message_receiver_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t = {"_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t", "svn_error_t *(*)(int,apr_pool_t *,apr_hash_t *)|svn_ra_init_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(apr_file_t **,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void **,char const *,svn_ra_callbacks_t const *,void *,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_dirent_t *,void *,apr_pool_t *)|svn_ra_dirent_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)|svn_commit_callback2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t **,char const *,svn_revnum_t,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const **,apr_pool_t *)|svn_ra_get_client_string_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_delta_editor_t const **,void **,char const *,svn_commit_callback_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,char const *,svn_revnum_t,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t", "svn_ra_get_wc_contents_func_t|svn_error_t *(*)(void *,svn_stream_t **,svn_checksum_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_array_header_t const *,svn_revnum_t,svn_revnum_t,svn_boolean_t,svn_boolean_t,svn_log_message_receiver_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char__int = {"_p_f_p_void_p_q_const__char__int", "int (*)(void *,char const *)|svn_ra_check_tunnel_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_ra_invalidate_wc_props_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_string_t const **,apr_pool_t *)|svn_ra_get_wc_prop_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_string_t const *,apr_pool_t *)|svn_ra_set_wc_prop_func_t|svn_ra_push_wc_prop_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)|svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)|svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)|svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_boolean_t,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_ra_lock_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_ra_file_rev_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t **,svn_revnum_t *,apr_hash_t **,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t **,svn_revnum_t *,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_node_kind_t *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_node_kind_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_revnum_t,svn_ra_file_rev_handler_t,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_revnum_t,svn_ra_file_rev_handler_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t__p_svn_error_t", "svn_ra_get_latest_revnum_func_t|struct svn_error_t *(*)(void *,svn_revnum_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_time_t,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_revnum_t *,apr_time_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_revnum_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_ra_invalidate_wc_props_func_t|svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_ra_get_wc_prop_func_t|svn_error_t *(*)(void *,char const *,char const *,svn_string_t const **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_ra_set_wc_prop_func_t|svn_ra_push_wc_prop_func_t|svn_error_t *(*)(void *,char const *,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_boolean_t,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_ra_lock_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_ra_file_rev_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t **,svn_revnum_t *,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_node_kind_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_revnum_t,svn_ra_file_rev_handler_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t__p_svn_error_t", "svn_ra_get_latest_revnum_func_t|svn_error_t *(*)(void *,svn_revnum_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_time_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_void__void = {"_p_f_p_void_p_void__void", "svn_ra_close_tunnel_func_t|void (*)(void *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,apr_hash_t **,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t **,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t const *,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,void *,svn_delta_editor_t const **,void **,apr_hash_t *,apr_pool_t *)|svn_ra_replay_revstart_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,void *,svn_delta_editor_t const *,void *,apr_hash_t *,apr_pool_t *)|svn_ra_replay_revfinish_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_ra_replay_revstart_callback_t|svn_error_t *(*)(svn_revnum_t,void *,svn_delta_editor_t const **,void **,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_ra_replay_revfinish_callback_t|svn_error_t *(*)(svn_revnum_t,void *,svn_delta_editor_t const *,void *,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_void__p_svn_version_t = {"_p_f_void__p_svn_version_t", "struct svn_version_t *(*)(void)|svn_version_t *(*)(void)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; @@ -17632,7 +17634,7 @@ static swig_type_info _swigt__p_p_apr_array_header_t = {"_p_p_apr_array_header_t static swig_type_info _swigt__p_p_apr_file_t = {"_p_p_apr_file_t", "apr_file_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **|svn_mergeinfo_catalog_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_txdelta_window_handler_t *|struct svn_error_t *(**)(svn_txdelta_window_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(**)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_void_p_void__void = {"_p_p_f_p_void_p_void__void", "svn_ra_close_tunnel_func_t *|void (**)(void *,void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_dirent_t = {"_p_p_svn_dirent_t", "struct svn_dirent_t **|svn_dirent_t **", 0, 0, (void*)0, 0}; @@ -17664,6 +17666,7 @@ static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct s static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_binary_patch_t = {"_p_svn_diff_binary_patch_t", "struct svn_diff_binary_patch_t *|svn_diff_binary_patch_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_conflict_display_style_t = {"_p_svn_diff_conflict_display_style_t", "enum svn_diff_conflict_display_style_t *|svn_diff_conflict_display_style_t *", 0, 0, (void*)0, 0}; @@ -17678,7 +17681,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0}; @@ -17694,6 +17697,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -17822,6 +17826,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_binary_patch_t, &_swigt__p_svn_diff_conflict_display_style_t, @@ -17852,6 +17857,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -17980,6 +17986,7 @@ static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_binary_patch_t[] = { {&_swigt__p_svn_diff_binary_patch_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_conflict_display_style_t[] = { {&_swigt__p_svn_diff_conflict_display_style_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -18010,6 +18017,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -18138,6 +18146,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_binary_patch_t, _swigc__p_svn_diff_conflict_display_style_t, @@ -18168,6 +18177,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, @@ -18747,57 +18757,57 @@ XS(SWIG_init) { SvREADONLY_on(sv); } - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_DEPTH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("depth")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_MERGEINFO", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("mergeinfo")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_LOG_REVPROPS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("log-revprops")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_PARTIAL_REPLAY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("partial-replay")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_COMMIT_REVPROPS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("commit-revprops")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_ATOMIC_REVPROPS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("atomic-revprops")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_INHERITED_PROPS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("inherited-props")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_EPHEMERAL_TXNPROPS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("ephemeral-txnprops")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_GET_FILE_REVS_REVERSE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("get-file-revs-reversed")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_LIST", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("list")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_ABI_VERSION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(2))); SvREADONLY_on(sv); diff --git a/subversion/bindings/swig/perl/native/svn_repos.c b/subversion/bindings/swig/perl/native/svn_repos.c index 48ee063..180cf9c 100644 --- a/subversion/bindings/swig/perl/native/svn_repos.c +++ b/subversion/bindings/swig/perl/native/svn_repos.c @@ -1538,134 +1538,138 @@ SWIG_Perl_SetModule(swig_module_info *module) { #define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[26] #define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[27] #define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void swig_types[28] -#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[29] -#define SWIGTYPE_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[30] -#define SWIGTYPE_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t swig_types[31] -#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[32] -#define SWIGTYPE_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[33] -#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[34] -#define SWIGTYPE_p_int swig_types[35] -#define SWIGTYPE_p_long swig_types[36] -#define SWIGTYPE_p_p_apr_array_header_t swig_types[37] -#define SWIGTYPE_p_p_apr_hash_t swig_types[38] -#define SWIGTYPE_p_p_char swig_types[39] -#define SWIGTYPE_p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[40] -#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[41] -#define SWIGTYPE_p_p_svn_authz_t swig_types[42] -#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[43] -#define SWIGTYPE_p_p_svn_dirent_t swig_types[44] -#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[45] -#define SWIGTYPE_p_p_svn_lock_t swig_types[46] -#define SWIGTYPE_p_p_svn_repos_parse_fns2_t swig_types[47] -#define SWIGTYPE_p_p_svn_repos_parse_fns3_t swig_types[48] -#define SWIGTYPE_p_p_svn_repos_parse_fns_t swig_types[49] -#define SWIGTYPE_p_p_svn_repos_t swig_types[50] -#define SWIGTYPE_p_p_svn_stream_t swig_types[51] -#define SWIGTYPE_p_p_svn_string_t swig_types[52] -#define SWIGTYPE_p_p_svn_version_t swig_types[53] -#define SWIGTYPE_p_p_void swig_types[54] -#define SWIGTYPE_p_svn_auth_baton_t swig_types[55] -#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[56] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[57] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[58] -#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[59] -#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[60] -#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[61] -#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[62] -#define SWIGTYPE_p_svn_auth_provider_t swig_types[63] -#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[64] -#define SWIGTYPE_p_svn_authz_t swig_types[65] -#define SWIGTYPE_p_svn_cache_config_t swig_types[66] -#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[67] -#define SWIGTYPE_p_svn_checksum_kind_t swig_types[68] -#define SWIGTYPE_p_svn_checksum_t swig_types[69] -#define SWIGTYPE_p_svn_commit_info_t swig_types[70] -#define SWIGTYPE_p_svn_config_t swig_types[71] -#define SWIGTYPE_p_svn_delta_editor_t swig_types[72] -#define SWIGTYPE_p_svn_depth_t swig_types[73] -#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[74] -#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[75] -#define SWIGTYPE_p_svn_diff_datasource_e swig_types[76] -#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[77] -#define SWIGTYPE_p_svn_diff_file_options_t swig_types[78] -#define SWIGTYPE_p_svn_diff_fns2_t swig_types[79] -#define SWIGTYPE_p_svn_diff_fns_t swig_types[80] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[81] -#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[82] -#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[83] -#define SWIGTYPE_p_svn_diff_t swig_types[84] -#define SWIGTYPE_p_svn_dirent_t swig_types[85] -#define SWIGTYPE_p_svn_errno_t swig_types[86] -#define SWIGTYPE_p_svn_error_t swig_types[87] -#define SWIGTYPE_p_svn_fs_access_t swig_types[88] -#define SWIGTYPE_p_svn_fs_dirent_t swig_types[89] -#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[90] -#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[91] -#define SWIGTYPE_p_svn_fs_history_t swig_types[92] -#define SWIGTYPE_p_svn_fs_id_t swig_types[93] -#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[94] -#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[95] -#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[96] -#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[97] -#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[98] -#define SWIGTYPE_p_svn_fs_path_change3_t swig_types[99] -#define SWIGTYPE_p_svn_fs_path_change_iterator_t swig_types[100] -#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[101] -#define SWIGTYPE_p_svn_fs_path_change_t swig_types[102] -#define SWIGTYPE_p_svn_fs_root_t swig_types[103] -#define SWIGTYPE_p_svn_fs_t swig_types[104] -#define SWIGTYPE_p_svn_fs_txn_t swig_types[105] -#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[106] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[107] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[108] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[109] -#define SWIGTYPE_p_svn_location_segment_t swig_types[110] -#define SWIGTYPE_p_svn_lock_t swig_types[111] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[112] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[113] -#define SWIGTYPE_p_svn_log_entry_t swig_types[114] -#define SWIGTYPE_p_svn_merge_range_t swig_types[115] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[116] -#define SWIGTYPE_p_svn_node_kind_t swig_types[117] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[118] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[119] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[120] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[121] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[122] -#define SWIGTYPE_p_svn_patch_file_t swig_types[123] -#define SWIGTYPE_p_svn_patch_t swig_types[124] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[125] -#define SWIGTYPE_p_svn_prop_kind swig_types[126] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[127] -#define SWIGTYPE_p_svn_repos_authz_access_t swig_types[128] -#define SWIGTYPE_p_svn_repos_log_entry_t swig_types[129] -#define SWIGTYPE_p_svn_repos_node_t swig_types[130] -#define SWIGTYPE_p_svn_repos_notify_action_t swig_types[131] -#define SWIGTYPE_p_svn_repos_notify_t swig_types[132] -#define SWIGTYPE_p_svn_repos_notify_warning_t swig_types[133] -#define SWIGTYPE_p_svn_repos_parse_fns2_t swig_types[134] -#define SWIGTYPE_p_svn_repos_parse_fns3_t swig_types[135] -#define SWIGTYPE_p_svn_repos_parse_fns_t swig_types[136] -#define SWIGTYPE_p_svn_repos_revision_access_level_t swig_types[137] -#define SWIGTYPE_p_svn_repos_t swig_types[138] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[139] -#define SWIGTYPE_p_svn_stream_t swig_types[140] -#define SWIGTYPE_p_svn_string_t swig_types[141] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[142] -#define SWIGTYPE_p_svn_tristate_t swig_types[143] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[144] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[145] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[146] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[147] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[148] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[149] -#define SWIGTYPE_p_svn_version_extended_t swig_types[150] -#define SWIGTYPE_p_svn_version_t swig_types[151] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[152] -#define SWIGTYPE_p_unsigned_long swig_types[153] -#define SWIGTYPE_p_void swig_types[154] -static swig_type_info *swig_types[156]; -static swig_module_info swig_module = {swig_types, 155, 0, 0, 0, 0}; +#define SWIGTYPE_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void swig_types[29] +#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[30] +#define SWIGTYPE_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[31] +#define SWIGTYPE_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t swig_types[32] +#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[33] +#define SWIGTYPE_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[34] +#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[35] +#define SWIGTYPE_p_int swig_types[36] +#define SWIGTYPE_p_long swig_types[37] +#define SWIGTYPE_p_p_apr_array_header_t swig_types[38] +#define SWIGTYPE_p_p_apr_hash_t swig_types[39] +#define SWIGTYPE_p_p_char swig_types[40] +#define SWIGTYPE_p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[41] +#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[42] +#define SWIGTYPE_p_p_svn_authz_t swig_types[43] +#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[44] +#define SWIGTYPE_p_p_svn_dirent_t swig_types[45] +#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[46] +#define SWIGTYPE_p_p_svn_lock_t swig_types[47] +#define SWIGTYPE_p_p_svn_repos_parse_fns2_t swig_types[48] +#define SWIGTYPE_p_p_svn_repos_parse_fns3_t swig_types[49] +#define SWIGTYPE_p_p_svn_repos_parse_fns_t swig_types[50] +#define SWIGTYPE_p_p_svn_repos_t swig_types[51] +#define SWIGTYPE_p_p_svn_stream_t swig_types[52] +#define SWIGTYPE_p_p_svn_string_t swig_types[53] +#define SWIGTYPE_p_p_svn_version_t swig_types[54] +#define SWIGTYPE_p_p_void swig_types[55] +#define SWIGTYPE_p_svn_auth_baton_t swig_types[56] +#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[57] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[58] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[59] +#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[60] +#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[61] +#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[62] +#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[63] +#define SWIGTYPE_p_svn_auth_provider_t swig_types[64] +#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[65] +#define SWIGTYPE_p_svn_authz_t swig_types[66] +#define SWIGTYPE_p_svn_cache_config_t swig_types[67] +#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[68] +#define SWIGTYPE_p_svn_checksum_kind_t swig_types[69] +#define SWIGTYPE_p_svn_checksum_t swig_types[70] +#define SWIGTYPE_p_svn_commit_info_t swig_types[71] +#define SWIGTYPE_p_svn_config_t swig_types[72] +#define SWIGTYPE_p_svn_delta_editor_t swig_types[73] +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[74] +#define SWIGTYPE_p_svn_depth_t swig_types[75] +#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[76] +#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[77] +#define SWIGTYPE_p_svn_diff_datasource_e swig_types[78] +#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[79] +#define SWIGTYPE_p_svn_diff_file_options_t swig_types[80] +#define SWIGTYPE_p_svn_diff_fns2_t swig_types[81] +#define SWIGTYPE_p_svn_diff_fns_t swig_types[82] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[83] +#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[84] +#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[85] +#define SWIGTYPE_p_svn_diff_t swig_types[86] +#define SWIGTYPE_p_svn_dirent_t swig_types[87] +#define SWIGTYPE_p_svn_errno_t swig_types[88] +#define SWIGTYPE_p_svn_error_t swig_types[89] +#define SWIGTYPE_p_svn_fs_access_t swig_types[90] +#define SWIGTYPE_p_svn_fs_dirent_t swig_types[91] +#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[92] +#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[93] +#define SWIGTYPE_p_svn_fs_history_t swig_types[94] +#define SWIGTYPE_p_svn_fs_id_t swig_types[95] +#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[96] +#define SWIGTYPE_p_svn_fs_ioctl_code_t swig_types[97] +#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[98] +#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[99] +#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[100] +#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[101] +#define SWIGTYPE_p_svn_fs_path_change3_t swig_types[102] +#define SWIGTYPE_p_svn_fs_path_change_iterator_t swig_types[103] +#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[104] +#define SWIGTYPE_p_svn_fs_path_change_t swig_types[105] +#define SWIGTYPE_p_svn_fs_root_t swig_types[106] +#define SWIGTYPE_p_svn_fs_t swig_types[107] +#define SWIGTYPE_p_svn_fs_txn_t swig_types[108] +#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[109] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[110] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[111] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[112] +#define SWIGTYPE_p_svn_location_segment_t swig_types[113] +#define SWIGTYPE_p_svn_lock_t swig_types[114] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[115] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[116] +#define SWIGTYPE_p_svn_log_entry_t swig_types[117] +#define SWIGTYPE_p_svn_merge_range_t swig_types[118] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[119] +#define SWIGTYPE_p_svn_node_kind_t swig_types[120] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[121] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[122] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[123] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[124] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[125] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[126] +#define SWIGTYPE_p_svn_patch_file_t swig_types[127] +#define SWIGTYPE_p_svn_patch_t swig_types[128] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[129] +#define SWIGTYPE_p_svn_prop_kind swig_types[130] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[131] +#define SWIGTYPE_p_svn_repos_authz_access_t swig_types[132] +#define SWIGTYPE_p_svn_repos_log_entry_t swig_types[133] +#define SWIGTYPE_p_svn_repos_node_t swig_types[134] +#define SWIGTYPE_p_svn_repos_notify_action_t swig_types[135] +#define SWIGTYPE_p_svn_repos_notify_t swig_types[136] +#define SWIGTYPE_p_svn_repos_notify_warning_t swig_types[137] +#define SWIGTYPE_p_svn_repos_parse_fns2_t swig_types[138] +#define SWIGTYPE_p_svn_repos_parse_fns3_t swig_types[139] +#define SWIGTYPE_p_svn_repos_parse_fns_t swig_types[140] +#define SWIGTYPE_p_svn_repos_revision_access_level_t swig_types[141] +#define SWIGTYPE_p_svn_repos_t swig_types[142] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[143] +#define SWIGTYPE_p_svn_stream_t swig_types[144] +#define SWIGTYPE_p_svn_string_t swig_types[145] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[146] +#define SWIGTYPE_p_svn_tristate_t swig_types[147] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[148] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[149] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[150] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[151] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[152] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[153] +#define SWIGTYPE_p_svn_version_extended_t swig_types[154] +#define SWIGTYPE_p_svn_version_t swig_types[155] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[156] +#define SWIGTYPE_p_unsigned_long swig_types[157] +#define SWIGTYPE_p_void swig_types[158] +static swig_type_info *swig_types[160]; +static swig_module_info swig_module = {swig_types, 159, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2277,6 +2281,11 @@ static svn_error_t * svn_repos_invoke_verify_callback( return _obj(baton, revision, verify_err, scratch_pool); } +static void svn_repos_invoke_authz_warning_func( + svn_repos_authz_warning_func_t _obj, void *baton, const svn_error_t *error, apr_pool_t *scratch_pool) { + _obj(baton, error, scratch_pool); +} + #ifdef __cplusplus extern "C" { @@ -4884,7 +4893,7 @@ XS(_wrap_svn_repos_freeze) { } { - result = (svn_error_t *)svn_repos_freeze(arg1,arg2,arg3,arg4); + result = (svn_error_t *)svn_repos_freeze((apr_array_header_t const *)arg1,arg2,arg3,arg4); @@ -19242,6 +19251,134 @@ XS(_wrap_svn_repos_authz_initialize) { XSRETURN(argvi); fail: + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_repos_authz_read4) { + { + svn_authz_t **arg1 = (svn_authz_t **) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + svn_boolean_t arg4 ; + svn_repos_t *arg5 = (svn_repos_t *) 0 ; + svn_repos_authz_warning_func_t arg6 = (svn_repos_authz_warning_func_t) 0 ; + void *arg7 = (void *) 0 ; + apr_pool_t *arg8 = (apr_pool_t *) 0 ; + apr_pool_t *arg9 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + svn_authz_t *temp1 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + int val4 ; + int ecode4 = 0 ; + void *argp5 = 0 ; + int res5 = 0 ; + int res7 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + { + _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + if ((items < 6) || (items > 8)) { + SWIG_croak("Usage: svn_repos_authz_read4(path,groups_path,must_exist,repos_hint,warning_func,warning_baton,result_pool,scratch_pool);"); + } + res2 = SWIG_AsCharPtrAndSize(ST(0), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_authz_read4" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_authz_read4" "', argument " "3"" of type '" "char const *""'"); + } + arg3 = (char *)(buf3); + ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_repos_authz_read4" "', argument " "4"" of type '" "svn_boolean_t""'"); + } + arg4 = (svn_boolean_t)(val4); + res5 = SWIG_ConvertPtr(ST(3), &argp5,SWIGTYPE_p_svn_repos_t, 0 | 0 ); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_repos_authz_read4" "', argument " "5"" of type '" "svn_repos_t *""'"); + } + arg5 = (svn_repos_t *)(argp5); + { + int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg6), SWIGTYPE_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_authz_read4" "', argument " "6"" of type '" "svn_repos_authz_warning_func_t""'"); + } + } + res7 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg7), 0, 0); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_repos_authz_read4" "', argument " "7"" of type '" "void *""'"); + } + if (items > 6) { + + } + if (items > 7) { + + } + { + result = (svn_error_t *)svn_repos_authz_read4(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_authz_t, 0); argvi++ ; + } + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + + + + + + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + + + + + + SWIG_croak_null(); } } @@ -19524,6 +19661,106 @@ XS(_wrap_svn_repos_authz_read) { if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_repos_authz_parse2) { + { + svn_authz_t **arg1 = (svn_authz_t **) 0 ; + svn_stream_t *arg2 = (svn_stream_t *) 0 ; + svn_stream_t *arg3 = (svn_stream_t *) 0 ; + svn_repos_authz_warning_func_t arg4 = (svn_repos_authz_warning_func_t) 0 ; + void *arg5 = (void *) 0 ; + apr_pool_t *arg6 = (apr_pool_t *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + svn_authz_t *temp1 ; + int res5 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + { + _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + arg1 = &temp1; + if ((items < 4) || (items > 6)) { + SWIG_croak("Usage: svn_repos_authz_parse2(stream,groups_stream,warning_func,warning_baton,result_pool,scratch_pool);"); + } + { + svn_swig_pl_make_stream (&arg2, ST(0)); + SPAGAIN; + } + { + svn_swig_pl_make_stream (&arg3, ST(1)); + SPAGAIN; + } + { + int res = SWIG_ConvertFunctionPtr(ST(2), (void**)(&arg4), SWIGTYPE_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_authz_parse2" "', argument " "4"" of type '" "svn_repos_authz_warning_func_t""'"); + } + } + res5 = SWIG_ConvertPtr(ST(3),SWIG_as_voidptrptr(&arg5), 0, 0); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_repos_authz_parse2" "', argument " "5"" of type '" "void *""'"); + } + if (items > 4) { + + } + if (items > 5) { + + } + { + result = (svn_error_t *)svn_repos_authz_parse2(arg1,arg2,arg3,arg4,arg5,arg6,arg7); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_authz_t, 0); argvi++ ; + } + + + + + + + + XSRETURN(argvi); + fail: + + + + + + + SWIG_croak_null(); } } @@ -22393,6 +22630,66 @@ XS(_wrap_svn_repos_invoke_verify_callback) { + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_repos_invoke_authz_warning_func) { + { + svn_repos_authz_warning_func_t arg1 = (svn_repos_authz_warning_func_t) 0 ; + void *arg2 = (void *) 0 ; + svn_error_t *arg3 = (svn_error_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + int res2 ; + void *argp3 = 0 ; + int res3 = 0 ; + int argvi = 0; + dXSARGS; + + { + _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 3) || (items > 4)) { + SWIG_croak("Usage: svn_repos_invoke_authz_warning_func(_obj,baton,error,scratch_pool);"); + } + { + int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_invoke_authz_warning_func" "', argument " "1"" of type '" "svn_repos_authz_warning_func_t""'"); + } + } + res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_invoke_authz_warning_func" "', argument " "2"" of type '" "void *""'"); + } + res3 = SWIG_ConvertPtr(ST(2), &argp3,SWIGTYPE_p_svn_error_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_invoke_authz_warning_func" "', argument " "3"" of type '" "svn_error_t const *""'"); + } + arg3 = (svn_error_t *)(argp3); + if (items > 3) { + + } + { + svn_repos_invoke_authz_warning_func(arg1,arg2,(svn_error_t const *)arg3,arg4); + + + + } + ST(argvi) = sv_newmortal(); + + + + + XSRETURN(argvi); + fail: + + + + SWIG_croak_null(); } } @@ -22407,42 +22704,43 @@ static swig_type_info _swigt__p_apr_int32_t = {"_p_apr_int32_t", "apr_int32_t *| static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *|svn_filesize_t *|apr_time_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_int_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_int_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(int,void *,apr_pool_t *)|svn_error_t *(*)(int,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_void__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_stream_t **,void *)|svn_error_t *(*)(svn_stream_t **,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_void_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void **,apr_hash_t *,void *,apr_pool_t *)|svn_error_t *(*)(void **,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_dirent_t *,void *,apr_pool_t *)|svn_repos_dirent_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,void *,apr_pool_t *)|struct svn_error_t *(*)(char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)|svn_repos_mergeinfo_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_repos_authz_func_t|svn_repos_dump_filter_func_t|struct svn_error_t *(*)(svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_txdelta_window_handler_t_p_p_void_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_handler_t_p_p_void_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_handler_t *,void **,void *)|svn_error_t *(*)(svn_txdelta_window_handler_t *,void **,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_repos_freeze_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char__p_svn_error_t = {"_p_f_p_void_p_q_const__char__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *)|svn_error_t *(*)(void *,char const *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_string_t const *)|svn_error_t *(*)(void *,char const *,svn_string_t const *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_repos_file_rev_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_pool_t *)|svn_repos_history_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_int_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_int_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(int,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_void__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_stream_t **,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void **,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_dirent_t *,void *,apr_pool_t *)|svn_repos_dirent_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)|svn_repos_mergeinfo_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)|svn_commit_callback2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)|svn_repos_authz_func_t|svn_repos_dump_filter_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_txdelta_window_handler_t_p_p_void_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_handler_t_p_p_void_p_void__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_window_handler_t *,void **,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_pool_t *)|svn_repos_freeze_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char__p_svn_error_t = {"_p_f_p_void_p_q_const__char__p_svn_error_t", "svn_error_t *(*)(void *,char const *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_string_t const *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_repos_file_rev_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_pool_t *)|svn_repos_history_func_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void = {"_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void", "svn_repos_notify_func_t|void (*)(void *,struct svn_repos_notify_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_repos_log_entry_t *,apr_pool_t *)|svn_repos_log_entry_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_repos_path_change_t *,apr_pool_t *)|svn_repos_path_change_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_repos_verify_callback_t|struct svn_error_t *(*)(void *,svn_revnum_t,svn_error_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_repos_authz_access_t,svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)|svn_repos_authz_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void = {"_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void", "void (*)(void *,svn_error_t const *,apr_pool_t *)|svn_repos_authz_warning_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_repos_log_entry_t *,apr_pool_t *)|svn_repos_log_entry_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_repos_path_change_t *,apr_pool_t *)|svn_repos_path_change_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,svn_error_t *,apr_pool_t *)|svn_repos_verify_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_repos_authz_access_t,svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)|svn_repos_authz_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_array_header_t = {"_p_p_apr_array_header_t", "apr_array_header_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **|svn_mergeinfo_catalog_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_repos_mergeinfo_receiver_t *|struct svn_error_t *(**)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_txdelta_window_handler_t *|struct svn_error_t *(**)(svn_txdelta_window_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)|svn_repos_mergeinfo_receiver_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(**)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_authz_t = {"_p_p_svn_authz_t", "struct svn_authz_t **|svn_authz_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_dirent_t = {"_p_p_svn_dirent_t", "struct svn_dirent_t **|svn_dirent_t **", 0, 0, (void*)0, 0}; @@ -22474,6 +22772,7 @@ static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct s static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_binary_patch_t = {"_p_svn_diff_binary_patch_t", "struct svn_diff_binary_patch_t *|svn_diff_binary_patch_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_conflict_display_style_t = {"_p_svn_diff_conflict_display_style_t", "enum svn_diff_conflict_display_style_t *|svn_diff_conflict_display_style_t *", 0, 0, (void*)0, 0}; @@ -22488,7 +22787,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_access_t = {"_p_svn_fs_access_t", "struct svn_fs_access_t *|svn_fs_access_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_dirent_t = {"_p_svn_fs_dirent_t", "struct svn_fs_dirent_t *|svn_fs_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_fsfs_info_t = {"_p_svn_fs_fsfs_info_t", "struct svn_fs_fsfs_info_t *|svn_fs_fsfs_info_t *", 0, 0, (void*)0, 0}; @@ -22496,6 +22795,7 @@ static swig_type_info _swigt__p_svn_fs_fsx_info_t = {"_p_svn_fs_fsx_info_t", "st static swig_type_info _swigt__p_svn_fs_history_t = {"_p_svn_fs_history_t", "struct svn_fs_history_t *|svn_fs_history_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_id_t = {"_p_svn_fs_id_t", "struct svn_fs_id_t *|svn_fs_id_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_info_placeholder_t = {"_p_svn_fs_info_placeholder_t", "struct svn_fs_info_placeholder_t *|svn_fs_info_placeholder_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_fs_ioctl_code_t = {"_p_svn_fs_ioctl_code_t", "struct svn_fs_ioctl_code_t *|svn_fs_ioctl_code_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "struct svn_fs_lock_target_t *|svn_fs_lock_target_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_node_relation_t = {"_p_svn_fs_node_relation_t", "enum svn_fs_node_relation_t *|svn_fs_node_relation_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_pack_notify_action_t = {"_p_svn_fs_pack_notify_action_t", "enum svn_fs_pack_notify_action_t *|svn_fs_pack_notify_action_t *", 0, 0, (void*)0, 0}; @@ -22523,6 +22823,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -22587,6 +22888,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, + &_swigt__p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, &_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t, @@ -22631,6 +22933,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_binary_patch_t, &_swigt__p_svn_diff_conflict_display_style_t, @@ -22653,6 +22956,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_fs_history_t, &_swigt__p_svn_fs_id_t, &_swigt__p_svn_fs_info_placeholder_t, + &_swigt__p_svn_fs_ioctl_code_t, &_swigt__p_svn_fs_lock_target_t, &_swigt__p_svn_fs_node_relation_t, &_swigt__p_svn_fs_pack_notify_action_t, @@ -22680,6 +22984,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -22744,6 +23049,7 @@ static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void[] = { {&_swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void[] = { {&_swigt__p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -22788,6 +23094,7 @@ static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_binary_patch_t[] = { {&_swigt__p_svn_diff_binary_patch_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_conflict_display_style_t[] = { {&_swigt__p_svn_diff_conflict_display_style_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -22810,6 +23117,7 @@ static swig_cast_info _swigc__p_svn_fs_fsx_info_t[] = { {&_swigt__p_svn_fs_fsx_ static swig_cast_info _swigc__p_svn_fs_history_t[] = { {&_swigt__p_svn_fs_history_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_id_t[] = { {&_swigt__p_svn_fs_id_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_info_placeholder_t[] = { {&_swigt__p_svn_fs_info_placeholder_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_fs_ioctl_code_t[] = { {&_swigt__p_svn_fs_ioctl_code_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = { {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_node_relation_t[] = { {&_swigt__p_svn_fs_node_relation_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_pack_notify_action_t[] = { {&_swigt__p_svn_fs_pack_notify_action_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -22837,6 +23145,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -22901,6 +23210,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, + _swigc__p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t, @@ -22945,6 +23255,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_binary_patch_t, _swigc__p_svn_diff_conflict_display_style_t, @@ -22967,6 +23278,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_fs_history_t, _swigc__p_svn_fs_id_t, _swigc__p_svn_fs_info_placeholder_t, + _swigc__p_svn_fs_ioctl_code_t, _swigc__p_svn_fs_lock_target_t, _swigc__p_svn_fs_node_relation_t, _swigc__p_svn_fs_pack_notify_action_t, @@ -22994,6 +23306,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, @@ -23292,9 +23605,11 @@ static swig_command_info swig_commands[] = { {"SVN::_Repos::svn_repos_get_fs_build_parser2", _wrap_svn_repos_get_fs_build_parser2}, {"SVN::_Repos::svn_repos_get_fs_build_parser", _wrap_svn_repos_get_fs_build_parser}, {"SVN::_Repos::svn_repos_authz_initialize", _wrap_svn_repos_authz_initialize}, +{"SVN::_Repos::svn_repos_authz_read4", _wrap_svn_repos_authz_read4}, {"SVN::_Repos::svn_repos_authz_read3", _wrap_svn_repos_authz_read3}, {"SVN::_Repos::svn_repos_authz_read2", _wrap_svn_repos_authz_read2}, {"SVN::_Repos::svn_repos_authz_read", _wrap_svn_repos_authz_read}, +{"SVN::_Repos::svn_repos_authz_parse2", _wrap_svn_repos_authz_parse2}, {"SVN::_Repos::svn_repos_authz_parse", _wrap_svn_repos_authz_parse}, {"SVN::_Repos::svn_repos_authz_check_access", _wrap_svn_repos_authz_check_access}, {"SVN::_Repos::svn_repos_check_revision_access", _wrap_svn_repos_check_revision_access}, @@ -23331,6 +23646,7 @@ static swig_command_info swig_commands[] = { {"SVN::_Repos::svn_repos_invoke_log_entry_receiver", _wrap_svn_repos_invoke_log_entry_receiver}, {"SVN::_Repos::svn_repos_invoke_file_rev_handler", _wrap_svn_repos_invoke_file_rev_handler}, {"SVN::_Repos::svn_repos_invoke_verify_callback", _wrap_svn_repos_invoke_verify_callback}, +{"SVN::_Repos::svn_repos_invoke_authz_warning_func", _wrap_svn_repos_invoke_authz_warning_func}, {0,0} }; /* ----------------------------------------------------------------------------- @@ -23625,357 +23941,357 @@ XS(SWIG_init) { SvREADONLY_on(sv); } - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_node_action_change", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_action_change))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_node_action_add", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_action_add))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_node_action_delete", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_action_delete))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_node_action_replace", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_action_replace))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_authz_none", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_authz_none))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_authz_read", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_authz_read))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_authz_write", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_authz_write))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_authz_recursive", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_authz_recursive))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_dump_rev_end", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_dump_rev_end))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_verify_rev_end", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_verify_rev_end))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_dump_end", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_dump_end))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_verify_end", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_verify_end))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_pack_shard_start", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_pack_shard_start))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_pack_shard_end", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_pack_shard_end))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_pack_shard_start_revprop", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_pack_shard_start_revprop))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_pack_shard_end_revprop", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_pack_shard_end_revprop))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_txn_start", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_txn_start))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_txn_committed", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_txn_committed))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_node_start", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_node_start))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_node_done", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_node_done))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_copied_node", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_copied_node))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_normalized_mergeinfo", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_normalized_mergeinfo))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_mutex_acquired", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_mutex_acquired))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_recover_start", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_recover_start))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_upgrade_start", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_upgrade_start))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_skipped_rev", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_skipped_rev))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_verify_rev_structure", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_verify_rev_structure))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_pack_revprops", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_pack_revprops))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_cleanup_revprops", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_cleanup_revprops))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_format_bumped", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_format_bumped))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_hotcopy_rev_range", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_hotcopy_rev_range))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_pack_noop", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_pack_noop))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_revprop_set", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_revprop_set))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning_found_old_reference", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning_found_old_reference))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning_found_old_mergeinfo", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning_found_old_mergeinfo))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning_invalid_fspath", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning_invalid_fspath))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning_name_collision", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning_name_collision))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning_mergeinfo_collision", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning_mergeinfo_collision))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning_invalid_mergeinfo", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning_invalid_mergeinfo))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_CAPABILITY_MERGEINFO", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("mergeinfo")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_MAGIC_HEADER", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("SVN-fs-dump-format-version")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_FORMAT_VERSION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(3))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_FORMAT_VERSION_DELTAS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(3))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_UUID", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("UUID")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_CONTENT_LENGTH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Content-length")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_REVISION_NUMBER", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Revision-number")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_NODE_PATH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Node-path")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_NODE_KIND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Node-kind")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_NODE_ACTION", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Node-action")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_NODE_COPYFROM_PATH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Node-copyfrom-path")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_NODE_COPYFROM_REV", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Node-copyfrom-rev")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_MD5", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Text-copy-source-md5")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_SHA1", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Text-copy-source-sha1")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_CHECKSUM", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Text-copy-source-md5")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_CONTENT_MD5", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Text-content-md5")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_CONTENT_SHA1", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Text-content-sha1")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_CONTENT_CHECKSUM", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Text-content-md5")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Prop-content-length")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Text-content-length")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_PROP_DELTA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Prop-delta")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_DELTA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Text-delta")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_MD5", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Text-delta-base-md5")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_SHA1", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Text-delta-base-sha1")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_CHECKSUM", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("Text-delta-base-md5")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_load_uuid_default", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_load_uuid_default))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_load_uuid_ignore", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_load_uuid_ignore))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_load_uuid_force", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_load_uuid_force))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_revision_access_none", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_revision_access_none))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_revision_access_partial", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_revision_access_partial))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_repos_revision_access_full", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_revision_access_full))); SvREADONLY_on(sv); diff --git a/subversion/bindings/swig/perl/native/svn_wc.c b/subversion/bindings/swig/perl/native/svn_wc.c index d8dee4e..9252a00 100644 --- a/subversion/bindings/swig/perl/native/svn_wc.c +++ b/subversion/bindings/swig/perl/native/svn_wc.c @@ -1598,100 +1598,102 @@ SWIG_Perl_SetModule(swig_module_info *module) { #define SWIGTYPE_p_svn_commit_info_t swig_types[86] #define SWIGTYPE_p_svn_config_t swig_types[87] #define SWIGTYPE_p_svn_delta_editor_t swig_types[88] -#define SWIGTYPE_p_svn_depth_t swig_types[89] -#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[90] -#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[91] -#define SWIGTYPE_p_svn_diff_datasource_e swig_types[92] -#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[93] -#define SWIGTYPE_p_svn_diff_file_options_t swig_types[94] -#define SWIGTYPE_p_svn_diff_fns2_t swig_types[95] -#define SWIGTYPE_p_svn_diff_fns_t swig_types[96] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[97] -#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[98] -#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[99] -#define SWIGTYPE_p_svn_diff_t swig_types[100] -#define SWIGTYPE_p_svn_dirent_t swig_types[101] -#define SWIGTYPE_p_svn_errno_t swig_types[102] -#define SWIGTYPE_p_svn_error_t swig_types[103] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[104] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[105] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[106] -#define SWIGTYPE_p_svn_location_segment_t swig_types[107] -#define SWIGTYPE_p_svn_lock_t swig_types[108] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[109] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[110] -#define SWIGTYPE_p_svn_log_entry_t swig_types[111] -#define SWIGTYPE_p_svn_merge_range_t swig_types[112] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[113] -#define SWIGTYPE_p_svn_node_kind_t swig_types[114] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[115] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[116] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[117] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[118] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[119] -#define SWIGTYPE_p_svn_patch_file_t swig_types[120] -#define SWIGTYPE_p_svn_patch_t swig_types[121] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[122] -#define SWIGTYPE_p_svn_prop_kind swig_types[123] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[124] -#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[125] -#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[126] -#define SWIGTYPE_p_svn_ra_plugin_t swig_types[127] -#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[128] -#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[129] -#define SWIGTYPE_p_svn_ra_reporter_t swig_types[130] -#define SWIGTYPE_p_svn_ra_session_t swig_types[131] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[132] -#define SWIGTYPE_p_svn_stream_t swig_types[133] -#define SWIGTYPE_p_svn_string_t swig_types[134] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[135] -#define SWIGTYPE_p_svn_tristate_t swig_types[136] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[137] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[138] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[139] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[140] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[141] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[142] -#define SWIGTYPE_p_svn_version_extended_t swig_types[143] -#define SWIGTYPE_p_svn_version_t swig_types[144] -#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[145] -#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[146] -#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[147] -#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[148] -#define SWIGTYPE_p_svn_wc_conflict_description2_t swig_types[149] -#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[150] -#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[151] -#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[152] -#define SWIGTYPE_p_svn_wc_conflict_result_t swig_types[153] -#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[154] -#define SWIGTYPE_p_svn_wc_context_t swig_types[155] -#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[156] -#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[157] -#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[158] -#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[159] -#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[160] -#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[161] -#define SWIGTYPE_p_svn_wc_entry_t swig_types[162] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[163] -#define SWIGTYPE_p_svn_wc_external_item_t swig_types[164] -#define SWIGTYPE_p_svn_wc_info_t swig_types[165] -#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[166] -#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[167] -#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[168] -#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[169] -#define SWIGTYPE_p_svn_wc_notify_t swig_types[170] -#define SWIGTYPE_p_svn_wc_operation_t swig_types[171] -#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[172] -#define SWIGTYPE_p_svn_wc_schedule_t swig_types[173] -#define SWIGTYPE_p_svn_wc_status2_t swig_types[174] -#define SWIGTYPE_p_svn_wc_status3_t swig_types[175] -#define SWIGTYPE_p_svn_wc_status_t swig_types[176] -#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[177] -#define SWIGTYPE_p_unsigned_char swig_types[178] -#define SWIGTYPE_p_unsigned_long swig_types[179] -#define SWIGTYPE_p_void swig_types[180] -static swig_type_info *swig_types[182]; -static swig_module_info swig_module = {swig_types, 181, 0, 0, 0, 0}; +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[89] +#define SWIGTYPE_p_svn_depth_t swig_types[90] +#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[91] +#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[92] +#define SWIGTYPE_p_svn_diff_datasource_e swig_types[93] +#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[94] +#define SWIGTYPE_p_svn_diff_file_options_t swig_types[95] +#define SWIGTYPE_p_svn_diff_fns2_t swig_types[96] +#define SWIGTYPE_p_svn_diff_fns_t swig_types[97] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[98] +#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[99] +#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[100] +#define SWIGTYPE_p_svn_diff_t swig_types[101] +#define SWIGTYPE_p_svn_dirent_t swig_types[102] +#define SWIGTYPE_p_svn_errno_t swig_types[103] +#define SWIGTYPE_p_svn_error_t swig_types[104] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[105] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[106] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[107] +#define SWIGTYPE_p_svn_location_segment_t swig_types[108] +#define SWIGTYPE_p_svn_lock_t swig_types[109] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[110] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[111] +#define SWIGTYPE_p_svn_log_entry_t swig_types[112] +#define SWIGTYPE_p_svn_merge_range_t swig_types[113] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[114] +#define SWIGTYPE_p_svn_node_kind_t swig_types[115] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[116] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[117] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[118] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[119] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[120] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[121] +#define SWIGTYPE_p_svn_patch_file_t swig_types[122] +#define SWIGTYPE_p_svn_patch_t swig_types[123] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[124] +#define SWIGTYPE_p_svn_prop_kind swig_types[125] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[126] +#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[127] +#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[128] +#define SWIGTYPE_p_svn_ra_plugin_t swig_types[129] +#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[130] +#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[131] +#define SWIGTYPE_p_svn_ra_reporter_t swig_types[132] +#define SWIGTYPE_p_svn_ra_session_t swig_types[133] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[134] +#define SWIGTYPE_p_svn_stream_t swig_types[135] +#define SWIGTYPE_p_svn_string_t swig_types[136] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[137] +#define SWIGTYPE_p_svn_tristate_t swig_types[138] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[139] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[140] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[141] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[142] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[143] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[144] +#define SWIGTYPE_p_svn_version_extended_t swig_types[145] +#define SWIGTYPE_p_svn_version_t swig_types[146] +#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[147] +#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[148] +#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[149] +#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[150] +#define SWIGTYPE_p_svn_wc_conflict_description2_t swig_types[151] +#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[152] +#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[153] +#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[154] +#define SWIGTYPE_p_svn_wc_conflict_result_t swig_types[155] +#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[156] +#define SWIGTYPE_p_svn_wc_context_t swig_types[157] +#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[158] +#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[159] +#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[160] +#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[161] +#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[162] +#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[163] +#define SWIGTYPE_p_svn_wc_entry_t swig_types[164] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[165] +#define SWIGTYPE_p_svn_wc_external_item_t swig_types[166] +#define SWIGTYPE_p_svn_wc_info_t swig_types[167] +#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[168] +#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[169] +#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[170] +#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[171] +#define SWIGTYPE_p_svn_wc_notify_t swig_types[172] +#define SWIGTYPE_p_svn_wc_operation_t swig_types[173] +#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[174] +#define SWIGTYPE_p_svn_wc_schedule_t swig_types[175] +#define SWIGTYPE_p_svn_wc_status2_t swig_types[176] +#define SWIGTYPE_p_svn_wc_status3_t swig_types[177] +#define SWIGTYPE_p_svn_wc_status_t swig_types[178] +#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[179] +#define SWIGTYPE_p_unsigned_char swig_types[180] +#define SWIGTYPE_p_unsigned_long swig_types[181] +#define SWIGTYPE_p_void swig_types[182] +static swig_type_info *swig_types[184]; +static swig_module_info swig_module = {swig_types, 183, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -36363,6 +36365,161 @@ XS(_wrap_svn_wc_relocate) { + SWIG_croak_null(); + } +} + + +XS(_wrap_svn_wc_revert6) { + { + svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_depth_t arg3 ; + svn_boolean_t arg4 ; + apr_array_header_t *arg5 = (apr_array_header_t *) 0 ; + svn_boolean_t arg6 ; + svn_boolean_t arg7 ; + svn_boolean_t arg8 ; + svn_cancel_func_t arg9 = (svn_cancel_func_t) 0 ; + void *arg10 = (void *) 0 ; + svn_wc_notify_func2_t arg11 = (svn_wc_notify_func2_t) 0 ; + void *arg12 = (void *) 0 ; + apr_pool_t *arg13 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int val3 ; + int ecode3 = 0 ; + int val4 ; + int ecode4 = 0 ; + void *argp5 = 0 ; + int res5 = 0 ; + int val6 ; + int ecode6 = 0 ; + int val7 ; + int ecode7 = 0 ; + int val8 ; + int ecode8 = 0 ; + int res12 ; + int argvi = 0; + svn_error_t *result = 0 ; + dXSARGS; + + { + _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1)); + SPAGAIN; + } + if ((items < 11) || (items > 12)) { + SWIG_croak("Usage: svn_wc_revert6(wc_ctx,local_abspath,depth,use_commit_times,changelist_filter,clear_changelists,metadata_only,added_keep_local,cancel_func,cancel_baton,notify_func,notify_baton,scratch_pool);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_revert6" "', argument " "1"" of type '" "svn_wc_context_t *""'"); + } + arg1 = (svn_wc_context_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_wc_revert6" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_wc_revert6" "', argument " "3"" of type '" "svn_depth_t""'"); + } + arg3 = (svn_depth_t)(val3); + ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_wc_revert6" "', argument " "4"" of type '" "svn_boolean_t""'"); + } + arg4 = (svn_boolean_t)(val4); + res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_apr_array_header_t, 0 | 0 ); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_wc_revert6" "', argument " "5"" of type '" "apr_array_header_t const *""'"); + } + arg5 = (apr_array_header_t *)(argp5); + ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_wc_revert6" "', argument " "6"" of type '" "svn_boolean_t""'"); + } + arg6 = (svn_boolean_t)(val6); + ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_wc_revert6" "', argument " "7"" of type '" "svn_boolean_t""'"); + } + arg7 = (svn_boolean_t)(val7); + ecode8 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(7), &val8); + if (!SWIG_IsOK(ecode8)) { + SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "svn_wc_revert6" "', argument " "8"" of type '" "svn_boolean_t""'"); + } + arg8 = (svn_boolean_t)(val8); + { + arg9 = (svn_cancel_func_t) svn_swig_pl_cancel_func; + arg10 = ST(8); + } + { + int res = SWIG_ConvertFunctionPtr(ST(9), (void**)(&arg11), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_revert6" "', argument " "11"" of type '" "svn_wc_notify_func2_t""'"); + } + } + res12 = SWIG_ConvertPtr(ST(10),SWIG_as_voidptrptr(&arg12), 0, 0); + if (!SWIG_IsOK(res12)) { + SWIG_exception_fail(SWIG_ArgError(res12), "in method '" "svn_wc_revert6" "', argument " "12"" of type '" "void *""'"); + } + if (items > 11) { + + } + { + result = (svn_error_t *)svn_wc_revert6(arg1,(char const *)arg2,arg3,arg4,(apr_array_header_t const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13); + + + + } + { + if (result) { + SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE); + + if (SvOK(exception_handler)) { + SV *callback_result; + + PUTBACK; + svn_swig_pl_callback_thunk (CALL_SV, exception_handler, + &callback_result, "S", result, + SWIGTYPE_p_svn_error_t); + SPAGAIN; + } else { + ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0); + argvi++; + } + } + } + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + + + + + + + + + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + + + + + + + + + SWIG_croak_null(); } } @@ -37762,7 +37919,7 @@ XS(_wrap_svn_wc_transmit_text_deltas2) { } } { - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg2, + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg2, _global_pool), 0)); argvi++ /*@SWIG@*/ @@ -45964,49 +46121,49 @@ static swig_type_info _swigt__p_apr_int32_t = {"_p_apr_int32_t", "apr_int32_t *| static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *|svn_filesize_t *|apr_time_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const **,char const **,void *,char const *,apr_pool_t *,apr_pool_t *)|svn_wc_upgrade_get_repos_info_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_string_t const **,svn_stream_t *,void *,apr_pool_t *)|svn_wc_canonicalize_svn_prop_get_file_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__svn_wc_entry_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_q_const__svn_wc_entry_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_wc_entry_t const *,void *,apr_pool_t *)|svn_error_t *(*)(char const *,svn_wc_entry_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_svn_error_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_error_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_error_t *,void *,apr_pool_t *)|svn_error_t *(*)(char const *,svn_error_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)|struct svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)|svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)|struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,svn_revnum_t,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,char const *,svn_revnum_t,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,char const *,svn_revnum_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,char const *,svn_revnum_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t **,char const *,char const *,apr_pool_t *,apr_pool_t *)|svn_wc_dirents_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const **,char const **,void *,char const *,apr_pool_t *,apr_pool_t *)|svn_wc_upgrade_get_repos_info_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_string_t const **,svn_stream_t *,void *,apr_pool_t *)|svn_wc_canonicalize_svn_prop_get_file_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t|svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t|svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__svn_wc_entry_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_q_const__svn_wc_entry_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_wc_entry_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_svn_error_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_error_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_error_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,char const *,svn_revnum_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t **,char const *,char const *,apr_pool_t *,apr_pool_t *)|svn_wc_dirents_func_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void = {"_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void", "void (*)(void *,char const *,enum svn_wc_notify_action_t,enum svn_node_kind_t,char const *,enum svn_wc_notify_state_t,enum svn_wc_notify_state_t,long)|svn_wc_notify_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t", "svn_wc_relocation_validator_t|struct svn_error_t *(*)(void *,char const *,char const *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_changelist_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,char const *,apr_pool_t *)|svn_wc_relocation_validator3_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_wc_relocation_validator2_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t", "svn_wc_external_update_t|struct svn_error_t *(*)(void *,char const *,svn_string_t const *,svn_string_t const *,svn_depth_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_wc_status3_t const *,apr_pool_t *)|svn_wc_status_func4_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t", "svn_wc_relocation_validator_t|svn_error_t *(*)(void *,char const *,char const *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_changelist_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,char const *,apr_pool_t *)|svn_wc_relocation_validator3_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_wc_relocation_validator2_t|svn_error_t *(*)(void *,char const *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t", "svn_wc_external_update_t|svn_error_t *(*)(void *,char const *,svn_string_t const *,svn_string_t const *,svn_depth_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status3_t const *,apr_pool_t *)|svn_wc_status_func4_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void", "void (*)(void *,char const *,struct svn_wc_status2_t *)|svn_wc_status_func2_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void", "void (*)(void *,char const *,struct svn_wc_status_t *)|svn_wc_status_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)|svn_wc_status_func3_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)|svn_wc_get_file_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)|svn_wc_status_func3_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)|svn_wc_get_file_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void = {"_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void", "svn_wc_notify_func2_t|void (*)(void *,struct svn_wc_notify_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; @@ -46046,6 +46203,7 @@ static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct s static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_binary_patch_t = {"_p_svn_diff_binary_patch_t", "struct svn_diff_binary_patch_t *|svn_diff_binary_patch_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_conflict_display_style_t = {"_p_svn_diff_conflict_display_style_t", "enum svn_diff_conflict_display_style_t *|svn_diff_conflict_display_style_t *", 0, 0, (void*)0, 0}; @@ -46060,7 +46218,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0}; @@ -46076,6 +46234,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -46229,6 +46388,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_binary_patch_t, &_swigt__p_svn_diff_conflict_display_style_t, @@ -46259,6 +46419,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -46412,6 +46573,7 @@ static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_binary_patch_t[] = { {&_swigt__p_svn_diff_binary_patch_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_conflict_display_style_t[] = { {&_swigt__p_svn_diff_conflict_display_style_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -46442,6 +46604,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -46595,6 +46758,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_binary_patch_t, _swigc__p_svn_diff_conflict_display_style_t, @@ -46625,6 +46789,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, @@ -47308,6 +47473,7 @@ static swig_command_info swig_commands[] = { {"SVN::_Wc::svn_wc_relocate3", _wrap_svn_wc_relocate3}, {"SVN::_Wc::svn_wc_relocate2", _wrap_svn_wc_relocate2}, {"SVN::_Wc::svn_wc_relocate", _wrap_svn_wc_relocate}, +{"SVN::_Wc::svn_wc_revert6", _wrap_svn_wc_revert6}, {"SVN::_Wc::svn_wc_revert5", _wrap_svn_wc_revert5}, {"SVN::_Wc::svn_wc_revert4", _wrap_svn_wc_revert4}, {"SVN::_Wc::svn_wc_revert3", _wrap_svn_wc_revert3}, @@ -47698,802 +47864,802 @@ XS(SWIG_init) { SvREADONLY_on(sv); } - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_FROM_NF", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000000))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_TO_NF", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000001))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_FORCE_EOL_REPAIR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000002))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_NO_OUTPUT_CLEANUP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000004))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_FORCE_COPY", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000008))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_USE_GLOBAL_TMP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000010))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_ADM_DIR_NAME", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr(".svn")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_add", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_add))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_copy", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_copy))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_delete", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_delete))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_restore", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_restore))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_revert", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_revert))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_revert", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_revert))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_resolved", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_resolved))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_skip", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_skip))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_delete", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_delete))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_add", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_add))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_update", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_update))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_completed", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_completed))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_external", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_external))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_status_completed", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_status_completed))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_status_external", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_status_external))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_modified", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_modified))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_added", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_added))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_deleted", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_deleted))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_replaced", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_replaced))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_postfix_txdelta", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_postfix_txdelta))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_blame_revision", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_blame_revision))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_locked", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_locked))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_unlocked", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_unlocked))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_lock", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_lock))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_unlock", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_unlock))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_exists", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_exists))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_changelist_set", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_changelist_set))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_changelist_clear", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_changelist_clear))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_changelist_moved", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_changelist_moved))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_merge_begin", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_merge_begin))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_foreign_merge_begin", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_foreign_merge_begin))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_replace", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_replace))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_property_added", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_property_added))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_property_modified", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_property_modified))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_property_deleted", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_property_deleted))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_property_deleted_nonexistent", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_property_deleted_nonexistent))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_revprop_set", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_revprop_set))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_revprop_deleted", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_revprop_deleted))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_merge_completed", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_merge_completed))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_tree_conflict", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_tree_conflict))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_external", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_external))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_started", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_started))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_skip_obstruction", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_skip_obstruction))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_skip_working_only", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_skip_working_only))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_skip_access_denied", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_skip_access_denied))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_external_removed", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_external_removed))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_shadowed_add", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_shadowed_add))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_shadowed_update", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_shadowed_update))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_shadowed_delete", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_shadowed_delete))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_merge_record_info", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_merge_record_info))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_upgraded_path", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_upgraded_path))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_merge_record_info_begin", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_merge_record_info_begin))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_merge_elide_info", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_merge_elide_info))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_patch", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_patch))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_patch_applied_hunk", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_patch_applied_hunk))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_patch_rejected_hunk", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_patch_rejected_hunk))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_patch_hunk_already_applied", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_patch_hunk_already_applied))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_copied", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_copied))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_copied_replaced", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_copied_replaced))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_url_redirect", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_url_redirect))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_path_nonexistent", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_path_nonexistent))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_exclude", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_exclude))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_conflict", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_conflict))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_missing", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_missing))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_out_of_date", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_out_of_date))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_no_parent", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_no_parent))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_locked", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_locked))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_forbidden_by_server", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_forbidden_by_server))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_skip_conflicted", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_skip_conflicted))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_broken_lock", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_broken_lock))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_obstruction", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_obstruction))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_conflict_resolver_starting", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_conflict_resolver_starting))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_conflict_resolver_done", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_conflict_resolver_done))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_left_local_modifications", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_left_local_modifications))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_foreign_copy_begin", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_foreign_copy_begin))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_move_broken", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_move_broken))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_cleanup_external", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_cleanup_external))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_requires_target", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_requires_target))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_info_external", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_info_external))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_finalizing", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_finalizing))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_resolved_text", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_resolved_text))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_resolved_prop", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_resolved_prop))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_resolved_tree", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_resolved_tree))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_begin_search_tree_conflict_details", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_begin_search_tree_conflict_details))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_tree_conflict_details_progress", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_tree_conflict_details_progress))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_end_search_tree_conflict_details", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_end_search_tree_conflict_details))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_inapplicable", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_inapplicable))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_unknown", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_unknown))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_unchanged", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_unchanged))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_missing", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_missing))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_obstructed", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_obstructed))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_changed", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_changed))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_merged", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_merged))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_conflicted", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_conflicted))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_source_missing", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_source_missing))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_lock_state_inapplicable", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_lock_state_inapplicable))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_lock_state_unknown", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_lock_state_unknown))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_lock_state_unchanged", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_lock_state_unchanged))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_lock_state_locked", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_lock_state_locked))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_lock_state_unlocked", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_lock_state_unlocked))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_action_edit", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_action_edit))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_action_add", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_action_add))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_action_delete", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_action_delete))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_action_replace", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_action_replace))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_edited", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_edited))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_obstructed", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_obstructed))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_deleted", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_deleted))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_missing", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_missing))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_unversioned", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_unversioned))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_added", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_added))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_replaced", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_replaced))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_moved_away", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_moved_away))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_moved_here", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_moved_here))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_kind_text", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_kind_text))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_kind_property", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_kind_property))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_kind_tree", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_kind_tree))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_operation_none", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_operation_none))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_operation_update", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_operation_update))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_operation_switch", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_operation_switch))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_operation_merge", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_operation_merge))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_undefined", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_undefined))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_postpone", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_postpone))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_base", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_base))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_theirs_full", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_theirs_full))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_mine_full", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_mine_full))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_theirs_conflict", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_theirs_conflict))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_mine_conflict", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_mine_conflict))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_merged", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_merged))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_unspecified", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_unspecified))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_schedule_normal", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_schedule_normal))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_schedule_add", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_schedule_add))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_schedule_delete", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_schedule_delete))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_schedule_replace", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_schedule_replace))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_ENTRY_WORKING_SIZE_UNKNOWN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)((-1)))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_ENTRY_THIS_DIR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_FromCharPtr("")); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_none", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_none))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_unversioned", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_unversioned))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_normal", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_normal))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_added", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_added))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_missing", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_missing))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_deleted", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_deleted))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_replaced", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_replaced))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_modified", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_modified))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_merged", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_merged))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_conflicted", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_conflicted))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_ignored", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_ignored))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_obstructed", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_obstructed))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_external", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_external))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_incomplete", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_incomplete))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_merge_unchanged", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_merge_unchanged))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_merge_merged", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_merge_merged))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_merge_conflict", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_merge_conflict))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "svn_wc_merge_no_merge", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_merge_no_merge))); SvREADONLY_on(sv); diff --git a/subversion/bindings/swig/proxy/svn_client_h.swg b/subversion/bindings/swig/proxy/svn_client_h.swg index cb4404d..989acfb 100644 --- a/subversion/bindings/swig/proxy/svn_client_h.swg +++ b/subversion/bindings/swig/proxy/svn_client_h.swg @@ -16,10 +16,12 @@ svn_client_get_commit_log3_t, svn_client_get_commit_log2_t, svn_client_get_commit_log_t, + svn_client_blame_receiver4_t, svn_client_blame_receiver3_t, svn_client_blame_receiver2_t, svn_client_blame_receiver_t, svn_client_diff_summarize_func_t, + svn_client__layout_func_t, svn_client_import_filter_func_t, svn_client_status_func_t, svn_client_conflict_walk_func_t, @@ -35,10 +37,12 @@ svn_client_get_commit_log3_t *, svn_client_get_commit_log2_t *, svn_client_get_commit_log_t *, + svn_client_blame_receiver4_t *, svn_client_blame_receiver3_t *, svn_client_blame_receiver2_t *, svn_client_blame_receiver_t *, svn_client_diff_summarize_func_t *, + svn_client__layout_func_t *, svn_client_import_filter_func_t *, svn_client_status_func_t *, svn_client_conflict_walk_func_t *, @@ -65,6 +69,7 @@ void *conflict_baton, void *conflict_baton2, void *tunnel_baton, + void *layout_baton, void *commit_baton, void *filter_baton, void *backwards_compatibility_baton, @@ -72,6 +77,10 @@ void *receiver_baton, void *summarize_baton, void *conflict_walk_func_baton, + void *shelved_baton, + void *not_shelved_baton, + void *edit_baton, + void *walk_baton, void *callback_baton, void *patch_baton }; @@ -96,7 +105,9 @@ %opaque_proxy(svn_client_conflict_t); %opaque_proxy(svn_client_conflict_option_t); %proxy(svn_client_copy_source_t); -%proxy(svn_client_shelved_patch_info_t); +%proxy(svn_client__shelf_t); +%proxy(svn_client__shelf_version_t); +%proxy(svn_client__shelf_info_t); %proxy(svn_info_t); %proxy(svn_client_info2_t); #endif @@ -129,6 +140,11 @@ static svn_error_t * svn_client_invoke_get_commit_log( return _obj(log_msg, tmp_file, commit_items, baton, pool); } +static svn_error_t * svn_client_invoke_blame_receiver4( + svn_client_blame_receiver4_t _obj, void *baton, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, const svn_string_t *line, svn_boolean_t local_change, apr_pool_t *pool) { + return _obj(baton, line_no, revision, rev_props, merged_revision, merged_rev_props, merged_path, line, local_change, pool); +} + static svn_error_t * svn_client_invoke_blame_receiver3( svn_client_blame_receiver3_t _obj, void *baton, svn_revnum_t start_revnum, svn_revnum_t end_revnum, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, const char *line, svn_boolean_t local_change, apr_pool_t *pool) { return _obj(baton, start_revnum, end_revnum, line_no, revision, rev_props, merged_revision, merged_rev_props, merged_path, line, local_change, pool); @@ -149,6 +165,11 @@ static svn_error_t * svn_client_invoke_diff_summarize_func( return _obj(diff, baton, pool); } +static svn_error_t * svn_client_invoke__layout_func( + svn_client__layout_func_t _obj, void *layout_baton, const char *local_abspath, const char *repos_root_url, svn_boolean_t not_present, svn_boolean_t url_changed, const char *url, svn_boolean_t revision_changed, svn_revnum_t revision, svn_boolean_t depth_changed, svn_depth_t depth, apr_pool_t *scratch_pool) { + return _obj(layout_baton, local_abspath, repos_root_url, not_present, url_changed, url, revision_changed, revision, depth_changed, depth, scratch_pool); +} + static svn_error_t * svn_client_invoke_import_filter_func( svn_client_import_filter_func_t _obj, void *baton, svn_boolean_t *filtered, const char *local_abspath, const svn_io_dirent2_t *dirent, apr_pool_t *scratch_pool) { return _obj(baton, filtered, local_abspath, dirent, scratch_pool); @@ -197,10 +218,12 @@ static svn_error_t * svn_client_invoke_patch_func( %funcptr_proxy(svn_client_get_commit_log3_t, svn_client_invoke_get_commit_log3); %funcptr_proxy(svn_client_get_commit_log2_t, svn_client_invoke_get_commit_log2); %funcptr_proxy(svn_client_get_commit_log_t, svn_client_invoke_get_commit_log); +%funcptr_proxy(svn_client_blame_receiver4_t, svn_client_invoke_blame_receiver4); %funcptr_proxy(svn_client_blame_receiver3_t, svn_client_invoke_blame_receiver3); %funcptr_proxy(svn_client_blame_receiver2_t, svn_client_invoke_blame_receiver2); %funcptr_proxy(svn_client_blame_receiver_t, svn_client_invoke_blame_receiver); %funcptr_proxy(svn_client_diff_summarize_func_t, svn_client_invoke_diff_summarize_func); +%funcptr_proxy(svn_client__layout_func_t, svn_client_invoke__layout_func); %funcptr_proxy(svn_client_import_filter_func_t, svn_client_invoke_import_filter_func); %funcptr_proxy(svn_client_status_func_t, svn_client_invoke_status_func); %funcptr_proxy(svn_client_conflict_walk_func_t, svn_client_invoke_conflict_walk_func); diff --git a/subversion/bindings/swig/proxy/svn_delta_h.swg b/subversion/bindings/swig/proxy/svn_delta_h.swg index dd20fe0..3ae4de6 100644 --- a/subversion/bindings/swig/proxy/svn_delta_h.swg +++ b/subversion/bindings/swig/proxy/svn_delta_h.swg @@ -5,6 +5,7 @@ /* No default constructors for opaque structs */ #ifdef SWIGPYTHON %nodefault svn_txdelta_stream_t; +%nodefault svn_delta_path_driver_state_t; #endif /* Callback typemaps */ @@ -14,6 +15,7 @@ svn_txdelta_next_window_fn_t, svn_txdelta_md5_digest_fn_t, svn_txdelta_stream_open_func_t, + svn_delta_path_driver_cb_func2_t, svn_delta_path_driver_cb_func_t, svn_file_rev_handler_t, svn_file_rev_handler_old_t @@ -23,6 +25,7 @@ svn_txdelta_next_window_fn_t *, svn_txdelta_md5_digest_fn_t *, svn_txdelta_stream_open_func_t *, + svn_delta_path_driver_cb_func2_t *, svn_delta_path_driver_cb_func_t *, svn_file_rev_handler_t *, svn_file_rev_handler_old_t * @@ -58,6 +61,7 @@ %proxy(svn_txdelta_window_t); %opaque_proxy(svn_txdelta_stream_t); %proxy(svn_delta_editor_t); +%opaque_proxy(svn_delta_path_driver_state_t); #endif /* Callbacks */ @@ -168,6 +172,11 @@ static svn_error_t * svn_txdelta_invoke_stream_open_func( return _obj(txdelta_stream, baton, result_pool, scratch_pool); } +static svn_error_t * svn_delta_invoke_path_driver_cb_func2( + svn_delta_path_driver_cb_func2_t _obj, void **dir_baton, const svn_delta_editor_t *editor, void *edit_baton, void *parent_baton, void *callback_baton, const char *relpath, apr_pool_t *pool) { + return _obj(dir_baton, editor, edit_baton, parent_baton, callback_baton, relpath, pool); +} + static svn_error_t * svn_delta_invoke_path_driver_cb_func( svn_delta_path_driver_cb_func_t _obj, void **dir_baton, void *parent_baton, void *callback_baton, const char *path, apr_pool_t *pool) { return _obj(dir_baton, parent_baton, callback_baton, path, pool); @@ -207,6 +216,7 @@ static svn_error_t * svn_file_invoke_rev_handler_old( %funcptr_proxy(svn_txdelta_next_window_fn_t, svn_txdelta_invoke_next_window_fn); %funcptr_proxy(svn_txdelta_md5_digest_fn_t, svn_txdelta_invoke_md5_digest_fn); %funcptr_proxy(svn_txdelta_stream_open_func_t, svn_txdelta_invoke_stream_open_func); +%funcptr_proxy(svn_delta_path_driver_cb_func2_t, svn_delta_invoke_path_driver_cb_func2); %funcptr_proxy(svn_delta_path_driver_cb_func_t, svn_delta_invoke_path_driver_cb_func); %funcptr_proxy(svn_file_rev_handler_t, svn_file_invoke_rev_handler); %funcptr_proxy(svn_file_rev_handler_old_t, svn_file_invoke_rev_handler_old); diff --git a/subversion/bindings/swig/proxy/svn_fs_h.swg b/subversion/bindings/swig/proxy/svn_fs_h.swg index dff9e88..0f69b16 100644 --- a/subversion/bindings/swig/proxy/svn_fs_h.swg +++ b/subversion/bindings/swig/proxy/svn_fs_h.swg @@ -78,6 +78,7 @@ %proxy(svn_fs_fsfs_info_t); %proxy(svn_fs_fsx_info_t); %proxy(svn_fs_info_placeholder_t); +%proxy(svn_fs_ioctl_code_t); #endif /* Callbacks */ diff --git a/subversion/bindings/swig/proxy/svn_opt_h.swg b/subversion/bindings/swig/proxy/svn_opt_h.swg index 65ccf3b..a9e09c2 100644 --- a/subversion/bindings/swig/proxy/svn_opt_h.swg +++ b/subversion/bindings/swig/proxy/svn_opt_h.swg @@ -23,6 +23,7 @@ /* Structure definitions */ #ifdef SWIGPYTHON +%proxy(svn_opt_subcommand_desc3_t); %proxy(svn_opt_subcommand_desc2_t); %proxy(svn_opt_subcommand_desc_t); %proxy(svn_opt_revision_value_t); diff --git a/subversion/bindings/swig/proxy/svn_opt_impl_h.swg b/subversion/bindings/swig/proxy/svn_opt_impl_h.swg new file mode 100644 index 0000000..e0402c4 --- /dev/null +++ b/subversion/bindings/swig/proxy/svn_opt_impl_h.swg @@ -0,0 +1,30 @@ +/* Proxy classes for svn_opt_impl.h + * DO NOT EDIT -- AUTOMATICALLY GENERATED + * BY build/generator/swig/header_wrappers.py */ + +/* No default constructors for opaque structs */ +#ifdef SWIGPYTHON +#endif + +/* Callback typemaps */ + +/* Baton typemaps */ + +/* Includes */ +%{ +#include "svn_opt_impl.h" +%} +%include svn_opt_impl.h + +/* Structure definitions */ +#ifdef SWIGPYTHON +#endif + +/* Callbacks */ + +%inline %{ +%} + +#ifdef SWIGPYTHON + +#endif diff --git a/subversion/bindings/swig/proxy/svn_repos_h.swg b/subversion/bindings/swig/proxy/svn_repos_h.swg index ab3496f..871ebe4 100644 --- a/subversion/bindings/swig/proxy/svn_repos_h.swg +++ b/subversion/bindings/swig/proxy/svn_repos_h.swg @@ -20,7 +20,8 @@ svn_repos_path_change_receiver_t, svn_repos_log_entry_receiver_t, svn_repos_file_rev_handler_t, - svn_repos_verify_callback_t + svn_repos_verify_callback_t, + svn_repos_authz_warning_func_t }; %apply CALLABLE_CALLBACK * { svn_repos_authz_func_t *, @@ -32,7 +33,8 @@ svn_repos_path_change_receiver_t *, svn_repos_log_entry_receiver_t *, svn_repos_file_rev_handler_t *, - svn_repos_verify_callback_t * + svn_repos_verify_callback_t *, + svn_repos_authz_warning_func_t * }; #endif @@ -60,7 +62,8 @@ void *filter_baton, void *parse_baton, void *revision_baton, - void *node_baton + void *node_baton, + void *warning_baton }; #endif @@ -250,6 +253,11 @@ static svn_error_t * svn_repos_invoke_verify_callback( return _obj(baton, revision, verify_err, scratch_pool); } +static void svn_repos_invoke_authz_warning_func( + svn_repos_authz_warning_func_t _obj, void *baton, const svn_error_t *error, apr_pool_t *scratch_pool) { + _obj(baton, error, scratch_pool); +} + %} #ifdef SWIGPYTHON @@ -286,5 +294,6 @@ static svn_error_t * svn_repos_invoke_verify_callback( %funcptr_proxy(svn_repos_log_entry_receiver_t, svn_repos_invoke_log_entry_receiver); %funcptr_proxy(svn_repos_file_rev_handler_t, svn_repos_invoke_file_rev_handler); %funcptr_proxy(svn_repos_verify_callback_t, svn_repos_invoke_verify_callback); +%funcptr_proxy(svn_repos_authz_warning_func_t, svn_repos_invoke_authz_warning_func); #endif diff --git a/subversion/bindings/swig/proxy/svn_types_impl_h.swg b/subversion/bindings/swig/proxy/svn_types_impl_h.swg new file mode 100644 index 0000000..5995b9c --- /dev/null +++ b/subversion/bindings/swig/proxy/svn_types_impl_h.swg @@ -0,0 +1,30 @@ +/* Proxy classes for svn_types_impl.h + * DO NOT EDIT -- AUTOMATICALLY GENERATED + * BY build/generator/swig/header_wrappers.py */ + +/* No default constructors for opaque structs */ +#ifdef SWIGPYTHON +#endif + +/* Callback typemaps */ + +/* Baton typemaps */ + +/* Includes */ +%{ +#include "svn_types_impl.h" +%} +%include svn_types_impl.h + +/* Structure definitions */ +#ifdef SWIGPYTHON +#endif + +/* Callbacks */ + +%inline %{ +%} + +#ifdef SWIGPYTHON + +#endif diff --git a/subversion/bindings/swig/python/client.py b/subversion/bindings/swig/python/client.py index 519f10b..11d1c3c 100644 --- a/subversion/bindings/swig/python/client.py +++ b/subversion/bindings/swig/python/client.py @@ -747,6 +747,10 @@ def svn_client_switch(*args): """svn_client_switch(char const * path, char const * url, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" return _client.svn_client_switch(*args) +def svn_client__layout_list(*args): + """svn_client__layout_list(char const * local_abspath, svn_client__layout_func_t layout, void * layout_baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__layout_list(*args) + def svn_client_add5(*args): """svn_client_add5(char const * path, svn_depth_t depth, svn_boolean_t force, svn_boolean_t no_ignore, svn_boolean_t no_autoprops, svn_boolean_t add_parents, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" return _client.svn_client_add5(*args) @@ -1020,6 +1024,10 @@ def svn_client_log(*args): """svn_client_log(apr_array_header_t targets, svn_opt_revision_t start, svn_opt_revision_t end, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_log_message_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" return _client.svn_client_log(*args) +def svn_client_blame6(*args): + """svn_client_blame6(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_boolean_t include_merged_revisions, svn_client_blame_receiver4_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_blame6(*args) + def svn_client_blame5(*args): """svn_client_blame5(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_boolean_t include_merged_revisions, svn_client_blame_receiver3_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" return _client.svn_client_blame5(*args) @@ -1040,6 +1048,10 @@ def svn_client_blame(*args): """svn_client_blame(char const * path_or_url, svn_opt_revision_t start, svn_opt_revision_t end, svn_client_blame_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" return _client.svn_client_blame(*args) +def svn_client_diff7(*args): + """svn_client_diff7(apr_array_header_t diff_options, char const * path_or_url1, svn_opt_revision_t revision1, char const * path_or_url2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, svn_boolean_t pretty_print_mergeinfo, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff7(*args) + def svn_client_diff6(*args): """svn_client_diff6(apr_array_header_t diff_options, char const * path_or_url1, svn_opt_revision_t revision1, char const * path_or_url2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" return _client.svn_client_diff6(*args) @@ -1064,6 +1076,10 @@ def svn_client_diff(*args): """svn_client_diff(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" return _client.svn_client_diff(*args) +def svn_client_diff_peg7(*args): + """svn_client_diff_peg7(apr_array_header_t diff_options, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, svn_boolean_t pretty_print_mergeinfo, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff_peg7(*args) + def svn_client_diff_peg6(*args): """svn_client_diff_peg6(apr_array_header_t diff_options, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" return _client.svn_client_diff_peg6(*args) @@ -1200,6 +1216,10 @@ def svn_client_relocate(*args): """svn_client_relocate(char const * dir, char const * from_prefix, char const * to_prefix, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" return _client.svn_client_relocate(*args) +def svn_client_revert4(*args): + """svn_client_revert4(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, svn_boolean_t added_keep_local, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_revert4(*args) + def svn_client_revert3(*args): """svn_client_revert3(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" return _client.svn_client_revert3(*args) @@ -1234,23 +1254,46 @@ svn_client_conflict_option_incoming_delete_accept = _client.svn_client_conflict_ svn_client_conflict_option_incoming_move_file_text_merge = _client.svn_client_conflict_option_incoming_move_file_text_merge svn_client_conflict_option_incoming_move_dir_merge = _client.svn_client_conflict_option_incoming_move_dir_merge svn_client_conflict_option_local_move_file_text_merge = _client.svn_client_conflict_option_local_move_file_text_merge +svn_client_conflict_option_local_move_dir_merge = _client.svn_client_conflict_option_local_move_dir_merge +svn_client_conflict_option_sibling_move_file_text_merge = _client.svn_client_conflict_option_sibling_move_file_text_merge +svn_client_conflict_option_sibling_move_dir_merge = _client.svn_client_conflict_option_sibling_move_dir_merge +svn_client_conflict_option_both_moved_file_merge = _client.svn_client_conflict_option_both_moved_file_merge +svn_client_conflict_option_both_moved_file_move_merge = _client.svn_client_conflict_option_both_moved_file_move_merge +svn_client_conflict_option_both_moved_dir_merge = _client.svn_client_conflict_option_both_moved_dir_merge +svn_client_conflict_option_both_moved_dir_move_merge = _client.svn_client_conflict_option_both_moved_dir_move_merge def svn_client_conflict_option_set_merged_propval(option, merged_propval): """svn_client_conflict_option_set_merged_propval(svn_client_conflict_option_t * option, svn_string_t const * merged_propval)""" return _client.svn_client_conflict_option_set_merged_propval(option, merged_propval) +def svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(*args): + """svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(*args) + def svn_client_conflict_option_get_moved_to_repos_relpath_candidates(*args): """svn_client_conflict_option_get_moved_to_repos_relpath_candidates(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" return _client.svn_client_conflict_option_get_moved_to_repos_relpath_candidates(*args) +def svn_client_conflict_option_set_moved_to_repos_relpath2(*args): + """svn_client_conflict_option_set_moved_to_repos_relpath2(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_option_set_moved_to_repos_relpath2(*args) + def svn_client_conflict_option_set_moved_to_repos_relpath(*args): """svn_client_conflict_option_set_moved_to_repos_relpath(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" return _client.svn_client_conflict_option_set_moved_to_repos_relpath(*args) +def svn_client_conflict_option_get_moved_to_abspath_candidates2(*args): + """svn_client_conflict_option_get_moved_to_abspath_candidates2(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_option_get_moved_to_abspath_candidates2(*args) + def svn_client_conflict_option_get_moved_to_abspath_candidates(*args): """svn_client_conflict_option_get_moved_to_abspath_candidates(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" return _client.svn_client_conflict_option_get_moved_to_abspath_candidates(*args) +def svn_client_conflict_option_set_moved_to_abspath2(*args): + """svn_client_conflict_option_set_moved_to_abspath2(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_option_set_moved_to_abspath2(*args) + def svn_client_conflict_option_set_moved_to_abspath(*args): """svn_client_conflict_option_set_moved_to_abspath(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" return _client.svn_client_conflict_option_set_moved_to_abspath(*args) @@ -1659,34 +1702,99 @@ def svn_client_cat2(*args): def svn_client_cat(*args): """svn_client_cat(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" return _client.svn_client_cat(*args) +class svn_client__shelf_t: + """Proxy of C svn_client__shelf_t struct.""" -def svn_client_shelve(*args): - """svn_client_shelve(char const * name, apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_boolean_t keep_local, svn_boolean_t dry_run, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_shelve(*args) + __swig_setmethods__ = {} + __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client__shelf_t, name, value) + __swig_getmethods__ = {} + __getattr__ = lambda self, name: _swig_getattr(self, svn_client__shelf_t, name) + __repr__ = _swig_repr + __swig_setmethods__["name"] = _client.svn_client__shelf_t_name_set + __swig_getmethods__["name"] = _client.svn_client__shelf_t_name_get + __swig_setmethods__["max_version"] = _client.svn_client__shelf_t_max_version_set + __swig_getmethods__["max_version"] = _client.svn_client__shelf_t_max_version_get + __swig_setmethods__["wc_root_abspath"] = _client.svn_client__shelf_t_wc_root_abspath_set + __swig_getmethods__["wc_root_abspath"] = _client.svn_client__shelf_t_wc_root_abspath_get + __swig_setmethods__["shelves_dir"] = _client.svn_client__shelf_t_shelves_dir_set + __swig_getmethods__["shelves_dir"] = _client.svn_client__shelf_t_shelves_dir_get + __swig_setmethods__["revprops"] = _client.svn_client__shelf_t_revprops_set + __swig_getmethods__["revprops"] = _client.svn_client__shelf_t_revprops_get + __swig_setmethods__["ctx"] = _client.svn_client__shelf_t_ctx_set + __swig_getmethods__["ctx"] = _client.svn_client__shelf_t_ctx_get + __swig_setmethods__["pool"] = _client.svn_client__shelf_t_pool_set + __swig_getmethods__["pool"] = _client.svn_client__shelf_t_pool_get + def set_parent_pool(self, parent_pool=None): + """Create a new proxy object for TYPE""" + import libsvn.core, weakref + self.__dict__["_parent_pool"] = \ + parent_pool or libsvn.core.application_pool; + if self.__dict__["_parent_pool"]: + self.__dict__["_is_valid"] = weakref.ref( + self.__dict__["_parent_pool"]._is_valid) -def svn_client_unshelve(*args): - """svn_client_unshelve(char const * name, char const * local_abspath, svn_boolean_t keep, svn_boolean_t dry_run, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_unshelve(*args) + def assert_valid(self): + """Assert that this object is using valid pool memory""" + if "_is_valid" in self.__dict__: + assert self.__dict__["_is_valid"](), "Variable has already been deleted" -def svn_client_shelves_delete(*args): - """svn_client_shelves_delete(char const * name, char const * local_abspath, svn_boolean_t dry_run, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_shelves_delete(*args) -class svn_client_shelved_patch_info_t: - """Proxy of C svn_client_shelved_patch_info_t struct.""" + def __getattr__(self, name): + """Get an attribute from this object""" + self.assert_valid() + + value = _swig_getattr(self, self.__class__, name) + + # If we got back a different object than we have, we need to copy all our + # metadata into it, so that it looks identical + members = self.__dict__.get("_members") + if members is not None: + _copy_metadata_deep(value, members.get(name)) + + # Verify that the new object is good + _assert_valid_deep(value) + + return value + + def __setattr__(self, name, value): + """Set an attribute on this object""" + self.assert_valid() + + # Save a copy of the object, so that the garbage + # collector won't kill the object while it's in + # SWIG-land + self.__dict__.setdefault("_members",{})[name] = value + + return _swig_setattr(self, self.__class__, name, value) + + + def __init__(self): + """__init__(svn_client__shelf_t self) -> svn_client__shelf_t""" + this = _client.new_svn_client__shelf_t() + try: + self.this.append(this) + except __builtin__.Exception: + self.this = this + __swig_destroy__ = _client.delete_svn_client__shelf_t + __del__ = lambda self: None +svn_client__shelf_t_swigregister = _client.svn_client__shelf_t_swigregister +svn_client__shelf_t_swigregister(svn_client__shelf_t) + +class svn_client__shelf_version_t: + """Proxy of C svn_client__shelf_version_t struct.""" __swig_setmethods__ = {} - __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_shelved_patch_info_t, name, value) + __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client__shelf_version_t, name, value) __swig_getmethods__ = {} - __getattr__ = lambda self, name: _swig_getattr(self, svn_client_shelved_patch_info_t, name) + __getattr__ = lambda self, name: _swig_getattr(self, svn_client__shelf_version_t, name) __repr__ = _swig_repr - __swig_setmethods__["message"] = _client.svn_client_shelved_patch_info_t_message_set - __swig_getmethods__["message"] = _client.svn_client_shelved_patch_info_t_message_get - __swig_setmethods__["patch_path"] = _client.svn_client_shelved_patch_info_t_patch_path_set - __swig_getmethods__["patch_path"] = _client.svn_client_shelved_patch_info_t_patch_path_get - __swig_setmethods__["dirent"] = _client.svn_client_shelved_patch_info_t_dirent_set - __swig_getmethods__["dirent"] = _client.svn_client_shelved_patch_info_t_dirent_get - __swig_setmethods__["mtime"] = _client.svn_client_shelved_patch_info_t_mtime_set - __swig_getmethods__["mtime"] = _client.svn_client_shelved_patch_info_t_mtime_get + __swig_setmethods__["shelf"] = _client.svn_client__shelf_version_t_shelf_set + __swig_getmethods__["shelf"] = _client.svn_client__shelf_version_t_shelf_get + __swig_setmethods__["mtime"] = _client.svn_client__shelf_version_t_mtime_set + __swig_getmethods__["mtime"] = _client.svn_client__shelf_version_t_mtime_get + __swig_setmethods__["files_dir_abspath"] = _client.svn_client__shelf_version_t_files_dir_abspath_set + __swig_getmethods__["files_dir_abspath"] = _client.svn_client__shelf_version_t_files_dir_abspath_get + __swig_setmethods__["version_number"] = _client.svn_client__shelf_version_t_version_number_set + __swig_getmethods__["version_number"] = _client.svn_client__shelf_version_t_version_number_get def set_parent_pool(self, parent_pool=None): """Create a new proxy object for TYPE""" import libsvn.core, weakref @@ -1731,33 +1839,174 @@ class svn_client_shelved_patch_info_t: def __init__(self): - """__init__(svn_client_shelved_patch_info_t self) -> svn_client_shelved_patch_info_t""" - this = _client.new_svn_client_shelved_patch_info_t() + """__init__(svn_client__shelf_version_t self) -> svn_client__shelf_version_t""" + this = _client.new_svn_client__shelf_version_t() try: self.this.append(this) except __builtin__.Exception: self.this = this - __swig_destroy__ = _client.delete_svn_client_shelved_patch_info_t + __swig_destroy__ = _client.delete_svn_client__shelf_version_t __del__ = lambda self: None -svn_client_shelved_patch_info_t_swigregister = _client.svn_client_shelved_patch_info_t_swigregister -svn_client_shelved_patch_info_t_swigregister(svn_client_shelved_patch_info_t) +svn_client__shelf_version_t_swigregister = _client.svn_client__shelf_version_t_swigregister +svn_client__shelf_version_t_swigregister(svn_client__shelf_version_t) + +def svn_client__shelf_open_or_create(*args): + """svn_client__shelf_open_or_create(char const * name, char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool) -> svn_error_t""" + return _client.svn_client__shelf_open_or_create(*args) -def svn_client_shelves_list(*args): - """svn_client_shelves_list(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_shelves_list(*args) +def svn_client__shelf_open_existing(*args): + """svn_client__shelf_open_existing(char const * name, char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool) -> svn_error_t""" + return _client.svn_client__shelf_open_existing(*args) -def svn_client_shelves_any(*args): - """svn_client_shelves_any(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_shelves_any(*args) +def svn_client__shelf_close(*args): + """svn_client__shelf_close(svn_client__shelf_t shelf, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_close(*args) -def svn_client_shelf_get_paths(*args): - """svn_client_shelf_get_paths(char const * name, char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_shelf_get_paths(*args) +def svn_client__shelf_delete(*args): + """svn_client__shelf_delete(char const * name, char const * local_abspath, svn_boolean_t dry_run, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_delete(*args) -def svn_client_shelf_has_changes(*args): - """svn_client_shelf_has_changes(char const * name, char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_shelf_has_changes(*args) +def svn_client__shelf_mods_editor(*args): + """svn_client__shelf_mods_editor(svn_client__shelf_version_t shelf_version, svn_wc_notify_func2_t notify_func, svn_client_ctx_t ctx, apr_pool_t result_pool) -> svn_error_t""" + return _client.svn_client__shelf_mods_editor(*args) + +def svn_client__shelf_save_new_version3(*args): + """svn_client__shelf_save_new_version3(svn_client__shelf_t shelf, apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_client_status_func_t shelved_func, void * shelved_baton, svn_client_status_func_t not_shelved_func, void * not_shelved_baton, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_save_new_version3(*args) + +def svn_client__shelf_delete_newer_versions(*args): + """svn_client__shelf_delete_newer_versions(svn_client__shelf_t shelf, svn_client__shelf_version_t shelf_version, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_delete_newer_versions(*args) + +def svn_client__shelf_version_open(*args): + """svn_client__shelf_version_open(svn_client__shelf_t shelf, int version_number, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_version_open(*args) + +def svn_client__shelf_get_newest_version(*args): + """svn_client__shelf_get_newest_version(svn_client__shelf_t shelf, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_get_newest_version(*args) + +def svn_client__shelf_get_all_versions(*args): + """svn_client__shelf_get_all_versions(svn_client__shelf_t shelf, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_get_all_versions(*args) + +def svn_client__shelf_apply(*args): + """svn_client__shelf_apply(svn_client__shelf_version_t shelf_version, svn_boolean_t dry_run, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_apply(*args) + +def svn_client__shelf_test_apply_file(*args): + """svn_client__shelf_test_apply_file(svn_client__shelf_version_t shelf_version, char const * file_relpath, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_test_apply_file(*args) + +def svn_client__shelf_unapply(*args): + """svn_client__shelf_unapply(svn_client__shelf_version_t shelf_version, svn_boolean_t dry_run, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_unapply(*args) + +def svn_client__shelf_replay(*args): + """svn_client__shelf_replay(svn_client__shelf_version_t shelf_version, char const * top_relpath, svn_delta_editor_t editor, void * edit_baton, svn_wc_notify_func2_t notify_func, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_replay(*args) + +def svn_client__shelf_paths_changed(*args): + """svn_client__shelf_paths_changed(svn_client__shelf_version_t shelf_version, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_paths_changed(*args) + +def svn_client__shelf_revprop_set(*args): + """svn_client__shelf_revprop_set(svn_client__shelf_t shelf, char const * prop_name, svn_string_t const * prop_val, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_revprop_set(*args) + +def svn_client__shelf_revprop_set_all(*args): + """svn_client__shelf_revprop_set_all(svn_client__shelf_t shelf, apr_hash_t revprop_table, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_revprop_set_all(*args) + +def svn_client__shelf_revprop_get(*args): + """svn_client__shelf_revprop_get(svn_client__shelf_t shelf, char const * prop_name, apr_pool_t result_pool) -> svn_error_t""" + return _client.svn_client__shelf_revprop_get(*args) + +def svn_client__shelf_revprop_list(*args): + """svn_client__shelf_revprop_list(svn_client__shelf_t shelf, apr_pool_t result_pool) -> svn_error_t""" + return _client.svn_client__shelf_revprop_list(*args) + +def svn_client__shelf_set_log_message(*args): + """svn_client__shelf_set_log_message(svn_client__shelf_t shelf, char const * log_message, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_set_log_message(*args) + +def svn_client__shelf_get_log_message(*args): + """svn_client__shelf_get_log_message(svn_client__shelf_t shelf, apr_pool_t result_pool) -> svn_error_t""" + return _client.svn_client__shelf_get_log_message(*args) +class svn_client__shelf_info_t: + """Proxy of C svn_client__shelf_info_t struct.""" + + __swig_setmethods__ = {} + __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client__shelf_info_t, name, value) + __swig_getmethods__ = {} + __getattr__ = lambda self, name: _swig_getattr(self, svn_client__shelf_info_t, name) + __repr__ = _swig_repr + __swig_setmethods__["mtime"] = _client.svn_client__shelf_info_t_mtime_set + __swig_getmethods__["mtime"] = _client.svn_client__shelf_info_t_mtime_get + def set_parent_pool(self, parent_pool=None): + """Create a new proxy object for TYPE""" + import libsvn.core, weakref + self.__dict__["_parent_pool"] = \ + parent_pool or libsvn.core.application_pool; + if self.__dict__["_parent_pool"]: + self.__dict__["_is_valid"] = weakref.ref( + self.__dict__["_parent_pool"]._is_valid) + + def assert_valid(self): + """Assert that this object is using valid pool memory""" + if "_is_valid" in self.__dict__: + assert self.__dict__["_is_valid"](), "Variable has already been deleted" + + def __getattr__(self, name): + """Get an attribute from this object""" + self.assert_valid() + + value = _swig_getattr(self, self.__class__, name) + + # If we got back a different object than we have, we need to copy all our + # metadata into it, so that it looks identical + members = self.__dict__.get("_members") + if members is not None: + _copy_metadata_deep(value, members.get(name)) + + # Verify that the new object is good + _assert_valid_deep(value) + + return value + + def __setattr__(self, name, value): + """Set an attribute on this object""" + self.assert_valid() + + # Save a copy of the object, so that the garbage + # collector won't kill the object while it's in + # SWIG-land + self.__dict__.setdefault("_members",{})[name] = value + + return _swig_setattr(self, self.__class__, name, value) + + + def __init__(self): + """__init__(svn_client__shelf_info_t self) -> svn_client__shelf_info_t""" + this = _client.new_svn_client__shelf_info_t() + try: + self.this.append(this) + except __builtin__.Exception: + self.this = this + __swig_destroy__ = _client.delete_svn_client__shelf_info_t + __del__ = lambda self: None +svn_client__shelf_info_t_swigregister = _client.svn_client__shelf_info_t_swigregister +svn_client__shelf_info_t_swigregister(svn_client__shelf_info_t) + + +def svn_client__shelf_list(*args): + """svn_client__shelf_list(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_list(*args) + +def svn_client__shelf_version_status_walk(*args): + """svn_client__shelf_version_status_walk(svn_client__shelf_version_t shelf_version, char const * wc_relpath, svn_wc_status_func4_t walk_func, void * walk_baton, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__shelf_version_status_walk(*args) def svn_client_add_to_changelist(*args): """svn_client_add_to_changelist(apr_array_header_t paths, char const * changelist, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" @@ -2185,6 +2434,10 @@ def svn_client_invoke_get_commit_log(*args): """svn_client_invoke_get_commit_log(svn_client_get_commit_log_t _obj, apr_array_header_t commit_items, void * baton, apr_pool_t pool) -> svn_error_t""" return _client.svn_client_invoke_get_commit_log(*args) +def svn_client_invoke_blame_receiver4(*args): + """svn_client_invoke_blame_receiver4(svn_client_blame_receiver4_t _obj, void * baton, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t rev_props, svn_revnum_t merged_revision, apr_hash_t merged_rev_props, char const * merged_path, svn_string_t const * line, svn_boolean_t local_change, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_invoke_blame_receiver4(*args) + def svn_client_invoke_blame_receiver3(*args): """svn_client_invoke_blame_receiver3(svn_client_blame_receiver3_t _obj, void * baton, svn_revnum_t start_revnum, svn_revnum_t end_revnum, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t rev_props, svn_revnum_t merged_revision, apr_hash_t merged_rev_props, char const * merged_path, char const * line, svn_boolean_t local_change, apr_pool_t pool) -> svn_error_t""" return _client.svn_client_invoke_blame_receiver3(*args) @@ -2201,6 +2454,10 @@ def svn_client_invoke_diff_summarize_func(*args): """svn_client_invoke_diff_summarize_func(svn_client_diff_summarize_func_t _obj, svn_client_diff_summarize_t diff, void * baton, apr_pool_t pool) -> svn_error_t""" return _client.svn_client_invoke_diff_summarize_func(*args) +def svn_client_invoke__layout_func(*args): + """svn_client_invoke__layout_func(svn_client__layout_func_t _obj, void * layout_baton, char const * local_abspath, char const * repos_root_url, svn_boolean_t not_present, svn_boolean_t url_changed, char const * url, svn_boolean_t revision_changed, svn_revnum_t revision, svn_boolean_t depth_changed, svn_depth_t depth, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_invoke__layout_func(*args) + def svn_client_invoke_import_filter_func(*args): """svn_client_invoke_import_filter_func(svn_client_import_filter_func_t _obj, void * baton, char const * local_abspath, svn_io_dirent2_t dirent, apr_pool_t scratch_pool) -> svn_error_t""" return _client.svn_client_invoke_import_filter_func(*args) @@ -2532,6 +2789,66 @@ class svn_client_get_commit_log_t: svn_client_get_commit_log_t_swigregister = _client.svn_client_get_commit_log_t_swigregister svn_client_get_commit_log_t_swigregister(svn_client_get_commit_log_t) +class svn_client_blame_receiver4_t: + """Proxy of C svn_client_blame_receiver4_t struct.""" + + __swig_setmethods__ = {} + __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client_blame_receiver4_t, name, value) + __swig_getmethods__ = {} + __getattr__ = lambda self, name: _swig_getattr(self, svn_client_blame_receiver4_t, name) + + def __init__(self, *args, **kwargs): + raise AttributeError("No constructor defined") + __repr__ = _swig_repr + def set_parent_pool(self, parent_pool=None): + """Create a new proxy object for TYPE""" + import libsvn.core, weakref + self.__dict__["_parent_pool"] = \ + parent_pool or libsvn.core.application_pool; + if self.__dict__["_parent_pool"]: + self.__dict__["_is_valid"] = weakref.ref( + self.__dict__["_parent_pool"]._is_valid) + + def assert_valid(self): + """Assert that this object is using valid pool memory""" + if "_is_valid" in self.__dict__: + assert self.__dict__["_is_valid"](), "Variable has already been deleted" + + def __getattr__(self, name): + """Get an attribute from this object""" + self.assert_valid() + + value = _swig_getattr(self, self.__class__, name) + + # If we got back a different object than we have, we need to copy all our + # metadata into it, so that it looks identical + members = self.__dict__.get("_members") + if members is not None: + _copy_metadata_deep(value, members.get(name)) + + # Verify that the new object is good + _assert_valid_deep(value) + + return value + + def __setattr__(self, name, value): + """Set an attribute on this object""" + self.assert_valid() + + # Save a copy of the object, so that the garbage + # collector won't kill the object while it's in + # SWIG-land + self.__dict__.setdefault("_members",{})[name] = value + + return _swig_setattr(self, self.__class__, name, value) + + + def __call__(self, *args): + return svn_client_invoke_blame_receiver4(self, *args) + +svn_client_blame_receiver4_t_swigregister = _client.svn_client_blame_receiver4_t_swigregister +svn_client_blame_receiver4_t_swigregister(svn_client_blame_receiver4_t) + class svn_client_blame_receiver3_t: """Proxy of C svn_client_blame_receiver3_t struct.""" @@ -2772,6 +3089,66 @@ class svn_client_diff_summarize_func_t: svn_client_diff_summarize_func_t_swigregister = _client.svn_client_diff_summarize_func_t_swigregister svn_client_diff_summarize_func_t_swigregister(svn_client_diff_summarize_func_t) +class svn_client__layout_func_t: + """Proxy of C svn_client__layout_func_t struct.""" + + __swig_setmethods__ = {} + __setattr__ = lambda self, name, value: _swig_setattr(self, svn_client__layout_func_t, name, value) + __swig_getmethods__ = {} + __getattr__ = lambda self, name: _swig_getattr(self, svn_client__layout_func_t, name) + + def __init__(self, *args, **kwargs): + raise AttributeError("No constructor defined") + __repr__ = _swig_repr + def set_parent_pool(self, parent_pool=None): + """Create a new proxy object for TYPE""" + import libsvn.core, weakref + self.__dict__["_parent_pool"] = \ + parent_pool or libsvn.core.application_pool; + if self.__dict__["_parent_pool"]: + self.__dict__["_is_valid"] = weakref.ref( + self.__dict__["_parent_pool"]._is_valid) + + def assert_valid(self): + """Assert that this object is using valid pool memory""" + if "_is_valid" in self.__dict__: + assert self.__dict__["_is_valid"](), "Variable has already been deleted" + + def __getattr__(self, name): + """Get an attribute from this object""" + self.assert_valid() + + value = _swig_getattr(self, self.__class__, name) + + # If we got back a different object than we have, we need to copy all our + # metadata into it, so that it looks identical + members = self.__dict__.get("_members") + if members is not None: + _copy_metadata_deep(value, members.get(name)) + + # Verify that the new object is good + _assert_valid_deep(value) + + return value + + def __setattr__(self, name, value): + """Set an attribute on this object""" + self.assert_valid() + + # Save a copy of the object, so that the garbage + # collector won't kill the object while it's in + # SWIG-land + self.__dict__.setdefault("_members",{})[name] = value + + return _swig_setattr(self, self.__class__, name, value) + + + def __call__(self, *args): + return svn_client_invoke__layout_func(self, *args) + +svn_client__layout_func_t_swigregister = _client.svn_client__layout_func_t_swigregister +svn_client__layout_func_t_swigregister(svn_client__layout_func_t) + class svn_client_import_filter_func_t: """Proxy of C svn_client_import_filter_func_t struct.""" diff --git a/subversion/bindings/swig/python/core.c b/subversion/bindings/swig/python/core.c index 0ded0c3..67a70da 100644 --- a/subversion/bindings/swig/python/core.c +++ b/subversion/bindings/swig/python/core.c @@ -3123,26 +3123,28 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { #define SWIGTYPE_p_svn_opt_revision_value_t swig_types[137] #define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[138] #define SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides swig_types[139] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[140] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[141] -#define SWIGTYPE_p_svn_prop_kind swig_types[142] -#define SWIGTYPE_p_svn_prop_t swig_types[143] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[144] -#define SWIGTYPE_p_svn_stream_t swig_types[145] -#define SWIGTYPE_p_svn_string_t swig_types[146] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[147] -#define SWIGTYPE_p_svn_tristate_t swig_types[148] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[149] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[150] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[151] -#define SWIGTYPE_p_svn_version_extended_t swig_types[152] -#define SWIGTYPE_p_svn_version_t swig_types[153] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[154] -#define SWIGTYPE_p_unsigned_char swig_types[155] -#define SWIGTYPE_p_unsigned_long swig_types[156] -#define SWIGTYPE_p_void swig_types[157] -static swig_type_info *swig_types[159]; -static swig_module_info swig_module = {swig_types, 158, 0, 0, 0, 0}; +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[140] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides swig_types[141] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[142] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[143] +#define SWIGTYPE_p_svn_prop_kind swig_types[144] +#define SWIGTYPE_p_svn_prop_t swig_types[145] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[146] +#define SWIGTYPE_p_svn_stream_t swig_types[147] +#define SWIGTYPE_p_svn_string_t swig_types[148] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[149] +#define SWIGTYPE_p_svn_tristate_t swig_types[150] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[151] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[152] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[153] +#define SWIGTYPE_p_svn_version_extended_t swig_types[154] +#define SWIGTYPE_p_svn_version_t swig_types[155] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[156] +#define SWIGTYPE_p_unsigned_char swig_types[157] +#define SWIGTYPE_p_unsigned_long swig_types[158] +#define SWIGTYPE_p_void swig_types[159] +static swig_type_info *swig_types[161]; +static swig_module_info swig_module = {swig_types, 160, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -3560,6 +3562,11 @@ SWIGINTERNINLINE PyObject* +#include "svn_types_impl.h" + + + + #include "svn_types.h" @@ -3681,8 +3688,17 @@ static const svn_version_t * svn_version_invoke_func( +#include "svn_opt_impl.h" + + + + #include "svn_opt.h" +typedef struct { + int optch; const char *desc; +} svn_opt_subcommand_desc3_t_desc_overrides; + typedef struct { int optch; const char *desc; } svn_opt_subcommand_desc2_t_desc_overrides; @@ -10667,6 +10683,505 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_name_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + char *arg2 = (char *) 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_subcommand_desc3_t_name_set",&obj0,&arg2)) SWIG_fail; + { + arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->name) free((char *)arg1->name); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->name = copied; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_name_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + PyObject * obj0 = 0 ; + char *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc3_t_name_get",&obj0)) SWIG_fail; + { + arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + result = (char *) ((arg1)->name); + resultobj = SWIG_FromCharPtr((const char *)result); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_cmd_func_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + svn_opt_subcommand_t *arg2 = (svn_opt_subcommand_t *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc3_t_cmd_func_set",&obj0,&obj1)) SWIG_fail; + { + arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + int res = SWIG_ConvertFunctionPtr(obj1, (void**)(&arg2), SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_opt_subcommand_desc3_t_cmd_func_set" "', argument " "2"" of type '" "svn_opt_subcommand_t *""'"); + } + } + if (arg1) (arg1)->cmd_func = arg2; + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_cmd_func_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + PyObject * obj0 = 0 ; + svn_opt_subcommand_t *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc3_t_cmd_func_get",&obj0)) SWIG_fail; + { + arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + result = (svn_opt_subcommand_t *) ((arg1)->cmd_func); + resultobj = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_aliases_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + char **arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc3_t_aliases_set",&obj0,&obj1)) SWIG_fail; + { + arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg2 = (char **)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_char, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + if (arg2) { + size_t ii = 0; + for (; ii < (size_t)3; ++ii) *(char const * *)&arg1->aliases[ii] = *((char const * *)arg2 + ii); + } else { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""aliases""' of type '""char const *[3]""'"); + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_aliases_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + PyObject * obj0 = 0 ; + char **result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc3_t_aliases_get",&obj0)) SWIG_fail; + { + arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + result = (char **)(char **) ((arg1)->aliases); + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_p_char, + _global_py_pool, args); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_help_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + char **arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc3_t_help_set",&obj0,&obj1)) SWIG_fail; + { + arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg2 = (char **)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_char, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + if (arg2) { + size_t ii = 0; + for (; ii < (size_t)100; ++ii) *(char const * *)&arg1->help[ii] = *((char const * *)arg2 + ii); + } else { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""help""' of type '""char const *[100]""'"); + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_help_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + PyObject * obj0 = 0 ; + char **result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc3_t_help_get",&obj0)) SWIG_fail; + { + arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + result = (char **)(char **) ((arg1)->help); + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_p_char, + _global_py_pool, args); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_valid_options_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + int *arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc3_t_valid_options_set",&obj0,&obj1)) SWIG_fail; + { + arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg2 = (int *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_int, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + if (arg2) { + size_t ii = 0; + for (; ii < (size_t)50; ++ii) *(int *)&arg1->valid_options[ii] = *((int *)arg2 + ii); + } else { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""valid_options""' of type '""int [50]""'"); + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_valid_options_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + PyObject * obj0 = 0 ; + int *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc3_t_valid_options_get",&obj0)) SWIG_fail; + { + arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + result = (int *)(int *) ((arg1)->valid_options); + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_int, + _global_py_pool, args); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_desc_overrides_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + PyObject * obj0 = 0 ; + svn_opt_subcommand_desc3_t_desc_overrides *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc3_t_desc_overrides_get",&obj0)) SWIG_fail; + { + arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + result = (svn_opt_subcommand_desc3_t_desc_overrides *)(svn_opt_subcommand_desc3_t_desc_overrides *) ((arg1)->desc_overrides); + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, + _global_py_pool, args); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_svn_opt_subcommand_desc3_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_opt_subcommand_desc3_t *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)":new_svn_opt_subcommand_desc3_t")) SWIG_fail; + { + svn_swig_py_release_py_lock(); + + result = (struct svn_opt_subcommand_desc3_t *)calloc(1, sizeof(struct svn_opt_subcommand_desc3_t)); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_subcommand_desc3_t, + _global_py_pool, args); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_delete_svn_opt_subcommand_desc3_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_opt_subcommand_desc3_t",&obj0)) SWIG_fail; + { + arg1 = (struct svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + free((char *) arg1); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *svn_opt_subcommand_desc3_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_svn_opt_subcommand_desc3_t, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_desc_overrides_optch_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *) 0 ; + int arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc3_t_desc_overrides_optch_set",&obj0,&obj1)) SWIG_fail; + { + arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg2 = (int)SWIG_As_long (obj1); + if (SWIG_arg_fail(svn_argnum_obj1)) { + SWIG_fail; + } + } + if (arg1) (arg1)->optch = arg2; + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_desc_overrides_optch_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *) 0 ; + PyObject * obj0 = 0 ; + int result; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc3_t_desc_overrides_optch_get",&obj0)) SWIG_fail; + { + arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + result = (int) ((arg1)->optch); + resultobj = SWIG_From_long((long)(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_desc_overrides_desc_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *) 0 ; + char *arg2 = (char *) 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_subcommand_desc3_t_desc_overrides_desc_set",&obj0,&arg2)) SWIG_fail; + { + arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->desc) free((char *)arg1->desc); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->desc = copied; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc3_t_desc_overrides_desc_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *) 0 ; + PyObject * obj0 = 0 ; + char *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc3_t_desc_overrides_desc_get",&obj0)) SWIG_fail; + { + arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + result = (char *) ((arg1)->desc); + resultobj = SWIG_FromCharPtr((const char *)result); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_svn_opt_subcommand_desc3_t_desc_overrides(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_opt_subcommand_desc3_t_desc_overrides *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)":new_svn_opt_subcommand_desc3_t_desc_overrides")) SWIG_fail; + { + svn_swig_py_release_py_lock(); + + result = (svn_opt_subcommand_desc3_t_desc_overrides *)calloc(1, sizeof(svn_opt_subcommand_desc3_t_desc_overrides)); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, + _global_py_pool, args); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_delete_svn_opt_subcommand_desc3_t_desc_overrides(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *) 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_opt_subcommand_desc3_t_desc_overrides",&obj0)) SWIG_fail; + { + arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + free((char *) arg1); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *svn_opt_subcommand_desc3_t_desc_overrides_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_name_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; struct svn_opt_subcommand_desc2_t *arg1 = (struct svn_opt_subcommand_desc2_t *) 0 ; @@ -11474,6 +11989,36 @@ SWIGINTERN PyObject *svn_opt_subcommand_desc_t_swigregister(PyObject *SWIGUNUSED return SWIG_Py_Void(); } +SWIGINTERN PyObject *_wrap_svn_opt_get_canonical_subcommand3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_opt_subcommand_desc3_t *arg1 = (svn_opt_subcommand_desc3_t *) 0 ; + char *arg2 = (char *) 0 ; + PyObject * obj0 = 0 ; + svn_opt_subcommand_desc3_t *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_get_canonical_subcommand3",&obj0,&arg2)) SWIG_fail; + { + arg1 = (svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_opt_subcommand_desc3_t *)svn_opt_get_canonical_subcommand3((struct svn_opt_subcommand_desc3_t const *)arg1,(char const *)arg2); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_subcommand_desc3_t, + _global_py_pool, args); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_opt_get_canonical_subcommand2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_opt_subcommand_desc2_t *arg1 = (svn_opt_subcommand_desc2_t *) 0 ; @@ -11534,6 +12079,73 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_opt_get_option_from_code3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + int arg1 ; + apr_getopt_option_t *arg2 = (apr_getopt_option_t *) 0 ; + svn_opt_subcommand_desc3_t *arg3 = (svn_opt_subcommand_desc3_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + apr_getopt_option_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_opt_get_option_from_code3",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + { + arg1 = (int)SWIG_As_long (obj0); + if (SWIG_arg_fail(svn_argnum_obj0)) { + SWIG_fail; + } + } + { + arg2 = (apr_getopt_option_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg3 = (svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj2); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj3) { + /* Verify that the user supplied a valid pool */ + if (obj3 != Py_None && obj3 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3); + SWIG_arg_fail(svn_argnum_obj3); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (apr_getopt_option_t *)svn_opt_get_option_from_code3(arg1,(apr_getopt_option_t const *)arg2,(struct svn_opt_subcommand_desc3_t const *)arg3,arg4); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_getopt_option_t, + _global_py_pool, args); + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_opt_get_option_from_code2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; int arg1 ; @@ -11638,6 +12250,52 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_takes_option4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_opt_subcommand_desc3_t *arg1 = (svn_opt_subcommand_desc3_t *) 0 ; + int arg2 ; + int *arg3 = (int *) 0 ; + int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + svn_boolean_t result; + + arg3 = &temp3; + if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_takes_option4",&obj0,&obj1)) SWIG_fail; + { + arg1 = (svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg2 = (int)SWIG_As_long (obj1); + if (SWIG_arg_fail(svn_argnum_obj1)) { + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_boolean_t)svn_opt_subcommand_takes_option4((struct svn_opt_subcommand_desc3_t const *)arg1,arg2,(int const *)arg3); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = SWIG_From_long((long)(result)); + if (SWIG_IsTmpObj(res3)) { + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg3))); + } else { + int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, new_flags)); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_opt_subcommand_takes_option3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_opt_subcommand_desc2_t *arg1 = (svn_opt_subcommand_desc2_t *) 0 ; @@ -11756,6 +12414,76 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_opt_print_generic_help3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + svn_opt_subcommand_desc3_t *arg2 = (svn_opt_subcommand_desc3_t *) 0 ; + apr_getopt_option_t *arg3 = (apr_getopt_option_t *) 0 ; + char *arg4 = (char *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + FILE *arg6 = (FILE *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg5 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"sOOs|OO:svn_opt_print_generic_help3",&arg1,&obj1,&obj2,&arg4,&obj4,&obj5)) SWIG_fail; + { + arg2 = (svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg3 = (apr_getopt_option_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj2); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj4) { + /* Verify that the user supplied a valid pool */ + if (obj4 != Py_None && obj4 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4); + SWIG_arg_fail(svn_argnum_obj4); + SWIG_fail; + } + } + if (obj5) { + { + arg6 = PyFile_AsFile(obj5); + if (arg6 == NULL) { + PyErr_SetString(PyExc_ValueError, "Must pass in a valid file object"); + SWIG_fail; + } + } + } + { + svn_swig_py_release_py_lock(); + + svn_opt_print_generic_help3((char const *)arg1,(struct svn_opt_subcommand_desc3_t const *)arg2,(apr_getopt_option_t const *)arg3,(char const *)arg4,arg5,arg6); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = SWIG_Py_Void(); + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_opt_print_generic_help2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; @@ -11899,6 +12627,74 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_opt_subcommand_help4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + svn_opt_subcommand_desc3_t *arg2 = (svn_opt_subcommand_desc3_t *) 0 ; + apr_getopt_option_t *arg3 = (apr_getopt_option_t *) 0 ; + int *arg4 = (int *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + int temp4 ; + int res4 = SWIG_TMPOBJ ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg5 = _global_pool; + arg4 = &temp4; + if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_opt_subcommand_help4",&arg1,&obj1,&obj2,&obj3)) SWIG_fail; + { + arg2 = (svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg3 = (apr_getopt_option_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj2); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj3) { + /* Verify that the user supplied a valid pool */ + if (obj3 != Py_None && obj3 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3); + SWIG_arg_fail(svn_argnum_obj3); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + svn_opt_subcommand_help4((char const *)arg1,(struct svn_opt_subcommand_desc3_t const *)arg2,(apr_getopt_option_t const *)arg3,(int const *)arg4,arg5); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = SWIG_Py_Void(); + if (SWIG_IsTmpObj(res4)) { + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg4))); + } else { + int new_flags = SWIG_IsNewObj(res4) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, new_flags)); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_opt_subcommand_help3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; @@ -13207,7 +14003,7 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_opt_print_help4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_opt_print_help5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; apr_getopt_t *arg1 = (apr_getopt_t *) 0 ; char *arg2 = (char *) 0 ; @@ -13216,7 +14012,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help4(PyObject *SWIGUNUSEDPARM(self), P svn_boolean_t arg5 ; char *arg6 = (char *) 0 ; char *arg7 = (char *) 0 ; - svn_opt_subcommand_desc2_t *arg8 = (svn_opt_subcommand_desc2_t *) 0 ; + svn_opt_subcommand_desc3_t *arg8 = (svn_opt_subcommand_desc3_t *) 0 ; apr_getopt_option_t *arg9 = (apr_getopt_option_t *) 0 ; int *arg10 = (int *) 0 ; char *arg11 = (char *) 0 ; @@ -13239,7 +14035,121 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help4(PyObject *SWIGUNUSEDPARM(self), P SWIG_fail; arg12 = _global_pool; arg10 = &temp10; - if (!PyArg_ParseTuple(args,(char *)"OsOOOssOOs|O:svn_opt_print_help4",&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&arg7,&obj7,&obj8,&arg11,&obj10)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OsOOOssOOs|O:svn_opt_print_help5",&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&arg7,&obj7,&obj8,&arg11,&obj10)) SWIG_fail; + { + arg1 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg3 = (svn_boolean_t)SWIG_As_long (obj2); + if (SWIG_arg_fail(svn_argnum_obj2)) { + SWIG_fail; + } + } + { + arg4 = (svn_boolean_t)SWIG_As_long (obj3); + if (SWIG_arg_fail(svn_argnum_obj3)) { + SWIG_fail; + } + } + { + arg5 = (svn_boolean_t)SWIG_As_long (obj4); + if (SWIG_arg_fail(svn_argnum_obj4)) { + SWIG_fail; + } + } + { + arg8 = (svn_opt_subcommand_desc3_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_opt_subcommand_desc3_t, svn_argnum_obj7); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg9 = (apr_getopt_option_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj8); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj10) { + /* Verify that the user supplied a valid pool */ + if (obj10 != Py_None && obj10 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj10); + SWIG_arg_fail(svn_argnum_obj10); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_opt_print_help5(arg1,(char const *)arg2,arg3,arg4,arg5,(char const *)arg6,(char const *)arg7,(struct svn_opt_subcommand_desc3_t const *)arg8,(apr_getopt_option_t const *)arg9,(int const *)arg10,(char const *)arg11,arg12); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + if (SWIG_IsTmpObj(res10)) { + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg10))); + } else { + int new_flags = SWIG_IsNewObj(res10) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg10), SWIGTYPE_p_int, new_flags)); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_opt_print_help4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + apr_getopt_t *arg1 = (apr_getopt_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_boolean_t arg3 ; + svn_boolean_t arg4 ; + svn_boolean_t arg5 ; + char *arg6 = (char *) 0 ; + char *arg7 = (char *) 0 ; + svn_opt_subcommand_desc2_t *arg8 = (svn_opt_subcommand_desc2_t *) 0 ; + apr_getopt_option_t *arg9 = (apr_getopt_option_t *) 0 ; + int *arg10 = (int *) 0 ; + char *arg11 = (char *) 0 ; + apr_pool_t *arg12 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + int temp10 ; + int res10 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; + PyObject * obj10 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg12 = _global_pool; + arg10 = &temp10; + if (!PyArg_ParseTuple(args,(char *)"OsOOOssOOs|O:svn_opt_print_help4",&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&arg7,&obj7,&obj8,&arg11,&obj10)) SWIG_fail; { arg1 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0); if (PyErr_Occurred()) { @@ -21845,20 +22755,32 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_dirent_local_style(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_dirent_internal_style_safe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - char *arg1 = (char *) 0 ; - apr_pool_t *arg2 = (apr_pool_t *) 0 ; + char **arg1 = (char **) 0 ; + char **arg2 = (char **) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool = NULL ; PyObject *_global_py_pool = NULL ; + char *temp1 ; + char *temp2 ; PyObject * obj1 = 0 ; - char *result = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, &_global_py_pool, &_global_pool)) SWIG_fail; - arg2 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"s|O:svn_dirent_local_style",&arg1,&obj1)) SWIG_fail; + arg4 = _global_pool; + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg5 = _global_pool; + arg1 = &temp1; + arg2 = &temp2; + if (!PyArg_ParseTuple(args,(char *)"s|OO:svn_dirent_internal_style_safe",&arg3,&obj1,&obj2)) SWIG_fail; if (obj1) { /* Verify that the user supplied a valid pool */ if (obj1 != Py_None && obj1 != _global_py_pool) { @@ -21867,20 +22789,70 @@ SWIGINTERN PyObject *_wrap_svn_dirent_local_style(PyObject *SWIGUNUSEDPARM(self) SWIG_fail; } } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } { svn_swig_py_release_py_lock(); - result = (char *)svn_dirent_local_style((char const *)arg1,arg2); + result = (svn_error_t *)svn_dirent_internal_style_safe((char const **)arg1,(char const **)arg2,(char const *)arg3,arg4,arg5); svn_swig_py_acquire_py_lock(); } - resultobj = SWIG_FromCharPtr((const char *)result); + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + PyObject *s; + if (*arg1 == NULL) { + Py_INCREF(Py_None); + s = Py_None; + } + else { + s = PyString_FromString(*arg1); + if (s == NULL) + SWIG_fail; + } + resultobj = SWIG_Python_AppendOutput(resultobj, s); + } + { + PyObject *s; + if (*arg2 == NULL) { + Py_INCREF(Py_None); + s = Py_None; + } + else { + s = PyString_FromString(*arg2); + if (s == NULL) + SWIG_fail; + } + resultobj = SWIG_Python_AppendOutput(resultobj, s); + } + { + Py_XDECREF(_global_py_pool); + } { Py_XDECREF(_global_py_pool); } return resultobj; fail: + { + Py_XDECREF(_global_py_pool); + } { Py_XDECREF(_global_py_pool); } @@ -21888,7 +22860,7 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_relpath__internal_style(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_dirent_local_style(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; apr_pool_t *arg2 = (apr_pool_t *) 0 ; @@ -21901,7 +22873,7 @@ SWIGINTERN PyObject *_wrap_svn_relpath__internal_style(PyObject *SWIGUNUSEDPARM( &_global_py_pool, &_global_pool)) SWIG_fail; arg2 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"s|O:svn_relpath__internal_style",&arg1,&obj1)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"s|O:svn_dirent_local_style",&arg1,&obj1)) SWIG_fail; if (obj1) { /* Verify that the user supplied a valid pool */ if (obj1 != Py_None && obj1 != _global_py_pool) { @@ -21913,7 +22885,7 @@ SWIGINTERN PyObject *_wrap_svn_relpath__internal_style(PyObject *SWIGUNUSEDPARM( { svn_swig_py_release_py_lock(); - result = (char *)svn_relpath__internal_style((char const *)arg1,arg2); + result = (char *)svn_dirent_local_style((char const *)arg1,arg2); svn_swig_py_acquire_py_lock(); @@ -22455,46 +23427,580 @@ SWIGINTERN PyObject *_wrap_svn_uri_split(PyObject *SWIGUNUSEDPARM(self), PyObjec { Py_XDECREF(_global_py_pool); } - return resultobj; -fail: - { - Py_XDECREF(_global_py_pool); - } - return NULL; -} - - -SWIGINTERN PyObject *_wrap_svn_uri_basename(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - char *arg1 = (char *) 0 ; - apr_pool_t *arg2 = (apr_pool_t *) 0 ; - apr_pool_t *_global_pool = NULL ; - PyObject *_global_py_pool = NULL ; - PyObject * obj1 = 0 ; - char *result = 0 ; - - if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, - &_global_py_pool, &_global_pool)) - SWIG_fail; - arg2 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"s|O:svn_uri_basename",&arg1,&obj1)) SWIG_fail; - if (obj1) { - /* Verify that the user supplied a valid pool */ - if (obj1 != Py_None && obj1 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); - SWIG_arg_fail(svn_argnum_obj1); - SWIG_fail; - } - } - { - svn_swig_py_release_py_lock(); - - result = (char *)svn_uri_basename((char const *)arg1,arg2); - - svn_swig_py_acquire_py_lock(); - - } - resultobj = SWIG_FromCharPtr((const char *)result); + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_uri_basename(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj1 = 0 ; + char *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg2 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"s|O:svn_uri_basename",&arg1,&obj1)) SWIG_fail; + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (char *)svn_uri_basename((char const *)arg1,arg2); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = SWIG_FromCharPtr((const char *)result); + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_uri_dirname(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj1 = 0 ; + char *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg2 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"s|O:svn_uri_dirname",&arg1,&obj1)) SWIG_fail; + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (char *)svn_uri_dirname((char const *)arg1,arg2); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = SWIG_FromCharPtr((const char *)result); + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_dirent_is_absolute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + svn_boolean_t result; + + if (!PyArg_ParseTuple(args,(char *)"s:svn_dirent_is_absolute",&arg1)) SWIG_fail; + { + svn_swig_py_release_py_lock(); + + result = (svn_boolean_t)svn_dirent_is_absolute((char const *)arg1); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = SWIG_From_long((long)(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_uri_is_root(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + apr_size_t arg2 ; + PyObject * obj1 = 0 ; + svn_boolean_t result; + + if (!PyArg_ParseTuple(args,(char *)"sO:svn_uri_is_root",&arg1,&obj1)) SWIG_fail; + { + arg2 = (apr_size_t)SWIG_As_unsigned_SS_long (obj1); + if (SWIG_arg_fail(svn_argnum_obj1)) { + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_boolean_t)svn_uri_is_root((char const *)arg1,arg2); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = SWIG_From_long((long)(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_dirent_canonicalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj1 = 0 ; + char *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg2 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"s|O:svn_dirent_canonicalize",&arg1,&obj1)) SWIG_fail; + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (char *)svn_dirent_canonicalize((char const *)arg1,arg2); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = SWIG_FromCharPtr((const char *)result); + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_dirent_canonicalize_safe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char **arg1 = (char **) 0 ; + char **arg2 = (char **) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + char *temp1 ; + char *temp2 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg5 = _global_pool; + arg1 = &temp1; + arg2 = &temp2; + if (!PyArg_ParseTuple(args,(char *)"s|OO:svn_dirent_canonicalize_safe",&arg3,&obj1,&obj2)) SWIG_fail; + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_dirent_canonicalize_safe((char const **)arg1,(char const **)arg2,(char const *)arg3,arg4,arg5); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + PyObject *s; + if (*arg1 == NULL) { + Py_INCREF(Py_None); + s = Py_None; + } + else { + s = PyString_FromString(*arg1); + if (s == NULL) + SWIG_fail; + } + resultobj = SWIG_Python_AppendOutput(resultobj, s); + } + { + PyObject *s; + if (*arg2 == NULL) { + Py_INCREF(Py_None); + s = Py_None; + } + else { + s = PyString_FromString(*arg2); + if (s == NULL) + SWIG_fail; + } + resultobj = SWIG_Python_AppendOutput(resultobj, s); + } + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_relpath_canonicalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj1 = 0 ; + char *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg2 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"s|O:svn_relpath_canonicalize",&arg1,&obj1)) SWIG_fail; + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (char *)svn_relpath_canonicalize((char const *)arg1,arg2); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = SWIG_FromCharPtr((const char *)result); + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_relpath_canonicalize_safe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char **arg1 = (char **) 0 ; + char **arg2 = (char **) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + char *temp1 ; + char *temp2 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg5 = _global_pool; + arg1 = &temp1; + arg2 = &temp2; + if (!PyArg_ParseTuple(args,(char *)"s|OO:svn_relpath_canonicalize_safe",&arg3,&obj1,&obj2)) SWIG_fail; + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_relpath_canonicalize_safe((char const **)arg1,(char const **)arg2,(char const *)arg3,arg4,arg5); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + PyObject *s; + if (*arg1 == NULL) { + Py_INCREF(Py_None); + s = Py_None; + } + else { + s = PyString_FromString(*arg1); + if (s == NULL) + SWIG_fail; + } + resultobj = SWIG_Python_AppendOutput(resultobj, s); + } + { + PyObject *s; + if (*arg2 == NULL) { + Py_INCREF(Py_None); + s = Py_None; + } + else { + s = PyString_FromString(*arg2); + if (s == NULL) + SWIG_fail; + } + resultobj = SWIG_Python_AppendOutput(resultobj, s); + } + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_uri_canonicalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj1 = 0 ; + char *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg2 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"s|O:svn_uri_canonicalize",&arg1,&obj1)) SWIG_fail; + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (char *)svn_uri_canonicalize((char const *)arg1,arg2); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = SWIG_FromCharPtr((const char *)result); + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_uri_canonicalize_safe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char **arg1 = (char **) 0 ; + char **arg2 = (char **) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + char *temp1 ; + char *temp2 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg5 = _global_pool; + arg1 = &temp1; + arg2 = &temp2; + if (!PyArg_ParseTuple(args,(char *)"s|OO:svn_uri_canonicalize_safe",&arg3,&obj1,&obj2)) SWIG_fail; + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_uri_canonicalize_safe((char const **)arg1,(char const **)arg2,(char const *)arg3,arg4,arg5); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + PyObject *s; + if (*arg1 == NULL) { + Py_INCREF(Py_None); + s = Py_None; + } + else { + s = PyString_FromString(*arg1); + if (s == NULL) + SWIG_fail; + } + resultobj = SWIG_Python_AppendOutput(resultobj, s); + } + { + PyObject *s; + if (*arg2 == NULL) { + Py_INCREF(Py_None); + s = Py_None; + } + else { + s = PyString_FromString(*arg2); + if (s == NULL) + SWIG_fail; + } + resultobj = SWIG_Python_AppendOutput(resultobj, s); + } + { + Py_XDECREF(_global_py_pool); + } { Py_XDECREF(_global_py_pool); } @@ -22503,225 +24009,6 @@ fail: { Py_XDECREF(_global_py_pool); } - return NULL; -} - - -SWIGINTERN PyObject *_wrap_svn_uri_dirname(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - char *arg1 = (char *) 0 ; - apr_pool_t *arg2 = (apr_pool_t *) 0 ; - apr_pool_t *_global_pool = NULL ; - PyObject *_global_py_pool = NULL ; - PyObject * obj1 = 0 ; - char *result = 0 ; - - if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, - &_global_py_pool, &_global_pool)) - SWIG_fail; - arg2 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"s|O:svn_uri_dirname",&arg1,&obj1)) SWIG_fail; - if (obj1) { - /* Verify that the user supplied a valid pool */ - if (obj1 != Py_None && obj1 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); - SWIG_arg_fail(svn_argnum_obj1); - SWIG_fail; - } - } - { - svn_swig_py_release_py_lock(); - - result = (char *)svn_uri_dirname((char const *)arg1,arg2); - - svn_swig_py_acquire_py_lock(); - - } - resultobj = SWIG_FromCharPtr((const char *)result); - { - Py_XDECREF(_global_py_pool); - } - return resultobj; -fail: - { - Py_XDECREF(_global_py_pool); - } - return NULL; -} - - -SWIGINTERN PyObject *_wrap_svn_dirent_is_absolute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - char *arg1 = (char *) 0 ; - svn_boolean_t result; - - if (!PyArg_ParseTuple(args,(char *)"s:svn_dirent_is_absolute",&arg1)) SWIG_fail; - { - svn_swig_py_release_py_lock(); - - result = (svn_boolean_t)svn_dirent_is_absolute((char const *)arg1); - - svn_swig_py_acquire_py_lock(); - - } - resultobj = SWIG_From_long((long)(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_svn_uri_is_root(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - char *arg1 = (char *) 0 ; - apr_size_t arg2 ; - PyObject * obj1 = 0 ; - svn_boolean_t result; - - if (!PyArg_ParseTuple(args,(char *)"sO:svn_uri_is_root",&arg1,&obj1)) SWIG_fail; - { - arg2 = (apr_size_t)SWIG_As_unsigned_SS_long (obj1); - if (SWIG_arg_fail(svn_argnum_obj1)) { - SWIG_fail; - } - } - { - svn_swig_py_release_py_lock(); - - result = (svn_boolean_t)svn_uri_is_root((char const *)arg1,arg2); - - svn_swig_py_acquire_py_lock(); - - } - resultobj = SWIG_From_long((long)(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_svn_dirent_canonicalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - char *arg1 = (char *) 0 ; - apr_pool_t *arg2 = (apr_pool_t *) 0 ; - apr_pool_t *_global_pool = NULL ; - PyObject *_global_py_pool = NULL ; - PyObject * obj1 = 0 ; - char *result = 0 ; - - if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, - &_global_py_pool, &_global_pool)) - SWIG_fail; - arg2 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"s|O:svn_dirent_canonicalize",&arg1,&obj1)) SWIG_fail; - if (obj1) { - /* Verify that the user supplied a valid pool */ - if (obj1 != Py_None && obj1 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); - SWIG_arg_fail(svn_argnum_obj1); - SWIG_fail; - } - } - { - svn_swig_py_release_py_lock(); - - result = (char *)svn_dirent_canonicalize((char const *)arg1,arg2); - - svn_swig_py_acquire_py_lock(); - - } - resultobj = SWIG_FromCharPtr((const char *)result); - { - Py_XDECREF(_global_py_pool); - } - return resultobj; -fail: - { - Py_XDECREF(_global_py_pool); - } - return NULL; -} - - -SWIGINTERN PyObject *_wrap_svn_relpath_canonicalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - char *arg1 = (char *) 0 ; - apr_pool_t *arg2 = (apr_pool_t *) 0 ; - apr_pool_t *_global_pool = NULL ; - PyObject *_global_py_pool = NULL ; - PyObject * obj1 = 0 ; - char *result = 0 ; - - if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, - &_global_py_pool, &_global_pool)) - SWIG_fail; - arg2 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"s|O:svn_relpath_canonicalize",&arg1,&obj1)) SWIG_fail; - if (obj1) { - /* Verify that the user supplied a valid pool */ - if (obj1 != Py_None && obj1 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); - SWIG_arg_fail(svn_argnum_obj1); - SWIG_fail; - } - } - { - svn_swig_py_release_py_lock(); - - result = (char *)svn_relpath_canonicalize((char const *)arg1,arg2); - - svn_swig_py_acquire_py_lock(); - - } - resultobj = SWIG_FromCharPtr((const char *)result); - { - Py_XDECREF(_global_py_pool); - } - return resultobj; -fail: - { - Py_XDECREF(_global_py_pool); - } - return NULL; -} - - -SWIGINTERN PyObject *_wrap_svn_uri_canonicalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - char *arg1 = (char *) 0 ; - apr_pool_t *arg2 = (apr_pool_t *) 0 ; - apr_pool_t *_global_pool = NULL ; - PyObject *_global_py_pool = NULL ; - PyObject * obj1 = 0 ; - char *result = 0 ; - - if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, - &_global_py_pool, &_global_pool)) - SWIG_fail; - arg2 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"s|O:svn_uri_canonicalize",&arg1,&obj1)) SWIG_fail; - if (obj1) { - /* Verify that the user supplied a valid pool */ - if (obj1 != Py_None && obj1 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); - SWIG_arg_fail(svn_argnum_obj1); - SWIG_fail; - } - } - { - svn_swig_py_release_py_lock(); - - result = (char *)svn_uri_canonicalize((char const *)arg1,arg2); - - svn_swig_py_acquire_py_lock(); - - } - resultobj = SWIG_FromCharPtr((const char *)result); - { - Py_XDECREF(_global_py_pool); - } - return resultobj; -fail: { Py_XDECREF(_global_py_pool); } @@ -35362,6 +36649,27 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_categorize_props", _wrap_svn_categorize_props, METH_VARARGS, (char *)"svn_categorize_props(apr_array_header_t proplist, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_prop_diffs", _wrap_svn_prop_diffs, METH_VARARGS, (char *)"svn_prop_diffs(apr_hash_t target_props, apr_hash_t source_props, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_prop_name_is_valid", _wrap_svn_prop_name_is_valid, METH_VARARGS, (char *)"svn_prop_name_is_valid(char const * prop_name) -> svn_boolean_t"}, + { (char *)"svn_opt_subcommand_desc3_t_name_set", _wrap_svn_opt_subcommand_desc3_t_name_set, METH_VARARGS, (char *)"svn_opt_subcommand_desc3_t_name_set(svn_opt_subcommand_desc3_t self, char const * name)"}, + { (char *)"svn_opt_subcommand_desc3_t_name_get", _wrap_svn_opt_subcommand_desc3_t_name_get, METH_VARARGS, (char *)"svn_opt_subcommand_desc3_t_name_get(svn_opt_subcommand_desc3_t self) -> char const *"}, + { (char *)"svn_opt_subcommand_desc3_t_cmd_func_set", _wrap_svn_opt_subcommand_desc3_t_cmd_func_set, METH_VARARGS, (char *)"svn_opt_subcommand_desc3_t_cmd_func_set(svn_opt_subcommand_desc3_t self, svn_opt_subcommand_t * cmd_func)"}, + { (char *)"svn_opt_subcommand_desc3_t_cmd_func_get", _wrap_svn_opt_subcommand_desc3_t_cmd_func_get, METH_VARARGS, (char *)"svn_opt_subcommand_desc3_t_cmd_func_get(svn_opt_subcommand_desc3_t self) -> svn_opt_subcommand_t *"}, + { (char *)"svn_opt_subcommand_desc3_t_aliases_set", _wrap_svn_opt_subcommand_desc3_t_aliases_set, METH_VARARGS, (char *)"svn_opt_subcommand_desc3_t_aliases_set(svn_opt_subcommand_desc3_t self, char const *[3] aliases)"}, + { (char *)"svn_opt_subcommand_desc3_t_aliases_get", _wrap_svn_opt_subcommand_desc3_t_aliases_get, METH_VARARGS, (char *)"svn_opt_subcommand_desc3_t_aliases_get(svn_opt_subcommand_desc3_t self) -> char const *[3]"}, + { (char *)"svn_opt_subcommand_desc3_t_help_set", _wrap_svn_opt_subcommand_desc3_t_help_set, METH_VARARGS, (char *)"svn_opt_subcommand_desc3_t_help_set(svn_opt_subcommand_desc3_t self, char const *[100] help)"}, + { (char *)"svn_opt_subcommand_desc3_t_help_get", _wrap_svn_opt_subcommand_desc3_t_help_get, METH_VARARGS, (char *)"svn_opt_subcommand_desc3_t_help_get(svn_opt_subcommand_desc3_t self) -> char const *[100]"}, + { (char *)"svn_opt_subcommand_desc3_t_valid_options_set", _wrap_svn_opt_subcommand_desc3_t_valid_options_set, METH_VARARGS, (char *)"svn_opt_subcommand_desc3_t_valid_options_set(svn_opt_subcommand_desc3_t self, int [50] valid_options)"}, + { (char *)"svn_opt_subcommand_desc3_t_valid_options_get", _wrap_svn_opt_subcommand_desc3_t_valid_options_get, METH_VARARGS, (char *)"svn_opt_subcommand_desc3_t_valid_options_get(svn_opt_subcommand_desc3_t self) -> int [50]"}, + { (char *)"svn_opt_subcommand_desc3_t_desc_overrides_get", _wrap_svn_opt_subcommand_desc3_t_desc_overrides_get, METH_VARARGS, (char *)"svn_opt_subcommand_desc3_t_desc_overrides_get(svn_opt_subcommand_desc3_t self) -> svn_opt_subcommand_desc3_t_desc_overrides"}, + { (char *)"new_svn_opt_subcommand_desc3_t", _wrap_new_svn_opt_subcommand_desc3_t, METH_VARARGS, (char *)"new_svn_opt_subcommand_desc3_t() -> svn_opt_subcommand_desc3_t"}, + { (char *)"delete_svn_opt_subcommand_desc3_t", _wrap_delete_svn_opt_subcommand_desc3_t, METH_VARARGS, (char *)"delete_svn_opt_subcommand_desc3_t(svn_opt_subcommand_desc3_t self)"}, + { (char *)"svn_opt_subcommand_desc3_t_swigregister", svn_opt_subcommand_desc3_t_swigregister, METH_VARARGS, NULL}, + { (char *)"svn_opt_subcommand_desc3_t_desc_overrides_optch_set", _wrap_svn_opt_subcommand_desc3_t_desc_overrides_optch_set, METH_VARARGS, (char *)"svn_opt_subcommand_desc3_t_desc_overrides_optch_set(svn_opt_subcommand_desc3_t_desc_overrides self, int optch)"}, + { (char *)"svn_opt_subcommand_desc3_t_desc_overrides_optch_get", _wrap_svn_opt_subcommand_desc3_t_desc_overrides_optch_get, METH_VARARGS, (char *)"svn_opt_subcommand_desc3_t_desc_overrides_optch_get(svn_opt_subcommand_desc3_t_desc_overrides self) -> int"}, + { (char *)"svn_opt_subcommand_desc3_t_desc_overrides_desc_set", _wrap_svn_opt_subcommand_desc3_t_desc_overrides_desc_set, METH_VARARGS, (char *)"svn_opt_subcommand_desc3_t_desc_overrides_desc_set(svn_opt_subcommand_desc3_t_desc_overrides self, char const * desc)"}, + { (char *)"svn_opt_subcommand_desc3_t_desc_overrides_desc_get", _wrap_svn_opt_subcommand_desc3_t_desc_overrides_desc_get, METH_VARARGS, (char *)"svn_opt_subcommand_desc3_t_desc_overrides_desc_get(svn_opt_subcommand_desc3_t_desc_overrides self) -> char const *"}, + { (char *)"new_svn_opt_subcommand_desc3_t_desc_overrides", _wrap_new_svn_opt_subcommand_desc3_t_desc_overrides, METH_VARARGS, (char *)"new_svn_opt_subcommand_desc3_t_desc_overrides() -> svn_opt_subcommand_desc3_t_desc_overrides"}, + { (char *)"delete_svn_opt_subcommand_desc3_t_desc_overrides", _wrap_delete_svn_opt_subcommand_desc3_t_desc_overrides, METH_VARARGS, (char *)"delete_svn_opt_subcommand_desc3_t_desc_overrides(svn_opt_subcommand_desc3_t_desc_overrides self)"}, + { (char *)"svn_opt_subcommand_desc3_t_desc_overrides_swigregister", svn_opt_subcommand_desc3_t_desc_overrides_swigregister, METH_VARARGS, NULL}, { (char *)"svn_opt_subcommand_desc2_t_name_set", _wrap_svn_opt_subcommand_desc2_t_name_set, METH_VARARGS, (char *)"svn_opt_subcommand_desc2_t_name_set(svn_opt_subcommand_desc2_t self, char const * name)"}, { (char *)"svn_opt_subcommand_desc2_t_name_get", _wrap_svn_opt_subcommand_desc2_t_name_get, METH_VARARGS, (char *)"svn_opt_subcommand_desc2_t_name_get(svn_opt_subcommand_desc2_t self) -> char const *"}, { (char *)"svn_opt_subcommand_desc2_t_cmd_func_set", _wrap_svn_opt_subcommand_desc2_t_cmd_func_set, METH_VARARGS, (char *)"svn_opt_subcommand_desc2_t_cmd_func_set(svn_opt_subcommand_desc2_t self, svn_opt_subcommand_t * cmd_func)"}, @@ -35396,15 +36704,20 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_svn_opt_subcommand_desc_t", _wrap_new_svn_opt_subcommand_desc_t, METH_VARARGS, (char *)"new_svn_opt_subcommand_desc_t() -> svn_opt_subcommand_desc_t"}, { (char *)"delete_svn_opt_subcommand_desc_t", _wrap_delete_svn_opt_subcommand_desc_t, METH_VARARGS, (char *)"delete_svn_opt_subcommand_desc_t(svn_opt_subcommand_desc_t self)"}, { (char *)"svn_opt_subcommand_desc_t_swigregister", svn_opt_subcommand_desc_t_swigregister, METH_VARARGS, NULL}, + { (char *)"svn_opt_get_canonical_subcommand3", _wrap_svn_opt_get_canonical_subcommand3, METH_VARARGS, (char *)"svn_opt_get_canonical_subcommand3(svn_opt_subcommand_desc3_t table, char const * cmd_name) -> svn_opt_subcommand_desc3_t"}, { (char *)"svn_opt_get_canonical_subcommand2", _wrap_svn_opt_get_canonical_subcommand2, METH_VARARGS, (char *)"svn_opt_get_canonical_subcommand2(svn_opt_subcommand_desc2_t table, char const * cmd_name) -> svn_opt_subcommand_desc2_t"}, { (char *)"svn_opt_get_canonical_subcommand", _wrap_svn_opt_get_canonical_subcommand, METH_VARARGS, (char *)"svn_opt_get_canonical_subcommand(svn_opt_subcommand_desc_t table, char const * cmd_name) -> svn_opt_subcommand_desc_t"}, + { (char *)"svn_opt_get_option_from_code3", _wrap_svn_opt_get_option_from_code3, METH_VARARGS, (char *)"svn_opt_get_option_from_code3(int code, apr_getopt_option_t const * option_table, svn_opt_subcommand_desc3_t command, apr_pool_t pool) -> apr_getopt_option_t const *"}, { (char *)"svn_opt_get_option_from_code2", _wrap_svn_opt_get_option_from_code2, METH_VARARGS, (char *)"svn_opt_get_option_from_code2(int code, apr_getopt_option_t const * option_table, svn_opt_subcommand_desc2_t command, apr_pool_t pool) -> apr_getopt_option_t const *"}, { (char *)"svn_opt_get_option_from_code", _wrap_svn_opt_get_option_from_code, METH_VARARGS, (char *)"svn_opt_get_option_from_code(int code, apr_getopt_option_t const * option_table) -> apr_getopt_option_t const *"}, + { (char *)"svn_opt_subcommand_takes_option4", _wrap_svn_opt_subcommand_takes_option4, METH_VARARGS, (char *)"svn_opt_subcommand_takes_option4(svn_opt_subcommand_desc3_t command, int option_code) -> svn_boolean_t"}, { (char *)"svn_opt_subcommand_takes_option3", _wrap_svn_opt_subcommand_takes_option3, METH_VARARGS, (char *)"svn_opt_subcommand_takes_option3(svn_opt_subcommand_desc2_t command, int option_code) -> svn_boolean_t"}, { (char *)"svn_opt_subcommand_takes_option2", _wrap_svn_opt_subcommand_takes_option2, METH_VARARGS, (char *)"svn_opt_subcommand_takes_option2(svn_opt_subcommand_desc2_t command, int option_code) -> svn_boolean_t"}, { (char *)"svn_opt_subcommand_takes_option", _wrap_svn_opt_subcommand_takes_option, METH_VARARGS, (char *)"svn_opt_subcommand_takes_option(svn_opt_subcommand_desc_t command, int option_code) -> svn_boolean_t"}, + { (char *)"svn_opt_print_generic_help3", _wrap_svn_opt_print_generic_help3, METH_VARARGS, (char *)"svn_opt_print_generic_help3(char const * header, svn_opt_subcommand_desc3_t cmd_table, apr_getopt_option_t const * opt_table, char const * footer, apr_pool_t pool, FILE * stream)"}, { (char *)"svn_opt_print_generic_help2", _wrap_svn_opt_print_generic_help2, METH_VARARGS, (char *)"svn_opt_print_generic_help2(char const * header, svn_opt_subcommand_desc2_t cmd_table, apr_getopt_option_t const * opt_table, char const * footer, apr_pool_t pool, FILE * stream)"}, { (char *)"svn_opt_format_option", _wrap_svn_opt_format_option, METH_VARARGS, (char *)"svn_opt_format_option(apr_getopt_option_t const * opt, svn_boolean_t doc, apr_pool_t pool)"}, + { (char *)"svn_opt_subcommand_help4", _wrap_svn_opt_subcommand_help4, METH_VARARGS, (char *)"svn_opt_subcommand_help4(char const * subcommand, svn_opt_subcommand_desc3_t table, apr_getopt_option_t const * options_table, apr_pool_t pool)"}, { (char *)"svn_opt_subcommand_help3", _wrap_svn_opt_subcommand_help3, METH_VARARGS, (char *)"svn_opt_subcommand_help3(char const * subcommand, svn_opt_subcommand_desc2_t table, apr_getopt_option_t const * options_table, apr_pool_t pool)"}, { (char *)"svn_opt_subcommand_help2", _wrap_svn_opt_subcommand_help2, METH_VARARGS, (char *)"svn_opt_subcommand_help2(char const * subcommand, svn_opt_subcommand_desc2_t table, apr_getopt_option_t const * options_table, apr_pool_t pool)"}, { (char *)"svn_opt_subcommand_help", _wrap_svn_opt_subcommand_help, METH_VARARGS, (char *)"svn_opt_subcommand_help(char const * subcommand, svn_opt_subcommand_desc_t table, apr_getopt_option_t const * options_table, apr_pool_t pool)"}, @@ -35439,6 +36752,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_opt_parse_num_args", _wrap_svn_opt_parse_num_args, METH_VARARGS, (char *)"svn_opt_parse_num_args(apr_getopt_t * os, int num_args, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_opt_parse_all_args", _wrap_svn_opt_parse_all_args, METH_VARARGS, (char *)"svn_opt_parse_all_args(apr_getopt_t * os, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_opt_parse_path", _wrap_svn_opt_parse_path, METH_VARARGS, (char *)"svn_opt_parse_path(svn_opt_revision_t rev, char const * path, apr_pool_t pool) -> svn_error_t"}, + { (char *)"svn_opt_print_help5", _wrap_svn_opt_print_help5, METH_VARARGS, (char *)"svn_opt_print_help5(apr_getopt_t * os, char const * pgm_name, svn_boolean_t print_version, svn_boolean_t quiet, svn_boolean_t verbose, char const * version_footer, char const * header, svn_opt_subcommand_desc3_t cmd_table, apr_getopt_option_t const * option_table, char const * footer, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_opt_print_help4", _wrap_svn_opt_print_help4, METH_VARARGS, (char *)"svn_opt_print_help4(apr_getopt_t * os, char const * pgm_name, svn_boolean_t print_version, svn_boolean_t quiet, svn_boolean_t verbose, char const * version_footer, char const * header, svn_opt_subcommand_desc2_t cmd_table, apr_getopt_option_t const * option_table, char const * footer, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_opt_print_help3", _wrap_svn_opt_print_help3, METH_VARARGS, (char *)"svn_opt_print_help3(apr_getopt_t * os, char const * pgm_name, svn_boolean_t print_version, svn_boolean_t quiet, char const * version_footer, char const * header, svn_opt_subcommand_desc2_t cmd_table, apr_getopt_option_t const * option_table, char const * footer, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_opt_print_help2", _wrap_svn_opt_print_help2, METH_VARARGS, (char *)"svn_opt_print_help2(apr_getopt_t * os, char const * pgm_name, svn_boolean_t print_version, svn_boolean_t quiet, char const * version_footer, char const * header, svn_opt_subcommand_desc2_t cmd_table, apr_getopt_option_t const * option_table, char const * footer, apr_pool_t pool) -> svn_error_t"}, @@ -35638,8 +36952,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_path_resolve_repos_relative_url", _wrap_svn_path_resolve_repos_relative_url, METH_VARARGS, (char *)"svn_path_resolve_repos_relative_url(char const * relative_url, char const * repos_root_url, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_path_illegal_path_escape", _wrap_svn_path_illegal_path_escape, METH_VARARGS, (char *)"svn_path_illegal_path_escape(char const * path, apr_pool_t pool) -> char const *"}, { (char *)"svn_dirent_internal_style", _wrap_svn_dirent_internal_style, METH_VARARGS, (char *)"svn_dirent_internal_style(char const * dirent, apr_pool_t result_pool) -> char const *"}, + { (char *)"svn_dirent_internal_style_safe", _wrap_svn_dirent_internal_style_safe, METH_VARARGS, (char *)"svn_dirent_internal_style_safe(char const * dirent, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_dirent_local_style", _wrap_svn_dirent_local_style, METH_VARARGS, (char *)"svn_dirent_local_style(char const * dirent, apr_pool_t result_pool) -> char const *"}, - { (char *)"svn_relpath__internal_style", _wrap_svn_relpath__internal_style, METH_VARARGS, (char *)"svn_relpath__internal_style(char const * relpath, apr_pool_t result_pool) -> char const *"}, { (char *)"svn_dirent_join", _wrap_svn_dirent_join, METH_VARARGS, (char *)"svn_dirent_join(char const * base, char const * component, apr_pool_t result_pool) -> char *"}, { (char *)"svn_relpath_join", _wrap_svn_relpath_join, METH_VARARGS, (char *)"svn_relpath_join(char const * base, char const * component, apr_pool_t result_pool) -> char *"}, { (char *)"svn_dirent_basename", _wrap_svn_dirent_basename, METH_VARARGS, (char *)"svn_dirent_basename(char const * dirent, apr_pool_t result_pool) -> char const *"}, @@ -35655,8 +36969,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_dirent_is_absolute", _wrap_svn_dirent_is_absolute, METH_VARARGS, (char *)"svn_dirent_is_absolute(char const * dirent) -> svn_boolean_t"}, { (char *)"svn_uri_is_root", _wrap_svn_uri_is_root, METH_VARARGS, (char *)"svn_uri_is_root(char const * uri, apr_size_t len) -> svn_boolean_t"}, { (char *)"svn_dirent_canonicalize", _wrap_svn_dirent_canonicalize, METH_VARARGS, (char *)"svn_dirent_canonicalize(char const * dirent, apr_pool_t result_pool) -> char const *"}, + { (char *)"svn_dirent_canonicalize_safe", _wrap_svn_dirent_canonicalize_safe, METH_VARARGS, (char *)"svn_dirent_canonicalize_safe(char const * dirent, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_relpath_canonicalize", _wrap_svn_relpath_canonicalize, METH_VARARGS, (char *)"svn_relpath_canonicalize(char const * relpath, apr_pool_t result_pool) -> char const *"}, + { (char *)"svn_relpath_canonicalize_safe", _wrap_svn_relpath_canonicalize_safe, METH_VARARGS, (char *)"svn_relpath_canonicalize_safe(char const * relpath, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_uri_canonicalize", _wrap_svn_uri_canonicalize, METH_VARARGS, (char *)"svn_uri_canonicalize(char const * uri, apr_pool_t result_pool) -> char const *"}, + { (char *)"svn_uri_canonicalize_safe", _wrap_svn_uri_canonicalize_safe, METH_VARARGS, (char *)"svn_uri_canonicalize_safe(char const * uri, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_dirent_is_canonical", _wrap_svn_dirent_is_canonical, METH_VARARGS, (char *)"svn_dirent_is_canonical(char const * dirent, apr_pool_t scratch_pool) -> svn_boolean_t"}, { (char *)"svn_relpath_is_canonical", _wrap_svn_relpath_is_canonical, METH_VARARGS, (char *)"svn_relpath_is_canonical(char const * relpath) -> svn_boolean_t"}, { (char *)"svn_uri_is_canonical", _wrap_svn_uri_is_canonical, METH_VARARGS, (char *)"svn_uri_is_canonical(char const * uri, apr_pool_t scratch_pool) -> svn_boolean_t"}, @@ -35905,39 +37222,39 @@ static swig_type_info _swigt__p_apr_proc_t = {"_p_apr_proc_t", "apr_proc_t *", 0 static swig_type_info _swigt__p_apr_size_t = {"_p_apr_size_t", "apr_size_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_uint64_t = {"_p_apr_uint64_t", "apr_uint64_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_auth_gnome_keyring_unlock_prompt_func_t|struct svn_error_t *(*)(char **,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_auth_gnome_keyring_unlock_prompt_func_t|svn_error_t *(*)(char **,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void = {"_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void", "svn_auth_simple_provider_func_t|svn_auth_ssl_client_cert_pw_provider_func_t|void (*)(struct svn_auth_provider_object_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_simple_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_pw_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_username_prompt_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_stream_t **,void *,apr_pool_t *,apr_pool_t *)|svn_stream_lazyopen_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void **,void **,void *,apr_hash_t *,char const *,apr_pool_t *)|svn_error_t *(*)(void **,void **,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void **,void *,void *,apr_hash_t *,char const *,apr_pool_t *)|struct svn_error_t *(*)(void **,void *,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_simple_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_pw_prompt_func_t|svn_error_t *(*)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_client_cert_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_username_prompt_func_t|svn_error_t *(*)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_stream_lazyopen_func_t|svn_error_t *(*)(svn_stream_t **,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void **,void **,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void **,void *,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__char_p_void__int = {"_p_f_p_q_const__char_p_q_const__char_p_void__int", "svn_config_enumerator_t|int (*)(char const *,char const *,void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int = {"_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int", "svn_config_enumerator2_t|int (*)(char const *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_q_const__char_p_void__int = {"_p_f_p_q_const__char_p_void__int", "svn_config_section_enumerator_t|int (*)(char const *,void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__int = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__int", "int (*)(char const *,void *,apr_pool_t *)|svn_config_section_enumerator2_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int = {"_p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int", "svn_boolean_t (*)(svn_version_t const *,svn_version_t const *)|int (*)(struct svn_version_t const *,struct svn_version_t const *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_boolean_t *,char const *,void *,apr_pool_t *)|svn_auth_plaintext_prompt_func_t|svn_auth_plaintext_passphrase_prompt_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_boolean_t *,void *,char const *,char const *,apr_hash_t *,apr_pool_t *)|svn_config_auth_walk_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,void *,void *,apr_hash_t *,char const *,apr_pool_t *)|struct svn_error_t *(*)(svn_boolean_t *,void *,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_close_fn_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_size_t__p_svn_error_t = {"_p_f_p_void_apr_size_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_size_t)|svn_stream_skip_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_char_p_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char *,apr_size_t *)|svn_read_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_stream_mark_t **,apr_pool_t *)|svn_stream_mark_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_stringbuf_t **,char const *,svn_boolean_t *,apr_pool_t *)|svn_stream_readline_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_size_t *)|svn_write_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_finfo_t const *,apr_pool_t *)|svn_io_walk_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t = {"_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t", "svn_stream_seek_fn_t|struct svn_error_t *(*)(void *,svn_stream_mark_t const *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t__p_svn_error_t", "svn_stream_data_available_fn_t|struct svn_error_t *(*)(void *,svn_boolean_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)|svn_commit_callback2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,char const *,void *,apr_pool_t *)|svn_auth_plaintext_prompt_func_t|svn_auth_plaintext_passphrase_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,void *,char const *,char const *,apr_hash_t *,apr_pool_t *)|svn_config_auth_walk_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,void *,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_close_fn_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_size_t__p_svn_error_t = {"_p_f_p_void_apr_size_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_size_t)|svn_stream_skip_fn_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_char_p_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t", "svn_read_fn_t|svn_error_t *(*)(void *,char *,apr_size_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t", "svn_stream_mark_fn_t|svn_error_t *(*)(void *,svn_stream_mark_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_stringbuf_t **,char const *,svn_boolean_t *,apr_pool_t *)|svn_stream_readline_fn_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_size_t *)|svn_write_fn_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_finfo_t const *,apr_pool_t *)|svn_io_walk_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t = {"_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_stream_mark_t const *)|svn_stream_seek_fn_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t__p_svn_error_t", "svn_stream_data_available_fn_t|svn_error_t *(*)(void *,svn_boolean_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_void__p_svn_version_t = {"_p_f_void__p_svn_version_t", "svn_version_func_t|struct svn_version_t *(*)(void)|svn_version_t *(*)(void)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; @@ -35945,34 +37262,34 @@ static swig_type_info _swigt__p_p_apr_array_header_t = {"_p_p_apr_array_header_t static swig_type_info _swigt__p_p_apr_file_t = {"_p_p_apr_file_t", "apr_file_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **|svn_mergeinfo_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(char **,char const *,void *,apr_pool_t *)|svn_auth_gnome_keyring_unlock_prompt_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_auth_gnome_keyring_unlock_prompt_func_t *|svn_error_t *(**)(char **,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void = {"_p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void", "void (**)(struct svn_auth_provider_object_t **,apr_pool_t *)|svn_auth_simple_provider_func_t *|svn_auth_ssl_client_cert_pw_provider_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_simple_prompt_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_client_cert_pw_prompt_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_client_cert_prompt_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_username_prompt_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_stream_t **,void *,apr_pool_t *,apr_pool_t *)|svn_stream_lazyopen_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_simple_prompt_func_t *|svn_error_t *(**)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_client_cert_pw_prompt_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_client_cert_prompt_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_username_prompt_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_stream_lazyopen_func_t *|svn_error_t *(**)(svn_stream_t **,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_q_const__char_p_q_const__char_p_void__int = {"_p_p_f_p_q_const__char_p_q_const__char_p_void__int", "svn_config_enumerator_t *|int (**)(char const *,char const *,void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int = {"_p_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int", "int (**)(char const *,char const *,void *,apr_pool_t *)|svn_config_enumerator2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_q_const__char_p_void__int = {"_p_p_f_p_q_const__char_p_void__int", "svn_config_section_enumerator_t *|int (**)(char const *,void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_q_const__char_p_void_p_apr_pool_t__int = {"_p_p_f_p_q_const__char_p_void_p_apr_pool_t__int", "int (**)(char const *,void *,apr_pool_t *)|svn_config_section_enumerator2_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_commit_info_t const *,void *,apr_pool_t *)|svn_commit_callback2_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_boolean_t *,char const *,void *,apr_pool_t *)|svn_auth_plaintext_prompt_func_t *|svn_auth_plaintext_passphrase_prompt_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_boolean_t *,void *,char const *,char const *,apr_hash_t *,apr_pool_t *)|svn_config_auth_walk_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void__p_svn_error_t = {"_p_p_f_p_void__p_svn_error_t", "svn_cancel_func_t *|svn_close_fn_t *|struct svn_error_t *(**)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_apr_size_t__p_svn_error_t = {"_p_p_f_p_void_apr_size_t__p_svn_error_t", "struct svn_error_t *(**)(void *,apr_size_t)|svn_stream_skip_fn_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t = {"_p_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t", "svn_read_fn_t *|struct svn_error_t *(**)(void *,char *,apr_size_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t", "svn_stream_mark_fn_t *|struct svn_error_t *(**)(void *,svn_stream_mark_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_stream_readline_fn_t *|struct svn_error_t *(**)(void *,svn_stringbuf_t **,char const *,svn_boolean_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,apr_size_t *)|svn_write_fn_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,apr_finfo_t const *,apr_pool_t *)|svn_io_walk_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t", "svn_stream_seek_fn_t *|struct svn_error_t *(**)(void *,svn_stream_mark_t const *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_svn_boolean_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_boolean_t__p_svn_error_t", "svn_stream_data_available_fn_t *|struct svn_error_t *(**)(void *,svn_boolean_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(**)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(svn_commit_info_t const *,void *,apr_pool_t *)|svn_commit_callback2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(svn_boolean_t *,char const *,void *,apr_pool_t *)|svn_auth_plaintext_prompt_func_t *|svn_auth_plaintext_passphrase_prompt_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(svn_boolean_t *,void *,char const *,char const *,apr_hash_t *,apr_pool_t *)|svn_config_auth_walk_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void__p_svn_error_t = {"_p_p_f_p_void__p_svn_error_t", "svn_cancel_func_t *|svn_close_fn_t *|svn_error_t *(**)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_apr_size_t__p_svn_error_t = {"_p_p_f_p_void_apr_size_t__p_svn_error_t", "svn_error_t *(**)(void *,apr_size_t)|svn_stream_skip_fn_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_log_message_receiver_t *|svn_error_t *(**)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t = {"_p_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t", "svn_error_t *(**)(void *,char *,apr_size_t *)|svn_read_fn_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t", "svn_stream_mark_fn_t *|svn_error_t *(**)(void *,svn_stream_mark_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,svn_stringbuf_t **,char const *,svn_boolean_t *,apr_pool_t *)|svn_stream_readline_fn_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,apr_size_t *)|svn_write_fn_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,apr_finfo_t const *,apr_pool_t *)|svn_io_walk_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t", "svn_error_t *(**)(void *,svn_stream_mark_t const *)|svn_stream_seek_fn_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_svn_boolean_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_boolean_t__p_svn_error_t", "svn_stream_data_available_fn_t *|svn_error_t *(**)(void *,svn_boolean_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "svn_commit_callback_t *|svn_error_t *(**)(svn_revnum_t,char const *,char const *,void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_void__p_svn_version_t = {"_p_p_f_void__p_svn_version_t", "struct svn_version_t *(**)(void)|svn_version_func_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_auth_baton_t = {"_p_p_svn_auth_baton_t", "struct svn_auth_baton_t **|svn_auth_baton_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_auth_cred_simple_t = {"_p_p_svn_auth_cred_simple_t", "struct svn_auth_cred_simple_t **|svn_auth_cred_simple_t **", 0, 0, (void*)0, 0}; @@ -36028,6 +37345,8 @@ static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", " static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t_desc_overrides = {"_p_svn_opt_subcommand_desc2_t_desc_overrides", "svn_opt_subcommand_desc2_t_desc_overrides *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t_desc_overrides = {"_p_svn_opt_subcommand_desc3_t_desc_overrides", "svn_opt_subcommand_desc3_t_desc_overrides *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_prop_inherited_item_t = {"_p_svn_prop_inherited_item_t", "struct svn_prop_inherited_item_t *|svn_prop_inherited_item_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_prop_kind = {"_p_svn_prop_kind", "svn_prop_kind_t *|enum svn_prop_kind *", 0, 0, (void*)0, 0}; @@ -36188,6 +37507,8 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, &_swigt__p_svn_opt_subcommand_desc2_t_desc_overrides, + &_swigt__p_svn_opt_subcommand_desc3_t, + &_swigt__p_svn_opt_subcommand_desc3_t_desc_overrides, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_prop_inherited_item_t, &_swigt__p_svn_prop_kind, @@ -36348,6 +37669,8 @@ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_re static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t_desc_overrides[] = { {&_swigt__p_svn_opt_subcommand_desc2_t_desc_overrides, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t_desc_overrides[] = { {&_swigt__p_svn_opt_subcommand_desc3_t_desc_overrides, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_prop_inherited_item_t[] = { {&_swigt__p_svn_prop_inherited_item_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_prop_kind[] = { {&_swigt__p_svn_prop_kind, 0, 0, 0},{0, 0, 0, 0}}; @@ -36508,6 +37831,8 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, _swigc__p_svn_opt_subcommand_desc2_t_desc_overrides, + _swigc__p_svn_opt_subcommand_desc3_t, + _swigc__p_svn_opt_subcommand_desc3_t_desc_overrides, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_prop_inherited_item_t, _swigc__p_svn_prop_kind, @@ -37375,6 +38700,7 @@ SWIG_init(void) { SWIG_Python_SetConstant(d, "SVN_ERR_FS_CORRUPT_REVPROP_MANIFEST",SWIG_From_long((long)(SVN_ERR_FS_CORRUPT_REVPROP_MANIFEST))); SWIG_Python_SetConstant(d, "SVN_ERR_FS_CORRUPT_PROPLIST",SWIG_From_long((long)(SVN_ERR_FS_CORRUPT_PROPLIST))); SWIG_Python_SetConstant(d, "SVN_ERR_FS_AMBIGUOUS_CHECKSUM_REP",SWIG_From_long((long)(SVN_ERR_FS_AMBIGUOUS_CHECKSUM_REP))); + SWIG_Python_SetConstant(d, "SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE",SWIG_From_long((long)(SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE))); SWIG_Python_SetConstant(d, "SVN_ERR_REPOS_LOCKED",SWIG_From_long((long)(SVN_ERR_REPOS_LOCKED))); SWIG_Python_SetConstant(d, "SVN_ERR_REPOS_HOOK_FAILURE",SWIG_From_long((long)(SVN_ERR_REPOS_HOOK_FAILURE))); SWIG_Python_SetConstant(d, "SVN_ERR_REPOS_BAD_ARGS",SWIG_From_long((long)(SVN_ERR_REPOS_BAD_ARGS))); @@ -37501,6 +38827,7 @@ SWIG_init(void) { SWIG_Python_SetConstant(d, "SVN_ERR_SQLITE_ROLLBACK_FAILED",SWIG_From_long((long)(SVN_ERR_SQLITE_ROLLBACK_FAILED))); SWIG_Python_SetConstant(d, "SVN_ERR_LZ4_COMPRESSION_FAILED",SWIG_From_long((long)(SVN_ERR_LZ4_COMPRESSION_FAILED))); SWIG_Python_SetConstant(d, "SVN_ERR_LZ4_DECOMPRESSION_FAILED",SWIG_From_long((long)(SVN_ERR_LZ4_DECOMPRESSION_FAILED))); + SWIG_Python_SetConstant(d, "SVN_ERR_CANONICALIZATION_FAILED",SWIG_From_long((long)(SVN_ERR_CANONICALIZATION_FAILED))); SWIG_Python_SetConstant(d, "SVN_ERR_CL_ARG_PARSING_ERROR",SWIG_From_long((long)(SVN_ERR_CL_ARG_PARSING_ERROR))); SWIG_Python_SetConstant(d, "SVN_ERR_CL_INSUFFICIENT_ARGS",SWIG_From_long((long)(SVN_ERR_CL_INSUFFICIENT_ARGS))); SWIG_Python_SetConstant(d, "SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS",SWIG_From_long((long)(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS))); @@ -37565,9 +38892,6 @@ SWIG_init(void) { SWIG_Python_SetConstant(d, "SVN_ERR_X509_CERT_SIG_MISMATCH",SWIG_From_long((long)(SVN_ERR_X509_CERT_SIG_MISMATCH))); SWIG_Python_SetConstant(d, "SVN_ERR_X509_CERT_VERIFY_FAILED",SWIG_From_long((long)(SVN_ERR_X509_CERT_VERIFY_FAILED))); SWIG_Python_SetConstant(d, "SVN_ERR_LAST",SWIG_From_long((long)(SVN_ERR_LAST))); - SWIG_Python_SetConstant(d, "SVN_UNALIGNED_ACCESS_IS_OK",SWIG_From_long((long)(0))); - SWIG_Python_SetConstant(d, "TRUE",SWIG_From_long((long)(1))); - SWIG_Python_SetConstant(d, "FALSE",SWIG_From_long((long)(0))); SWIG_Python_SetConstant(d, "svn_node_none",SWIG_From_long((long)(svn_node_none))); SWIG_Python_SetConstant(d, "svn_node_file",SWIG_From_long((long)(svn_node_file))); SWIG_Python_SetConstant(d, "svn_node_dir",SWIG_From_long((long)(svn_node_dir))); @@ -37576,15 +38900,18 @@ SWIG_init(void) { SWIG_Python_SetConstant(d, "svn_tristate_false",SWIG_From_long((long)(svn_tristate_false))); SWIG_Python_SetConstant(d, "svn_tristate_true",SWIG_From_long((long)(svn_tristate_true))); SWIG_Python_SetConstant(d, "svn_tristate_unknown",SWIG_From_long((long)(svn_tristate_unknown))); - SWIG_Python_SetConstant(d, "SVN_REVNUM_T_FMT",SWIG_FromCharPtr("ld")); - SWIG_Python_SetConstant(d, "svn_nonrecursive",SWIG_From_long((long)(svn_nonrecursive))); - SWIG_Python_SetConstant(d, "svn_recursive",SWIG_From_long((long)(svn_recursive))); SWIG_Python_SetConstant(d, "svn_depth_unknown",SWIG_From_long((long)(svn_depth_unknown))); SWIG_Python_SetConstant(d, "svn_depth_exclude",SWIG_From_long((long)(svn_depth_exclude))); SWIG_Python_SetConstant(d, "svn_depth_empty",SWIG_From_long((long)(svn_depth_empty))); SWIG_Python_SetConstant(d, "svn_depth_files",SWIG_From_long((long)(svn_depth_files))); SWIG_Python_SetConstant(d, "svn_depth_immediates",SWIG_From_long((long)(svn_depth_immediates))); SWIG_Python_SetConstant(d, "svn_depth_infinity",SWIG_From_long((long)(svn_depth_infinity))); + SWIG_Python_SetConstant(d, "SVN_UNALIGNED_ACCESS_IS_OK",SWIG_From_long((long)(0))); + SWIG_Python_SetConstant(d, "TRUE",SWIG_From_long((long)(1))); + SWIG_Python_SetConstant(d, "FALSE",SWIG_From_long((long)(0))); + SWIG_Python_SetConstant(d, "SVN_REVNUM_T_FMT",SWIG_FromCharPtr("ld")); + SWIG_Python_SetConstant(d, "svn_nonrecursive",SWIG_From_long((long)(svn_nonrecursive))); + SWIG_Python_SetConstant(d, "svn_recursive",SWIG_From_long((long)(svn_recursive))); SWIG_Python_SetConstant(d, "SVN_DIRENT_KIND",SWIG_From_long((long)(0x00001))); SWIG_Python_SetConstant(d, "SVN_DIRENT_SIZE",SWIG_From_long((long)(0x00002))); SWIG_Python_SetConstant(d, "SVN_DIRENT_HAS_PROPS",SWIG_From_long((long)(0x00004))); @@ -37607,16 +38934,16 @@ SWIG_init(void) { SWIG_Python_SetConstant(d, "SVN__STREAM_CHUNK_SIZE",SWIG_From_long((long)(16384))); SWIG_Python_SetConstant(d, "SVN_ALLOCATOR_RECOMMENDED_MAX_FREE",SWIG_From_long((long)((4096*1024)))); SWIG_Python_SetConstant(d, "SVN_VER_MAJOR",SWIG_From_long((long)(1))); - SWIG_Python_SetConstant(d, "SVN_VER_MINOR",SWIG_From_long((long)(10))); - SWIG_Python_SetConstant(d, "SVN_VER_PATCH",SWIG_From_long((long)(6))); - SWIG_Python_SetConstant(d, "SVN_VER_MICRO",SWIG_From_long((long)(6))); + SWIG_Python_SetConstant(d, "SVN_VER_MINOR",SWIG_From_long((long)(13))); + SWIG_Python_SetConstant(d, "SVN_VER_PATCH",SWIG_From_long((long)(0))); + SWIG_Python_SetConstant(d, "SVN_VER_MICRO",SWIG_From_long((long)(0))); SWIG_Python_SetConstant(d, "SVN_VER_LIBRARY",SWIG_From_long((long)(1))); - SWIG_Python_SetConstant(d, "SVN_VER_TAG",SWIG_FromCharPtr(" (r1863367)")); + SWIG_Python_SetConstant(d, "SVN_VER_TAG",SWIG_FromCharPtr(" (r1867053)")); SWIG_Python_SetConstant(d, "SVN_VER_NUMTAG",SWIG_FromCharPtr("")); - SWIG_Python_SetConstant(d, "SVN_VER_REVISION",SWIG_From_long((long)(1863367))); - SWIG_Python_SetConstant(d, "SVN_VER_NUM",SWIG_FromCharPtr("1.10.6")); - SWIG_Python_SetConstant(d, "SVN_VER_NUMBER",SWIG_FromCharPtr("1.10.6")); - SWIG_Python_SetConstant(d, "SVN_VERSION",SWIG_FromCharPtr("1.10.6 (r1863367)")); + SWIG_Python_SetConstant(d, "SVN_VER_REVISION",SWIG_From_long((long)(1867053))); + SWIG_Python_SetConstant(d, "SVN_VER_NUM",SWIG_FromCharPtr("1.13.0")); + SWIG_Python_SetConstant(d, "SVN_VER_NUMBER",SWIG_FromCharPtr("1.13.0")); + SWIG_Python_SetConstant(d, "SVN_VERSION",SWIG_FromCharPtr("1.13.0 (r1867053)")); SWIG_Python_SetConstant(d, "svn_prop_entry_kind",SWIG_From_long((long)(svn_prop_entry_kind))); SWIG_Python_SetConstant(d, "svn_prop_wc_kind",SWIG_From_long((long)(svn_prop_wc_kind))); SWIG_Python_SetConstant(d, "svn_prop_regular_kind",SWIG_From_long((long)(svn_prop_regular_kind))); @@ -37663,9 +38990,6 @@ SWIG_init(void) { SWIG_Python_SetConstant(d, "SVN_PROP_TXN_CLIENT_COMPAT_VERSION",SWIG_FromCharPtr("svn:txn-client-compat-version")); SWIG_Python_SetConstant(d, "SVN_PROP_TXN_USER_AGENT",SWIG_FromCharPtr("svn:txn-user-agent")); SWIG_Python_SetConstant(d, "SVN_PROP_REVISION_PREFIX",SWIG_FromCharPtr("svn:revision-")); - SWIG_Python_SetConstant(d, "SVN_OPT_MAX_ALIASES",SWIG_From_long((long)(3))); - SWIG_Python_SetConstant(d, "SVN_OPT_MAX_OPTIONS",SWIG_From_long((long)(50))); - SWIG_Python_SetConstant(d, "SVN_OPT_FIRST_LONGOPT_ID",SWIG_From_long((long)(256))); SWIG_Python_SetConstant(d, "svn_opt_revision_unspecified",SWIG_From_long((long)(svn_opt_revision_unspecified))); SWIG_Python_SetConstant(d, "svn_opt_revision_number",SWIG_From_long((long)(svn_opt_revision_number))); SWIG_Python_SetConstant(d, "svn_opt_revision_date",SWIG_From_long((long)(svn_opt_revision_date))); @@ -37674,6 +38998,10 @@ SWIG_init(void) { SWIG_Python_SetConstant(d, "svn_opt_revision_base",SWIG_From_long((long)(svn_opt_revision_base))); SWIG_Python_SetConstant(d, "svn_opt_revision_working",SWIG_From_long((long)(svn_opt_revision_working))); SWIG_Python_SetConstant(d, "svn_opt_revision_head",SWIG_From_long((long)(svn_opt_revision_head))); + SWIG_Python_SetConstant(d, "SVN_OPT_MAX_ALIASES",SWIG_From_long((long)(3))); + SWIG_Python_SetConstant(d, "SVN_OPT_MAX_OPTIONS",SWIG_From_long((long)(50))); + SWIG_Python_SetConstant(d, "SVN_OPT_MAX_PARAGRAPHS",SWIG_From_long((long)(100))); + SWIG_Python_SetConstant(d, "SVN_OPT_FIRST_LONGOPT_ID",SWIG_From_long((long)(256))); SWIG_Python_SetConstant(d, "SVN_AUTH_CRED_SIMPLE",SWIG_FromCharPtr("svn.simple")); SWIG_Python_SetConstant(d, "SVN_AUTH_CRED_USERNAME",SWIG_FromCharPtr("svn.username")); SWIG_Python_SetConstant(d, "SVN_AUTH_CRED_SSL_CLIENT_CERT",SWIG_FromCharPtr("svn.ssl.client-cert")); diff --git a/subversion/bindings/swig/python/core.py b/subversion/bindings/swig/python/core.py index f51e034..8c3e52a 100644 --- a/subversion/bindings/swig/python/core.py +++ b/subversion/bindings/swig/python/core.py @@ -296,6 +296,7 @@ SVN_ERR_FS_INVALID_GENERATION = _core.SVN_ERR_FS_INVALID_GENERATION SVN_ERR_FS_CORRUPT_REVPROP_MANIFEST = _core.SVN_ERR_FS_CORRUPT_REVPROP_MANIFEST SVN_ERR_FS_CORRUPT_PROPLIST = _core.SVN_ERR_FS_CORRUPT_PROPLIST SVN_ERR_FS_AMBIGUOUS_CHECKSUM_REP = _core.SVN_ERR_FS_AMBIGUOUS_CHECKSUM_REP +SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE = _core.SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE SVN_ERR_REPOS_LOCKED = _core.SVN_ERR_REPOS_LOCKED SVN_ERR_REPOS_HOOK_FAILURE = _core.SVN_ERR_REPOS_HOOK_FAILURE SVN_ERR_REPOS_BAD_ARGS = _core.SVN_ERR_REPOS_BAD_ARGS @@ -422,6 +423,7 @@ SVN_ERR_INVALID_INPUT = _core.SVN_ERR_INVALID_INPUT SVN_ERR_SQLITE_ROLLBACK_FAILED = _core.SVN_ERR_SQLITE_ROLLBACK_FAILED SVN_ERR_LZ4_COMPRESSION_FAILED = _core.SVN_ERR_LZ4_COMPRESSION_FAILED SVN_ERR_LZ4_DECOMPRESSION_FAILED = _core.SVN_ERR_LZ4_DECOMPRESSION_FAILED +SVN_ERR_CANONICALIZATION_FAILED = _core.SVN_ERR_CANONICALIZATION_FAILED SVN_ERR_CL_ARG_PARSING_ERROR = _core.SVN_ERR_CL_ARG_PARSING_ERROR SVN_ERR_CL_INSUFFICIENT_ARGS = _core.SVN_ERR_CL_INSUFFICIENT_ARGS SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS = _core.SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS @@ -506,6 +508,20 @@ def svn_parse_date(*args): def svn_sleep_for_timestamps(): """svn_sleep_for_timestamps()""" return _core.svn_sleep_for_timestamps() +svn_node_none = _core.svn_node_none +svn_node_file = _core.svn_node_file +svn_node_dir = _core.svn_node_dir +svn_node_unknown = _core.svn_node_unknown +svn_node_symlink = _core.svn_node_symlink +svn_tristate_false = _core.svn_tristate_false +svn_tristate_true = _core.svn_tristate_true +svn_tristate_unknown = _core.svn_tristate_unknown +svn_depth_unknown = _core.svn_depth_unknown +svn_depth_exclude = _core.svn_depth_exclude +svn_depth_empty = _core.svn_depth_empty +svn_depth_files = _core.svn_depth_files +svn_depth_immediates = _core.svn_depth_immediates +svn_depth_infinity = _core.svn_depth_infinity SVN_UNALIGNED_ACCESS_IS_OK = _core.SVN_UNALIGNED_ACCESS_IS_OK TRUE = _core.TRUE FALSE = _core.FALSE @@ -582,11 +598,6 @@ class svn_error_t: svn_error_t_swigregister = _core.svn_error_t_swigregister svn_error_t_swigregister(svn_error_t) -svn_node_none = _core.svn_node_none -svn_node_file = _core.svn_node_file -svn_node_dir = _core.svn_node_dir -svn_node_unknown = _core.svn_node_unknown -svn_node_symlink = _core.svn_node_symlink def svn_node_kind_to_word(kind): """svn_node_kind_to_word(svn_node_kind_t kind) -> char const *""" @@ -595,9 +606,6 @@ def svn_node_kind_to_word(kind): def svn_node_kind_from_word(word): """svn_node_kind_from_word(char const * word) -> svn_node_kind_t""" return _core.svn_node_kind_from_word(word) -svn_tristate_false = _core.svn_tristate_false -svn_tristate_true = _core.svn_tristate_true -svn_tristate_unknown = _core.svn_tristate_unknown def svn_tristate__to_word(tristate): """svn_tristate__to_word(svn_tristate_t tristate) -> char const *""" @@ -613,12 +621,6 @@ def svn_revnum_parse(str): SVN_REVNUM_T_FMT = _core.SVN_REVNUM_T_FMT svn_nonrecursive = _core.svn_nonrecursive svn_recursive = _core.svn_recursive -svn_depth_unknown = _core.svn_depth_unknown -svn_depth_exclude = _core.svn_depth_exclude -svn_depth_empty = _core.svn_depth_empty -svn_depth_files = _core.svn_depth_files -svn_depth_immediates = _core.svn_depth_immediates -svn_depth_infinity = _core.svn_depth_infinity def svn_depth_to_word(depth): """svn_depth_to_word(svn_depth_t depth) -> char const *""" @@ -2333,9 +2335,117 @@ SVN_PROP_TXN_PREFIX = _core.SVN_PROP_TXN_PREFIX SVN_PROP_TXN_CLIENT_COMPAT_VERSION = _core.SVN_PROP_TXN_CLIENT_COMPAT_VERSION SVN_PROP_TXN_USER_AGENT = _core.SVN_PROP_TXN_USER_AGENT SVN_PROP_REVISION_PREFIX = _core.SVN_PROP_REVISION_PREFIX +svn_opt_revision_unspecified = _core.svn_opt_revision_unspecified +svn_opt_revision_number = _core.svn_opt_revision_number +svn_opt_revision_date = _core.svn_opt_revision_date +svn_opt_revision_committed = _core.svn_opt_revision_committed +svn_opt_revision_previous = _core.svn_opt_revision_previous +svn_opt_revision_base = _core.svn_opt_revision_base +svn_opt_revision_working = _core.svn_opt_revision_working +svn_opt_revision_head = _core.svn_opt_revision_head SVN_OPT_MAX_ALIASES = _core.SVN_OPT_MAX_ALIASES SVN_OPT_MAX_OPTIONS = _core.SVN_OPT_MAX_OPTIONS +SVN_OPT_MAX_PARAGRAPHS = _core.SVN_OPT_MAX_PARAGRAPHS SVN_OPT_FIRST_LONGOPT_ID = _core.SVN_OPT_FIRST_LONGOPT_ID +class svn_opt_subcommand_desc3_t: + """Proxy of C svn_opt_subcommand_desc3_t struct.""" + + __swig_setmethods__ = {} + __setattr__ = lambda self, name, value: _swig_setattr(self, svn_opt_subcommand_desc3_t, name, value) + __swig_getmethods__ = {} + __getattr__ = lambda self, name: _swig_getattr(self, svn_opt_subcommand_desc3_t, name) + __repr__ = _swig_repr + __swig_setmethods__["name"] = _core.svn_opt_subcommand_desc3_t_name_set + __swig_getmethods__["name"] = _core.svn_opt_subcommand_desc3_t_name_get + __swig_setmethods__["cmd_func"] = _core.svn_opt_subcommand_desc3_t_cmd_func_set + __swig_getmethods__["cmd_func"] = _core.svn_opt_subcommand_desc3_t_cmd_func_get + __swig_setmethods__["aliases"] = _core.svn_opt_subcommand_desc3_t_aliases_set + __swig_getmethods__["aliases"] = _core.svn_opt_subcommand_desc3_t_aliases_get + __swig_setmethods__["help"] = _core.svn_opt_subcommand_desc3_t_help_set + __swig_getmethods__["help"] = _core.svn_opt_subcommand_desc3_t_help_get + __swig_setmethods__["valid_options"] = _core.svn_opt_subcommand_desc3_t_valid_options_set + __swig_getmethods__["valid_options"] = _core.svn_opt_subcommand_desc3_t_valid_options_get + __swig_getmethods__["desc_overrides"] = _core.svn_opt_subcommand_desc3_t_desc_overrides_get + def set_parent_pool(self, parent_pool=None): + """Create a new proxy object for TYPE""" + import libsvn.core, weakref + self.__dict__["_parent_pool"] = \ + parent_pool or libsvn.core.application_pool; + if self.__dict__["_parent_pool"]: + self.__dict__["_is_valid"] = weakref.ref( + self.__dict__["_parent_pool"]._is_valid) + + def assert_valid(self): + """Assert that this object is using valid pool memory""" + if "_is_valid" in self.__dict__: + assert self.__dict__["_is_valid"](), "Variable has already been deleted" + + def __getattr__(self, name): + """Get an attribute from this object""" + self.assert_valid() + + value = _swig_getattr(self, self.__class__, name) + + # If we got back a different object than we have, we need to copy all our + # metadata into it, so that it looks identical + members = self.__dict__.get("_members") + if members is not None: + _copy_metadata_deep(value, members.get(name)) + + # Verify that the new object is good + _assert_valid_deep(value) + + return value + + def __setattr__(self, name, value): + """Set an attribute on this object""" + self.assert_valid() + + # Save a copy of the object, so that the garbage + # collector won't kill the object while it's in + # SWIG-land + self.__dict__.setdefault("_members",{})[name] = value + + return _swig_setattr(self, self.__class__, name, value) + + + def __init__(self): + """__init__(svn_opt_subcommand_desc3_t self) -> svn_opt_subcommand_desc3_t""" + this = _core.new_svn_opt_subcommand_desc3_t() + try: + self.this.append(this) + except __builtin__.Exception: + self.this = this + __swig_destroy__ = _core.delete_svn_opt_subcommand_desc3_t + __del__ = lambda self: None +svn_opt_subcommand_desc3_t_swigregister = _core.svn_opt_subcommand_desc3_t_swigregister +svn_opt_subcommand_desc3_t_swigregister(svn_opt_subcommand_desc3_t) + +class svn_opt_subcommand_desc3_t_desc_overrides: + """Proxy of C svn_opt_subcommand_desc3_t_desc_overrides struct.""" + + __swig_setmethods__ = {} + __setattr__ = lambda self, name, value: _swig_setattr(self, svn_opt_subcommand_desc3_t_desc_overrides, name, value) + __swig_getmethods__ = {} + __getattr__ = lambda self, name: _swig_getattr(self, svn_opt_subcommand_desc3_t_desc_overrides, name) + __repr__ = _swig_repr + __swig_setmethods__["optch"] = _core.svn_opt_subcommand_desc3_t_desc_overrides_optch_set + __swig_getmethods__["optch"] = _core.svn_opt_subcommand_desc3_t_desc_overrides_optch_get + __swig_setmethods__["desc"] = _core.svn_opt_subcommand_desc3_t_desc_overrides_desc_set + __swig_getmethods__["desc"] = _core.svn_opt_subcommand_desc3_t_desc_overrides_desc_get + + def __init__(self): + """__init__(svn_opt_subcommand_desc3_t_desc_overrides self) -> svn_opt_subcommand_desc3_t_desc_overrides""" + this = _core.new_svn_opt_subcommand_desc3_t_desc_overrides() + try: + self.this.append(this) + except __builtin__.Exception: + self.this = this + __swig_destroy__ = _core.delete_svn_opt_subcommand_desc3_t_desc_overrides + __del__ = lambda self: None +svn_opt_subcommand_desc3_t_desc_overrides_swigregister = _core.svn_opt_subcommand_desc3_t_desc_overrides_swigregister +svn_opt_subcommand_desc3_t_desc_overrides_swigregister(svn_opt_subcommand_desc3_t_desc_overrides) + class svn_opt_subcommand_desc2_t: """Proxy of C svn_opt_subcommand_desc2_t struct.""" @@ -2509,6 +2619,10 @@ svn_opt_subcommand_desc_t_swigregister = _core.svn_opt_subcommand_desc_t_swigreg svn_opt_subcommand_desc_t_swigregister(svn_opt_subcommand_desc_t) +def svn_opt_get_canonical_subcommand3(table, cmd_name): + """svn_opt_get_canonical_subcommand3(svn_opt_subcommand_desc3_t table, char const * cmd_name) -> svn_opt_subcommand_desc3_t""" + return _core.svn_opt_get_canonical_subcommand3(table, cmd_name) + def svn_opt_get_canonical_subcommand2(table, cmd_name): """svn_opt_get_canonical_subcommand2(svn_opt_subcommand_desc2_t table, char const * cmd_name) -> svn_opt_subcommand_desc2_t""" return _core.svn_opt_get_canonical_subcommand2(table, cmd_name) @@ -2517,6 +2631,10 @@ def svn_opt_get_canonical_subcommand(table, cmd_name): """svn_opt_get_canonical_subcommand(svn_opt_subcommand_desc_t table, char const * cmd_name) -> svn_opt_subcommand_desc_t""" return _core.svn_opt_get_canonical_subcommand(table, cmd_name) +def svn_opt_get_option_from_code3(*args): + """svn_opt_get_option_from_code3(int code, apr_getopt_option_t const * option_table, svn_opt_subcommand_desc3_t command, apr_pool_t pool) -> apr_getopt_option_t const *""" + return _core.svn_opt_get_option_from_code3(*args) + def svn_opt_get_option_from_code2(*args): """svn_opt_get_option_from_code2(int code, apr_getopt_option_t const * option_table, svn_opt_subcommand_desc2_t command, apr_pool_t pool) -> apr_getopt_option_t const *""" return _core.svn_opt_get_option_from_code2(*args) @@ -2525,6 +2643,10 @@ def svn_opt_get_option_from_code(code, option_table): """svn_opt_get_option_from_code(int code, apr_getopt_option_t const * option_table) -> apr_getopt_option_t const *""" return _core.svn_opt_get_option_from_code(code, option_table) +def svn_opt_subcommand_takes_option4(command, option_code): + """svn_opt_subcommand_takes_option4(svn_opt_subcommand_desc3_t command, int option_code) -> svn_boolean_t""" + return _core.svn_opt_subcommand_takes_option4(command, option_code) + def svn_opt_subcommand_takes_option3(command, option_code): """svn_opt_subcommand_takes_option3(svn_opt_subcommand_desc2_t command, int option_code) -> svn_boolean_t""" return _core.svn_opt_subcommand_takes_option3(command, option_code) @@ -2537,6 +2659,10 @@ def svn_opt_subcommand_takes_option(command, option_code): """svn_opt_subcommand_takes_option(svn_opt_subcommand_desc_t command, int option_code) -> svn_boolean_t""" return _core.svn_opt_subcommand_takes_option(command, option_code) +def svn_opt_print_generic_help3(*args): + """svn_opt_print_generic_help3(char const * header, svn_opt_subcommand_desc3_t cmd_table, apr_getopt_option_t const * opt_table, char const * footer, apr_pool_t pool, FILE * stream)""" + return _core.svn_opt_print_generic_help3(*args) + def svn_opt_print_generic_help2(*args): """svn_opt_print_generic_help2(char const * header, svn_opt_subcommand_desc2_t cmd_table, apr_getopt_option_t const * opt_table, char const * footer, apr_pool_t pool, FILE * stream)""" return _core.svn_opt_print_generic_help2(*args) @@ -2545,6 +2671,10 @@ def svn_opt_format_option(*args): """svn_opt_format_option(apr_getopt_option_t const * opt, svn_boolean_t doc, apr_pool_t pool)""" return _core.svn_opt_format_option(*args) +def svn_opt_subcommand_help4(*args): + """svn_opt_subcommand_help4(char const * subcommand, svn_opt_subcommand_desc3_t table, apr_getopt_option_t const * options_table, apr_pool_t pool)""" + return _core.svn_opt_subcommand_help4(*args) + def svn_opt_subcommand_help3(*args): """svn_opt_subcommand_help3(char const * subcommand, svn_opt_subcommand_desc2_t table, apr_getopt_option_t const * options_table, apr_pool_t pool)""" return _core.svn_opt_subcommand_help3(*args) @@ -2556,14 +2686,6 @@ def svn_opt_subcommand_help2(*args): def svn_opt_subcommand_help(*args): """svn_opt_subcommand_help(char const * subcommand, svn_opt_subcommand_desc_t table, apr_getopt_option_t const * options_table, apr_pool_t pool)""" return _core.svn_opt_subcommand_help(*args) -svn_opt_revision_unspecified = _core.svn_opt_revision_unspecified -svn_opt_revision_number = _core.svn_opt_revision_number -svn_opt_revision_date = _core.svn_opt_revision_date -svn_opt_revision_committed = _core.svn_opt_revision_committed -svn_opt_revision_previous = _core.svn_opt_revision_previous -svn_opt_revision_base = _core.svn_opt_revision_base -svn_opt_revision_working = _core.svn_opt_revision_working -svn_opt_revision_head = _core.svn_opt_revision_head class svn_opt_revision_value_t: """Proxy of C svn_opt_revision_value_t struct.""" @@ -2806,6 +2928,10 @@ def svn_opt_parse_path(*args): """svn_opt_parse_path(svn_opt_revision_t rev, char const * path, apr_pool_t pool) -> svn_error_t""" return _core.svn_opt_parse_path(*args) +def svn_opt_print_help5(*args): + """svn_opt_print_help5(apr_getopt_t * os, char const * pgm_name, svn_boolean_t print_version, svn_boolean_t quiet, svn_boolean_t verbose, char const * version_footer, char const * header, svn_opt_subcommand_desc3_t cmd_table, apr_getopt_option_t const * option_table, char const * footer, apr_pool_t pool) -> svn_error_t""" + return _core.svn_opt_print_help5(*args) + def svn_opt_print_help4(*args): """svn_opt_print_help4(apr_getopt_t * os, char const * pgm_name, svn_boolean_t print_version, svn_boolean_t quiet, svn_boolean_t verbose, char const * version_footer, char const * header, svn_opt_subcommand_desc2_t cmd_table, apr_getopt_option_t const * option_table, char const * footer, apr_pool_t pool) -> svn_error_t""" return _core.svn_opt_print_help4(*args) @@ -5007,14 +5133,14 @@ def svn_dirent_internal_style(*args): """svn_dirent_internal_style(char const * dirent, apr_pool_t result_pool) -> char const *""" return _core.svn_dirent_internal_style(*args) +def svn_dirent_internal_style_safe(*args): + """svn_dirent_internal_style_safe(char const * dirent, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _core.svn_dirent_internal_style_safe(*args) + def svn_dirent_local_style(*args): """svn_dirent_local_style(char const * dirent, apr_pool_t result_pool) -> char const *""" return _core.svn_dirent_local_style(*args) -def svn_relpath__internal_style(*args): - """svn_relpath__internal_style(char const * relpath, apr_pool_t result_pool) -> char const *""" - return _core.svn_relpath__internal_style(*args) - def svn_dirent_join(*args): """svn_dirent_join(char const * base, char const * component, apr_pool_t result_pool) -> char *""" return _core.svn_dirent_join(*args) @@ -5075,14 +5201,26 @@ def svn_dirent_canonicalize(*args): """svn_dirent_canonicalize(char const * dirent, apr_pool_t result_pool) -> char const *""" return _core.svn_dirent_canonicalize(*args) +def svn_dirent_canonicalize_safe(*args): + """svn_dirent_canonicalize_safe(char const * dirent, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _core.svn_dirent_canonicalize_safe(*args) + def svn_relpath_canonicalize(*args): """svn_relpath_canonicalize(char const * relpath, apr_pool_t result_pool) -> char const *""" return _core.svn_relpath_canonicalize(*args) +def svn_relpath_canonicalize_safe(*args): + """svn_relpath_canonicalize_safe(char const * relpath, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _core.svn_relpath_canonicalize_safe(*args) + def svn_uri_canonicalize(*args): """svn_uri_canonicalize(char const * uri, apr_pool_t result_pool) -> char const *""" return _core.svn_uri_canonicalize(*args) +def svn_uri_canonicalize_safe(*args): + """svn_uri_canonicalize_safe(char const * uri, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _core.svn_uri_canonicalize_safe(*args) + def svn_dirent_is_canonical(*args): """svn_dirent_is_canonical(char const * dirent, apr_pool_t scratch_pool) -> svn_boolean_t""" return _core.svn_dirent_is_canonical(*args) diff --git a/subversion/bindings/swig/python/delta.py b/subversion/bindings/swig/python/delta.py index 428d10e..0383fd9 100644 --- a/subversion/bindings/swig/python/delta.py +++ b/subversion/bindings/swig/python/delta.py @@ -545,6 +545,10 @@ def svn_delta_depth_filter_editor(*args): """svn_delta_depth_filter_editor(svn_delta_editor_t wrapped_editor, void * wrapped_edit_baton, svn_depth_t requested_depth, svn_boolean_t has_target, apr_pool_t pool) -> svn_error_t""" return _delta.svn_delta_depth_filter_editor(*args) +def svn_delta_path_driver3(*args): + """svn_delta_path_driver3(svn_delta_editor_t editor, void * edit_baton, apr_array_header_t relpaths, svn_boolean_t sort_paths, svn_delta_path_driver_cb_func2_t callback_func, void * callback_baton, apr_pool_t pool) -> svn_error_t""" + return _delta.svn_delta_path_driver3(*args) + def svn_delta_path_driver2(*args): """svn_delta_path_driver2(svn_delta_editor_t editor, void * edit_baton, apr_array_header_t paths, svn_boolean_t sort_paths, svn_delta_path_driver_cb_func_t callback_func, apr_pool_t scratch_pool) -> svn_error_t""" return _delta.svn_delta_path_driver2(*args) @@ -553,6 +557,18 @@ def svn_delta_path_driver(*args): """svn_delta_path_driver(svn_delta_editor_t editor, void * edit_baton, svn_revnum_t revision, apr_array_header_t paths, svn_delta_path_driver_cb_func_t callback_func, apr_pool_t scratch_pool) -> svn_error_t""" return _delta.svn_delta_path_driver(*args) +def svn_delta_path_driver_start(*args): + """svn_delta_path_driver_start(svn_delta_editor_t editor, void * edit_baton, svn_delta_path_driver_cb_func2_t callback_func, void * callback_baton, apr_pool_t result_pool) -> svn_error_t""" + return _delta.svn_delta_path_driver_start(*args) + +def svn_delta_path_driver_step(*args): + """svn_delta_path_driver_step(svn_delta_path_driver_state_t * state, char const * relpath, apr_pool_t scratch_pool) -> svn_error_t""" + return _delta.svn_delta_path_driver_step(*args) + +def svn_delta_path_driver_finish(*args): + """svn_delta_path_driver_finish(svn_delta_path_driver_state_t * state, apr_pool_t scratch_pool) -> svn_error_t""" + return _delta.svn_delta_path_driver_finish(*args) + def svn_compat_wrap_file_rev_handler(*args): """svn_compat_wrap_file_rev_handler(svn_file_rev_handler_old_t handler, void * handler_baton, apr_pool_t pool)""" return _delta.svn_compat_wrap_file_rev_handler(*args) @@ -612,6 +628,62 @@ class svn_txdelta_stream_t: svn_txdelta_stream_t_swigregister = _delta.svn_txdelta_stream_t_swigregister svn_txdelta_stream_t_swigregister(svn_txdelta_stream_t) +class svn_delta_path_driver_state_t: + """Proxy of C svn_delta_path_driver_state_t struct.""" + + __swig_setmethods__ = {} + __setattr__ = lambda self, name, value: _swig_setattr(self, svn_delta_path_driver_state_t, name, value) + __swig_getmethods__ = {} + __getattr__ = lambda self, name: _swig_getattr(self, svn_delta_path_driver_state_t, name) + + def __init__(self, *args, **kwargs): + raise AttributeError("No constructor defined") + __repr__ = _swig_repr + def set_parent_pool(self, parent_pool=None): + """Create a new proxy object for TYPE""" + import libsvn.core, weakref + self.__dict__["_parent_pool"] = \ + parent_pool or libsvn.core.application_pool; + if self.__dict__["_parent_pool"]: + self.__dict__["_is_valid"] = weakref.ref( + self.__dict__["_parent_pool"]._is_valid) + + def assert_valid(self): + """Assert that this object is using valid pool memory""" + if "_is_valid" in self.__dict__: + assert self.__dict__["_is_valid"](), "Variable has already been deleted" + + def __getattr__(self, name): + """Get an attribute from this object""" + self.assert_valid() + + value = _swig_getattr(self, self.__class__, name) + + # If we got back a different object than we have, we need to copy all our + # metadata into it, so that it looks identical + members = self.__dict__.get("_members") + if members is not None: + _copy_metadata_deep(value, members.get(name)) + + # Verify that the new object is good + _assert_valid_deep(value) + + return value + + def __setattr__(self, name, value): + """Set an attribute on this object""" + self.assert_valid() + + # Save a copy of the object, so that the garbage + # collector won't kill the object while it's in + # SWIG-land + self.__dict__.setdefault("_members",{})[name] = value + + return _swig_setattr(self, self.__class__, name, value) + +svn_delta_path_driver_state_t_swigregister = _delta.svn_delta_path_driver_state_t_swigregister +svn_delta_path_driver_state_t_swigregister(svn_delta_path_driver_state_t) + def svn_delta_editor_invoke_set_target_revision(*args): """svn_delta_editor_invoke_set_target_revision(svn_delta_editor_t _obj, void * edit_baton, svn_revnum_t target_revision, apr_pool_t scratch_pool) -> svn_error_t""" @@ -697,6 +769,10 @@ def svn_txdelta_invoke_stream_open_func(*args): """svn_txdelta_invoke_stream_open_func(svn_txdelta_stream_open_func_t _obj, void * baton, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" return _delta.svn_txdelta_invoke_stream_open_func(*args) +def svn_delta_invoke_path_driver_cb_func2(*args): + """svn_delta_invoke_path_driver_cb_func2(svn_delta_path_driver_cb_func2_t _obj, svn_delta_editor_t editor, void * edit_baton, void * parent_baton, void * callback_baton, char const * relpath, apr_pool_t pool) -> svn_error_t""" + return _delta.svn_delta_invoke_path_driver_cb_func2(*args) + def svn_delta_invoke_path_driver_cb_func(*args): """svn_delta_invoke_path_driver_cb_func(svn_delta_path_driver_cb_func_t _obj, void * parent_baton, void * callback_baton, char const * path, apr_pool_t pool) -> svn_error_t""" return _delta.svn_delta_invoke_path_driver_cb_func(*args) @@ -948,6 +1024,66 @@ class svn_txdelta_stream_open_func_t: svn_txdelta_stream_open_func_t_swigregister = _delta.svn_txdelta_stream_open_func_t_swigregister svn_txdelta_stream_open_func_t_swigregister(svn_txdelta_stream_open_func_t) +class svn_delta_path_driver_cb_func2_t: + """Proxy of C svn_delta_path_driver_cb_func2_t struct.""" + + __swig_setmethods__ = {} + __setattr__ = lambda self, name, value: _swig_setattr(self, svn_delta_path_driver_cb_func2_t, name, value) + __swig_getmethods__ = {} + __getattr__ = lambda self, name: _swig_getattr(self, svn_delta_path_driver_cb_func2_t, name) + + def __init__(self, *args, **kwargs): + raise AttributeError("No constructor defined") + __repr__ = _swig_repr + def set_parent_pool(self, parent_pool=None): + """Create a new proxy object for TYPE""" + import libsvn.core, weakref + self.__dict__["_parent_pool"] = \ + parent_pool or libsvn.core.application_pool; + if self.__dict__["_parent_pool"]: + self.__dict__["_is_valid"] = weakref.ref( + self.__dict__["_parent_pool"]._is_valid) + + def assert_valid(self): + """Assert that this object is using valid pool memory""" + if "_is_valid" in self.__dict__: + assert self.__dict__["_is_valid"](), "Variable has already been deleted" + + def __getattr__(self, name): + """Get an attribute from this object""" + self.assert_valid() + + value = _swig_getattr(self, self.__class__, name) + + # If we got back a different object than we have, we need to copy all our + # metadata into it, so that it looks identical + members = self.__dict__.get("_members") + if members is not None: + _copy_metadata_deep(value, members.get(name)) + + # Verify that the new object is good + _assert_valid_deep(value) + + return value + + def __setattr__(self, name, value): + """Set an attribute on this object""" + self.assert_valid() + + # Save a copy of the object, so that the garbage + # collector won't kill the object while it's in + # SWIG-land + self.__dict__.setdefault("_members",{})[name] = value + + return _swig_setattr(self, self.__class__, name, value) + + + def __call__(self, *args): + return svn_delta_invoke_path_driver_cb_func2(self, *args) + +svn_delta_path_driver_cb_func2_t_swigregister = _delta.svn_delta_path_driver_cb_func2_t_swigregister +svn_delta_path_driver_cb_func2_t_swigregister(svn_delta_path_driver_cb_func2_t) + class svn_delta_path_driver_cb_func_t: """Proxy of C svn_delta_path_driver_cb_func_t struct.""" diff --git a/subversion/bindings/swig/python/fs.py b/subversion/bindings/swig/python/fs.py index cb03d57..5280a83 100644 --- a/subversion/bindings/swig/python/fs.py +++ b/subversion/bindings/swig/python/fs.py @@ -1148,6 +1148,70 @@ def svn_fs_info(*args): def svn_fs_info_dup(*args): """svn_fs_info_dup(void const * info, apr_pool_t result_pool, apr_pool_t scratch_pool) -> void *""" return _fs.svn_fs_info_dup(*args) +class svn_fs_ioctl_code_t: + """Proxy of C svn_fs_ioctl_code_t struct.""" + + __swig_setmethods__ = {} + __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_ioctl_code_t, name, value) + __swig_getmethods__ = {} + __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_ioctl_code_t, name) + + def __init__(self, *args, **kwargs): + raise AttributeError("No constructor defined") + __repr__ = _swig_repr + __swig_setmethods__["fs_type"] = _fs.svn_fs_ioctl_code_t_fs_type_set + __swig_getmethods__["fs_type"] = _fs.svn_fs_ioctl_code_t_fs_type_get + __swig_setmethods__["code"] = _fs.svn_fs_ioctl_code_t_code_set + __swig_getmethods__["code"] = _fs.svn_fs_ioctl_code_t_code_get + def set_parent_pool(self, parent_pool=None): + """Create a new proxy object for TYPE""" + import libsvn.core, weakref + self.__dict__["_parent_pool"] = \ + parent_pool or libsvn.core.application_pool; + if self.__dict__["_parent_pool"]: + self.__dict__["_is_valid"] = weakref.ref( + self.__dict__["_parent_pool"]._is_valid) + + def assert_valid(self): + """Assert that this object is using valid pool memory""" + if "_is_valid" in self.__dict__: + assert self.__dict__["_is_valid"](), "Variable has already been deleted" + + def __getattr__(self, name): + """Get an attribute from this object""" + self.assert_valid() + + value = _swig_getattr(self, self.__class__, name) + + # If we got back a different object than we have, we need to copy all our + # metadata into it, so that it looks identical + members = self.__dict__.get("_members") + if members is not None: + _copy_metadata_deep(value, members.get(name)) + + # Verify that the new object is good + _assert_valid_deep(value) + + return value + + def __setattr__(self, name, value): + """Set an attribute on this object""" + self.assert_valid() + + # Save a copy of the object, so that the garbage + # collector won't kill the object while it's in + # SWIG-land + self.__dict__.setdefault("_members",{})[name] = value + + return _swig_setattr(self, self.__class__, name, value) + +svn_fs_ioctl_code_t_swigregister = _fs.svn_fs_ioctl_code_t_swigregister +svn_fs_ioctl_code_t_swigregister(svn_fs_ioctl_code_t) + + +def svn_fs_ioctl(*args): + """svn_fs_ioctl(svn_fs_t * fs, svn_fs_ioctl_code_t ctlcode, void * input, svn_cancel_func_t cancel_func, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _fs.svn_fs_ioctl(*args) class svn_fs_t: """Proxy of C svn_fs_t struct.""" diff --git a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c index 68063d3..abe5a2a 100644 --- a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c +++ b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c @@ -2293,8 +2293,8 @@ static svn_error_t *parse_fn3_set_fulltext(svn_stream_t **stream, void *node_baton) { item_baton *ib = node_baton; - PyObject *result; - svn_error_t *err; + PyObject *result = NULL; + svn_error_t *err = SVN_NO_ERROR; svn_swig_py_acquire_py_lock(); @@ -2316,14 +2316,17 @@ static svn_error_t *parse_fn3_set_fulltext(svn_stream_t **stream, /* create a stream from the IO object. it will increment the reference on the 'result'. */ *stream = svn_swig_py_make_stream(result, ib->pool); + if (*stream == NULL) + { + err = callback_exception_error(); + goto finished; + } } /* if the handler returned an IO object, svn_swig_py_make_stream() has incremented its reference counter. If it was None, it is discarded. */ - Py_DECREF(result); - err = SVN_NO_ERROR; - - finished: +finished: + Py_XDECREF(result); svn_swig_py_release_py_lock(); return err; } @@ -2575,17 +2578,39 @@ svn_swig_py_stream_destroy(void *py_io) svn_stream_t * svn_swig_py_make_stream(PyObject *py_io, apr_pool_t *pool) { - svn_stream_t *stream; + PyObject *_stream = NULL; + void *result = NULL; + swig_type_info *typeinfo = svn_swig_TypeQuery("svn_stream_t *"); - stream = svn_stream_create(py_io, pool); - svn_stream_set_read2(stream, read_handler_pyio, NULL); - svn_stream_set_write(stream, write_handler_pyio); - svn_stream_set_close(stream, close_handler_pyio); - apr_pool_cleanup_register(pool, py_io, svn_swig_py_stream_destroy, - apr_pool_cleanup_null); - Py_INCREF(py_io); + if (svn_swig_py_convert_ptr(py_io, &result, typeinfo) != 0) { + PyErr_Clear(); + if (PyObject_HasAttrString(py_io, "_stream")) { + _stream = PyObject_GetAttrString(py_io, "_stream"); + if (svn_swig_py_convert_ptr(_stream, &result, typeinfo) != 0) { + PyErr_Clear(); + } + } + } + if (result == NULL) { + if (!PyObject_HasAttrString(py_io, "read") + && !PyObject_HasAttrString(py_io, "write")) { + PyErr_SetString(PyExc_TypeError, + "expecting a svn_stream_t or file like object"); + goto finished; + } + result = svn_stream_create(py_io, pool); + svn_stream_set_read2(result, read_handler_pyio, NULL); + svn_stream_set_write(result, write_handler_pyio); + svn_stream_set_close(result, close_handler_pyio); + apr_pool_cleanup_register(pool, py_io, svn_swig_py_stream_destroy, + apr_pool_cleanup_null); + Py_INCREF(py_io); + } - return stream; +finished: + Py_XDECREF(_stream); + + return result; } PyObject * diff --git a/subversion/bindings/swig/python/repos.py b/subversion/bindings/swig/python/repos.py index b857327..787773e 100644 --- a/subversion/bindings/swig/python/repos.py +++ b/subversion/bindings/swig/python/repos.py @@ -1265,6 +1265,10 @@ def svn_repos_authz_initialize(*args): """svn_repos_authz_initialize(apr_pool_t pool) -> svn_error_t""" return _repos.svn_repos_authz_initialize(*args) +def svn_repos_authz_read4(*args): + """svn_repos_authz_read4(char const * path, char const * groups_path, svn_boolean_t must_exist, svn_repos_t * repos_hint, svn_repos_authz_warning_func_t warning_func, void * warning_baton, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _repos.svn_repos_authz_read4(*args) + def svn_repos_authz_read3(*args): """svn_repos_authz_read3(char const * path, char const * groups_path, svn_boolean_t must_exist, svn_repos_t * repos_hint, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" return _repos.svn_repos_authz_read3(*args) @@ -1277,6 +1281,10 @@ def svn_repos_authz_read(*args): """svn_repos_authz_read(char const * file, svn_boolean_t must_exist, apr_pool_t pool) -> svn_error_t""" return _repos.svn_repos_authz_read(*args) +def svn_repos_authz_parse2(*args): + """svn_repos_authz_parse2(svn_stream_t * stream, svn_stream_t * groups_stream, svn_repos_authz_warning_func_t warning_func, void * warning_baton, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _repos.svn_repos_authz_parse2(*args) + def svn_repos_authz_parse(*args): """svn_repos_authz_parse(svn_stream_t * stream, svn_stream_t * groups_stream, apr_pool_t pool) -> svn_error_t""" return _repos.svn_repos_authz_parse(*args) @@ -1535,6 +1543,10 @@ def svn_repos_invoke_file_rev_handler(*args): def svn_repos_invoke_verify_callback(*args): """svn_repos_invoke_verify_callback(svn_repos_verify_callback_t _obj, void * baton, svn_revnum_t revision, svn_error_t verify_err, apr_pool_t scratch_pool) -> svn_error_t""" return _repos.svn_repos_invoke_verify_callback(*args) + +def svn_repos_invoke_authz_warning_func(*args): + """svn_repos_invoke_authz_warning_func(svn_repos_authz_warning_func_t _obj, void * baton, svn_error_t error, apr_pool_t scratch_pool)""" + return _repos.svn_repos_invoke_authz_warning_func(*args) class svn_repos_authz_func_t: """Proxy of C svn_repos_authz_func_t struct.""" @@ -2135,5 +2147,65 @@ class svn_repos_verify_callback_t: svn_repos_verify_callback_t_swigregister = _repos.svn_repos_verify_callback_t_swigregister svn_repos_verify_callback_t_swigregister(svn_repos_verify_callback_t) +class svn_repos_authz_warning_func_t: + """Proxy of C svn_repos_authz_warning_func_t struct.""" + + __swig_setmethods__ = {} + __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_authz_warning_func_t, name, value) + __swig_getmethods__ = {} + __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_authz_warning_func_t, name) + + def __init__(self, *args, **kwargs): + raise AttributeError("No constructor defined") + __repr__ = _swig_repr + def set_parent_pool(self, parent_pool=None): + """Create a new proxy object for TYPE""" + import libsvn.core, weakref + self.__dict__["_parent_pool"] = \ + parent_pool or libsvn.core.application_pool; + if self.__dict__["_parent_pool"]: + self.__dict__["_is_valid"] = weakref.ref( + self.__dict__["_parent_pool"]._is_valid) + + def assert_valid(self): + """Assert that this object is using valid pool memory""" + if "_is_valid" in self.__dict__: + assert self.__dict__["_is_valid"](), "Variable has already been deleted" + + def __getattr__(self, name): + """Get an attribute from this object""" + self.assert_valid() + + value = _swig_getattr(self, self.__class__, name) + + # If we got back a different object than we have, we need to copy all our + # metadata into it, so that it looks identical + members = self.__dict__.get("_members") + if members is not None: + _copy_metadata_deep(value, members.get(name)) + + # Verify that the new object is good + _assert_valid_deep(value) + + return value + + def __setattr__(self, name, value): + """Set an attribute on this object""" + self.assert_valid() + + # Save a copy of the object, so that the garbage + # collector won't kill the object while it's in + # SWIG-land + self.__dict__.setdefault("_members",{})[name] = value + + return _swig_setattr(self, self.__class__, name, value) + + + def __call__(self, *args): + return svn_repos_invoke_authz_warning_func(self, *args) + +svn_repos_authz_warning_func_t_swigregister = _repos.svn_repos_authz_warning_func_t_swigregister +svn_repos_authz_warning_func_t_swigregister(svn_repos_authz_warning_func_t) + diff --git a/subversion/bindings/swig/python/svn/core.py b/subversion/bindings/swig/python/svn/core.py index ec8d718..bbf8b28 100644 --- a/subversion/bindings/swig/python/svn/core.py +++ b/subversion/bindings/swig/python/svn/core.py @@ -317,7 +317,7 @@ def run_app(func, *args, **kw): # 'apr_pool_clear' 'apr_pool_destroy' 'apr_pool_t' # 'apr_time_ansi_put' # 'run_app' -# 'svn_relpath__internal_style' 'svn_uri__is_ancestor' +# 'svn_uri__is_ancestor' # 'svn_tristate__from_word' 'svn_tristate__to_word' __all__ = filter(lambda s: (s.startswith('svn_') or s.startswith('SVN_') diff --git a/subversion/bindings/swig/python/svn/fs.py b/subversion/bindings/swig/python/svn/fs.py index 9893880..408e538 100644 --- a/subversion/bindings/swig/python/svn/fs.py +++ b/subversion/bindings/swig/python/svn/fs.py @@ -34,12 +34,15 @@ del _unprefix_names # Names that are not to be exported import sys as _sys, os as _os, tempfile as _tempfile, subprocess as _subprocess try: - # Python >=3.0 - import builtins -except ImportError: # Python <3.0 + # Check for Python <3.0 first to prevent the presence of the python2-future + # package from incorrectly importing Python 3 behavior when it isn't intended. import __builtin__ as builtins +except ImportError: + # Python >=3.0 + import builtins import svn.core as _svncore +import svn.diff as _svndiff def entries(root, path, pool=None): @@ -56,6 +59,7 @@ class FileDiff: self.tempfile1 = None self.tempfile2 = None + self.difftemp = None self.root1 = root1 self.path1 = path1 @@ -76,7 +80,7 @@ class FileDiff: return 0 def _dump_contents(self, file, root, path, pool=None): - fp = builtins.open(file, 'w+') # avoid namespace clash with + fp = builtins.open(file, 'wb') # avoid namespace clash with # trimmed-down svn_fs_open() if path is not None: stream = file_contents(root, path, pool) @@ -108,27 +112,49 @@ class FileDiff: def get_pipe(self): self.get_files() - # use an array for the command to avoid the shell and potential - # security exposures - cmd = ["diff"] \ - + self.diffoptions \ - + [self.tempfile1, self.tempfile2] - - # open the pipe, and return the file object for reading from the child. - p = _subprocess.Popen(cmd, stdout=_subprocess.PIPE, bufsize=-1, - close_fds=_sys.platform != "win32") - return p.stdout + # If diffoptions were provided, then the diff command needs to be + # called in preference to using the internal Subversion diff. + if self.diffoptions is not None: + # use an array for the command to avoid the shell and potential + # security exposures + cmd = ["diff"] \ + + self.diffoptions \ + + [self.tempfile1, self.tempfile2] + + # open the pipe, and return the file object for reading from the child. + p = _subprocess.Popen(cmd, stdout=_subprocess.PIPE, bufsize=-1, + close_fds=_sys.platform != "win32") + return p.stdout + + else: + if self.difftemp is None: + self.difftemp = _tempfile.mktemp() + + with builtins.open(self.difftemp, "wb") as fp: + diffopt = _svndiff.file_options_create() + diffobj = _svndiff.file_diff_2(self.tempfile1, + self.tempfile2, + diffopt) + + _svndiff.file_output_unified4(fp, + diffobj, + self.tempfile1, + self.tempfile2, + None, None, + "utf8", + None, + diffopt.show_c_function, + diffopt.context_size, + None, None) + + return builtins.open(self.difftemp, "rb") def __del__(self): # it seems that sometimes the files are deleted, so just ignore any # failures trying to remove them - if self.tempfile1 is not None: - try: - _os.remove(self.tempfile1) - except OSError: - pass - if self.tempfile2 is not None: - try: - _os.remove(self.tempfile2) - except OSError: - pass + for tmpfile in [self.tempfile1, self.tempfile2, self.difftemp]: + if tmpfile is not None: + try: + _os.remove(tmpfile) + except OSError: + pass diff --git a/subversion/bindings/swig/python/svn_client.c b/subversion/bindings/swig/python/svn_client.c index 3d70798..1472f06 100644 --- a/subversion/bindings/swig/python/svn_client.c +++ b/subversion/bindings/swig/python/svn_client.c @@ -3006,179 +3006,193 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { #define SWIGTYPE_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[20] #define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[21] #define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[22] -#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[23] -#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[24] -#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[25] -#define SWIGTYPE_p_f_p_void_p_q_const__char__int swig_types[26] -#define SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void swig_types[27] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[28] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[29] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[30] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[31] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[32] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[33] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[34] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t swig_types[35] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[36] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[37] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t swig_types[38] -#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[39] -#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[40] -#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t swig_types[41] -#define SWIGTYPE_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t swig_types[42] -#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[43] -#define SWIGTYPE_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[44] -#define SWIGTYPE_p_int swig_types[45] -#define SWIGTYPE_p_long swig_types[46] -#define SWIGTYPE_p_p_apr_array_header_t swig_types[47] -#define SWIGTYPE_p_p_apr_hash_t swig_types[48] -#define SWIGTYPE_p_p_char swig_types[49] -#define SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void swig_types[50] -#define SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[51] -#define SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[52] -#define SWIGTYPE_p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[53] -#define SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[54] -#define SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[55] -#define SWIGTYPE_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[56] -#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[57] -#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[58] -#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[59] -#define SWIGTYPE_p_p_f_p_void_p_q_const__char__int swig_types[60] -#define SWIGTYPE_p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void swig_types[61] -#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[62] -#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[63] -#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[64] -#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[65] -#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[66] -#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[67] -#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t swig_types[68] -#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t swig_types[69] -#define SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[70] -#define SWIGTYPE_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[71] -#define SWIGTYPE_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t swig_types[72] -#define SWIGTYPE_p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t swig_types[73] -#define SWIGTYPE_p_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[74] -#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[75] -#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[76] -#define SWIGTYPE_p_p_svn_client_commit_item3_t swig_types[77] -#define SWIGTYPE_p_p_svn_client_conflict_t swig_types[78] -#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[79] -#define SWIGTYPE_p_p_svn_commit_info_t swig_types[80] -#define SWIGTYPE_p_p_svn_ra_session_t swig_types[81] -#define SWIGTYPE_p_p_svn_string_t swig_types[82] -#define SWIGTYPE_p_svn_auth_baton_t swig_types[83] -#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[84] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[85] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[86] -#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[87] -#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[88] -#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[89] -#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[90] -#define SWIGTYPE_p_svn_auth_provider_t swig_types[91] -#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[92] -#define SWIGTYPE_p_svn_cache_config_t swig_types[93] -#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[94] -#define SWIGTYPE_p_svn_checksum_kind_t swig_types[95] -#define SWIGTYPE_p_svn_checksum_t swig_types[96] -#define SWIGTYPE_p_svn_client_commit_info_t swig_types[97] -#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[98] -#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[99] -#define SWIGTYPE_p_svn_client_commit_item_t swig_types[100] -#define SWIGTYPE_p_svn_client_conflict_option_id_t swig_types[101] -#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[102] -#define SWIGTYPE_p_svn_client_conflict_t swig_types[103] -#define SWIGTYPE_p_svn_client_copy_source_t swig_types[104] -#define SWIGTYPE_p_svn_client_ctx_t swig_types[105] -#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[106] -#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[107] -#define SWIGTYPE_p_svn_client_info2_t swig_types[108] -#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[109] -#define SWIGTYPE_p_svn_client_shelved_patch_info_t swig_types[110] -#define SWIGTYPE_p_svn_client_status_t swig_types[111] -#define SWIGTYPE_p_svn_commit_info_t swig_types[112] -#define SWIGTYPE_p_svn_config_t swig_types[113] -#define SWIGTYPE_p_svn_delta_editor_t swig_types[114] -#define SWIGTYPE_p_svn_depth_t swig_types[115] -#define SWIGTYPE_p_svn_diff_file_options_t swig_types[116] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[117] -#define SWIGTYPE_p_svn_dirent_t swig_types[118] -#define SWIGTYPE_p_svn_errno_t swig_types[119] -#define SWIGTYPE_p_svn_error_t swig_types[120] -#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[121] -#define SWIGTYPE_p_svn_info_t swig_types[122] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[123] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[124] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[125] -#define SWIGTYPE_p_svn_location_segment_t swig_types[126] -#define SWIGTYPE_p_svn_lock_t swig_types[127] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[128] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[129] -#define SWIGTYPE_p_svn_log_entry_t swig_types[130] -#define SWIGTYPE_p_svn_merge_range_t swig_types[131] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[132] -#define SWIGTYPE_p_svn_node_kind_t swig_types[133] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[134] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[135] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[136] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[137] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[138] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[139] -#define SWIGTYPE_p_svn_prop_kind swig_types[140] -#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[141] -#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[142] -#define SWIGTYPE_p_svn_ra_plugin_t swig_types[143] -#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[144] -#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[145] -#define SWIGTYPE_p_svn_ra_reporter_t swig_types[146] -#define SWIGTYPE_p_svn_ra_session_t swig_types[147] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[148] -#define SWIGTYPE_p_svn_stream_t swig_types[149] -#define SWIGTYPE_p_svn_string_t swig_types[150] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[151] -#define SWIGTYPE_p_svn_tristate_t swig_types[152] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[153] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[154] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[155] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[156] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[157] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[158] -#define SWIGTYPE_p_svn_version_extended_t swig_types[159] -#define SWIGTYPE_p_svn_version_t swig_types[160] -#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[161] -#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[162] -#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[163] -#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[164] -#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[165] -#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[166] -#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[167] -#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[168] -#define SWIGTYPE_p_svn_wc_context_t swig_types[169] -#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[170] -#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[171] -#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[172] -#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[173] -#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[174] -#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[175] -#define SWIGTYPE_p_svn_wc_entry_t swig_types[176] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[177] -#define SWIGTYPE_p_svn_wc_external_item_t swig_types[178] -#define SWIGTYPE_p_svn_wc_info_t swig_types[179] -#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[180] -#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[181] -#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[182] -#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[183] -#define SWIGTYPE_p_svn_wc_notify_t swig_types[184] -#define SWIGTYPE_p_svn_wc_operation_t swig_types[185] -#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[186] -#define SWIGTYPE_p_svn_wc_schedule_t swig_types[187] -#define SWIGTYPE_p_svn_wc_status2_t swig_types[188] -#define SWIGTYPE_p_svn_wc_status3_t swig_types[189] -#define SWIGTYPE_p_svn_wc_status_t swig_types[190] -#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[191] -#define SWIGTYPE_p_unsigned_long swig_types[192] -#define SWIGTYPE_p_void swig_types[193] -static swig_type_info *swig_types[195]; -static swig_module_info swig_module = {swig_types, 194, 0, 0, 0, 0}; +#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[23] +#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[24] +#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[25] +#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[26] +#define SWIGTYPE_p_f_p_void_p_q_const__char__int swig_types[27] +#define SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void swig_types[28] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[29] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[30] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[31] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t swig_types[32] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[33] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[34] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[35] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[36] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t swig_types[37] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t swig_types[38] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[39] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[40] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t swig_types[41] +#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[42] +#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[43] +#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t swig_types[44] +#define SWIGTYPE_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t swig_types[45] +#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[46] +#define SWIGTYPE_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[47] +#define SWIGTYPE_p_int swig_types[48] +#define SWIGTYPE_p_long swig_types[49] +#define SWIGTYPE_p_p_apr_array_header_t swig_types[50] +#define SWIGTYPE_p_p_apr_hash_t swig_types[51] +#define SWIGTYPE_p_p_char swig_types[52] +#define SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void swig_types[53] +#define SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[54] +#define SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[55] +#define SWIGTYPE_p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[56] +#define SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[57] +#define SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[58] +#define SWIGTYPE_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[59] +#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[60] +#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[61] +#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[62] +#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[63] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char__int swig_types[64] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void swig_types[65] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[66] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[67] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t swig_types[68] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[69] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[70] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[71] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[72] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t swig_types[73] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t swig_types[74] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t swig_types[75] +#define SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[76] +#define SWIGTYPE_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[77] +#define SWIGTYPE_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t swig_types[78] +#define SWIGTYPE_p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t swig_types[79] +#define SWIGTYPE_p_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[80] +#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[81] +#define SWIGTYPE_p_p_svn_client__shelf_t swig_types[82] +#define SWIGTYPE_p_p_svn_client__shelf_version_t swig_types[83] +#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[84] +#define SWIGTYPE_p_p_svn_client_commit_item3_t swig_types[85] +#define SWIGTYPE_p_p_svn_client_conflict_t swig_types[86] +#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[87] +#define SWIGTYPE_p_p_svn_commit_info_t swig_types[88] +#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[89] +#define SWIGTYPE_p_p_svn_ra_session_t swig_types[90] +#define SWIGTYPE_p_p_svn_string_t swig_types[91] +#define SWIGTYPE_p_p_void swig_types[92] +#define SWIGTYPE_p_svn_auth_baton_t swig_types[93] +#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[94] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[95] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[96] +#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[97] +#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[98] +#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[99] +#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[100] +#define SWIGTYPE_p_svn_auth_provider_t swig_types[101] +#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[102] +#define SWIGTYPE_p_svn_cache_config_t swig_types[103] +#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[104] +#define SWIGTYPE_p_svn_checksum_kind_t swig_types[105] +#define SWIGTYPE_p_svn_checksum_t swig_types[106] +#define SWIGTYPE_p_svn_client__shelf_info_t swig_types[107] +#define SWIGTYPE_p_svn_client__shelf_t swig_types[108] +#define SWIGTYPE_p_svn_client__shelf_version_t swig_types[109] +#define SWIGTYPE_p_svn_client_commit_info_t swig_types[110] +#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[111] +#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[112] +#define SWIGTYPE_p_svn_client_commit_item_t swig_types[113] +#define SWIGTYPE_p_svn_client_conflict_option_id_t swig_types[114] +#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[115] +#define SWIGTYPE_p_svn_client_conflict_t swig_types[116] +#define SWIGTYPE_p_svn_client_copy_source_t swig_types[117] +#define SWIGTYPE_p_svn_client_ctx_t swig_types[118] +#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[119] +#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[120] +#define SWIGTYPE_p_svn_client_info2_t swig_types[121] +#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[122] +#define SWIGTYPE_p_svn_client_status_t swig_types[123] +#define SWIGTYPE_p_svn_commit_info_t swig_types[124] +#define SWIGTYPE_p_svn_config_t swig_types[125] +#define SWIGTYPE_p_svn_delta_editor_t swig_types[126] +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[127] +#define SWIGTYPE_p_svn_depth_t swig_types[128] +#define SWIGTYPE_p_svn_diff_file_options_t swig_types[129] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[130] +#define SWIGTYPE_p_svn_dirent_t swig_types[131] +#define SWIGTYPE_p_svn_errno_t swig_types[132] +#define SWIGTYPE_p_svn_error_t swig_types[133] +#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[134] +#define SWIGTYPE_p_svn_info_t swig_types[135] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[136] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[137] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[138] +#define SWIGTYPE_p_svn_location_segment_t swig_types[139] +#define SWIGTYPE_p_svn_lock_t swig_types[140] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[141] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[142] +#define SWIGTYPE_p_svn_log_entry_t swig_types[143] +#define SWIGTYPE_p_svn_merge_range_t swig_types[144] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[145] +#define SWIGTYPE_p_svn_node_kind_t swig_types[146] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[147] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[148] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[149] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[150] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[151] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[152] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[153] +#define SWIGTYPE_p_svn_prop_kind swig_types[154] +#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[155] +#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[156] +#define SWIGTYPE_p_svn_ra_plugin_t swig_types[157] +#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[158] +#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[159] +#define SWIGTYPE_p_svn_ra_reporter_t swig_types[160] +#define SWIGTYPE_p_svn_ra_session_t swig_types[161] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[162] +#define SWIGTYPE_p_svn_stream_t swig_types[163] +#define SWIGTYPE_p_svn_string_t swig_types[164] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[165] +#define SWIGTYPE_p_svn_tristate_t swig_types[166] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[167] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[168] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[169] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[170] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[171] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[172] +#define SWIGTYPE_p_svn_version_extended_t swig_types[173] +#define SWIGTYPE_p_svn_version_t swig_types[174] +#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[175] +#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[176] +#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[177] +#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[178] +#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[179] +#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[180] +#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[181] +#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[182] +#define SWIGTYPE_p_svn_wc_context_t swig_types[183] +#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[184] +#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[185] +#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[186] +#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[187] +#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[188] +#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[189] +#define SWIGTYPE_p_svn_wc_entry_t swig_types[190] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[191] +#define SWIGTYPE_p_svn_wc_external_item_t swig_types[192] +#define SWIGTYPE_p_svn_wc_info_t swig_types[193] +#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[194] +#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[195] +#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[196] +#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[197] +#define SWIGTYPE_p_svn_wc_notify_t swig_types[198] +#define SWIGTYPE_p_svn_wc_operation_t swig_types[199] +#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[200] +#define SWIGTYPE_p_svn_wc_schedule_t swig_types[201] +#define SWIGTYPE_p_svn_wc_status2_t swig_types[202] +#define SWIGTYPE_p_svn_wc_status3_t swig_types[203] +#define SWIGTYPE_p_svn_wc_status_t swig_types[204] +#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[205] +#define SWIGTYPE_p_unsigned_long swig_types[206] +#define SWIGTYPE_p_void swig_types[207] +static swig_type_info *swig_types[209]; +static swig_module_info swig_module = {swig_types, 208, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -3678,6 +3692,11 @@ static svn_error_t * svn_client_invoke_get_commit_log( return _obj(log_msg, tmp_file, commit_items, baton, pool); } +static svn_error_t * svn_client_invoke_blame_receiver4( + svn_client_blame_receiver4_t _obj, void *baton, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, const svn_string_t *line, svn_boolean_t local_change, apr_pool_t *pool) { + return _obj(baton, line_no, revision, rev_props, merged_revision, merged_rev_props, merged_path, line, local_change, pool); +} + static svn_error_t * svn_client_invoke_blame_receiver3( svn_client_blame_receiver3_t _obj, void *baton, svn_revnum_t start_revnum, svn_revnum_t end_revnum, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, const char *line, svn_boolean_t local_change, apr_pool_t *pool) { return _obj(baton, start_revnum, end_revnum, line_no, revision, rev_props, merged_revision, merged_rev_props, merged_path, line, local_change, pool); @@ -3698,6 +3717,11 @@ static svn_error_t * svn_client_invoke_diff_summarize_func( return _obj(diff, baton, pool); } +static svn_error_t * svn_client_invoke__layout_func( + svn_client__layout_func_t _obj, void *layout_baton, const char *local_abspath, const char *repos_root_url, svn_boolean_t not_present, svn_boolean_t url_changed, const char *url, svn_boolean_t revision_changed, svn_revnum_t revision, svn_boolean_t depth_changed, svn_depth_t depth, apr_pool_t *scratch_pool) { + return _obj(layout_baton, local_abspath, repos_root_url, not_present, url_changed, url, revision_changed, revision, depth_changed, depth, scratch_pool); +} + static svn_error_t * svn_client_invoke_import_filter_func( svn_client_import_filter_func_t _obj, void *baton, svn_boolean_t *filtered, const char *local_abspath, const svn_io_dirent2_t *dirent, apr_pool_t *scratch_pool) { return _obj(baton, filtered, local_abspath, dirent, scratch_pool); @@ -9862,6 +9886,87 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_client__layout_list(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + svn_client__layout_func_t arg2 = (svn_client__layout_func_t) 0 ; + void *arg3 = (void *) 0 ; + svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg5 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_client__layout_list",&arg1,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + { + svn_client__layout_func_t * tmp = + svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1); + if (tmp == NULL || PyErr_Occurred()) { + SWIG_fail; + } + arg2 = *tmp; + } + { + if (obj2 == Py_None) { + arg3 = NULL; + } else if (SWIG_ConvertPtr(obj2, (void **) &arg3, 0, 0) == -1) { + arg3 = (void *) obj2; + PyErr_Clear(); + } + } + { + arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj4) { + /* Verify that the user supplied a valid pool */ + if (obj4 != Py_None && obj4 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4); + SWIG_arg_fail(svn_argnum_obj4); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__layout_list((char const *)arg1,arg2,arg3,arg4,arg5); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_client_add5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; @@ -15536,6 +15641,160 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_client_blame6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_revnum_t *arg1 = (svn_revnum_t *) 0 ; + svn_revnum_t *arg2 = (svn_revnum_t *) 0 ; + char *arg3 = (char *) 0 ; + svn_opt_revision_t *arg4 = (svn_opt_revision_t *) 0 ; + svn_opt_revision_t *arg5 = (svn_opt_revision_t *) 0 ; + svn_opt_revision_t *arg6 = (svn_opt_revision_t *) 0 ; + svn_diff_file_options_t *arg7 = (svn_diff_file_options_t *) 0 ; + svn_boolean_t arg8 ; + svn_boolean_t arg9 ; + svn_client_blame_receiver4_t arg10 = (svn_client_blame_receiver4_t) 0 ; + void *arg11 = (void *) 0 ; + svn_client_ctx_t *arg12 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg13 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + svn_revnum_t temp1 ; + int res1 = SWIG_TMPOBJ ; + svn_revnum_t temp2 ; + int res2 = SWIG_TMPOBJ ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; + PyObject * obj9 = 0 ; + PyObject * obj10 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg13 = _global_pool; + arg1 = &temp1; + arg2 = &temp2; + if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOOO|O:svn_client_blame6",&arg3,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail; + { + arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg6 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg7 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj4); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg8 = (svn_boolean_t)SWIG_As_long (obj5); + if (SWIG_arg_fail(svn_argnum_obj5)) { + SWIG_fail; + } + } + { + arg9 = (svn_boolean_t)SWIG_As_long (obj6); + if (SWIG_arg_fail(svn_argnum_obj6)) { + SWIG_fail; + } + } + { + svn_client_blame_receiver4_t * tmp = + svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7); + if (tmp == NULL || PyErr_Occurred()) { + SWIG_fail; + } + arg10 = *tmp; + } + { + if (obj8 == Py_None) { + arg11 = NULL; + } else if (SWIG_ConvertPtr(obj8, (void **) &arg11, 0, 0) == -1) { + arg11 = (void *) obj8; + PyErr_Clear(); + } + } + { + arg12 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj10) { + /* Verify that the user supplied a valid pool */ + if (obj10 != Py_None && obj10 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj10); + SWIG_arg_fail(svn_argnum_obj10); + SWIG_fail; + } + } + { + if (!arg4) { + SWIG_exception(SWIG_ValueError,"Received a NULL pointer."); + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client_blame6(arg1,arg2,(char const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_opt_revision_t const *)arg5,(struct svn_opt_revision_t const *)arg6,(svn_diff_file_options_t const *)arg7,arg8,arg9,arg10,arg11,arg12,arg13); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + if (SWIG_IsTmpObj(res1)) { + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_long((*arg1))); + } else { + int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_long, new_flags)); + } + if (SWIG_IsTmpObj(res2)) { + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_long((*arg2))); + } else { + int new_flags = SWIG_IsNewObj(res2) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_long, new_flags)); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_client_blame5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; @@ -16098,7 +16357,7 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_client_diff6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client_diff7(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; char *arg2 = (char *) 0 ; @@ -16115,12 +16374,13 @@ SWIGINTERN PyObject *_wrap_svn_client_diff6(PyObject *SWIGUNUSEDPARM(self), PyOb svn_boolean_t arg13 ; svn_boolean_t arg14 ; svn_boolean_t arg15 ; - char *arg16 = (char *) 0 ; - svn_stream_t *arg17 = (svn_stream_t *) 0 ; + svn_boolean_t arg16 ; + char *arg17 = (char *) 0 ; svn_stream_t *arg18 = (svn_stream_t *) 0 ; - apr_array_header_t *arg19 = (apr_array_header_t *) 0 ; - svn_client_ctx_t *arg20 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg21 = (apr_pool_t *) 0 ; + svn_stream_t *arg19 = (svn_stream_t *) 0 ; + apr_array_header_t *arg20 = (apr_array_header_t *) 0 ; + svn_client_ctx_t *arg21 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg22 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool = NULL ; PyObject *_global_py_pool = NULL ; PyObject * obj0 = 0 ; @@ -16135,18 +16395,19 @@ SWIGINTERN PyObject *_wrap_svn_client_diff6(PyObject *SWIGUNUSEDPARM(self), PyOb PyObject * obj12 = 0 ; PyObject * obj13 = 0 ; PyObject * obj14 = 0 ; - PyObject * obj16 = 0 ; + PyObject * obj15 = 0 ; PyObject * obj17 = 0 ; PyObject * obj18 = 0 ; PyObject * obj19 = 0 ; PyObject * obj20 = 0 ; + PyObject * obj21 = 0 ; svn_error_t *result = 0 ; if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, &_global_py_pool, &_global_pool)) SWIG_fail; - arg21 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"OsOsOzOOOOOOOOOsOOOO|O:svn_client_diff6",&obj0,&arg2,&obj2,&arg4,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&arg16,&obj16,&obj17,&obj18,&obj19,&obj20)) SWIG_fail; + arg22 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OsOsOzOOOOOOOOOOsOOOO|O:svn_client_diff7",&obj0,&arg2,&obj2,&arg4,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15,&arg17,&obj17,&obj18,&obj19,&obj20,&obj21)) SWIG_fail; { arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0, sizeof(const char *), @@ -16223,13 +16484,35 @@ SWIGINTERN PyObject *_wrap_svn_client_diff6(PyObject *SWIGUNUSEDPARM(self), PyOb } } { - arg17 = svn_swig_py_make_stream (obj16, _global_pool); + arg16 = (svn_boolean_t)SWIG_As_long (obj15); + if (SWIG_arg_fail(svn_argnum_obj15)) { + SWIG_fail; + } } { - arg18 = svn_swig_py_make_stream (obj17, _global_pool); + if (obj17 == Py_None) { + arg18 = NULL; + } + else { + arg18 = svn_swig_py_make_stream (obj17, _global_pool); + if (arg18 == NULL) { + SWIG_fail; + } + } } { - arg19 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj18, + if (obj18 == Py_None) { + arg19 = NULL; + } + else { + arg19 = svn_swig_py_make_stream (obj18, _global_pool); + if (arg19 == NULL) { + SWIG_fail; + } + } + } + { + arg20 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj19, sizeof(const char *), svn_swig_py_unwrap_string, NULL, @@ -16238,23 +16521,23 @@ SWIGINTERN PyObject *_wrap_svn_client_diff6(PyObject *SWIGUNUSEDPARM(self), PyOb SWIG_fail; } { - arg20 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj19, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj19); + arg21 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj20, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj20); if (PyErr_Occurred()) { SWIG_fail; } } - if (obj20) { + if (obj21) { /* Verify that the user supplied a valid pool */ - if (obj20 != Py_None && obj20 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj20); - SWIG_arg_fail(svn_argnum_obj20); + if (obj21 != Py_None && obj21 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj21); + SWIG_arg_fail(svn_argnum_obj21); SWIG_fail; } } { svn_swig_py_release_py_lock(); - result = (svn_error_t *)svn_client_diff6((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(char const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,(char const *)arg16,arg17,arg18,(apr_array_header_t const *)arg19,arg20,arg21); + result = (svn_error_t *)svn_client_diff7((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(char const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,arg16,(char const *)arg17,arg18,arg19,(apr_array_header_t const *)arg20,arg21,arg22); svn_swig_py_acquire_py_lock(); @@ -16282,7 +16565,7 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_client_diff5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client_diff6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; char *arg2 = (char *) 0 ; @@ -16296,12 +16579,15 @@ SWIGINTERN PyObject *_wrap_svn_client_diff5(PyObject *SWIGUNUSEDPARM(self), PyOb svn_boolean_t arg10 ; svn_boolean_t arg11 ; svn_boolean_t arg12 ; - char *arg13 = (char *) 0 ; - apr_file_t *arg14 = (apr_file_t *) 0 ; - apr_file_t *arg15 = (apr_file_t *) 0 ; - apr_array_header_t *arg16 = (apr_array_header_t *) 0 ; - svn_client_ctx_t *arg17 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg18 = (apr_pool_t *) 0 ; + svn_boolean_t arg13 ; + svn_boolean_t arg14 ; + svn_boolean_t arg15 ; + char *arg16 = (char *) 0 ; + svn_stream_t *arg17 = (svn_stream_t *) 0 ; + svn_stream_t *arg18 = (svn_stream_t *) 0 ; + apr_array_header_t *arg19 = (apr_array_header_t *) 0 ; + svn_client_ctx_t *arg20 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg21 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool = NULL ; PyObject *_global_py_pool = NULL ; PyObject * obj0 = 0 ; @@ -16313,18 +16599,215 @@ SWIGINTERN PyObject *_wrap_svn_client_diff5(PyObject *SWIGUNUSEDPARM(self), PyOb PyObject * obj9 = 0 ; PyObject * obj10 = 0 ; PyObject * obj11 = 0 ; + PyObject * obj12 = 0 ; PyObject * obj13 = 0 ; PyObject * obj14 = 0 ; - PyObject * obj15 = 0 ; PyObject * obj16 = 0 ; PyObject * obj17 = 0 ; + PyObject * obj18 = 0 ; + PyObject * obj19 = 0 ; + PyObject * obj20 = 0 ; svn_error_t *result = 0 ; if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, &_global_py_pool, &_global_pool)) SWIG_fail; - arg18 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"OsOsOzOOOOOOsOOOO|O:svn_client_diff5",&obj0,&arg2,&obj2,&arg4,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&arg13,&obj13,&obj14,&obj15,&obj16,&obj17)) SWIG_fail; + arg21 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OsOsOzOOOOOOOOOsOOOO|O:svn_client_diff6",&obj0,&arg2,&obj2,&arg4,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&arg16,&obj16,&obj17,&obj18,&obj19,&obj20)) SWIG_fail; + { + arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0, + sizeof(const char *), + svn_swig_py_unwrap_string, + NULL, + _global_pool); + if (PyErr_Occurred()) + SWIG_fail; + } + { + arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg7 = (svn_depth_t)SWIG_As_long (obj6); + if (SWIG_arg_fail(svn_argnum_obj6)) { + SWIG_fail; + } + } + { + arg8 = (svn_boolean_t)SWIG_As_long (obj7); + if (SWIG_arg_fail(svn_argnum_obj7)) { + SWIG_fail; + } + } + { + arg9 = (svn_boolean_t)SWIG_As_long (obj8); + if (SWIG_arg_fail(svn_argnum_obj8)) { + SWIG_fail; + } + } + { + arg10 = (svn_boolean_t)SWIG_As_long (obj9); + if (SWIG_arg_fail(svn_argnum_obj9)) { + SWIG_fail; + } + } + { + arg11 = (svn_boolean_t)SWIG_As_long (obj10); + if (SWIG_arg_fail(svn_argnum_obj10)) { + SWIG_fail; + } + } + { + arg12 = (svn_boolean_t)SWIG_As_long (obj11); + if (SWIG_arg_fail(svn_argnum_obj11)) { + SWIG_fail; + } + } + { + arg13 = (svn_boolean_t)SWIG_As_long (obj12); + if (SWIG_arg_fail(svn_argnum_obj12)) { + SWIG_fail; + } + } + { + arg14 = (svn_boolean_t)SWIG_As_long (obj13); + if (SWIG_arg_fail(svn_argnum_obj13)) { + SWIG_fail; + } + } + { + arg15 = (svn_boolean_t)SWIG_As_long (obj14); + if (SWIG_arg_fail(svn_argnum_obj14)) { + SWIG_fail; + } + } + { + if (obj16 == Py_None) { + arg17 = NULL; + } + else { + arg17 = svn_swig_py_make_stream (obj16, _global_pool); + if (arg17 == NULL) { + SWIG_fail; + } + } + } + { + if (obj17 == Py_None) { + arg18 = NULL; + } + else { + arg18 = svn_swig_py_make_stream (obj17, _global_pool); + if (arg18 == NULL) { + SWIG_fail; + } + } + } + { + arg19 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj18, + sizeof(const char *), + svn_swig_py_unwrap_string, + NULL, + _global_pool); + if (PyErr_Occurred()) + SWIG_fail; + } + { + arg20 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj19, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj19); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj20) { + /* Verify that the user supplied a valid pool */ + if (obj20 != Py_None && obj20 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj20); + SWIG_arg_fail(svn_argnum_obj20); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client_diff6((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(char const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,(char const *)arg16,arg17,arg18,(apr_array_header_t const *)arg19,arg20,arg21); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client_diff5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_opt_revision_t *arg3 = (svn_opt_revision_t *) 0 ; + char *arg4 = (char *) 0 ; + svn_opt_revision_t *arg5 = (svn_opt_revision_t *) 0 ; + char *arg6 = (char *) 0 ; + svn_depth_t arg7 ; + svn_boolean_t arg8 ; + svn_boolean_t arg9 ; + svn_boolean_t arg10 ; + svn_boolean_t arg11 ; + svn_boolean_t arg12 ; + char *arg13 = (char *) 0 ; + apr_file_t *arg14 = (apr_file_t *) 0 ; + apr_file_t *arg15 = (apr_file_t *) 0 ; + apr_array_header_t *arg16 = (apr_array_header_t *) 0 ; + svn_client_ctx_t *arg17 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg18 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; + PyObject * obj9 = 0 ; + PyObject * obj10 = 0 ; + PyObject * obj11 = 0 ; + PyObject * obj13 = 0 ; + PyObject * obj14 = 0 ; + PyObject * obj15 = 0 ; + PyObject * obj16 = 0 ; + PyObject * obj17 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg18 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OsOsOzOOOOOOsOOOO|O:svn_client_diff5",&obj0,&arg2,&obj2,&arg4,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&arg13,&obj13,&obj14,&obj15,&obj16,&obj17)) SWIG_fail; { arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0, sizeof(const char *), @@ -16982,7 +17465,7 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_client_diff_peg6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client_diff_peg7(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; char *arg2 = (char *) 0 ; @@ -16999,12 +17482,13 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg6(PyObject *SWIGUNUSEDPARM(self), svn_boolean_t arg13 ; svn_boolean_t arg14 ; svn_boolean_t arg15 ; - char *arg16 = (char *) 0 ; - svn_stream_t *arg17 = (svn_stream_t *) 0 ; + svn_boolean_t arg16 ; + char *arg17 = (char *) 0 ; svn_stream_t *arg18 = (svn_stream_t *) 0 ; - apr_array_header_t *arg19 = (apr_array_header_t *) 0 ; - svn_client_ctx_t *arg20 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg21 = (apr_pool_t *) 0 ; + svn_stream_t *arg19 = (svn_stream_t *) 0 ; + apr_array_header_t *arg20 = (apr_array_header_t *) 0 ; + svn_client_ctx_t *arg21 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg22 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool = NULL ; PyObject *_global_py_pool = NULL ; PyObject * obj0 = 0 ; @@ -17020,18 +17504,19 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg6(PyObject *SWIGUNUSEDPARM(self), PyObject * obj12 = 0 ; PyObject * obj13 = 0 ; PyObject * obj14 = 0 ; - PyObject * obj16 = 0 ; + PyObject * obj15 = 0 ; PyObject * obj17 = 0 ; PyObject * obj18 = 0 ; PyObject * obj19 = 0 ; PyObject * obj20 = 0 ; + PyObject * obj21 = 0 ; svn_error_t *result = 0 ; if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, &_global_py_pool, &_global_pool)) SWIG_fail; - arg21 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"OsOOOzOOOOOOOOOsOOOO|O:svn_client_diff_peg6",&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&arg16,&obj16,&obj17,&obj18,&obj19,&obj20)) SWIG_fail; + arg22 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OsOOOzOOOOOOOOOOsOOOO|O:svn_client_diff_peg7",&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15,&arg17,&obj17,&obj18,&obj19,&obj20,&obj21)) SWIG_fail; { arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0, sizeof(const char *), @@ -17114,13 +17599,35 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg6(PyObject *SWIGUNUSEDPARM(self), } } { - arg17 = svn_swig_py_make_stream (obj16, _global_pool); + arg16 = (svn_boolean_t)SWIG_As_long (obj15); + if (SWIG_arg_fail(svn_argnum_obj15)) { + SWIG_fail; + } + } + { + if (obj17 == Py_None) { + arg18 = NULL; + } + else { + arg18 = svn_swig_py_make_stream (obj17, _global_pool); + if (arg18 == NULL) { + SWIG_fail; + } + } } { - arg18 = svn_swig_py_make_stream (obj17, _global_pool); + if (obj18 == Py_None) { + arg19 = NULL; + } + else { + arg19 = svn_swig_py_make_stream (obj18, _global_pool); + if (arg19 == NULL) { + SWIG_fail; + } + } } { - arg19 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj18, + arg20 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj19, sizeof(const char *), svn_swig_py_unwrap_string, NULL, @@ -17129,16 +17636,16 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg6(PyObject *SWIGUNUSEDPARM(self), SWIG_fail; } { - arg20 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj19, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj19); + arg21 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj20, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj20); if (PyErr_Occurred()) { SWIG_fail; } } - if (obj20) { + if (obj21) { /* Verify that the user supplied a valid pool */ - if (obj20 != Py_None && obj20 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj20); - SWIG_arg_fail(svn_argnum_obj20); + if (obj21 != Py_None && obj21 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj21); + SWIG_arg_fail(svn_argnum_obj21); SWIG_fail; } } @@ -17150,7 +17657,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg6(PyObject *SWIGUNUSEDPARM(self), { svn_swig_py_release_py_lock(); - result = (svn_error_t *)svn_client_diff_peg6((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,(char const *)arg16,arg17,arg18,(apr_array_header_t const *)arg19,arg20,arg21); + result = (svn_error_t *)svn_client_diff_peg7((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,arg16,(char const *)arg17,arg18,arg19,(apr_array_header_t const *)arg20,arg21,arg22); svn_swig_py_acquire_py_lock(); @@ -17178,7 +17685,7 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_client_diff_peg5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client_diff_peg6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; char *arg2 = (char *) 0 ; @@ -17192,12 +17699,15 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg5(PyObject *SWIGUNUSEDPARM(self), svn_boolean_t arg10 ; svn_boolean_t arg11 ; svn_boolean_t arg12 ; - char *arg13 = (char *) 0 ; - apr_file_t *arg14 = (apr_file_t *) 0 ; - apr_file_t *arg15 = (apr_file_t *) 0 ; - apr_array_header_t *arg16 = (apr_array_header_t *) 0 ; - svn_client_ctx_t *arg17 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg18 = (apr_pool_t *) 0 ; + svn_boolean_t arg13 ; + svn_boolean_t arg14 ; + svn_boolean_t arg15 ; + char *arg16 = (char *) 0 ; + svn_stream_t *arg17 = (svn_stream_t *) 0 ; + svn_stream_t *arg18 = (svn_stream_t *) 0 ; + apr_array_header_t *arg19 = (apr_array_header_t *) 0 ; + svn_client_ctx_t *arg20 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg21 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool = NULL ; PyObject *_global_py_pool = NULL ; PyObject * obj0 = 0 ; @@ -17210,18 +17720,21 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg5(PyObject *SWIGUNUSEDPARM(self), PyObject * obj9 = 0 ; PyObject * obj10 = 0 ; PyObject * obj11 = 0 ; + PyObject * obj12 = 0 ; PyObject * obj13 = 0 ; PyObject * obj14 = 0 ; - PyObject * obj15 = 0 ; PyObject * obj16 = 0 ; PyObject * obj17 = 0 ; + PyObject * obj18 = 0 ; + PyObject * obj19 = 0 ; + PyObject * obj20 = 0 ; svn_error_t *result = 0 ; if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, &_global_py_pool, &_global_pool)) SWIG_fail; - arg18 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"OsOOOzOOOOOOsOOOO|O:svn_client_diff_peg5",&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&arg13,&obj13,&obj14,&obj15,&obj16,&obj17)) SWIG_fail; + arg21 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OsOOOzOOOOOOOOOsOOOO|O:svn_client_diff_peg6",&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&arg16,&obj16,&obj17,&obj18,&obj19,&obj20)) SWIG_fail; { arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0, sizeof(const char *), @@ -17286,15 +17799,47 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg5(PyObject *SWIGUNUSEDPARM(self), } } { - arg14 = svn_swig_py_make_file(obj13, _global_pool); - if (!arg14) SWIG_fail; + arg13 = (svn_boolean_t)SWIG_As_long (obj12); + if (SWIG_arg_fail(svn_argnum_obj12)) { + SWIG_fail; + } } { - arg15 = svn_swig_py_make_file(obj14, _global_pool); - if (!arg15) SWIG_fail; + arg14 = (svn_boolean_t)SWIG_As_long (obj13); + if (SWIG_arg_fail(svn_argnum_obj13)) { + SWIG_fail; + } } { - arg16 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj15, + arg15 = (svn_boolean_t)SWIG_As_long (obj14); + if (SWIG_arg_fail(svn_argnum_obj14)) { + SWIG_fail; + } + } + { + if (obj16 == Py_None) { + arg17 = NULL; + } + else { + arg17 = svn_swig_py_make_stream (obj16, _global_pool); + if (arg17 == NULL) { + SWIG_fail; + } + } + } + { + if (obj17 == Py_None) { + arg18 = NULL; + } + else { + arg18 = svn_swig_py_make_stream (obj17, _global_pool); + if (arg18 == NULL) { + SWIG_fail; + } + } + } + { + arg19 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj18, sizeof(const char *), svn_swig_py_unwrap_string, NULL, @@ -17303,16 +17848,16 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg5(PyObject *SWIGUNUSEDPARM(self), SWIG_fail; } { - arg17 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj16, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj16); + arg20 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj19, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj19); if (PyErr_Occurred()) { SWIG_fail; } } - if (obj17) { + if (obj20) { /* Verify that the user supplied a valid pool */ - if (obj17 != Py_None && obj17 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj17); - SWIG_arg_fail(svn_argnum_obj17); + if (obj20 != Py_None && obj20 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj20); + SWIG_arg_fail(svn_argnum_obj20); SWIG_fail; } } @@ -17324,7 +17869,181 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg5(PyObject *SWIGUNUSEDPARM(self), { svn_swig_py_release_py_lock(); - result = (svn_error_t *)svn_client_diff_peg5((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,(char const *)arg13,arg14,arg15,(apr_array_header_t const *)arg16,arg17,arg18); + result = (svn_error_t *)svn_client_diff_peg6((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,(char const *)arg16,arg17,arg18,(apr_array_header_t const *)arg19,arg20,arg21); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client_diff_peg5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_opt_revision_t *arg3 = (svn_opt_revision_t *) 0 ; + svn_opt_revision_t *arg4 = (svn_opt_revision_t *) 0 ; + svn_opt_revision_t *arg5 = (svn_opt_revision_t *) 0 ; + char *arg6 = (char *) 0 ; + svn_depth_t arg7 ; + svn_boolean_t arg8 ; + svn_boolean_t arg9 ; + svn_boolean_t arg10 ; + svn_boolean_t arg11 ; + svn_boolean_t arg12 ; + char *arg13 = (char *) 0 ; + apr_file_t *arg14 = (apr_file_t *) 0 ; + apr_file_t *arg15 = (apr_file_t *) 0 ; + apr_array_header_t *arg16 = (apr_array_header_t *) 0 ; + svn_client_ctx_t *arg17 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg18 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; + PyObject * obj9 = 0 ; + PyObject * obj10 = 0 ; + PyObject * obj11 = 0 ; + PyObject * obj13 = 0 ; + PyObject * obj14 = 0 ; + PyObject * obj15 = 0 ; + PyObject * obj16 = 0 ; + PyObject * obj17 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg18 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OsOOOzOOOOOOsOOOO|O:svn_client_diff_peg5",&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&arg13,&obj13,&obj14,&obj15,&obj16,&obj17)) SWIG_fail; + { + arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0, + sizeof(const char *), + svn_swig_py_unwrap_string, + NULL, + _global_pool); + if (PyErr_Occurred()) + SWIG_fail; + } + { + arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg7 = (svn_depth_t)SWIG_As_long (obj6); + if (SWIG_arg_fail(svn_argnum_obj6)) { + SWIG_fail; + } + } + { + arg8 = (svn_boolean_t)SWIG_As_long (obj7); + if (SWIG_arg_fail(svn_argnum_obj7)) { + SWIG_fail; + } + } + { + arg9 = (svn_boolean_t)SWIG_As_long (obj8); + if (SWIG_arg_fail(svn_argnum_obj8)) { + SWIG_fail; + } + } + { + arg10 = (svn_boolean_t)SWIG_As_long (obj9); + if (SWIG_arg_fail(svn_argnum_obj9)) { + SWIG_fail; + } + } + { + arg11 = (svn_boolean_t)SWIG_As_long (obj10); + if (SWIG_arg_fail(svn_argnum_obj10)) { + SWIG_fail; + } + } + { + arg12 = (svn_boolean_t)SWIG_As_long (obj11); + if (SWIG_arg_fail(svn_argnum_obj11)) { + SWIG_fail; + } + } + { + arg14 = svn_swig_py_make_file(obj13, _global_pool); + if (!arg14) SWIG_fail; + } + { + arg15 = svn_swig_py_make_file(obj14, _global_pool); + if (!arg15) SWIG_fail; + } + { + arg16 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj15, + sizeof(const char *), + svn_swig_py_unwrap_string, + NULL, + _global_pool); + if (PyErr_Occurred()) + SWIG_fail; + } + { + arg17 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj16, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj16); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj17) { + /* Verify that the user supplied a valid pool */ + if (obj17 != Py_None && obj17 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj17); + SWIG_arg_fail(svn_argnum_obj17); + SWIG_fail; + } + } + { + if (!arg3) { + SWIG_exception(SWIG_ValueError,"Received a NULL pointer."); + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client_diff_peg5((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,(char const *)arg13,arg14,arg15,(apr_array_header_t const *)arg16,arg17,arg18); svn_swig_py_acquire_py_lock(); @@ -21170,15 +21889,16 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_client_revert3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client_revert4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; svn_depth_t arg2 ; apr_array_header_t *arg3 = (apr_array_header_t *) 0 ; svn_boolean_t arg4 ; svn_boolean_t arg5 ; - svn_client_ctx_t *arg6 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg7 = (apr_pool_t *) 0 ; + svn_boolean_t arg6 ; + svn_client_ctx_t *arg7 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg8 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool = NULL ; PyObject *_global_py_pool = NULL ; PyObject * obj0 = 0 ; @@ -21188,13 +21908,14 @@ SWIGINTERN PyObject *_wrap_svn_client_revert3(PyObject *SWIGUNUSEDPARM(self), Py PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; svn_error_t *result = 0 ; if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, &_global_py_pool, &_global_pool)) SWIG_fail; - arg7 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"OOOOOO|O:svn_client_revert3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; + arg8 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OOOOOOO|O:svn_client_revert4",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; { arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0, sizeof(const char *), @@ -21232,23 +21953,29 @@ SWIGINTERN PyObject *_wrap_svn_client_revert3(PyObject *SWIGUNUSEDPARM(self), Py } } { - arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5); + arg6 = (svn_boolean_t)SWIG_As_long (obj5); + if (SWIG_arg_fail(svn_argnum_obj5)) { + SWIG_fail; + } + } + { + arg7 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6); if (PyErr_Occurred()) { SWIG_fail; } } - if (obj6) { + if (obj7) { /* Verify that the user supplied a valid pool */ - if (obj6 != Py_None && obj6 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj6); - SWIG_arg_fail(svn_argnum_obj6); + if (obj7 != Py_None && obj7 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj7); + SWIG_arg_fail(svn_argnum_obj7); SWIG_fail; } } { svn_swig_py_release_py_lock(); - result = (svn_error_t *)svn_client_revert3((apr_array_header_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5,arg6,arg7); + result = (svn_error_t *)svn_client_revert4((apr_array_header_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5,arg6,arg7,arg8); svn_swig_py_acquire_py_lock(); @@ -21276,13 +22003,15 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_client_revert2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client_revert3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; svn_depth_t arg2 ; apr_array_header_t *arg3 = (apr_array_header_t *) 0 ; - svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg5 = (apr_pool_t *) 0 ; + svn_boolean_t arg4 ; + svn_boolean_t arg5 ; + svn_client_ctx_t *arg6 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool = NULL ; PyObject *_global_py_pool = NULL ; PyObject * obj0 = 0 ; @@ -21290,13 +22019,15 @@ SWIGINTERN PyObject *_wrap_svn_client_revert2(PyObject *SWIGUNUSEDPARM(self), Py PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; svn_error_t *result = 0 ; if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, &_global_py_pool, &_global_pool)) SWIG_fail; - arg5 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_client_revert2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + arg7 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OOOOOO|O:svn_client_revert3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; { arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0, sizeof(const char *), @@ -21322,23 +22053,35 @@ SWIGINTERN PyObject *_wrap_svn_client_revert2(PyObject *SWIGUNUSEDPARM(self), Py SWIG_fail; } { - arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3); + arg4 = (svn_boolean_t)SWIG_As_long (obj3); + if (SWIG_arg_fail(svn_argnum_obj3)) { + SWIG_fail; + } + } + { + arg5 = (svn_boolean_t)SWIG_As_long (obj4); + if (SWIG_arg_fail(svn_argnum_obj4)) { + SWIG_fail; + } + } + { + arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5); if (PyErr_Occurred()) { SWIG_fail; } } - if (obj4) { + if (obj6) { /* Verify that the user supplied a valid pool */ - if (obj4 != Py_None && obj4 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4); - SWIG_arg_fail(svn_argnum_obj4); + if (obj6 != Py_None && obj6 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj6); + SWIG_arg_fail(svn_argnum_obj6); SWIG_fail; } } { svn_swig_py_release_py_lock(); - result = (svn_error_t *)svn_client_revert2((apr_array_header_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5); + result = (svn_error_t *)svn_client_revert3((apr_array_header_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5,arg6,arg7); svn_swig_py_acquire_py_lock(); @@ -21366,25 +22109,27 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_client_revert(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client_revert2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; - svn_boolean_t arg2 ; - svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg4 = (apr_pool_t *) 0 ; + svn_depth_t arg2 ; + apr_array_header_t *arg3 = (apr_array_header_t *) 0 ; + svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool = NULL ; PyObject *_global_py_pool = NULL ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; svn_error_t *result = 0 ; if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, &_global_py_pool, &_global_pool)) SWIG_fail; - arg4 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_revert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + arg5 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_client_revert2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; { arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0, sizeof(const char *), @@ -21395,29 +22140,117 @@ SWIGINTERN PyObject *_wrap_svn_client_revert(PyObject *SWIGUNUSEDPARM(self), PyO SWIG_fail; } { - arg2 = (svn_boolean_t)SWIG_As_long (obj1); + arg2 = (svn_depth_t)SWIG_As_long (obj1); if (SWIG_arg_fail(svn_argnum_obj1)) { SWIG_fail; } } { - arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2); + arg3 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj2, + sizeof(const char *), + svn_swig_py_unwrap_string, + NULL, + _global_pool); + if (PyErr_Occurred()) + SWIG_fail; + } + { + arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3); if (PyErr_Occurred()) { SWIG_fail; } } - if (obj3) { + if (obj4) { /* Verify that the user supplied a valid pool */ - if (obj3 != Py_None && obj3 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3); - SWIG_arg_fail(svn_argnum_obj3); + if (obj4 != Py_None && obj4 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4); + SWIG_arg_fail(svn_argnum_obj4); SWIG_fail; } } { svn_swig_py_release_py_lock(); - result = (svn_error_t *)svn_client_revert((apr_array_header_t const *)arg1,arg2,arg3,arg4); + result = (svn_error_t *)svn_client_revert2((apr_array_header_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client_revert(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; + svn_boolean_t arg2 ; + svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_revert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + { + arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0, + sizeof(const char *), + svn_swig_py_unwrap_string, + NULL, + _global_pool); + if (PyErr_Occurred()) + SWIG_fail; + } + { + arg2 = (svn_boolean_t)SWIG_As_long (obj1); + if (SWIG_arg_fail(svn_argnum_obj1)) { + SWIG_fail; + } + } + { + arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj3) { + /* Verify that the user supplied a valid pool */ + if (obj3 != Py_None && obj3 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3); + SWIG_arg_fail(svn_argnum_obj3); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client_revert((apr_array_header_t const *)arg1,arg2,arg3,arg4); svn_swig_py_acquire_py_lock(); @@ -21488,6 +22321,98 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + apr_array_header_t **arg1 = (apr_array_header_t **) 0 ; + svn_client_conflict_option_t *arg2 = (svn_client_conflict_option_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + apr_array_header_t *temp1 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg3 = _global_pool; + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + arg1 = &temp1; + if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_client_conflict_option_get_moved_to_repos_relpath_candidates2",&obj0,&obj1,&obj2)) SWIG_fail; + { + arg2 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(arg1,arg2,arg3,arg4); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_repos_relpath_candidates2 arg 1 (apr_array_header_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_repos_relpath_candidates2 is not implemented yet"); + + } + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; apr_array_header_t **arg1 = (apr_array_header_t **) 0 ; @@ -21580,6 +22505,82 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_client_conflict_option_set_moved_to_repos_relpath2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_client_conflict_option_t *arg1 = (svn_client_conflict_option_t *) 0 ; + int arg2 ; + svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_conflict_option_set_moved_to_repos_relpath2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + { + arg1 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg2 = (int)SWIG_As_long (obj1); + if (SWIG_arg_fail(svn_argnum_obj1)) { + SWIG_fail; + } + } + { + arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj3) { + /* Verify that the user supplied a valid pool */ + if (obj3 != Py_None && obj3 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3); + SWIG_arg_fail(svn_argnum_obj3); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client_conflict_option_set_moved_to_repos_relpath2(arg1,arg2,arg3,arg4); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_client_conflict_option_set_moved_to_repos_relpath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_client_conflict_option_t *arg1 = (svn_client_conflict_option_t *) 0 ; @@ -21656,6 +22657,98 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_client_conflict_option_get_moved_to_abspath_candidates2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + apr_array_header_t **arg1 = (apr_array_header_t **) 0 ; + svn_client_conflict_option_t *arg2 = (svn_client_conflict_option_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + apr_array_header_t *temp1 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg3 = _global_pool; + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + arg1 = &temp1; + if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_client_conflict_option_get_moved_to_abspath_candidates2",&obj0,&obj1,&obj2)) SWIG_fail; + { + arg2 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client_conflict_option_get_moved_to_abspath_candidates2(arg1,arg2,arg3,arg4); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_abspath_candidates2 arg 1 (apr_array_header_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_abspath_candidates2 is not implemented yet"); + + } + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_client_conflict_option_get_moved_to_abspath_candidates(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; apr_array_header_t **arg1 = (apr_array_header_t **) 0 ; @@ -21748,6 +22841,82 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_client_conflict_option_set_moved_to_abspath2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_client_conflict_option_t *arg1 = (svn_client_conflict_option_t *) 0 ; + int arg2 ; + svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_conflict_option_set_moved_to_abspath2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + { + arg1 = (svn_client_conflict_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_conflict_option_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg2 = (int)SWIG_As_long (obj1); + if (SWIG_arg_fail(svn_argnum_obj1)) { + SWIG_fail; + } + } + { + arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj3) { + /* Verify that the user supplied a valid pool */ + if (obj3 != Py_None && obj3 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3); + SWIG_arg_fail(svn_argnum_obj3); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client_conflict_option_set_moved_to_abspath2(arg1,arg2,arg3,arg4); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_client_conflict_option_set_moved_to_abspath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_client_conflict_option_t *arg1 = (svn_client_conflict_option_t *) 0 ; @@ -29512,7 +30681,15 @@ SWIGINTERN PyObject *_wrap_svn_client_cat3(PyObject *SWIGUNUSEDPARM(self), PyObj arg1 = &temp1; if (!PyArg_ParseTuple(args,(char *)"OsOOOO|OO:svn_client_cat3",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; { - arg2 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2); @@ -29627,7 +30804,15 @@ SWIGINTERN PyObject *_wrap_svn_client_cat2(PyObject *SWIGUNUSEDPARM(self), PyObj arg6 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_client_cat2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2); @@ -29717,7 +30902,15 @@ SWIGINTERN PyObject *_wrap_svn_client_cat(PyObject *SWIGUNUSEDPARM(self), PyObje arg5 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_client_cat",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2); @@ -29775,282 +30968,452 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_client_shelve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client__shelf_t_name_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - char *arg1 = (char *) 0 ; - apr_array_header_t *arg2 = (apr_array_header_t *) 0 ; - svn_depth_t arg3 ; - apr_array_header_t *arg4 = (apr_array_header_t *) 0 ; - svn_boolean_t arg5 ; - svn_boolean_t arg6 ; - svn_client_ctx_t *arg7 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg8 = (apr_pool_t *) 0 ; - apr_pool_t *_global_pool = NULL ; - PyObject *_global_py_pool = NULL ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - PyObject * obj5 = 0 ; - PyObject * obj6 = 0 ; - PyObject * obj7 = 0 ; - svn_error_t *result = 0 ; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + char *arg2 = (char *) 0 ; + PyObject * obj0 = 0 ; - if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, - &_global_py_pool, &_global_pool)) - SWIG_fail; - arg8 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"sOOOOOO|O:svn_client_shelve",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; - { - arg2 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj1, - sizeof(const char *), - svn_swig_py_unwrap_string, - NULL, - _global_pool); - if (PyErr_Occurred()) - SWIG_fail; - } + if (!PyArg_ParseTuple(args,(char *)"Os:svn_client__shelf_t_name_set",&obj0,&arg2)) SWIG_fail; { - arg3 = (svn_depth_t)SWIG_As_long (obj2); - if (SWIG_arg_fail(svn_argnum_obj2)) { + arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { SWIG_fail; } } { - arg4 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj3, - sizeof(const char *), - svn_swig_py_unwrap_string, - NULL, - _global_pool); - if (PyErr_Occurred()) - SWIG_fail; + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->name) free((char *)arg1->name); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->name = copied; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_t_name_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + PyObject * obj0 = 0 ; + char *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_t_name_get",&obj0)) SWIG_fail; + { + arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } } + result = (char *) ((arg1)->name); + resultobj = SWIG_FromCharPtr((const char *)result); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_t_max_version_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + int arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:svn_client__shelf_t_max_version_set",&obj0,&obj1)) SWIG_fail; { - arg5 = (svn_boolean_t)SWIG_As_long (obj4); - if (SWIG_arg_fail(svn_argnum_obj4)) { + arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { SWIG_fail; } } { - arg6 = (svn_boolean_t)SWIG_As_long (obj5); - if (SWIG_arg_fail(svn_argnum_obj5)) { + arg2 = (int)SWIG_As_long (obj1); + if (SWIG_arg_fail(svn_argnum_obj1)) { SWIG_fail; } } + if (arg1) (arg1)->max_version = arg2; + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_t_max_version_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + PyObject * obj0 = 0 ; + int result; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_t_max_version_get",&obj0)) SWIG_fail; { - arg7 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6); + arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } - if (obj7) { - /* Verify that the user supplied a valid pool */ - if (obj7 != Py_None && obj7 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj7); - SWIG_arg_fail(svn_argnum_obj7); + result = (int) ((arg1)->max_version); + resultobj = SWIG_From_long((long)(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_t_wc_root_abspath_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + char *arg2 = (char *) 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"Os:svn_client__shelf_t_wc_root_abspath_set",&obj0,&arg2)) SWIG_fail; + { + arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { SWIG_fail; } } { - svn_swig_py_release_py_lock(); - - result = (svn_error_t *)svn_client_shelve((char const *)arg1,(apr_array_header_t const *)arg2,arg3,(apr_array_header_t const *)arg4,arg5,arg6,arg7,arg8); - - svn_swig_py_acquire_py_lock(); - + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->wc_root_abspath) free((char *)arg1->wc_root_abspath); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->wc_root_abspath = copied; } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_t_wc_root_abspath_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + PyObject * obj0 = 0 ; + char *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_t_wc_root_abspath_get",&obj0)) SWIG_fail; { - if (result != NULL) { - if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) - svn_swig_py_svn_exception(result); - else - svn_error_clear(result); + arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + result = (char *) ((arg1)->wc_root_abspath); + resultobj = SWIG_FromCharPtr((const char *)result); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_t_shelves_dir_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + char *arg2 = (char *) 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"Os:svn_client__shelf_t_shelves_dir_set",&obj0,&arg2)) SWIG_fail; + { + arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { SWIG_fail; } - Py_INCREF(Py_None); - resultobj = Py_None; } { - Py_XDECREF(_global_py_pool); + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->shelves_dir) free((char *)arg1->shelves_dir); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->shelves_dir = copied; } + resultobj = SWIG_Py_Void(); return resultobj; fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_t_shelves_dir_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + PyObject * obj0 = 0 ; + char *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_t_shelves_dir_get",&obj0)) SWIG_fail; { - Py_XDECREF(_global_py_pool); + arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } } + result = (char *) ((arg1)->shelves_dir); + resultobj = SWIG_FromCharPtr((const char *)result); + return resultobj; +fail: return NULL; } -SWIGINTERN PyObject *_wrap_svn_client_unshelve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client__shelf_t_revprops_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - char *arg1 = (char *) 0 ; - char *arg2 = (char *) 0 ; - svn_boolean_t arg3 ; - svn_boolean_t arg4 ; - svn_client_ctx_t *arg5 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg6 = (apr_pool_t *) 0 ; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + apr_hash_t *arg2 = (apr_hash_t *) 0 ; apr_pool_t *_global_pool = NULL ; PyObject *_global_py_pool = NULL ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - PyObject * obj5 = 0 ; - svn_error_t *result = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, - &_global_py_pool, &_global_pool)) - SWIG_fail; - arg6 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"ssOOO|O:svn_client_unshelve",&arg1,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO:svn_client__shelf_t_revprops_set",&obj0,&obj1)) SWIG_fail; { - arg3 = (svn_boolean_t)SWIG_As_long (obj2); - if (SWIG_arg_fail(svn_argnum_obj2)) { + arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { SWIG_fail; } } { - arg4 = (svn_boolean_t)SWIG_As_long (obj3); - if (SWIG_arg_fail(svn_argnum_obj3)) { + if (_global_pool == NULL) + { + if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) SWIG_fail; } - } - { - arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4); + + arg2 = svn_swig_py_prophash_from_dict(obj1, _global_pool); if (PyErr_Occurred()) { SWIG_fail; } } - if (obj5) { - /* Verify that the user supplied a valid pool */ - if (obj5 != Py_None && obj5 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj5); - SWIG_arg_fail(svn_argnum_obj5); + if (arg1) (arg1)->revprops = arg2; + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_t_revprops_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + PyObject * obj0 = 0 ; + apr_hash_t *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_t_revprops_get",&obj0)) SWIG_fail; + { + arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { SWIG_fail; } } + result = (apr_hash_t *) ((arg1)->revprops); { - svn_swig_py_release_py_lock(); - - result = (svn_error_t *)svn_client_unshelve((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6); - - svn_swig_py_acquire_py_lock(); - + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_prophash_to_dict(result)); } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_t_ctx_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + svn_client_ctx_t *arg2 = (svn_client_ctx_t *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:svn_client__shelf_t_ctx_set",&obj0,&obj1)) SWIG_fail; { - if (result != NULL) { - if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) - svn_swig_py_svn_exception(result); - else - svn_error_clear(result); + arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { SWIG_fail; } - Py_INCREF(Py_None); - resultobj = Py_None; } { - Py_XDECREF(_global_py_pool); + arg2 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } } + if (arg1) (arg1)->ctx = arg2; + resultobj = SWIG_Py_Void(); return resultobj; fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_t_ctx_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + PyObject * obj0 = 0 ; + svn_client_ctx_t *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_t_ctx_get",&obj0)) SWIG_fail; { - Py_XDECREF(_global_py_pool); + arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } } + result = (svn_client_ctx_t *) ((arg1)->ctx); + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_ctx_t, + _global_py_pool, args); + return resultobj; +fail: return NULL; } -SWIGINTERN PyObject *_wrap_svn_client_shelves_delete(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client__shelf_t_pool_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - char *arg1 = (char *) 0 ; - char *arg2 = (char *) 0 ; - svn_boolean_t arg3 ; - svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg5 = (apr_pool_t *) 0 ; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool = NULL ; PyObject *_global_py_pool = NULL ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - svn_error_t *result = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, &_global_py_pool, &_global_pool)) SWIG_fail; - arg5 = _global_pool; - if (!PyArg_ParseTuple(args,(char *)"ssOO|O:svn_client_shelves_delete",&arg1,&arg2,&obj2,&obj3,&obj4)) SWIG_fail; + arg2 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client__shelf_t_pool_set",&obj0,&obj1)) SWIG_fail; { - arg3 = (svn_boolean_t)SWIG_As_long (obj2); - if (SWIG_arg_fail(svn_argnum_obj2)) { + arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { SWIG_fail; } } - { - arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3); - if (PyErr_Occurred()) { + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); SWIG_fail; } } - if (obj4) { - /* Verify that the user supplied a valid pool */ - if (obj4 != Py_None && obj4 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4); - SWIG_arg_fail(svn_argnum_obj4); + if (arg1) (arg1)->pool = arg2; + resultobj = SWIG_Py_Void(); + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_t_pool_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + PyObject * obj0 = 0 ; + apr_pool_t *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_t_pool_get",&obj0)) SWIG_fail; + { + arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { SWIG_fail; } } + result = (apr_pool_t *) ((arg1)->pool); + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_pool_t, + _global_py_pool, args); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_svn_client__shelf_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_t *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)":new_svn_client__shelf_t")) SWIG_fail; { svn_swig_py_release_py_lock(); - result = (svn_error_t *)svn_client_shelves_delete((char const *)arg1,(char const *)arg2,arg3,arg4,arg5); + result = (struct svn_client__shelf_t *)calloc(1, sizeof(struct svn_client__shelf_t)); svn_swig_py_acquire_py_lock(); } + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client__shelf_t, + _global_py_pool, args); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_delete_svn_client__shelf_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client__shelf_t",&obj0)) SWIG_fail; { - if (result != NULL) { - if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) - svn_swig_py_svn_exception(result); - else - svn_error_clear(result); + arg1 = (struct svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { SWIG_fail; } - Py_INCREF(Py_None); - resultobj = Py_None; } { - Py_XDECREF(_global_py_pool); + svn_swig_py_release_py_lock(); + + free((char *) arg1); + + svn_swig_py_acquire_py_lock(); + } + resultobj = SWIG_Py_Void(); return resultobj; fail: - { - Py_XDECREF(_global_py_pool); - } return NULL; } -SWIGINTERN PyObject *_wrap_svn_client_shelved_patch_info_t_message_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *svn_client__shelf_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_svn_client__shelf_t, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *_wrap_svn_client__shelf_version_t_shelf_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; - char *arg2 = (char *) 0 ; + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_shelved_patch_info_t_message_set",&obj0,&arg2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO:svn_client__shelf_version_t_shelf_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_client_shelved_patch_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_shelved_patch_info_t, svn_argnum_obj0); + arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } { - apr_size_t len = strlen(arg2) + 1; - char *copied; - if (arg1->message) free((char *)arg1->message); - copied = malloc(len); - memcpy(copied, arg2, len); - arg1->message = copied; + arg2 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } } + if (arg1) (arg1)->shelf = arg2; resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -30058,48 +31421,44 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_client_shelved_patch_info_t_message_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client__shelf_version_t_shelf_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; PyObject * obj0 = 0 ; - char *result = 0 ; + svn_client__shelf_t *result = 0 ; - if (!PyArg_ParseTuple(args,(char *)"O:svn_client_shelved_patch_info_t_message_get",&obj0)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_version_t_shelf_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_client_shelved_patch_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_shelved_patch_info_t, svn_argnum_obj0); + arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } - result = (char *) ((arg1)->message); - resultobj = SWIG_FromCharPtr((const char *)result); + result = (svn_client__shelf_t *) ((arg1)->shelf); + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client__shelf_t, + _global_py_pool, args); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_svn_client_shelved_patch_info_t_patch_path_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client__shelf_version_t_mtime_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; - char *arg2 = (char *) 0 ; + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + apr_time_t arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_shelved_patch_info_t_patch_path_set",&obj0,&arg2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO:svn_client__shelf_version_t_mtime_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_client_shelved_patch_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_shelved_patch_info_t, svn_argnum_obj0); + arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } - { - apr_size_t len = strlen(arg2) + 1; - char *copied; - if (arg1->patch_path) free((char *)arg1->patch_path); - copied = malloc(len); - memcpy(copied, arg2, len); - arg1->patch_path = copied; - } + arg2 = (apr_time_t) PyLong_AsLongLong(obj1); + if (arg1) (arg1)->mtime = arg2; resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -30107,48 +31466,48 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_client_shelved_patch_info_t_patch_path_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client__shelf_version_t_mtime_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; PyObject * obj0 = 0 ; - char *result = 0 ; + apr_time_t result; - if (!PyArg_ParseTuple(args,(char *)"O:svn_client_shelved_patch_info_t_patch_path_get",&obj0)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_version_t_mtime_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_client_shelved_patch_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_shelved_patch_info_t, svn_argnum_obj0); + arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } - result = (char *) ((arg1)->patch_path); - resultobj = SWIG_FromCharPtr((const char *)result); + result = ((arg1)->mtime); + resultobj = PyLong_FromLongLong((apr_int64_t)(result)); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_svn_client_shelved_patch_info_t_dirent_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client__shelf_version_t_files_dir_abspath_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; - svn_io_dirent2_t *arg2 = (svn_io_dirent2_t *) 0 ; + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + char *arg2 = (char *) 0 ; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_shelved_patch_info_t_dirent_set",&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"Os:svn_client__shelf_version_t_files_dir_abspath_set",&obj0,&arg2)) SWIG_fail; { - arg1 = (struct svn_client_shelved_patch_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_shelved_patch_info_t, svn_argnum_obj0); + arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } { - arg2 = (svn_io_dirent2_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj1); - if (PyErr_Occurred()) { - SWIG_fail; - } + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->files_dir_abspath) free((char *)arg1->files_dir_abspath); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->files_dir_abspath = copied; } - if (arg1) (arg1)->dirent = arg2; resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -30156,44 +31515,48 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_client_shelved_patch_info_t_dirent_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client__shelf_version_t_files_dir_abspath_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; PyObject * obj0 = 0 ; - svn_io_dirent2_t *result = 0 ; + char *result = 0 ; - if (!PyArg_ParseTuple(args,(char *)"O:svn_client_shelved_patch_info_t_dirent_get",&obj0)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_version_t_files_dir_abspath_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_client_shelved_patch_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_shelved_patch_info_t, svn_argnum_obj0); + arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } - result = (svn_io_dirent2_t *) ((arg1)->dirent); - resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_io_dirent2_t, - _global_py_pool, args); + result = (char *) ((arg1)->files_dir_abspath); + resultobj = SWIG_FromCharPtr((const char *)result); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_svn_client_shelved_patch_info_t_mtime_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client__shelf_version_t_version_number_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; - apr_time_t arg2 ; + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + int arg2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_shelved_patch_info_t_mtime_set",&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO:svn_client__shelf_version_t_version_number_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_client_shelved_patch_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_shelved_patch_info_t, svn_argnum_obj0); + arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } - arg2 = (apr_time_t) PyLong_AsLongLong(obj1); - if (arg1) (arg1)->mtime = arg2; + { + arg2 = (int)SWIG_As_long (obj1); + if (SWIG_arg_fail(svn_argnum_obj1)) { + SWIG_fail; + } + } + if (arg1) (arg1)->version_number = arg2; resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -30201,41 +31564,41 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_client_shelved_patch_info_t_mtime_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client__shelf_version_t_version_number_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; PyObject * obj0 = 0 ; - apr_time_t result; + int result; - if (!PyArg_ParseTuple(args,(char *)"O:svn_client_shelved_patch_info_t_mtime_get",&obj0)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_version_t_version_number_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_client_shelved_patch_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_shelved_patch_info_t, svn_argnum_obj0); + arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } - result = ((arg1)->mtime); - resultobj = PyLong_FromLongLong((apr_int64_t)(result)); + result = (int) ((arg1)->version_number); + resultobj = SWIG_From_long((long)(result)); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_new_svn_client_shelved_patch_info_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_new_svn_client__shelf_version_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - struct svn_client_shelved_patch_info_t *result = 0 ; + struct svn_client__shelf_version_t *result = 0 ; - if (!PyArg_ParseTuple(args,(char *)":new_svn_client_shelved_patch_info_t")) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)":new_svn_client__shelf_version_t")) SWIG_fail; { svn_swig_py_release_py_lock(); - result = (struct svn_client_shelved_patch_info_t *)calloc(1, sizeof(struct svn_client_shelved_patch_info_t)); + result = (struct svn_client__shelf_version_t *)calloc(1, sizeof(struct svn_client__shelf_version_t)); svn_swig_py_acquire_py_lock(); } - resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_shelved_patch_info_t, + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client__shelf_version_t, _global_py_pool, args); return resultobj; fail: @@ -30243,14 +31606,14 @@ fail: } -SWIGINTERN PyObject *_wrap_delete_svn_client_shelved_patch_info_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_delete_svn_client__shelf_version_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; PyObject * obj0 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_shelved_patch_info_t",&obj0)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client__shelf_version_t",&obj0)) SWIG_fail; { - arg1 = (struct svn_client_shelved_patch_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_shelved_patch_info_t, svn_argnum_obj0); + arg1 = (struct svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -30270,52 +31633,39 @@ fail: } -SWIGINTERN PyObject *svn_client_shelved_patch_info_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *svn_client__shelf_version_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_svn_client_shelved_patch_info_t, SWIG_NewClientData(obj)); + SWIG_TypeNewClientData(SWIGTYPE_p_svn_client__shelf_version_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } -SWIGINTERN PyObject *_wrap_svn_client_shelves_list(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client__shelf_open_or_create(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - apr_hash_t **arg1 = (apr_hash_t **) 0 ; + svn_client__shelf_t **arg1 = (svn_client__shelf_t **) 0 ; char *arg2 = (char *) 0 ; - svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg4 = (apr_pool_t *) 0 ; + char *arg3 = (char *) 0 ; + svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; apr_pool_t *arg5 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool = NULL ; PyObject *_global_py_pool = NULL ; - apr_hash_t *temp1 ; - PyObject * obj1 = 0 ; + svn_client__shelf_t *temp1 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; svn_error_t *result = 0 ; - if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, - &_global_py_pool, &_global_pool)) - SWIG_fail; - arg4 = _global_pool; if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, &_global_py_pool, &_global_pool)) SWIG_fail; arg5 = _global_pool; arg1 = &temp1; - if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_client_shelves_list",&arg2,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_client__shelf_open_or_create",&arg2,&arg3,&obj2,&obj3)) SWIG_fail; { - arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1); + arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2); if (PyErr_Occurred()) { SWIG_fail; } } - if (obj2) { - /* Verify that the user supplied a valid pool */ - if (obj2 != Py_None && obj2 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); - SWIG_arg_fail(svn_argnum_obj2); - SWIG_fail; - } - } if (obj3) { /* Verify that the user supplied a valid pool */ if (obj3 != Py_None && obj3 != _global_py_pool) { @@ -30327,7 +31677,7 @@ SWIGINTERN PyObject *_wrap_svn_client_shelves_list(PyObject *SWIGUNUSEDPARM(self { svn_swig_py_release_py_lock(); - result = (svn_error_t *)svn_client_shelves_list(arg1,(char const *)arg2,arg3,arg4,arg5); + result = (svn_error_t *)svn_client__shelf_open_or_create(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5); svn_swig_py_acquire_py_lock(); @@ -30344,25 +31694,19 @@ SWIGINTERN PyObject *_wrap_svn_client_shelves_list(PyObject *SWIGUNUSEDPARM(self resultobj = Py_None; } { - /* FIXME: Missing argout typemap: svn_client_shelves_list arg 1 (apr_hash_t **) */ + /* FIXME: Missing argout typemap: svn_client__shelf_open_or_create arg 1 (svn_client__shelf_t **) */ - SWIG_exception(SWIG_ValueError, "svn_client_shelves_list is not implemented yet"); + SWIG_exception(SWIG_ValueError, "svn_client__shelf_open_or_create is not implemented yet"); } { Py_XDECREF(_global_py_pool); } - { - Py_XDECREF(_global_py_pool); - } return resultobj; fail: - { - Py_XDECREF(_global_py_pool); - } { Py_XDECREF(_global_py_pool); } @@ -30370,44 +31714,44 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_client_shelves_any(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client__shelf_open_existing(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - svn_boolean_t *arg1 = (svn_boolean_t *) 0 ; + svn_client__shelf_t **arg1 = (svn_client__shelf_t **) 0 ; char *arg2 = (char *) 0 ; - svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg4 = (apr_pool_t *) 0 ; + char *arg3 = (char *) 0 ; + svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool = NULL ; PyObject *_global_py_pool = NULL ; - svn_boolean_t temp1 ; - int res1 = SWIG_TMPOBJ ; - PyObject * obj1 = 0 ; + svn_client__shelf_t *temp1 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; svn_error_t *result = 0 ; if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, &_global_py_pool, &_global_pool)) SWIG_fail; - arg4 = _global_pool; + arg5 = _global_pool; arg1 = &temp1; - if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_client_shelves_any",&arg2,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_client__shelf_open_existing",&arg2,&arg3,&obj2,&obj3)) SWIG_fail; { - arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1); + arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2); if (PyErr_Occurred()) { SWIG_fail; } } - if (obj2) { + if (obj3) { /* Verify that the user supplied a valid pool */ - if (obj2 != Py_None && obj2 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); - SWIG_arg_fail(svn_argnum_obj2); + if (obj3 != Py_None && obj3 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3); + SWIG_arg_fail(svn_argnum_obj3); SWIG_fail; } } { svn_swig_py_release_py_lock(); - result = (svn_error_t *)svn_client_shelves_any(arg1,(char const *)arg2,arg3,arg4); + result = (svn_error_t *)svn_client__shelf_open_existing(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5); svn_swig_py_acquire_py_lock(); @@ -30423,11 +31767,14 @@ SWIGINTERN PyObject *_wrap_svn_client_shelves_any(PyObject *SWIGUNUSEDPARM(self) Py_INCREF(Py_None); resultobj = Py_None; } - if (SWIG_IsTmpObj(res1)) { - resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg1))); - } else { - int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN | 0 ) : 0 ; - resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags)); + { + /* FIXME: Missing argout typemap: svn_client__shelf_open_existing arg 1 (svn_client__shelf_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_open_existing is not implemented yet"); + } { Py_XDECREF(_global_py_pool); @@ -30441,38 +31788,1149 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_client_shelf_get_paths(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client__shelf_close(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - apr_hash_t **arg1 = (apr_hash_t **) 0 ; - char *arg2 = (char *) 0 ; - char *arg3 = (char *) 0 ; - svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg5 = (apr_pool_t *) 0 ; - apr_pool_t *arg6 = (apr_pool_t *) 0 ; + svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool = NULL ; PyObject *_global_py_pool = NULL ; - apr_hash_t *temp1 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; svn_error_t *result = 0 ; if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, &_global_py_pool, &_global_pool)) SWIG_fail; - arg5 = _global_pool; - if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, - &_global_py_pool, &_global_pool)) - SWIG_fail; - arg6 = _global_pool; - arg1 = &temp1; - if (!PyArg_ParseTuple(args,(char *)"ssO|OO:svn_client_shelf_get_paths",&arg2,&arg3,&obj2,&obj3,&obj4)) SWIG_fail; + arg2 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client__shelf_close",&obj0,&obj1)) SWIG_fail; { - arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2); + arg1 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_close(arg1,arg2); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_delete(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + svn_boolean_t arg3 ; + svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg5 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"ssOO|O:svn_client__shelf_delete",&arg1,&arg2,&obj2,&obj3,&obj4)) SWIG_fail; + { + arg3 = (svn_boolean_t)SWIG_As_long (obj2); + if (SWIG_arg_fail(svn_argnum_obj2)) { + SWIG_fail; + } + } + { + arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj4) { + /* Verify that the user supplied a valid pool */ + if (obj4 != Py_None && obj4 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4); + SWIG_arg_fail(svn_argnum_obj4); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_delete((char const *)arg1,(char const *)arg2,arg3,arg4,arg5); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_mods_editor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_delta_editor_t **arg1 = (svn_delta_editor_t **) 0 ; + void **arg2 = (void **) 0 ; + svn_client__shelf_version_t *arg3 = (svn_client__shelf_version_t *) 0 ; + svn_wc_notify_func2_t arg4 = (svn_wc_notify_func2_t) 0 ; + void *arg5 = (void *) 0 ; + svn_client_ctx_t *arg6 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + svn_delta_editor_t *temp1 ; + void *temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg7 = _global_pool; + arg1 = &temp1; + arg2 = &temp2; + if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client__shelf_mods_editor",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + { + arg3 = (svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg4 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2; + arg5 = obj1; + } + { + arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj3) { + /* Verify that the user supplied a valid pool */ + if (obj3 != Py_None && obj3 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3); + SWIG_arg_fail(svn_argnum_obj3); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_mods_editor((struct svn_delta_editor_t const **)arg1,arg2,arg3,arg4,arg5,arg6,arg7); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t, + _global_py_pool, args)) + + ; + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_mods_editor arg 2 (void **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_mods_editor is not implemented yet"); + + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_save_new_version3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + apr_array_header_t *arg3 = (apr_array_header_t *) 0 ; + svn_depth_t arg4 ; + apr_array_header_t *arg5 = (apr_array_header_t *) 0 ; + svn_client_status_func_t arg6 = (svn_client_status_func_t) 0 ; + void *arg7 = (void *) 0 ; + svn_client_status_func_t arg8 = (svn_client_status_func_t) 0 ; + void *arg9 = (void *) 0 ; + apr_pool_t *arg10 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + svn_client__shelf_version_t *temp1 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg10 = _global_pool; + arg1 = &temp1; + if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO|O:svn_client__shelf_save_new_version3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail; + { + arg2 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg3 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj1, + sizeof(const char *), + svn_swig_py_unwrap_string, + NULL, + _global_pool); + if (PyErr_Occurred()) + SWIG_fail; + } + { + arg4 = (svn_depth_t)SWIG_As_long (obj2); + if (SWIG_arg_fail(svn_argnum_obj2)) { + SWIG_fail; + } + } + { + arg5 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj3, + sizeof(const char *), + svn_swig_py_unwrap_string, + NULL, + _global_pool); + if (PyErr_Occurred()) + SWIG_fail; + } + { + svn_client_status_func_t * tmp = + svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj4); + if (tmp == NULL || PyErr_Occurred()) { + SWIG_fail; + } + arg6 = *tmp; + } + { + if (obj5 == Py_None) { + arg7 = NULL; + } else if (SWIG_ConvertPtr(obj5, (void **) &arg7, 0, 0) == -1) { + arg7 = (void *) obj5; + PyErr_Clear(); + } + } + { + svn_client_status_func_t * tmp = + svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6); + if (tmp == NULL || PyErr_Occurred()) { + SWIG_fail; + } + arg8 = *tmp; + } + { + if (obj7 == Py_None) { + arg9 = NULL; + } else if (SWIG_ConvertPtr(obj7, (void **) &arg9, 0, 0) == -1) { + arg9 = (void *) obj7; + PyErr_Clear(); + } + } + if (obj8) { + /* Verify that the user supplied a valid pool */ + if (obj8 != Py_None && obj8 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj8); + SWIG_arg_fail(svn_argnum_obj8); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_save_new_version3(arg1,arg2,(apr_array_header_t const *)arg3,arg4,(apr_array_header_t const *)arg5,arg6,arg7,arg8,arg9,arg10); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_save_new_version3 arg 1 (svn_client__shelf_version_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_save_new_version3 is not implemented yet"); + + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_delete_newer_versions(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ; + svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg3 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_client__shelf_delete_newer_versions",&obj0,&obj1,&obj2)) SWIG_fail; + { + arg1 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg2 = (svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_delete_newer_versions(arg1,arg2,arg3); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_version_open(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + int arg3 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + svn_client__shelf_version_t *temp1 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg5 = _global_pool; + arg1 = &temp1; + if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_client__shelf_version_open",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + { + arg2 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg3 = (int)SWIG_As_long (obj1); + if (SWIG_arg_fail(svn_argnum_obj1)) { + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + if (obj3) { + /* Verify that the user supplied a valid pool */ + if (obj3 != Py_None && obj3 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3); + SWIG_arg_fail(svn_argnum_obj3); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_version_open(arg1,arg2,arg3,arg4,arg5); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_version_open arg 1 (svn_client__shelf_version_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_version_open is not implemented yet"); + + } + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_get_newest_version(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + svn_client__shelf_version_t *temp1 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg3 = _global_pool; + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + arg1 = &temp1; + if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_client__shelf_get_newest_version",&obj0,&obj1,&obj2)) SWIG_fail; + { + arg2 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_get_newest_version(arg1,arg2,arg3,arg4); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_get_newest_version arg 1 (svn_client__shelf_version_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_newest_version is not implemented yet"); + + } + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_get_all_versions(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + apr_array_header_t **arg1 = (apr_array_header_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + apr_array_header_t *temp1 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg3 = _global_pool; + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + arg1 = &temp1; + if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_client__shelf_get_all_versions",&obj0,&obj1,&obj2)) SWIG_fail; + { + arg2 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_get_all_versions(arg1,arg2,arg3,arg4); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_get_all_versions arg 1 (apr_array_header_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_all_versions is not implemented yet"); + + } + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_apply(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ; + svn_boolean_t arg2 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg3 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_client__shelf_apply",&obj0,&obj1,&obj2)) SWIG_fail; + { + arg1 = (svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg2 = (svn_boolean_t)SWIG_As_long (obj1); + if (SWIG_arg_fail(svn_argnum_obj1)) { + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_apply(arg1,arg2,arg3); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_test_apply_file(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_boolean_t *arg1 = (svn_boolean_t *) 0 ; + svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_t *) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + svn_boolean_t temp1 ; + int res1 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + arg1 = &temp1; + if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_client__shelf_test_apply_file",&obj0,&arg3,&obj2)) SWIG_fail; + { + arg2 = (svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_test_apply_file(arg1,arg2,(char const *)arg3,arg4); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + if (SWIG_IsTmpObj(res1)) { + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg1))); + } else { + int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags)); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_unapply(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ; + svn_boolean_t arg2 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg3 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_client__shelf_unapply",&obj0,&obj1,&obj2)) SWIG_fail; + { + arg1 = (svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg2 = (svn_boolean_t)SWIG_As_long (obj1); + if (SWIG_arg_fail(svn_argnum_obj1)) { + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_unapply(arg1,arg2,arg3); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_replay(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_delta_editor_t *arg3 = (svn_delta_editor_t *) 0 ; + void *arg4 = (void *) 0 ; + svn_wc_notify_func2_t arg5 = (svn_wc_notify_func2_t) 0 ; + void *arg6 = (void *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg7 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_client__shelf_replay",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; + { + arg1 = (svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg3 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj2); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + if (obj3 == Py_None) { + arg4 = NULL; + } else if (SWIG_ConvertPtr(obj3, (void **) &arg4, 0, 0) == -1) { + arg4 = (void *) obj3; + PyErr_Clear(); + } + } + { + arg5 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2; + arg6 = obj4; + } + if (obj5) { + /* Verify that the user supplied a valid pool */ + if (obj5 != Py_None && obj5 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj5); + SWIG_arg_fail(svn_argnum_obj5); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_replay(arg1,(char const *)arg2,(struct svn_delta_editor_t const *)arg3,arg4,arg5,arg6,arg7); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_paths_changed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + apr_hash_t **arg1 = (apr_hash_t **) 0 ; + svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + apr_hash_t *temp1 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg3 = _global_pool; + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + arg1 = &temp1; + if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_client__shelf_paths_changed",&obj0,&obj1,&obj2)) SWIG_fail; + { + arg2 = (svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_paths_changed(arg1,arg2,arg3,arg4); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_paths_changed arg 1 (apr_hash_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_paths_changed is not implemented yet"); + + } + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_revprop_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_string_t *arg3 = (svn_string_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + svn_string_t value3 ; + PyObject * obj0 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_client__shelf_revprop_set",&obj0,&arg2,&obj2,&obj3)) SWIG_fail; + { + arg1 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + if (obj2 == Py_None) + arg3 = NULL; + else { + if (!PyString_Check(obj2)) { + PyErr_SetString(PyExc_TypeError, "not a string"); + SWIG_fail; + } + value3.data = PyString_AS_STRING(obj2); + value3.len = PyString_GET_SIZE(obj2); + arg3 = &value3; + } + } if (obj3) { /* Verify that the user supplied a valid pool */ if (obj3 != Py_None && obj3 != _global_py_pool) { @@ -30481,18 +32939,538 @@ SWIGINTERN PyObject *_wrap_svn_client_shelf_get_paths(PyObject *SWIGUNUSEDPARM(s SWIG_fail; } } - if (obj4) { + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_revprop_set(arg1,(char const *)arg2,(struct svn_string_t const *)arg3,arg4); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_revprop_set_all(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ; + apr_hash_t *arg2 = (apr_hash_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg3 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_client__shelf_revprop_set_all",&obj0,&obj1,&obj2)) SWIG_fail; + { + arg1 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + if (_global_pool == NULL) + { + if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + } + + arg2 = svn_swig_py_prophash_from_dict(obj1, _global_pool); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj2) { /* Verify that the user supplied a valid pool */ - if (obj4 != Py_None && obj4 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4); - SWIG_arg_fail(svn_argnum_obj4); + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_revprop_set_all(arg1,arg2,arg3); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_revprop_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_string_t **arg1 = (svn_string_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + svn_string_t *temp1 ; + PyObject * obj0 = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + arg1 = &temp1; + if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_client__shelf_revprop_get",&obj0,&arg3,&obj2)) SWIG_fail; + { + arg2 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_revprop_get(arg1,arg2,(char const *)arg3,arg4); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + PyObject *s; + if (*arg1 == NULL) { + Py_INCREF(Py_None); + s = Py_None; + } + else { + s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len); + if (s == NULL) + SWIG_fail; + } + resultobj = SWIG_Python_AppendOutput(resultobj, s); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_revprop_list(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + apr_hash_t **arg1 = (apr_hash_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + apr_hash_t *temp1 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg3 = _global_pool; + arg1 = &temp1; + if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client__shelf_revprop_list",&obj0,&obj1)) SWIG_fail; + { + arg2 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_revprop_list(arg1,arg2,arg3); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_prophash_to_dict(*arg1)); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_set_log_message(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ; + char *arg2 = (char *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg3 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_client__shelf_set_log_message",&obj0,&arg2,&obj2)) SWIG_fail; + { + arg1 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_set_log_message(arg1,(char const *)arg2,arg3); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_get_log_message(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char **arg1 = (char **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + char *temp1 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg3 = _global_pool; + arg1 = &temp1; + if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client__shelf_get_log_message",&obj0,&obj1)) SWIG_fail; + { + arg2 = (svn_client__shelf_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client__shelf_get_log_message(arg1,arg2,arg3); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_get_log_message arg 1 (char **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_log_message is not implemented yet"); + + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_info_t_mtime_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *) 0 ; + apr_time_t arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:svn_client__shelf_info_t_mtime_set",&obj0,&obj1)) SWIG_fail; + { + arg1 = (struct svn_client__shelf_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_info_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + arg2 = (apr_time_t) PyLong_AsLongLong(obj1); + if (arg1) (arg1)->mtime = arg2; + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_client__shelf_info_t_mtime_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *) 0 ; + PyObject * obj0 = 0 ; + apr_time_t result; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_client__shelf_info_t_mtime_get",&obj0)) SWIG_fail; + { + arg1 = (struct svn_client__shelf_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_info_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + result = ((arg1)->mtime); + resultobj = PyLong_FromLongLong((apr_int64_t)(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_svn_client__shelf_info_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_info_t *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)":new_svn_client__shelf_info_t")) SWIG_fail; + { + svn_swig_py_release_py_lock(); + + result = (struct svn_client__shelf_info_t *)calloc(1, sizeof(struct svn_client__shelf_info_t)); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client__shelf_info_t, + _global_py_pool, args); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_delete_svn_client__shelf_info_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *) 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client__shelf_info_t",&obj0)) SWIG_fail; + { + arg1 = (struct svn_client__shelf_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_info_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + free((char *) arg1); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *svn_client__shelf_info_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_svn_client__shelf_info_t, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *_wrap_svn_client__shelf_list(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + apr_hash_t **arg1 = (apr_hash_t **) 0 ; + char *arg2 = (char *) 0 ; + svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + apr_hash_t *temp1 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg5 = _global_pool; + arg1 = &temp1; + if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_client__shelf_list",&arg2,&obj1,&obj2,&obj3)) SWIG_fail; + { + arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + if (obj3) { + /* Verify that the user supplied a valid pool */ + if (obj3 != Py_None && obj3 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3); + SWIG_arg_fail(svn_argnum_obj3); SWIG_fail; } } { svn_swig_py_release_py_lock(); - result = (svn_error_t *)svn_client_shelf_get_paths(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6); + result = (svn_error_t *)svn_client__shelf_list(arg1,(char const *)arg2,arg3,arg4,arg5); svn_swig_py_acquire_py_lock(); @@ -30509,12 +33487,12 @@ SWIGINTERN PyObject *_wrap_svn_client_shelf_get_paths(PyObject *SWIGUNUSEDPARM(s resultobj = Py_None; } { - /* FIXME: Missing argout typemap: svn_client_shelf_get_paths arg 1 (apr_hash_t **) */ + /* FIXME: Missing argout typemap: svn_client__shelf_list arg 1 (apr_hash_t **) */ - SWIG_exception(SWIG_ValueError, "svn_client_shelf_get_paths is not implemented yet"); + SWIG_exception(SWIG_ValueError, "svn_client__shelf_list is not implemented yet"); } { @@ -30535,45 +33513,60 @@ fail: } -SWIGINTERN PyObject *_wrap_svn_client_shelf_has_changes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_svn_client__shelf_version_status_walk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - svn_boolean_t *arg1 = (svn_boolean_t *) 0 ; + svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ; char *arg2 = (char *) 0 ; - char *arg3 = (char *) 0 ; - svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + svn_wc_status_func4_t arg3 = (svn_wc_status_func4_t) 0 ; + void *arg4 = (void *) 0 ; apr_pool_t *arg5 = (apr_pool_t *) 0 ; apr_pool_t *_global_pool = NULL ; PyObject *_global_py_pool = NULL ; - svn_boolean_t temp1 ; - int res1 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; svn_error_t *result = 0 ; if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, &_global_py_pool, &_global_pool)) SWIG_fail; arg5 = _global_pool; - arg1 = &temp1; - if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_client_shelf_has_changes",&arg2,&arg3,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_client__shelf_version_status_walk",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail; { - arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2); + arg1 = (svn_client__shelf_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client__shelf_version_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } - if (obj3) { + { + svn_wc_status_func4_t * tmp = + svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj2); + if (tmp == NULL || PyErr_Occurred()) { + SWIG_fail; + } + arg3 = *tmp; + } + { + if (obj3 == Py_None) { + arg4 = NULL; + } else if (SWIG_ConvertPtr(obj3, (void **) &arg4, 0, 0) == -1) { + arg4 = (void *) obj3; + PyErr_Clear(); + } + } + if (obj4) { /* Verify that the user supplied a valid pool */ - if (obj3 != Py_None && obj3 != _global_py_pool) { - SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3); - SWIG_arg_fail(svn_argnum_obj3); + if (obj4 != Py_None && obj4 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4); + SWIG_arg_fail(svn_argnum_obj4); SWIG_fail; } } { svn_swig_py_release_py_lock(); - result = (svn_error_t *)svn_client_shelf_has_changes(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5); + result = (svn_error_t *)svn_client__shelf_version_status_walk(arg1,(char const *)arg2,arg3,arg4,arg5); svn_swig_py_acquire_py_lock(); @@ -30589,12 +33582,6 @@ SWIGINTERN PyObject *_wrap_svn_client_shelf_has_changes(PyObject *SWIGUNUSEDPARM Py_INCREF(Py_None); resultobj = Py_None; } - if (SWIG_IsTmpObj(res1)) { - resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg1))); - } else { - int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN | 0 ) : 0 ; - resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags)); - } { Py_XDECREF(_global_py_pool); } @@ -35188,6 +38175,138 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_client_blame_receiver4_t arg1 = (svn_client_blame_receiver4_t) 0 ; + void *arg2 = (void *) 0 ; + apr_int64_t arg3 ; + svn_revnum_t arg4 ; + apr_hash_t *arg5 = (apr_hash_t *) 0 ; + svn_revnum_t arg6 ; + apr_hash_t *arg7 = (apr_hash_t *) 0 ; + char *arg8 = (char *) 0 ; + svn_string_t *arg9 = (svn_string_t *) 0 ; + svn_boolean_t arg10 ; + apr_pool_t *arg11 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + svn_string_t value9 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj8 = 0 ; + PyObject * obj9 = 0 ; + PyObject * obj10 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg11 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OOOOOOOsOO|O:svn_client_invoke_blame_receiver4",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&arg8,&obj8,&obj9,&obj10)) SWIG_fail; + { + svn_client_blame_receiver4_t * tmp = + svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0); + if (tmp == NULL || PyErr_Occurred()) { + SWIG_fail; + } + arg1 = *tmp; + } + { + if (obj1 == Py_None) { + arg2 = NULL; + } else if (SWIG_ConvertPtr(obj1, (void **) &arg2, 0, 0) == -1) { + arg2 = (void *) obj1; + PyErr_Clear(); + } + } + arg3 = (apr_int64_t) PyLong_AsLongLong(obj2); + { + arg4 = (svn_revnum_t)SWIG_As_long (obj3); + if (SWIG_arg_fail(svn_argnum_obj3)) { + SWIG_fail; + } + } + { + arg5 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_hash_t, svn_argnum_obj4); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg6 = (svn_revnum_t)SWIG_As_long (obj5); + if (SWIG_arg_fail(svn_argnum_obj5)) { + SWIG_fail; + } + } + { + arg7 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_apr_hash_t, svn_argnum_obj6); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + if (obj8 == Py_None) + arg9 = NULL; + else { + if (!PyString_Check(obj8)) { + PyErr_SetString(PyExc_TypeError, "not a string"); + SWIG_fail; + } + value9.data = PyString_AS_STRING(obj8); + value9.len = PyString_GET_SIZE(obj8); + arg9 = &value9; + } + } + { + arg10 = (svn_boolean_t)SWIG_As_long (obj9); + if (SWIG_arg_fail(svn_argnum_obj9)) { + SWIG_fail; + } + } + if (obj10) { + /* Verify that the user supplied a valid pool */ + if (obj10 != Py_None && obj10 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj10); + SWIG_arg_fail(svn_argnum_obj10); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client_invoke_blame_receiver4(arg1,arg2,arg3,arg4,arg5,arg6,arg7,(char const *)arg8,(struct svn_string_t const *)arg9,arg10,arg11); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_client_blame_receiver3_t arg1 = (svn_client_blame_receiver3_t) 0 ; @@ -35584,6 +38703,129 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_client_invoke__layout_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_client__layout_func_t arg1 = (svn_client__layout_func_t) 0 ; + void *arg2 = (void *) 0 ; + char *arg3 = (char *) 0 ; + char *arg4 = (char *) 0 ; + svn_boolean_t arg5 ; + svn_boolean_t arg6 ; + char *arg7 = (char *) 0 ; + svn_boolean_t arg8 ; + svn_revnum_t arg9 ; + svn_boolean_t arg10 ; + svn_depth_t arg11 ; + apr_pool_t *arg12 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; + PyObject * obj9 = 0 ; + PyObject * obj10 = 0 ; + PyObject * obj11 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg12 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OOssOOsOOOO|O:svn_client_invoke__layout_func",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5,&arg7,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail; + { + svn_client__layout_func_t * tmp = + svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0); + if (tmp == NULL || PyErr_Occurred()) { + SWIG_fail; + } + arg1 = *tmp; + } + { + if (obj1 == Py_None) { + arg2 = NULL; + } else if (SWIG_ConvertPtr(obj1, (void **) &arg2, 0, 0) == -1) { + arg2 = (void *) obj1; + PyErr_Clear(); + } + } + { + arg5 = (svn_boolean_t)SWIG_As_long (obj4); + if (SWIG_arg_fail(svn_argnum_obj4)) { + SWIG_fail; + } + } + { + arg6 = (svn_boolean_t)SWIG_As_long (obj5); + if (SWIG_arg_fail(svn_argnum_obj5)) { + SWIG_fail; + } + } + { + arg8 = (svn_boolean_t)SWIG_As_long (obj7); + if (SWIG_arg_fail(svn_argnum_obj7)) { + SWIG_fail; + } + } + { + arg9 = (svn_revnum_t)SWIG_As_long (obj8); + if (SWIG_arg_fail(svn_argnum_obj8)) { + SWIG_fail; + } + } + { + arg10 = (svn_boolean_t)SWIG_As_long (obj9); + if (SWIG_arg_fail(svn_argnum_obj9)) { + SWIG_fail; + } + } + { + arg11 = (svn_depth_t)SWIG_As_long (obj10); + if (SWIG_arg_fail(svn_argnum_obj10)) { + SWIG_fail; + } + } + if (obj11) { + /* Verify that the user supplied a valid pool */ + if (obj11 != Py_None && obj11 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj11); + SWIG_arg_fail(svn_argnum_obj11); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_client_invoke__layout_func(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,(char const *)arg7,arg8,arg9,arg10,arg11,arg12); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_client_invoke_import_filter_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_client_import_filter_func_t arg1 = (svn_client_import_filter_func_t) 0 ; @@ -36300,6 +39542,13 @@ SWIGINTERN PyObject *svn_client_get_commit_log_t_swigregister(PyObject *SWIGUNUS return SWIG_Py_Void(); } +SWIGINTERN PyObject *svn_client_blame_receiver4_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + SWIGINTERN PyObject *svn_client_blame_receiver3_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; @@ -36328,6 +39577,13 @@ SWIGINTERN PyObject *svn_client_diff_summarize_func_t_swigregister(PyObject *SWI return SWIG_Py_Void(); } +SWIGINTERN PyObject *svn_client__layout_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + SWIGINTERN PyObject *svn_client_import_filter_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; @@ -36553,6 +39809,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_client_switch3", _wrap_svn_client_switch3, METH_VARARGS, (char *)"svn_client_switch3(char const * path, char const * url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_boolean_t ignore_ancestry, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_switch2", _wrap_svn_client_switch2, METH_VARARGS, (char *)"svn_client_switch2(char const * path, char const * url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_switch", _wrap_svn_client_switch, METH_VARARGS, (char *)"svn_client_switch(char const * path, char const * url, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, + { (char *)"svn_client__layout_list", _wrap_svn_client__layout_list, METH_VARARGS, (char *)"svn_client__layout_list(char const * local_abspath, svn_client__layout_func_t layout, void * layout_baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_client_add5", _wrap_svn_client_add5, METH_VARARGS, (char *)"svn_client_add5(char const * path, svn_depth_t depth, svn_boolean_t force, svn_boolean_t no_ignore, svn_boolean_t no_autoprops, svn_boolean_t add_parents, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_client_add4", _wrap_svn_client_add4, METH_VARARGS, (char *)"svn_client_add4(char const * path, svn_depth_t depth, svn_boolean_t force, svn_boolean_t no_ignore, svn_boolean_t add_parents, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_add3", _wrap_svn_client_add3, METH_VARARGS, (char *)"svn_client_add3(char const * path, svn_boolean_t recursive, svn_boolean_t force, svn_boolean_t no_ignore, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, @@ -36658,17 +39915,20 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_client_log3", _wrap_svn_client_log3, METH_VARARGS, (char *)"svn_client_log3(apr_array_header_t targets, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_log_message_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_log2", _wrap_svn_client_log2, METH_VARARGS, (char *)"svn_client_log2(apr_array_header_t targets, svn_opt_revision_t start, svn_opt_revision_t end, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_log_message_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_log", _wrap_svn_client_log, METH_VARARGS, (char *)"svn_client_log(apr_array_header_t targets, svn_opt_revision_t start, svn_opt_revision_t end, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_log_message_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, + { (char *)"svn_client_blame6", _wrap_svn_client_blame6, METH_VARARGS, (char *)"svn_client_blame6(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_boolean_t include_merged_revisions, svn_client_blame_receiver4_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_blame5", _wrap_svn_client_blame5, METH_VARARGS, (char *)"svn_client_blame5(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_boolean_t include_merged_revisions, svn_client_blame_receiver3_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_blame4", _wrap_svn_client_blame4, METH_VARARGS, (char *)"svn_client_blame4(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_boolean_t include_merged_revisions, svn_client_blame_receiver2_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_blame3", _wrap_svn_client_blame3, METH_VARARGS, (char *)"svn_client_blame3(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_client_blame_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_blame2", _wrap_svn_client_blame2, METH_VARARGS, (char *)"svn_client_blame2(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_client_blame_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_blame", _wrap_svn_client_blame, METH_VARARGS, (char *)"svn_client_blame(char const * path_or_url, svn_opt_revision_t start, svn_opt_revision_t end, svn_client_blame_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, + { (char *)"svn_client_diff7", _wrap_svn_client_diff7, METH_VARARGS, (char *)"svn_client_diff7(apr_array_header_t diff_options, char const * path_or_url1, svn_opt_revision_t revision1, char const * path_or_url2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, svn_boolean_t pretty_print_mergeinfo, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_diff6", _wrap_svn_client_diff6, METH_VARARGS, (char *)"svn_client_diff6(apr_array_header_t diff_options, char const * path_or_url1, svn_opt_revision_t revision1, char const * path_or_url2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_diff5", _wrap_svn_client_diff5, METH_VARARGS, (char *)"svn_client_diff5(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t use_git_diff_format, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_diff4", _wrap_svn_client_diff4, METH_VARARGS, (char *)"svn_client_diff4(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_diff3", _wrap_svn_client_diff3, METH_VARARGS, (char *)"svn_client_diff3(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_diff2", _wrap_svn_client_diff2, METH_VARARGS, (char *)"svn_client_diff2(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_diff", _wrap_svn_client_diff, METH_VARARGS, (char *)"svn_client_diff(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, + { (char *)"svn_client_diff_peg7", _wrap_svn_client_diff_peg7, METH_VARARGS, (char *)"svn_client_diff_peg7(apr_array_header_t diff_options, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, svn_boolean_t pretty_print_mergeinfo, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_diff_peg6", _wrap_svn_client_diff_peg6, METH_VARARGS, (char *)"svn_client_diff_peg6(apr_array_header_t diff_options, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_diff_peg5", _wrap_svn_client_diff_peg5, METH_VARARGS, (char *)"svn_client_diff_peg5(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t use_git_diff_format, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_diff_peg4", _wrap_svn_client_diff_peg4, METH_VARARGS, (char *)"svn_client_diff_peg4(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, @@ -36703,13 +39963,18 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_client_upgrade", _wrap_svn_client_upgrade, METH_VARARGS, (char *)"svn_client_upgrade(char const * wcroot_dir, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_client_relocate2", _wrap_svn_client_relocate2, METH_VARARGS, (char *)"svn_client_relocate2(char const * wcroot_dir, char const * from_prefix, char const * to_prefix, svn_boolean_t ignore_externals, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_relocate", _wrap_svn_client_relocate, METH_VARARGS, (char *)"svn_client_relocate(char const * dir, char const * from_prefix, char const * to_prefix, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, + { (char *)"svn_client_revert4", _wrap_svn_client_revert4, METH_VARARGS, (char *)"svn_client_revert4(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, svn_boolean_t added_keep_local, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_client_revert3", _wrap_svn_client_revert3, METH_VARARGS, (char *)"svn_client_revert3(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_revert2", _wrap_svn_client_revert2, METH_VARARGS, (char *)"svn_client_revert2(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_revert", _wrap_svn_client_revert, METH_VARARGS, (char *)"svn_client_revert(apr_array_header_t paths, svn_boolean_t recursive, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_conflict_option_set_merged_propval", _wrap_svn_client_conflict_option_set_merged_propval, METH_VARARGS, (char *)"svn_client_conflict_option_set_merged_propval(svn_client_conflict_option_t * option, svn_string_t const * merged_propval)"}, + { (char *)"svn_client_conflict_option_get_moved_to_repos_relpath_candidates2", _wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates2, METH_VARARGS, (char *)"svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_client_conflict_option_get_moved_to_repos_relpath_candidates", _wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates, METH_VARARGS, (char *)"svn_client_conflict_option_get_moved_to_repos_relpath_candidates(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client_conflict_option_set_moved_to_repos_relpath2", _wrap_svn_client_conflict_option_set_moved_to_repos_relpath2, METH_VARARGS, (char *)"svn_client_conflict_option_set_moved_to_repos_relpath2(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_client_conflict_option_set_moved_to_repos_relpath", _wrap_svn_client_conflict_option_set_moved_to_repos_relpath, METH_VARARGS, (char *)"svn_client_conflict_option_set_moved_to_repos_relpath(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client_conflict_option_get_moved_to_abspath_candidates2", _wrap_svn_client_conflict_option_get_moved_to_abspath_candidates2, METH_VARARGS, (char *)"svn_client_conflict_option_get_moved_to_abspath_candidates2(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_client_conflict_option_get_moved_to_abspath_candidates", _wrap_svn_client_conflict_option_get_moved_to_abspath_candidates, METH_VARARGS, (char *)"svn_client_conflict_option_get_moved_to_abspath_candidates(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client_conflict_option_set_moved_to_abspath2", _wrap_svn_client_conflict_option_set_moved_to_abspath2, METH_VARARGS, (char *)"svn_client_conflict_option_set_moved_to_abspath2(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_client_conflict_option_set_moved_to_abspath", _wrap_svn_client_conflict_option_set_moved_to_abspath, METH_VARARGS, (char *)"svn_client_conflict_option_set_moved_to_abspath(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_client_conflict_option_find_by_id", _wrap_svn_client_conflict_option_find_by_id, METH_VARARGS, (char *)"svn_client_conflict_option_find_by_id(apr_array_header_t options, svn_client_conflict_option_id_t option_id) -> svn_client_conflict_option_t *"}, { (char *)"svn_client_conflict_get", _wrap_svn_client_conflict_get, METH_VARARGS, (char *)"svn_client_conflict_get(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, @@ -36804,24 +40069,62 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_client_cat3", _wrap_svn_client_cat3, METH_VARARGS, (char *)"svn_client_cat3(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t expand_keywords, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_client_cat2", _wrap_svn_client_cat2, METH_VARARGS, (char *)"svn_client_cat2(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_cat", _wrap_svn_client_cat, METH_VARARGS, (char *)"svn_client_cat(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, - { (char *)"svn_client_shelve", _wrap_svn_client_shelve, METH_VARARGS, (char *)"svn_client_shelve(char const * name, apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_boolean_t keep_local, svn_boolean_t dry_run, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, - { (char *)"svn_client_unshelve", _wrap_svn_client_unshelve, METH_VARARGS, (char *)"svn_client_unshelve(char const * name, char const * local_abspath, svn_boolean_t keep, svn_boolean_t dry_run, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, - { (char *)"svn_client_shelves_delete", _wrap_svn_client_shelves_delete, METH_VARARGS, (char *)"svn_client_shelves_delete(char const * name, char const * local_abspath, svn_boolean_t dry_run, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, - { (char *)"svn_client_shelved_patch_info_t_message_set", _wrap_svn_client_shelved_patch_info_t_message_set, METH_VARARGS, (char *)"svn_client_shelved_patch_info_t_message_set(svn_client_shelved_patch_info_t self, char const * message)"}, - { (char *)"svn_client_shelved_patch_info_t_message_get", _wrap_svn_client_shelved_patch_info_t_message_get, METH_VARARGS, (char *)"svn_client_shelved_patch_info_t_message_get(svn_client_shelved_patch_info_t self) -> char const *"}, - { (char *)"svn_client_shelved_patch_info_t_patch_path_set", _wrap_svn_client_shelved_patch_info_t_patch_path_set, METH_VARARGS, (char *)"svn_client_shelved_patch_info_t_patch_path_set(svn_client_shelved_patch_info_t self, char const * patch_path)"}, - { (char *)"svn_client_shelved_patch_info_t_patch_path_get", _wrap_svn_client_shelved_patch_info_t_patch_path_get, METH_VARARGS, (char *)"svn_client_shelved_patch_info_t_patch_path_get(svn_client_shelved_patch_info_t self) -> char const *"}, - { (char *)"svn_client_shelved_patch_info_t_dirent_set", _wrap_svn_client_shelved_patch_info_t_dirent_set, METH_VARARGS, (char *)"svn_client_shelved_patch_info_t_dirent_set(svn_client_shelved_patch_info_t self, svn_io_dirent2_t dirent)"}, - { (char *)"svn_client_shelved_patch_info_t_dirent_get", _wrap_svn_client_shelved_patch_info_t_dirent_get, METH_VARARGS, (char *)"svn_client_shelved_patch_info_t_dirent_get(svn_client_shelved_patch_info_t self) -> svn_io_dirent2_t"}, - { (char *)"svn_client_shelved_patch_info_t_mtime_set", _wrap_svn_client_shelved_patch_info_t_mtime_set, METH_VARARGS, (char *)"svn_client_shelved_patch_info_t_mtime_set(svn_client_shelved_patch_info_t self, apr_time_t mtime)"}, - { (char *)"svn_client_shelved_patch_info_t_mtime_get", _wrap_svn_client_shelved_patch_info_t_mtime_get, METH_VARARGS, (char *)"svn_client_shelved_patch_info_t_mtime_get(svn_client_shelved_patch_info_t self) -> apr_time_t"}, - { (char *)"new_svn_client_shelved_patch_info_t", _wrap_new_svn_client_shelved_patch_info_t, METH_VARARGS, (char *)"new_svn_client_shelved_patch_info_t() -> svn_client_shelved_patch_info_t"}, - { (char *)"delete_svn_client_shelved_patch_info_t", _wrap_delete_svn_client_shelved_patch_info_t, METH_VARARGS, (char *)"delete_svn_client_shelved_patch_info_t(svn_client_shelved_patch_info_t self)"}, - { (char *)"svn_client_shelved_patch_info_t_swigregister", svn_client_shelved_patch_info_t_swigregister, METH_VARARGS, NULL}, - { (char *)"svn_client_shelves_list", _wrap_svn_client_shelves_list, METH_VARARGS, (char *)"svn_client_shelves_list(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, - { (char *)"svn_client_shelves_any", _wrap_svn_client_shelves_any, METH_VARARGS, (char *)"svn_client_shelves_any(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"}, - { (char *)"svn_client_shelf_get_paths", _wrap_svn_client_shelf_get_paths, METH_VARARGS, (char *)"svn_client_shelf_get_paths(char const * name, char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, - { (char *)"svn_client_shelf_has_changes", _wrap_svn_client_shelf_has_changes, METH_VARARGS, (char *)"svn_client_shelf_has_changes(char const * name, char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_t_name_set", _wrap_svn_client__shelf_t_name_set, METH_VARARGS, (char *)"svn_client__shelf_t_name_set(svn_client__shelf_t self, char const * name)"}, + { (char *)"svn_client__shelf_t_name_get", _wrap_svn_client__shelf_t_name_get, METH_VARARGS, (char *)"svn_client__shelf_t_name_get(svn_client__shelf_t self) -> char const *"}, + { (char *)"svn_client__shelf_t_max_version_set", _wrap_svn_client__shelf_t_max_version_set, METH_VARARGS, (char *)"svn_client__shelf_t_max_version_set(svn_client__shelf_t self, int max_version)"}, + { (char *)"svn_client__shelf_t_max_version_get", _wrap_svn_client__shelf_t_max_version_get, METH_VARARGS, (char *)"svn_client__shelf_t_max_version_get(svn_client__shelf_t self) -> int"}, + { (char *)"svn_client__shelf_t_wc_root_abspath_set", _wrap_svn_client__shelf_t_wc_root_abspath_set, METH_VARARGS, (char *)"svn_client__shelf_t_wc_root_abspath_set(svn_client__shelf_t self, char const * wc_root_abspath)"}, + { (char *)"svn_client__shelf_t_wc_root_abspath_get", _wrap_svn_client__shelf_t_wc_root_abspath_get, METH_VARARGS, (char *)"svn_client__shelf_t_wc_root_abspath_get(svn_client__shelf_t self) -> char const *"}, + { (char *)"svn_client__shelf_t_shelves_dir_set", _wrap_svn_client__shelf_t_shelves_dir_set, METH_VARARGS, (char *)"svn_client__shelf_t_shelves_dir_set(svn_client__shelf_t self, char const * shelves_dir)"}, + { (char *)"svn_client__shelf_t_shelves_dir_get", _wrap_svn_client__shelf_t_shelves_dir_get, METH_VARARGS, (char *)"svn_client__shelf_t_shelves_dir_get(svn_client__shelf_t self) -> char const *"}, + { (char *)"svn_client__shelf_t_revprops_set", _wrap_svn_client__shelf_t_revprops_set, METH_VARARGS, (char *)"svn_client__shelf_t_revprops_set(svn_client__shelf_t self, apr_hash_t revprops)"}, + { (char *)"svn_client__shelf_t_revprops_get", _wrap_svn_client__shelf_t_revprops_get, METH_VARARGS, (char *)"svn_client__shelf_t_revprops_get(svn_client__shelf_t self) -> apr_hash_t"}, + { (char *)"svn_client__shelf_t_ctx_set", _wrap_svn_client__shelf_t_ctx_set, METH_VARARGS, (char *)"svn_client__shelf_t_ctx_set(svn_client__shelf_t self, svn_client_ctx_t ctx)"}, + { (char *)"svn_client__shelf_t_ctx_get", _wrap_svn_client__shelf_t_ctx_get, METH_VARARGS, (char *)"svn_client__shelf_t_ctx_get(svn_client__shelf_t self) -> svn_client_ctx_t"}, + { (char *)"svn_client__shelf_t_pool_set", _wrap_svn_client__shelf_t_pool_set, METH_VARARGS, (char *)"svn_client__shelf_t_pool_set(svn_client__shelf_t self, apr_pool_t pool)"}, + { (char *)"svn_client__shelf_t_pool_get", _wrap_svn_client__shelf_t_pool_get, METH_VARARGS, (char *)"svn_client__shelf_t_pool_get(svn_client__shelf_t self) -> apr_pool_t"}, + { (char *)"new_svn_client__shelf_t", _wrap_new_svn_client__shelf_t, METH_VARARGS, (char *)"new_svn_client__shelf_t() -> svn_client__shelf_t"}, + { (char *)"delete_svn_client__shelf_t", _wrap_delete_svn_client__shelf_t, METH_VARARGS, (char *)"delete_svn_client__shelf_t(svn_client__shelf_t self)"}, + { (char *)"svn_client__shelf_t_swigregister", svn_client__shelf_t_swigregister, METH_VARARGS, NULL}, + { (char *)"svn_client__shelf_version_t_shelf_set", _wrap_svn_client__shelf_version_t_shelf_set, METH_VARARGS, (char *)"svn_client__shelf_version_t_shelf_set(svn_client__shelf_version_t self, svn_client__shelf_t shelf)"}, + { (char *)"svn_client__shelf_version_t_shelf_get", _wrap_svn_client__shelf_version_t_shelf_get, METH_VARARGS, (char *)"svn_client__shelf_version_t_shelf_get(svn_client__shelf_version_t self) -> svn_client__shelf_t"}, + { (char *)"svn_client__shelf_version_t_mtime_set", _wrap_svn_client__shelf_version_t_mtime_set, METH_VARARGS, (char *)"svn_client__shelf_version_t_mtime_set(svn_client__shelf_version_t self, apr_time_t mtime)"}, + { (char *)"svn_client__shelf_version_t_mtime_get", _wrap_svn_client__shelf_version_t_mtime_get, METH_VARARGS, (char *)"svn_client__shelf_version_t_mtime_get(svn_client__shelf_version_t self) -> apr_time_t"}, + { (char *)"svn_client__shelf_version_t_files_dir_abspath_set", _wrap_svn_client__shelf_version_t_files_dir_abspath_set, METH_VARARGS, (char *)"svn_client__shelf_version_t_files_dir_abspath_set(svn_client__shelf_version_t self, char const * files_dir_abspath)"}, + { (char *)"svn_client__shelf_version_t_files_dir_abspath_get", _wrap_svn_client__shelf_version_t_files_dir_abspath_get, METH_VARARGS, (char *)"svn_client__shelf_version_t_files_dir_abspath_get(svn_client__shelf_version_t self) -> char const *"}, + { (char *)"svn_client__shelf_version_t_version_number_set", _wrap_svn_client__shelf_version_t_version_number_set, METH_VARARGS, (char *)"svn_client__shelf_version_t_version_number_set(svn_client__shelf_version_t self, int version_number)"}, + { (char *)"svn_client__shelf_version_t_version_number_get", _wrap_svn_client__shelf_version_t_version_number_get, METH_VARARGS, (char *)"svn_client__shelf_version_t_version_number_get(svn_client__shelf_version_t self) -> int"}, + { (char *)"new_svn_client__shelf_version_t", _wrap_new_svn_client__shelf_version_t, METH_VARARGS, (char *)"new_svn_client__shelf_version_t() -> svn_client__shelf_version_t"}, + { (char *)"delete_svn_client__shelf_version_t", _wrap_delete_svn_client__shelf_version_t, METH_VARARGS, (char *)"delete_svn_client__shelf_version_t(svn_client__shelf_version_t self)"}, + { (char *)"svn_client__shelf_version_t_swigregister", svn_client__shelf_version_t_swigregister, METH_VARARGS, NULL}, + { (char *)"svn_client__shelf_open_or_create", _wrap_svn_client__shelf_open_or_create, METH_VARARGS, (char *)"svn_client__shelf_open_or_create(char const * name, char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_open_existing", _wrap_svn_client__shelf_open_existing, METH_VARARGS, (char *)"svn_client__shelf_open_existing(char const * name, char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_close", _wrap_svn_client__shelf_close, METH_VARARGS, (char *)"svn_client__shelf_close(svn_client__shelf_t shelf, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_delete", _wrap_svn_client__shelf_delete, METH_VARARGS, (char *)"svn_client__shelf_delete(char const * name, char const * local_abspath, svn_boolean_t dry_run, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_mods_editor", _wrap_svn_client__shelf_mods_editor, METH_VARARGS, (char *)"svn_client__shelf_mods_editor(svn_client__shelf_version_t shelf_version, svn_wc_notify_func2_t notify_func, svn_client_ctx_t ctx, apr_pool_t result_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_save_new_version3", _wrap_svn_client__shelf_save_new_version3, METH_VARARGS, (char *)"svn_client__shelf_save_new_version3(svn_client__shelf_t shelf, apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_client_status_func_t shelved_func, void * shelved_baton, svn_client_status_func_t not_shelved_func, void * not_shelved_baton, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_delete_newer_versions", _wrap_svn_client__shelf_delete_newer_versions, METH_VARARGS, (char *)"svn_client__shelf_delete_newer_versions(svn_client__shelf_t shelf, svn_client__shelf_version_t shelf_version, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_version_open", _wrap_svn_client__shelf_version_open, METH_VARARGS, (char *)"svn_client__shelf_version_open(svn_client__shelf_t shelf, int version_number, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_get_newest_version", _wrap_svn_client__shelf_get_newest_version, METH_VARARGS, (char *)"svn_client__shelf_get_newest_version(svn_client__shelf_t shelf, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_get_all_versions", _wrap_svn_client__shelf_get_all_versions, METH_VARARGS, (char *)"svn_client__shelf_get_all_versions(svn_client__shelf_t shelf, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_apply", _wrap_svn_client__shelf_apply, METH_VARARGS, (char *)"svn_client__shelf_apply(svn_client__shelf_version_t shelf_version, svn_boolean_t dry_run, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_test_apply_file", _wrap_svn_client__shelf_test_apply_file, METH_VARARGS, (char *)"svn_client__shelf_test_apply_file(svn_client__shelf_version_t shelf_version, char const * file_relpath, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_unapply", _wrap_svn_client__shelf_unapply, METH_VARARGS, (char *)"svn_client__shelf_unapply(svn_client__shelf_version_t shelf_version, svn_boolean_t dry_run, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_replay", _wrap_svn_client__shelf_replay, METH_VARARGS, (char *)"svn_client__shelf_replay(svn_client__shelf_version_t shelf_version, char const * top_relpath, svn_delta_editor_t editor, void * edit_baton, svn_wc_notify_func2_t notify_func, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_paths_changed", _wrap_svn_client__shelf_paths_changed, METH_VARARGS, (char *)"svn_client__shelf_paths_changed(svn_client__shelf_version_t shelf_version, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_revprop_set", _wrap_svn_client__shelf_revprop_set, METH_VARARGS, (char *)"svn_client__shelf_revprop_set(svn_client__shelf_t shelf, char const * prop_name, svn_string_t const * prop_val, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_revprop_set_all", _wrap_svn_client__shelf_revprop_set_all, METH_VARARGS, (char *)"svn_client__shelf_revprop_set_all(svn_client__shelf_t shelf, apr_hash_t revprop_table, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_revprop_get", _wrap_svn_client__shelf_revprop_get, METH_VARARGS, (char *)"svn_client__shelf_revprop_get(svn_client__shelf_t shelf, char const * prop_name, apr_pool_t result_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_revprop_list", _wrap_svn_client__shelf_revprop_list, METH_VARARGS, (char *)"svn_client__shelf_revprop_list(svn_client__shelf_t shelf, apr_pool_t result_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_set_log_message", _wrap_svn_client__shelf_set_log_message, METH_VARARGS, (char *)"svn_client__shelf_set_log_message(svn_client__shelf_t shelf, char const * log_message, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_get_log_message", _wrap_svn_client__shelf_get_log_message, METH_VARARGS, (char *)"svn_client__shelf_get_log_message(svn_client__shelf_t shelf, apr_pool_t result_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_info_t_mtime_set", _wrap_svn_client__shelf_info_t_mtime_set, METH_VARARGS, (char *)"svn_client__shelf_info_t_mtime_set(svn_client__shelf_info_t self, apr_time_t mtime)"}, + { (char *)"svn_client__shelf_info_t_mtime_get", _wrap_svn_client__shelf_info_t_mtime_get, METH_VARARGS, (char *)"svn_client__shelf_info_t_mtime_get(svn_client__shelf_info_t self) -> apr_time_t"}, + { (char *)"new_svn_client__shelf_info_t", _wrap_new_svn_client__shelf_info_t, METH_VARARGS, (char *)"new_svn_client__shelf_info_t() -> svn_client__shelf_info_t"}, + { (char *)"delete_svn_client__shelf_info_t", _wrap_delete_svn_client__shelf_info_t, METH_VARARGS, (char *)"delete_svn_client__shelf_info_t(svn_client__shelf_info_t self)"}, + { (char *)"svn_client__shelf_info_t_swigregister", svn_client__shelf_info_t_swigregister, METH_VARARGS, NULL}, + { (char *)"svn_client__shelf_list", _wrap_svn_client__shelf_list, METH_VARARGS, (char *)"svn_client__shelf_list(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_client__shelf_version_status_walk", _wrap_svn_client__shelf_version_status_walk, METH_VARARGS, (char *)"svn_client__shelf_version_status_walk(svn_client__shelf_version_t shelf_version, char const * wc_relpath, svn_wc_status_func4_t walk_func, void * walk_baton, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_client_add_to_changelist", _wrap_svn_client_add_to_changelist, METH_VARARGS, (char *)"svn_client_add_to_changelist(apr_array_header_t paths, char const * changelist, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_remove_from_changelists", _wrap_svn_client_remove_from_changelists, METH_VARARGS, (char *)"svn_client_remove_from_changelists(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_get_changelists", _wrap_svn_client_get_changelists, METH_VARARGS, (char *)"svn_client_get_changelists(char const * path, apr_array_header_t changelists, svn_depth_t depth, svn_changelist_receiver_t callback_func, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"}, @@ -36934,10 +40237,12 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_client_invoke_get_commit_log3", _wrap_svn_client_invoke_get_commit_log3, METH_VARARGS, (char *)"svn_client_invoke_get_commit_log3(svn_client_get_commit_log3_t _obj, apr_array_header_t commit_items, void * baton, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_invoke_get_commit_log2", _wrap_svn_client_invoke_get_commit_log2, METH_VARARGS, (char *)"svn_client_invoke_get_commit_log2(svn_client_get_commit_log2_t _obj, apr_array_header_t commit_items, void * baton, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_invoke_get_commit_log", _wrap_svn_client_invoke_get_commit_log, METH_VARARGS, (char *)"svn_client_invoke_get_commit_log(svn_client_get_commit_log_t _obj, apr_array_header_t commit_items, void * baton, apr_pool_t pool) -> svn_error_t"}, + { (char *)"svn_client_invoke_blame_receiver4", _wrap_svn_client_invoke_blame_receiver4, METH_VARARGS, (char *)"svn_client_invoke_blame_receiver4(svn_client_blame_receiver4_t _obj, void * baton, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t rev_props, svn_revnum_t merged_revision, apr_hash_t merged_rev_props, char const * merged_path, svn_string_t const * line, svn_boolean_t local_change, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_invoke_blame_receiver3", _wrap_svn_client_invoke_blame_receiver3, METH_VARARGS, (char *)"svn_client_invoke_blame_receiver3(svn_client_blame_receiver3_t _obj, void * baton, svn_revnum_t start_revnum, svn_revnum_t end_revnum, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t rev_props, svn_revnum_t merged_revision, apr_hash_t merged_rev_props, char const * merged_path, char const * line, svn_boolean_t local_change, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_invoke_blame_receiver2", _wrap_svn_client_invoke_blame_receiver2, METH_VARARGS, (char *)"svn_client_invoke_blame_receiver2(svn_client_blame_receiver2_t _obj, void * baton, apr_int64_t line_no, svn_revnum_t revision, char const * author, char const * date, svn_revnum_t merged_revision, char const * merged_author, char const * merged_date, char const * merged_path, char const * line, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_invoke_blame_receiver", _wrap_svn_client_invoke_blame_receiver, METH_VARARGS, (char *)"svn_client_invoke_blame_receiver(svn_client_blame_receiver_t _obj, void * baton, apr_int64_t line_no, svn_revnum_t revision, char const * author, char const * date, char const * line, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_client_invoke_diff_summarize_func", _wrap_svn_client_invoke_diff_summarize_func, METH_VARARGS, (char *)"svn_client_invoke_diff_summarize_func(svn_client_diff_summarize_func_t _obj, svn_client_diff_summarize_t diff, void * baton, apr_pool_t pool) -> svn_error_t"}, + { (char *)"svn_client_invoke__layout_func", _wrap_svn_client_invoke__layout_func, METH_VARARGS, (char *)"svn_client_invoke__layout_func(svn_client__layout_func_t _obj, void * layout_baton, char const * local_abspath, char const * repos_root_url, svn_boolean_t not_present, svn_boolean_t url_changed, char const * url, svn_boolean_t revision_changed, svn_revnum_t revision, svn_boolean_t depth_changed, svn_depth_t depth, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_client_invoke_import_filter_func", _wrap_svn_client_invoke_import_filter_func, METH_VARARGS, (char *)"svn_client_invoke_import_filter_func(svn_client_import_filter_func_t _obj, void * baton, char const * local_abspath, svn_io_dirent2_t dirent, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_client_invoke_status_func", _wrap_svn_client_invoke_status_func, METH_VARARGS, (char *)"svn_client_invoke_status_func(svn_client_status_func_t _obj, void * baton, char const * path, svn_client_status_t status, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_client_invoke_conflict_walk_func", _wrap_svn_client_invoke_conflict_walk_func, METH_VARARGS, (char *)"svn_client_invoke_conflict_walk_func(svn_client_conflict_walk_func_t _obj, void * baton, svn_client_conflict_t * conflict, apr_pool_t scratch_pool) -> svn_error_t"}, @@ -36951,10 +40256,12 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_client_get_commit_log3_t_swigregister", svn_client_get_commit_log3_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_client_get_commit_log2_t_swigregister", svn_client_get_commit_log2_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_client_get_commit_log_t_swigregister", svn_client_get_commit_log_t_swigregister, METH_VARARGS, NULL}, + { (char *)"svn_client_blame_receiver4_t_swigregister", svn_client_blame_receiver4_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_client_blame_receiver3_t_swigregister", svn_client_blame_receiver3_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_client_blame_receiver2_t_swigregister", svn_client_blame_receiver2_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_client_blame_receiver_t_swigregister", svn_client_blame_receiver_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_client_diff_summarize_func_t_swigregister", svn_client_diff_summarize_func_t_swigregister, METH_VARARGS, NULL}, + { (char *)"svn_client__layout_func_t_swigregister", svn_client__layout_func_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_client_import_filter_func_t_swigregister", svn_client_import_filter_func_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_client_status_func_t_swigregister", svn_client_status_func_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_client_conflict_walk_func_t_swigregister", svn_client_conflict_walk_func_t_swigregister, METH_VARARGS, NULL}, @@ -36978,80 +40285,90 @@ static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *| static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void = {"_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void", "void (*)(apr_off_t,apr_off_t,void *,apr_pool_t *)|svn_ra_progress_notify_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const **,char const **,apr_array_header_t *,void *,apr_pool_t *)|svn_client_get_commit_log_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const **,char const **,apr_array_header_t const *,void *,apr_pool_t *)|svn_client_get_commit_log3_t|svn_client_get_commit_log2_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_simple_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_pw_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_username_prompt_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|struct svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_client_diff_summarize_func_t|struct svn_error_t *(*)(svn_client_diff_summarize_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_client_blame_receiver2_t|struct svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,svn_revnum_t,char const *,char const *,char const *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const **,char const **,apr_array_header_t *,void *,apr_pool_t *)|svn_client_get_commit_log_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_client_get_commit_log3_t|svn_error_t *(*)(char const **,char const **,apr_array_header_t const *,void *,apr_pool_t *)|svn_client_get_commit_log2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_simple_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_pw_prompt_func_t|svn_error_t *(*)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_client_cert_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_username_prompt_func_t|svn_error_t *(*)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t|svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t|svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_client_diff_summarize_t const *,void *,apr_pool_t *)|svn_client_diff_summarize_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)|svn_commit_callback2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_client_blame_receiver4_t|svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,apr_hash_t *,svn_revnum_t,apr_hash_t *,char const *,svn_string_t const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,svn_revnum_t,char const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char__int = {"_p_f_p_void_p_q_const__char__int", "int (*)(void *,char const *)|svn_ra_check_tunnel_func_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void = {"_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void", "void (*)(void *,char const *,enum svn_wc_notify_action_t,enum svn_node_kind_t,char const *,enum svn_wc_notify_state_t,enum svn_wc_notify_state_t,long)|svn_wc_notify_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_array_header_t *,apr_pool_t *)|svn_proplist_receiver2_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_pool_t *)|svn_proplist_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_changelist_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t", "svn_client_info_receiver2_t|struct svn_error_t *(*)(void *,char const *,svn_client_info2_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t", "svn_client_status_func_t|struct svn_error_t *(*)(void *,char const *,svn_client_status_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,apr_pool_t *)|svn_client_list_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_list_func2_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_info_t const *,apr_pool_t *)|svn_info_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_proplist_receiver2_t|svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_pool_t *)|svn_proplist_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_changelist_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t", "svn_client__layout_func_t|svn_error_t *(*)(void *,char const *,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_boolean_t,svn_revnum_t,svn_boolean_t,svn_depth_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t", "svn_client_info_receiver2_t|svn_error_t *(*)(void *,char const *,svn_client_info2_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_client_status_t const *,apr_pool_t *)|svn_client_status_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,apr_pool_t *)|svn_client_list_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_list_func2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_info_t const *,apr_pool_t *)|svn_info_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status3_t const *,apr_pool_t *)|svn_wc_status_func4_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void", "void (*)(void *,char const *,struct svn_wc_status2_t *)|svn_wc_status_func2_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void", "void (*)(void *,char const *,struct svn_wc_status_t *)|svn_wc_status_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)|svn_wc_status_func3_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)|svn_wc_status_func3_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void = {"_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void", "svn_wc_notify_func2_t|void (*)(void *,struct svn_wc_notify_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_boolean_t *,char const *,char const *,char const *,apr_pool_t *)|svn_client_patch_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_boolean_t *,char const *,svn_io_dirent2_t const *,apr_pool_t *)|svn_client_import_filter_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t", "svn_client_conflict_walk_func_t|struct svn_error_t *(*)(void *,svn_client_conflict_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,svn_revnum_t,apr_int64_t,svn_revnum_t,apr_hash_t *,svn_revnum_t,apr_hash_t *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_client_blame_receiver3_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_boolean_t *,char const *,char const *,char const *,apr_pool_t *)|svn_client_patch_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_boolean_t *,char const *,svn_io_dirent2_t const *,apr_pool_t *)|svn_client_import_filter_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_client_conflict_t *,apr_pool_t *)|svn_client_conflict_walk_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,svn_revnum_t,apr_int64_t,svn_revnum_t,apr_hash_t *,svn_revnum_t,apr_hash_t *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_client_blame_receiver3_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_array_header_t = {"_p_p_apr_array_header_t", "apr_array_header_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void = {"_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void", "void (**)(apr_off_t,apr_off_t,void *,apr_pool_t *)|svn_ra_progress_notify_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_client_get_commit_log_t *|struct svn_error_t *(**)(char const **,char const **,apr_array_header_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_client_get_commit_log3_t *|svn_client_get_commit_log2_t *|struct svn_error_t *(**)(char const **,char const **,apr_array_header_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)|svn_ra_open_tunnel_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)|svn_wc_conflict_resolver_func2_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)|svn_wc_conflict_resolver_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_client_diff_summarize_t const *,void *,apr_pool_t *)|svn_client_diff_summarize_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void__p_svn_error_t = {"_p_p_f_p_void__p_svn_error_t", "svn_cancel_func_t *|struct svn_error_t *(**)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,svn_revnum_t,char const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_client_get_commit_log_t *|svn_error_t *(**)(char const **,char const **,apr_array_header_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_client_get_commit_log3_t *|svn_client_get_commit_log2_t *|svn_error_t *(**)(char const **,char const **,apr_array_header_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t *|svn_error_t *(**)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t *|svn_error_t *(**)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t *|svn_error_t *(**)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(svn_client_diff_summarize_t const *,void *,apr_pool_t *)|svn_client_diff_summarize_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void__p_svn_error_t = {"_p_p_f_p_void__p_svn_error_t", "svn_cancel_func_t *|svn_error_t *(**)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,apr_int64_t,svn_revnum_t,apr_hash_t *,svn_revnum_t,apr_hash_t *,char const *,svn_string_t const *,svn_boolean_t,apr_pool_t *)|svn_client_blame_receiver4_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,svn_revnum_t,char const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_void_p_q_const__char__int = {"_p_p_f_p_void_p_q_const__char__int", "int (**)(void *,char const *)|svn_ra_check_tunnel_func_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void = {"_p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void", "void (**)(void *,char const *,enum svn_wc_notify_action_t,enum svn_node_kind_t,char const *,enum svn_wc_notify_state_t,enum svn_wc_notify_state_t,long)|svn_wc_notify_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,apr_hash_t *,apr_array_header_t *,apr_pool_t *)|svn_proplist_receiver2_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,apr_hash_t *,apr_pool_t *)|svn_proplist_receiver_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_client_info2_t const *,apr_pool_t *)|svn_client_info_receiver2_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_client_status_t const *,apr_pool_t *)|svn_client_status_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,apr_pool_t *)|svn_client_list_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_list_func2_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t", "svn_info_receiver_t *|struct svn_error_t *(**)(void *,char const *,svn_info_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "svn_wc_status_func3_t *|struct svn_error_t *(**)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_proplist_receiver2_t *|svn_error_t *(**)(void *,char const *,apr_hash_t *,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_proplist_receiver_t *|svn_error_t *(**)(void *,char const *,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_boolean_t,svn_revnum_t,svn_boolean_t,svn_depth_t,apr_pool_t *)|svn_client__layout_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,svn_client_info2_t const *,apr_pool_t *)|svn_client_info_receiver2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,svn_client_status_t const *,apr_pool_t *)|svn_client_status_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,apr_pool_t *)|svn_client_list_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_list_func2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,svn_info_t const *,apr_pool_t *)|svn_info_receiver_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,svn_wc_status3_t const *,apr_pool_t *)|svn_wc_status_func4_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "svn_wc_status_func3_t *|svn_error_t *(**)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void = {"_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void", "void (**)(void *,struct svn_wc_notify_t const *,apr_pool_t *)|svn_wc_notify_func2_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,svn_boolean_t *,char const *,char const *,char const *,apr_pool_t *)|svn_client_patch_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,svn_boolean_t *,char const *,svn_io_dirent2_t const *,apr_pool_t *)|svn_client_import_filter_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t", "svn_client_conflict_walk_func_t *|struct svn_error_t *(**)(void *,svn_client_conflict_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,svn_revnum_t,svn_revnum_t,apr_int64_t,svn_revnum_t,apr_hash_t *,svn_revnum_t,apr_hash_t *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_client_blame_receiver3_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,svn_boolean_t *,char const *,char const *,char const *,apr_pool_t *)|svn_client_patch_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,svn_boolean_t *,char const *,svn_io_dirent2_t const *,apr_pool_t *)|svn_client_import_filter_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t", "svn_client_conflict_walk_func_t *|svn_error_t *(**)(void *,svn_client_conflict_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_client_blame_receiver3_t *|svn_error_t *(**)(void *,svn_revnum_t,svn_revnum_t,apr_int64_t,svn_revnum_t,apr_hash_t *,svn_revnum_t,apr_hash_t *,char const *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_auth_provider_object_t = {"_p_p_svn_auth_provider_object_t", "struct svn_auth_provider_object_t **|svn_auth_provider_object_t **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_svn_client__shelf_t = {"_p_p_svn_client__shelf_t", "struct svn_client__shelf_t **|svn_client__shelf_t **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_svn_client__shelf_version_t = {"_p_p_svn_client__shelf_version_t", "struct svn_client__shelf_version_t **|svn_client__shelf_version_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_client_commit_info_t = {"_p_p_svn_client_commit_info_t", "struct svn_client_commit_info_t **|svn_client_commit_info_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_client_commit_item3_t = {"_p_p_svn_client_commit_item3_t", "struct svn_client_commit_item3_t **|svn_client_commit_item3_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_client_conflict_t = {"_p_p_svn_client_conflict_t", "struct svn_client_conflict_t **|svn_client_conflict_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_client_ctx_t = {"_p_p_svn_client_ctx_t", "struct svn_client_ctx_t **|svn_client_ctx_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_commit_info_t = {"_p_p_svn_commit_info_t", "struct svn_commit_info_t **|svn_commit_info_t **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_ra_session_t = {"_p_p_svn_ra_session_t", "struct svn_ra_session_t **|svn_ra_session_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_string_t = {"_p_p_svn_string_t", "struct svn_string_t **|svn_string_t **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_auth_baton_t = {"_p_svn_auth_baton_t", "struct svn_auth_baton_t *|svn_auth_baton_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_auth_cred_simple_t = {"_p_svn_auth_cred_simple_t", "struct svn_auth_cred_simple_t *|svn_auth_cred_simple_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_auth_cred_ssl_client_cert_pw_t = {"_p_svn_auth_cred_ssl_client_cert_pw_t", "struct svn_auth_cred_ssl_client_cert_pw_t *|svn_auth_cred_ssl_client_cert_pw_t *", 0, 0, (void*)0, 0}; @@ -37066,6 +40383,9 @@ static swig_type_info _swigt__p_svn_cache_config_t = {"_p_svn_cache_config_t", " static swig_type_info _swigt__p_svn_checksum_ctx_t = {"_p_svn_checksum_ctx_t", "struct svn_checksum_ctx_t *|svn_checksum_ctx_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_checksum_kind_t = {"_p_svn_checksum_kind_t", "enum svn_checksum_kind_t *|svn_checksum_kind_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct svn_checksum_t *|svn_checksum_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_client__shelf_info_t = {"_p_svn_client__shelf_info_t", "struct svn_client__shelf_info_t *|svn_client__shelf_info_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_client__shelf_t = {"_p_svn_client__shelf_t", "struct svn_client__shelf_t *|svn_client__shelf_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_client__shelf_version_t = {"_p_svn_client__shelf_version_t", "struct svn_client__shelf_version_t *|svn_client__shelf_version_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_commit_info_t = {"_p_svn_client_commit_info_t", "struct svn_client_commit_info_t *|svn_client_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_commit_item2_t = {"_p_svn_client_commit_item2_t", "struct svn_client_commit_item2_t *|svn_client_commit_item2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_commit_item3_t = {"_p_svn_client_commit_item3_t", "struct svn_client_commit_item3_t *|svn_client_commit_item3_t *", 0, 0, (void*)0, 0}; @@ -37079,17 +40399,17 @@ static swig_type_info _swigt__p_svn_client_diff_summarize_kind_t = {"_p_svn_clie static swig_type_info _swigt__p_svn_client_diff_summarize_t = {"_p_svn_client_diff_summarize_t", "struct svn_client_diff_summarize_t *|svn_client_diff_summarize_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_info2_t = {"_p_svn_client_info2_t", "struct svn_client_info2_t *|svn_client_info2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_proplist_item_t = {"_p_svn_client_proplist_item_t", "struct svn_client_proplist_item_t *|svn_client_proplist_item_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_client_shelved_patch_info_t = {"_p_svn_client_shelved_patch_info_t", "struct svn_client_shelved_patch_info_t *|svn_client_shelved_patch_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_status_t = {"_p_svn_client_status_t", "struct svn_client_status_t *|svn_client_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_file_options_t = {"_p_svn_diff_file_options_t", "svn_diff_file_options_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_hunk_t = {"_p_svn_diff_hunk_t", "svn_diff_hunk_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "svn_fs_lock_target_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_info_t = {"_p_svn_info_t", "struct svn_info_t *|svn_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; @@ -37107,6 +40427,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_prop_inherited_item_t = {"_p_svn_prop_inherited_item_t", "struct svn_prop_inherited_item_t *|svn_prop_inherited_item_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_prop_kind = {"_p_svn_prop_kind", "svn_prop_kind_t *|enum svn_prop_kind *", 0, 0, (void*)0, 0}; @@ -37188,6 +40509,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void__p_svn_error_t, + &_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, @@ -37196,11 +40518,13 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, + &_swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t, + &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void, &_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void, &_swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, @@ -37223,17 +40547,20 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void__p_svn_error_t, + &_swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_p_q_const__char__int, &_swigt__p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void, &_swigt__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, + &_swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t, + &_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void, &_swigt__p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, @@ -37241,13 +40568,17 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_svn_auth_provider_object_t, + &_swigt__p_p_svn_client__shelf_t, + &_swigt__p_p_svn_client__shelf_version_t, &_swigt__p_p_svn_client_commit_info_t, &_swigt__p_p_svn_client_commit_item3_t, &_swigt__p_p_svn_client_conflict_t, &_swigt__p_p_svn_client_ctx_t, &_swigt__p_p_svn_commit_info_t, + &_swigt__p_p_svn_delta_editor_t, &_swigt__p_p_svn_ra_session_t, &_swigt__p_p_svn_string_t, + &_swigt__p_p_void, &_swigt__p_svn_auth_baton_t, &_swigt__p_svn_auth_cred_simple_t, &_swigt__p_svn_auth_cred_ssl_client_cert_pw_t, @@ -37262,6 +40593,9 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_checksum_ctx_t, &_swigt__p_svn_checksum_kind_t, &_swigt__p_svn_checksum_t, + &_swigt__p_svn_client__shelf_info_t, + &_swigt__p_svn_client__shelf_t, + &_swigt__p_svn_client__shelf_version_t, &_swigt__p_svn_client_commit_info_t, &_swigt__p_svn_client_commit_item2_t, &_swigt__p_svn_client_commit_item3_t, @@ -37275,11 +40609,11 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_client_diff_summarize_t, &_swigt__p_svn_client_info2_t, &_swigt__p_svn_client_proplist_item_t, - &_swigt__p_svn_client_shelved_patch_info_t, &_swigt__p_svn_client_status_t, &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_file_options_t, &_swigt__p_svn_diff_hunk_t, @@ -37303,6 +40637,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_prop_inherited_item_t, &_swigt__p_svn_prop_kind, @@ -37384,6 +40719,7 @@ static swig_cast_info _swigc__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc static swig_cast_info _swigc__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void__p_svn_error_t[] = { {&_swigt__p_f_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -37392,11 +40728,13 @@ static swig_cast_info _swigc__p_f_p_void_p_q_const__char_enum_svn_wc_notify_acti static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void[] = { {&_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void[] = { {&_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -37419,17 +40757,20 @@ static swig_cast_info _swigc__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_ static swig_cast_info _swigc__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void__p_svn_error_t[] = { {&_swigt__p_p_f_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char__int[] = { {&_swigt__p_p_f_p_void_p_q_const__char__int, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void[] = { {&_swigt__p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void[] = { {&_swigt__p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -37437,13 +40778,17 @@ static swig_cast_info _swigc__p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_c static swig_cast_info _swigc__p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_auth_provider_object_t[] = { {&_swigt__p_p_svn_auth_provider_object_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_svn_client__shelf_t[] = { {&_swigt__p_p_svn_client__shelf_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_svn_client__shelf_version_t[] = { {&_swigt__p_p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_client_commit_info_t[] = { {&_swigt__p_p_svn_client_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_client_commit_item3_t[] = { {&_swigt__p_p_svn_client_commit_item3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_client_conflict_t[] = { {&_swigt__p_p_svn_client_conflict_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_client_ctx_t[] = { {&_swigt__p_p_svn_client_ctx_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_commit_info_t[] = { {&_swigt__p_p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_svn_delta_editor_t[] = { {&_swigt__p_p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_ra_session_t[] = { {&_swigt__p_p_svn_ra_session_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_string_t[] = { {&_swigt__p_p_svn_string_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_void[] = { {&_swigt__p_p_void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_auth_baton_t[] = { {&_swigt__p_svn_auth_baton_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_auth_cred_simple_t[] = { {&_swigt__p_svn_auth_cred_simple_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_auth_cred_ssl_client_cert_pw_t[] = { {&_swigt__p_svn_auth_cred_ssl_client_cert_pw_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -37458,6 +40803,9 @@ static swig_cast_info _swigc__p_svn_cache_config_t[] = { {&_swigt__p_svn_cache_ static swig_cast_info _swigc__p_svn_checksum_ctx_t[] = { {&_swigt__p_svn_checksum_ctx_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_checksum_kind_t[] = { {&_swigt__p_svn_checksum_kind_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_client__shelf_info_t[] = { {&_swigt__p_svn_client__shelf_info_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_client__shelf_t[] = { {&_swigt__p_svn_client__shelf_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_client__shelf_version_t[] = { {&_swigt__p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_commit_info_t[] = { {&_swigt__p_svn_client_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_commit_item2_t[] = { {&_swigt__p_svn_client_commit_item2_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_commit_item3_t[] = { {&_swigt__p_svn_client_commit_item3_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -37471,11 +40819,11 @@ static swig_cast_info _swigc__p_svn_client_diff_summarize_kind_t[] = { {&_swigt static swig_cast_info _swigc__p_svn_client_diff_summarize_t[] = { {&_swigt__p_svn_client_diff_summarize_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_info2_t[] = { {&_swigt__p_svn_client_info2_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_proplist_item_t[] = { {&_swigt__p_svn_client_proplist_item_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_svn_client_shelved_patch_info_t[] = { {&_swigt__p_svn_client_shelved_patch_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_status_t[] = { {&_swigt__p_svn_client_status_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_file_options_t[] = { {&_swigt__p_svn_diff_file_options_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_hunk_t[] = { {&_swigt__p_svn_diff_hunk_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -37499,6 +40847,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_prop_inherited_item_t[] = { {&_swigt__p_svn_prop_inherited_item_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_prop_kind[] = { {&_swigt__p_svn_prop_kind, 0, 0, 0},{0, 0, 0, 0}}; @@ -37580,6 +40929,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void__p_svn_error_t, + _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, @@ -37588,11 +40938,13 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, + _swigc__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t, + _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void, _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void, _swigc__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, @@ -37615,17 +40967,20 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void__p_svn_error_t, + _swigc__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_p_q_const__char__int, _swigc__p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void, _swigc__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, + _swigc__p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t, + _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void, _swigc__p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, @@ -37633,13 +40988,17 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_svn_auth_provider_object_t, + _swigc__p_p_svn_client__shelf_t, + _swigc__p_p_svn_client__shelf_version_t, _swigc__p_p_svn_client_commit_info_t, _swigc__p_p_svn_client_commit_item3_t, _swigc__p_p_svn_client_conflict_t, _swigc__p_p_svn_client_ctx_t, _swigc__p_p_svn_commit_info_t, + _swigc__p_p_svn_delta_editor_t, _swigc__p_p_svn_ra_session_t, _swigc__p_p_svn_string_t, + _swigc__p_p_void, _swigc__p_svn_auth_baton_t, _swigc__p_svn_auth_cred_simple_t, _swigc__p_svn_auth_cred_ssl_client_cert_pw_t, @@ -37654,6 +41013,9 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_checksum_ctx_t, _swigc__p_svn_checksum_kind_t, _swigc__p_svn_checksum_t, + _swigc__p_svn_client__shelf_info_t, + _swigc__p_svn_client__shelf_t, + _swigc__p_svn_client__shelf_version_t, _swigc__p_svn_client_commit_info_t, _swigc__p_svn_client_commit_item2_t, _swigc__p_svn_client_commit_item3_t, @@ -37667,11 +41029,11 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_client_diff_summarize_t, _swigc__p_svn_client_info2_t, _swigc__p_svn_client_proplist_item_t, - _swigc__p_svn_client_shelved_patch_info_t, _swigc__p_svn_client_status_t, _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_file_options_t, _swigc__p_svn_diff_hunk_t, @@ -37695,6 +41057,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_prop_inherited_item_t, _swigc__p_svn_prop_kind, @@ -38481,6 +41844,13 @@ SWIG_init(void) { SWIG_Python_SetConstant(d, "svn_client_conflict_option_incoming_move_file_text_merge",SWIG_From_long((long)(svn_client_conflict_option_incoming_move_file_text_merge))); SWIG_Python_SetConstant(d, "svn_client_conflict_option_incoming_move_dir_merge",SWIG_From_long((long)(svn_client_conflict_option_incoming_move_dir_merge))); SWIG_Python_SetConstant(d, "svn_client_conflict_option_local_move_file_text_merge",SWIG_From_long((long)(svn_client_conflict_option_local_move_file_text_merge))); + SWIG_Python_SetConstant(d, "svn_client_conflict_option_local_move_dir_merge",SWIG_From_long((long)(svn_client_conflict_option_local_move_dir_merge))); + SWIG_Python_SetConstant(d, "svn_client_conflict_option_sibling_move_file_text_merge",SWIG_From_long((long)(svn_client_conflict_option_sibling_move_file_text_merge))); + SWIG_Python_SetConstant(d, "svn_client_conflict_option_sibling_move_dir_merge",SWIG_From_long((long)(svn_client_conflict_option_sibling_move_dir_merge))); + SWIG_Python_SetConstant(d, "svn_client_conflict_option_both_moved_file_merge",SWIG_From_long((long)(svn_client_conflict_option_both_moved_file_merge))); + SWIG_Python_SetConstant(d, "svn_client_conflict_option_both_moved_file_move_merge",SWIG_From_long((long)(svn_client_conflict_option_both_moved_file_move_merge))); + SWIG_Python_SetConstant(d, "svn_client_conflict_option_both_moved_dir_merge",SWIG_From_long((long)(svn_client_conflict_option_both_moved_dir_merge))); + SWIG_Python_SetConstant(d, "svn_client_conflict_option_both_moved_dir_move_merge",SWIG_From_long((long)(svn_client_conflict_option_both_moved_dir_move_merge))); SWIG_Python_SetConstant(d, "SWIG_SVN_INFO_SIZE_UNKNOWN",SWIG_From_unsigned_SS_long((unsigned long)(-1))); { svn_cancel_func_t * tmp = malloc(sizeof(svn_cancel_func_t)); diff --git a/subversion/bindings/swig/python/svn_delta.c b/subversion/bindings/swig/python/svn_delta.c index e3a3ded..0e047ab 100644 --- a/subversion/bindings/swig/python/svn_delta.c +++ b/subversion/bindings/swig/python/svn_delta.c @@ -2994,98 +2994,103 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { #define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[8] #define SWIGTYPE_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[9] #define SWIGTYPE_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[10] -#define SWIGTYPE_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[11] -#define SWIGTYPE_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[12] -#define SWIGTYPE_p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[13] -#define SWIGTYPE_p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[14] -#define SWIGTYPE_p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[15] -#define SWIGTYPE_p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[16] -#define SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[17] -#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[18] -#define SWIGTYPE_p_f_p_void__p_unsigned_char swig_types[19] -#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[20] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[21] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t swig_types[22] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[23] -#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[24] -#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[25] -#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[26] -#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[27] -#define SWIGTYPE_p_int swig_types[28] -#define SWIGTYPE_p_long swig_types[29] -#define SWIGTYPE_p_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[30] -#define SWIGTYPE_p_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[31] -#define SWIGTYPE_p_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[32] -#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[33] -#define SWIGTYPE_p_p_f_p_void__p_unsigned_char swig_types[34] -#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[35] -#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[36] -#define SWIGTYPE_p_p_svn_checksum_t swig_types[37] -#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[38] -#define SWIGTYPE_p_p_svn_txdelta_op_t swig_types[39] -#define SWIGTYPE_p_p_svn_txdelta_stream_t swig_types[40] -#define SWIGTYPE_p_p_svn_txdelta_window_t swig_types[41] -#define SWIGTYPE_p_p_void swig_types[42] -#define SWIGTYPE_p_svn_auth_baton_t swig_types[43] -#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[44] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[45] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[46] -#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[47] -#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[48] -#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[49] -#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[50] -#define SWIGTYPE_p_svn_auth_provider_t swig_types[51] -#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[52] -#define SWIGTYPE_p_svn_cache_config_t swig_types[53] -#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[54] -#define SWIGTYPE_p_svn_checksum_kind_t swig_types[55] -#define SWIGTYPE_p_svn_checksum_t swig_types[56] -#define SWIGTYPE_p_svn_commit_info_t swig_types[57] -#define SWIGTYPE_p_svn_config_t swig_types[58] -#define SWIGTYPE_p_svn_delta_editor_t swig_types[59] -#define SWIGTYPE_p_svn_depth_t swig_types[60] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[61] -#define SWIGTYPE_p_svn_dirent_t swig_types[62] -#define SWIGTYPE_p_svn_errno_t swig_types[63] -#define SWIGTYPE_p_svn_error_t swig_types[64] -#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[65] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[66] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[67] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[68] -#define SWIGTYPE_p_svn_location_segment_t swig_types[69] -#define SWIGTYPE_p_svn_lock_t swig_types[70] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[71] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[72] -#define SWIGTYPE_p_svn_log_entry_t swig_types[73] -#define SWIGTYPE_p_svn_merge_range_t swig_types[74] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[75] -#define SWIGTYPE_p_svn_node_kind_t swig_types[76] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[77] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[78] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[79] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[80] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[81] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[82] -#define SWIGTYPE_p_svn_prop_kind swig_types[83] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[84] -#define SWIGTYPE_p_svn_stream_t swig_types[85] -#define SWIGTYPE_p_svn_string_t swig_types[86] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[87] -#define SWIGTYPE_p_svn_tristate_t swig_types[88] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[89] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[90] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[91] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[92] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[93] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[94] -#define SWIGTYPE_p_svn_version_extended_t swig_types[95] -#define SWIGTYPE_p_svn_version_t swig_types[96] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[97] -#define SWIGTYPE_p_unsigned_char swig_types[98] -#define SWIGTYPE_p_unsigned_long swig_types[99] -#define SWIGTYPE_p_void swig_types[100] -static swig_type_info *swig_types[102]; -static swig_module_info swig_module = {swig_types, 101, 0, 0, 0, 0}; +#define SWIGTYPE_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[11] +#define SWIGTYPE_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[12] +#define SWIGTYPE_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[13] +#define SWIGTYPE_p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[14] +#define SWIGTYPE_p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[15] +#define SWIGTYPE_p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[16] +#define SWIGTYPE_p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[17] +#define SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[18] +#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[19] +#define SWIGTYPE_p_f_p_void__p_unsigned_char swig_types[20] +#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[21] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[22] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t swig_types[23] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[24] +#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[25] +#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[26] +#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[27] +#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[28] +#define SWIGTYPE_p_int swig_types[29] +#define SWIGTYPE_p_long swig_types[30] +#define SWIGTYPE_p_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[31] +#define SWIGTYPE_p_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[32] +#define SWIGTYPE_p_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[33] +#define SWIGTYPE_p_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[34] +#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[35] +#define SWIGTYPE_p_p_f_p_void__p_unsigned_char swig_types[36] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[37] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[38] +#define SWIGTYPE_p_p_svn_checksum_t swig_types[39] +#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[40] +#define SWIGTYPE_p_p_svn_delta_path_driver_state_t swig_types[41] +#define SWIGTYPE_p_p_svn_txdelta_op_t swig_types[42] +#define SWIGTYPE_p_p_svn_txdelta_stream_t swig_types[43] +#define SWIGTYPE_p_p_svn_txdelta_window_t swig_types[44] +#define SWIGTYPE_p_p_void swig_types[45] +#define SWIGTYPE_p_svn_auth_baton_t swig_types[46] +#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[47] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[48] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[49] +#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[50] +#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[51] +#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[52] +#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[53] +#define SWIGTYPE_p_svn_auth_provider_t swig_types[54] +#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[55] +#define SWIGTYPE_p_svn_cache_config_t swig_types[56] +#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[57] +#define SWIGTYPE_p_svn_checksum_kind_t swig_types[58] +#define SWIGTYPE_p_svn_checksum_t swig_types[59] +#define SWIGTYPE_p_svn_commit_info_t swig_types[60] +#define SWIGTYPE_p_svn_config_t swig_types[61] +#define SWIGTYPE_p_svn_delta_editor_t swig_types[62] +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[63] +#define SWIGTYPE_p_svn_depth_t swig_types[64] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[65] +#define SWIGTYPE_p_svn_dirent_t swig_types[66] +#define SWIGTYPE_p_svn_errno_t swig_types[67] +#define SWIGTYPE_p_svn_error_t swig_types[68] +#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[69] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[70] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[71] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[72] +#define SWIGTYPE_p_svn_location_segment_t swig_types[73] +#define SWIGTYPE_p_svn_lock_t swig_types[74] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[75] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[76] +#define SWIGTYPE_p_svn_log_entry_t swig_types[77] +#define SWIGTYPE_p_svn_merge_range_t swig_types[78] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[79] +#define SWIGTYPE_p_svn_node_kind_t swig_types[80] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[81] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[82] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[83] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[84] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[85] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[86] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[87] +#define SWIGTYPE_p_svn_prop_kind swig_types[88] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[89] +#define SWIGTYPE_p_svn_stream_t swig_types[90] +#define SWIGTYPE_p_svn_string_t swig_types[91] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[92] +#define SWIGTYPE_p_svn_tristate_t swig_types[93] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[94] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[95] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[96] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[97] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[98] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[99] +#define SWIGTYPE_p_svn_version_extended_t swig_types[100] +#define SWIGTYPE_p_svn_version_t swig_types[101] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[102] +#define SWIGTYPE_p_unsigned_char swig_types[103] +#define SWIGTYPE_p_unsigned_long swig_types[104] +#define SWIGTYPE_p_void swig_types[105] +static swig_type_info *swig_types[107]; +static swig_module_info swig_module = {swig_types, 106, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -3630,6 +3635,11 @@ static svn_error_t * svn_txdelta_invoke_stream_open_func( return _obj(txdelta_stream, baton, result_pool, scratch_pool); } +static svn_error_t * svn_delta_invoke_path_driver_cb_func2( + svn_delta_path_driver_cb_func2_t _obj, void **dir_baton, const svn_delta_editor_t *editor, void *edit_baton, void *parent_baton, void *callback_baton, const char *relpath, apr_pool_t *pool) { + return _obj(dir_baton, editor, edit_baton, parent_baton, callback_baton, relpath, pool); +} + static svn_error_t * svn_delta_invoke_path_driver_cb_func( svn_delta_path_driver_cb_func_t _obj, void **dir_baton, void *parent_baton, void *callback_baton, const char *path, apr_pool_t *pool) { return _obj(dir_baton, parent_baton, callback_baton, path, pool); @@ -4487,10 +4497,26 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_run(PyObject *SWIGUNUSEDPARM(self), PyObj arg6 = &temp6; if (!PyArg_ParseTuple(args,(char *)"OOOOOO|OO:svn_txdelta_run",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { - arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { svn_txdelta_window_handler_t * tmp = @@ -4773,10 +4799,26 @@ SWIGINTERN PyObject *_wrap_svn_txdelta2(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = &temp1; if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_txdelta2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; { - arg2 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { - arg3 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg3 = NULL; + } + else { + arg3 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg3 == NULL) { + SWIG_fail; + } + } } { arg4 = (svn_boolean_t)SWIG_As_long (obj2); @@ -4839,10 +4881,26 @@ SWIGINTERN PyObject *_wrap_svn_txdelta(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = &temp1; if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_txdelta",&obj0,&obj1,&obj2)) SWIG_fail; { - arg2 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { - arg3 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg3 = NULL; + } + else { + arg3 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg3 == NULL) { + SWIG_fail; + } + } } if (obj2) { /* Verify that the user supplied a valid pool */ @@ -4915,7 +4973,15 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_target_push(PyObject *SWIGUNUSEDPARM(self } } { - arg3 = svn_swig_py_make_stream (obj2, _global_pool); + if (obj2 == Py_None) { + arg3 = NULL; + } + else { + arg3 = svn_swig_py_make_stream (obj2, _global_pool); + if (arg3 == NULL) { + SWIG_fail; + } + } } if (obj3) { /* Verify that the user supplied a valid pool */ @@ -5058,7 +5124,15 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_send_stream(PyObject *SWIGUNUSEDPARM(self arg4 = temp4; if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_txdelta_send_stream",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { svn_txdelta_window_handler_t * tmp = @@ -5321,10 +5395,26 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_apply(PyObject *SWIGUNUSEDPARM(self), PyO arg7 = &temp7; if (!PyArg_ParseTuple(args,(char *)"OOz|O:svn_txdelta_apply",&obj0,&obj1,&arg4,&obj3)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { - arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } if (obj3) { /* Verify that the user supplied a valid pool */ @@ -5400,7 +5490,15 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_to_svndiff3(PyObject *SWIGUNUSEDPARM(self arg2 = &temp2; if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_txdelta_to_svndiff3",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; { - arg3 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg3 = NULL; + } + else { + arg3 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg3 == NULL) { + SWIG_fail; + } + } } { arg4 = (int)SWIG_As_long (obj1); @@ -5486,7 +5584,15 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_to_svndiff2(PyObject *SWIGUNUSEDPARM(self arg2 = &temp2; if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_txdelta_to_svndiff2",&obj0,&obj1,&obj2)) SWIG_fail; { - arg3 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg3 = NULL; + } + else { + arg3 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg3 == NULL) { + SWIG_fail; + } + } } { arg4 = (int)SWIG_As_long (obj1); @@ -5564,7 +5670,15 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_to_svndiff(PyObject *SWIGUNUSEDPARM(self) arg4 = &temp4; if (!PyArg_ParseTuple(args,(char *)"O|O:svn_txdelta_to_svndiff",&obj0,&obj1)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } if (obj1) { /* Verify that the user supplied a valid pool */ @@ -5766,7 +5880,15 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_read_svndiff_window(PyObject *SWIGUNUSEDP arg1 = &temp1; if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_txdelta_read_svndiff_window",&obj0,&obj1,&obj2)) SWIG_fail; { - arg2 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { arg3 = (int)SWIG_As_long (obj1); @@ -7063,6 +7185,112 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_delta_path_driver3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_delta_editor_t *arg1 = (svn_delta_editor_t *) 0 ; + void *arg2 = (void *) 0 ; + apr_array_header_t *arg3 = (apr_array_header_t *) 0 ; + svn_boolean_t arg4 ; + svn_delta_path_driver_cb_func2_t arg5 = (svn_delta_path_driver_cb_func2_t) 0 ; + void *arg6 = (void *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg7 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OOOOOO|O:svn_delta_path_driver3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; + { + arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + if (obj1 == Py_None) { + arg2 = NULL; + } else if (SWIG_ConvertPtr(obj1, (void **) &arg2, 0, 0) == -1) { + arg2 = (void *) obj1; + PyErr_Clear(); + } + } + { + arg3 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj2); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg4 = (svn_boolean_t)SWIG_As_long (obj3); + if (SWIG_arg_fail(svn_argnum_obj3)) { + SWIG_fail; + } + } + { + svn_delta_path_driver_cb_func2_t * tmp = + svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj4); + if (tmp == NULL || PyErr_Occurred()) { + SWIG_fail; + } + arg5 = *tmp; + } + { + if (obj5 == Py_None) { + arg6 = NULL; + } else if (SWIG_ConvertPtr(obj5, (void **) &arg6, 0, 0) == -1) { + arg6 = (void *) obj5; + PyErr_Clear(); + } + } + if (obj6) { + /* Verify that the user supplied a valid pool */ + if (obj6 != Py_None && obj6 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj6); + SWIG_arg_fail(svn_argnum_obj6); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_delta_path_driver3((struct svn_delta_editor_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5,arg6,arg7); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_delta_path_driver2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_delta_editor_t *arg1 = (svn_delta_editor_t *) 0 ; @@ -7255,6 +7483,229 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_delta_path_driver_start(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_delta_path_driver_state_t **arg1 = (svn_delta_path_driver_state_t **) 0 ; + svn_delta_editor_t *arg2 = (svn_delta_editor_t *) 0 ; + void *arg3 = (void *) 0 ; + svn_delta_path_driver_cb_func2_t arg4 = (svn_delta_path_driver_cb_func2_t) 0 ; + void *arg5 = (void *) 0 ; + apr_pool_t *arg6 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + svn_delta_path_driver_state_t *temp1 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg6 = _global_pool; + arg1 = &temp1; + if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_delta_path_driver_start",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + { + arg2 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + if (obj1 == Py_None) { + arg3 = NULL; + } else if (SWIG_ConvertPtr(obj1, (void **) &arg3, 0, 0) == -1) { + arg3 = (void *) obj1; + PyErr_Clear(); + } + } + { + svn_delta_path_driver_cb_func2_t * tmp = + svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj2); + if (tmp == NULL || PyErr_Occurred()) { + SWIG_fail; + } + arg4 = *tmp; + } + { + if (obj3 == Py_None) { + arg5 = NULL; + } else if (SWIG_ConvertPtr(obj3, (void **) &arg5, 0, 0) == -1) { + arg5 = (void *) obj3; + PyErr_Clear(); + } + } + if (obj4) { + /* Verify that the user supplied a valid pool */ + if (obj4 != Py_None && obj4 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4); + SWIG_arg_fail(svn_argnum_obj4); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_delta_path_driver_start(arg1,(struct svn_delta_editor_t const *)arg2,arg3,arg4,arg5,arg6); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + /* FIXME: Missing argout typemap: svn_delta_path_driver_start arg 1 (svn_delta_path_driver_state_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_delta_path_driver_start is not implemented yet"); + + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_delta_path_driver_step(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_delta_path_driver_state_t *arg1 = (svn_delta_path_driver_state_t *) 0 ; + char *arg2 = (char *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj2 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg3 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_delta_path_driver_step",&obj0,&arg2,&obj2)) SWIG_fail; + { + arg1 = (svn_delta_path_driver_state_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_path_driver_state_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj2) { + /* Verify that the user supplied a valid pool */ + if (obj2 != Py_None && obj2 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2); + SWIG_arg_fail(svn_argnum_obj2); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_delta_path_driver_step(arg1,(char const *)arg2,arg3); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_delta_path_driver_finish(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_delta_path_driver_state_t *arg1 = (svn_delta_path_driver_state_t *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg2 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"O|O:svn_delta_path_driver_finish",&obj0,&obj1)) SWIG_fail; + { + arg1 = (svn_delta_path_driver_state_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_path_driver_state_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj1) { + /* Verify that the user supplied a valid pool */ + if (obj1 != Py_None && obj1 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1); + SWIG_arg_fail(svn_argnum_obj1); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_delta_path_driver_finish(arg1,arg2); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_compat_wrap_file_rev_handler(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_file_rev_handler_t *arg1 = (svn_file_rev_handler_t *) 0 ; @@ -7352,6 +7803,13 @@ SWIGINTERN PyObject *svn_txdelta_stream_t_swigregister(PyObject *SWIGUNUSEDPARM( return SWIG_Py_Void(); } +SWIGINTERN PyObject *svn_delta_path_driver_state_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_svn_delta_path_driver_state_t, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_set_target_revision(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_delta_editor_t *arg1 = (svn_delta_editor_t *) 0 ; @@ -9024,6 +9482,116 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_delta_invoke_path_driver_cb_func2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_delta_path_driver_cb_func2_t arg1 = (svn_delta_path_driver_cb_func2_t) 0 ; + void **arg2 = (void **) 0 ; + svn_delta_editor_t *arg3 = (svn_delta_editor_t *) 0 ; + void *arg4 = (void *) 0 ; + void *arg5 = (void *) 0 ; + void *arg6 = (void *) 0 ; + char *arg7 = (char *) 0 ; + apr_pool_t *arg8 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + void *temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj6 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg8 = _global_pool; + arg2 = &temp2; + if (!PyArg_ParseTuple(args,(char *)"OOOOOs|O:svn_delta_invoke_path_driver_cb_func2",&obj0,&obj1,&obj2,&obj3,&obj4,&arg7,&obj6)) SWIG_fail; + { + svn_delta_path_driver_cb_func2_t * tmp = + svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0); + if (tmp == NULL || PyErr_Occurred()) { + SWIG_fail; + } + arg1 = *tmp; + } + { + arg3 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + if (obj2 == Py_None) { + arg4 = NULL; + } else if (SWIG_ConvertPtr(obj2, (void **) &arg4, 0, 0) == -1) { + arg4 = (void *) obj2; + PyErr_Clear(); + } + } + { + if (obj3 == Py_None) { + arg5 = NULL; + } else if (SWIG_ConvertPtr(obj3, (void **) &arg5, 0, 0) == -1) { + arg5 = (void *) obj3; + PyErr_Clear(); + } + } + { + if (obj4 == Py_None) { + arg6 = NULL; + } else if (SWIG_ConvertPtr(obj4, (void **) &arg6, 0, 0) == -1) { + arg6 = (void *) obj4; + PyErr_Clear(); + } + } + if (obj6) { + /* Verify that the user supplied a valid pool */ + if (obj6 != Py_None && obj6 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj6); + SWIG_arg_fail(svn_argnum_obj6); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_delta_invoke_path_driver_cb_func2(arg1,arg2,(struct svn_delta_editor_t const *)arg3,arg4,arg5,arg6,(char const *)arg7,arg8); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void, + _global_py_pool, args)) + + ; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_delta_invoke_path_driver_cb_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_delta_path_driver_cb_func_t arg1 = (svn_delta_path_driver_cb_func_t) 0 ; @@ -9398,6 +9966,13 @@ SWIGINTERN PyObject *svn_txdelta_stream_open_func_t_swigregister(PyObject *SWIGU return SWIG_Py_Void(); } +SWIGINTERN PyObject *svn_delta_path_driver_cb_func2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + SWIGINTERN PyObject *svn_delta_path_driver_cb_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; @@ -9510,10 +10085,15 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_delta_noop_window_handler", _wrap_svn_delta_noop_window_handler, METH_VARARGS, (char *)"svn_delta_noop_window_handler(svn_txdelta_window_t window, void * baton) -> svn_error_t"}, { (char *)"svn_delta_get_cancellation_editor", _wrap_svn_delta_get_cancellation_editor, METH_VARARGS, (char *)"svn_delta_get_cancellation_editor(svn_cancel_func_t cancel_func, svn_delta_editor_t wrapped_editor, void * wrapped_baton, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_delta_depth_filter_editor", _wrap_svn_delta_depth_filter_editor, METH_VARARGS, (char *)"svn_delta_depth_filter_editor(svn_delta_editor_t wrapped_editor, void * wrapped_edit_baton, svn_depth_t requested_depth, svn_boolean_t has_target, apr_pool_t pool) -> svn_error_t"}, + { (char *)"svn_delta_path_driver3", _wrap_svn_delta_path_driver3, METH_VARARGS, (char *)"svn_delta_path_driver3(svn_delta_editor_t editor, void * edit_baton, apr_array_header_t relpaths, svn_boolean_t sort_paths, svn_delta_path_driver_cb_func2_t callback_func, void * callback_baton, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_delta_path_driver2", _wrap_svn_delta_path_driver2, METH_VARARGS, (char *)"svn_delta_path_driver2(svn_delta_editor_t editor, void * edit_baton, apr_array_header_t paths, svn_boolean_t sort_paths, svn_delta_path_driver_cb_func_t callback_func, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_delta_path_driver", _wrap_svn_delta_path_driver, METH_VARARGS, (char *)"svn_delta_path_driver(svn_delta_editor_t editor, void * edit_baton, svn_revnum_t revision, apr_array_header_t paths, svn_delta_path_driver_cb_func_t callback_func, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_delta_path_driver_start", _wrap_svn_delta_path_driver_start, METH_VARARGS, (char *)"svn_delta_path_driver_start(svn_delta_editor_t editor, void * edit_baton, svn_delta_path_driver_cb_func2_t callback_func, void * callback_baton, apr_pool_t result_pool) -> svn_error_t"}, + { (char *)"svn_delta_path_driver_step", _wrap_svn_delta_path_driver_step, METH_VARARGS, (char *)"svn_delta_path_driver_step(svn_delta_path_driver_state_t * state, char const * relpath, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_delta_path_driver_finish", _wrap_svn_delta_path_driver_finish, METH_VARARGS, (char *)"svn_delta_path_driver_finish(svn_delta_path_driver_state_t * state, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_compat_wrap_file_rev_handler", _wrap_svn_compat_wrap_file_rev_handler, METH_VARARGS, (char *)"svn_compat_wrap_file_rev_handler(svn_file_rev_handler_old_t handler, void * handler_baton, apr_pool_t pool)"}, { (char *)"svn_txdelta_stream_t_swigregister", svn_txdelta_stream_t_swigregister, METH_VARARGS, NULL}, + { (char *)"svn_delta_path_driver_state_t_swigregister", svn_delta_path_driver_state_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_delta_editor_invoke_set_target_revision", _wrap_svn_delta_editor_invoke_set_target_revision, METH_VARARGS, (char *)"svn_delta_editor_invoke_set_target_revision(svn_delta_editor_t _obj, void * edit_baton, svn_revnum_t target_revision, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_delta_editor_invoke_open_root", _wrap_svn_delta_editor_invoke_open_root, METH_VARARGS, (char *)"svn_delta_editor_invoke_open_root(svn_delta_editor_t _obj, void * edit_baton, svn_revnum_t base_revision, apr_pool_t result_pool) -> svn_error_t"}, { (char *)"svn_delta_editor_invoke_delete_entry", _wrap_svn_delta_editor_invoke_delete_entry, METH_VARARGS, (char *)"svn_delta_editor_invoke_delete_entry(svn_delta_editor_t _obj, char const * path, svn_revnum_t revision, void * parent_baton, apr_pool_t scratch_pool) -> svn_error_t"}, @@ -9535,6 +10115,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_txdelta_invoke_next_window_fn", _wrap_svn_txdelta_invoke_next_window_fn, METH_VARARGS, (char *)"svn_txdelta_invoke_next_window_fn(svn_txdelta_next_window_fn_t _obj, void * baton, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_txdelta_invoke_md5_digest_fn", _wrap_svn_txdelta_invoke_md5_digest_fn, METH_VARARGS, (char *)"svn_txdelta_invoke_md5_digest_fn(svn_txdelta_md5_digest_fn_t _obj, void * baton) -> unsigned char const *"}, { (char *)"svn_txdelta_invoke_stream_open_func", _wrap_svn_txdelta_invoke_stream_open_func, METH_VARARGS, (char *)"svn_txdelta_invoke_stream_open_func(svn_txdelta_stream_open_func_t _obj, void * baton, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_delta_invoke_path_driver_cb_func2", _wrap_svn_delta_invoke_path_driver_cb_func2, METH_VARARGS, (char *)"svn_delta_invoke_path_driver_cb_func2(svn_delta_path_driver_cb_func2_t _obj, svn_delta_editor_t editor, void * edit_baton, void * parent_baton, void * callback_baton, char const * relpath, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_delta_invoke_path_driver_cb_func", _wrap_svn_delta_invoke_path_driver_cb_func, METH_VARARGS, (char *)"svn_delta_invoke_path_driver_cb_func(svn_delta_path_driver_cb_func_t _obj, void * parent_baton, void * callback_baton, char const * path, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_file_invoke_rev_handler", _wrap_svn_file_invoke_rev_handler, METH_VARARGS, (char *)"svn_file_invoke_rev_handler(svn_file_rev_handler_t _obj, void * baton, char const * path, svn_revnum_t rev, apr_hash_t rev_props, svn_boolean_t result_of_merge, apr_array_header_t prop_diffs, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_file_invoke_rev_handler_old", _wrap_svn_file_invoke_rev_handler_old, METH_VARARGS, (char *)"svn_file_invoke_rev_handler_old(svn_file_rev_handler_old_t _obj, void * baton, char const * path, svn_revnum_t rev, apr_hash_t rev_props, apr_array_header_t prop_diffs, apr_pool_t pool) -> svn_error_t"}, @@ -9542,6 +10123,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_txdelta_next_window_fn_t_swigregister", svn_txdelta_next_window_fn_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_txdelta_md5_digest_fn_t_swigregister", svn_txdelta_md5_digest_fn_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_txdelta_stream_open_func_t_swigregister", svn_txdelta_stream_open_func_t_swigregister, METH_VARARGS, NULL}, + { (char *)"svn_delta_path_driver_cb_func2_t_swigregister", svn_delta_path_driver_cb_func2_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_delta_path_driver_cb_func_t_swigregister", svn_delta_path_driver_cb_func_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_file_rev_handler_t_swigregister", svn_file_rev_handler_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_file_rev_handler_old_t_swigregister", svn_file_rev_handler_old_t_swigregister, METH_VARARGS, NULL}, @@ -9559,37 +10141,40 @@ static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *| static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_size_t = {"_p_apr_size_t", "apr_size_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_stream_t **,void *,apr_pool_t *,apr_pool_t *)|svn_txdelta_stream_open_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_t **,void *,apr_pool_t *)|svn_txdelta_next_window_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_delta_path_driver_cb_func_t|struct svn_error_t *(*)(void **,void *,void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,void *,apr_pool_t *)|struct svn_error_t *(*)(char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "struct svn_error_t *(*)(char const *,void *,char const *,svn_revnum_t,apr_pool_t *,void **)|svn_error_t *(*)(char const *,void *,char const *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "svn_error_t *(*)(char const *,void *,svn_revnum_t,apr_pool_t *,void **)|struct svn_error_t *(*)(char const *,void *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_revnum_t,void *,apr_pool_t *)|struct svn_error_t *(*)(char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(struct svn_delta_editor_t const *,void *,char const *,svn_txdelta_stream_open_func_t,void *,apr_pool_t *)|struct svn_error_t *(*)(struct svn_delta_editor_t const *,void *,char const *,svn_txdelta_stream_open_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_stream_t **,void *,apr_pool_t *,apr_pool_t *)|svn_txdelta_stream_open_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_window_t **,void *,apr_pool_t *)|svn_txdelta_next_window_fn_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_delta_path_driver_cb_func2_t|svn_error_t *(*)(void **,svn_delta_editor_t const *,void *,void *,void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_delta_path_driver_cb_func_t|svn_error_t *(*)(void **,void *,void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "svn_error_t *(*)(char const *,void *,char const *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "svn_error_t *(*)(char const *,void *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(struct svn_delta_editor_t const *,void *,char const *,svn_txdelta_stream_open_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void__p_unsigned_char = {"_p_f_p_void__p_unsigned_char", "unsigned char *(*)(void *)|svn_txdelta_md5_digest_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_error_t *(*)(void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_pool_t *,svn_txdelta_window_handler_t *,void **)|svn_error_t *(*)(void *,char const *,apr_pool_t *,svn_txdelta_window_handler_t *,void **)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_string_t const *,apr_pool_t *)|svn_error_t *(*)(void *,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_file_rev_handler_old_t|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *,void **)|svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *,svn_txdelta_window_handler_t *,void **)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_file_rev_handler_old_t|svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_txdelta_stream_t **,void *,apr_pool_t *,apr_pool_t *)|svn_txdelta_stream_open_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_txdelta_window_t **,void *,apr_pool_t *)|svn_txdelta_next_window_fn_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void **,void *,void *,char const *,apr_pool_t *)|svn_delta_path_driver_cb_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_txdelta_window_handler_t *|struct svn_error_t *(**)(svn_txdelta_window_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(svn_txdelta_stream_t **,void *,apr_pool_t *,apr_pool_t *)|svn_txdelta_stream_open_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(svn_txdelta_window_t **,void *,apr_pool_t *)|svn_txdelta_next_window_fn_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void **,svn_delta_editor_t const *,void *,void *,void *,char const *,apr_pool_t *)|svn_delta_path_driver_cb_func2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void **,void *,void *,char const *,apr_pool_t *)|svn_delta_path_driver_cb_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(**)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_void__p_unsigned_char = {"_p_p_f_p_void__p_unsigned_char", "svn_txdelta_md5_digest_fn_t *|unsigned char *(**)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_old_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_file_rev_handler_old_t *|svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_file_rev_handler_t *|svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_checksum_t = {"_p_p_svn_checksum_t", "struct svn_checksum_t **|svn_checksum_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_svn_delta_path_driver_state_t = {"_p_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t **|svn_delta_path_driver_state_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_txdelta_op_t = {"_p_p_svn_txdelta_op_t", "struct svn_txdelta_op_t **|svn_txdelta_op_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_txdelta_stream_t = {"_p_p_svn_txdelta_stream_t", "struct svn_txdelta_stream_t **|svn_txdelta_stream_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_txdelta_window_t = {"_p_p_svn_txdelta_window_t", "struct svn_txdelta_window_t **|svn_txdelta_window_t **", 0, 0, (void*)0, 0}; @@ -9611,11 +10196,12 @@ static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct s static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_hunk_t = {"_p_svn_diff_hunk_t", "svn_diff_hunk_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "svn_fs_lock_target_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; @@ -9632,6 +10218,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_prop_inherited_item_t = {"_p_svn_prop_inherited_item_t", "struct svn_prop_inherited_item_t *|svn_prop_inherited_item_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_prop_kind = {"_p_svn_prop_kind", "svn_prop_kind_t *|enum svn_prop_kind *", 0, 0, (void*)0, 0}; @@ -9665,6 +10252,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, + &_swigt__p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t, @@ -9686,6 +10274,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_long, &_swigt__p_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, + &_swigt__p_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, &_swigt__p_p_f_p_void__p_unsigned_char, @@ -9693,6 +10282,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_svn_checksum_t, &_swigt__p_p_svn_delta_editor_t, + &_swigt__p_p_svn_delta_path_driver_state_t, &_swigt__p_p_svn_txdelta_op_t, &_swigt__p_p_svn_txdelta_stream_t, &_swigt__p_p_svn_txdelta_window_t, @@ -9714,6 +10304,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_hunk_t, &_swigt__p_svn_dirent_t, @@ -9735,6 +10326,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_prop_inherited_item_t, &_swigt__p_svn_prop_kind, @@ -9768,6 +10360,7 @@ static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, static swig_cast_info _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t[] = { {&_swigt__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -9789,6 +10382,7 @@ static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0 static swig_cast_info _swigc__p_long[] = { {&_swigt__p_long, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t[] = { {&_swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void__p_unsigned_char[] = { {&_swigt__p_p_f_p_void__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}}; @@ -9796,6 +10390,7 @@ static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_ha static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_checksum_t[] = { {&_swigt__p_p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_delta_editor_t[] = { {&_swigt__p_p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_svn_delta_path_driver_state_t[] = { {&_swigt__p_p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_txdelta_op_t[] = { {&_swigt__p_p_svn_txdelta_op_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_txdelta_stream_t[] = { {&_swigt__p_p_svn_txdelta_stream_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_txdelta_window_t[] = { {&_swigt__p_p_svn_txdelta_window_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -9817,6 +10412,7 @@ static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_hunk_t[] = { {&_swigt__p_svn_diff_hunk_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_dirent_t[] = { {&_swigt__p_svn_dirent_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -9838,6 +10434,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_prop_inherited_item_t[] = { {&_swigt__p_svn_prop_inherited_item_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_prop_kind[] = { {&_swigt__p_svn_prop_kind, 0, 0, 0},{0, 0, 0, 0}}; @@ -9871,6 +10468,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, + _swigc__p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t, @@ -9892,6 +10490,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_long, _swigc__p_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, + _swigc__p_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, _swigc__p_p_f_p_void__p_unsigned_char, @@ -9899,6 +10498,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_svn_checksum_t, _swigc__p_p_svn_delta_editor_t, + _swigc__p_p_svn_delta_path_driver_state_t, _swigc__p_p_svn_txdelta_op_t, _swigc__p_p_svn_txdelta_stream_t, _swigc__p_p_svn_txdelta_window_t, @@ -9920,6 +10520,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_hunk_t, _swigc__p_svn_dirent_t, @@ -9941,6 +10542,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_prop_inherited_item_t, _swigc__p_svn_prop_kind, diff --git a/subversion/bindings/swig/python/svn_diff.c b/subversion/bindings/swig/python/svn_diff.c index dff45ea..392fab8 100644 --- a/subversion/bindings/swig/python/svn_diff.c +++ b/subversion/bindings/swig/python/svn_diff.c @@ -3056,27 +3056,28 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { #define SWIGTYPE_p_svn_opt_revision_t swig_types[70] #define SWIGTYPE_p_svn_opt_revision_value_t swig_types[71] #define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[72] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[73] -#define SWIGTYPE_p_svn_patch_file_t swig_types[74] -#define SWIGTYPE_p_svn_patch_t swig_types[75] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[76] -#define SWIGTYPE_p_svn_prop_kind swig_types[77] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[78] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[79] -#define SWIGTYPE_p_svn_stream_t swig_types[80] -#define SWIGTYPE_p_svn_string_t swig_types[81] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[82] -#define SWIGTYPE_p_svn_tristate_t swig_types[83] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[84] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[85] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[86] -#define SWIGTYPE_p_svn_version_extended_t swig_types[87] -#define SWIGTYPE_p_svn_version_t swig_types[88] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[89] -#define SWIGTYPE_p_unsigned_long swig_types[90] -#define SWIGTYPE_p_void swig_types[91] -static swig_type_info *swig_types[93]; -static swig_module_info swig_module = {swig_types, 92, 0, 0, 0, 0}; +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[73] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[74] +#define SWIGTYPE_p_svn_patch_file_t swig_types[75] +#define SWIGTYPE_p_svn_patch_t swig_types[76] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[77] +#define SWIGTYPE_p_svn_prop_kind swig_types[78] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[79] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[80] +#define SWIGTYPE_p_svn_stream_t swig_types[81] +#define SWIGTYPE_p_svn_string_t swig_types[82] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[83] +#define SWIGTYPE_p_svn_tristate_t swig_types[84] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[85] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[86] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[87] +#define SWIGTYPE_p_svn_version_extended_t swig_types[88] +#define SWIGTYPE_p_svn_version_t swig_types[89] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[90] +#define SWIGTYPE_p_unsigned_long swig_types[91] +#define SWIGTYPE_p_void swig_types[92] +static swig_type_info *swig_types[94]; +static swig_module_info swig_module = {swig_types, 93, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -6112,7 +6113,15 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified4(PyObject *SWIGUNUSEDPAR arg13 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOsszzzzOOO|O:svn_diff_file_output_unified4",&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8,&obj8,&obj9,&obj10,&obj11)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); @@ -6201,7 +6210,15 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified3(PyObject *SWIGUNUSEDPAR arg10 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOsszzzzO|O:svn_diff_file_output_unified3",&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8,&obj8,&obj9)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); @@ -6277,7 +6294,15 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified2(PyObject *SWIGUNUSEDPAR arg8 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOsszzz|O:svn_diff_file_output_unified2",&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&arg7,&obj7)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); @@ -6346,7 +6371,15 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified(PyObject *SWIGUNUSEDPARM arg7 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOsszz|O:svn_diff_file_output_unified",&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&obj6)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); @@ -6423,7 +6456,15 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge3(PyObject *SWIGUNUSEDPARM( arg13 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOssszzzzOO|O:svn_diff_file_output_merge3",&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8,&arg9,&obj9,&obj10,&obj11)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); @@ -6507,7 +6548,15 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge2(PyObject *SWIGUNUSEDPARM( arg11 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOssszzzzO|O:svn_diff_file_output_merge2",&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8,&arg9,&obj9,&obj10)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); @@ -6589,7 +6638,15 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge(PyObject *SWIGUNUSEDPARM(s arg12 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOssszzzzOO|O:svn_diff_file_output_merge",&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8,&arg9,&obj9,&obj10,&obj11)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); @@ -6671,13 +6728,37 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_binary(PyObject *SWIGUNUSEDPARM(self) arg6 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_diff_output_binary",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { - arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { - arg3 = svn_swig_py_make_stream (obj2, _global_pool); + if (obj2 == Py_None) { + arg3 = NULL; + } + else { + arg3 = svn_swig_py_make_stream (obj2, _global_pool); + if (arg3 == NULL) { + SWIG_fail; + } + } } { arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func; @@ -7108,7 +7189,15 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified3(PyObject *SWIGUNU arg13 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOOszzzOOOO|O:svn_diff_mem_string_output_unified3",&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); @@ -7227,7 +7316,15 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified2(PyObject *SWIGUNU arg10 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOOszzzOO|O:svn_diff_mem_string_output_unified2",&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7,&obj7,&obj8,&obj9)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); @@ -7333,7 +7430,15 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified(PyObject *SWIGUNUS arg8 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOzzzOO|O:svn_diff_mem_string_output_unified",&obj0,&obj1,&arg3,&arg4,&arg5,&obj5,&obj6,&obj7)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); @@ -7442,7 +7547,15 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge3(PyObject *SWIGUNUSE arg13 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOOOOzzzzOO|O:svn_diff_mem_string_output_merge3",&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&arg7,&arg8,&arg9,&obj9,&obj10,&obj11)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); @@ -7571,7 +7684,15 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge2(PyObject *SWIGUNUSE arg11 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOOOOzzzzO|O:svn_diff_mem_string_output_merge2",&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&arg7,&arg8,&arg9,&obj9,&obj10)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); @@ -7698,7 +7819,15 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge(PyObject *SWIGUNUSED arg12 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOOOOzzzzOO|O:svn_diff_mem_string_output_merge",&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&arg7,&arg8,&arg9,&obj9,&obj10,&obj11)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); @@ -10921,16 +11050,16 @@ static swig_type_info _swigt__p_apr_off_t = {"_p_apr_off_t", "apr_off_t *", 0, 0 static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_uint32_t = {"_p_apr_uint32_t", "apr_uint32_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t = {"_p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t", "struct svn_error_t *(*)(apr_uint32_t *,void **,void *,svn_diff_datasource_e)|svn_error_t *(*)(apr_uint32_t *,void **,void *,svn_diff_datasource_e)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t = {"_p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t", "svn_error_t *(*)(apr_uint32_t *,void **,void *,svn_diff_datasource_e)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void__void = {"_p_f_p_void__void", "void (*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t = {"_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t)|svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t = {"_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,svn_diff_t *)|svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,svn_diff_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_off_t_p_apr_off_t_p_q_const__svn_diff_datasource_e_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_apr_off_t_p_apr_off_t_p_q_const__svn_diff_datasource_e_apr_size_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_off_t *,apr_off_t *,svn_diff_datasource_e const *,apr_size_t)|struct svn_error_t *(*)(void *,apr_off_t *,apr_off_t *,svn_diff_datasource_e const *,apr_size_t)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t = {"_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t = {"_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,svn_diff_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_off_t_p_apr_off_t_p_q_const__svn_diff_datasource_e_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_apr_off_t_p_apr_off_t_p_q_const__svn_diff_datasource_e_apr_size_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_off_t *,apr_off_t *,svn_diff_datasource_e const *,apr_size_t)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_void__void = {"_p_f_p_void_p_void__void", "void (*)(void *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_void_p_void_p_int__p_svn_error_t = {"_p_f_p_void_p_void_p_void_p_int__p_svn_error_t", "svn_error_t *(*)(void *,void *,void *,int *)|struct svn_error_t *(*)(void *,void *,void *,int *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_diff_datasource_e__p_svn_error_t = {"_p_f_p_void_svn_diff_datasource_e__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_diff_datasource_e)|svn_error_t *(*)(void *,svn_diff_datasource_e)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_void_p_void_p_int__p_svn_error_t = {"_p_f_p_void_p_void_p_void_p_int__p_svn_error_t", "svn_error_t *(*)(void *,void *,void *,int *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_diff_datasource_e__p_svn_error_t = {"_p_f_p_void_svn_diff_datasource_e__p_svn_error_t", "svn_error_t *(*)(void *,svn_diff_datasource_e)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0}; @@ -10969,7 +11098,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "svn_fs_lock_target_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; @@ -10986,6 +11115,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -11080,6 +11210,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -11174,6 +11305,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -11268,6 +11400,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, diff --git a/subversion/bindings/swig/python/svn_fs.c b/subversion/bindings/swig/python/svn_fs.c index 0dc546b..360c7d9 100644 --- a/subversion/bindings/swig/python/svn_fs.c +++ b/subversion/bindings/swig/python/svn_fs.c @@ -3000,7 +3000,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { #define SWIGTYPE_p_f_p_void_long_long_p_apr_pool_t__void swig_types[14] #define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[15] #define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[16] -#define SWIGTYPE_p_f_p_void_p_struct_svn_error_t__void swig_types[17] +#define SWIGTYPE_p_f_p_void_p_svn_error_t__void swig_types[17] #define SWIGTYPE_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t swig_types[18] #define SWIGTYPE_p_int swig_types[19] #define SWIGTYPE_p_long swig_types[20] @@ -3016,7 +3016,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { #define SWIGTYPE_p_p_f_p_void_long_long_p_apr_pool_t__void swig_types[30] #define SWIGTYPE_p_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[31] #define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[32] -#define SWIGTYPE_p_p_f_p_void_p_struct_svn_error_t__void swig_types[33] +#define SWIGTYPE_p_p_f_p_void_p_svn_error_t__void swig_types[33] #define SWIGTYPE_p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t swig_types[34] #define SWIGTYPE_p_p_svn_checksum_t swig_types[35] #define SWIGTYPE_p_p_svn_fs_access_t swig_types[36] @@ -3051,67 +3051,70 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { #define SWIGTYPE_p_svn_commit_info_t swig_types[65] #define SWIGTYPE_p_svn_config_t swig_types[66] #define SWIGTYPE_p_svn_delta_editor_t swig_types[67] -#define SWIGTYPE_p_svn_depth_t swig_types[68] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[69] -#define SWIGTYPE_p_svn_dirent_t swig_types[70] -#define SWIGTYPE_p_svn_errno_t swig_types[71] -#define SWIGTYPE_p_svn_error_t swig_types[72] -#define SWIGTYPE_p_svn_fs_access_t swig_types[73] -#define SWIGTYPE_p_svn_fs_dirent_t swig_types[74] -#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[75] -#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[76] -#define SWIGTYPE_p_svn_fs_history_t swig_types[77] -#define SWIGTYPE_p_svn_fs_id_t swig_types[78] -#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[79] -#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[80] -#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[81] -#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[82] -#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[83] -#define SWIGTYPE_p_svn_fs_path_change3_t swig_types[84] -#define SWIGTYPE_p_svn_fs_path_change_iterator_t swig_types[85] -#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[86] -#define SWIGTYPE_p_svn_fs_path_change_t swig_types[87] -#define SWIGTYPE_p_svn_fs_root_t swig_types[88] -#define SWIGTYPE_p_svn_fs_t swig_types[89] -#define SWIGTYPE_p_svn_fs_txn_t swig_types[90] -#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[91] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[92] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[93] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[94] -#define SWIGTYPE_p_svn_location_segment_t swig_types[95] -#define SWIGTYPE_p_svn_lock_t swig_types[96] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[97] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[98] -#define SWIGTYPE_p_svn_log_entry_t swig_types[99] -#define SWIGTYPE_p_svn_merge_range_t swig_types[100] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[101] -#define SWIGTYPE_p_svn_node_kind_t swig_types[102] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[103] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[104] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[105] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[106] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[107] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[108] -#define SWIGTYPE_p_svn_prop_kind swig_types[109] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[110] -#define SWIGTYPE_p_svn_stream_t swig_types[111] -#define SWIGTYPE_p_svn_string_t swig_types[112] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[113] -#define SWIGTYPE_p_svn_tristate_t swig_types[114] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[115] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[116] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[117] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[118] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[119] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[120] -#define SWIGTYPE_p_svn_version_extended_t swig_types[121] -#define SWIGTYPE_p_svn_version_t swig_types[122] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[123] -#define SWIGTYPE_p_unsigned_char swig_types[124] -#define SWIGTYPE_p_unsigned_long swig_types[125] -#define SWIGTYPE_p_void swig_types[126] -static swig_type_info *swig_types[128]; -static swig_module_info swig_module = {swig_types, 127, 0, 0, 0, 0}; +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[68] +#define SWIGTYPE_p_svn_depth_t swig_types[69] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[70] +#define SWIGTYPE_p_svn_dirent_t swig_types[71] +#define SWIGTYPE_p_svn_errno_t swig_types[72] +#define SWIGTYPE_p_svn_error_t swig_types[73] +#define SWIGTYPE_p_svn_fs_access_t swig_types[74] +#define SWIGTYPE_p_svn_fs_dirent_t swig_types[75] +#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[76] +#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[77] +#define SWIGTYPE_p_svn_fs_history_t swig_types[78] +#define SWIGTYPE_p_svn_fs_id_t swig_types[79] +#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[80] +#define SWIGTYPE_p_svn_fs_ioctl_code_t swig_types[81] +#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[82] +#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[83] +#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[84] +#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[85] +#define SWIGTYPE_p_svn_fs_path_change3_t swig_types[86] +#define SWIGTYPE_p_svn_fs_path_change_iterator_t swig_types[87] +#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[88] +#define SWIGTYPE_p_svn_fs_path_change_t swig_types[89] +#define SWIGTYPE_p_svn_fs_root_t swig_types[90] +#define SWIGTYPE_p_svn_fs_t swig_types[91] +#define SWIGTYPE_p_svn_fs_txn_t swig_types[92] +#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[93] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[94] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[95] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[96] +#define SWIGTYPE_p_svn_location_segment_t swig_types[97] +#define SWIGTYPE_p_svn_lock_t swig_types[98] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[99] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[100] +#define SWIGTYPE_p_svn_log_entry_t swig_types[101] +#define SWIGTYPE_p_svn_merge_range_t swig_types[102] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[103] +#define SWIGTYPE_p_svn_node_kind_t swig_types[104] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[105] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[106] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[107] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[108] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[109] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[110] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[111] +#define SWIGTYPE_p_svn_prop_kind swig_types[112] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[113] +#define SWIGTYPE_p_svn_stream_t swig_types[114] +#define SWIGTYPE_p_svn_string_t swig_types[115] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[116] +#define SWIGTYPE_p_svn_tristate_t swig_types[117] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[118] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[119] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[120] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[121] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[122] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[123] +#define SWIGTYPE_p_svn_version_extended_t swig_types[124] +#define SWIGTYPE_p_svn_version_t swig_types[125] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[126] +#define SWIGTYPE_p_unsigned_char swig_types[127] +#define SWIGTYPE_p_unsigned_long swig_types[128] +#define SWIGTYPE_p_void swig_types[129] +static swig_type_info *swig_types[131]; +static swig_module_info swig_module = {swig_types, 130, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -14658,6 +14661,233 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_fs_ioctl_code_t_fs_type_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_fs_ioctl_code_t *arg1 = (struct svn_fs_ioctl_code_t *) 0 ; + char *arg2 = (char *) 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"Os:svn_fs_ioctl_code_t_fs_type_set",&obj0,&arg2)) SWIG_fail; + { + arg1 = (struct svn_fs_ioctl_code_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_ioctl_code_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->fs_type) free((char *)arg1->fs_type); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->fs_type = copied; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_fs_ioctl_code_t_fs_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_fs_ioctl_code_t *arg1 = (struct svn_fs_ioctl_code_t *) 0 ; + PyObject * obj0 = 0 ; + char *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_ioctl_code_t_fs_type_get",&obj0)) SWIG_fail; + { + arg1 = (struct svn_fs_ioctl_code_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_ioctl_code_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + result = (char *) ((arg1)->fs_type); + resultobj = SWIG_FromCharPtr((const char *)result); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_fs_ioctl_code_t_code_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_fs_ioctl_code_t *arg1 = (struct svn_fs_ioctl_code_t *) 0 ; + int arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_ioctl_code_t_code_set",&obj0,&obj1)) SWIG_fail; + { + arg1 = (struct svn_fs_ioctl_code_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_ioctl_code_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg2 = (int)SWIG_As_long (obj1); + if (SWIG_arg_fail(svn_argnum_obj1)) { + SWIG_fail; + } + } + if (arg1) (arg1)->code = arg2; + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_fs_ioctl_code_t_code_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_fs_ioctl_code_t *arg1 = (struct svn_fs_ioctl_code_t *) 0 ; + PyObject * obj0 = 0 ; + int result; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_ioctl_code_t_code_get",&obj0)) SWIG_fail; + { + arg1 = (struct svn_fs_ioctl_code_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_ioctl_code_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + result = (int) ((arg1)->code); + resultobj = SWIG_From_long((long)(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *svn_fs_ioctl_code_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_ioctl_code_t, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *_wrap_svn_fs_ioctl(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_fs_t *arg1 = (svn_fs_t *) 0 ; + svn_fs_ioctl_code_t arg2 ; + void *arg3 = (void *) 0 ; + void **arg4 = (void **) 0 ; + svn_cancel_func_t arg5 = (svn_cancel_func_t) 0 ; + void *arg6 = (void *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; + apr_pool_t *arg8 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + void *argp2 ; + int res2 = 0 ; + void *temp4 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg7 = _global_pool; + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg8 = _global_pool; + arg4 = &temp4; + if (!PyArg_ParseTuple(args,(char *)"OOOO|OO:svn_fs_ioctl",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; + { + arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_svn_fs_ioctl_code_t, 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_ioctl" "', argument " "2"" of type '" "svn_fs_ioctl_code_t""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "svn_fs_ioctl" "', argument " "2"" of type '" "svn_fs_ioctl_code_t""'"); + } else { + arg2 = *((svn_fs_ioctl_code_t *)(argp2)); + } + } + { + arg3 = (void *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_void, svn_argnum_obj2); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func; + arg6 = obj3; + } + if (obj4) { + /* Verify that the user supplied a valid pool */ + if (obj4 != Py_None && obj4 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4); + SWIG_arg_fail(svn_argnum_obj4); + SWIG_fail; + } + } + if (obj5) { + /* Verify that the user supplied a valid pool */ + if (obj5 != Py_None && obj5 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj5); + SWIG_arg_fail(svn_argnum_obj5); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_fs_ioctl(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + /* FIXME: Missing argout typemap: svn_fs_ioctl arg 4 (void **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_fs_ioctl is not implemented yet"); + + } + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *svn_fs_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; @@ -14726,7 +14956,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_warning_callback(PyObject *SWIGUNUSEDPA if (!PyArg_ParseTuple(args,(char *)"OOO:svn_fs_invoke_warning_callback",&obj0,&obj1,&obj2)) SWIG_fail; { svn_fs_warning_callback_t * tmp = - svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_struct_svn_error_t__void, svn_argnum_obj0); + svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_error_t__void, svn_argnum_obj0); if (tmp == NULL || PyErr_Occurred()) { SWIG_fail; } @@ -15493,7 +15723,7 @@ fail: SWIGINTERN PyObject *svn_fs_warning_callback_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_struct_svn_error_t__void, SWIG_NewClientData(obj)); + SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_svn_error_t__void, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -15770,6 +16000,12 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_fs_info_placeholder_t_swigregister", svn_fs_info_placeholder_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_fs_info", _wrap_svn_fs_info, METH_VARARGS, (char *)"svn_fs_info(svn_fs_t * fs, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_fs_info_dup", _wrap_svn_fs_info_dup, METH_VARARGS, (char *)"svn_fs_info_dup(void const * info, apr_pool_t result_pool, apr_pool_t scratch_pool) -> void *"}, + { (char *)"svn_fs_ioctl_code_t_fs_type_set", _wrap_svn_fs_ioctl_code_t_fs_type_set, METH_VARARGS, (char *)"svn_fs_ioctl_code_t_fs_type_set(svn_fs_ioctl_code_t self, char const * fs_type)"}, + { (char *)"svn_fs_ioctl_code_t_fs_type_get", _wrap_svn_fs_ioctl_code_t_fs_type_get, METH_VARARGS, (char *)"svn_fs_ioctl_code_t_fs_type_get(svn_fs_ioctl_code_t self) -> char const *"}, + { (char *)"svn_fs_ioctl_code_t_code_set", _wrap_svn_fs_ioctl_code_t_code_set, METH_VARARGS, (char *)"svn_fs_ioctl_code_t_code_set(svn_fs_ioctl_code_t self, int code)"}, + { (char *)"svn_fs_ioctl_code_t_code_get", _wrap_svn_fs_ioctl_code_t_code_get, METH_VARARGS, (char *)"svn_fs_ioctl_code_t_code_get(svn_fs_ioctl_code_t self) -> int"}, + { (char *)"svn_fs_ioctl_code_t_swigregister", svn_fs_ioctl_code_t_swigregister, METH_VARARGS, NULL}, + { (char *)"svn_fs_ioctl", _wrap_svn_fs_ioctl, METH_VARARGS, (char *)"svn_fs_ioctl(svn_fs_t * fs, svn_fs_ioctl_code_t ctlcode, void * input, svn_cancel_func_t cancel_func, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_fs_t_swigregister", svn_fs_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_fs_access_t_swigregister", svn_fs_access_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_fs_id_t_swigregister", svn_fs_id_t_swigregister, METH_VARARGS, NULL}, @@ -15812,33 +16048,33 @@ static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0 static swig_type_info _swigt__p_apr_uint64_t = {"_p_apr_uint64_t", "apr_uint64_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_long_p_void_p_apr_pool_t__void = {"_p_f_long_p_void_p_apr_pool_t__void", "void (*)(long,void *,apr_pool_t *)|svn_fs_progress_notify_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)|svn_fs_mergeinfo_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_fs_process_contents_func_t|struct svn_error_t *(*)(unsigned char const *,apr_size_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_uint64_t,svn_fs_upgrade_notify_action_t,apr_pool_t *)|svn_fs_upgrade_notify_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)|svn_fs_mergeinfo_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(unsigned char const *,apr_size_t,void *,apr_pool_t *)|svn_fs_process_contents_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_uint64_t,svn_fs_upgrade_notify_action_t,apr_pool_t *)|svn_fs_upgrade_notify_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_long_long_p_apr_pool_t__void = {"_p_f_p_void_long_long_p_apr_pool_t__void", "void (*)(void *,long,long,apr_pool_t *)|svn_fs_hotcopy_notify_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_fs_freeze_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_struct_svn_error_t__void = {"_p_f_p_void_p_struct_svn_error_t__void", "void (*)(void *,struct svn_error_t *)|svn_fs_warning_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_lock_t *,apr_pool_t *)|svn_fs_get_locks_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_pool_t *)|svn_fs_freeze_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_error_t__void = {"_p_f_p_void_p_svn_error_t__void", "void (*)(void *,svn_error_t *)|svn_fs_warning_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_lock_t *,apr_pool_t *)|svn_fs_get_locks_callback_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_array_header_t = {"_p_p_apr_array_header_t", "apr_array_header_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **|svn_mergeinfo_catalog_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_long_p_void_p_apr_pool_t__void = {"_p_p_f_long_p_void_p_apr_pool_t__void", "void (**)(long,void *,apr_pool_t *)|svn_fs_progress_notify_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_fs_mergeinfo_receiver_t *|struct svn_error_t *(**)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(unsigned char const *,apr_size_t,void *,apr_pool_t *)|svn_fs_process_contents_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_txdelta_window_handler_t *|struct svn_error_t *(**)(svn_txdelta_window_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,apr_uint64_t,svn_fs_upgrade_notify_action_t,apr_pool_t *)|svn_fs_upgrade_notify_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)|svn_fs_mergeinfo_receiver_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(unsigned char const *,apr_size_t,void *,apr_pool_t *)|svn_fs_process_contents_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(**)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,apr_uint64_t,svn_fs_upgrade_notify_action_t,apr_pool_t *)|svn_fs_upgrade_notify_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_void_long_long_p_apr_pool_t__void = {"_p_p_f_p_void_long_long_p_apr_pool_t__void", "void (**)(void *,long,long,apr_pool_t *)|svn_fs_hotcopy_notify_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,apr_pool_t *)|svn_fs_freeze_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_fs_lock_callback_t *|struct svn_error_t *(**)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_struct_svn_error_t__void = {"_p_p_f_p_void_p_struct_svn_error_t__void", "void (**)(void *,struct svn_error_t *)|svn_fs_warning_callback_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t", "svn_fs_get_locks_callback_t *|struct svn_error_t *(**)(void *,svn_lock_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,apr_pool_t *)|svn_fs_freeze_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_fs_lock_callback_t *|svn_error_t *(**)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_svn_error_t__void = {"_p_p_f_p_void_p_svn_error_t__void", "void (**)(void *,svn_error_t *)|svn_fs_warning_callback_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,svn_lock_t *,apr_pool_t *)|svn_fs_get_locks_callback_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_checksum_t = {"_p_p_svn_checksum_t", "struct svn_checksum_t **|svn_checksum_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_fs_access_t = {"_p_p_svn_fs_access_t", "struct svn_fs_access_t **|svn_fs_access_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_fs_history_t = {"_p_p_svn_fs_history_t", "struct svn_fs_history_t **|svn_fs_history_t **", 0, 0, (void*)0, 0}; @@ -15872,11 +16108,12 @@ static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct s static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_hunk_t = {"_p_svn_diff_hunk_t", "svn_diff_hunk_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_access_t = {"_p_svn_fs_access_t", "struct svn_fs_access_t *|svn_fs_access_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_dirent_t = {"_p_svn_fs_dirent_t", "struct svn_fs_dirent_t *|svn_fs_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_fsfs_info_t = {"_p_svn_fs_fsfs_info_t", "struct svn_fs_fsfs_info_t *|svn_fs_fsfs_info_t *", 0, 0, (void*)0, 0}; @@ -15884,6 +16121,7 @@ static swig_type_info _swigt__p_svn_fs_fsx_info_t = {"_p_svn_fs_fsx_info_t", "st static swig_type_info _swigt__p_svn_fs_history_t = {"_p_svn_fs_history_t", "struct svn_fs_history_t *|svn_fs_history_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_id_t = {"_p_svn_fs_id_t", "struct svn_fs_id_t *|svn_fs_id_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_info_placeholder_t = {"_p_svn_fs_info_placeholder_t", "struct svn_fs_info_placeholder_t *|svn_fs_info_placeholder_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_fs_ioctl_code_t = {"_p_svn_fs_ioctl_code_t", "struct svn_fs_ioctl_code_t *|svn_fs_ioctl_code_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "struct svn_fs_lock_target_t *|svn_fs_lock_target_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_node_relation_t = {"_p_svn_fs_node_relation_t", "enum svn_fs_node_relation_t *|svn_fs_node_relation_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_pack_notify_action_t = {"_p_svn_fs_pack_notify_action_t", "enum svn_fs_pack_notify_action_t *|svn_fs_pack_notify_action_t *", 0, 0, (void*)0, 0}; @@ -15911,6 +16149,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_prop_inherited_item_t = {"_p_svn_prop_inherited_item_t", "struct svn_prop_inherited_item_t *|svn_prop_inherited_item_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_prop_kind = {"_p_svn_prop_kind", "svn_prop_kind_t *|enum svn_prop_kind *", 0, 0, (void*)0, 0}; @@ -15950,7 +16189,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_f_p_void_long_long_p_apr_pool_t__void, &_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, - &_swigt__p_f_p_void_p_struct_svn_error_t__void, + &_swigt__p_f_p_void_p_svn_error_t__void, &_swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_int, &_swigt__p_long, @@ -15966,7 +16205,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_p_f_p_void_long_long_p_apr_pool_t__void, &_swigt__p_p_f_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, - &_swigt__p_p_f_p_void_p_struct_svn_error_t__void, + &_swigt__p_p_f_p_void_p_svn_error_t__void, &_swigt__p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_svn_checksum_t, &_swigt__p_p_svn_fs_access_t, @@ -16001,6 +16240,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_hunk_t, &_swigt__p_svn_dirent_t, @@ -16013,6 +16253,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_fs_history_t, &_swigt__p_svn_fs_id_t, &_swigt__p_svn_fs_info_placeholder_t, + &_swigt__p_svn_fs_ioctl_code_t, &_swigt__p_svn_fs_lock_target_t, &_swigt__p_svn_fs_node_relation_t, &_swigt__p_svn_fs_pack_notify_action_t, @@ -16040,6 +16281,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_prop_inherited_item_t, &_swigt__p_svn_prop_kind, @@ -16079,7 +16321,7 @@ static swig_cast_info _swigc__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_acti static swig_cast_info _swigc__p_f_p_void_long_long_p_apr_pool_t__void[] = { {&_swigt__p_f_p_void_long_long_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_f_p_void_p_struct_svn_error_t__void[] = { {&_swigt__p_f_p_void_p_struct_svn_error_t__void, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_void_p_svn_error_t__void[] = { {&_swigt__p_f_p_void_p_svn_error_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_long[] = { {&_swigt__p_long, 0, 0, 0},{0, 0, 0, 0}}; @@ -16095,7 +16337,7 @@ static swig_cast_info _swigc__p_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_ac static swig_cast_info _swigc__p_p_f_p_void_long_long_p_apr_pool_t__void[] = { {&_swigt__p_p_f_p_void_long_long_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_p_f_p_void_p_struct_svn_error_t__void[] = { {&_swigt__p_p_f_p_void_p_struct_svn_error_t__void, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_f_p_void_p_svn_error_t__void[] = { {&_swigt__p_p_f_p_void_p_svn_error_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_checksum_t[] = { {&_swigt__p_p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_fs_access_t[] = { {&_swigt__p_p_svn_fs_access_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -16130,6 +16372,7 @@ static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_hunk_t[] = { {&_swigt__p_svn_diff_hunk_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_dirent_t[] = { {&_swigt__p_svn_dirent_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -16142,6 +16385,7 @@ static swig_cast_info _swigc__p_svn_fs_fsx_info_t[] = { {&_swigt__p_svn_fs_fsx_ static swig_cast_info _swigc__p_svn_fs_history_t[] = { {&_swigt__p_svn_fs_history_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_id_t[] = { {&_swigt__p_svn_fs_id_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_info_placeholder_t[] = { {&_swigt__p_svn_fs_info_placeholder_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_fs_ioctl_code_t[] = { {&_swigt__p_svn_fs_ioctl_code_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = { {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_node_relation_t[] = { {&_swigt__p_svn_fs_node_relation_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_pack_notify_action_t[] = { {&_swigt__p_svn_fs_pack_notify_action_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -16169,6 +16413,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_prop_inherited_item_t[] = { {&_swigt__p_svn_prop_inherited_item_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_prop_kind[] = { {&_swigt__p_svn_prop_kind, 0, 0, 0},{0, 0, 0, 0}}; @@ -16208,7 +16453,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_f_p_void_long_long_p_apr_pool_t__void, _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, - _swigc__p_f_p_void_p_struct_svn_error_t__void, + _swigc__p_f_p_void_p_svn_error_t__void, _swigc__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, _swigc__p_int, _swigc__p_long, @@ -16224,7 +16469,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_p_f_p_void_long_long_p_apr_pool_t__void, _swigc__p_p_f_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, - _swigc__p_p_f_p_void_p_struct_svn_error_t__void, + _swigc__p_p_f_p_void_p_svn_error_t__void, _swigc__p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_svn_checksum_t, _swigc__p_p_svn_fs_access_t, @@ -16259,6 +16504,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_hunk_t, _swigc__p_svn_dirent_t, @@ -16271,6 +16517,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_fs_history_t, _swigc__p_svn_fs_id_t, _swigc__p_svn_fs_info_placeholder_t, + _swigc__p_svn_fs_ioctl_code_t, _swigc__p_svn_fs_lock_target_t, _swigc__p_svn_fs_node_relation_t, _swigc__p_svn_fs_pack_notify_action_t, @@ -16298,6 +16545,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_prop_inherited_item_t, _swigc__p_svn_prop_kind, diff --git a/subversion/bindings/swig/python/svn_ra.c b/subversion/bindings/swig/python/svn_ra.c index f44e086..36b66fa 100644 --- a/subversion/bindings/swig/python/svn_ra.c +++ b/subversion/bindings/swig/python/svn_ra.c @@ -3096,55 +3096,57 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { #define SWIGTYPE_p_svn_commit_info_t swig_types[110] #define SWIGTYPE_p_svn_config_t swig_types[111] #define SWIGTYPE_p_svn_delta_editor_t swig_types[112] -#define SWIGTYPE_p_svn_depth_t swig_types[113] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[114] -#define SWIGTYPE_p_svn_dirent_t swig_types[115] -#define SWIGTYPE_p_svn_errno_t swig_types[116] -#define SWIGTYPE_p_svn_error_t swig_types[117] -#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[118] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[119] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[120] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[121] -#define SWIGTYPE_p_svn_location_segment_t swig_types[122] -#define SWIGTYPE_p_svn_lock_t swig_types[123] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[124] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[125] -#define SWIGTYPE_p_svn_log_entry_t swig_types[126] -#define SWIGTYPE_p_svn_merge_range_t swig_types[127] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[128] -#define SWIGTYPE_p_svn_node_kind_t swig_types[129] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[130] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[131] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[132] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[133] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[134] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[135] -#define SWIGTYPE_p_svn_prop_kind swig_types[136] -#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[137] -#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[138] -#define SWIGTYPE_p_svn_ra_plugin_t swig_types[139] -#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[140] -#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[141] -#define SWIGTYPE_p_svn_ra_reporter_t swig_types[142] -#define SWIGTYPE_p_svn_ra_session_t swig_types[143] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[144] -#define SWIGTYPE_p_svn_stream_t swig_types[145] -#define SWIGTYPE_p_svn_string_t swig_types[146] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[147] -#define SWIGTYPE_p_svn_tristate_t swig_types[148] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[149] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[150] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[151] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[152] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[153] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[154] -#define SWIGTYPE_p_svn_version_extended_t swig_types[155] -#define SWIGTYPE_p_svn_version_t swig_types[156] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[157] -#define SWIGTYPE_p_unsigned_long swig_types[158] -#define SWIGTYPE_p_void swig_types[159] -static swig_type_info *swig_types[161]; -static swig_module_info swig_module = {swig_types, 160, 0, 0, 0, 0}; +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[113] +#define SWIGTYPE_p_svn_depth_t swig_types[114] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[115] +#define SWIGTYPE_p_svn_dirent_t swig_types[116] +#define SWIGTYPE_p_svn_errno_t swig_types[117] +#define SWIGTYPE_p_svn_error_t swig_types[118] +#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[119] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[120] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[121] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[122] +#define SWIGTYPE_p_svn_location_segment_t swig_types[123] +#define SWIGTYPE_p_svn_lock_t swig_types[124] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[125] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[126] +#define SWIGTYPE_p_svn_log_entry_t swig_types[127] +#define SWIGTYPE_p_svn_merge_range_t swig_types[128] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[129] +#define SWIGTYPE_p_svn_node_kind_t swig_types[130] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[131] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[132] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[133] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[134] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[135] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[136] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[137] +#define SWIGTYPE_p_svn_prop_kind swig_types[138] +#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[139] +#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[140] +#define SWIGTYPE_p_svn_ra_plugin_t swig_types[141] +#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[142] +#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[143] +#define SWIGTYPE_p_svn_ra_reporter_t swig_types[144] +#define SWIGTYPE_p_svn_ra_session_t swig_types[145] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[146] +#define SWIGTYPE_p_svn_stream_t swig_types[147] +#define SWIGTYPE_p_svn_string_t swig_types[148] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[149] +#define SWIGTYPE_p_svn_tristate_t swig_types[150] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[151] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[152] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[153] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[154] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[155] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[156] +#define SWIGTYPE_p_svn_version_extended_t swig_types[157] +#define SWIGTYPE_p_svn_version_t swig_types[158] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[159] +#define SWIGTYPE_p_unsigned_long swig_types[160] +#define SWIGTYPE_p_void swig_types[161] +static swig_type_info *swig_types[163]; +static swig_module_info swig_module = {swig_types, 162, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -7865,7 +7867,15 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_file(PyObject *SWIGUNUSEDPARM(self), PyObj } } { - arg4 = svn_swig_py_make_stream (obj3, _global_pool); + if (obj3 == Py_None) { + arg4 = NULL; + } + else { + arg4 = svn_swig_py_make_stream (obj3, _global_pool); + if (arg4 == NULL) { + SWIG_fail; + } + } } if (obj4) { /* Verify that the user supplied a valid pool */ @@ -15089,7 +15099,15 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_file(PyObject *SWIGUNUSEDPAR } } { - arg5 = svn_swig_py_make_stream (obj4, _global_pool); + if (obj4 == Py_None) { + arg5 = NULL; + } + else { + arg5 = svn_swig_py_make_stream (obj4, _global_pool); + if (arg5 == NULL) { + SWIG_fail; + } + } } if (obj5) { /* Verify that the user supplied a valid pool */ @@ -18135,55 +18153,55 @@ static swig_type_info _swigt__p_apr_off_t = {"_p_apr_off_t", "apr_off_t *", 0, 0 static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void = {"_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void", "void (*)(apr_off_t,apr_off_t,void *,apr_pool_t *)|svn_ra_progress_notify_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t = {"_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t", "struct svn_error_t *(*)(int,apr_pool_t *,apr_hash_t *)|svn_ra_init_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(apr_file_t **,void *,apr_pool_t *)|struct svn_error_t *(*)(apr_file_t **,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|struct svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void **,char const *,svn_ra_callbacks_t const *,void *,apr_hash_t *,apr_pool_t *)|svn_error_t *(*)(void **,char const *,svn_ra_callbacks_t const *,void *,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_dirent_t *,void *,apr_pool_t *)|svn_ra_dirent_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_error_t *(*)(void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t **,char const *,svn_revnum_t,apr_array_header_t *,apr_pool_t *)|struct svn_error_t *(*)(void *,apr_hash_t **,char const *,svn_revnum_t,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const **,apr_pool_t *)|svn_ra_get_client_string_func_t|struct svn_error_t *(*)(void *,char const **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_delta_editor_t const **,void **,char const *,svn_commit_callback_t,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_delta_editor_t const **,void **,char const *,svn_commit_callback_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,char const *,svn_revnum_t,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,char const *,svn_revnum_t,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_stream_t **,svn_checksum_t const *,apr_pool_t *)|svn_ra_get_wc_contents_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_array_header_t const *,svn_revnum_t,svn_revnum_t,svn_boolean_t,svn_boolean_t,svn_log_message_receiver_t,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,apr_array_header_t const *,svn_revnum_t,svn_revnum_t,svn_boolean_t,svn_boolean_t,svn_log_message_receiver_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t = {"_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t", "svn_error_t *(*)(int,apr_pool_t *,apr_hash_t *)|svn_ra_init_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(apr_file_t **,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void **,char const *,svn_ra_callbacks_t const *,void *,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_dirent_t *,void *,apr_pool_t *)|svn_ra_dirent_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)|svn_commit_callback2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t **,char const *,svn_revnum_t,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const **,apr_pool_t *)|svn_ra_get_client_string_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_delta_editor_t const **,void **,char const *,svn_commit_callback_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,char const *,svn_revnum_t,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t", "svn_ra_get_wc_contents_func_t|svn_error_t *(*)(void *,svn_stream_t **,svn_checksum_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_array_header_t const *,svn_revnum_t,svn_revnum_t,svn_boolean_t,svn_boolean_t,svn_log_message_receiver_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char__int = {"_p_f_p_void_p_q_const__char__int", "int (*)(void *,char const *)|svn_ra_check_tunnel_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_ra_invalidate_wc_props_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_string_t const **,apr_pool_t *)|svn_ra_get_wc_prop_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_string_t const *,apr_pool_t *)|svn_ra_set_wc_prop_func_t|svn_ra_push_wc_prop_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)|svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)|svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)|svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_boolean_t,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_ra_lock_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_ra_file_rev_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t **,svn_revnum_t *,apr_hash_t **,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t **,svn_revnum_t *,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_node_kind_t *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_node_kind_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_revnum_t,svn_ra_file_rev_handler_t,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_revnum_t,svn_ra_file_rev_handler_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t__p_svn_error_t", "svn_ra_get_latest_revnum_func_t|struct svn_error_t *(*)(void *,svn_revnum_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_time_t,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_revnum_t *,apr_time_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_revnum_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_ra_invalidate_wc_props_func_t|svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_ra_get_wc_prop_func_t|svn_error_t *(*)(void *,char const *,char const *,svn_string_t const **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_ra_set_wc_prop_func_t|svn_ra_push_wc_prop_func_t|svn_error_t *(*)(void *,char const *,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_boolean_t,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_ra_lock_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_ra_file_rev_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t **,svn_revnum_t *,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_node_kind_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_revnum_t,svn_ra_file_rev_handler_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t__p_svn_error_t", "svn_ra_get_latest_revnum_func_t|svn_error_t *(*)(void *,svn_revnum_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_time_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_void__void = {"_p_f_p_void_p_void__void", "svn_ra_close_tunnel_func_t|void (*)(void *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,apr_hash_t **,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t **,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t const *,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,void *,svn_delta_editor_t const **,void **,apr_hash_t *,apr_pool_t *)|svn_ra_replay_revstart_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,void *,svn_delta_editor_t const *,void *,apr_hash_t *,apr_pool_t *)|svn_ra_replay_revfinish_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_ra_replay_revstart_callback_t|svn_error_t *(*)(svn_revnum_t,void *,svn_delta_editor_t const **,void **,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_ra_replay_revfinish_callback_t|svn_error_t *(*)(svn_revnum_t,void *,svn_delta_editor_t const *,void *,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_void__p_svn_version_t = {"_p_f_void__p_svn_version_t", "struct svn_version_t *(*)(void)|svn_version_t *(*)(void)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; @@ -18192,23 +18210,23 @@ static swig_type_info _swigt__p_p_apr_file_t = {"_p_p_apr_file_t", "apr_file_t * static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **|svn_mergeinfo_catalog_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void = {"_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void", "void (**)(apr_off_t,apr_off_t,void *,apr_pool_t *)|svn_ra_progress_notify_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t = {"_p_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t", "svn_ra_init_func_t *|struct svn_error_t *(**)(int,apr_pool_t *,apr_hash_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)|svn_ra_open_tunnel_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_txdelta_window_handler_t *|struct svn_error_t *(**)(svn_txdelta_window_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void__p_svn_error_t = {"_p_p_f_p_void__p_svn_error_t", "svn_cancel_func_t *|struct svn_error_t *(**)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_ra_get_client_string_func_t *|struct svn_error_t *(**)(void *,char const **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,svn_stream_t **,svn_checksum_t const *,apr_pool_t *)|svn_ra_get_wc_contents_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t = {"_p_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t", "svn_error_t *(**)(int,apr_pool_t *,apr_hash_t *)|svn_ra_init_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t *|svn_error_t *(**)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(**)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void__p_svn_error_t = {"_p_p_f_p_void__p_svn_error_t", "svn_cancel_func_t *|svn_error_t *(**)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const **,apr_pool_t *)|svn_ra_get_client_string_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,svn_stream_t **,svn_checksum_t const *,apr_pool_t *)|svn_ra_get_wc_contents_func_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_void_p_q_const__char__int = {"_p_p_f_p_void_p_q_const__char__int", "int (**)(void *,char const *)|svn_ra_check_tunnel_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,char const *,apr_pool_t *)|svn_ra_invalidate_wc_props_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,char const *,svn_string_t const **,apr_pool_t *)|svn_ra_get_wc_prop_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,char const *,svn_string_t const *,apr_pool_t *)|svn_ra_set_wc_prop_func_t *|svn_ra_push_wc_prop_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_ra_lock_callback_t *|struct svn_error_t *(**)(void *,char const *,svn_boolean_t,svn_lock_t const *,svn_error_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_ra_file_rev_handler_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_svn_revnum_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_revnum_t__p_svn_error_t", "struct svn_error_t *(**)(void *,svn_revnum_t *)|svn_ra_get_latest_revnum_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,char const *,apr_pool_t *)|svn_ra_invalidate_wc_props_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,char const *,svn_string_t const **,apr_pool_t *)|svn_ra_get_wc_prop_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,char const *,svn_string_t const *,apr_pool_t *)|svn_ra_set_wc_prop_func_t *|svn_ra_push_wc_prop_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_ra_lock_callback_t *|svn_error_t *(**)(void *,char const *,svn_boolean_t,svn_lock_t const *,svn_error_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_ra_file_rev_handler_t *|svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_file_rev_handler_t *|svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_svn_revnum_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_revnum_t__p_svn_error_t", "svn_error_t *(**)(void *,svn_revnum_t *)|svn_ra_get_latest_revnum_func_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_void_p_void__void = {"_p_p_f_p_void_p_void__void", "svn_ra_close_tunnel_func_t *|void (**)(void *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_ra_replay_revstart_callback_t *|struct svn_error_t *(**)(svn_revnum_t,void *,svn_delta_editor_t const **,void **,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_ra_replay_revfinish_callback_t *|struct svn_error_t *(**)(svn_revnum_t,void *,svn_delta_editor_t const *,void *,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_ra_replay_revstart_callback_t *|svn_error_t *(**)(svn_revnum_t,void *,svn_delta_editor_t const **,void **,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_ra_replay_revfinish_callback_t *|svn_error_t *(**)(svn_revnum_t,void *,svn_delta_editor_t const *,void *,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_dirent_t = {"_p_p_svn_dirent_t", "struct svn_dirent_t **|svn_dirent_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_lock_t = {"_p_p_svn_lock_t", "struct svn_lock_t **|svn_lock_t **", 0, 0, (void*)0, 0}; @@ -18239,11 +18257,12 @@ static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct s static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_hunk_t = {"_p_svn_diff_hunk_t", "svn_diff_hunk_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "svn_fs_lock_target_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; @@ -18260,6 +18279,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_prop_inherited_item_t = {"_p_svn_prop_inherited_item_t", "struct svn_prop_inherited_item_t *|svn_prop_inherited_item_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_prop_kind = {"_p_svn_prop_kind", "svn_prop_kind_t *|enum svn_prop_kind *", 0, 0, (void*)0, 0}; @@ -18401,6 +18421,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_hunk_t, &_swigt__p_svn_dirent_t, @@ -18422,6 +18443,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_prop_inherited_item_t, &_swigt__p_svn_prop_kind, @@ -18563,6 +18585,7 @@ static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_hunk_t[] = { {&_swigt__p_svn_diff_hunk_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_dirent_t[] = { {&_swigt__p_svn_dirent_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -18584,6 +18607,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_prop_inherited_item_t[] = { {&_swigt__p_svn_prop_inherited_item_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_prop_kind[] = { {&_swigt__p_svn_prop_kind, 0, 0, 0},{0, 0, 0, 0}}; @@ -18725,6 +18749,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_hunk_t, _swigc__p_svn_dirent_t, @@ -18746,6 +18771,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_prop_inherited_item_t, _swigc__p_svn_prop_kind, diff --git a/subversion/bindings/swig/python/svn_repos.c b/subversion/bindings/swig/python/svn_repos.c index dc15b89..e410897 100644 --- a/subversion/bindings/swig/python/svn_repos.c +++ b/subversion/bindings/swig/python/svn_repos.c @@ -3011,133 +3011,138 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { #define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[25] #define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[26] #define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void swig_types[27] -#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[28] -#define SWIGTYPE_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[29] -#define SWIGTYPE_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t swig_types[30] -#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[31] -#define SWIGTYPE_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[32] -#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[33] -#define SWIGTYPE_p_int swig_types[34] -#define SWIGTYPE_p_long swig_types[35] -#define SWIGTYPE_p_p_apr_array_header_t swig_types[36] -#define SWIGTYPE_p_p_apr_hash_t swig_types[37] -#define SWIGTYPE_p_p_char swig_types[38] -#define SWIGTYPE_p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[39] -#define SWIGTYPE_p_p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[40] -#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[41] -#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[42] -#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t swig_types[43] -#define SWIGTYPE_p_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[44] -#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[45] -#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[46] -#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[47] -#define SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void swig_types[48] -#define SWIGTYPE_p_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[49] -#define SWIGTYPE_p_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t swig_types[50] -#define SWIGTYPE_p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[51] -#define SWIGTYPE_p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[52] -#define SWIGTYPE_p_p_svn_authz_t swig_types[53] -#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[54] -#define SWIGTYPE_p_p_svn_dirent_t swig_types[55] -#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[56] -#define SWIGTYPE_p_p_svn_lock_t swig_types[57] -#define SWIGTYPE_p_p_svn_repos_parse_fns2_t swig_types[58] -#define SWIGTYPE_p_p_svn_repos_parse_fns3_t swig_types[59] -#define SWIGTYPE_p_p_svn_repos_parse_fns_t swig_types[60] -#define SWIGTYPE_p_p_svn_repos_t swig_types[61] -#define SWIGTYPE_p_p_svn_stream_t swig_types[62] -#define SWIGTYPE_p_p_svn_string_t swig_types[63] -#define SWIGTYPE_p_p_svn_version_t swig_types[64] -#define SWIGTYPE_p_p_void swig_types[65] -#define SWIGTYPE_p_svn_auth_baton_t swig_types[66] -#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[67] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[68] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[69] -#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[70] -#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[71] -#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[72] -#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[73] -#define SWIGTYPE_p_svn_auth_provider_t swig_types[74] -#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[75] -#define SWIGTYPE_p_svn_authz_t swig_types[76] -#define SWIGTYPE_p_svn_cache_config_t swig_types[77] -#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[78] -#define SWIGTYPE_p_svn_checksum_kind_t swig_types[79] -#define SWIGTYPE_p_svn_checksum_t swig_types[80] -#define SWIGTYPE_p_svn_commit_info_t swig_types[81] -#define SWIGTYPE_p_svn_config_t swig_types[82] -#define SWIGTYPE_p_svn_delta_editor_t swig_types[83] -#define SWIGTYPE_p_svn_depth_t swig_types[84] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[85] -#define SWIGTYPE_p_svn_dirent_t swig_types[86] -#define SWIGTYPE_p_svn_errno_t swig_types[87] -#define SWIGTYPE_p_svn_error_t swig_types[88] -#define SWIGTYPE_p_svn_fs_access_t swig_types[89] -#define SWIGTYPE_p_svn_fs_dirent_t swig_types[90] -#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[91] -#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[92] -#define SWIGTYPE_p_svn_fs_history_t swig_types[93] -#define SWIGTYPE_p_svn_fs_id_t swig_types[94] -#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[95] -#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[96] -#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[97] -#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[98] -#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[99] -#define SWIGTYPE_p_svn_fs_path_change3_t swig_types[100] -#define SWIGTYPE_p_svn_fs_path_change_iterator_t swig_types[101] -#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[102] -#define SWIGTYPE_p_svn_fs_path_change_t swig_types[103] -#define SWIGTYPE_p_svn_fs_root_t swig_types[104] -#define SWIGTYPE_p_svn_fs_t swig_types[105] -#define SWIGTYPE_p_svn_fs_txn_t swig_types[106] -#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[107] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[108] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[109] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[110] -#define SWIGTYPE_p_svn_location_segment_t swig_types[111] -#define SWIGTYPE_p_svn_lock_t swig_types[112] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[113] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[114] -#define SWIGTYPE_p_svn_log_entry_t swig_types[115] -#define SWIGTYPE_p_svn_merge_range_t swig_types[116] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[117] -#define SWIGTYPE_p_svn_node_kind_t swig_types[118] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[119] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[120] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[121] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[122] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[123] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[124] -#define SWIGTYPE_p_svn_prop_kind swig_types[125] -#define SWIGTYPE_p_svn_repos_authz_access_t swig_types[126] -#define SWIGTYPE_p_svn_repos_log_entry_t swig_types[127] -#define SWIGTYPE_p_svn_repos_node_t swig_types[128] -#define SWIGTYPE_p_svn_repos_notify_action_t swig_types[129] -#define SWIGTYPE_p_svn_repos_notify_t swig_types[130] -#define SWIGTYPE_p_svn_repos_notify_warning_t swig_types[131] -#define SWIGTYPE_p_svn_repos_parse_fns2_t swig_types[132] -#define SWIGTYPE_p_svn_repos_parse_fns3_t swig_types[133] -#define SWIGTYPE_p_svn_repos_parse_fns_t swig_types[134] -#define SWIGTYPE_p_svn_repos_revision_access_level_t swig_types[135] -#define SWIGTYPE_p_svn_repos_t swig_types[136] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[137] -#define SWIGTYPE_p_svn_stream_t swig_types[138] -#define SWIGTYPE_p_svn_string_t swig_types[139] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[140] -#define SWIGTYPE_p_svn_tristate_t swig_types[141] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[142] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[143] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[144] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[145] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[146] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[147] -#define SWIGTYPE_p_svn_version_extended_t swig_types[148] -#define SWIGTYPE_p_svn_version_t swig_types[149] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[150] -#define SWIGTYPE_p_unsigned_long swig_types[151] -#define SWIGTYPE_p_void swig_types[152] -static swig_type_info *swig_types[154]; -static swig_module_info swig_module = {swig_types, 153, 0, 0, 0, 0}; +#define SWIGTYPE_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void swig_types[28] +#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[29] +#define SWIGTYPE_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[30] +#define SWIGTYPE_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t swig_types[31] +#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[32] +#define SWIGTYPE_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[33] +#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[34] +#define SWIGTYPE_p_int swig_types[35] +#define SWIGTYPE_p_long swig_types[36] +#define SWIGTYPE_p_p_apr_array_header_t swig_types[37] +#define SWIGTYPE_p_p_apr_hash_t swig_types[38] +#define SWIGTYPE_p_p_char swig_types[39] +#define SWIGTYPE_p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[40] +#define SWIGTYPE_p_p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[41] +#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[42] +#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[43] +#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t swig_types[44] +#define SWIGTYPE_p_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[45] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[46] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[47] +#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[48] +#define SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void swig_types[49] +#define SWIGTYPE_p_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void swig_types[50] +#define SWIGTYPE_p_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[51] +#define SWIGTYPE_p_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t swig_types[52] +#define SWIGTYPE_p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[53] +#define SWIGTYPE_p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[54] +#define SWIGTYPE_p_p_svn_authz_t swig_types[55] +#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[56] +#define SWIGTYPE_p_p_svn_dirent_t swig_types[57] +#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[58] +#define SWIGTYPE_p_p_svn_lock_t swig_types[59] +#define SWIGTYPE_p_p_svn_repos_parse_fns2_t swig_types[60] +#define SWIGTYPE_p_p_svn_repos_parse_fns3_t swig_types[61] +#define SWIGTYPE_p_p_svn_repos_parse_fns_t swig_types[62] +#define SWIGTYPE_p_p_svn_repos_t swig_types[63] +#define SWIGTYPE_p_p_svn_stream_t swig_types[64] +#define SWIGTYPE_p_p_svn_string_t swig_types[65] +#define SWIGTYPE_p_p_svn_version_t swig_types[66] +#define SWIGTYPE_p_p_void swig_types[67] +#define SWIGTYPE_p_svn_auth_baton_t swig_types[68] +#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[69] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[70] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[71] +#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[72] +#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[73] +#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[74] +#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[75] +#define SWIGTYPE_p_svn_auth_provider_t swig_types[76] +#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[77] +#define SWIGTYPE_p_svn_authz_t swig_types[78] +#define SWIGTYPE_p_svn_cache_config_t swig_types[79] +#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[80] +#define SWIGTYPE_p_svn_checksum_kind_t swig_types[81] +#define SWIGTYPE_p_svn_checksum_t swig_types[82] +#define SWIGTYPE_p_svn_commit_info_t swig_types[83] +#define SWIGTYPE_p_svn_config_t swig_types[84] +#define SWIGTYPE_p_svn_delta_editor_t swig_types[85] +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[86] +#define SWIGTYPE_p_svn_depth_t swig_types[87] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[88] +#define SWIGTYPE_p_svn_dirent_t swig_types[89] +#define SWIGTYPE_p_svn_errno_t swig_types[90] +#define SWIGTYPE_p_svn_error_t swig_types[91] +#define SWIGTYPE_p_svn_fs_access_t swig_types[92] +#define SWIGTYPE_p_svn_fs_dirent_t swig_types[93] +#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[94] +#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[95] +#define SWIGTYPE_p_svn_fs_history_t swig_types[96] +#define SWIGTYPE_p_svn_fs_id_t swig_types[97] +#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[98] +#define SWIGTYPE_p_svn_fs_ioctl_code_t swig_types[99] +#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[100] +#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[101] +#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[102] +#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[103] +#define SWIGTYPE_p_svn_fs_path_change3_t swig_types[104] +#define SWIGTYPE_p_svn_fs_path_change_iterator_t swig_types[105] +#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[106] +#define SWIGTYPE_p_svn_fs_path_change_t swig_types[107] +#define SWIGTYPE_p_svn_fs_root_t swig_types[108] +#define SWIGTYPE_p_svn_fs_t swig_types[109] +#define SWIGTYPE_p_svn_fs_txn_t swig_types[110] +#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[111] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[112] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[113] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[114] +#define SWIGTYPE_p_svn_location_segment_t swig_types[115] +#define SWIGTYPE_p_svn_lock_t swig_types[116] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[117] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[118] +#define SWIGTYPE_p_svn_log_entry_t swig_types[119] +#define SWIGTYPE_p_svn_merge_range_t swig_types[120] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[121] +#define SWIGTYPE_p_svn_node_kind_t swig_types[122] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[123] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[124] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[125] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[126] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[127] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[128] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[129] +#define SWIGTYPE_p_svn_prop_kind swig_types[130] +#define SWIGTYPE_p_svn_repos_authz_access_t swig_types[131] +#define SWIGTYPE_p_svn_repos_log_entry_t swig_types[132] +#define SWIGTYPE_p_svn_repos_node_t swig_types[133] +#define SWIGTYPE_p_svn_repos_notify_action_t swig_types[134] +#define SWIGTYPE_p_svn_repos_notify_t swig_types[135] +#define SWIGTYPE_p_svn_repos_notify_warning_t swig_types[136] +#define SWIGTYPE_p_svn_repos_parse_fns2_t swig_types[137] +#define SWIGTYPE_p_svn_repos_parse_fns3_t swig_types[138] +#define SWIGTYPE_p_svn_repos_parse_fns_t swig_types[139] +#define SWIGTYPE_p_svn_repos_revision_access_level_t swig_types[140] +#define SWIGTYPE_p_svn_repos_t swig_types[141] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[142] +#define SWIGTYPE_p_svn_stream_t swig_types[143] +#define SWIGTYPE_p_svn_string_t swig_types[144] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[145] +#define SWIGTYPE_p_svn_tristate_t swig_types[146] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[147] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[148] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[149] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[150] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[151] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[152] +#define SWIGTYPE_p_svn_version_extended_t swig_types[153] +#define SWIGTYPE_p_svn_version_t swig_types[154] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[155] +#define SWIGTYPE_p_unsigned_long swig_types[156] +#define SWIGTYPE_p_void swig_types[157] +static swig_type_info *swig_types[159]; +static swig_module_info swig_module = {swig_types, 158, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -3830,6 +3835,11 @@ static svn_error_t * svn_repos_invoke_verify_callback( return _obj(baton, revision, verify_err, scratch_pool); } +static void svn_repos_invoke_authz_warning_func( + svn_repos_authz_warning_func_t _obj, void *baton, const svn_error_t *error, apr_pool_t *scratch_pool) { + _obj(baton, error, scratch_pool); +} + #ifdef __cplusplus extern "C" { @@ -6114,7 +6124,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_freeze(PyObject *SWIGUNUSEDPARM(self), PyOb { svn_swig_py_release_py_lock(); - result = (svn_error_t *)svn_repos_freeze(arg1,arg2,arg3,arg4); + result = (svn_error_t *)svn_repos_freeze((apr_array_header_t const *)arg1,arg2,arg3,arg4); svn_swig_py_acquire_py_lock(); @@ -14480,7 +14490,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_verify_fs(PyObject *SWIGUNUSEDPARM(self), P } } { - arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { arg3 = (svn_revnum_t)SWIG_As_long (obj2); @@ -14584,7 +14602,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_dump_fs4(PyObject *SWIGUNUSEDPARM(self), Py } } { - arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { arg3 = (svn_revnum_t)SWIG_As_long (obj2); @@ -14736,7 +14762,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_dump_fs3(PyObject *SWIGUNUSEDPARM(self), Py } } { - arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { arg3 = (svn_revnum_t)SWIG_As_long (obj2); @@ -14858,10 +14892,26 @@ SWIGINTERN PyObject *_wrap_svn_repos_dump_fs2(PyObject *SWIGUNUSEDPARM(self), Py } } { - arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { - arg3 = svn_swig_py_make_stream (obj2, _global_pool); + if (obj2 == Py_None) { + arg3 = NULL; + } + else { + arg3 = svn_swig_py_make_stream (obj2, _global_pool); + if (arg3 == NULL) { + SWIG_fail; + } + } } { arg4 = (svn_revnum_t)SWIG_As_long (obj3); @@ -14965,10 +15015,26 @@ SWIGINTERN PyObject *_wrap_svn_repos_dump_fs(PyObject *SWIGUNUSEDPARM(self), PyO } } { - arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { - arg3 = svn_swig_py_make_stream (obj2, _global_pool); + if (obj2 == Py_None) { + arg3 = NULL; + } + else { + arg3 = svn_swig_py_make_stream (obj2, _global_pool); + if (arg3 == NULL) { + SWIG_fail; + } + } } { arg4 = (svn_revnum_t)SWIG_As_long (obj3); @@ -15079,7 +15145,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs6(PyObject *SWIGUNUSEDPARM(self), Py } } { - arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { arg3 = (svn_revnum_t)SWIG_As_long (obj2); @@ -15234,7 +15308,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs5(PyObject *SWIGUNUSEDPARM(self), Py } } { - arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { arg3 = (svn_revnum_t)SWIG_As_long (obj2); @@ -15381,7 +15463,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs4(PyObject *SWIGUNUSEDPARM(self), Py } } { - arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { arg3 = (svn_revnum_t)SWIG_As_long (obj2); @@ -15518,7 +15608,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs3(PyObject *SWIGUNUSEDPARM(self), Py } } { - arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { arg3 = (enum svn_repos_load_uuid)SWIG_As_long (obj2); @@ -15639,10 +15737,26 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs2(PyObject *SWIGUNUSEDPARM(self), Py } } { - arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { - arg3 = svn_swig_py_make_stream (obj2, _global_pool); + if (obj2 == Py_None) { + arg3 = NULL; + } + else { + arg3 = svn_swig_py_make_stream (obj2, _global_pool); + if (arg3 == NULL) { + SWIG_fail; + } + } } { arg4 = (enum svn_repos_load_uuid)SWIG_As_long (obj3); @@ -15737,10 +15851,26 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs(PyObject *SWIGUNUSEDPARM(self), PyO } } { - arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { - arg3 = svn_swig_py_make_stream (obj2, _global_pool); + if (obj2 == Py_None) { + arg3 = NULL; + } + else { + arg3 = svn_swig_py_make_stream (obj2, _global_pool); + if (arg3 == NULL) { + SWIG_fail; + } + } } { arg4 = (enum svn_repos_load_uuid)SWIG_As_long (obj3); @@ -15832,7 +15962,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs_revprops(PyObject *SWIGUNUSEDPARM(s } } { - arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { arg3 = (svn_revnum_t)SWIG_As_long (obj2); @@ -16543,7 +16681,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_dumpstream3(PyObject *SWIGUNUSEDPARM( arg7 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:svn_repos_parse_dumpstream3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg2 = (svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj1); @@ -18098,7 +18244,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_dumpstream2(PyObject *SWIGUNUSEDPARM( arg6 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_repos_parse_dumpstream2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg2 = (svn_repos_parser_fns2_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj1); @@ -18180,7 +18334,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_dumpstream(PyObject *SWIGUNUSEDPARM(s arg6 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_repos_parse_dumpstream",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; { - arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg1 = NULL; + } + else { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg1 == NULL) { + SWIG_fail; + } + } } { arg2 = (svn_repos_parser_fns_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj1); @@ -18412,7 +18574,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser2(PyObject *SWIGUNUSEDPA } } { - arg6 = svn_swig_py_make_stream (obj3, _global_pool); + if (obj3 == Py_None) { + arg6 = NULL; + } + else { + arg6 = svn_swig_py_make_stream (obj3, _global_pool); + if (arg6 == NULL) { + SWIG_fail; + } + } } if (obj5) { /* Verify that the user supplied a valid pool */ @@ -18515,7 +18685,15 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser(PyObject *SWIGUNUSEDPAR } } { - arg6 = svn_swig_py_make_stream (obj3, _global_pool); + if (obj3 == Py_None) { + arg6 = NULL; + } + else { + arg6 = svn_swig_py_make_stream (obj3, _global_pool); + if (arg6 == NULL) { + SWIG_fail; + } + } } if (obj5) { /* Verify that the user supplied a valid pool */ @@ -18620,6 +18798,125 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_repos_authz_read4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_authz_t **arg1 = (svn_authz_t **) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + svn_boolean_t arg4 ; + svn_repos_t *arg5 = (svn_repos_t *) 0 ; + svn_repos_authz_warning_func_t arg6 = (svn_repos_authz_warning_func_t) 0 ; + void *arg7 = (void *) 0 ; + apr_pool_t *arg8 = (apr_pool_t *) 0 ; + apr_pool_t *arg9 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + svn_authz_t *temp1 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg8 = _global_pool; + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg9 = _global_pool; + arg1 = &temp1; + if (!PyArg_ParseTuple(args,(char *)"ssOOOO|OO:svn_repos_authz_read4",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; + { + arg4 = (svn_boolean_t)SWIG_As_long (obj2); + if (SWIG_arg_fail(svn_argnum_obj2)) { + SWIG_fail; + } + } + { + arg5 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_repos_t, svn_argnum_obj3); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + svn_repos_authz_warning_func_t * tmp = + svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, svn_argnum_obj4); + if (tmp == NULL || PyErr_Occurred()) { + SWIG_fail; + } + arg6 = *tmp; + } + { + if (obj5 == Py_None) { + arg7 = NULL; + } else if (SWIG_ConvertPtr(obj5, (void **) &arg7, 0, 0) == -1) { + arg7 = (void *) obj5; + PyErr_Clear(); + } + } + if (obj6) { + /* Verify that the user supplied a valid pool */ + if (obj6 != Py_None && obj6 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj6); + SWIG_arg_fail(svn_argnum_obj6); + SWIG_fail; + } + } + if (obj7) { + /* Verify that the user supplied a valid pool */ + if (obj7 != Py_None && obj7 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj7); + SWIG_arg_fail(svn_argnum_obj7); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_repos_authz_read4(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_authz_t, + _global_py_pool, args)) + + ; + } + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_repos_authz_read3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_authz_t **arg1 = (svn_authz_t **) 0 ; @@ -18860,6 +19157,133 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_repos_authz_parse2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_authz_t **arg1 = (svn_authz_t **) 0 ; + svn_stream_t *arg2 = (svn_stream_t *) 0 ; + svn_stream_t *arg3 = (svn_stream_t *) 0 ; + svn_repos_authz_warning_func_t arg4 = (svn_repos_authz_warning_func_t) 0 ; + void *arg5 = (void *) 0 ; + apr_pool_t *arg6 = (apr_pool_t *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + svn_authz_t *temp1 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg6 = _global_pool; + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg7 = _global_pool; + arg1 = &temp1; + if (!PyArg_ParseTuple(args,(char *)"OOOO|OO:svn_repos_authz_parse2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; + { + if (obj0 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } + } + { + if (obj1 == Py_None) { + arg3 = NULL; + } + else { + arg3 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg3 == NULL) { + SWIG_fail; + } + } + } + { + svn_repos_authz_warning_func_t * tmp = + svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, svn_argnum_obj2); + if (tmp == NULL || PyErr_Occurred()) { + SWIG_fail; + } + arg4 = *tmp; + } + { + if (obj3 == Py_None) { + arg5 = NULL; + } else if (SWIG_ConvertPtr(obj3, (void **) &arg5, 0, 0) == -1) { + arg5 = (void *) obj3; + PyErr_Clear(); + } + } + if (obj4) { + /* Verify that the user supplied a valid pool */ + if (obj4 != Py_None && obj4 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4); + SWIG_arg_fail(svn_argnum_obj4); + SWIG_fail; + } + } + if (obj5) { + /* Verify that the user supplied a valid pool */ + if (obj5 != Py_None && obj5 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj5); + SWIG_arg_fail(svn_argnum_obj5); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_repos_authz_parse2(arg1,arg2,arg3,arg4,arg5,arg6,arg7); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_authz_t, + _global_py_pool, args)) + + ; + } + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_repos_authz_parse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_authz_t **arg1 = (svn_authz_t **) 0 ; @@ -18881,10 +19305,26 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_parse(PyObject *SWIGUNUSEDPARM(self), arg1 = &temp1; if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_repos_authz_parse",&obj0,&obj1,&obj2)) SWIG_fail; { - arg2 = svn_swig_py_make_stream (obj0, _global_pool); + if (obj0 == Py_None) { + arg2 = NULL; + } + else { + arg2 = svn_swig_py_make_stream (obj0, _global_pool); + if (arg2 == NULL) { + SWIG_fail; + } + } } { - arg3 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg3 = NULL; + } + else { + arg3 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg3 == NULL) { + SWIG_fail; + } + } } if (obj2) { /* Verify that the user supplied a valid pool */ @@ -21464,6 +21904,75 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_repos_invoke_authz_warning_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_repos_authz_warning_func_t arg1 = (svn_repos_authz_warning_func_t) 0 ; + void *arg2 = (void *) 0 ; + svn_error_t *arg3 = (svn_error_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg4 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_invoke_authz_warning_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + { + svn_repos_authz_warning_func_t * tmp = + svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, svn_argnum_obj0); + if (tmp == NULL || PyErr_Occurred()) { + SWIG_fail; + } + arg1 = *tmp; + } + { + if (obj1 == Py_None) { + arg2 = NULL; + } else if (SWIG_ConvertPtr(obj1, (void **) &arg2, 0, 0) == -1) { + arg2 = (void *) obj1; + PyErr_Clear(); + } + } + { + arg3 = (svn_error_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_error_t, svn_argnum_obj2); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (obj3) { + /* Verify that the user supplied a valid pool */ + if (obj3 != Py_None && obj3 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3); + SWIG_arg_fail(svn_argnum_obj3); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + svn_repos_invoke_authz_warning_func(arg1,arg2,(svn_error_t const *)arg3,arg4); + + svn_swig_py_acquire_py_lock(); + + } + resultobj = SWIG_Py_Void(); + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *svn_repos_authz_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; @@ -21534,6 +22043,13 @@ SWIGINTERN PyObject *svn_repos_verify_callback_t_swigregister(PyObject *SWIGUNUS return SWIG_Py_Void(); } +SWIGINTERN PyObject *svn_repos_authz_warning_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + static PyMethodDef SwigMethods[] = { { (char *)"SWIG_PyInstanceMethod_New", (PyCFunction)SWIG_PyInstanceMethod_New, METH_O, NULL}, { (char *)"svn_swig_py_make_parse_fns3", _wrap_svn_swig_py_make_parse_fns3, METH_VARARGS, (char *)"svn_swig_py_make_parse_fns3(PyObject * py_parse_fns3, apr_pool_t pool)"}, @@ -21793,9 +22309,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_repos_get_fs_build_parser2", _wrap_svn_repos_get_fs_build_parser2, METH_VARARGS, (char *)"svn_repos_get_fs_build_parser2(svn_repos_t * repos, svn_boolean_t use_history, enum svn_repos_load_uuid uuid_action, svn_stream_t * outstream, char const * parent_dir, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_repos_get_fs_build_parser", _wrap_svn_repos_get_fs_build_parser, METH_VARARGS, (char *)"svn_repos_get_fs_build_parser(svn_repos_t * repos, svn_boolean_t use_history, enum svn_repos_load_uuid uuid_action, svn_stream_t * outstream, char const * parent_dir, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_repos_authz_initialize", _wrap_svn_repos_authz_initialize, METH_VARARGS, (char *)"svn_repos_authz_initialize(apr_pool_t pool) -> svn_error_t"}, + { (char *)"svn_repos_authz_read4", _wrap_svn_repos_authz_read4, METH_VARARGS, (char *)"svn_repos_authz_read4(char const * path, char const * groups_path, svn_boolean_t must_exist, svn_repos_t * repos_hint, svn_repos_authz_warning_func_t warning_func, void * warning_baton, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_repos_authz_read3", _wrap_svn_repos_authz_read3, METH_VARARGS, (char *)"svn_repos_authz_read3(char const * path, char const * groups_path, svn_boolean_t must_exist, svn_repos_t * repos_hint, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_repos_authz_read2", _wrap_svn_repos_authz_read2, METH_VARARGS, (char *)"svn_repos_authz_read2(char const * path, char const * groups_path, svn_boolean_t must_exist, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_repos_authz_read", _wrap_svn_repos_authz_read, METH_VARARGS, (char *)"svn_repos_authz_read(char const * file, svn_boolean_t must_exist, apr_pool_t pool) -> svn_error_t"}, + { (char *)"svn_repos_authz_parse2", _wrap_svn_repos_authz_parse2, METH_VARARGS, (char *)"svn_repos_authz_parse2(svn_stream_t * stream, svn_stream_t * groups_stream, svn_repos_authz_warning_func_t warning_func, void * warning_baton, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_repos_authz_parse", _wrap_svn_repos_authz_parse, METH_VARARGS, (char *)"svn_repos_authz_parse(svn_stream_t * stream, svn_stream_t * groups_stream, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_repos_authz_check_access", _wrap_svn_repos_authz_check_access, METH_VARARGS, (char *)"svn_repos_authz_check_access(svn_authz_t * authz, char const * repos_name, char const * path, char const * user, svn_repos_authz_access_t required_access, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_repos_check_revision_access", _wrap_svn_repos_check_revision_access, METH_VARARGS, (char *)"svn_repos_check_revision_access(svn_repos_revision_access_level_t * access_level, svn_repos_t * repos, svn_revnum_t revision, svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t"}, @@ -21834,6 +22352,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_repos_invoke_log_entry_receiver", _wrap_svn_repos_invoke_log_entry_receiver, METH_VARARGS, (char *)"svn_repos_invoke_log_entry_receiver(svn_repos_log_entry_receiver_t _obj, void * baton, svn_repos_log_entry_t log_entry, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_repos_invoke_file_rev_handler", _wrap_svn_repos_invoke_file_rev_handler, METH_VARARGS, (char *)"svn_repos_invoke_file_rev_handler(svn_repos_file_rev_handler_t _obj, void * baton, char const * path, svn_revnum_t rev, apr_hash_t rev_props, apr_array_header_t prop_diffs, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_repos_invoke_verify_callback", _wrap_svn_repos_invoke_verify_callback, METH_VARARGS, (char *)"svn_repos_invoke_verify_callback(svn_repos_verify_callback_t _obj, void * baton, svn_revnum_t revision, svn_error_t verify_err, apr_pool_t scratch_pool) -> svn_error_t"}, + { (char *)"svn_repos_invoke_authz_warning_func", _wrap_svn_repos_invoke_authz_warning_func, METH_VARARGS, (char *)"svn_repos_invoke_authz_warning_func(svn_repos_authz_warning_func_t _obj, void * baton, svn_error_t error, apr_pool_t scratch_pool)"}, { (char *)"svn_repos_authz_func_t_swigregister", svn_repos_authz_func_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_repos_authz_callback_t_swigregister", svn_repos_authz_callback_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_repos_notify_func_t_swigregister", svn_repos_notify_func_t_swigregister, METH_VARARGS, NULL}, @@ -21844,6 +22363,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_repos_log_entry_receiver_t_swigregister", svn_repos_log_entry_receiver_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_repos_file_rev_handler_t_swigregister", svn_repos_file_rev_handler_t_swigregister, METH_VARARGS, NULL}, { (char *)"svn_repos_verify_callback_t_swigregister", svn_repos_verify_callback_t_swigregister, METH_VARARGS, NULL}, + { (char *)"svn_repos_authz_warning_func_t_swigregister", svn_repos_authz_warning_func_t_swigregister, METH_VARARGS, NULL}, { NULL, NULL, 0, NULL } }; @@ -21856,53 +22376,55 @@ static swig_type_info _swigt__p_apr_int32_t = {"_p_apr_int32_t", "apr_int32_t *| static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *|svn_filesize_t *|apr_time_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_int_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_int_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(int,void *,apr_pool_t *)|svn_error_t *(*)(int,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_void__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_stream_t **,void *)|svn_error_t *(*)(svn_stream_t **,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_void_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void **,apr_hash_t *,void *,apr_pool_t *)|svn_error_t *(*)(void **,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_dirent_t *,void *,apr_pool_t *)|svn_repos_dirent_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,void *,apr_pool_t *)|struct svn_error_t *(*)(char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)|svn_repos_mergeinfo_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_repos_authz_func_t|svn_repos_dump_filter_func_t|struct svn_error_t *(*)(svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_txdelta_window_handler_t_p_p_void_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_handler_t_p_p_void_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_handler_t *,void **,void *)|svn_error_t *(*)(svn_txdelta_window_handler_t *,void **,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_repos_freeze_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char__p_svn_error_t = {"_p_f_p_void_p_q_const__char__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *)|svn_error_t *(*)(void *,char const *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_string_t const *)|svn_error_t *(*)(void *,char const *,svn_string_t const *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_repos_file_rev_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_pool_t *)|svn_repos_history_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_int_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_int_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(int,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_void__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_stream_t **,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void **,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_dirent_t *,void *,apr_pool_t *)|svn_repos_dirent_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)|svn_repos_mergeinfo_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)|svn_commit_callback2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)|svn_repos_authz_func_t|svn_repos_dump_filter_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_txdelta_window_handler_t_p_p_void_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_handler_t_p_p_void_p_void__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_window_handler_t *,void **,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_pool_t *)|svn_repos_freeze_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char__p_svn_error_t = {"_p_f_p_void_p_q_const__char__p_svn_error_t", "svn_error_t *(*)(void *,char const *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_string_t const *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_repos_file_rev_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_pool_t *)|svn_repos_history_func_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void = {"_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void", "svn_repos_notify_func_t|void (*)(void *,struct svn_repos_notify_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_repos_log_entry_t *,apr_pool_t *)|svn_repos_log_entry_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_repos_path_change_t *,apr_pool_t *)|svn_repos_path_change_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_repos_verify_callback_t|struct svn_error_t *(*)(void *,svn_revnum_t,svn_error_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_repos_authz_access_t,svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)|svn_repos_authz_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void = {"_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void", "void (*)(void *,svn_error_t const *,apr_pool_t *)|svn_repos_authz_warning_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_repos_log_entry_t *,apr_pool_t *)|svn_repos_log_entry_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_repos_path_change_t *,apr_pool_t *)|svn_repos_path_change_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,svn_error_t *,apr_pool_t *)|svn_repos_verify_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_repos_authz_access_t,svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)|svn_repos_authz_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_array_header_t = {"_p_p_apr_array_header_t", "apr_array_header_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **|svn_mergeinfo_catalog_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_repos_mergeinfo_receiver_t *|struct svn_error_t *(**)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_repos_dump_filter_func_t *|svn_repos_authz_func_t *|struct svn_error_t *(**)(svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_txdelta_window_handler_t *|struct svn_error_t *(**)(svn_txdelta_window_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void__p_svn_error_t = {"_p_p_f_p_void__p_svn_error_t", "svn_cancel_func_t *|struct svn_error_t *(**)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,apr_pool_t *)|svn_repos_freeze_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_repos_file_rev_handler_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_pool_t *)|svn_repos_history_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)|svn_repos_mergeinfo_receiver_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)|svn_repos_dump_filter_func_t *|svn_repos_authz_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(**)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void__p_svn_error_t = {"_p_p_f_p_void__p_svn_error_t", "svn_cancel_func_t *|svn_error_t *(**)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,apr_pool_t *)|svn_repos_freeze_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_repos_file_rev_handler_t *|svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_file_rev_handler_t *|svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_repos_history_func_t *|svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void = {"_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void", "void (**)(void *,struct svn_repos_notify_t const *,apr_pool_t *)|svn_repos_notify_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,svn_repos_log_entry_t *,apr_pool_t *)|svn_repos_log_entry_receiver_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,svn_repos_path_change_t *,apr_pool_t *)|svn_repos_path_change_receiver_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_repos_verify_callback_t *|struct svn_error_t *(**)(void *,svn_revnum_t,svn_error_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_repos_authz_callback_t *|struct svn_error_t *(**)(svn_repos_authz_access_t,svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void = {"_p_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void", "void (**)(void *,svn_error_t const *,apr_pool_t *)|svn_repos_authz_warning_func_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,svn_repos_log_entry_t *,apr_pool_t *)|svn_repos_log_entry_receiver_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t", "svn_repos_path_change_receiver_t *|svn_error_t *(**)(void *,svn_repos_path_change_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,svn_revnum_t,svn_error_t *,apr_pool_t *)|svn_repos_verify_callback_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(svn_repos_authz_access_t,svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)|svn_repos_authz_callback_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_authz_t = {"_p_p_svn_authz_t", "struct svn_authz_t **|svn_authz_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_dirent_t = {"_p_p_svn_dirent_t", "struct svn_dirent_t **|svn_dirent_t **", 0, 0, (void*)0, 0}; @@ -21934,11 +22456,12 @@ static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct s static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_hunk_t = {"_p_svn_diff_hunk_t", "svn_diff_hunk_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_access_t = {"_p_svn_fs_access_t", "struct svn_fs_access_t *|svn_fs_access_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_dirent_t = {"_p_svn_fs_dirent_t", "struct svn_fs_dirent_t *|svn_fs_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_fsfs_info_t = {"_p_svn_fs_fsfs_info_t", "struct svn_fs_fsfs_info_t *|svn_fs_fsfs_info_t *", 0, 0, (void*)0, 0}; @@ -21946,6 +22469,7 @@ static swig_type_info _swigt__p_svn_fs_fsx_info_t = {"_p_svn_fs_fsx_info_t", "st static swig_type_info _swigt__p_svn_fs_history_t = {"_p_svn_fs_history_t", "struct svn_fs_history_t *|svn_fs_history_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_id_t = {"_p_svn_fs_id_t", "struct svn_fs_id_t *|svn_fs_id_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_info_placeholder_t = {"_p_svn_fs_info_placeholder_t", "struct svn_fs_info_placeholder_t *|svn_fs_info_placeholder_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_fs_ioctl_code_t = {"_p_svn_fs_ioctl_code_t", "struct svn_fs_ioctl_code_t *|svn_fs_ioctl_code_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "struct svn_fs_lock_target_t *|svn_fs_lock_target_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_node_relation_t = {"_p_svn_fs_node_relation_t", "enum svn_fs_node_relation_t *|svn_fs_node_relation_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_pack_notify_action_t = {"_p_svn_fs_pack_notify_action_t", "enum svn_fs_pack_notify_action_t *|svn_fs_pack_notify_action_t *", 0, 0, (void*)0, 0}; @@ -21973,6 +22497,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_prop_inherited_item_t = {"_p_svn_prop_inherited_item_t", "struct svn_prop_inherited_item_t *|svn_prop_inherited_item_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_prop_kind = {"_p_svn_prop_kind", "svn_prop_kind_t *|enum svn_prop_kind *", 0, 0, (void*)0, 0}; @@ -22033,6 +22558,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, + &_swigt__p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, &_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t, @@ -22054,6 +22580,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, + &_swigt__p_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, &_swigt__p_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, @@ -22089,6 +22616,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_hunk_t, &_swigt__p_svn_dirent_t, @@ -22101,6 +22629,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_fs_history_t, &_swigt__p_svn_fs_id_t, &_swigt__p_svn_fs_info_placeholder_t, + &_swigt__p_svn_fs_ioctl_code_t, &_swigt__p_svn_fs_lock_target_t, &_swigt__p_svn_fs_node_relation_t, &_swigt__p_svn_fs_pack_notify_action_t, @@ -22128,6 +22657,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_prop_inherited_item_t, &_swigt__p_svn_prop_kind, @@ -22188,6 +22718,7 @@ static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void[] = { {&_swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void[] = { {&_swigt__p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -22209,6 +22740,7 @@ static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_ha static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void[] = { {&_swigt__p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void[] = { {&_swigt__p_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -22244,6 +22776,7 @@ static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_hunk_t[] = { {&_swigt__p_svn_diff_hunk_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_dirent_t[] = { {&_swigt__p_svn_dirent_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -22256,6 +22789,7 @@ static swig_cast_info _swigc__p_svn_fs_fsx_info_t[] = { {&_swigt__p_svn_fs_fsx_ static swig_cast_info _swigc__p_svn_fs_history_t[] = { {&_swigt__p_svn_fs_history_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_id_t[] = { {&_swigt__p_svn_fs_id_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_info_placeholder_t[] = { {&_swigt__p_svn_fs_info_placeholder_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_fs_ioctl_code_t[] = { {&_swigt__p_svn_fs_ioctl_code_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = { {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_node_relation_t[] = { {&_swigt__p_svn_fs_node_relation_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_pack_notify_action_t[] = { {&_swigt__p_svn_fs_pack_notify_action_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -22283,6 +22817,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_prop_inherited_item_t[] = { {&_swigt__p_svn_prop_inherited_item_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_prop_kind[] = { {&_swigt__p_svn_prop_kind, 0, 0, 0},{0, 0, 0, 0}}; @@ -22343,6 +22878,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, + _swigc__p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t, @@ -22364,6 +22900,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, + _swigc__p_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, _swigc__p_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t, _swigc__p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, @@ -22399,6 +22936,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_hunk_t, _swigc__p_svn_dirent_t, @@ -22411,6 +22949,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_fs_history_t, _swigc__p_svn_fs_id_t, _swigc__p_svn_fs_info_placeholder_t, + _swigc__p_svn_fs_ioctl_code_t, _swigc__p_svn_fs_lock_target_t, _swigc__p_svn_fs_node_relation_t, _swigc__p_svn_fs_pack_notify_action_t, @@ -22438,6 +22977,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_prop_inherited_item_t, _swigc__p_svn_prop_kind, diff --git a/subversion/bindings/swig/python/svn_wc.c b/subversion/bindings/swig/python/svn_wc.c index 3eadf73..dc89b6b 100644 --- a/subversion/bindings/swig/python/svn_wc.c +++ b/subversion/bindings/swig/python/svn_wc.c @@ -3090,88 +3090,90 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { #define SWIGTYPE_p_svn_commit_info_t swig_types[104] #define SWIGTYPE_p_svn_config_t swig_types[105] #define SWIGTYPE_p_svn_delta_editor_t swig_types[106] -#define SWIGTYPE_p_svn_depth_t swig_types[107] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[108] -#define SWIGTYPE_p_svn_dirent_t swig_types[109] -#define SWIGTYPE_p_svn_errno_t swig_types[110] -#define SWIGTYPE_p_svn_error_t swig_types[111] -#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[112] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[113] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[114] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[115] -#define SWIGTYPE_p_svn_location_segment_t swig_types[116] -#define SWIGTYPE_p_svn_lock_t swig_types[117] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[118] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[119] -#define SWIGTYPE_p_svn_log_entry_t swig_types[120] -#define SWIGTYPE_p_svn_merge_range_t swig_types[121] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[122] -#define SWIGTYPE_p_svn_node_kind_t swig_types[123] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[124] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[125] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[126] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[127] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[128] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[129] -#define SWIGTYPE_p_svn_prop_kind swig_types[130] -#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[131] -#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[132] -#define SWIGTYPE_p_svn_ra_plugin_t swig_types[133] -#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[134] -#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[135] -#define SWIGTYPE_p_svn_ra_reporter_t swig_types[136] -#define SWIGTYPE_p_svn_ra_session_t swig_types[137] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[138] -#define SWIGTYPE_p_svn_stream_t swig_types[139] -#define SWIGTYPE_p_svn_string_t swig_types[140] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[141] -#define SWIGTYPE_p_svn_tristate_t swig_types[142] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[143] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[144] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[145] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[146] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[147] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[148] -#define SWIGTYPE_p_svn_version_extended_t swig_types[149] -#define SWIGTYPE_p_svn_version_t swig_types[150] -#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[151] -#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[152] -#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[153] -#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[154] -#define SWIGTYPE_p_svn_wc_conflict_description2_t swig_types[155] -#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[156] -#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[157] -#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[158] -#define SWIGTYPE_p_svn_wc_conflict_result_t swig_types[159] -#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[160] -#define SWIGTYPE_p_svn_wc_context_t swig_types[161] -#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[162] -#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[163] -#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[164] -#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[165] -#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[166] -#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[167] -#define SWIGTYPE_p_svn_wc_entry_t swig_types[168] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[169] -#define SWIGTYPE_p_svn_wc_external_item_t swig_types[170] -#define SWIGTYPE_p_svn_wc_info_t swig_types[171] -#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[172] -#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[173] -#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[174] -#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[175] -#define SWIGTYPE_p_svn_wc_notify_t swig_types[176] -#define SWIGTYPE_p_svn_wc_operation_t swig_types[177] -#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[178] -#define SWIGTYPE_p_svn_wc_schedule_t swig_types[179] -#define SWIGTYPE_p_svn_wc_status2_t swig_types[180] -#define SWIGTYPE_p_svn_wc_status3_t swig_types[181] -#define SWIGTYPE_p_svn_wc_status_t swig_types[182] -#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[183] -#define SWIGTYPE_p_unsigned_char swig_types[184] -#define SWIGTYPE_p_unsigned_long swig_types[185] -#define SWIGTYPE_p_void swig_types[186] -static swig_type_info *swig_types[188]; -static swig_module_info swig_module = {swig_types, 187, 0, 0, 0, 0}; +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[107] +#define SWIGTYPE_p_svn_depth_t swig_types[108] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[109] +#define SWIGTYPE_p_svn_dirent_t swig_types[110] +#define SWIGTYPE_p_svn_errno_t swig_types[111] +#define SWIGTYPE_p_svn_error_t swig_types[112] +#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[113] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[114] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[115] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[116] +#define SWIGTYPE_p_svn_location_segment_t swig_types[117] +#define SWIGTYPE_p_svn_lock_t swig_types[118] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[119] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[120] +#define SWIGTYPE_p_svn_log_entry_t swig_types[121] +#define SWIGTYPE_p_svn_merge_range_t swig_types[122] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[123] +#define SWIGTYPE_p_svn_node_kind_t swig_types[124] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[125] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[126] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[127] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[128] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[129] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[130] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[131] +#define SWIGTYPE_p_svn_prop_kind swig_types[132] +#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[133] +#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[134] +#define SWIGTYPE_p_svn_ra_plugin_t swig_types[135] +#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[136] +#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[137] +#define SWIGTYPE_p_svn_ra_reporter_t swig_types[138] +#define SWIGTYPE_p_svn_ra_session_t swig_types[139] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[140] +#define SWIGTYPE_p_svn_stream_t swig_types[141] +#define SWIGTYPE_p_svn_string_t swig_types[142] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[143] +#define SWIGTYPE_p_svn_tristate_t swig_types[144] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[145] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[146] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[147] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[148] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[149] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[150] +#define SWIGTYPE_p_svn_version_extended_t swig_types[151] +#define SWIGTYPE_p_svn_version_t swig_types[152] +#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[153] +#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[154] +#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[155] +#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[156] +#define SWIGTYPE_p_svn_wc_conflict_description2_t swig_types[157] +#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[158] +#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[159] +#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[160] +#define SWIGTYPE_p_svn_wc_conflict_result_t swig_types[161] +#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[162] +#define SWIGTYPE_p_svn_wc_context_t swig_types[163] +#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[164] +#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[165] +#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[166] +#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[167] +#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[168] +#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[169] +#define SWIGTYPE_p_svn_wc_entry_t swig_types[170] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[171] +#define SWIGTYPE_p_svn_wc_external_item_t swig_types[172] +#define SWIGTYPE_p_svn_wc_info_t swig_types[173] +#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[174] +#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[175] +#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[176] +#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[177] +#define SWIGTYPE_p_svn_wc_notify_t swig_types[178] +#define SWIGTYPE_p_svn_wc_operation_t swig_types[179] +#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[180] +#define SWIGTYPE_p_svn_wc_schedule_t swig_types[181] +#define SWIGTYPE_p_svn_wc_status2_t swig_types[182] +#define SWIGTYPE_p_svn_wc_status3_t swig_types[183] +#define SWIGTYPE_p_svn_wc_status_t swig_types[184] +#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[185] +#define SWIGTYPE_p_unsigned_char swig_types[186] +#define SWIGTYPE_p_unsigned_long swig_types[187] +#define SWIGTYPE_p_void swig_types[188] +static swig_type_info *swig_types[190]; +static swig_module_info swig_module = {swig_types, 189, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -21713,10 +21715,26 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file4(PyObject *SWIGUNUSEDPARM(self) } } { - arg3 = svn_swig_py_make_stream (obj2, _global_pool); + if (obj2 == Py_None) { + arg3 = NULL; + } + else { + arg3 = svn_swig_py_make_stream (obj2, _global_pool); + if (arg3 == NULL) { + SWIG_fail; + } + } } { - arg4 = svn_swig_py_make_stream (obj3, _global_pool); + if (obj3 == Py_None) { + arg4 = NULL; + } + else { + arg4 = svn_swig_py_make_stream (obj3, _global_pool); + if (arg4 == NULL) { + SWIG_fail; + } + } } { if (_global_pool == NULL) @@ -21833,10 +21851,26 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file3(PyObject *SWIGUNUSEDPARM(self) } } { - arg3 = svn_swig_py_make_stream (obj2, _global_pool); + if (obj2 == Py_None) { + arg3 = NULL; + } + else { + arg3 = svn_swig_py_make_stream (obj2, _global_pool); + if (arg3 == NULL) { + SWIG_fail; + } + } } { - arg4 = svn_swig_py_make_stream (obj3, _global_pool); + if (obj3 == Py_None) { + arg4 = NULL; + } + else { + arg4 = svn_swig_py_make_stream (obj3, _global_pool); + if (arg4 == NULL) { + SWIG_fail; + } + } } { if (_global_pool == NULL) @@ -30988,6 +31022,129 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_wc_revert6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_depth_t arg3 ; + svn_boolean_t arg4 ; + apr_array_header_t *arg5 = (apr_array_header_t *) 0 ; + svn_boolean_t arg6 ; + svn_boolean_t arg7 ; + svn_boolean_t arg8 ; + svn_cancel_func_t arg9 = (svn_cancel_func_t) 0 ; + void *arg10 = (void *) 0 ; + svn_wc_notify_func2_t arg11 = (svn_wc_notify_func2_t) 0 ; + void *arg12 = (void *) 0 ; + apr_pool_t *arg13 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; + PyObject * obj9 = 0 ; + PyObject * obj10 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg13 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOOO|O:svn_wc_revert6",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail; + { + arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg3 = (svn_depth_t)SWIG_As_long (obj2); + if (SWIG_arg_fail(svn_argnum_obj2)) { + SWIG_fail; + } + } + { + arg4 = (svn_boolean_t)SWIG_As_long (obj3); + if (SWIG_arg_fail(svn_argnum_obj3)) { + SWIG_fail; + } + } + { + arg5 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg6 = (svn_boolean_t)SWIG_As_long (obj5); + if (SWIG_arg_fail(svn_argnum_obj5)) { + SWIG_fail; + } + } + { + arg7 = (svn_boolean_t)SWIG_As_long (obj6); + if (SWIG_arg_fail(svn_argnum_obj6)) { + SWIG_fail; + } + } + { + arg8 = (svn_boolean_t)SWIG_As_long (obj7); + if (SWIG_arg_fail(svn_argnum_obj7)) { + SWIG_fail; + } + } + { + arg9 = (svn_cancel_func_t) svn_swig_py_cancel_func; + arg10 = obj8; + } + { + arg11 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2; + arg12 = obj9; + } + if (obj10) { + /* Verify that the user supplied a valid pool */ + if (obj10 != Py_None && obj10 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj10); + SWIG_arg_fail(svn_argnum_obj10); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_wc_revert6(arg1,(char const *)arg2,arg3,arg4,(apr_array_header_t const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_wc_revert5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ; @@ -37979,7 +38136,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_get_file(PyObject *SWIGUNUSEDPARM(self) } } { - arg5 = svn_swig_py_make_stream (obj4, _global_pool); + if (obj4 == Py_None) { + arg5 = NULL; + } + else { + arg5 = svn_swig_py_make_stream (obj4, _global_pool); + if (arg5 == NULL) { + SWIG_fail; + } + } } if (obj5) { /* Verify that the user supplied a valid pool */ @@ -38166,7 +38331,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_canonicalize_svn_prop_get_file(PyObject arg1 = *tmp; } { - arg3 = svn_swig_py_make_stream (obj1, _global_pool); + if (obj1 == Py_None) { + arg3 = NULL; + } + else { + arg3 = svn_swig_py_make_stream (obj1, _global_pool); + if (arg3 == NULL) { + SWIG_fail; + } + } } { if (obj2 == Py_None) { @@ -39431,6 +39604,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_wc_relocate3", _wrap_svn_wc_relocate3, METH_VARARGS, (char *)"svn_wc_relocate3(char const * path, svn_wc_adm_access_t * adm_access, char const * arg3, char const * to, svn_boolean_t recurse, svn_wc_relocation_validator3_t validator, void * validator_baton, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_wc_relocate2", _wrap_svn_wc_relocate2, METH_VARARGS, (char *)"svn_wc_relocate2(char const * path, svn_wc_adm_access_t * adm_access, char const * arg3, char const * to, svn_boolean_t recurse, svn_wc_relocation_validator2_t validator, void * validator_baton, apr_pool_t pool) -> svn_error_t"}, { (char *)"svn_wc_relocate", _wrap_svn_wc_relocate, METH_VARARGS, (char *)"svn_wc_relocate(char const * path, svn_wc_adm_access_t * adm_access, char const * arg3, char const * to, svn_boolean_t recurse, svn_wc_relocation_validator_t validator, void * validator_baton, apr_pool_t pool) -> svn_error_t"}, + { (char *)"svn_wc_revert6", _wrap_svn_wc_revert6, METH_VARARGS, (char *)"svn_wc_revert6(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_depth_t depth, svn_boolean_t use_commit_times, apr_array_header_t changelist_filter, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, svn_boolean_t added_keep_local, svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_wc_revert5", _wrap_svn_wc_revert5, METH_VARARGS, (char *)"svn_wc_revert5(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_depth_t depth, svn_boolean_t use_commit_times, apr_array_header_t changelist_filter, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_wc_revert4", _wrap_svn_wc_revert4, METH_VARARGS, (char *)"svn_wc_revert4(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_depth_t depth, svn_boolean_t use_commit_times, apr_array_header_t changelist_filter, svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, apr_pool_t scratch_pool) -> svn_error_t"}, { (char *)"svn_wc_revert3", _wrap_svn_wc_revert3, METH_VARARGS, (char *)"svn_wc_revert3(char const * path, svn_wc_adm_access_t * parent_access, svn_depth_t depth, svn_boolean_t use_commit_times, apr_array_header_t changelist_filter, svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, apr_pool_t pool) -> svn_error_t"}, @@ -39563,49 +39737,49 @@ static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *| static swig_type_info _swigt__p_apr_off_t = {"_p_apr_off_t", "apr_off_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const **,char const **,void *,char const *,apr_pool_t *,apr_pool_t *)|svn_wc_upgrade_get_repos_info_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_string_t const **,svn_stream_t *,void *,apr_pool_t *)|svn_wc_canonicalize_svn_prop_get_file_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__svn_wc_entry_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_q_const__svn_wc_entry_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_wc_entry_t const *,void *,apr_pool_t *)|svn_error_t *(*)(char const *,svn_wc_entry_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_svn_error_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_error_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_error_t *,void *,apr_pool_t *)|svn_error_t *(*)(char const *,svn_error_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)|struct svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)|svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)|struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,svn_revnum_t,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,char const *,svn_revnum_t,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,char const *,svn_revnum_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,char const *,svn_revnum_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t **,char const *,char const *,apr_pool_t *,apr_pool_t *)|svn_wc_dirents_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const **,char const **,void *,char const *,apr_pool_t *,apr_pool_t *)|svn_wc_upgrade_get_repos_info_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_string_t const **,svn_stream_t *,void *,apr_pool_t *)|svn_wc_canonicalize_svn_prop_get_file_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t|svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t|svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__svn_wc_entry_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_q_const__svn_wc_entry_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_wc_entry_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_svn_error_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_error_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_error_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,char const *,svn_revnum_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t **,char const *,char const *,apr_pool_t *,apr_pool_t *)|svn_wc_dirents_func_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void = {"_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void", "void (*)(void *,char const *,enum svn_wc_notify_action_t,enum svn_node_kind_t,char const *,enum svn_wc_notify_state_t,enum svn_wc_notify_state_t,long)|svn_wc_notify_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t", "svn_wc_relocation_validator_t|struct svn_error_t *(*)(void *,char const *,char const *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_changelist_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,char const *,apr_pool_t *)|svn_wc_relocation_validator3_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_wc_relocation_validator2_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t", "svn_wc_external_update_t|struct svn_error_t *(*)(void *,char const *,svn_string_t const *,svn_string_t const *,svn_depth_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_wc_status3_t const *,apr_pool_t *)|svn_wc_status_func4_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t", "svn_wc_relocation_validator_t|svn_error_t *(*)(void *,char const *,char const *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_changelist_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,char const *,apr_pool_t *)|svn_wc_relocation_validator3_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_wc_relocation_validator2_t|svn_error_t *(*)(void *,char const *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t", "svn_wc_external_update_t|svn_error_t *(*)(void *,char const *,svn_string_t const *,svn_string_t const *,svn_depth_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status3_t const *,apr_pool_t *)|svn_wc_status_func4_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void", "void (*)(void *,char const *,struct svn_wc_status2_t *)|svn_wc_status_func2_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void", "void (*)(void *,char const *,struct svn_wc_status_t *)|svn_wc_status_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)|svn_wc_status_func3_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)|svn_wc_get_file_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)|svn_wc_status_func3_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)|svn_wc_get_file_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void = {"_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void", "svn_wc_notify_func2_t|void (*)(void *,struct svn_wc_notify_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; @@ -39613,22 +39787,22 @@ static swig_type_info _swigt__p_p_apr_array_header_t = {"_p_p_apr_array_header_t static swig_type_info _swigt__p_p_apr_file_t = {"_p_p_apr_file_t", "apr_file_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_upgrade_get_repos_info_t *|struct svn_error_t *(**)(char const **,char const **,void *,char const *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_canonicalize_svn_prop_get_file_t *|struct svn_error_t *(**)(svn_string_t const **,svn_stream_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)|svn_wc_conflict_resolver_func2_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)|svn_wc_conflict_resolver_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_dirents_func_t *|struct svn_error_t *(**)(void *,apr_hash_t **,char const *,char const *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(char const **,char const **,void *,char const *,apr_pool_t *,apr_pool_t *)|svn_wc_upgrade_get_repos_info_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_canonicalize_svn_prop_get_file_t *|svn_error_t *(**)(svn_string_t const **,svn_stream_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t *|svn_error_t *(**)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t *|svn_error_t *(**)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_dirents_func_t *|svn_error_t *(**)(void *,apr_hash_t **,char const *,char const *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void = {"_p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void", "void (**)(void *,char const *,enum svn_wc_notify_action_t,enum svn_node_kind_t,char const *,enum svn_wc_notify_state_t,enum svn_wc_notify_state_t,long)|svn_wc_notify_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,char const *)|svn_wc_relocation_validator_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,char const *,apr_pool_t *)|svn_changelist_receiver_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_wc_relocation_validator3_t *|struct svn_error_t *(**)(void *,char const *,char const *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_wc_relocation_validator2_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_string_t const *,svn_string_t const *,svn_depth_t,apr_pool_t *)|svn_wc_external_update_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t", "svn_wc_status_func4_t *|struct svn_error_t *(**)(void *,char const *,svn_wc_status3_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t", "svn_error_t *(**)(void *,char const *,char const *)|svn_wc_relocation_validator_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,char const *,apr_pool_t *)|svn_changelist_receiver_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,char const *,char const *,apr_pool_t *)|svn_wc_relocation_validator3_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_wc_relocation_validator2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,svn_string_t const *,svn_string_t const *,svn_depth_t,apr_pool_t *)|svn_wc_external_update_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(void *,char const *,svn_wc_status3_t const *,apr_pool_t *)|svn_wc_status_func4_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void = {"_p_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void", "void (**)(void *,char const *,struct svn_wc_status2_t *)|svn_wc_status_func2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void = {"_p_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void", "void (**)(void *,char const *,struct svn_wc_status_t *)|svn_wc_status_func_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "svn_wc_status_func3_t *|struct svn_error_t *(**)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)|svn_wc_get_file_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "svn_wc_status_func3_t *|svn_error_t *(**)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_wc_get_file_t *|svn_error_t *(**)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void = {"_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void", "void (**)(void *,struct svn_wc_notify_t const *,apr_pool_t *)|svn_wc_notify_func2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_checksum_t = {"_p_p_svn_checksum_t", "struct svn_checksum_t **|svn_checksum_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0}; @@ -39662,11 +39836,12 @@ static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct s static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_hunk_t = {"_p_svn_diff_hunk_t", "svn_diff_hunk_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "svn_fs_lock_target_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; @@ -39683,6 +39858,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_prop_inherited_item_t = {"_p_svn_prop_inherited_item_t", "struct svn_prop_inherited_item_t *|svn_prop_inherited_item_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_prop_kind = {"_p_svn_prop_kind", "svn_prop_kind_t *|enum svn_prop_kind *", 0, 0, (void*)0, 0}; @@ -39851,6 +40027,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_hunk_t, &_swigt__p_svn_dirent_t, @@ -39872,6 +40049,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_prop_inherited_item_t, &_swigt__p_svn_prop_kind, @@ -40040,6 +40218,7 @@ static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_hunk_t[] = { {&_swigt__p_svn_diff_hunk_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_dirent_t[] = { {&_swigt__p_svn_dirent_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -40061,6 +40240,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_prop_inherited_item_t[] = { {&_swigt__p_svn_prop_inherited_item_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_prop_kind[] = { {&_swigt__p_svn_prop_kind, 0, 0, 0},{0, 0, 0, 0}}; @@ -40229,6 +40409,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_hunk_t, _swigc__p_svn_dirent_t, @@ -40250,6 +40431,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_prop_inherited_item_t, _swigc__p_svn_prop_kind, diff --git a/subversion/bindings/swig/python/tests/delta.py b/subversion/bindings/swig/python/tests/delta.py index 162cf32..7f6ba67 100644 --- a/subversion/bindings/swig/python/tests/delta.py +++ b/subversion/bindings/swig/python/tests/delta.py @@ -19,6 +19,8 @@ # # import unittest, setup_path +import os +import tempfile import svn.delta import svn.core from sys import version_info # For Python version check @@ -47,6 +49,59 @@ class DeltaTestCase(unittest.TestCase): svn.delta.tx_apply(src_stream, target_stream, None) window_handler(None, baton) + def testTxWindowHandler_stream_IF(self): + """Test tx_invoke_window_handler, with svn.core.svn_stream_t object""" + pool = svn.core.Pool() + in_str = "hello world" + src_stream = svn.core.svn_stream_from_stringbuf(in_str) + content_str = "bye world" + content_stream = svn.core.svn_stream_from_stringbuf(content_str) + fd, fname = tempfile.mkstemp() + os.close(fd) + try: + target_stream = svn.core.svn_stream_from_aprfile2(fname, False) + window_handler, baton = \ + svn.delta.tx_apply(src_stream, target_stream, None) + svn.delta.tx_send_stream(content_stream, window_handler, baton, pool) + fp = open(fname, 'rb') + out_str = fp.read() + fp.close() + self.assertEqual(content_str, out_str) + finally: + del pool + try: + os.remove(fname) + except OSError: + pass + + def testTxWindowHandler_Stream_IF(self): + """Test tx_invoke_window_handler, with svn.core.Stream object""" + pool = svn.core.Pool() + in_str = "hello world" + src_stream = svn.core.Stream( + svn.core.svn_stream_from_stringbuf(in_str)) + content_str = "bye world" + content_stream = svn.core.Stream( + svn.core.svn_stream_from_stringbuf(content_str)) + fd, fname = tempfile.mkstemp() + os.close(fd) + try: + target_stream = svn.core.Stream( + svn.core.svn_stream_from_aprfile2(fname, False)) + window_handler, baton = \ + svn.delta.tx_apply(src_stream, target_stream, None) + svn.delta.tx_send_stream(content_stream, window_handler, baton, None) + fp = open(fname, 'rb') + out_str = fp.read() + fp.close() + self.assertEqual(content_str, out_str) + finally: + del pool + try: + os.remove(fname) + except OSError: + pass + def testTxdeltaWindowT(self): """Test the svn_txdelta_window_t wrapper.""" a = StringIO("abc\ndef\n") diff --git a/subversion/bindings/swig/python/tests/fs.py b/subversion/bindings/swig/python/tests/fs.py new file mode 100644 index 0000000..b1e2538 --- /dev/null +++ b/subversion/bindings/swig/python/tests/fs.py @@ -0,0 +1,124 @@ +# +# -*- coding: utf-8 -*- +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +import os, unittest, sys, errno +from tempfile import mkstemp +from subprocess import Popen, PIPE +try: + # Python >=3.0 + from urllib.parse import urljoin +except ImportError: + # Python <3.0 + from urlparse import urljoin + +from svn import core, repos, fs, client +import utils + +class SubversionFSTestCase(unittest.TestCase): + """Test cases for the Subversion FS layer""" + + def log_message_func(self, items, pool): + """ Simple log message provider for unit tests. """ + return "Test unicode log message" + + def setUp(self): + """Load a Subversion repository""" + self.temper = utils.Temper() + (self.repos, self.repos_path, self.repos_uri) = self.temper.alloc_known_repo( + 'trac/versioncontrol/tests/svnrepos.dump', suffix='-repository') + self.fs = repos.fs(self.repos) + self.rev = fs.youngest_rev(self.fs) + self.tmpfile = None + self.unistr = u'⊙_ʘ' + tmpfd, self.tmpfile = mkstemp() + + tmpfp = os.fdopen(tmpfd, "wb") + + # Use a unicode file to ensure proper non-ascii handling. + tmpfp.write(self.unistr.encode('utf8')) + + tmpfp.close() + + clientctx = client.svn_client_create_context() + clientctx.log_msg_func3 = client.svn_swig_py_get_commit_log_func + clientctx.log_msg_baton3 = self.log_message_func + + providers = [ + client.svn_client_get_simple_provider(), + client.svn_client_get_username_provider(), + ] + + clientctx.auth_baton = core.svn_auth_open(providers) + + commitinfo = client.import2(self.tmpfile, + urljoin(self.repos_uri +"/", "trunk/UniTest.txt"), + True, True, + clientctx) + + self.commitedrev = commitinfo.revision + + def tearDown(self): + self.fs = None + self.repos = None + self.temper.cleanup() + + if self.tmpfile is not None: + os.remove(self.tmpfile) + + def test_diff_repos_paths_internal(self): + """Test diffing of a repository path using the internal diff.""" + + # Test standard internal diff + fdiff = fs.FileDiff(fs.revision_root(self.fs, self.commitedrev), "/trunk/UniTest.txt", + None, None, diffoptions=None) + + diffp = fdiff.get_pipe() + diffoutput = diffp.read().decode('utf8') + + self.assertTrue(diffoutput.find(u'-' + self.unistr) > 0) + + def test_diff_repos_paths_external(self): + """Test diffing of a repository path using an external diff (if available).""" + + # Test if this environment has the diff command, if not then skip the test + try: + diffout, differr = Popen(["diff"], stdin=PIPE, stderr=PIPE).communicate() + + except OSError as err: + if err.errno == errno.ENOENT: + self.skipTest("'diff' command not present") + else: + raise err + + fdiff = fs.FileDiff(fs.revision_root(self.fs, self.commitedrev), "/trunk/UniTest.txt", + None, None, diffoptions=[]) + diffp = fdiff.get_pipe() + diffoutput = diffp.read().decode('utf8') + + self.assertTrue(diffoutput.find(u'< ' + self.unistr) > 0) + +def suite(): + return unittest.defaultTestLoader.loadTestsFromTestCase( + SubversionFSTestCase) + +if __name__ == '__main__': + runner = unittest.TextTestRunner() + runner.run(suite()) diff --git a/subversion/bindings/swig/python/tests/repository.py b/subversion/bindings/swig/python/tests/repository.py index 46580b7..6d78986 100644 --- a/subversion/bindings/swig/python/tests/repository.py +++ b/subversion/bindings/swig/python/tests/repository.py @@ -231,6 +231,21 @@ class SubversionRepositoryTestCase(unittest.TestCase): # the comparison list gets too long. self.assertEqual(dsp.ops[:len(expected_list)], expected_list) + def test_parse_fns3_invalid_set_fulltext(self): + class DumpStreamParserSubclass(DumpStreamParser): + def set_fulltext(self, node_baton): + DumpStreamParser.set_fulltext(self, node_baton) + return 42 + stream = open(os.path.join(os.path.dirname(sys.argv[0]), + "trac/versioncontrol/tests/svnrepos.dump")) + try: + dsp = DumpStreamParserSubclass() + ptr, baton = repos.make_parse_fns3(dsp) + self.assertRaises(TypeError, repos.parse_dumpstream3, + stream, ptr, baton, False, None) + finally: + stream.close() + def test_get_logs(self): """Test scope of get_logs callbacks""" logs = [] diff --git a/subversion/bindings/swig/python/tests/run_all.py b/subversion/bindings/swig/python/tests/run_all.py index 32d9a00..acb0926 100644 --- a/subversion/bindings/swig/python/tests/run_all.py +++ b/subversion/bindings/swig/python/tests/run_all.py @@ -19,7 +19,7 @@ # # import unittest, setup_path -import mergeinfo, core, client, delta, checksum, pool, ra, wc, repository, \ +import mergeinfo, core, client, delta, checksum, pool, fs, ra, wc, repository, \ auth, trac.versioncontrol.tests from svn.core import svn_cache_config_get, svn_cache_config_set @@ -37,6 +37,7 @@ def suite(): s.addTest(client.suite()) s.addTest(delta.suite()) s.addTest(pool.suite()) + s.addTest(fs.suite()) s.addTest(ra.suite()) s.addTest(wc.suite()) s.addTest(repository.suite()) diff --git a/subversion/bindings/swig/python/wc.py b/subversion/bindings/swig/python/wc.py index bd5f09c..e489805 100644 --- a/subversion/bindings/swig/python/wc.py +++ b/subversion/bindings/swig/python/wc.py @@ -2553,6 +2553,10 @@ def svn_wc_relocate(*args): """svn_wc_relocate(char const * path, svn_wc_adm_access_t * adm_access, char const * arg3, char const * to, svn_boolean_t recurse, svn_wc_relocation_validator_t validator, void * validator_baton, apr_pool_t pool) -> svn_error_t""" return _wc.svn_wc_relocate(*args) +def svn_wc_revert6(*args): + """svn_wc_revert6(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_depth_t depth, svn_boolean_t use_commit_times, apr_array_header_t changelist_filter, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, svn_boolean_t added_keep_local, svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, apr_pool_t scratch_pool) -> svn_error_t""" + return _wc.svn_wc_revert6(*args) + def svn_wc_revert5(*args): """svn_wc_revert5(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_depth_t depth, svn_boolean_t use_commit_times, apr_array_header_t changelist_filter, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, apr_pool_t scratch_pool) -> svn_error_t""" return _wc.svn_wc_revert5(*args) diff --git a/subversion/bindings/swig/ruby/core.c b/subversion/bindings/swig/ruby/core.c index a5fb757..31d68db 100644 --- a/subversion/bindings/swig/ruby/core.c +++ b/subversion/bindings/swig/ruby/core.c @@ -1936,28 +1936,30 @@ int SWIG_Ruby_arity( VALUE proc, int minimal ) #define SWIGTYPE_p_svn_opt_revision_value_t swig_types[130] #define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[131] #define SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides swig_types[132] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[133] -#define SWIGTYPE_p_svn_patch_file_t swig_types[134] -#define SWIGTYPE_p_svn_patch_t swig_types[135] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[136] -#define SWIGTYPE_p_svn_prop_kind swig_types[137] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[138] -#define SWIGTYPE_p_svn_prop_t swig_types[139] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[140] -#define SWIGTYPE_p_svn_stream_t swig_types[141] -#define SWIGTYPE_p_svn_string_t swig_types[142] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[143] -#define SWIGTYPE_p_svn_tristate_t swig_types[144] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[145] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[146] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[147] -#define SWIGTYPE_p_svn_version_extended_t swig_types[148] -#define SWIGTYPE_p_svn_version_t swig_types[149] -#define SWIGTYPE_p_unsigned_char swig_types[150] -#define SWIGTYPE_p_unsigned_long swig_types[151] -#define SWIGTYPE_p_void swig_types[152] -static swig_type_info *swig_types[154]; -static swig_module_info swig_module = {swig_types, 153, 0, 0, 0, 0}; +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[133] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides swig_types[134] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[135] +#define SWIGTYPE_p_svn_patch_file_t swig_types[136] +#define SWIGTYPE_p_svn_patch_t swig_types[137] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[138] +#define SWIGTYPE_p_svn_prop_kind swig_types[139] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[140] +#define SWIGTYPE_p_svn_prop_t swig_types[141] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[142] +#define SWIGTYPE_p_svn_stream_t swig_types[143] +#define SWIGTYPE_p_svn_string_t swig_types[144] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[145] +#define SWIGTYPE_p_svn_tristate_t swig_types[146] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[147] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[148] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[149] +#define SWIGTYPE_p_svn_version_extended_t swig_types[150] +#define SWIGTYPE_p_svn_version_t swig_types[151] +#define SWIGTYPE_p_unsigned_char swig_types[152] +#define SWIGTYPE_p_unsigned_long swig_types[153] +#define SWIGTYPE_p_void swig_types[154] +static swig_type_info *swig_types[156]; +static swig_module_info swig_module = {swig_types, 155, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2113,6 +2115,11 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc) +#include "svn_types_impl.h" + + + + #include "svn_types.h" @@ -2123,7 +2130,7 @@ SWIG_ruby_failed(void) } -/*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args) { VALUE obj = args[0]; @@ -2317,8 +2324,17 @@ static const svn_version_t * svn_version_invoke_func( +#include "svn_opt_impl.h" + + + + #include "svn_opt.h" +typedef struct { + int optch; const char *desc; +} svn_opt_subcommand_desc3_t_desc_overrides; + typedef struct { int optch; const char *desc; } svn_opt_subcommand_desc2_t_desc_overrides; @@ -2334,7 +2350,7 @@ typedef struct { #include "svn_auth.h" -/*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args) { VALUE obj = args[0]; @@ -10474,6 +10490,539 @@ fail: } +static swig_class SwigClassSvn_opt_subcommand_desc3_t; + +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_desc3_t_name_set(int argc, VALUE *argv, VALUE self) { + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + char *arg2 = (char *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_opt_subcommand_desc3_t *","name", 1, self )); + } + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","name", 2, argv[0] )); + } + arg2 = (char *)(buf2); + { + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->name) free((char *)arg1->name); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->name = copied; + } + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + return Qnil; +fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_desc3_t_name_get(int argc, VALUE *argv, VALUE self) { + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + char *result = 0 ; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_opt_subcommand_desc3_t *","name", 1, self )); + } + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); + result = (char *) ((arg1)->name); + { + if (result) { + vresult = rb_str_new2(result); + } else { + vresult = Qnil; + } + } + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_desc3_t_cmd_func_set(int argc, VALUE *argv, VALUE self) { + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + svn_opt_subcommand_t *arg2 = (svn_opt_subcommand_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_opt_subcommand_desc3_t *","cmd_func", 1, self )); + } + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); + { + int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg2), SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_opt_subcommand_t *","cmd_func", 2, argv[0] )); + } + } + if (arg1) (arg1)->cmd_func = arg2; + return Qnil; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_desc3_t_cmd_func_get(int argc, VALUE *argv, VALUE self) { + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + svn_opt_subcommand_t *result = 0 ; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_opt_subcommand_desc3_t *","cmd_func", 1, self )); + } + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); + result = (svn_opt_subcommand_t *) ((arg1)->cmd_func); + vresult = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t); + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_desc3_t_aliases_set(int argc, VALUE *argv, VALUE self) { + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + char **arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_opt_subcommand_desc3_t *","aliases", 1, self )); + } + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); + res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_p_char, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *[3]","aliases", 2, argv[0] )); + } + arg2 = (char **)(argp2); + { + if (arg2) { + size_t ii = 0; + for (; ii < (size_t)3; ++ii) *(char const * *)&arg1->aliases[ii] = *((char const * *)arg2 + ii); + } else { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""aliases""' of type '""char const *[3]""'"); + } + } + return Qnil; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_desc3_t_aliases_get(int argc, VALUE *argv, VALUE self) { + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + char **result = 0 ; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_opt_subcommand_desc3_t *","aliases", 1, self )); + } + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); + result = (char **)(char **) ((arg1)->aliases); + vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_p_char, 0 | 0 ); + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_desc3_t_help_set(int argc, VALUE *argv, VALUE self) { + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + char **arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_opt_subcommand_desc3_t *","help", 1, self )); + } + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); + res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_p_char, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *[100]","help", 2, argv[0] )); + } + arg2 = (char **)(argp2); + { + if (arg2) { + size_t ii = 0; + for (; ii < (size_t)100; ++ii) *(char const * *)&arg1->help[ii] = *((char const * *)arg2 + ii); + } else { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""help""' of type '""char const *[100]""'"); + } + } + return Qnil; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_desc3_t_help_get(int argc, VALUE *argv, VALUE self) { + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + char **result = 0 ; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_opt_subcommand_desc3_t *","help", 1, self )); + } + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); + result = (char **)(char **) ((arg1)->help); + vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_p_char, 0 | 0 ); + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_desc3_t_valid_options_set(int argc, VALUE *argv, VALUE self) { + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + int *arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_opt_subcommand_desc3_t *","valid_options", 1, self )); + } + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); + res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_int, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "int [50]","valid_options", 2, argv[0] )); + } + arg2 = (int *)(argp2); + { + if (arg2) { + size_t ii = 0; + for (; ii < (size_t)50; ++ii) *(int *)&arg1->valid_options[ii] = *((int *)arg2 + ii); + } else { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""valid_options""' of type '""int [50]""'"); + } + } + return Qnil; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_desc3_t_valid_options_get(int argc, VALUE *argv, VALUE self) { + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int *result = 0 ; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_opt_subcommand_desc3_t *","valid_options", 1, self )); + } + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); + result = (int *)(int *) ((arg1)->valid_options); + vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 | 0 ); + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_desc3_t_desc_overrides_get(int argc, VALUE *argv, VALUE self) { + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + svn_opt_subcommand_desc3_t_desc_overrides *result = 0 ; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_opt_subcommand_desc3_t *","desc_overrides", 1, self )); + } + arg1 = (struct svn_opt_subcommand_desc3_t *)(argp1); + result = (svn_opt_subcommand_desc3_t_desc_overrides *)(svn_opt_subcommand_desc3_t_desc_overrides *) ((arg1)->desc_overrides); + vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, 0 | 0 ); + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +#ifdef HAVE_RB_DEFINE_ALLOC_FUNC +_wrap_svn_opt_subcommand_desc3_t_allocate(VALUE self) +#else +_wrap_svn_opt_subcommand_desc3_t_allocate(int argc, VALUE *argv, VALUE self) +#endif +{ + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_svn_opt_subcommand_desc3_t); +#ifndef HAVE_RB_DEFINE_ALLOC_FUNC + rb_obj_call_init(vresult, argc, argv); +#endif + return vresult; +} + + +SWIGINTERN VALUE +_wrap_new_svn_opt_subcommand_desc3_t(int argc, VALUE *argv, VALUE self) { + struct svn_opt_subcommand_desc3_t *result = 0 ; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + { + result = (struct svn_opt_subcommand_desc3_t *)calloc(1, sizeof(struct svn_opt_subcommand_desc3_t)); + DATA_PTR(self) = result; + + + + } + return self; +fail: + return Qnil; +} + + +SWIGINTERN void +free_svn_opt_subcommand_desc3_t(void *self) { + struct svn_opt_subcommand_desc3_t *arg1 = (struct svn_opt_subcommand_desc3_t *)self; + free((char *) arg1); +} + +static swig_class SwigClassSvn_opt_subcommand_desc3_t_desc_overrides; + +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_desc3_t_desc_overrides_optch_set(int argc, VALUE *argv, VALUE self) { + svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *) 0 ; + int arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_opt_subcommand_desc3_t_desc_overrides *","optch", 1, self )); + } + arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)(argp1); + ecode2 = SWIG_AsVal_int(argv[0], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","optch", 2, argv[0] )); + } + arg2 = (int)(val2); + if (arg1) (arg1)->optch = arg2; + return Qnil; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_desc3_t_desc_overrides_optch_get(int argc, VALUE *argv, VALUE self) { + svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int result; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_opt_subcommand_desc3_t_desc_overrides *","optch", 1, self )); + } + arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)(argp1); + result = (int) ((arg1)->optch); + vresult = SWIG_From_int((int)(result)); + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_desc3_t_desc_overrides_desc_set(int argc, VALUE *argv, VALUE self) { + svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *) 0 ; + char *arg2 = (char *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_opt_subcommand_desc3_t_desc_overrides *","desc", 1, self )); + } + arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)(argp1); + res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","desc", 2, argv[0] )); + } + arg2 = (char *)(buf2); + { + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->desc) free((char *)arg1->desc); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->desc = copied; + } + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + return Qnil; +fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_desc3_t_desc_overrides_desc_get(int argc, VALUE *argv, VALUE self) { + svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + char *result = 0 ; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_opt_subcommand_desc3_t_desc_overrides *","desc", 1, self )); + } + arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)(argp1); + result = (char *) ((arg1)->desc); + { + if (result) { + vresult = rb_str_new2(result); + } else { + vresult = Qnil; + } + } + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +#ifdef HAVE_RB_DEFINE_ALLOC_FUNC +_wrap_svn_opt_subcommand_desc3_t_desc_overrides_allocate(VALUE self) +#else +_wrap_svn_opt_subcommand_desc3_t_desc_overrides_allocate(int argc, VALUE *argv, VALUE self) +#endif +{ + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides); +#ifndef HAVE_RB_DEFINE_ALLOC_FUNC + rb_obj_call_init(vresult, argc, argv); +#endif + return vresult; +} + + +SWIGINTERN VALUE +_wrap_new_svn_opt_subcommand_desc3_t_desc_overrides(int argc, VALUE *argv, VALUE self) { + svn_opt_subcommand_desc3_t_desc_overrides *result = 0 ; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + { + result = (svn_opt_subcommand_desc3_t_desc_overrides *)calloc(1, sizeof(svn_opt_subcommand_desc3_t_desc_overrides)); + DATA_PTR(self) = result; + + + + } + return self; +fail: + return Qnil; +} + + +SWIGINTERN void +free_svn_opt_subcommand_desc3_t_desc_overrides(void *self) { + svn_opt_subcommand_desc3_t_desc_overrides *arg1 = (svn_opt_subcommand_desc3_t_desc_overrides *)self; + free((char *) arg1); +} + static swig_class SwigClassSvn_opt_subcommand_desc2_t; SWIGINTERN VALUE @@ -11369,6 +11918,46 @@ free_svn_opt_subcommand_desc_t(void *self) { free((char *) arg1); } +SWIGINTERN VALUE +_wrap_svn_opt_get_canonical_subcommand3(int argc, VALUE *argv, VALUE self) { + svn_opt_subcommand_desc3_t *arg1 = (svn_opt_subcommand_desc3_t *) 0 ; + char *arg2 = (char *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + svn_opt_subcommand_desc3_t *result = 0 ; + VALUE vresult = Qnil; + + if ((argc < 2) || (argc > 2)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_opt_subcommand_desc3_t const *","svn_opt_get_canonical_subcommand3", 1, argv[0] )); + } + arg1 = (svn_opt_subcommand_desc3_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_opt_get_canonical_subcommand3", 2, argv[1] )); + } + arg2 = (char *)(buf2); + { + result = (svn_opt_subcommand_desc3_t *)svn_opt_get_canonical_subcommand3((struct svn_opt_subcommand_desc3_t const *)arg1,(char const *)arg2); + + + + } + vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + return vresult; +fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_opt_get_canonical_subcommand2(int argc, VALUE *argv, VALUE self) { svn_opt_subcommand_desc2_t *arg1 = (svn_opt_subcommand_desc2_t *) 0 ; @@ -11449,6 +12038,76 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_opt_get_option_from_code3(int argc, VALUE *argv, VALUE self) { + int arg1 ; + apr_getopt_option_t *arg2 = (apr_getopt_option_t *) 0 ; + svn_opt_subcommand_desc3_t *arg3 = (svn_opt_subcommand_desc3_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + int val1 ; + int ecode1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + apr_getopt_option_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 3) || (argc > 4)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + } + ecode1 = SWIG_AsVal_int(argv[0], &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","svn_opt_get_option_from_code3", 1, argv[0] )); + } + arg1 = (int)(val1); + res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_apr_getopt_option_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "apr_getopt_option_t const *","svn_opt_get_option_from_code3", 2, argv[1] )); + } + arg2 = (apr_getopt_option_t *)(argp2); + res3 = SWIG_ConvertPtr(argv[2], &argp3,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_opt_subcommand_desc3_t const *","svn_opt_get_option_from_code3", 3, argv[2] )); + } + arg3 = (svn_opt_subcommand_desc3_t *)(argp3); + if (argc > 3) { + + } + { + result = (apr_getopt_option_t *)svn_opt_get_option_from_code3(arg1,(apr_getopt_option_t const *)arg2,(struct svn_opt_subcommand_desc3_t const *)arg3,arg4); + + + + } + vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_apr_getopt_option_t, 0 | 0 ); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_opt_get_option_from_code2(int argc, VALUE *argv, VALUE self) { int arg1 ; @@ -11556,6 +12215,53 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_takes_option4(int argc, VALUE *argv, VALUE self) { + svn_opt_subcommand_desc3_t *arg1 = (svn_opt_subcommand_desc3_t *) 0 ; + int arg2 ; + int *arg3 = (int *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + int temp3 ; + int res3 = SWIG_TMPOBJ ; + svn_boolean_t result; + VALUE vresult = Qnil; + + arg3 = &temp3; + if ((argc < 2) || (argc > 2)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_opt_subcommand_desc3_t const *","svn_opt_subcommand_takes_option4", 1, argv[0] )); + } + arg1 = (svn_opt_subcommand_desc3_t *)(argp1); + ecode2 = SWIG_AsVal_int(argv[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","svn_opt_subcommand_takes_option4", 2, argv[1] )); + } + arg2 = (int)(val2); + { + result = (svn_boolean_t)svn_opt_subcommand_takes_option4((struct svn_opt_subcommand_desc3_t const *)arg1,arg2,(int const *)arg3); + + + + } + vresult = result ? Qtrue : Qfalse; + if (SWIG_IsTmpObj(res3)) { + vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_int((*arg3))); + } else { + int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, new_flags)); + } + return vresult; +fail: + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_opt_subcommand_takes_option3(int argc, VALUE *argv, VALUE self) { svn_opt_subcommand_desc2_t *arg1 = (svn_opt_subcommand_desc2_t *) 0 ; @@ -11677,6 +12383,97 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_opt_print_generic_help3(int argc, VALUE *argv, VALUE self) { + char *arg1 = (char *) 0 ; + svn_opt_subcommand_desc3_t *arg2 = (svn_opt_subcommand_desc3_t *) 0 ; + apr_getopt_option_t *arg3 = (apr_getopt_option_t *) 0 ; + char *arg4 = (char *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + FILE *arg6 = (FILE *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + int res4 ; + char *buf4 = 0 ; + int alloc4 = 0 ; + void *argp6 = 0 ; + int res6 = 0 ; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5); + _global_pool = arg5; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 4) || (argc > 6)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail; + } + res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_opt_print_generic_help3", 1, argv[0] )); + } + arg1 = (char *)(buf1); + res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_opt_subcommand_desc3_t const *","svn_opt_print_generic_help3", 2, argv[1] )); + } + arg2 = (svn_opt_subcommand_desc3_t *)(argp2); + res3 = SWIG_ConvertPtr(argv[2], &argp3,SWIGTYPE_p_apr_getopt_option_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "apr_getopt_option_t const *","svn_opt_print_generic_help3", 3, argv[2] )); + } + arg3 = (apr_getopt_option_t *)(argp3); + res4 = SWIG_AsCharPtrAndSize(argv[3], &buf4, NULL, &alloc4); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "char const *","svn_opt_print_generic_help3", 4, argv[3] )); + } + arg4 = (char *)(buf4); + if (argc > 4) { + + } + if (argc > 5) { + res6 = SWIG_ConvertPtr(argv[5], &argp6,SWIGTYPE_p_FILE, 0 | 0 ); + if (!SWIG_IsOK(res6)) { + SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "FILE *","svn_opt_print_generic_help3", 6, argv[5] )); + } + arg6 = (FILE *)(argp6); + } + { + svn_opt_print_generic_help3((char const *)arg1,(struct svn_opt_subcommand_desc3_t const *)arg2,(apr_getopt_option_t const *)arg3,(char const *)arg4,arg5,arg6); + + + + } + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + if (alloc4 == SWIG_NEWOBJ) free((char*)buf4); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + if (alloc4 == SWIG_NEWOBJ) free((char*)buf4); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_opt_print_generic_help2(int argc, VALUE *argv, VALUE self) { char *arg1 = (char *) 0 ; @@ -11832,6 +12629,87 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_opt_subcommand_help4(int argc, VALUE *argv, VALUE self) { + char *arg1 = (char *) 0 ; + svn_opt_subcommand_desc3_t *arg2 = (svn_opt_subcommand_desc3_t *) 0 ; + apr_getopt_option_t *arg3 = (apr_getopt_option_t *) 0 ; + int *arg4 = (int *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + int temp4 ; + int res4 = SWIG_TMPOBJ ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5); + _global_pool = arg5; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg4 = &temp4; + if ((argc < 3) || (argc > 4)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + } + res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_opt_subcommand_help4", 1, argv[0] )); + } + arg1 = (char *)(buf1); + res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_opt_subcommand_desc3_t const *","svn_opt_subcommand_help4", 2, argv[1] )); + } + arg2 = (svn_opt_subcommand_desc3_t *)(argp2); + res3 = SWIG_ConvertPtr(argv[2], &argp3,SWIGTYPE_p_apr_getopt_option_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "apr_getopt_option_t const *","svn_opt_subcommand_help4", 3, argv[2] )); + } + arg3 = (apr_getopt_option_t *)(argp3); + if (argc > 3) { + + } + { + svn_opt_subcommand_help4((char const *)arg1,(struct svn_opt_subcommand_desc3_t const *)arg2,(apr_getopt_option_t const *)arg3,(int const *)arg4,arg5); + + + + } + if (SWIG_IsTmpObj(res4)) { + vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_int((*arg4))); + } else { + int new_flags = SWIG_IsNewObj(res4) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, new_flags)); + } + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_opt_subcommand_help3(int argc, VALUE *argv, VALUE self) { char *arg1 = (char *) 0 ; @@ -12898,6 +13776,143 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_opt_print_help5(int argc, VALUE *argv, VALUE self) { + apr_getopt_t *arg1 = (apr_getopt_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_boolean_t arg3 ; + svn_boolean_t arg4 ; + svn_boolean_t arg5 ; + char *arg6 = (char *) 0 ; + char *arg7 = (char *) 0 ; + svn_opt_subcommand_desc3_t *arg8 = (svn_opt_subcommand_desc3_t *) 0 ; + apr_getopt_option_t *arg9 = (apr_getopt_option_t *) 0 ; + int *arg10 = (int *) 0 ; + char *arg11 = (char *) 0 ; + apr_pool_t *arg12 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int res6 ; + char *buf6 = 0 ; + int alloc6 = 0 ; + int res7 ; + char *buf7 = 0 ; + int alloc7 = 0 ; + void *argp8 = 0 ; + int res8 = 0 ; + void *argp9 = 0 ; + int res9 = 0 ; + int temp10 ; + int res10 = SWIG_TMPOBJ ; + int res11 ; + char *buf11 = 0 ; + int alloc11 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg12); + _global_pool = arg12; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg10 = &temp10; + if ((argc < 10) || (argc > 11)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 10)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_apr_getopt_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "apr_getopt_t *","svn_opt_print_help5", 1, argv[0] )); + } + arg1 = (apr_getopt_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_opt_print_help5", 2, argv[1] )); + } + arg2 = (char *)(buf2); + arg3 = RTEST(argv[2]); + arg4 = RTEST(argv[3]); + arg5 = RTEST(argv[4]); + res6 = SWIG_AsCharPtrAndSize(argv[5], &buf6, NULL, &alloc6); + if (!SWIG_IsOK(res6)) { + SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "char const *","svn_opt_print_help5", 6, argv[5] )); + } + arg6 = (char *)(buf6); + res7 = SWIG_AsCharPtrAndSize(argv[6], &buf7, NULL, &alloc7); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "char const *","svn_opt_print_help5", 7, argv[6] )); + } + arg7 = (char *)(buf7); + res8 = SWIG_ConvertPtr(argv[7], &argp8,SWIGTYPE_p_svn_opt_subcommand_desc3_t, 0 | 0 ); + if (!SWIG_IsOK(res8)) { + SWIG_exception_fail(SWIG_ArgError(res8), Ruby_Format_TypeError( "", "svn_opt_subcommand_desc3_t const *","svn_opt_print_help5", 8, argv[7] )); + } + arg8 = (svn_opt_subcommand_desc3_t *)(argp8); + res9 = SWIG_ConvertPtr(argv[8], &argp9,SWIGTYPE_p_apr_getopt_option_t, 0 | 0 ); + if (!SWIG_IsOK(res9)) { + SWIG_exception_fail(SWIG_ArgError(res9), Ruby_Format_TypeError( "", "apr_getopt_option_t const *","svn_opt_print_help5", 9, argv[8] )); + } + arg9 = (apr_getopt_option_t *)(argp9); + res11 = SWIG_AsCharPtrAndSize(argv[9], &buf11, NULL, &alloc11); + if (!SWIG_IsOK(res11)) { + SWIG_exception_fail(SWIG_ArgError(res11), Ruby_Format_TypeError( "", "char const *","svn_opt_print_help5", 11, argv[9] )); + } + arg11 = (char *)(buf11); + if (argc > 10) { + + } + { + result = (svn_error_t *)svn_opt_print_help5(arg1,(char const *)arg2,arg3,arg4,arg5,(char const *)arg6,(char const *)arg7,(struct svn_opt_subcommand_desc3_t const *)arg8,(apr_getopt_option_t const *)arg9,(int const *)arg10,(char const *)arg11,arg12); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + if (SWIG_IsTmpObj(res10)) { + vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_int((*arg10))); + } else { + int new_flags = SWIG_IsNewObj(res10) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg10), SWIGTYPE_p_int, new_flags)); + } + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + if (alloc6 == SWIG_NEWOBJ) free((char*)buf6); + if (alloc7 == SWIG_NEWOBJ) free((char*)buf7); + if (alloc11 == SWIG_NEWOBJ) free((char*)buf11); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + if (alloc6 == SWIG_NEWOBJ) free((char*)buf6); + if (alloc7 == SWIG_NEWOBJ) free((char*)buf7); + if (alloc11 == SWIG_NEWOBJ) free((char*)buf11); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_opt_print_help4(int argc, VALUE *argv, VALUE self) { apr_getopt_t *arg1 = (apr_getopt_t *) 0 ; @@ -22322,47 +23337,84 @@ fail: SWIGINTERN VALUE -_wrap_svn_dirent_local_style(int argc, VALUE *argv, VALUE self) { - char *arg1 = (char *) 0 ; - apr_pool_t *arg2 = (apr_pool_t *) 0 ; +_wrap_svn_dirent_internal_style_safe(int argc, VALUE *argv, VALUE self) { + char **arg1 = (char **) 0 ; + char **arg2 = (char **) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; VALUE _global_svn_swig_rb_pool ; apr_pool_t *_global_pool ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; - char *result = 0 ; + char *temp1 ; + char *temp2 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + svn_error_t *result = 0 ; VALUE vresult = Qnil; { - svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg2); - _global_pool = arg2; + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; svn_swig_rb_push_pool(_global_svn_swig_rb_pool); } - if ((argc < 1) || (argc > 2)) { + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5); + _global_pool = arg5; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + arg2 = &temp2; + if ((argc < 1) || (argc > 3)) { rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; } - res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_dirent_local_style", 1, argv[0] )); + res3 = SWIG_AsCharPtrAndSize(argv[0], &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_dirent_internal_style_safe", 3, argv[0] )); } - arg1 = (char *)(buf1); + arg3 = (char *)(buf3); if (argc > 1) { + } + if (argc > 2) { + } { - result = (char *)svn_dirent_local_style((char const *)arg1,arg2); + result = (svn_error_t *)svn_dirent_internal_style_safe((char const **)arg1,(char const **)arg2,(char const *)arg3,arg4,arg5); } { if (result) { - vresult = rb_str_new2(result); + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + if (*arg1) { + vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg1)); } else { - vresult = Qnil; + vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); } } - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + { + if (*arg2) { + vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg2)); + } else { + vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); + } + } + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -22372,7 +23424,14 @@ _wrap_svn_dirent_local_style(int argc, VALUE *argv, VALUE self) { } return vresult; fail: - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -22385,7 +23444,7 @@ fail: SWIGINTERN VALUE -_wrap_svn_relpath__internal_style(int argc, VALUE *argv, VALUE self) { +_wrap_svn_dirent_local_style(int argc, VALUE *argv, VALUE self) { char *arg1 = (char *) 0 ; apr_pool_t *arg2 = (apr_pool_t *) 0 ; VALUE _global_svn_swig_rb_pool ; @@ -22406,14 +23465,14 @@ _wrap_svn_relpath__internal_style(int argc, VALUE *argv, VALUE self) { } res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_relpath__internal_style", 1, argv[0] )); + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_dirent_local_style", 1, argv[0] )); } arg1 = (char *)(buf1); if (argc > 1) { } { - result = (char *)svn_relpath__internal_style((char const *)arg1,arg2); + result = (char *)svn_dirent_local_style((char const *)arg1,arg2); @@ -23186,41 +24245,439 @@ fail: SWIGINTERN VALUE -_wrap_svn_uri_dirname(int argc, VALUE *argv, VALUE self) { - char *arg1 = (char *) 0 ; - apr_pool_t *arg2 = (apr_pool_t *) 0 ; +_wrap_svn_uri_dirname(int argc, VALUE *argv, VALUE self) { + char *arg1 = (char *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + char *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg2); + _global_pool = arg2; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 1) || (argc > 2)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_uri_dirname", 1, argv[0] )); + } + arg1 = (char *)(buf1); + if (argc > 1) { + + } + { + result = (char *)svn_uri_dirname((char const *)arg1,arg2); + + + + } + vresult = SWIG_FromCharPtr((const char *)result); + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_dirent_is_absolute(int argc, VALUE *argv, VALUE self) { + char *arg1 = (char *) 0 ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + svn_boolean_t result; + VALUE vresult = Qnil; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_dirent_is_absolute", 1, argv[0] )); + } + arg1 = (char *)(buf1); + { + result = (svn_boolean_t)svn_dirent_is_absolute((char const *)arg1); + + + + } + vresult = result ? Qtrue : Qfalse; + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + return vresult; +fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_uri_is_root(int argc, VALUE *argv, VALUE self) { + char *arg1 = (char *) 0 ; + apr_size_t arg2 ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + unsigned long val2 ; + int ecode2 = 0 ; + svn_boolean_t result; + VALUE vresult = Qnil; + + if ((argc < 2) || (argc > 2)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + } + res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_uri_is_root", 1, argv[0] )); + } + arg1 = (char *)(buf1); + ecode2 = SWIG_AsVal_unsigned_SS_long(argv[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "apr_size_t","svn_uri_is_root", 2, argv[1] )); + } + arg2 = (apr_size_t)(val2); + { + result = (svn_boolean_t)svn_uri_is_root((char const *)arg1,arg2); + + + + } + vresult = result ? Qtrue : Qfalse; + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + return vresult; +fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_dirent_canonicalize(int argc, VALUE *argv, VALUE self) { + char *arg1 = (char *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + char *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg2); + _global_pool = arg2; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 1) || (argc > 2)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_dirent_canonicalize", 1, argv[0] )); + } + arg1 = (char *)(buf1); + if (argc > 1) { + + } + { + result = (char *)svn_dirent_canonicalize((char const *)arg1,arg2); + + + + } + { + if (result) { + vresult = rb_str_new2(result); + } else { + vresult = Qnil; + } + } + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_dirent_canonicalize_safe(int argc, VALUE *argv, VALUE self) { + char **arg1 = (char **) 0 ; + char **arg2 = (char **) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + char *temp1 ; + char *temp2 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5); + _global_pool = arg5; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + arg2 = &temp2; + if ((argc < 1) || (argc > 3)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res3 = SWIG_AsCharPtrAndSize(argv[0], &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_dirent_canonicalize_safe", 3, argv[0] )); + } + arg3 = (char *)(buf3); + if (argc > 1) { + + } + if (argc > 2) { + + } + { + result = (svn_error_t *)svn_dirent_canonicalize_safe((char const **)arg1,(char const **)arg2,(char const *)arg3,arg4,arg5); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + if (*arg1) { + vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg1)); + } else { + vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); + } + } + { + if (*arg2) { + vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg2)); + } else { + vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); + } + } + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_relpath_canonicalize(int argc, VALUE *argv, VALUE self) { + char *arg1 = (char *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + char *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg2); + _global_pool = arg2; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 1) || (argc > 2)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_relpath_canonicalize", 1, argv[0] )); + } + arg1 = (char *)(buf1); + if (argc > 1) { + + } + { + result = (char *)svn_relpath_canonicalize((char const *)arg1,arg2); + + + + } + { + if (result) { + vresult = rb_str_new2(result); + } else { + vresult = Qnil; + } + } + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_relpath_canonicalize_safe(int argc, VALUE *argv, VALUE self) { + char **arg1 = (char **) 0 ; + char **arg2 = (char **) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; VALUE _global_svn_swig_rb_pool ; apr_pool_t *_global_pool ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; - char *result = 0 ; + char *temp1 ; + char *temp2 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + svn_error_t *result = 0 ; VALUE vresult = Qnil; { - svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg2); - _global_pool = arg2; + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; svn_swig_rb_push_pool(_global_svn_swig_rb_pool); } - if ((argc < 1) || (argc > 2)) { + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5); + _global_pool = arg5; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + arg2 = &temp2; + if ((argc < 1) || (argc > 3)) { rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; } - res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_uri_dirname", 1, argv[0] )); + res3 = SWIG_AsCharPtrAndSize(argv[0], &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_relpath_canonicalize_safe", 3, argv[0] )); } - arg1 = (char *)(buf1); + arg3 = (char *)(buf3); if (argc > 1) { + } + if (argc > 2) { + } { - result = (char *)svn_uri_dirname((char const *)arg1,arg2); + result = (svn_error_t *)svn_relpath_canonicalize_safe((char const **)arg1,(char const **)arg2,(char const *)arg3,arg4,arg5); } - vresult = SWIG_FromCharPtr((const char *)result); - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + if (*arg1) { + vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg1)); + } else { + vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); + } + } + { + if (*arg2) { + vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg2)); + } else { + vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); + } + } + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -23228,9 +24685,6 @@ _wrap_svn_uri_dirname(int argc, VALUE *argv, VALUE self) { svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); } - return vresult; -fail: - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -23238,84 +24692,29 @@ fail: svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); } - return Qnil; -} - - -SWIGINTERN VALUE -_wrap_svn_dirent_is_absolute(int argc, VALUE *argv, VALUE self) { - char *arg1 = (char *) 0 ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; - svn_boolean_t result; - VALUE vresult = Qnil; - - if ((argc < 1) || (argc > 1)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; - } - res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_dirent_is_absolute", 1, argv[0] )); - } - arg1 = (char *)(buf1); - { - result = (svn_boolean_t)svn_dirent_is_absolute((char const *)arg1); - - - - } - vresult = result ? Qtrue : Qfalse; - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); return vresult; fail: - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); - return Qnil; -} - - -SWIGINTERN VALUE -_wrap_svn_uri_is_root(int argc, VALUE *argv, VALUE self) { - char *arg1 = (char *) 0 ; - apr_size_t arg2 ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; - unsigned long val2 ; - int ecode2 = 0 ; - svn_boolean_t result; - VALUE vresult = Qnil; - - if ((argc < 2) || (argc > 2)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; - } - res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_uri_is_root", 1, argv[0] )); + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); } - arg1 = (char *)(buf1); - ecode2 = SWIG_AsVal_unsigned_SS_long(argv[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "apr_size_t","svn_uri_is_root", 2, argv[1] )); - } - arg2 = (apr_size_t)(val2); { - result = (svn_boolean_t)svn_uri_is_root((char const *)arg1,arg2); - - - + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); } - vresult = result ? Qtrue : Qfalse; - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); - return vresult; -fail: - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); return Qnil; } SWIGINTERN VALUE -_wrap_svn_dirent_canonicalize(int argc, VALUE *argv, VALUE self) { +_wrap_svn_uri_canonicalize(int argc, VALUE *argv, VALUE self) { char *arg1 = (char *) 0 ; apr_pool_t *arg2 = (apr_pool_t *) 0 ; VALUE _global_svn_swig_rb_pool ; @@ -23336,14 +24735,14 @@ _wrap_svn_dirent_canonicalize(int argc, VALUE *argv, VALUE self) { } res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_dirent_canonicalize", 1, argv[0] )); + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_uri_canonicalize", 1, argv[0] )); } arg1 = (char *)(buf1); if (argc > 1) { } { - result = (char *)svn_dirent_canonicalize((char const *)arg1,arg2); + result = (char *)svn_uri_canonicalize((char const *)arg1,arg2); @@ -23378,47 +24777,77 @@ fail: SWIGINTERN VALUE -_wrap_svn_relpath_canonicalize(int argc, VALUE *argv, VALUE self) { - char *arg1 = (char *) 0 ; - apr_pool_t *arg2 = (apr_pool_t *) 0 ; +_wrap_svn_uri_canonicalize_safe(int argc, VALUE *argv, VALUE self) { + char **arg1 = (char **) 0 ; + char **arg2 = (char **) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; VALUE _global_svn_swig_rb_pool ; apr_pool_t *_global_pool ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; - char *result = 0 ; + char *temp1 ; + char *temp2 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + svn_error_t *result = 0 ; VALUE vresult = Qnil; { - svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg2); - _global_pool = arg2; + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; svn_swig_rb_push_pool(_global_svn_swig_rb_pool); } - if ((argc < 1) || (argc > 2)) { + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5); + _global_pool = arg5; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + arg2 = &temp2; + if ((argc < 1) || (argc > 3)) { rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; } - res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_relpath_canonicalize", 1, argv[0] )); + res3 = SWIG_AsCharPtrAndSize(argv[0], &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_uri_canonicalize_safe", 3, argv[0] )); } - arg1 = (char *)(buf1); + arg3 = (char *)(buf3); if (argc > 1) { + } + if (argc > 2) { + } { - result = (char *)svn_relpath_canonicalize((char const *)arg1,arg2); + result = (svn_error_t *)svn_uri_canonicalize_safe((char const **)arg1,(char const **)arg2,(char const *)arg3,arg4,arg5); } { if (result) { - vresult = rb_str_new2(result); + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + if (*arg1) { + vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg1)); } else { - vresult = Qnil; + vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); } } - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + { + if (*arg2) { + vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg2)); + } else { + vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); + } + } + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -23426,9 +24855,6 @@ _wrap_svn_relpath_canonicalize(int argc, VALUE *argv, VALUE self) { svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); } - return vresult; -fail: - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -23436,52 +24862,9 @@ fail: svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); } - return Qnil; -} - - -SWIGINTERN VALUE -_wrap_svn_uri_canonicalize(int argc, VALUE *argv, VALUE self) { - char *arg1 = (char *) 0 ; - apr_pool_t *arg2 = (apr_pool_t *) 0 ; - VALUE _global_svn_swig_rb_pool ; - apr_pool_t *_global_pool ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; - char *result = 0 ; - VALUE vresult = Qnil; - - { - svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg2); - _global_pool = arg2; - svn_swig_rb_push_pool(_global_svn_swig_rb_pool); - } - if ((argc < 1) || (argc > 2)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; - } - res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_uri_canonicalize", 1, argv[0] )); - } - arg1 = (char *)(buf1); - if (argc > 1) { - - } - { - result = (char *)svn_uri_canonicalize((char const *)arg1,arg2); - - - - } - { - if (result) { - vresult = rb_str_new2(result); - } else { - vresult = Qnil; - } - } - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + return vresult; +fail: + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -23489,9 +24872,6 @@ _wrap_svn_uri_canonicalize(int argc, VALUE *argv, VALUE self) { svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); } - return vresult; -fail: - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -43976,47 +45356,47 @@ static swig_type_info _swigt__p_apr_size_t = {"_p_apr_size_t", "apr_size_t *", 0 static swig_type_info _swigt__p_apr_uint32_t = {"_p_apr_uint32_t", "apr_uint32_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_uint64_t = {"_p_apr_uint64_t", "apr_uint64_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t = {"_p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t", "struct svn_error_t *(*)(apr_uint32_t *,void **,void *,svn_diff_datasource_e)|svn_error_t *(*)(apr_uint32_t *,void **,void *,svn_diff_datasource_e)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_auth_gnome_keyring_unlock_prompt_func_t|struct svn_error_t *(*)(char **,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t = {"_p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t", "svn_error_t *(*)(apr_uint32_t *,void **,void *,svn_diff_datasource_e)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_auth_gnome_keyring_unlock_prompt_func_t|svn_error_t *(*)(char **,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void = {"_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void", "svn_auth_simple_provider_func_t|svn_auth_ssl_client_cert_pw_provider_func_t|void (*)(struct svn_auth_provider_object_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_simple_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_pw_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_username_prompt_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_stream_t **,void *,apr_pool_t *,apr_pool_t *)|svn_stream_lazyopen_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void **,void **,void *,apr_hash_t *,char const *,apr_pool_t *)|svn_error_t *(*)(void **,void **,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void **,void *,void *,apr_hash_t *,char const *,apr_pool_t *)|struct svn_error_t *(*)(void **,void *,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_simple_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_pw_prompt_func_t|svn_error_t *(*)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_client_cert_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_username_prompt_func_t|svn_error_t *(*)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_stream_lazyopen_func_t|svn_error_t *(*)(svn_stream_t **,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void **,void **,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void **,void *,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__char_p_void__int = {"_p_f_p_q_const__char_p_q_const__char_p_void__int", "svn_config_enumerator_t|int (*)(char const *,char const *,void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int = {"_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int", "svn_config_enumerator2_t|int (*)(char const *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_q_const__char_p_void__int = {"_p_f_p_q_const__char_p_void__int", "svn_config_section_enumerator_t|int (*)(char const *,void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__int = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__int", "int (*)(char const *,void *,apr_pool_t *)|svn_config_section_enumerator2_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int = {"_p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int", "svn_boolean_t (*)(svn_version_t const *,svn_version_t const *)|int (*)(struct svn_version_t const *,struct svn_version_t const *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_boolean_t *,char const *,void *,apr_pool_t *)|svn_auth_plaintext_prompt_func_t|svn_auth_plaintext_passphrase_prompt_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_boolean_t *,void *,char const *,char const *,apr_hash_t *,apr_pool_t *)|svn_config_auth_walk_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,void *,void *,apr_hash_t *,char const *,apr_pool_t *)|struct svn_error_t *(*)(svn_boolean_t *,void *,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_close_fn_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)|svn_commit_callback2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,char const *,void *,apr_pool_t *)|svn_auth_plaintext_prompt_func_t|svn_auth_plaintext_passphrase_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,void *,char const *,char const *,apr_hash_t *,apr_pool_t *)|svn_config_auth_walk_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,void *,void *,apr_hash_t *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_close_fn_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void__void = {"_p_f_p_void__void", "void (*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t = {"_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t)|svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t = {"_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,svn_diff_t *)|svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,svn_diff_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_size_t__p_svn_error_t = {"_p_f_p_void_apr_size_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_size_t)|svn_stream_skip_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_off_t_p_apr_off_t_p_q_const__svn_diff_datasource_e_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_apr_off_t_p_apr_off_t_p_q_const__svn_diff_datasource_e_apr_size_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_off_t *,apr_off_t *,svn_diff_datasource_e const *,apr_size_t)|struct svn_error_t *(*)(void *,apr_off_t *,apr_off_t *,svn_diff_datasource_e const *,apr_size_t)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_char_p_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char *,apr_size_t *)|svn_read_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_stream_mark_t **,apr_pool_t *)|svn_stream_mark_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_stringbuf_t **,char const *,svn_boolean_t *,apr_pool_t *)|svn_stream_readline_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_size_t *)|svn_write_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_finfo_t const *,apr_pool_t *)|svn_io_walk_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t = {"_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t", "svn_stream_seek_fn_t|struct svn_error_t *(*)(void *,svn_stream_mark_t const *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t__p_svn_error_t", "svn_stream_data_available_fn_t|struct svn_error_t *(*)(void *,svn_boolean_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t = {"_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t = {"_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,svn_diff_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_size_t__p_svn_error_t = {"_p_f_p_void_apr_size_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_size_t)|svn_stream_skip_fn_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_off_t_p_apr_off_t_p_q_const__svn_diff_datasource_e_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_apr_off_t_p_apr_off_t_p_q_const__svn_diff_datasource_e_apr_size_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_off_t *,apr_off_t *,svn_diff_datasource_e const *,apr_size_t)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_char_p_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t", "svn_read_fn_t|svn_error_t *(*)(void *,char *,apr_size_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t", "svn_stream_mark_fn_t|svn_error_t *(*)(void *,svn_stream_mark_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stringbuf_t_p_q_const__char_p_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_stringbuf_t **,char const *,svn_boolean_t *,apr_pool_t *)|svn_stream_readline_fn_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_size_t *)|svn_write_fn_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_finfo_t const *,apr_pool_t *)|svn_io_walk_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t = {"_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_stream_mark_t const *)|svn_stream_seek_fn_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t__p_svn_error_t", "svn_stream_data_available_fn_t|svn_error_t *(*)(void *,svn_boolean_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_void__void = {"_p_f_p_void_p_void__void", "void (*)(void *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_void_p_void_p_int__p_svn_error_t = {"_p_f_p_void_p_void_p_void_p_int__p_svn_error_t", "svn_error_t *(*)(void *,void *,void *,int *)|struct svn_error_t *(*)(void *,void *,void *,int *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_diff_datasource_e__p_svn_error_t = {"_p_f_p_void_svn_diff_datasource_e__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_diff_datasource_e)|svn_error_t *(*)(void *,svn_diff_datasource_e)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_void_p_void_p_int__p_svn_error_t = {"_p_f_p_void_p_void_p_void_p_int__p_svn_error_t", "svn_error_t *(*)(void *,void *,void *,int *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_diff_datasource_e__p_svn_error_t = {"_p_f_p_void_svn_diff_datasource_e__p_svn_error_t", "svn_error_t *(*)(void *,svn_diff_datasource_e)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_void__p_svn_version_t = {"_p_f_void__p_svn_version_t", "svn_version_func_t|struct svn_version_t *(*)(void)|svn_version_t *(*)(void)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; @@ -44073,7 +45453,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *|struct svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0}; @@ -44090,6 +45470,8 @@ static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", " static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t_desc_overrides = {"_p_svn_opt_subcommand_desc2_t_desc_overrides", "svn_opt_subcommand_desc2_t_desc_overrides *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t_desc_overrides = {"_p_svn_opt_subcommand_desc3_t_desc_overrides", "svn_opt_subcommand_desc3_t_desc_overrides *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -44245,6 +45627,8 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, &_swigt__p_svn_opt_subcommand_desc2_t_desc_overrides, + &_swigt__p_svn_opt_subcommand_desc3_t, + &_swigt__p_svn_opt_subcommand_desc3_t_desc_overrides, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -44400,6 +45784,8 @@ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_re static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t_desc_overrides[] = { {&_swigt__p_svn_opt_subcommand_desc2_t_desc_overrides, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t_desc_overrides[] = { {&_swigt__p_svn_opt_subcommand_desc3_t_desc_overrides, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -44555,6 +45941,8 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, _swigc__p_svn_opt_subcommand_desc2_t_desc_overrides, + _swigc__p_svn_opt_subcommand_desc3_t, + _swigc__p_svn_opt_subcommand_desc3_t_desc_overrides, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, @@ -44997,6 +46385,7 @@ SWIGEXPORT void Init_core(void) { rb_define_const(mCore, "SVN_ERR_FS_CORRUPT_REVPROP_MANIFEST", SWIG_From_int((int)(SVN_ERR_FS_CORRUPT_REVPROP_MANIFEST))); rb_define_const(mCore, "SVN_ERR_FS_CORRUPT_PROPLIST", SWIG_From_int((int)(SVN_ERR_FS_CORRUPT_PROPLIST))); rb_define_const(mCore, "SVN_ERR_FS_AMBIGUOUS_CHECKSUM_REP", SWIG_From_int((int)(SVN_ERR_FS_AMBIGUOUS_CHECKSUM_REP))); + rb_define_const(mCore, "SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE", SWIG_From_int((int)(SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE))); rb_define_const(mCore, "SVN_ERR_REPOS_LOCKED", SWIG_From_int((int)(SVN_ERR_REPOS_LOCKED))); rb_define_const(mCore, "SVN_ERR_REPOS_HOOK_FAILURE", SWIG_From_int((int)(SVN_ERR_REPOS_HOOK_FAILURE))); rb_define_const(mCore, "SVN_ERR_REPOS_BAD_ARGS", SWIG_From_int((int)(SVN_ERR_REPOS_BAD_ARGS))); @@ -45123,6 +46512,7 @@ SWIGEXPORT void Init_core(void) { rb_define_const(mCore, "SVN_ERR_SQLITE_ROLLBACK_FAILED", SWIG_From_int((int)(SVN_ERR_SQLITE_ROLLBACK_FAILED))); rb_define_const(mCore, "SVN_ERR_LZ4_COMPRESSION_FAILED", SWIG_From_int((int)(SVN_ERR_LZ4_COMPRESSION_FAILED))); rb_define_const(mCore, "SVN_ERR_LZ4_DECOMPRESSION_FAILED", SWIG_From_int((int)(SVN_ERR_LZ4_DECOMPRESSION_FAILED))); + rb_define_const(mCore, "SVN_ERR_CANONICALIZATION_FAILED", SWIG_From_int((int)(SVN_ERR_CANONICALIZATION_FAILED))); rb_define_const(mCore, "SVN_ERR_CL_ARG_PARSING_ERROR", SWIG_From_int((int)(SVN_ERR_CL_ARG_PARSING_ERROR))); rb_define_const(mCore, "SVN_ERR_CL_INSUFFICIENT_ARGS", SWIG_From_int((int)(SVN_ERR_CL_INSUFFICIENT_ARGS))); rb_define_const(mCore, "SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS", SWIG_From_int((int)(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS))); @@ -45192,6 +46582,20 @@ SWIGEXPORT void Init_core(void) { rb_define_module_function(mCore, "svn_time_to_human_cstring", _wrap_svn_time_to_human_cstring, -1); rb_define_module_function(mCore, "svn_parse_date", _wrap_svn_parse_date, -1); rb_define_module_function(mCore, "svn_sleep_for_timestamps", _wrap_svn_sleep_for_timestamps, -1); + rb_define_const(mCore, "Svn_node_none", SWIG_From_int((int)(svn_node_none))); + rb_define_const(mCore, "Svn_node_file", SWIG_From_int((int)(svn_node_file))); + rb_define_const(mCore, "Svn_node_dir", SWIG_From_int((int)(svn_node_dir))); + rb_define_const(mCore, "Svn_node_unknown", SWIG_From_int((int)(svn_node_unknown))); + rb_define_const(mCore, "Svn_node_symlink", SWIG_From_int((int)(svn_node_symlink))); + rb_define_const(mCore, "Svn_tristate_false", SWIG_From_int((int)(svn_tristate_false))); + rb_define_const(mCore, "Svn_tristate_true", SWIG_From_int((int)(svn_tristate_true))); + rb_define_const(mCore, "Svn_tristate_unknown", SWIG_From_int((int)(svn_tristate_unknown))); + rb_define_const(mCore, "Svn_depth_unknown", SWIG_From_int((int)(svn_depth_unknown))); + rb_define_const(mCore, "Svn_depth_exclude", SWIG_From_int((int)(svn_depth_exclude))); + rb_define_const(mCore, "Svn_depth_empty", SWIG_From_int((int)(svn_depth_empty))); + rb_define_const(mCore, "Svn_depth_files", SWIG_From_int((int)(svn_depth_files))); + rb_define_const(mCore, "Svn_depth_immediates", SWIG_From_int((int)(svn_depth_immediates))); + rb_define_const(mCore, "Svn_depth_infinity", SWIG_From_int((int)(svn_depth_infinity))); rb_define_const(mCore, "SVN_UNALIGNED_ACCESS_IS_OK", SWIG_From_int((int)(0))); rb_define_const(mCore, "TRUE", SWIG_From_int((int)(1))); rb_define_const(mCore, "FALSE", SWIG_From_int((int)(0))); @@ -45213,28 +46617,14 @@ SWIGEXPORT void Init_core(void) { SwigClassSvn_error_t.mark = 0; SwigClassSvn_error_t.destroy = (void (*)(void *)) free_svn_error_t; SwigClassSvn_error_t.trackObjects = 0; - rb_define_const(mCore, "Svn_node_none", SWIG_From_int((int)(svn_node_none))); - rb_define_const(mCore, "Svn_node_file", SWIG_From_int((int)(svn_node_file))); - rb_define_const(mCore, "Svn_node_dir", SWIG_From_int((int)(svn_node_dir))); - rb_define_const(mCore, "Svn_node_unknown", SWIG_From_int((int)(svn_node_unknown))); - rb_define_const(mCore, "Svn_node_symlink", SWIG_From_int((int)(svn_node_symlink))); rb_define_module_function(mCore, "svn_node_kind_to_word", _wrap_svn_node_kind_to_word, -1); rb_define_module_function(mCore, "svn_node_kind_from_word", _wrap_svn_node_kind_from_word, -1); - rb_define_const(mCore, "Svn_tristate_false", SWIG_From_int((int)(svn_tristate_false))); - rb_define_const(mCore, "Svn_tristate_true", SWIG_From_int((int)(svn_tristate_true))); - rb_define_const(mCore, "Svn_tristate_unknown", SWIG_From_int((int)(svn_tristate_unknown))); rb_define_module_function(mCore, "svn_tristate__to_word", _wrap_svn_tristate__to_word, -1); rb_define_module_function(mCore, "svn_tristate__from_word", _wrap_svn_tristate__from_word, -1); rb_define_module_function(mCore, "svn_revnum_parse", _wrap_svn_revnum_parse, -1); rb_define_const(mCore, "SVN_REVNUM_T_FMT", SWIG_FromCharPtr("ld")); rb_define_const(mCore, "Svn_nonrecursive", SWIG_From_int((int)(svn_nonrecursive))); rb_define_const(mCore, "Svn_recursive", SWIG_From_int((int)(svn_recursive))); - rb_define_const(mCore, "Svn_depth_unknown", SWIG_From_int((int)(svn_depth_unknown))); - rb_define_const(mCore, "Svn_depth_exclude", SWIG_From_int((int)(svn_depth_exclude))); - rb_define_const(mCore, "Svn_depth_empty", SWIG_From_int((int)(svn_depth_empty))); - rb_define_const(mCore, "Svn_depth_files", SWIG_From_int((int)(svn_depth_files))); - rb_define_const(mCore, "Svn_depth_immediates", SWIG_From_int((int)(svn_depth_immediates))); - rb_define_const(mCore, "Svn_depth_infinity", SWIG_From_int((int)(svn_depth_infinity))); rb_define_module_function(mCore, "svn_depth_to_word", _wrap_svn_depth_to_word, -1); rb_define_module_function(mCore, "svn_depth_from_word", _wrap_svn_depth_from_word, -1); rb_define_const(mCore, "SVN_DIRENT_KIND", SWIG_From_int((int)(0x00001))); @@ -45426,16 +46816,16 @@ SWIGEXPORT void Init_core(void) { rb_define_module_function(mCore, "svn_pool_create", _wrap_svn_pool_create, -1); rb_define_module_function(mCore, "svn_pool_create_allocator", _wrap_svn_pool_create_allocator, -1); rb_define_const(mCore, "SVN_VER_MAJOR", SWIG_From_int((int)(1))); - rb_define_const(mCore, "SVN_VER_MINOR", SWIG_From_int((int)(10))); - rb_define_const(mCore, "SVN_VER_PATCH", SWIG_From_int((int)(6))); - rb_define_const(mCore, "SVN_VER_MICRO", SWIG_From_int((int)(6))); + rb_define_const(mCore, "SVN_VER_MINOR", SWIG_From_int((int)(13))); + rb_define_const(mCore, "SVN_VER_PATCH", SWIG_From_int((int)(0))); + rb_define_const(mCore, "SVN_VER_MICRO", SWIG_From_int((int)(0))); rb_define_const(mCore, "SVN_VER_LIBRARY", SWIG_From_int((int)(1))); - rb_define_const(mCore, "SVN_VER_TAG", SWIG_FromCharPtr(" (r1863367)")); + rb_define_const(mCore, "SVN_VER_TAG", SWIG_FromCharPtr(" (r1867053)")); rb_define_const(mCore, "SVN_VER_NUMTAG", SWIG_FromCharPtr("")); - rb_define_const(mCore, "SVN_VER_REVISION", SWIG_From_int((int)(1863367))); - rb_define_const(mCore, "SVN_VER_NUM", SWIG_FromCharPtr("1.10.6")); - rb_define_const(mCore, "SVN_VER_NUMBER", SWIG_FromCharPtr("1.10.6")); - rb_define_const(mCore, "SVN_VERSION", SWIG_FromCharPtr("1.10.6 (r1863367)")); + rb_define_const(mCore, "SVN_VER_REVISION", SWIG_From_int((int)(1867053))); + rb_define_const(mCore, "SVN_VER_NUM", SWIG_FromCharPtr("1.13.0")); + rb_define_const(mCore, "SVN_VER_NUMBER", SWIG_FromCharPtr("1.13.0")); + rb_define_const(mCore, "SVN_VERSION", SWIG_FromCharPtr("1.13.0 (r1867053)")); SwigClassSvn_version_t.klass = rb_define_class_under(mCore, "Svn_version_t", rb_cObject); SWIG_TypeClientData(SWIGTYPE_p_svn_version_t, (void *) &SwigClassSvn_version_t); @@ -45583,10 +46973,50 @@ SWIGEXPORT void Init_core(void) { rb_define_const(mCore, "SVN_PROP_TXN_CLIENT_COMPAT_VERSION", SWIG_FromCharPtr("svn:txn-client-compat-version")); rb_define_const(mCore, "SVN_PROP_TXN_USER_AGENT", SWIG_FromCharPtr("svn:txn-user-agent")); rb_define_const(mCore, "SVN_PROP_REVISION_PREFIX", SWIG_FromCharPtr("svn:revision-")); + rb_define_const(mCore, "Svn_opt_revision_unspecified", SWIG_From_int((int)(svn_opt_revision_unspecified))); + rb_define_const(mCore, "Svn_opt_revision_number", SWIG_From_int((int)(svn_opt_revision_number))); + rb_define_const(mCore, "Svn_opt_revision_date", SWIG_From_int((int)(svn_opt_revision_date))); + rb_define_const(mCore, "Svn_opt_revision_committed", SWIG_From_int((int)(svn_opt_revision_committed))); + rb_define_const(mCore, "Svn_opt_revision_previous", SWIG_From_int((int)(svn_opt_revision_previous))); + rb_define_const(mCore, "Svn_opt_revision_base", SWIG_From_int((int)(svn_opt_revision_base))); + rb_define_const(mCore, "Svn_opt_revision_working", SWIG_From_int((int)(svn_opt_revision_working))); + rb_define_const(mCore, "Svn_opt_revision_head", SWIG_From_int((int)(svn_opt_revision_head))); rb_define_const(mCore, "SVN_OPT_MAX_ALIASES", SWIG_From_int((int)(3))); rb_define_const(mCore, "SVN_OPT_MAX_OPTIONS", SWIG_From_int((int)(50))); + rb_define_const(mCore, "SVN_OPT_MAX_PARAGRAPHS", SWIG_From_int((int)(100))); rb_define_const(mCore, "SVN_OPT_FIRST_LONGOPT_ID", SWIG_From_int((int)(256))); + SwigClassSvn_opt_subcommand_desc3_t.klass = rb_define_class_under(mCore, "Svn_opt_subcommand_desc3_t", rb_cObject); + SWIG_TypeClientData(SWIGTYPE_p_svn_opt_subcommand_desc3_t, (void *) &SwigClassSvn_opt_subcommand_desc3_t); + rb_define_alloc_func(SwigClassSvn_opt_subcommand_desc3_t.klass, _wrap_svn_opt_subcommand_desc3_t_allocate); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t.klass, "initialize", _wrap_new_svn_opt_subcommand_desc3_t, -1); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t.klass, "name=", _wrap_svn_opt_subcommand_desc3_t_name_set, -1); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t.klass, "name", _wrap_svn_opt_subcommand_desc3_t_name_get, -1); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t.klass, "cmd_func=", _wrap_svn_opt_subcommand_desc3_t_cmd_func_set, -1); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t.klass, "cmd_func", _wrap_svn_opt_subcommand_desc3_t_cmd_func_get, -1); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t.klass, "aliases=", _wrap_svn_opt_subcommand_desc3_t_aliases_set, -1); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t.klass, "aliases", _wrap_svn_opt_subcommand_desc3_t_aliases_get, -1); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t.klass, "help=", _wrap_svn_opt_subcommand_desc3_t_help_set, -1); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t.klass, "help", _wrap_svn_opt_subcommand_desc3_t_help_get, -1); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t.klass, "valid_options=", _wrap_svn_opt_subcommand_desc3_t_valid_options_set, -1); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t.klass, "valid_options", _wrap_svn_opt_subcommand_desc3_t_valid_options_get, -1); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t.klass, "desc_overrides", _wrap_svn_opt_subcommand_desc3_t_desc_overrides_get, -1); + SwigClassSvn_opt_subcommand_desc3_t.mark = 0; + SwigClassSvn_opt_subcommand_desc3_t.destroy = (void (*)(void *)) free_svn_opt_subcommand_desc3_t; + SwigClassSvn_opt_subcommand_desc3_t.trackObjects = 0; + + SwigClassSvn_opt_subcommand_desc3_t_desc_overrides.klass = rb_define_class_under(mCore, "Svn_opt_subcommand_desc3_t_desc_overrides", rb_cObject); + SWIG_TypeClientData(SWIGTYPE_p_svn_opt_subcommand_desc3_t_desc_overrides, (void *) &SwigClassSvn_opt_subcommand_desc3_t_desc_overrides); + rb_define_alloc_func(SwigClassSvn_opt_subcommand_desc3_t_desc_overrides.klass, _wrap_svn_opt_subcommand_desc3_t_desc_overrides_allocate); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t_desc_overrides.klass, "initialize", _wrap_new_svn_opt_subcommand_desc3_t_desc_overrides, -1); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t_desc_overrides.klass, "optch=", _wrap_svn_opt_subcommand_desc3_t_desc_overrides_optch_set, -1); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t_desc_overrides.klass, "optch", _wrap_svn_opt_subcommand_desc3_t_desc_overrides_optch_get, -1); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t_desc_overrides.klass, "desc=", _wrap_svn_opt_subcommand_desc3_t_desc_overrides_desc_set, -1); + rb_define_method(SwigClassSvn_opt_subcommand_desc3_t_desc_overrides.klass, "desc", _wrap_svn_opt_subcommand_desc3_t_desc_overrides_desc_get, -1); + SwigClassSvn_opt_subcommand_desc3_t_desc_overrides.mark = 0; + SwigClassSvn_opt_subcommand_desc3_t_desc_overrides.destroy = (void (*)(void *)) free_svn_opt_subcommand_desc3_t_desc_overrides; + SwigClassSvn_opt_subcommand_desc3_t_desc_overrides.trackObjects = 0; + SwigClassSvn_opt_subcommand_desc2_t.klass = rb_define_class_under(mCore, "Svn_opt_subcommand_desc2_t", rb_cObject); SWIG_TypeClientData(SWIGTYPE_p_svn_opt_subcommand_desc2_t, (void *) &SwigClassSvn_opt_subcommand_desc2_t); rb_define_alloc_func(SwigClassSvn_opt_subcommand_desc2_t.klass, _wrap_svn_opt_subcommand_desc2_t_allocate); @@ -45635,26 +47065,23 @@ SWIGEXPORT void Init_core(void) { SwigClassSvn_opt_subcommand_desc_t.mark = 0; SwigClassSvn_opt_subcommand_desc_t.destroy = (void (*)(void *)) free_svn_opt_subcommand_desc_t; SwigClassSvn_opt_subcommand_desc_t.trackObjects = 0; + rb_define_module_function(mCore, "svn_opt_get_canonical_subcommand3", _wrap_svn_opt_get_canonical_subcommand3, -1); rb_define_module_function(mCore, "svn_opt_get_canonical_subcommand2", _wrap_svn_opt_get_canonical_subcommand2, -1); rb_define_module_function(mCore, "svn_opt_get_canonical_subcommand", _wrap_svn_opt_get_canonical_subcommand, -1); + rb_define_module_function(mCore, "svn_opt_get_option_from_code3", _wrap_svn_opt_get_option_from_code3, -1); rb_define_module_function(mCore, "svn_opt_get_option_from_code2", _wrap_svn_opt_get_option_from_code2, -1); rb_define_module_function(mCore, "svn_opt_get_option_from_code", _wrap_svn_opt_get_option_from_code, -1); + rb_define_module_function(mCore, "svn_opt_subcommand_takes_option4", _wrap_svn_opt_subcommand_takes_option4, -1); rb_define_module_function(mCore, "svn_opt_subcommand_takes_option3", _wrap_svn_opt_subcommand_takes_option3, -1); rb_define_module_function(mCore, "svn_opt_subcommand_takes_option2", _wrap_svn_opt_subcommand_takes_option2, -1); rb_define_module_function(mCore, "svn_opt_subcommand_takes_option", _wrap_svn_opt_subcommand_takes_option, -1); + rb_define_module_function(mCore, "svn_opt_print_generic_help3", _wrap_svn_opt_print_generic_help3, -1); rb_define_module_function(mCore, "svn_opt_print_generic_help2", _wrap_svn_opt_print_generic_help2, -1); rb_define_module_function(mCore, "svn_opt_format_option", _wrap_svn_opt_format_option, -1); + rb_define_module_function(mCore, "svn_opt_subcommand_help4", _wrap_svn_opt_subcommand_help4, -1); rb_define_module_function(mCore, "svn_opt_subcommand_help3", _wrap_svn_opt_subcommand_help3, -1); rb_define_module_function(mCore, "svn_opt_subcommand_help2", _wrap_svn_opt_subcommand_help2, -1); rb_define_module_function(mCore, "svn_opt_subcommand_help", _wrap_svn_opt_subcommand_help, -1); - rb_define_const(mCore, "Svn_opt_revision_unspecified", SWIG_From_int((int)(svn_opt_revision_unspecified))); - rb_define_const(mCore, "Svn_opt_revision_number", SWIG_From_int((int)(svn_opt_revision_number))); - rb_define_const(mCore, "Svn_opt_revision_date", SWIG_From_int((int)(svn_opt_revision_date))); - rb_define_const(mCore, "Svn_opt_revision_committed", SWIG_From_int((int)(svn_opt_revision_committed))); - rb_define_const(mCore, "Svn_opt_revision_previous", SWIG_From_int((int)(svn_opt_revision_previous))); - rb_define_const(mCore, "Svn_opt_revision_base", SWIG_From_int((int)(svn_opt_revision_base))); - rb_define_const(mCore, "Svn_opt_revision_working", SWIG_From_int((int)(svn_opt_revision_working))); - rb_define_const(mCore, "Svn_opt_revision_head", SWIG_From_int((int)(svn_opt_revision_head))); SwigClassSvn_opt_revision_value_t.klass = rb_define_class_under(mCore, "Svn_opt_revision_value_t", rb_cObject); SWIG_TypeClientData(SWIGTYPE_p_svn_opt_revision_value_t, (void *) &SwigClassSvn_opt_revision_value_t); @@ -45697,6 +47124,7 @@ SWIGEXPORT void Init_core(void) { rb_define_module_function(mCore, "svn_opt_parse_revprop", _wrap_svn_opt_parse_revprop, -1); rb_define_module_function(mCore, "svn_opt_push_implicit_dot_target", _wrap_svn_opt_push_implicit_dot_target, -1); rb_define_module_function(mCore, "svn_opt_parse_path", _wrap_svn_opt_parse_path, -1); + rb_define_module_function(mCore, "svn_opt_print_help5", _wrap_svn_opt_print_help5, -1); rb_define_module_function(mCore, "svn_opt_print_help4", _wrap_svn_opt_print_help4, -1); rb_define_module_function(mCore, "svn_opt_print_help3", _wrap_svn_opt_print_help3, -1); rb_define_module_function(mCore, "svn_opt_print_help2", _wrap_svn_opt_print_help2, -1); @@ -46040,8 +47468,8 @@ SWIGEXPORT void Init_core(void) { rb_define_module_function(mCore, "svn_path_resolve_repos_relative_url", _wrap_svn_path_resolve_repos_relative_url, -1); rb_define_module_function(mCore, "svn_path_illegal_path_escape", _wrap_svn_path_illegal_path_escape, -1); rb_define_module_function(mCore, "svn_dirent_internal_style", _wrap_svn_dirent_internal_style, -1); + rb_define_module_function(mCore, "svn_dirent_internal_style_safe", _wrap_svn_dirent_internal_style_safe, -1); rb_define_module_function(mCore, "svn_dirent_local_style", _wrap_svn_dirent_local_style, -1); - rb_define_module_function(mCore, "svn_relpath__internal_style", _wrap_svn_relpath__internal_style, -1); rb_define_module_function(mCore, "svn_dirent_join", _wrap_svn_dirent_join, -1); rb_define_module_function(mCore, "svn_relpath_join", _wrap_svn_relpath_join, -1); rb_define_module_function(mCore, "svn_dirent_basename", _wrap_svn_dirent_basename, -1); @@ -46057,8 +47485,11 @@ SWIGEXPORT void Init_core(void) { rb_define_module_function(mCore, "svn_dirent_is_absolute", _wrap_svn_dirent_is_absolute, -1); rb_define_module_function(mCore, "svn_uri_is_root", _wrap_svn_uri_is_root, -1); rb_define_module_function(mCore, "svn_dirent_canonicalize", _wrap_svn_dirent_canonicalize, -1); + rb_define_module_function(mCore, "svn_dirent_canonicalize_safe", _wrap_svn_dirent_canonicalize_safe, -1); rb_define_module_function(mCore, "svn_relpath_canonicalize", _wrap_svn_relpath_canonicalize, -1); + rb_define_module_function(mCore, "svn_relpath_canonicalize_safe", _wrap_svn_relpath_canonicalize_safe, -1); rb_define_module_function(mCore, "svn_uri_canonicalize", _wrap_svn_uri_canonicalize, -1); + rb_define_module_function(mCore, "svn_uri_canonicalize_safe", _wrap_svn_uri_canonicalize_safe, -1); rb_define_module_function(mCore, "svn_dirent_is_canonical", _wrap_svn_dirent_is_canonical, -1); rb_define_module_function(mCore, "svn_relpath_is_canonical", _wrap_svn_relpath_is_canonical, -1); rb_define_module_function(mCore, "svn_uri_is_canonical", _wrap_svn_uri_is_canonical, -1); diff --git a/subversion/bindings/swig/ruby/svn/util.rb b/subversion/bindings/swig/ruby/svn/util.rb index 8e05367..d409b98 100644 --- a/subversion/bindings/swig/ruby/svn/util.rb +++ b/subversion/bindings/swig/ruby/svn/util.rb @@ -36,8 +36,13 @@ module Svn module Util #:nodoc: module_function def to_ruby_class_name(name) + # Convert to CamelCase with 'X' for a leading/double/trailing underscore. name.to_s.split("_").collect do |x| - "#{x[0,1].upcase}#{x[1..-1].downcase}" + if x.empty? + "X" + else + x.capitalize + end end.join("") end @@ -70,6 +75,8 @@ module Svn target_name = $POSTMATCH when /^SWIG_SVN_/ target_name = $POSTMATCH + when /^Svn_(?:#{target_mod.name.split("::").last.downcase}_)?_(.+)_t$/ + # ignore private types when /^Svn_(?:#{target_mod.name.split("::").last.downcase}_)?(.+)_t$/ target_name = to_ruby_class_name($1) when /^Svn_(?:#{target_mod.name.split("::").last.downcase}_)?/ diff --git a/subversion/bindings/swig/ruby/svn_client.c b/subversion/bindings/swig/ruby/svn_client.c index c96c0f1..9592496 100644 --- a/subversion/bindings/swig/ruby/svn_client.c +++ b/subversion/bindings/swig/ruby/svn_client.c @@ -1826,164 +1826,175 @@ int SWIG_Ruby_arity( VALUE proc, int minimal ) #define SWIGTYPE_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[20] #define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[21] #define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[22] -#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[23] -#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[24] -#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[25] -#define SWIGTYPE_p_f_p_void_p_q_const__char__int swig_types[26] -#define SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void swig_types[27] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[28] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[29] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[30] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[31] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[32] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[33] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[34] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t swig_types[35] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[36] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[37] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t swig_types[38] -#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[39] -#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[40] -#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t swig_types[41] -#define SWIGTYPE_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t swig_types[42] -#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[43] -#define SWIGTYPE_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[44] -#define SWIGTYPE_p_int swig_types[45] -#define SWIGTYPE_p_long swig_types[46] -#define SWIGTYPE_p_p_apr_array_header_t swig_types[47] -#define SWIGTYPE_p_p_apr_hash_t swig_types[48] -#define SWIGTYPE_p_p_char swig_types[49] -#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[50] -#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[51] -#define SWIGTYPE_p_p_svn_client_conflict_t swig_types[52] -#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[53] -#define SWIGTYPE_p_p_svn_commit_info_t swig_types[54] -#define SWIGTYPE_p_p_svn_ra_session_t swig_types[55] -#define SWIGTYPE_p_p_svn_string_t swig_types[56] -#define SWIGTYPE_p_svn_auth_baton_t swig_types[57] -#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[58] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[59] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[60] -#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[61] -#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[62] -#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[63] -#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[64] -#define SWIGTYPE_p_svn_auth_provider_t swig_types[65] -#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[66] -#define SWIGTYPE_p_svn_cache_config_t swig_types[67] -#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[68] -#define SWIGTYPE_p_svn_checksum_kind_t swig_types[69] -#define SWIGTYPE_p_svn_checksum_t swig_types[70] -#define SWIGTYPE_p_svn_client_commit_info_t swig_types[71] -#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[72] -#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[73] -#define SWIGTYPE_p_svn_client_commit_item_t swig_types[74] -#define SWIGTYPE_p_svn_client_conflict_option_id_t swig_types[75] -#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[76] -#define SWIGTYPE_p_svn_client_conflict_t swig_types[77] -#define SWIGTYPE_p_svn_client_copy_source_t swig_types[78] -#define SWIGTYPE_p_svn_client_ctx_t swig_types[79] -#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[80] -#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[81] -#define SWIGTYPE_p_svn_client_info2_t swig_types[82] -#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[83] -#define SWIGTYPE_p_svn_client_shelved_patch_info_t swig_types[84] -#define SWIGTYPE_p_svn_client_status_t swig_types[85] -#define SWIGTYPE_p_svn_commit_info_t swig_types[86] -#define SWIGTYPE_p_svn_config_t swig_types[87] -#define SWIGTYPE_p_svn_delta_editor_t swig_types[88] -#define SWIGTYPE_p_svn_depth_t swig_types[89] -#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[90] -#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[91] -#define SWIGTYPE_p_svn_diff_datasource_e swig_types[92] -#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[93] -#define SWIGTYPE_p_svn_diff_file_options_t swig_types[94] -#define SWIGTYPE_p_svn_diff_fns2_t swig_types[95] -#define SWIGTYPE_p_svn_diff_fns_t swig_types[96] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[97] -#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[98] -#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[99] -#define SWIGTYPE_p_svn_diff_t swig_types[100] -#define SWIGTYPE_p_svn_dirent_t swig_types[101] -#define SWIGTYPE_p_svn_errno_t swig_types[102] -#define SWIGTYPE_p_svn_error_t swig_types[103] -#define SWIGTYPE_p_svn_info_t swig_types[104] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[105] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[106] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[107] -#define SWIGTYPE_p_svn_location_segment_t swig_types[108] -#define SWIGTYPE_p_svn_lock_t swig_types[109] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[110] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[111] -#define SWIGTYPE_p_svn_log_entry_t swig_types[112] -#define SWIGTYPE_p_svn_merge_range_t swig_types[113] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[114] -#define SWIGTYPE_p_svn_node_kind_t swig_types[115] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[116] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[117] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[118] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[119] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[120] -#define SWIGTYPE_p_svn_patch_file_t swig_types[121] -#define SWIGTYPE_p_svn_patch_t swig_types[122] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[123] -#define SWIGTYPE_p_svn_prop_kind swig_types[124] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[125] -#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[126] -#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[127] -#define SWIGTYPE_p_svn_ra_plugin_t swig_types[128] -#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[129] -#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[130] -#define SWIGTYPE_p_svn_ra_reporter_t swig_types[131] -#define SWIGTYPE_p_svn_ra_session_t swig_types[132] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[133] -#define SWIGTYPE_p_svn_stream_t swig_types[134] -#define SWIGTYPE_p_svn_string_t swig_types[135] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[136] -#define SWIGTYPE_p_svn_tristate_t swig_types[137] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[138] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[139] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[140] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[141] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[142] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[143] -#define SWIGTYPE_p_svn_version_extended_t swig_types[144] -#define SWIGTYPE_p_svn_version_t swig_types[145] -#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[146] -#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[147] -#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[148] -#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[149] -#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[150] -#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[151] -#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[152] -#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[153] -#define SWIGTYPE_p_svn_wc_context_t swig_types[154] -#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[155] -#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[156] -#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[157] -#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[158] -#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[159] -#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[160] -#define SWIGTYPE_p_svn_wc_entry_t swig_types[161] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[162] -#define SWIGTYPE_p_svn_wc_external_item_t swig_types[163] -#define SWIGTYPE_p_svn_wc_info_t swig_types[164] -#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[165] -#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[166] -#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[167] -#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[168] -#define SWIGTYPE_p_svn_wc_notify_t swig_types[169] -#define SWIGTYPE_p_svn_wc_operation_t swig_types[170] -#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[171] -#define SWIGTYPE_p_svn_wc_schedule_t swig_types[172] -#define SWIGTYPE_p_svn_wc_status2_t swig_types[173] -#define SWIGTYPE_p_svn_wc_status3_t swig_types[174] -#define SWIGTYPE_p_svn_wc_status_t swig_types[175] -#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[176] -#define SWIGTYPE_p_unsigned_long swig_types[177] -#define SWIGTYPE_p_void swig_types[178] -static swig_type_info *swig_types[180]; -static swig_module_info swig_module = {swig_types, 179, 0, 0, 0, 0}; +#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[23] +#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[24] +#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[25] +#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[26] +#define SWIGTYPE_p_f_p_void_p_q_const__char__int swig_types[27] +#define SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void swig_types[28] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[29] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[30] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[31] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t swig_types[32] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[33] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[34] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[35] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[36] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t swig_types[37] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t swig_types[38] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[39] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[40] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t swig_types[41] +#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[42] +#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[43] +#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t swig_types[44] +#define SWIGTYPE_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t swig_types[45] +#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[46] +#define SWIGTYPE_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[47] +#define SWIGTYPE_p_int swig_types[48] +#define SWIGTYPE_p_long swig_types[49] +#define SWIGTYPE_p_p_apr_array_header_t swig_types[50] +#define SWIGTYPE_p_p_apr_hash_t swig_types[51] +#define SWIGTYPE_p_p_char swig_types[52] +#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[53] +#define SWIGTYPE_p_p_svn_client__shelf_t swig_types[54] +#define SWIGTYPE_p_p_svn_client__shelf_version_t swig_types[55] +#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[56] +#define SWIGTYPE_p_p_svn_client_conflict_t swig_types[57] +#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[58] +#define SWIGTYPE_p_p_svn_commit_info_t swig_types[59] +#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[60] +#define SWIGTYPE_p_p_svn_ra_session_t swig_types[61] +#define SWIGTYPE_p_p_svn_string_t swig_types[62] +#define SWIGTYPE_p_p_void swig_types[63] +#define SWIGTYPE_p_svn_auth_baton_t swig_types[64] +#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[65] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[66] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[67] +#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[68] +#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[69] +#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[70] +#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[71] +#define SWIGTYPE_p_svn_auth_provider_t swig_types[72] +#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[73] +#define SWIGTYPE_p_svn_cache_config_t swig_types[74] +#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[75] +#define SWIGTYPE_p_svn_checksum_kind_t swig_types[76] +#define SWIGTYPE_p_svn_checksum_t swig_types[77] +#define SWIGTYPE_p_svn_client__shelf_info_t swig_types[78] +#define SWIGTYPE_p_svn_client__shelf_t swig_types[79] +#define SWIGTYPE_p_svn_client__shelf_version_t swig_types[80] +#define SWIGTYPE_p_svn_client_commit_info_t swig_types[81] +#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[82] +#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[83] +#define SWIGTYPE_p_svn_client_commit_item_t swig_types[84] +#define SWIGTYPE_p_svn_client_conflict_option_id_t swig_types[85] +#define SWIGTYPE_p_svn_client_conflict_option_t swig_types[86] +#define SWIGTYPE_p_svn_client_conflict_t swig_types[87] +#define SWIGTYPE_p_svn_client_copy_source_t swig_types[88] +#define SWIGTYPE_p_svn_client_ctx_t swig_types[89] +#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[90] +#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[91] +#define SWIGTYPE_p_svn_client_info2_t swig_types[92] +#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[93] +#define SWIGTYPE_p_svn_client_status_t swig_types[94] +#define SWIGTYPE_p_svn_commit_info_t swig_types[95] +#define SWIGTYPE_p_svn_config_t swig_types[96] +#define SWIGTYPE_p_svn_delta_editor_t swig_types[97] +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[98] +#define SWIGTYPE_p_svn_depth_t swig_types[99] +#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[100] +#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[101] +#define SWIGTYPE_p_svn_diff_datasource_e swig_types[102] +#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[103] +#define SWIGTYPE_p_svn_diff_file_options_t swig_types[104] +#define SWIGTYPE_p_svn_diff_fns2_t swig_types[105] +#define SWIGTYPE_p_svn_diff_fns_t swig_types[106] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[107] +#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[108] +#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[109] +#define SWIGTYPE_p_svn_diff_t swig_types[110] +#define SWIGTYPE_p_svn_dirent_t swig_types[111] +#define SWIGTYPE_p_svn_errno_t swig_types[112] +#define SWIGTYPE_p_svn_error_t swig_types[113] +#define SWIGTYPE_p_svn_info_t swig_types[114] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[115] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[116] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[117] +#define SWIGTYPE_p_svn_location_segment_t swig_types[118] +#define SWIGTYPE_p_svn_lock_t swig_types[119] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[120] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[121] +#define SWIGTYPE_p_svn_log_entry_t swig_types[122] +#define SWIGTYPE_p_svn_merge_range_t swig_types[123] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[124] +#define SWIGTYPE_p_svn_node_kind_t swig_types[125] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[126] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[127] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[128] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[129] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[130] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[131] +#define SWIGTYPE_p_svn_patch_file_t swig_types[132] +#define SWIGTYPE_p_svn_patch_t swig_types[133] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[134] +#define SWIGTYPE_p_svn_prop_kind swig_types[135] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[136] +#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[137] +#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[138] +#define SWIGTYPE_p_svn_ra_plugin_t swig_types[139] +#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[140] +#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[141] +#define SWIGTYPE_p_svn_ra_reporter_t swig_types[142] +#define SWIGTYPE_p_svn_ra_session_t swig_types[143] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[144] +#define SWIGTYPE_p_svn_stream_t swig_types[145] +#define SWIGTYPE_p_svn_string_t swig_types[146] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[147] +#define SWIGTYPE_p_svn_tristate_t swig_types[148] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[149] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[150] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[151] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[152] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[153] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[154] +#define SWIGTYPE_p_svn_version_extended_t swig_types[155] +#define SWIGTYPE_p_svn_version_t swig_types[156] +#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[157] +#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[158] +#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[159] +#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[160] +#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[161] +#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[162] +#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[163] +#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[164] +#define SWIGTYPE_p_svn_wc_context_t swig_types[165] +#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[166] +#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[167] +#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[168] +#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[169] +#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[170] +#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[171] +#define SWIGTYPE_p_svn_wc_entry_t swig_types[172] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[173] +#define SWIGTYPE_p_svn_wc_external_item_t swig_types[174] +#define SWIGTYPE_p_svn_wc_info_t swig_types[175] +#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[176] +#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[177] +#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[178] +#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[179] +#define SWIGTYPE_p_svn_wc_notify_t swig_types[180] +#define SWIGTYPE_p_svn_wc_operation_t swig_types[181] +#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[182] +#define SWIGTYPE_p_svn_wc_schedule_t swig_types[183] +#define SWIGTYPE_p_svn_wc_status2_t swig_types[184] +#define SWIGTYPE_p_svn_wc_status3_t swig_types[185] +#define SWIGTYPE_p_svn_wc_status_t swig_types[186] +#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[187] +#define SWIGTYPE_p_unsigned_long swig_types[188] +#define SWIGTYPE_p_void swig_types[189] +static swig_type_info *swig_types[191]; +static swig_module_info swig_module = {swig_types, 190, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2071,7 +2082,7 @@ SWIG_ruby_failed(void) } -/*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args) { VALUE obj = args[0]; @@ -2176,7 +2187,7 @@ SWIG_From_int (int value) } -/*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args) { VALUE obj = args[0]; @@ -2317,6 +2328,11 @@ static svn_error_t * svn_client_invoke_get_commit_log( return _obj(log_msg, tmp_file, commit_items, baton, pool); } +static svn_error_t * svn_client_invoke_blame_receiver4( + svn_client_blame_receiver4_t _obj, void *baton, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, const svn_string_t *line, svn_boolean_t local_change, apr_pool_t *pool) { + return _obj(baton, line_no, revision, rev_props, merged_revision, merged_rev_props, merged_path, line, local_change, pool); +} + static svn_error_t * svn_client_invoke_blame_receiver3( svn_client_blame_receiver3_t _obj, void *baton, svn_revnum_t start_revnum, svn_revnum_t end_revnum, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, const char *line, svn_boolean_t local_change, apr_pool_t *pool) { return _obj(baton, start_revnum, end_revnum, line_no, revision, rev_props, merged_revision, merged_rev_props, merged_path, line, local_change, pool); @@ -2337,6 +2353,11 @@ static svn_error_t * svn_client_invoke_diff_summarize_func( return _obj(diff, baton, pool); } +static svn_error_t * svn_client_invoke__layout_func( + svn_client__layout_func_t _obj, void *layout_baton, const char *local_abspath, const char *repos_root_url, svn_boolean_t not_present, svn_boolean_t url_changed, const char *url, svn_boolean_t revision_changed, svn_revnum_t revision, svn_boolean_t depth_changed, svn_depth_t depth, apr_pool_t *scratch_pool) { + return _obj(layout_baton, local_abspath, repos_root_url, not_present, url_changed, url, revision_changed, revision, depth_changed, depth, scratch_pool); +} + static svn_error_t * svn_client_invoke_import_filter_func( svn_client_import_filter_func_t _obj, void *baton, svn_boolean_t *filtered, const char *local_abspath, const svn_io_dirent2_t *dirent, apr_pool_t *scratch_pool) { return _obj(baton, filtered, local_abspath, dirent, scratch_pool); @@ -8400,6 +8421,91 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_client__layout_list(int argc, VALUE *argv, VALUE self) { + char *arg1 = (char *) 0 ; + svn_client__layout_func_t arg2 = (svn_client__layout_func_t) 0 ; + void *arg3 = (void *) 0 ; + svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + int res3 ; + void *argp4 = 0 ; + int res4 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5); + _global_pool = arg5; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 4) || (argc > 5)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail; + } + res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_client__layout_list", 1, argv[0] )); + } + arg1 = (char *)(buf1); + { + int res = SWIG_ConvertFunctionPtr(argv[1], (void**)(&arg2), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_client__layout_func_t","svn_client__layout_list", 2, argv[1] )); + } + } + res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","svn_client__layout_list", 3, argv[2] )); + } + res4 = SWIG_ConvertPtr(argv[3], &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client__layout_list", 4, argv[3] )); + } + arg4 = (svn_client_ctx_t *)(argp4); + if (argc > 4) { + + } + { + result = (svn_error_t *)svn_client__layout_list((char const *)arg1,arg2,arg3,arg4,arg5); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_client_add5(int argc, VALUE *argv, VALUE self) { char *arg1 = (char *) 0 ; @@ -13955,31 +14061,37 @@ fail: SWIGINTERN VALUE -_wrap_svn_client_blame5(int argc, VALUE *argv, VALUE self) { - char *arg1 = (char *) 0 ; - svn_opt_revision_t *arg2 = (svn_opt_revision_t *) 0 ; - svn_opt_revision_t *arg3 = (svn_opt_revision_t *) 0 ; +_wrap_svn_client_blame6(int argc, VALUE *argv, VALUE self) { + svn_revnum_t *arg1 = (svn_revnum_t *) 0 ; + svn_revnum_t *arg2 = (svn_revnum_t *) 0 ; + char *arg3 = (char *) 0 ; svn_opt_revision_t *arg4 = (svn_opt_revision_t *) 0 ; - svn_diff_file_options_t *arg5 = (svn_diff_file_options_t *) 0 ; - svn_boolean_t arg6 ; - svn_boolean_t arg7 ; - svn_client_blame_receiver3_t arg8 = (svn_client_blame_receiver3_t) 0 ; - void *arg9 = (void *) 0 ; - svn_client_ctx_t *arg10 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg11 = (apr_pool_t *) 0 ; + svn_opt_revision_t *arg5 = (svn_opt_revision_t *) 0 ; + svn_opt_revision_t *arg6 = (svn_opt_revision_t *) 0 ; + svn_diff_file_options_t *arg7 = (svn_diff_file_options_t *) 0 ; + svn_boolean_t arg8 ; + svn_boolean_t arg9 ; + svn_client_blame_receiver4_t arg10 = (svn_client_blame_receiver4_t) 0 ; + void *arg11 = (void *) 0 ; + svn_client_ctx_t *arg12 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg13 = (apr_pool_t *) 0 ; VALUE _global_svn_swig_rb_pool ; apr_pool_t *_global_pool ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; - svn_opt_revision_t rev2 ; - svn_opt_revision_t rev3 ; + svn_revnum_t temp1 ; + int res1 = SWIG_TMPOBJ ; + svn_revnum_t temp2 ; + int res2 = SWIG_TMPOBJ ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; svn_opt_revision_t rev4 ; - void *argp5 = 0 ; - int res5 = 0 ; - int res9 ; - void *argp10 = 0 ; - int res10 = 0 ; + svn_opt_revision_t rev5 ; + svn_opt_revision_t rev6 ; + void *argp7 = 0 ; + int res7 = 0 ; + int res11 ; + void *argp12 = 0 ; + int res12 = 0 ; svn_error_t *result = 0 ; VALUE vresult = Qnil; @@ -13990,64 +14102,66 @@ _wrap_svn_client_blame5(int argc, VALUE *argv, VALUE self) { svn_swig_rb_adjust_arg_for_client_ctx_and_pool(&adjusted_argc, &adjusted_argv); svn_swig_rb_get_pool(adjusted_argc, adjusted_argv, self, - &_global_svn_swig_rb_pool, &arg11); - _global_pool = arg11; + &_global_svn_swig_rb_pool, &arg13); + _global_pool = arg13; svn_swig_rb_push_pool(_global_svn_swig_rb_pool); } + arg1 = &temp1; + arg2 = &temp2; if ((argc < 9) || (argc > 11)) { rb_raise(rb_eArgError, "wrong # of arguments(%d for 9)",argc); SWIG_fail; } - res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_client_blame5", 1, argv[0] )); + res3 = SWIG_AsCharPtrAndSize(argv[0], &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_client_blame6", 3, argv[0] )); } - arg1 = (char *)(buf1); + arg3 = (char *)(buf3); { - arg2 = &rev2; - svn_swig_rb_set_revision(&rev2, argv[1]); + arg4 = &rev4; + svn_swig_rb_set_revision(&rev4, argv[1]); } { - arg3 = &rev3; - svn_swig_rb_set_revision(&rev3, argv[2]); + arg5 = &rev5; + svn_swig_rb_set_revision(&rev5, argv[2]); } { - arg4 = &rev4; - svn_swig_rb_set_revision(&rev4, argv[3]); + arg6 = &rev6; + svn_swig_rb_set_revision(&rev6, argv[3]); } - res5 = SWIG_ConvertPtr(argv[4], &argp5,SWIGTYPE_p_svn_diff_file_options_t, 0 | 0 ); - if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "svn_diff_file_options_t const *","svn_client_blame5", 5, argv[4] )); + res7 = SWIG_ConvertPtr(argv[4], &argp7,SWIGTYPE_p_svn_diff_file_options_t, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "svn_diff_file_options_t const *","svn_client_blame6", 7, argv[4] )); } - arg5 = (svn_diff_file_options_t *)(argp5); - arg6 = RTEST(argv[5]); - arg7 = RTEST(argv[6]); + arg7 = (svn_diff_file_options_t *)(argp7); + arg8 = RTEST(argv[5]); + arg9 = RTEST(argv[6]); { - int res = SWIG_ConvertFunctionPtr(argv[7], (void**)(&arg8), SWIGTYPE_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t); + int res = SWIG_ConvertFunctionPtr(argv[7], (void**)(&arg10), SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t); if (!SWIG_IsOK(res)) { - SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_client_blame_receiver3_t","svn_client_blame5", 8, argv[7] )); + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_client_blame_receiver4_t","svn_client_blame6", 10, argv[7] )); } } - res9 = SWIG_ConvertPtr(argv[8],SWIG_as_voidptrptr(&arg9), 0, 0); - if (!SWIG_IsOK(res9)) { - SWIG_exception_fail(SWIG_ArgError(res9), Ruby_Format_TypeError( "", "void *","svn_client_blame5", 9, argv[8] )); + res11 = SWIG_ConvertPtr(argv[8],SWIG_as_voidptrptr(&arg11), 0, 0); + if (!SWIG_IsOK(res11)) { + SWIG_exception_fail(SWIG_ArgError(res11), Ruby_Format_TypeError( "", "void *","svn_client_blame6", 11, argv[8] )); } if (argc > 9) { - res10 = SWIG_ConvertPtr(argv[9], &argp10,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res10)) { - SWIG_exception_fail(SWIG_ArgError(res10), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_blame5", 10, argv[9] )); + res12 = SWIG_ConvertPtr(argv[9], &argp12,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res12)) { + SWIG_exception_fail(SWIG_ArgError(res12), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_blame6", 12, argv[9] )); } - arg10 = (svn_client_ctx_t *)(argp10); + arg12 = (svn_client_ctx_t *)(argp12); } if (argc > 10) { } { - if (!arg2) { + if (!arg4) { SWIG_exception(SWIG_ValueError,"Received a NULL pointer."); } } { - result = (svn_error_t *)svn_client_blame5((char const *)arg1,(struct svn_opt_revision_t const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_diff_file_options_t const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11); + result = (svn_error_t *)svn_client_blame6(arg1,arg2,(char const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_opt_revision_t const *)arg5,(struct svn_opt_revision_t const *)arg6,(struct svn_diff_file_options_t const *)arg7,arg8,arg9,arg10,arg11,arg12,arg13); @@ -14060,7 +14174,19 @@ _wrap_svn_client_blame5(int argc, VALUE *argv, VALUE self) { } vresult = Qnil; } - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + if (SWIG_IsTmpObj(res1)) { + vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_long((*arg1))); + } else { + int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_long, new_flags)); + } + if (SWIG_IsTmpObj(res2)) { + vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_long((*arg2))); + } else { + int new_flags = SWIG_IsNewObj(res2) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_long, new_flags)); + } + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -14070,7 +14196,7 @@ _wrap_svn_client_blame5(int argc, VALUE *argv, VALUE self) { } return vresult; fail: - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -14083,7 +14209,7 @@ fail: SWIGINTERN VALUE -_wrap_svn_client_blame4(int argc, VALUE *argv, VALUE self) { +_wrap_svn_client_blame5(int argc, VALUE *argv, VALUE self) { char *arg1 = (char *) 0 ; svn_opt_revision_t *arg2 = (svn_opt_revision_t *) 0 ; svn_opt_revision_t *arg3 = (svn_opt_revision_t *) 0 ; @@ -14091,7 +14217,7 @@ _wrap_svn_client_blame4(int argc, VALUE *argv, VALUE self) { svn_diff_file_options_t *arg5 = (svn_diff_file_options_t *) 0 ; svn_boolean_t arg6 ; svn_boolean_t arg7 ; - svn_client_blame_receiver2_t arg8 = (svn_client_blame_receiver2_t) 0 ; + svn_client_blame_receiver3_t arg8 = (svn_client_blame_receiver3_t) 0 ; void *arg9 = (void *) 0 ; svn_client_ctx_t *arg10 = (svn_client_ctx_t *) 0 ; apr_pool_t *arg11 = (apr_pool_t *) 0 ; @@ -14127,7 +14253,7 @@ _wrap_svn_client_blame4(int argc, VALUE *argv, VALUE self) { } res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_client_blame4", 1, argv[0] )); + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_client_blame5", 1, argv[0] )); } arg1 = (char *)(buf1); { @@ -14144,25 +14270,25 @@ _wrap_svn_client_blame4(int argc, VALUE *argv, VALUE self) { } res5 = SWIG_ConvertPtr(argv[4], &argp5,SWIGTYPE_p_svn_diff_file_options_t, 0 | 0 ); if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "svn_diff_file_options_t const *","svn_client_blame4", 5, argv[4] )); + SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "svn_diff_file_options_t const *","svn_client_blame5", 5, argv[4] )); } arg5 = (svn_diff_file_options_t *)(argp5); arg6 = RTEST(argv[5]); arg7 = RTEST(argv[6]); { - int res = SWIG_ConvertFunctionPtr(argv[7], (void**)(&arg8), SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t); + int res = SWIG_ConvertFunctionPtr(argv[7], (void**)(&arg8), SWIGTYPE_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t); if (!SWIG_IsOK(res)) { - SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_client_blame_receiver2_t","svn_client_blame4", 8, argv[7] )); + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_client_blame_receiver3_t","svn_client_blame5", 8, argv[7] )); } } res9 = SWIG_ConvertPtr(argv[8],SWIG_as_voidptrptr(&arg9), 0, 0); if (!SWIG_IsOK(res9)) { - SWIG_exception_fail(SWIG_ArgError(res9), Ruby_Format_TypeError( "", "void *","svn_client_blame4", 9, argv[8] )); + SWIG_exception_fail(SWIG_ArgError(res9), Ruby_Format_TypeError( "", "void *","svn_client_blame5", 9, argv[8] )); } if (argc > 9) { res10 = SWIG_ConvertPtr(argv[9], &argp10,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); if (!SWIG_IsOK(res10)) { - SWIG_exception_fail(SWIG_ArgError(res10), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_blame4", 10, argv[9] )); + SWIG_exception_fail(SWIG_ArgError(res10), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_blame5", 10, argv[9] )); } arg10 = (svn_client_ctx_t *)(argp10); } @@ -14175,7 +14301,7 @@ _wrap_svn_client_blame4(int argc, VALUE *argv, VALUE self) { } } { - result = (svn_error_t *)svn_client_blame4((char const *)arg1,(struct svn_opt_revision_t const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_diff_file_options_t const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11); + result = (svn_error_t *)svn_client_blame5((char const *)arg1,(struct svn_opt_revision_t const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_diff_file_options_t const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11); @@ -14211,17 +14337,18 @@ fail: SWIGINTERN VALUE -_wrap_svn_client_blame3(int argc, VALUE *argv, VALUE self) { +_wrap_svn_client_blame4(int argc, VALUE *argv, VALUE self) { char *arg1 = (char *) 0 ; svn_opt_revision_t *arg2 = (svn_opt_revision_t *) 0 ; svn_opt_revision_t *arg3 = (svn_opt_revision_t *) 0 ; svn_opt_revision_t *arg4 = (svn_opt_revision_t *) 0 ; svn_diff_file_options_t *arg5 = (svn_diff_file_options_t *) 0 ; svn_boolean_t arg6 ; - svn_client_blame_receiver_t arg7 = (svn_client_blame_receiver_t) 0 ; - void *arg8 = (void *) 0 ; - svn_client_ctx_t *arg9 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg10 = (apr_pool_t *) 0 ; + svn_boolean_t arg7 ; + svn_client_blame_receiver2_t arg8 = (svn_client_blame_receiver2_t) 0 ; + void *arg9 = (void *) 0 ; + svn_client_ctx_t *arg10 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg11 = (apr_pool_t *) 0 ; VALUE _global_svn_swig_rb_pool ; apr_pool_t *_global_pool ; int res1 ; @@ -14232,8 +14359,9 @@ _wrap_svn_client_blame3(int argc, VALUE *argv, VALUE self) { svn_opt_revision_t rev4 ; void *argp5 = 0 ; int res5 = 0 ; - void *argp9 = 0 ; - int res9 = 0 ; + int res9 ; + void *argp10 = 0 ; + int res10 = 0 ; svn_error_t *result = 0 ; VALUE vresult = Qnil; @@ -14244,16 +14372,16 @@ _wrap_svn_client_blame3(int argc, VALUE *argv, VALUE self) { svn_swig_rb_adjust_arg_for_client_ctx_and_pool(&adjusted_argc, &adjusted_argv); svn_swig_rb_get_pool(adjusted_argc, adjusted_argv, self, - &_global_svn_swig_rb_pool, &arg10); - _global_pool = arg10; + &_global_svn_swig_rb_pool, &arg11); + _global_pool = arg11; svn_swig_rb_push_pool(_global_svn_swig_rb_pool); } - if ((argc < 7) || (argc > 9)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 7)",argc); SWIG_fail; + if ((argc < 9) || (argc > 11)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 9)",argc); SWIG_fail; } res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_client_blame3", 1, argv[0] )); + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_client_blame4", 1, argv[0] )); } arg1 = (char *)(buf1); { @@ -14270,22 +14398,29 @@ _wrap_svn_client_blame3(int argc, VALUE *argv, VALUE self) { } res5 = SWIG_ConvertPtr(argv[4], &argp5,SWIGTYPE_p_svn_diff_file_options_t, 0 | 0 ); if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "svn_diff_file_options_t const *","svn_client_blame3", 5, argv[4] )); + SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "svn_diff_file_options_t const *","svn_client_blame4", 5, argv[4] )); } arg5 = (svn_diff_file_options_t *)(argp5); arg6 = RTEST(argv[5]); + arg7 = RTEST(argv[6]); { - arg7 = (svn_client_blame_receiver_t) svn_swig_rb_client_blame_receiver_func; - arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool); + int res = SWIG_ConvertFunctionPtr(argv[7], (void**)(&arg8), SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_client_blame_receiver2_t","svn_client_blame4", 8, argv[7] )); + } } - if (argc > 7) { - res9 = SWIG_ConvertPtr(argv[7], &argp9,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res9)) { - SWIG_exception_fail(SWIG_ArgError(res9), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_blame3", 9, argv[7] )); + res9 = SWIG_ConvertPtr(argv[8],SWIG_as_voidptrptr(&arg9), 0, 0); + if (!SWIG_IsOK(res9)) { + SWIG_exception_fail(SWIG_ArgError(res9), Ruby_Format_TypeError( "", "void *","svn_client_blame4", 9, argv[8] )); + } + if (argc > 9) { + res10 = SWIG_ConvertPtr(argv[9], &argp10,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res10)) { + SWIG_exception_fail(SWIG_ArgError(res10), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_blame4", 10, argv[9] )); } - arg9 = (svn_client_ctx_t *)(argp9); + arg10 = (svn_client_ctx_t *)(argp10); } - if (argc > 8) { + if (argc > 10) { } { @@ -14294,7 +14429,126 @@ _wrap_svn_client_blame3(int argc, VALUE *argv, VALUE self) { } } { - result = (svn_error_t *)svn_client_blame3((char const *)arg1,(struct svn_opt_revision_t const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_diff_file_options_t const *)arg5,arg6,arg7,arg8,arg9,arg10); + result = (svn_error_t *)svn_client_blame4((char const *)arg1,(struct svn_opt_revision_t const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_diff_file_options_t const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client_blame3(int argc, VALUE *argv, VALUE self) { + char *arg1 = (char *) 0 ; + svn_opt_revision_t *arg2 = (svn_opt_revision_t *) 0 ; + svn_opt_revision_t *arg3 = (svn_opt_revision_t *) 0 ; + svn_opt_revision_t *arg4 = (svn_opt_revision_t *) 0 ; + svn_diff_file_options_t *arg5 = (svn_diff_file_options_t *) 0 ; + svn_boolean_t arg6 ; + svn_client_blame_receiver_t arg7 = (svn_client_blame_receiver_t) 0 ; + void *arg8 = (void *) 0 ; + svn_client_ctx_t *arg9 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg10 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + svn_opt_revision_t rev2 ; + svn_opt_revision_t rev3 ; + svn_opt_revision_t rev4 ; + void *argp5 = 0 ; + int res5 = 0 ; + void *argp9 = 0 ; + int res9 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + int adjusted_argc = argc; + VALUE *adjusted_argv = argv; + + svn_swig_rb_adjust_arg_for_client_ctx_and_pool(&adjusted_argc, + &adjusted_argv); + svn_swig_rb_get_pool(adjusted_argc, adjusted_argv, self, + &_global_svn_swig_rb_pool, &arg10); + _global_pool = arg10; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 7) || (argc > 9)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 7)",argc); SWIG_fail; + } + res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_client_blame3", 1, argv[0] )); + } + arg1 = (char *)(buf1); + { + arg2 = &rev2; + svn_swig_rb_set_revision(&rev2, argv[1]); + } + { + arg3 = &rev3; + svn_swig_rb_set_revision(&rev3, argv[2]); + } + { + arg4 = &rev4; + svn_swig_rb_set_revision(&rev4, argv[3]); + } + res5 = SWIG_ConvertPtr(argv[4], &argp5,SWIGTYPE_p_svn_diff_file_options_t, 0 | 0 ); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "svn_diff_file_options_t const *","svn_client_blame3", 5, argv[4] )); + } + arg5 = (svn_diff_file_options_t *)(argp5); + arg6 = RTEST(argv[5]); + { + arg7 = (svn_client_blame_receiver_t) svn_swig_rb_client_blame_receiver_func; + arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool); + } + if (argc > 7) { + res9 = SWIG_ConvertPtr(argv[7], &argp9,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res9)) { + SWIG_exception_fail(SWIG_ArgError(res9), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_blame3", 9, argv[7] )); + } + arg9 = (svn_client_ctx_t *)(argp9); + } + if (argc > 8) { + + } + { + if (!arg2) { + SWIG_exception(SWIG_ValueError,"Received a NULL pointer."); + } + } + { + result = (svn_error_t *)svn_client_blame3((char const *)arg1,(struct svn_opt_revision_t const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_diff_file_options_t const *)arg5,arg6,arg7,arg8,arg9,arg10); @@ -14536,6 +14790,175 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_client_diff7(int argc, VALUE *argv, VALUE self) { + apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_opt_revision_t *arg3 = (svn_opt_revision_t *) 0 ; + char *arg4 = (char *) 0 ; + svn_opt_revision_t *arg5 = (svn_opt_revision_t *) 0 ; + char *arg6 = (char *) 0 ; + svn_depth_t arg7 ; + svn_boolean_t arg8 ; + svn_boolean_t arg9 ; + svn_boolean_t arg10 ; + svn_boolean_t arg11 ; + svn_boolean_t arg12 ; + svn_boolean_t arg13 ; + svn_boolean_t arg14 ; + svn_boolean_t arg15 ; + svn_boolean_t arg16 ; + char *arg17 = (char *) 0 ; + svn_stream_t *arg18 = (svn_stream_t *) 0 ; + svn_stream_t *arg19 = (svn_stream_t *) 0 ; + apr_array_header_t *arg20 = (apr_array_header_t *) 0 ; + svn_client_ctx_t *arg21 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg22 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + svn_opt_revision_t rev3 ; + int res4 ; + char *buf4 = 0 ; + int alloc4 = 0 ; + svn_opt_revision_t rev5 ; + void *argp21 = 0 ; + int res21 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + int adjusted_argc = argc; + VALUE *adjusted_argv = argv; + + svn_swig_rb_adjust_arg_for_client_ctx_and_pool(&adjusted_argc, + &adjusted_argv); + svn_swig_rb_get_pool(adjusted_argc, adjusted_argv, self, + &_global_svn_swig_rb_pool, &arg22); + _global_pool = arg22; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 20) || (argc > 22)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 20)",argc); SWIG_fail; + } + { + arg1 = svn_swig_rb_strings_to_apr_array(argv[0], _global_pool); + } + res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client_diff7", 2, argv[1] )); + } + arg2 = (char *)(buf2); + { + arg3 = &rev3; + svn_swig_rb_set_revision(&rev3, argv[2]); + } + res4 = SWIG_AsCharPtrAndSize(argv[3], &buf4, NULL, &alloc4); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "char const *","svn_client_diff7", 4, argv[3] )); + } + arg4 = (char *)(buf4); + { + arg5 = &rev5; + svn_swig_rb_set_revision(&rev5, argv[4]); + } + { + if (NIL_P(argv[5])) { + arg6 = NULL; + } else { + arg6 = StringValuePtr(argv[5]); + } + } + { + arg7 = svn_swig_rb_to_depth(argv[6]); + } + arg8 = RTEST(argv[7]); + arg9 = RTEST(argv[8]); + arg10 = RTEST(argv[9]); + arg11 = RTEST(argv[10]); + arg12 = RTEST(argv[11]); + arg13 = RTEST(argv[12]); + arg14 = RTEST(argv[13]); + arg15 = RTEST(argv[14]); + arg16 = RTEST(argv[15]); + { + arg17 = NULL; + + if (NIL_P(argv[16])) { + + } else if (TYPE(argv[16]) == T_FIXNUM) { + arg17 = (char *)NUM2INT(argv[16]); + if (!(arg17 == APR_LOCALE_CHARSET || arg17 == APR_DEFAULT_CHARSET)) { + arg17 = NULL; + } + } else { + arg17 = StringValuePtr(argv[16]); + } + + if (!arg17) { + arg17 = (char *)APR_LOCALE_CHARSET; + } + } + { + arg18 = svn_swig_rb_make_stream(argv[17]); + } + { + arg19 = svn_swig_rb_make_stream(argv[18]); + } + { + arg20 = (NIL_P(argv[19])) ? NULL : + svn_swig_rb_strings_to_apr_array(argv[19], _global_pool); + } + if (argc > 20) { + res21 = SWIG_ConvertPtr(argv[20], &argp21,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res21)) { + SWIG_exception_fail(SWIG_ArgError(res21), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_diff7", 21, argv[20] )); + } + arg21 = (svn_client_ctx_t *)(argp21); + } + if (argc > 21) { + + } + { + result = (svn_error_t *)svn_client_diff7((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(char const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,arg16,(char const *)arg17,arg18,arg19,(apr_array_header_t const *)arg20,arg21,arg22); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + if (alloc4 == SWIG_NEWOBJ) free((char*)buf4); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + if (alloc4 == SWIG_NEWOBJ) free((char*)buf4); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_client_diff6(int argc, VALUE *argv, VALUE self) { apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; @@ -15408,7 +15831,7 @@ fail: SWIGINTERN VALUE -_wrap_svn_client_diff_peg6(int argc, VALUE *argv, VALUE self) { +_wrap_svn_client_diff_peg7(int argc, VALUE *argv, VALUE self) { apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; char *arg2 = (char *) 0 ; svn_opt_revision_t *arg3 = (svn_opt_revision_t *) 0 ; @@ -15424,12 +15847,13 @@ _wrap_svn_client_diff_peg6(int argc, VALUE *argv, VALUE self) { svn_boolean_t arg13 ; svn_boolean_t arg14 ; svn_boolean_t arg15 ; - char *arg16 = (char *) 0 ; - svn_stream_t *arg17 = (svn_stream_t *) 0 ; + svn_boolean_t arg16 ; + char *arg17 = (char *) 0 ; svn_stream_t *arg18 = (svn_stream_t *) 0 ; - apr_array_header_t *arg19 = (apr_array_header_t *) 0 ; - svn_client_ctx_t *arg20 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg21 = (apr_pool_t *) 0 ; + svn_stream_t *arg19 = (svn_stream_t *) 0 ; + apr_array_header_t *arg20 = (apr_array_header_t *) 0 ; + svn_client_ctx_t *arg21 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg22 = (apr_pool_t *) 0 ; VALUE _global_svn_swig_rb_pool ; apr_pool_t *_global_pool ; int res2 ; @@ -15438,8 +15862,8 @@ _wrap_svn_client_diff_peg6(int argc, VALUE *argv, VALUE self) { svn_opt_revision_t rev3 ; svn_opt_revision_t rev4 ; svn_opt_revision_t rev5 ; - void *argp20 = 0 ; - int res20 = 0 ; + void *argp21 = 0 ; + int res21 = 0 ; svn_error_t *result = 0 ; VALUE vresult = Qnil; @@ -15450,19 +15874,187 @@ _wrap_svn_client_diff_peg6(int argc, VALUE *argv, VALUE self) { svn_swig_rb_adjust_arg_for_client_ctx_and_pool(&adjusted_argc, &adjusted_argv); svn_swig_rb_get_pool(adjusted_argc, adjusted_argv, self, - &_global_svn_swig_rb_pool, &arg21); - _global_pool = arg21; + &_global_svn_swig_rb_pool, &arg22); + _global_pool = arg22; svn_swig_rb_push_pool(_global_svn_swig_rb_pool); } - if ((argc < 19) || (argc > 21)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 19)",argc); SWIG_fail; + if ((argc < 20) || (argc > 22)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 20)",argc); SWIG_fail; } { arg1 = svn_swig_rb_strings_to_apr_array(argv[0], _global_pool); } res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client_diff_peg6", 2, argv[1] )); + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client_diff_peg7", 2, argv[1] )); + } + arg2 = (char *)(buf2); + { + arg3 = &rev3; + svn_swig_rb_set_revision(&rev3, argv[2]); + } + { + arg4 = &rev4; + svn_swig_rb_set_revision(&rev4, argv[3]); + } + { + arg5 = &rev5; + svn_swig_rb_set_revision(&rev5, argv[4]); + } + { + if (NIL_P(argv[5])) { + arg6 = NULL; + } else { + arg6 = StringValuePtr(argv[5]); + } + } + { + arg7 = svn_swig_rb_to_depth(argv[6]); + } + arg8 = RTEST(argv[7]); + arg9 = RTEST(argv[8]); + arg10 = RTEST(argv[9]); + arg11 = RTEST(argv[10]); + arg12 = RTEST(argv[11]); + arg13 = RTEST(argv[12]); + arg14 = RTEST(argv[13]); + arg15 = RTEST(argv[14]); + arg16 = RTEST(argv[15]); + { + arg17 = NULL; + + if (NIL_P(argv[16])) { + + } else if (TYPE(argv[16]) == T_FIXNUM) { + arg17 = (char *)NUM2INT(argv[16]); + if (!(arg17 == APR_LOCALE_CHARSET || arg17 == APR_DEFAULT_CHARSET)) { + arg17 = NULL; + } + } else { + arg17 = StringValuePtr(argv[16]); + } + + if (!arg17) { + arg17 = (char *)APR_LOCALE_CHARSET; + } + } + { + arg18 = svn_swig_rb_make_stream(argv[17]); + } + { + arg19 = svn_swig_rb_make_stream(argv[18]); + } + { + arg20 = (NIL_P(argv[19])) ? NULL : + svn_swig_rb_strings_to_apr_array(argv[19], _global_pool); + } + if (argc > 20) { + res21 = SWIG_ConvertPtr(argv[20], &argp21,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res21)) { + SWIG_exception_fail(SWIG_ArgError(res21), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_diff_peg7", 21, argv[20] )); + } + arg21 = (svn_client_ctx_t *)(argp21); + } + if (argc > 21) { + + } + { + if (!arg3) { + SWIG_exception(SWIG_ValueError,"Received a NULL pointer."); + } + } + { + result = (svn_error_t *)svn_client_diff_peg7((apr_array_header_t const *)arg1,(char const *)arg2,(struct svn_opt_revision_t const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_opt_revision_t const *)arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,arg16,(char const *)arg17,arg18,arg19,(apr_array_header_t const *)arg20,arg21,arg22); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client_diff_peg6(int argc, VALUE *argv, VALUE self) { + apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_opt_revision_t *arg3 = (svn_opt_revision_t *) 0 ; + svn_opt_revision_t *arg4 = (svn_opt_revision_t *) 0 ; + svn_opt_revision_t *arg5 = (svn_opt_revision_t *) 0 ; + char *arg6 = (char *) 0 ; + svn_depth_t arg7 ; + svn_boolean_t arg8 ; + svn_boolean_t arg9 ; + svn_boolean_t arg10 ; + svn_boolean_t arg11 ; + svn_boolean_t arg12 ; + svn_boolean_t arg13 ; + svn_boolean_t arg14 ; + svn_boolean_t arg15 ; + char *arg16 = (char *) 0 ; + svn_stream_t *arg17 = (svn_stream_t *) 0 ; + svn_stream_t *arg18 = (svn_stream_t *) 0 ; + apr_array_header_t *arg19 = (apr_array_header_t *) 0 ; + svn_client_ctx_t *arg20 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg21 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + svn_opt_revision_t rev3 ; + svn_opt_revision_t rev4 ; + svn_opt_revision_t rev5 ; + void *argp20 = 0 ; + int res20 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + int adjusted_argc = argc; + VALUE *adjusted_argv = argv; + + svn_swig_rb_adjust_arg_for_client_ctx_and_pool(&adjusted_argc, + &adjusted_argv); + svn_swig_rb_get_pool(adjusted_argc, adjusted_argv, self, + &_global_svn_swig_rb_pool, &arg21); + _global_pool = arg21; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 19) || (argc > 21)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 19)",argc); SWIG_fail; + } + { + arg1 = svn_swig_rb_strings_to_apr_array(argv[0], _global_pool); + } + res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client_diff_peg6", 2, argv[1] )); } arg2 = (char *)(buf2); { @@ -19580,34 +20172,29 @@ fail: SWIGINTERN VALUE -_wrap_svn_client_revert3(int argc, VALUE *argv, VALUE self) { +_wrap_svn_client_revert4(int argc, VALUE *argv, VALUE self) { apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; svn_depth_t arg2 ; apr_array_header_t *arg3 = (apr_array_header_t *) 0 ; svn_boolean_t arg4 ; svn_boolean_t arg5 ; - svn_client_ctx_t *arg6 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg7 = (apr_pool_t *) 0 ; + svn_boolean_t arg6 ; + svn_client_ctx_t *arg7 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg8 = (apr_pool_t *) 0 ; VALUE _global_svn_swig_rb_pool ; apr_pool_t *_global_pool ; - void *argp6 = 0 ; - int res6 = 0 ; + void *argp7 = 0 ; + int res7 = 0 ; svn_error_t *result = 0 ; VALUE vresult = Qnil; { - int adjusted_argc = argc; - VALUE *adjusted_argv = argv; - - svn_swig_rb_adjust_arg_for_client_ctx_and_pool(&adjusted_argc, - &adjusted_argv); - svn_swig_rb_get_pool(adjusted_argc, adjusted_argv, self, - &_global_svn_swig_rb_pool, &arg7); - _global_pool = arg7; + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg8); + _global_pool = arg8; svn_swig_rb_push_pool(_global_svn_swig_rb_pool); } - if ((argc < 5) || (argc > 7)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail; + if ((argc < 7) || (argc > 8)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 7)",argc); SWIG_fail; } { arg1 = svn_swig_rb_strings_to_apr_array(argv[0], _global_pool); @@ -19621,18 +20208,17 @@ _wrap_svn_client_revert3(int argc, VALUE *argv, VALUE self) { } arg4 = RTEST(argv[3]); arg5 = RTEST(argv[4]); - if (argc > 5) { - res6 = SWIG_ConvertPtr(argv[5], &argp6,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res6)) { - SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_revert3", 6, argv[5] )); - } - arg6 = (svn_client_ctx_t *)(argp6); + arg6 = RTEST(argv[5]); + res7 = SWIG_ConvertPtr(argv[6], &argp7,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_revert4", 7, argv[6] )); } - if (argc > 6) { + arg7 = (svn_client_ctx_t *)(argp7); + if (argc > 7) { } { - result = (svn_error_t *)svn_client_revert3((apr_array_header_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5,arg6,arg7); + result = (svn_error_t *)svn_client_revert4((apr_array_header_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5,arg6,arg7,arg8); @@ -19666,16 +20252,18 @@ fail: SWIGINTERN VALUE -_wrap_svn_client_revert2(int argc, VALUE *argv, VALUE self) { +_wrap_svn_client_revert3(int argc, VALUE *argv, VALUE self) { apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; svn_depth_t arg2 ; apr_array_header_t *arg3 = (apr_array_header_t *) 0 ; - svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg5 = (apr_pool_t *) 0 ; + svn_boolean_t arg4 ; + svn_boolean_t arg5 ; + svn_client_ctx_t *arg6 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; VALUE _global_svn_swig_rb_pool ; apr_pool_t *_global_pool ; - void *argp4 = 0 ; - int res4 = 0 ; + void *argp6 = 0 ; + int res6 = 0 ; svn_error_t *result = 0 ; VALUE vresult = Qnil; @@ -19686,12 +20274,12 @@ _wrap_svn_client_revert2(int argc, VALUE *argv, VALUE self) { svn_swig_rb_adjust_arg_for_client_ctx_and_pool(&adjusted_argc, &adjusted_argv); svn_swig_rb_get_pool(adjusted_argc, adjusted_argv, self, - &_global_svn_swig_rb_pool, &arg5); - _global_pool = arg5; + &_global_svn_swig_rb_pool, &arg7); + _global_pool = arg7; svn_swig_rb_push_pool(_global_svn_swig_rb_pool); } - if ((argc < 3) || (argc > 5)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + if ((argc < 5) || (argc > 7)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail; } { arg1 = svn_swig_rb_strings_to_apr_array(argv[0], _global_pool); @@ -19703,18 +20291,20 @@ _wrap_svn_client_revert2(int argc, VALUE *argv, VALUE self) { arg3 = (NIL_P(argv[2])) ? NULL : svn_swig_rb_strings_to_apr_array(argv[2], _global_pool); } - if (argc > 3) { - res4 = SWIG_ConvertPtr(argv[3], &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_revert2", 4, argv[3] )); + arg4 = RTEST(argv[3]); + arg5 = RTEST(argv[4]); + if (argc > 5) { + res6 = SWIG_ConvertPtr(argv[5], &argp6,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res6)) { + SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_revert3", 6, argv[5] )); } - arg4 = (svn_client_ctx_t *)(argp4); + arg6 = (svn_client_ctx_t *)(argp6); } - if (argc > 4) { + if (argc > 6) { } { - result = (svn_error_t *)svn_client_revert2((apr_array_header_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5); + result = (svn_error_t *)svn_client_revert3((apr_array_header_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5,arg6,arg7); @@ -19748,15 +20338,16 @@ fail: SWIGINTERN VALUE -_wrap_svn_client_revert(int argc, VALUE *argv, VALUE self) { +_wrap_svn_client_revert2(int argc, VALUE *argv, VALUE self) { apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; - svn_boolean_t arg2 ; - svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg4 = (apr_pool_t *) 0 ; + svn_depth_t arg2 ; + apr_array_header_t *arg3 = (apr_array_header_t *) 0 ; + svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; VALUE _global_svn_swig_rb_pool ; apr_pool_t *_global_pool ; - void *argp3 = 0 ; - int res3 = 0 ; + void *argp4 = 0 ; + int res4 = 0 ; svn_error_t *result = 0 ; VALUE vresult = Qnil; @@ -19767,29 +20358,110 @@ _wrap_svn_client_revert(int argc, VALUE *argv, VALUE self) { svn_swig_rb_adjust_arg_for_client_ctx_and_pool(&adjusted_argc, &adjusted_argv); svn_swig_rb_get_pool(adjusted_argc, adjusted_argv, self, - &_global_svn_swig_rb_pool, &arg4); - _global_pool = arg4; + &_global_svn_swig_rb_pool, &arg5); + _global_pool = arg5; svn_swig_rb_push_pool(_global_svn_swig_rb_pool); } - if ((argc < 2) || (argc > 4)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + if ((argc < 3) || (argc > 5)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; } { arg1 = svn_swig_rb_strings_to_apr_array(argv[0], _global_pool); } - arg2 = RTEST(argv[1]); - if (argc > 2) { - res3 = SWIG_ConvertPtr(argv[2], &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_revert", 3, argv[2] )); - } - arg3 = (svn_client_ctx_t *)(argp3); + { + arg2 = svn_swig_rb_to_depth(argv[1]); + } + { + arg3 = (NIL_P(argv[2])) ? NULL : + svn_swig_rb_strings_to_apr_array(argv[2], _global_pool); } if (argc > 3) { + res4 = SWIG_ConvertPtr(argv[3], &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_revert2", 4, argv[3] )); + } + arg4 = (svn_client_ctx_t *)(argp4); + } + if (argc > 4) { } { - result = (svn_error_t *)svn_client_revert((apr_array_header_t const *)arg1,arg2,arg3,arg4); + result = (svn_error_t *)svn_client_revert2((apr_array_header_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client_revert(int argc, VALUE *argv, VALUE self) { + apr_array_header_t *arg1 = (apr_array_header_t *) 0 ; + svn_boolean_t arg2 ; + svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp3 = 0 ; + int res3 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + int adjusted_argc = argc; + VALUE *adjusted_argv = argv; + + svn_swig_rb_adjust_arg_for_client_ctx_and_pool(&adjusted_argc, + &adjusted_argv); + svn_swig_rb_get_pool(adjusted_argc, adjusted_argv, self, + &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 2) || (argc > 4)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + } + { + arg1 = svn_swig_rb_strings_to_apr_array(argv[0], _global_pool); + } + arg2 = RTEST(argv[1]); + if (argc > 2) { + res3 = SWIG_ConvertPtr(argv[2], &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_revert", 3, argv[2] )); + } + arg3 = (svn_client_ctx_t *)(argp3); + } + if (argc > 3) { + + } + { + result = (svn_error_t *)svn_client_revert((apr_array_header_t const *)arg1,arg2,arg3,arg4); @@ -19859,6 +20531,102 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(int argc, VALUE *argv, VALUE self) { + apr_array_header_t **arg1 = (apr_array_header_t **) 0 ; + svn_client_conflict_option_t *arg2 = (svn_client_conflict_option_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + apr_array_header_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3); + _global_pool = arg3; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + if ((argc < 1) || (argc > 3)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client_conflict_option_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client_conflict_option_t *","svn_client_conflict_option_get_moved_to_repos_relpath_candidates2", 2, argv[0] )); + } + arg2 = (svn_client_conflict_option_t *)(argp2); + if (argc > 1) { + + } + if (argc > 2) { + + } + { + result = (svn_error_t *)svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(arg1,arg2,arg3,arg4); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_repos_relpath_candidates2 arg 1 (apr_array_header_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_repos_relpath_candidates2 is not implemented yet"); + + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates(int argc, VALUE *argv, VALUE self) { apr_array_header_t **arg1 = (apr_array_header_t **) 0 ; @@ -19955,6 +20723,83 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_client_conflict_option_set_moved_to_repos_relpath2(int argc, VALUE *argv, VALUE self) { + svn_client_conflict_option_t *arg1 = (svn_client_conflict_option_t *) 0 ; + int arg2 ; + svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 3) || (argc > 4)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client_conflict_option_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client_conflict_option_t *","svn_client_conflict_option_set_moved_to_repos_relpath2", 1, argv[0] )); + } + arg1 = (svn_client_conflict_option_t *)(argp1); + ecode2 = SWIG_AsVal_int(argv[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","svn_client_conflict_option_set_moved_to_repos_relpath2", 2, argv[1] )); + } + arg2 = (int)(val2); + res3 = SWIG_ConvertPtr(argv[2], &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_conflict_option_set_moved_to_repos_relpath2", 3, argv[2] )); + } + arg3 = (svn_client_ctx_t *)(argp3); + if (argc > 3) { + + } + { + result = (svn_error_t *)svn_client_conflict_option_set_moved_to_repos_relpath2(arg1,arg2,arg3,arg4); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_client_conflict_option_set_moved_to_repos_relpath(int argc, VALUE *argv, VALUE self) { svn_client_conflict_option_t *arg1 = (svn_client_conflict_option_t *) 0 ; @@ -20032,6 +20877,102 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_client_conflict_option_get_moved_to_abspath_candidates2(int argc, VALUE *argv, VALUE self) { + apr_array_header_t **arg1 = (apr_array_header_t **) 0 ; + svn_client_conflict_option_t *arg2 = (svn_client_conflict_option_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + apr_array_header_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3); + _global_pool = arg3; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + if ((argc < 1) || (argc > 3)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client_conflict_option_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client_conflict_option_t *","svn_client_conflict_option_get_moved_to_abspath_candidates2", 2, argv[0] )); + } + arg2 = (svn_client_conflict_option_t *)(argp2); + if (argc > 1) { + + } + if (argc > 2) { + + } + { + result = (svn_error_t *)svn_client_conflict_option_get_moved_to_abspath_candidates2(arg1,arg2,arg3,arg4); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + /* FIXME: Missing argout typemap: svn_client_conflict_option_get_moved_to_abspath_candidates2 arg 1 (apr_array_header_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client_conflict_option_get_moved_to_abspath_candidates2 is not implemented yet"); + + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_client_conflict_option_get_moved_to_abspath_candidates(int argc, VALUE *argv, VALUE self) { apr_array_header_t **arg1 = (apr_array_header_t **) 0 ; @@ -20128,6 +21069,83 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_client_conflict_option_set_moved_to_abspath2(int argc, VALUE *argv, VALUE self) { + svn_client_conflict_option_t *arg1 = (svn_client_conflict_option_t *) 0 ; + int arg2 ; + svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 3) || (argc > 4)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client_conflict_option_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client_conflict_option_t *","svn_client_conflict_option_set_moved_to_abspath2", 1, argv[0] )); + } + arg1 = (svn_client_conflict_option_t *)(argp1); + ecode2 = SWIG_AsVal_int(argv[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","svn_client_conflict_option_set_moved_to_abspath2", 2, argv[1] )); + } + arg2 = (int)(val2); + res3 = SWIG_ConvertPtr(argv[2], &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_conflict_option_set_moved_to_abspath2", 3, argv[2] )); + } + arg3 = (svn_client_ctx_t *)(argp3); + if (argc > 3) { + + } + { + result = (svn_error_t *)svn_client_conflict_option_set_moved_to_abspath2(arg1,arg2,arg3,arg4); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_client_conflict_option_set_moved_to_abspath(int argc, VALUE *argv, VALUE self) { svn_client_conflict_option_t *arg1 = (svn_client_conflict_option_t *) 0 ; @@ -28571,296 +29589,133 @@ fail: } +static swig_class SwigClassSvn_client__shelf_t; + SWIGINTERN VALUE -_wrap_svn_client_shelve(int argc, VALUE *argv, VALUE self) { - char *arg1 = (char *) 0 ; - apr_array_header_t *arg2 = (apr_array_header_t *) 0 ; - svn_depth_t arg3 ; - apr_array_header_t *arg4 = (apr_array_header_t *) 0 ; - svn_boolean_t arg5 ; - svn_boolean_t arg6 ; - svn_client_ctx_t *arg7 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg8 = (apr_pool_t *) 0 ; - VALUE _global_svn_swig_rb_pool ; - apr_pool_t *_global_pool ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; - void *argp7 = 0 ; - int res7 = 0 ; - svn_error_t *result = 0 ; - VALUE vresult = Qnil; +_wrap_svn_client__shelf_t_name_set(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + char *arg2 = (char *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; - { - int adjusted_argc = argc; - VALUE *adjusted_argv = argv; - - svn_swig_rb_adjust_arg_for_client_ctx_and_pool(&adjusted_argc, - &adjusted_argv); - svn_swig_rb_get_pool(adjusted_argc, adjusted_argv, self, - &_global_svn_swig_rb_pool, &arg8); - _global_pool = arg8; - svn_swig_rb_push_pool(_global_svn_swig_rb_pool); - } - if ((argc < 6) || (argc > 8)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 6)",argc); SWIG_fail; + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; } - res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_client_shelve", 1, argv[0] )); - } - arg1 = (char *)(buf1); - { - arg2 = svn_swig_rb_strings_to_apr_array(argv[1], _global_pool); - } - { - arg3 = svn_swig_rb_to_depth(argv[2]); - } - { - arg4 = (NIL_P(argv[3])) ? NULL : - svn_swig_rb_strings_to_apr_array(argv[3], _global_pool); - } - arg5 = RTEST(argv[4]); - arg6 = RTEST(argv[5]); - if (argc > 6) { - res7 = SWIG_ConvertPtr(argv[6], &argp7,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res7)) { - SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_shelve", 7, argv[6] )); - } - arg7 = (svn_client_ctx_t *)(argp7); - } - if (argc > 7) { - - } - { - result = (svn_error_t *)svn_client_shelve((char const *)arg1,(apr_array_header_t const *)arg2,arg3,(apr_array_header_t const *)arg4,arg5,arg6,arg7,arg8); - - - + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","name", 1, self )); } - { - if (result) { - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); - svn_swig_rb_handle_svn_error(result); - } - vresult = Qnil; + arg1 = (struct svn_client__shelf_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","name", 2, argv[0] )); } - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + arg2 = (char *)(buf2); { - VALUE target; - target = _global_vresult_address == &vresult ? self : vresult; - if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->name) free((char *)arg1->name); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->name = copied; } - return vresult; + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + return Qnil; fail: - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); - { - VALUE target; - target = _global_vresult_address == &vresult ? self : vresult; - if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); - } + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); return Qnil; } SWIGINTERN VALUE -_wrap_svn_client_unshelve(int argc, VALUE *argv, VALUE self) { - char *arg1 = (char *) 0 ; - char *arg2 = (char *) 0 ; - svn_boolean_t arg3 ; - svn_boolean_t arg4 ; - svn_client_ctx_t *arg5 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg6 = (apr_pool_t *) 0 ; - VALUE _global_svn_swig_rb_pool ; - apr_pool_t *_global_pool ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; - void *argp5 = 0 ; - int res5 = 0 ; - svn_error_t *result = 0 ; +_wrap_svn_client__shelf_t_name_get(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + char *result = 0 ; VALUE vresult = Qnil; - { - int adjusted_argc = argc; - VALUE *adjusted_argv = argv; - - svn_swig_rb_adjust_arg_for_client_ctx_and_pool(&adjusted_argc, - &adjusted_argv); - svn_swig_rb_get_pool(adjusted_argc, adjusted_argv, self, - &_global_svn_swig_rb_pool, &arg6); - _global_pool = arg6; - svn_swig_rb_push_pool(_global_svn_swig_rb_pool); - } - if ((argc < 4) || (argc > 6)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail; + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; } - res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_client_unshelve", 1, argv[0] )); - } - arg1 = (char *)(buf1); - res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client_unshelve", 2, argv[1] )); - } - arg2 = (char *)(buf2); - arg3 = RTEST(argv[2]); - arg4 = RTEST(argv[3]); - if (argc > 4) { - res5 = SWIG_ConvertPtr(argv[4], &argp5,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_unshelve", 5, argv[4] )); - } - arg5 = (svn_client_ctx_t *)(argp5); - } - if (argc > 5) { - - } - { - result = (svn_error_t *)svn_client_unshelve((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6); - - - + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","name", 1, self )); } + arg1 = (struct svn_client__shelf_t *)(argp1); + result = (char *) ((arg1)->name); { if (result) { - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); - svn_swig_rb_handle_svn_error(result); + vresult = rb_str_new2(result); + } else { + vresult = Qnil; } - vresult = Qnil; - } - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - { - VALUE target; - target = _global_vresult_address == &vresult ? self : vresult; - if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); } return vresult; fail: - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - { - VALUE target; - target = _global_vresult_address == &vresult ? self : vresult; - if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); - } return Qnil; } SWIGINTERN VALUE -_wrap_svn_client_shelves_delete(int argc, VALUE *argv, VALUE self) { - char *arg1 = (char *) 0 ; - char *arg2 = (char *) 0 ; - svn_boolean_t arg3 ; - svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg5 = (apr_pool_t *) 0 ; - VALUE _global_svn_swig_rb_pool ; - apr_pool_t *_global_pool ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; - void *argp4 = 0 ; - int res4 = 0 ; - svn_error_t *result = 0 ; - VALUE vresult = Qnil; +_wrap_svn_client__shelf_t_max_version_set(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + int arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; - { - int adjusted_argc = argc; - VALUE *adjusted_argv = argv; - - svn_swig_rb_adjust_arg_for_client_ctx_and_pool(&adjusted_argc, - &adjusted_argv); - svn_swig_rb_get_pool(adjusted_argc, adjusted_argv, self, - &_global_svn_swig_rb_pool, &arg5); - _global_pool = arg5; - svn_swig_rb_push_pool(_global_svn_swig_rb_pool); - } - if ((argc < 3) || (argc > 5)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; } - res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_client_shelves_delete", 1, argv[0] )); - } - arg1 = (char *)(buf1); - res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client_shelves_delete", 2, argv[1] )); - } - arg2 = (char *)(buf2); - arg3 = RTEST(argv[2]); - if (argc > 3) { - res4 = SWIG_ConvertPtr(argv[3], &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_shelves_delete", 4, argv[3] )); - } - arg4 = (svn_client_ctx_t *)(argp4); - } - if (argc > 4) { - + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","max_version", 1, self )); } - { - result = (svn_error_t *)svn_client_shelves_delete((char const *)arg1,(char const *)arg2,arg3,arg4,arg5); - - - - } - { - if (result) { - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); - svn_swig_rb_handle_svn_error(result); - } - vresult = Qnil; + arg1 = (struct svn_client__shelf_t *)(argp1); + ecode2 = SWIG_AsVal_int(argv[0], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","max_version", 2, argv[0] )); + } + arg2 = (int)(val2); + if (arg1) (arg1)->max_version = arg2; + return Qnil; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_t_max_version_get(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int result; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; } - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - { - VALUE target; - target = _global_vresult_address == &vresult ? self : vresult; - if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","max_version", 1, self )); } + arg1 = (struct svn_client__shelf_t *)(argp1); + result = (int) ((arg1)->max_version); + vresult = SWIG_From_int((int)(result)); return vresult; fail: - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - { - VALUE target; - target = _global_vresult_address == &vresult ? self : vresult; - if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); - } return Qnil; } -static swig_class SwigClassSvn_client_shelved_patch_info_t; - SWIGINTERN VALUE -_wrap_svn_client_shelved_patch_info_t_message_set(int argc, VALUE *argv, VALUE self) { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; +_wrap_svn_client__shelf_t_wc_root_abspath_set(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; char *arg2 = (char *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -28871,23 +29726,23 @@ _wrap_svn_client_shelved_patch_info_t_message_set(int argc, VALUE *argv, VALUE s if ((argc < 1) || (argc > 1)) { rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; } - res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client_shelved_patch_info_t *","message", 1, self )); + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","wc_root_abspath", 1, self )); } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); + arg1 = (struct svn_client__shelf_t *)(argp1); res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","message", 2, argv[0] )); + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","wc_root_abspath", 2, argv[0] )); } arg2 = (char *)(buf2); { apr_size_t len = strlen(arg2) + 1; char *copied; - if (arg1->message) free((char *)arg1->message); + if (arg1->wc_root_abspath) free((char *)arg1->wc_root_abspath); copied = malloc(len); memcpy(copied, arg2, len); - arg1->message = copied; + arg1->wc_root_abspath = copied; } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); return Qnil; @@ -28898,8 +29753,8 @@ fail: SWIGINTERN VALUE -_wrap_svn_client_shelved_patch_info_t_message_get(int argc, VALUE *argv, VALUE self) { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; +_wrap_svn_client__shelf_t_wc_root_abspath_get(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; char *result = 0 ; @@ -28908,12 +29763,12 @@ _wrap_svn_client_shelved_patch_info_t_message_get(int argc, VALUE *argv, VALUE s if ((argc < 0) || (argc > 0)) { rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; } - res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client_shelved_patch_info_t *","message", 1, self )); + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","wc_root_abspath", 1, self )); } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); - result = (char *) ((arg1)->message); + arg1 = (struct svn_client__shelf_t *)(argp1); + result = (char *) ((arg1)->wc_root_abspath); { if (result) { vresult = rb_str_new2(result); @@ -28928,8 +29783,8 @@ fail: SWIGINTERN VALUE -_wrap_svn_client_shelved_patch_info_t_patch_path_set(int argc, VALUE *argv, VALUE self) { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; +_wrap_svn_client__shelf_t_shelves_dir_set(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; char *arg2 = (char *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -28940,23 +29795,23 @@ _wrap_svn_client_shelved_patch_info_t_patch_path_set(int argc, VALUE *argv, VALU if ((argc < 1) || (argc > 1)) { rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; } - res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client_shelved_patch_info_t *","patch_path", 1, self )); + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","shelves_dir", 1, self )); } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); + arg1 = (struct svn_client__shelf_t *)(argp1); res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","patch_path", 2, argv[0] )); + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","shelves_dir", 2, argv[0] )); } arg2 = (char *)(buf2); { apr_size_t len = strlen(arg2) + 1; char *copied; - if (arg1->patch_path) free((char *)arg1->patch_path); + if (arg1->shelves_dir) free((char *)arg1->shelves_dir); copied = malloc(len); memcpy(copied, arg2, len); - arg1->patch_path = copied; + arg1->shelves_dir = copied; } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); return Qnil; @@ -28967,8 +29822,8 @@ fail: SWIGINTERN VALUE -_wrap_svn_client_shelved_patch_info_t_patch_path_get(int argc, VALUE *argv, VALUE self) { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; +_wrap_svn_client__shelf_t_shelves_dir_get(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; char *result = 0 ; @@ -28977,12 +29832,12 @@ _wrap_svn_client_shelved_patch_info_t_patch_path_get(int argc, VALUE *argv, VALU if ((argc < 0) || (argc > 0)) { rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; } - res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client_shelved_patch_info_t *","patch_path", 1, self )); + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","shelves_dir", 1, self )); } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); - result = (char *) ((arg1)->patch_path); + arg1 = (struct svn_client__shelf_t *)(argp1); + result = (char *) ((arg1)->shelves_dir); { if (result) { vresult = rb_str_new2(result); @@ -28997,28 +29852,38 @@ fail: SWIGINTERN VALUE -_wrap_svn_client_shelved_patch_info_t_dirent_set(int argc, VALUE *argv, VALUE self) { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; - svn_io_dirent2_t *arg2 = (svn_io_dirent2_t *) 0 ; +_wrap_svn_client__shelf_t_revprops_set(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + apr_hash_t *arg2 = (apr_hash_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; if ((argc < 1) || (argc > 1)) { rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; } - res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client_shelved_patch_info_t *","dirent", 1, self )); + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","revprops", 1, self )); } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); - res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_io_dirent2_t, SWIG_POINTER_DISOWN | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_io_dirent2_t *","dirent", 2, argv[0] )); + arg1 = (struct svn_client__shelf_t *)(argp1); + { + VALUE rb_pool = Qnil; + if (!_global_pool) { + svn_swig_rb_get_pool(argc, argv, self, &rb_pool, &_global_pool); + svn_swig_rb_push_pool(rb_pool); + } + arg2 = svn_swig_rb_hash_to_apr_hash_svn_string(argv[0], _global_pool); + _global_pool = NULL; + if (!NIL_P(rb_pool)) { + if (NIL_P(arg2)) { + svn_swig_rb_destroy_pool(rb_pool); + } else { + svn_swig_rb_set_pool_for_no_swig_type(argv[0], rb_pool); + } + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } } - arg2 = (svn_io_dirent2_t *)(argp2); - if (arg1) (arg1)->dirent = arg2; + if (arg1) (arg1)->revprops = arg2; return Qnil; fail: return Qnil; @@ -29026,23 +29891,25 @@ fail: SWIGINTERN VALUE -_wrap_svn_client_shelved_patch_info_t_dirent_get(int argc, VALUE *argv, VALUE self) { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; +_wrap_svn_client__shelf_t_revprops_get(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - svn_io_dirent2_t *result = 0 ; + apr_hash_t *result = 0 ; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) { rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; } - res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client_shelved_patch_info_t *","dirent", 1, self )); + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","revprops", 1, self )); + } + arg1 = (struct svn_client__shelf_t *)(argp1); + result = (apr_hash_t *) ((arg1)->revprops); + { + vresult = SWIG_Ruby_AppendOutput(vresult, svn_swig_rb_apr_hash_to_hash_svn_string(result)); } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); - result = (svn_io_dirent2_t *) ((arg1)->dirent); - vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_io_dirent2_t, 0 | 0 ); return vresult; fail: return Qnil; @@ -29050,24 +29917,28 @@ fail: SWIGINTERN VALUE -_wrap_svn_client_shelved_patch_info_t_mtime_set(int argc, VALUE *argv, VALUE self) { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; - apr_time_t arg2 ; +_wrap_svn_client__shelf_t_ctx_set(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + svn_client_ctx_t *arg2 = (svn_client_ctx_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; if ((argc < 1) || (argc > 1)) { rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; } - res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client_shelved_patch_info_t *","mtime", 1, self )); + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","ctx", 1, self )); } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); - { - arg2 = (apr_time_t)NUM2LL(argv[0]); + arg1 = (struct svn_client__shelf_t *)(argp1); + res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client_ctx_t, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client_ctx_t *","ctx", 2, argv[0] )); } - if (arg1) (arg1)->mtime = arg2; + arg2 = (svn_client_ctx_t *)(argp2); + if (arg1) (arg1)->ctx = arg2; return Qnil; fail: return Qnil; @@ -29075,25 +29946,93 @@ fail: SWIGINTERN VALUE -_wrap_svn_client_shelved_patch_info_t_mtime_get(int argc, VALUE *argv, VALUE self) { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *) 0 ; +_wrap_svn_client__shelf_t_ctx_get(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - apr_time_t result; + svn_client_ctx_t *result = 0 ; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) { rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; } - res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client_shelved_patch_info_t, 0 | 0 ); + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client_shelved_patch_info_t *","mtime", 1, self )); + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","ctx", 1, self )); } - arg1 = (struct svn_client_shelved_patch_info_t *)(argp1); - result = ((arg1)->mtime); + arg1 = (struct svn_client__shelf_t *)(argp1); + result = (svn_client_ctx_t *) ((arg1)->ctx); + vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_t_pool_set(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + { - vresult = LL2NUM((apr_time_t)(result)); + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg2); + _global_pool = arg2; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 0) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","pool", 1, self )); + } + arg1 = (struct svn_client__shelf_t *)(argp1); + if (argc > 0) { + + } + if (arg1) (arg1)->pool = arg2; + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_t_pool_get(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + apr_pool_t *result = 0 ; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_t *","pool", 1, self )); } + arg1 = (struct svn_client__shelf_t *)(argp1); + result = (apr_pool_t *) ((arg1)->pool); + vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_apr_pool_t, 0 | 0 ); return vresult; fail: return Qnil; @@ -29102,12 +30041,12 @@ fail: SWIGINTERN VALUE #ifdef HAVE_RB_DEFINE_ALLOC_FUNC -_wrap_svn_client_shelved_patch_info_t_allocate(VALUE self) +_wrap_svn_client__shelf_t_allocate(VALUE self) #else -_wrap_svn_client_shelved_patch_info_t_allocate(int argc, VALUE *argv, VALUE self) +_wrap_svn_client__shelf_t_allocate(int argc, VALUE *argv, VALUE self) #endif { - VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_svn_client_shelved_patch_info_t); + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_svn_client__shelf_t); #ifndef HAVE_RB_DEFINE_ALLOC_FUNC rb_obj_call_init(vresult, argc, argv); #endif @@ -29116,14 +30055,14 @@ _wrap_svn_client_shelved_patch_info_t_allocate(int argc, VALUE *argv, VALUE self SWIGINTERN VALUE -_wrap_new_svn_client_shelved_patch_info_t(int argc, VALUE *argv, VALUE self) { - struct svn_client_shelved_patch_info_t *result = 0 ; +_wrap_new_svn_client__shelf_t(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_t *result = 0 ; if ((argc < 0) || (argc > 0)) { rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; } { - result = (struct svn_client_shelved_patch_info_t *)calloc(1, sizeof(struct svn_client_shelved_patch_info_t)); + result = (struct svn_client__shelf_t *)calloc(1, sizeof(struct svn_client__shelf_t)); DATA_PTR(self) = result; @@ -29136,61 +30075,1993 @@ fail: SWIGINTERN void -free_svn_client_shelved_patch_info_t(void *self) { - struct svn_client_shelved_patch_info_t *arg1 = (struct svn_client_shelved_patch_info_t *)self; +free_svn_client__shelf_t(void *self) { + struct svn_client__shelf_t *arg1 = (struct svn_client__shelf_t *)self; free((char *) arg1); } +static swig_class SwigClassSvn_client__shelf_version_t; + SWIGINTERN VALUE -_wrap_svn_client_shelves_list(int argc, VALUE *argv, VALUE self) { - apr_hash_t **arg1 = (apr_hash_t **) 0 ; - char *arg2 = (char *) 0 ; - svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg4 = (apr_pool_t *) 0 ; - apr_pool_t *arg5 = (apr_pool_t *) 0 ; - VALUE _global_svn_swig_rb_pool ; - apr_pool_t *_global_pool ; - apr_hash_t *temp1 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; - svn_error_t *result = 0 ; +_wrap_svn_client__shelf_version_t_shelf_set(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_version_t *","shelf", 1, self )); + } + arg1 = (struct svn_client__shelf_version_t *)(argp1); + res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client__shelf_t, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_t *","shelf", 2, argv[0] )); + } + arg2 = (svn_client__shelf_t *)(argp2); + if (arg1) (arg1)->shelf = arg2; + return Qnil; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_version_t_shelf_get(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + svn_client__shelf_t *result = 0 ; VALUE vresult = Qnil; + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_version_t *","shelf", 1, self )); + } + arg1 = (struct svn_client__shelf_version_t *)(argp1); + result = (svn_client__shelf_t *) ((arg1)->shelf); + vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_version_t_mtime_set(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + apr_time_t arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_version_t *","mtime", 1, self )); + } + arg1 = (struct svn_client__shelf_version_t *)(argp1); { - svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); - _global_pool = arg4; - svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + arg2 = (apr_time_t)NUM2LL(argv[0]); + } + if (arg1) (arg1)->mtime = arg2; + return Qnil; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_version_t_mtime_get(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + apr_time_t result; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_version_t *","mtime", 1, self )); } + arg1 = (struct svn_client__shelf_version_t *)(argp1); + result = ((arg1)->mtime); { - svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5); - _global_pool = arg5; - svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + vresult = LL2NUM((apr_time_t)(result)); } - arg1 = &temp1; - if ((argc < 2) || (argc > 4)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_version_t_files_dir_abspath_set(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + char *arg2 = (char *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_version_t *","files_dir_abspath", 1, self )); + } + arg1 = (struct svn_client__shelf_version_t *)(argp1); res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client_shelves_list", 2, argv[0] )); + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","files_dir_abspath", 2, argv[0] )); } arg2 = (char *)(buf2); - res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_shelves_list", 3, argv[1] )); + { + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->files_dir_abspath) free((char *)arg1->files_dir_abspath); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->files_dir_abspath = copied; } - arg3 = (svn_client_ctx_t *)(argp3); - if (argc > 2) { - + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + return Qnil; +fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_version_t_files_dir_abspath_get(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + char *result = 0 ; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; } - if (argc > 3) { + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_version_t *","files_dir_abspath", 1, self )); + } + arg1 = (struct svn_client__shelf_version_t *)(argp1); + result = (char *) ((arg1)->files_dir_abspath); + { + if (result) { + vresult = rb_str_new2(result); + } else { + vresult = Qnil; + } + } + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_version_t_version_number_set(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + int arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_version_t *","version_number", 1, self )); + } + arg1 = (struct svn_client__shelf_version_t *)(argp1); + ecode2 = SWIG_AsVal_int(argv[0], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","version_number", 2, argv[0] )); + } + arg2 = (int)(val2); + if (arg1) (arg1)->version_number = arg2; + return Qnil; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_version_t_version_number_get(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int result; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_version_t *","version_number", 1, self )); + } + arg1 = (struct svn_client__shelf_version_t *)(argp1); + result = (int) ((arg1)->version_number); + vresult = SWIG_From_int((int)(result)); + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +#ifdef HAVE_RB_DEFINE_ALLOC_FUNC +_wrap_svn_client__shelf_version_t_allocate(VALUE self) +#else +_wrap_svn_client__shelf_version_t_allocate(int argc, VALUE *argv, VALUE self) +#endif +{ + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_svn_client__shelf_version_t); +#ifndef HAVE_RB_DEFINE_ALLOC_FUNC + rb_obj_call_init(vresult, argc, argv); +#endif + return vresult; +} + + +SWIGINTERN VALUE +_wrap_new_svn_client__shelf_version_t(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_version_t *result = 0 ; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + { + result = (struct svn_client__shelf_version_t *)calloc(1, sizeof(struct svn_client__shelf_version_t)); + DATA_PTR(self) = result; + + + + } + return self; +fail: + return Qnil; +} + + +SWIGINTERN void +free_svn_client__shelf_version_t(void *self) { + struct svn_client__shelf_version_t *arg1 = (struct svn_client__shelf_version_t *)self; + free((char *) arg1); +} + +SWIGINTERN VALUE +_wrap_svn_client__shelf_open_or_create(int argc, VALUE *argv, VALUE self) { + svn_client__shelf_t **arg1 = (svn_client__shelf_t **) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + svn_client__shelf_t *temp1 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + void *argp4 = 0 ; + int res4 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5); + _global_pool = arg5; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + if ((argc < 3) || (argc > 4)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + } + res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client__shelf_open_or_create", 2, argv[0] )); + } + arg2 = (char *)(buf2); + res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_client__shelf_open_or_create", 3, argv[1] )); + } + arg3 = (char *)(buf3); + res4 = SWIG_ConvertPtr(argv[2], &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client__shelf_open_or_create", 4, argv[2] )); + } + arg4 = (svn_client_ctx_t *)(argp4); + if (argc > 3) { + + } + { + result = (svn_error_t *)svn_client__shelf_open_or_create(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_open_or_create arg 1 (svn_client__shelf_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_open_or_create is not implemented yet"); + + } + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_open_existing(int argc, VALUE *argv, VALUE self) { + svn_client__shelf_t **arg1 = (svn_client__shelf_t **) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + svn_client__shelf_t *temp1 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + void *argp4 = 0 ; + int res4 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5); + _global_pool = arg5; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + if ((argc < 3) || (argc > 4)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + } + res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client__shelf_open_existing", 2, argv[0] )); + } + arg2 = (char *)(buf2); + res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_client__shelf_open_existing", 3, argv[1] )); + } + arg3 = (char *)(buf3); + res4 = SWIG_ConvertPtr(argv[2], &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client__shelf_open_existing", 4, argv[2] )); + } + arg4 = (svn_client_ctx_t *)(argp4); + if (argc > 3) { + + } + { + result = (svn_error_t *)svn_client__shelf_open_existing(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_open_existing arg 1 (svn_client__shelf_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_open_existing is not implemented yet"); + + } + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_close(int argc, VALUE *argv, VALUE self) { + svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg2); + _global_pool = arg2; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 1) || (argc > 2)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_close", 1, argv[0] )); + } + arg1 = (svn_client__shelf_t *)(argp1); + if (argc > 1) { + + } + { + result = (svn_error_t *)svn_client__shelf_close(arg1,arg2); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_delete(int argc, VALUE *argv, VALUE self) { + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + svn_boolean_t arg3 ; + svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + void *argp4 = 0 ; + int res4 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5); + _global_pool = arg5; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 4) || (argc > 5)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail; + } + res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_client__shelf_delete", 1, argv[0] )); + } + arg1 = (char *)(buf1); + res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client__shelf_delete", 2, argv[1] )); + } + arg2 = (char *)(buf2); + arg3 = RTEST(argv[2]); + res4 = SWIG_ConvertPtr(argv[3], &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client__shelf_delete", 4, argv[3] )); + } + arg4 = (svn_client_ctx_t *)(argp4); + if (argc > 4) { + + } + { + result = (svn_error_t *)svn_client__shelf_delete((char const *)arg1,(char const *)arg2,arg3,arg4,arg5); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_mods_editor(int argc, VALUE *argv, VALUE self) { + svn_delta_editor_t **arg1 = (svn_delta_editor_t **) 0 ; + void **arg2 = (void **) 0 ; + svn_client__shelf_version_t *arg3 = (svn_client__shelf_version_t *) 0 ; + svn_wc_notify_func2_t arg4 = (svn_wc_notify_func2_t) 0 ; + void *arg5 = (void *) 0 ; + svn_client_ctx_t *arg6 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + svn_delta_editor_t *temp1 ; + void *temp2 ; + void *argp3 = 0 ; + int res3 = 0 ; + void *argp6 = 0 ; + int res6 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg7); + _global_pool = arg7; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + arg2 = &temp2; + if ((argc < 3) || (argc > 4)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + } + res3 = SWIG_ConvertPtr(argv[0], &argp3,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_client__shelf_version_t *","svn_client__shelf_mods_editor", 3, argv[0] )); + } + arg3 = (svn_client__shelf_version_t *)(argp3); + { + arg4 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2; + arg5 = (void *)svn_swig_rb_make_baton(argv[1], _global_svn_swig_rb_pool); + } + res6 = SWIG_ConvertPtr(argv[2], &argp6,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + if (!SWIG_IsOK(res6)) { + SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client__shelf_mods_editor", 6, argv[2] )); + } + arg6 = (svn_client_ctx_t *)(argp6); + if (argc > 3) { + + } + { + result = (svn_error_t *)svn_client__shelf_mods_editor((struct svn_delta_editor_t const **)arg1,arg2,arg3,arg4,arg5,arg6,arg7); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t, 0)); + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_mods_editor arg 2 (void **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_mods_editor is not implemented yet"); + + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_save_new_version3(int argc, VALUE *argv, VALUE self) { + svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + apr_array_header_t *arg3 = (apr_array_header_t *) 0 ; + svn_depth_t arg4 ; + apr_array_header_t *arg5 = (apr_array_header_t *) 0 ; + svn_client_status_func_t arg6 = (svn_client_status_func_t) 0 ; + void *arg7 = (void *) 0 ; + svn_client_status_func_t arg8 = (svn_client_status_func_t) 0 ; + void *arg9 = (void *) 0 ; + apr_pool_t *arg10 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + svn_client__shelf_version_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + int res7 ; + int res9 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg10); + _global_pool = arg10; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + if ((argc < 8) || (argc > 9)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 8)",argc); SWIG_fail; + } + res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_save_new_version3", 2, argv[0] )); + } + arg2 = (svn_client__shelf_t *)(argp2); + { + arg3 = svn_swig_rb_strings_to_apr_array(argv[1], _global_pool); + } + { + arg4 = svn_swig_rb_to_depth(argv[2]); + } + { + arg5 = (NIL_P(argv[3])) ? NULL : + svn_swig_rb_strings_to_apr_array(argv[3], _global_pool); + } + { + int res = SWIG_ConvertFunctionPtr(argv[4], (void**)(&arg6), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_client_status_func_t","svn_client__shelf_save_new_version3", 6, argv[4] )); + } + } + res7 = SWIG_ConvertPtr(argv[5],SWIG_as_voidptrptr(&arg7), 0, 0); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "void *","svn_client__shelf_save_new_version3", 7, argv[5] )); + } + { + int res = SWIG_ConvertFunctionPtr(argv[6], (void**)(&arg8), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_client_status_func_t","svn_client__shelf_save_new_version3", 8, argv[6] )); + } + } + res9 = SWIG_ConvertPtr(argv[7],SWIG_as_voidptrptr(&arg9), 0, 0); + if (!SWIG_IsOK(res9)) { + SWIG_exception_fail(SWIG_ArgError(res9), Ruby_Format_TypeError( "", "void *","svn_client__shelf_save_new_version3", 9, argv[7] )); + } + if (argc > 8) { + + } + { + result = (svn_error_t *)svn_client__shelf_save_new_version3(arg1,arg2,(apr_array_header_t const *)arg3,arg4,(apr_array_header_t const *)arg5,arg6,arg7,arg8,arg9,arg10); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_save_new_version3 arg 1 (svn_client__shelf_version_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_save_new_version3 is not implemented yet"); + + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_delete_newer_versions(int argc, VALUE *argv, VALUE self) { + svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ; + svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3); + _global_pool = arg3; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 2) || (argc > 3)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_delete_newer_versions", 1, argv[0] )); + } + arg1 = (svn_client__shelf_t *)(argp1); + res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_version_t *","svn_client__shelf_delete_newer_versions", 2, argv[1] )); + } + arg2 = (svn_client__shelf_version_t *)(argp2); + if (argc > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_delete_newer_versions(arg1,arg2,arg3); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_version_open(int argc, VALUE *argv, VALUE self) { + svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + int arg3 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + apr_pool_t *arg5 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + svn_client__shelf_version_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + int val3 ; + int ecode3 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5); + _global_pool = arg5; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + if ((argc < 2) || (argc > 4)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + } + res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_version_open", 2, argv[0] )); + } + arg2 = (svn_client__shelf_t *)(argp2); + ecode3 = SWIG_AsVal_int(argv[1], &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "int","svn_client__shelf_version_open", 3, argv[1] )); + } + arg3 = (int)(val3); + if (argc > 2) { + + } + if (argc > 3) { + + } + { + result = (svn_error_t *)svn_client__shelf_version_open(arg1,arg2,arg3,arg4,arg5); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_version_open arg 1 (svn_client__shelf_version_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_version_open is not implemented yet"); + + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_get_newest_version(int argc, VALUE *argv, VALUE self) { + svn_client__shelf_version_t **arg1 = (svn_client__shelf_version_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + svn_client__shelf_version_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3); + _global_pool = arg3; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + if ((argc < 1) || (argc > 3)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_get_newest_version", 2, argv[0] )); + } + arg2 = (svn_client__shelf_t *)(argp2); + if (argc > 1) { + + } + if (argc > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_get_newest_version(arg1,arg2,arg3,arg4); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_get_newest_version arg 1 (svn_client__shelf_version_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_newest_version is not implemented yet"); + + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_get_all_versions(int argc, VALUE *argv, VALUE self) { + apr_array_header_t **arg1 = (apr_array_header_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + apr_array_header_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3); + _global_pool = arg3; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + if ((argc < 1) || (argc > 3)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_get_all_versions", 2, argv[0] )); + } + arg2 = (svn_client__shelf_t *)(argp2); + if (argc > 1) { + + } + if (argc > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_get_all_versions(arg1,arg2,arg3,arg4); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_get_all_versions arg 1 (apr_array_header_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_all_versions is not implemented yet"); + + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_apply(int argc, VALUE *argv, VALUE self) { + svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ; + svn_boolean_t arg2 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3); + _global_pool = arg3; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 2) || (argc > 3)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_version_t *","svn_client__shelf_apply", 1, argv[0] )); + } + arg1 = (svn_client__shelf_version_t *)(argp1); + arg2 = RTEST(argv[1]); + if (argc > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_apply(arg1,arg2,arg3); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_test_apply_file(int argc, VALUE *argv, VALUE self) { + svn_boolean_t *arg1 = (svn_boolean_t *) 0 ; + svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_t *) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + svn_boolean_t temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + if ((argc < 2) || (argc > 3)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + } + res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_version_t *","svn_client__shelf_test_apply_file", 2, argv[0] )); + } + arg2 = (svn_client__shelf_version_t *)(argp2); + res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_client__shelf_test_apply_file", 3, argv[1] )); + } + arg3 = (char *)(buf3); + if (argc > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_test_apply_file(arg1,arg2,(char const *)arg3,arg4); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + vresult = SWIG_Ruby_AppendOutput(vresult, *arg1 ? Qtrue : Qfalse); + } + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_unapply(int argc, VALUE *argv, VALUE self) { + svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ; + svn_boolean_t arg2 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3); + _global_pool = arg3; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 2) || (argc > 3)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_version_t *","svn_client__shelf_unapply", 1, argv[0] )); + } + arg1 = (svn_client__shelf_version_t *)(argp1); + arg2 = RTEST(argv[1]); + if (argc > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_unapply(arg1,arg2,arg3); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_replay(int argc, VALUE *argv, VALUE self) { + svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_delta_editor_t *arg3 = (svn_delta_editor_t *) 0 ; + void *arg4 = (void *) 0 ; + svn_wc_notify_func2_t arg5 = (svn_wc_notify_func2_t) 0 ; + void *arg6 = (void *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg7); + _global_pool = arg7; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 4) || (argc > 5)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_version_t *","svn_client__shelf_replay", 1, argv[0] )); + } + arg1 = (svn_client__shelf_version_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client__shelf_replay", 2, argv[1] )); + } + arg2 = (char *)(buf2); + { + if (RTEST(rb_obj_is_kind_of(argv[2], + svn_swig_rb_svn_delta_editor()))) { + arg3 = svn_swig_rb_to_swig_type(argv[2], + "svn_delta_editor_t *", + _global_pool); + arg4 = svn_swig_rb_to_swig_type(rb_funcall(argv[2], rb_intern("baton"), 0), + "void *", _global_pool); + } else { + svn_swig_rb_make_delta_editor(&arg3, &arg4, argv[2], _global_pool); + } + } + { + arg5 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2; + arg6 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool); + } + if (argc > 4) { + + } + { + result = (svn_error_t *)svn_client__shelf_replay(arg1,(char const *)arg2,(struct svn_delta_editor_t const *)arg3,arg4,arg5,arg6,arg7); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_paths_changed(int argc, VALUE *argv, VALUE self) { + apr_hash_t **arg1 = (apr_hash_t **) 0 ; + svn_client__shelf_version_t *arg2 = (svn_client__shelf_version_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + apr_hash_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3); + _global_pool = arg3; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + if ((argc < 1) || (argc > 3)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_version_t *","svn_client__shelf_paths_changed", 2, argv[0] )); + } + arg2 = (svn_client__shelf_version_t *)(argp2); + if (argc > 1) { + + } + if (argc > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_paths_changed(arg1,arg2,arg3,arg4); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + /* FIXME: Missing argout typemap: svn_client__shelf_paths_changed arg 1 (apr_hash_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_client__shelf_paths_changed is not implemented yet"); + + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_revprop_set(int argc, VALUE *argv, VALUE self) { + svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_string_t *arg3 = (svn_string_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + svn_string_t value3 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 3) || (argc > 4)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_revprop_set", 1, argv[0] )); + } + arg1 = (svn_client__shelf_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client__shelf_revprop_set", 2, argv[1] )); + } + arg2 = (char *)(buf2); + { + if (NIL_P(argv[2])) { + arg3 = NULL; + } else { + value3.data = StringValuePtr(argv[2]); + value3.len = RSTRING_LEN(argv[2]); + arg3 = &value3; + } + } + if (argc > 3) { + + } + { + result = (svn_error_t *)svn_client__shelf_revprop_set(arg1,(char const *)arg2,(struct svn_string_t const *)arg3,arg4); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_revprop_set_all(int argc, VALUE *argv, VALUE self) { + svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ; + apr_hash_t *arg2 = (apr_hash_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3); + _global_pool = arg3; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 2) || (argc > 3)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_revprop_set_all", 1, argv[0] )); + } + arg1 = (svn_client__shelf_t *)(argp1); + { + VALUE rb_pool = Qnil; + if (!_global_pool) { + svn_swig_rb_get_pool(argc, argv, self, &rb_pool, &_global_pool); + svn_swig_rb_push_pool(rb_pool); + } + arg2 = svn_swig_rb_hash_to_apr_hash_svn_string(argv[1], _global_pool); + _global_pool = NULL; + if (!NIL_P(rb_pool)) { + if (NIL_P(arg2)) { + svn_swig_rb_destroy_pool(rb_pool); + } else { + svn_swig_rb_set_pool_for_no_swig_type(argv[1], rb_pool); + } + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + } + if (argc > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_revprop_set_all(arg1,arg2,arg3); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_revprop_get(int argc, VALUE *argv, VALUE self) { + svn_string_t **arg1 = (svn_string_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + char *arg3 = (char *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + svn_string_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + if ((argc < 2) || (argc > 3)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + } + res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_revprop_get", 2, argv[0] )); + } + arg2 = (svn_client__shelf_t *)(argp2); + res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_client__shelf_revprop_get", 3, argv[1] )); + } + arg3 = (char *)(buf3); + if (argc > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_revprop_get(arg1,arg2,(char const *)arg3,arg4); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + if (*arg1) { + vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new((*arg1)->data, (*arg1)->len)); + } else { + vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); + } + } + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_revprop_list(int argc, VALUE *argv, VALUE self) { + apr_hash_t **arg1 = (apr_hash_t **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + apr_hash_t *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3); + _global_pool = arg3; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + if ((argc < 1) || (argc > 2)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_revprop_list", 2, argv[0] )); + } + arg2 = (svn_client__shelf_t *)(argp2); + if (argc > 1) { + + } + { + result = (svn_error_t *)svn_client__shelf_revprop_list(arg1,arg2,arg3); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + vresult = SWIG_Ruby_AppendOutput(vresult, svn_swig_rb_apr_hash_to_hash_svn_string(*arg1)); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_set_log_message(int argc, VALUE *argv, VALUE self) { + svn_client__shelf_t *arg1 = (svn_client__shelf_t *) 0 ; + char *arg2 = (char *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3); + _global_pool = arg3; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 2) || (argc > 3)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_set_log_message", 1, argv[0] )); + } + arg1 = (svn_client__shelf_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client__shelf_set_log_message", 2, argv[1] )); + } + arg2 = (char *)(buf2); + if (argc > 2) { + + } + { + result = (svn_error_t *)svn_client__shelf_set_log_message(arg1,(char const *)arg2,arg3); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client__shelf_get_log_message(int argc, VALUE *argv, VALUE self) { + char **arg1 = (char **) 0 ; + svn_client__shelf_t *arg2 = (svn_client__shelf_t *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + char *temp1 ; + void *argp2 = 0 ; + int res2 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3); + _global_pool = arg3; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + if ((argc < 1) || (argc > 2)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client__shelf_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client__shelf_t *","svn_client__shelf_get_log_message", 2, argv[0] )); + } + arg2 = (svn_client__shelf_t *)(argp2); + if (argc > 1) { } { - result = (svn_error_t *)svn_client_shelves_list(arg1,(char const *)arg2,arg3,arg4,arg5); + result = (svn_error_t *)svn_client__shelf_get_log_message(arg1,arg2,arg3); @@ -29204,22 +32075,14 @@ _wrap_svn_client_shelves_list(int argc, VALUE *argv, VALUE self) { vresult = Qnil; } { - /* FIXME: Missing argout typemap: svn_client_shelves_list arg 1 (apr_hash_t **) */ + /* FIXME: Missing argout typemap: svn_client__shelf_get_log_message arg 1 (char **) */ - SWIG_exception(SWIG_ValueError, "svn_client_shelves_list is not implemented yet"); + SWIG_exception(SWIG_ValueError, "svn_client__shelf_get_log_message is not implemented yet"); } - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - { - VALUE target; - target = _global_vresult_address == &vresult ? self : vresult; - if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); - } { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -29229,7 +32092,6 @@ _wrap_svn_client_shelves_list(int argc, VALUE *argv, VALUE self) { } return vresult; fail: - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -29237,154 +32099,154 @@ fail: svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); } + return Qnil; +} + + +static swig_class SwigClassSvn_client__shelf_info_t; + +SWIGINTERN VALUE +_wrap_svn_client__shelf_info_t_mtime_set(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *) 0 ; + apr_time_t arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_info_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_info_t *","mtime", 1, self )); + } + arg1 = (struct svn_client__shelf_info_t *)(argp1); { - VALUE target; - target = _global_vresult_address == &vresult ? self : vresult; - if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + arg2 = (apr_time_t)NUM2LL(argv[0]); } + if (arg1) (arg1)->mtime = arg2; + return Qnil; +fail: return Qnil; } SWIGINTERN VALUE -_wrap_svn_client_shelves_any(int argc, VALUE *argv, VALUE self) { - svn_boolean_t *arg1 = (svn_boolean_t *) 0 ; - char *arg2 = (char *) 0 ; - svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; - apr_pool_t *arg4 = (apr_pool_t *) 0 ; - VALUE _global_svn_swig_rb_pool ; - apr_pool_t *_global_pool ; - svn_boolean_t temp1 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; - svn_error_t *result = 0 ; +_wrap_svn_client__shelf_info_t_mtime_get(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + apr_time_t result; VALUE vresult = Qnil; - { - svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); - _global_pool = arg4; - svn_swig_rb_push_pool(_global_svn_swig_rb_pool); - } - arg1 = &temp1; - if ((argc < 2) || (argc > 3)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; } - res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client_shelves_any", 2, argv[0] )); + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client__shelf_info_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client__shelf_info_t *","mtime", 1, self )); } - arg2 = (char *)(buf2); - res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_shelves_any", 3, argv[1] )); + arg1 = (struct svn_client__shelf_info_t *)(argp1); + result = ((arg1)->mtime); + { + vresult = LL2NUM((apr_time_t)(result)); } - arg3 = (svn_client_ctx_t *)(argp3); - if (argc > 2) { - + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +#ifdef HAVE_RB_DEFINE_ALLOC_FUNC +_wrap_svn_client__shelf_info_t_allocate(VALUE self) +#else +_wrap_svn_client__shelf_info_t_allocate(int argc, VALUE *argv, VALUE self) +#endif +{ + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_svn_client__shelf_info_t); +#ifndef HAVE_RB_DEFINE_ALLOC_FUNC + rb_obj_call_init(vresult, argc, argv); +#endif + return vresult; +} + + +SWIGINTERN VALUE +_wrap_new_svn_client__shelf_info_t(int argc, VALUE *argv, VALUE self) { + struct svn_client__shelf_info_t *result = 0 ; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; } { - result = (svn_error_t *)svn_client_shelves_any(arg1,(char const *)arg2,arg3,arg4); + result = (struct svn_client__shelf_info_t *)calloc(1, sizeof(struct svn_client__shelf_info_t)); + DATA_PTR(self) = result; } - { - if (result) { - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); - svn_swig_rb_handle_svn_error(result); - } - vresult = Qnil; - } - { - vresult = SWIG_Ruby_AppendOutput(vresult, *arg1 ? Qtrue : Qfalse); - } - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - { - VALUE target; - target = _global_vresult_address == &vresult ? self : vresult; - if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); - } - return vresult; + return self; fail: - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - { - VALUE target; - target = _global_vresult_address == &vresult ? self : vresult; - if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); - } return Qnil; } +SWIGINTERN void +free_svn_client__shelf_info_t(void *self) { + struct svn_client__shelf_info_t *arg1 = (struct svn_client__shelf_info_t *)self; + free((char *) arg1); +} + SWIGINTERN VALUE -_wrap_svn_client_shelf_get_paths(int argc, VALUE *argv, VALUE self) { +_wrap_svn_client__shelf_list(int argc, VALUE *argv, VALUE self) { apr_hash_t **arg1 = (apr_hash_t **) 0 ; char *arg2 = (char *) 0 ; - char *arg3 = (char *) 0 ; - svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + svn_client_ctx_t *arg3 = (svn_client_ctx_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; apr_pool_t *arg5 = (apr_pool_t *) 0 ; - apr_pool_t *arg6 = (apr_pool_t *) 0 ; VALUE _global_svn_swig_rb_pool ; apr_pool_t *_global_pool ; apr_hash_t *temp1 ; int res2 ; char *buf2 = 0 ; int alloc2 = 0 ; - int res3 ; - char *buf3 = 0 ; - int alloc3 = 0 ; - void *argp4 = 0 ; - int res4 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; svn_error_t *result = 0 ; VALUE vresult = Qnil; { - svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5); - _global_pool = arg5; + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; svn_swig_rb_push_pool(_global_svn_swig_rb_pool); } { - svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg6); - _global_pool = arg6; + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5); + _global_pool = arg5; svn_swig_rb_push_pool(_global_svn_swig_rb_pool); } arg1 = &temp1; - if ((argc < 3) || (argc > 5)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + if ((argc < 2) || (argc > 4)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; } res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client_shelf_get_paths", 2, argv[0] )); + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client__shelf_list", 2, argv[0] )); } arg2 = (char *)(buf2); - res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3); + res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_client_shelf_get_paths", 3, argv[1] )); + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client__shelf_list", 3, argv[1] )); } - arg3 = (char *)(buf3); - res4 = SWIG_ConvertPtr(argv[2], &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_shelf_get_paths", 4, argv[2] )); - } - arg4 = (svn_client_ctx_t *)(argp4); - if (argc > 3) { + arg3 = (svn_client_ctx_t *)(argp3); + if (argc > 2) { } - if (argc > 4) { + if (argc > 3) { } { - result = (svn_error_t *)svn_client_shelf_get_paths(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6); + result = (svn_error_t *)svn_client__shelf_list(arg1,(char const *)arg2,arg3,arg4,arg5); @@ -29398,16 +32260,15 @@ _wrap_svn_client_shelf_get_paths(int argc, VALUE *argv, VALUE self) { vresult = Qnil; } { - /* FIXME: Missing argout typemap: svn_client_shelf_get_paths arg 1 (apr_hash_t **) */ + /* FIXME: Missing argout typemap: svn_client__shelf_list arg 1 (apr_hash_t **) */ - SWIG_exception(SWIG_ValueError, "svn_client_shelf_get_paths is not implemented yet"); + SWIG_exception(SWIG_ValueError, "svn_client__shelf_list is not implemented yet"); } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -29425,7 +32286,6 @@ _wrap_svn_client_shelf_get_paths(int argc, VALUE *argv, VALUE self) { return vresult; fail: if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -29445,23 +32305,20 @@ fail: SWIGINTERN VALUE -_wrap_svn_client_shelf_has_changes(int argc, VALUE *argv, VALUE self) { - svn_boolean_t *arg1 = (svn_boolean_t *) 0 ; +_wrap_svn_client__shelf_version_status_walk(int argc, VALUE *argv, VALUE self) { + svn_client__shelf_version_t *arg1 = (svn_client__shelf_version_t *) 0 ; char *arg2 = (char *) 0 ; - char *arg3 = (char *) 0 ; - svn_client_ctx_t *arg4 = (svn_client_ctx_t *) 0 ; + svn_wc_status_func4_t arg3 = (svn_wc_status_func4_t) 0 ; + void *arg4 = (void *) 0 ; apr_pool_t *arg5 = (apr_pool_t *) 0 ; VALUE _global_svn_swig_rb_pool ; apr_pool_t *_global_pool ; - svn_boolean_t temp1 ; + void *argp1 = 0 ; + int res1 = 0 ; int res2 ; char *buf2 = 0 ; int alloc2 = 0 ; - int res3 ; - char *buf3 = 0 ; - int alloc3 = 0 ; - void *argp4 = 0 ; - int res4 = 0 ; + int res4 ; svn_error_t *result = 0 ; VALUE vresult = Qnil; @@ -29470,30 +32327,34 @@ _wrap_svn_client_shelf_has_changes(int argc, VALUE *argv, VALUE self) { _global_pool = arg5; svn_swig_rb_push_pool(_global_svn_swig_rb_pool); } - arg1 = &temp1; - if ((argc < 3) || (argc > 4)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + if ((argc < 4) || (argc > 5)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail; } - res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_client__shelf_version_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_client__shelf_version_t *","svn_client__shelf_version_status_walk", 1, argv[0] )); + } + arg1 = (svn_client__shelf_version_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client_shelf_has_changes", 2, argv[0] )); + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client__shelf_version_status_walk", 2, argv[1] )); } arg2 = (char *)(buf2); - res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_client_shelf_has_changes", 3, argv[1] )); + { + int res = SWIG_ConvertFunctionPtr(argv[2], (void**)(&arg3), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_wc_status_func4_t","svn_client__shelf_version_status_walk", 3, argv[2] )); + } } - arg3 = (char *)(buf3); - res4 = SWIG_ConvertPtr(argv[2], &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 | 0 ); + res4 = SWIG_ConvertPtr(argv[3],SWIG_as_voidptrptr(&arg4), 0, 0); if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_shelf_has_changes", 4, argv[2] )); + SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "void *","svn_client__shelf_version_status_walk", 4, argv[3] )); } - arg4 = (svn_client_ctx_t *)(argp4); - if (argc > 3) { + if (argc > 4) { } { - result = (svn_error_t *)svn_client_shelf_has_changes(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5); + result = (svn_error_t *)svn_client__shelf_version_status_walk(arg1,(char const *)arg2,arg3,arg4,arg5); @@ -29506,11 +32367,7 @@ _wrap_svn_client_shelf_has_changes(int argc, VALUE *argv, VALUE self) { } vresult = Qnil; } - { - vresult = SWIG_Ruby_AppendOutput(vresult, *arg1 ? Qtrue : Qfalse); - } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -29521,7 +32378,6 @@ _wrap_svn_client_shelf_has_changes(int argc, VALUE *argv, VALUE self) { return vresult; fail: if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -34332,147 +37188,285 @@ fail: SWIGINTERN VALUE -_wrap_svn_client_invoke_get_commit_log2(int argc, VALUE *argv, VALUE self) { - svn_client_get_commit_log2_t arg1 = (svn_client_get_commit_log2_t) 0 ; - char **arg2 = (char **) 0 ; - char **arg3 = (char **) 0 ; - apr_array_header_t *arg4 = (apr_array_header_t *) 0 ; - void *arg5 = (void *) 0 ; - apr_pool_t *arg6 = (apr_pool_t *) 0 ; +_wrap_svn_client_invoke_get_commit_log2(int argc, VALUE *argv, VALUE self) { + svn_client_get_commit_log2_t arg1 = (svn_client_get_commit_log2_t) 0 ; + char **arg2 = (char **) 0 ; + char **arg3 = (char **) 0 ; + apr_array_header_t *arg4 = (apr_array_header_t *) 0 ; + void *arg5 = (void *) 0 ; + apr_pool_t *arg6 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + char *temp2 ; + char *temp3 ; + void *argp4 = 0 ; + int res4 = 0 ; + int res5 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg6); + _global_pool = arg6; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg2 = &temp2; + arg3 = &temp3; + if ((argc < 3) || (argc > 4)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + } + { + int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_client_get_commit_log2_t","svn_client_invoke_get_commit_log2", 1, argv[0] )); + } + } + res4 = SWIG_ConvertPtr(argv[1], &argp4,SWIGTYPE_p_apr_array_header_t, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "apr_array_header_t const *","svn_client_invoke_get_commit_log2", 4, argv[1] )); + } + arg4 = (apr_array_header_t *)(argp4); + res5 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg5), 0, 0); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "void *","svn_client_invoke_get_commit_log2", 5, argv[2] )); + } + if (argc > 3) { + + } + { + result = (svn_error_t *)svn_client_invoke_get_commit_log2(arg1,(char const **)arg2,(char const **)arg3,(apr_array_header_t const *)arg4,arg5,arg6); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + if (*arg2) { + vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg2)); + } else { + vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); + } + } + { + if (*arg3) { + vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg3)); + } else { + vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); + } + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client_invoke_get_commit_log(int argc, VALUE *argv, VALUE self) { + svn_client_get_commit_log_t arg1 = (svn_client_get_commit_log_t) 0 ; + char **arg2 = (char **) 0 ; + char **arg3 = (char **) 0 ; + apr_array_header_t *arg4 = (apr_array_header_t *) 0 ; + void *arg5 = (void *) 0 ; + apr_pool_t *arg6 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + char *temp2 ; + char *temp3 ; + void *argp4 = 0 ; + int res4 = 0 ; + int res5 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg6); + _global_pool = arg6; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg2 = &temp2; + arg3 = &temp3; + if ((argc < 3) || (argc > 4)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + } + { + int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_client_get_commit_log_t","svn_client_invoke_get_commit_log", 1, argv[0] )); + } + } + res4 = SWIG_ConvertPtr(argv[1], &argp4,SWIGTYPE_p_apr_array_header_t, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "apr_array_header_t *","svn_client_invoke_get_commit_log", 4, argv[1] )); + } + arg4 = (apr_array_header_t *)(argp4); + res5 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg5), 0, 0); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "void *","svn_client_invoke_get_commit_log", 5, argv[2] )); + } + if (argc > 3) { + + } + { + result = (svn_error_t *)svn_client_invoke_get_commit_log(arg1,(char const **)arg2,(char const **)arg3,arg4,arg5,arg6); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + if (*arg2) { + vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg2)); + } else { + vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); + } + } + { + if (*arg3) { + vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg3)); + } else { + vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); + } + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_client_invoke_blame_receiver4(int argc, VALUE *argv, VALUE self) { + svn_client_blame_receiver4_t arg1 = (svn_client_blame_receiver4_t) 0 ; + void *arg2 = (void *) 0 ; + apr_int64_t arg3 ; + svn_revnum_t arg4 ; + apr_hash_t *arg5 = (apr_hash_t *) 0 ; + svn_revnum_t arg6 ; + apr_hash_t *arg7 = (apr_hash_t *) 0 ; + char *arg8 = (char *) 0 ; + svn_string_t *arg9 = (svn_string_t *) 0 ; + svn_boolean_t arg10 ; + apr_pool_t *arg11 = (apr_pool_t *) 0 ; VALUE _global_svn_swig_rb_pool ; apr_pool_t *_global_pool ; - char *temp2 ; - char *temp3 ; - void *argp4 = 0 ; - int res4 = 0 ; - int res5 ; + int res2 ; + long val4 ; + int ecode4 = 0 ; + void *argp5 = 0 ; + int res5 = 0 ; + long val6 ; + int ecode6 = 0 ; + void *argp7 = 0 ; + int res7 = 0 ; + int res8 ; + char *buf8 = 0 ; + int alloc8 = 0 ; + svn_string_t value9 ; svn_error_t *result = 0 ; VALUE vresult = Qnil; { - svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg6); - _global_pool = arg6; + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg11); + _global_pool = arg11; svn_swig_rb_push_pool(_global_svn_swig_rb_pool); } - arg2 = &temp2; - arg3 = &temp3; - if ((argc < 3) || (argc > 4)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + if ((argc < 10) || (argc > 11)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 10)",argc); SWIG_fail; } { - int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t); + int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t); if (!SWIG_IsOK(res)) { - SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_client_get_commit_log2_t","svn_client_invoke_get_commit_log2", 1, argv[0] )); - } - } - res4 = SWIG_ConvertPtr(argv[1], &argp4,SWIGTYPE_p_apr_array_header_t, 0 | 0 ); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "apr_array_header_t const *","svn_client_invoke_get_commit_log2", 4, argv[1] )); - } - arg4 = (apr_array_header_t *)(argp4); - res5 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg5), 0, 0); - if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "void *","svn_client_invoke_get_commit_log2", 5, argv[2] )); - } - if (argc > 3) { - - } - { - result = (svn_error_t *)svn_client_invoke_get_commit_log2(arg1,(char const **)arg2,(char const **)arg3,(apr_array_header_t const *)arg4,arg5,arg6); - - - - } - { - if (result) { - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); - svn_swig_rb_handle_svn_error(result); - } - vresult = Qnil; - } - { - if (*arg2) { - vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg2)); - } else { - vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_client_blame_receiver4_t","svn_client_invoke_blame_receiver4", 1, argv[0] )); } } - { - if (*arg3) { - vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg3)); - } else { - vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); - } + res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_client_invoke_blame_receiver4", 2, argv[1] )); } { - VALUE target; - target = _global_vresult_address == &vresult ? self : vresult; - if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + arg3 = (apr_int64_t)NUM2LL(argv[2]); } - return vresult; -fail: - { - VALUE target; - target = _global_vresult_address == &vresult ? self : vresult; - if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) - svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); - svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + ecode4 = SWIG_AsVal_long(argv[3], &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "svn_revnum_t","svn_client_invoke_blame_receiver4", 4, argv[3] )); + } + arg4 = (svn_revnum_t)(val4); + res5 = SWIG_ConvertPtr(argv[4], &argp5,SWIGTYPE_p_apr_hash_t, 0 | 0 ); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "apr_hash_t *","svn_client_invoke_blame_receiver4", 5, argv[4] )); } - return Qnil; -} - - -SWIGINTERN VALUE -_wrap_svn_client_invoke_get_commit_log(int argc, VALUE *argv, VALUE self) { - svn_client_get_commit_log_t arg1 = (svn_client_get_commit_log_t) 0 ; - char **arg2 = (char **) 0 ; - char **arg3 = (char **) 0 ; - apr_array_header_t *arg4 = (apr_array_header_t *) 0 ; - void *arg5 = (void *) 0 ; - apr_pool_t *arg6 = (apr_pool_t *) 0 ; - VALUE _global_svn_swig_rb_pool ; - apr_pool_t *_global_pool ; - char *temp2 ; - char *temp3 ; - void *argp4 = 0 ; - int res4 = 0 ; - int res5 ; - svn_error_t *result = 0 ; - VALUE vresult = Qnil; - - { - svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg6); - _global_pool = arg6; - svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + arg5 = (apr_hash_t *)(argp5); + ecode6 = SWIG_AsVal_long(argv[5], &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), Ruby_Format_TypeError( "", "svn_revnum_t","svn_client_invoke_blame_receiver4", 6, argv[5] )); + } + arg6 = (svn_revnum_t)(val6); + res7 = SWIG_ConvertPtr(argv[6], &argp7,SWIGTYPE_p_apr_hash_t, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "apr_hash_t *","svn_client_invoke_blame_receiver4", 7, argv[6] )); } - arg2 = &temp2; - arg3 = &temp3; - if ((argc < 3) || (argc > 4)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + arg7 = (apr_hash_t *)(argp7); + res8 = SWIG_AsCharPtrAndSize(argv[7], &buf8, NULL, &alloc8); + if (!SWIG_IsOK(res8)) { + SWIG_exception_fail(SWIG_ArgError(res8), Ruby_Format_TypeError( "", "char const *","svn_client_invoke_blame_receiver4", 8, argv[7] )); } + arg8 = (char *)(buf8); { - int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t); - if (!SWIG_IsOK(res)) { - SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_client_get_commit_log_t","svn_client_invoke_get_commit_log", 1, argv[0] )); + if (NIL_P(argv[8])) { + arg9 = NULL; + } else { + value9.data = StringValuePtr(argv[8]); + value9.len = RSTRING_LEN(argv[8]); + arg9 = &value9; } } - res4 = SWIG_ConvertPtr(argv[1], &argp4,SWIGTYPE_p_apr_array_header_t, 0 | 0 ); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "apr_array_header_t *","svn_client_invoke_get_commit_log", 4, argv[1] )); - } - arg4 = (apr_array_header_t *)(argp4); - res5 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg5), 0, 0); - if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "void *","svn_client_invoke_get_commit_log", 5, argv[2] )); - } - if (argc > 3) { + arg10 = RTEST(argv[9]); + if (argc > 10) { } { - result = (svn_error_t *)svn_client_invoke_get_commit_log(arg1,(char const **)arg2,(char const **)arg3,arg4,arg5,arg6); + result = (svn_error_t *)svn_client_invoke_blame_receiver4(arg1,arg2,arg3,arg4,arg5,arg6,arg7,(char const *)arg8,(struct svn_string_t const *)arg9,arg10,arg11); @@ -34485,20 +37479,7 @@ _wrap_svn_client_invoke_get_commit_log(int argc, VALUE *argv, VALUE self) { } vresult = Qnil; } - { - if (*arg2) { - vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg2)); - } else { - vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); - } - } - { - if (*arg3) { - vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new2(*arg3)); - } else { - vresult = SWIG_Ruby_AppendOutput(vresult, Qnil); - } - } + if (alloc8 == SWIG_NEWOBJ) free((char*)buf8); { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -34508,6 +37489,7 @@ _wrap_svn_client_invoke_get_commit_log(int argc, VALUE *argv, VALUE self) { } return vresult; fail: + if (alloc8 == SWIG_NEWOBJ) free((char*)buf8); { VALUE target; target = _global_vresult_address == &vresult ? self : vresult; @@ -34998,6 +37980,125 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_client_invoke__layout_func(int argc, VALUE *argv, VALUE self) { + svn_client__layout_func_t arg1 = (svn_client__layout_func_t) 0 ; + void *arg2 = (void *) 0 ; + char *arg3 = (char *) 0 ; + char *arg4 = (char *) 0 ; + svn_boolean_t arg5 ; + svn_boolean_t arg6 ; + char *arg7 = (char *) 0 ; + svn_boolean_t arg8 ; + svn_revnum_t arg9 ; + svn_boolean_t arg10 ; + svn_depth_t arg11 ; + apr_pool_t *arg12 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + int res2 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + int res4 ; + char *buf4 = 0 ; + int alloc4 = 0 ; + int res7 ; + char *buf7 = 0 ; + int alloc7 = 0 ; + long val9 ; + int ecode9 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg12); + _global_pool = arg12; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 11) || (argc > 12)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 11)",argc); SWIG_fail; + } + { + int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_client__layout_func_t","svn_client_invoke__layout_func", 1, argv[0] )); + } + } + res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_client_invoke__layout_func", 2, argv[1] )); + } + res3 = SWIG_AsCharPtrAndSize(argv[2], &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_client_invoke__layout_func", 3, argv[2] )); + } + arg3 = (char *)(buf3); + res4 = SWIG_AsCharPtrAndSize(argv[3], &buf4, NULL, &alloc4); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "char const *","svn_client_invoke__layout_func", 4, argv[3] )); + } + arg4 = (char *)(buf4); + arg5 = RTEST(argv[4]); + arg6 = RTEST(argv[5]); + res7 = SWIG_AsCharPtrAndSize(argv[6], &buf7, NULL, &alloc7); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "char const *","svn_client_invoke__layout_func", 7, argv[6] )); + } + arg7 = (char *)(buf7); + arg8 = RTEST(argv[7]); + ecode9 = SWIG_AsVal_long(argv[8], &val9); + if (!SWIG_IsOK(ecode9)) { + SWIG_exception_fail(SWIG_ArgError(ecode9), Ruby_Format_TypeError( "", "svn_revnum_t","svn_client_invoke__layout_func", 9, argv[8] )); + } + arg9 = (svn_revnum_t)(val9); + arg10 = RTEST(argv[9]); + { + arg11 = svn_swig_rb_to_depth(argv[10]); + } + if (argc > 11) { + + } + { + result = (svn_error_t *)svn_client_invoke__layout_func(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,(char const *)arg7,arg8,arg9,arg10,arg11,arg12); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + if (alloc4 == SWIG_NEWOBJ) free((char*)buf4); + if (alloc7 == SWIG_NEWOBJ) free((char*)buf7); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + if (alloc4 == SWIG_NEWOBJ) free((char*)buf4); + if (alloc7 == SWIG_NEWOBJ) free((char*)buf7); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_client_invoke_import_filter_func(int argc, VALUE *argv, VALUE self) { svn_client_import_filter_func_t arg1 = (svn_client_import_filter_func_t) 0 ; @@ -36080,54 +39181,61 @@ static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *| static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void = {"_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void", "void (*)(apr_off_t,apr_off_t,void *,apr_pool_t *)|svn_ra_progress_notify_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const **,char const **,apr_array_header_t *,void *,apr_pool_t *)|svn_client_get_commit_log_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const **,char const **,apr_array_header_t const *,void *,apr_pool_t *)|svn_client_get_commit_log3_t|svn_client_get_commit_log2_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_simple_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_pw_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_username_prompt_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|struct svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_client_diff_summarize_func_t|struct svn_error_t *(*)(svn_client_diff_summarize_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_client_blame_receiver2_t|struct svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,svn_revnum_t,char const *,char const *,char const *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const **,char const **,apr_array_header_t *,void *,apr_pool_t *)|svn_client_get_commit_log_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_client_get_commit_log3_t|svn_error_t *(*)(char const **,char const **,apr_array_header_t const *,void *,apr_pool_t *)|svn_client_get_commit_log2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_simple_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_pw_prompt_func_t|svn_error_t *(*)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_client_cert_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_username_prompt_func_t|svn_error_t *(*)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t|svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t|svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_client_diff_summarize_t const *,void *,apr_pool_t *)|svn_client_diff_summarize_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)|svn_commit_callback2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_client_blame_receiver4_t|svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,apr_hash_t *,svn_revnum_t,apr_hash_t *,char const *,svn_string_t const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,svn_revnum_t,char const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char__int = {"_p_f_p_void_p_q_const__char__int", "int (*)(void *,char const *)|svn_ra_check_tunnel_func_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void = {"_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void", "void (*)(void *,char const *,enum svn_wc_notify_action_t,enum svn_node_kind_t,char const *,enum svn_wc_notify_state_t,enum svn_wc_notify_state_t,long)|svn_wc_notify_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_array_header_t *,apr_pool_t *)|svn_proplist_receiver2_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_pool_t *)|svn_proplist_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_changelist_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t", "svn_client_info_receiver2_t|struct svn_error_t *(*)(void *,char const *,svn_client_info2_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t", "svn_client_status_func_t|struct svn_error_t *(*)(void *,char const *,svn_client_status_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,apr_pool_t *)|svn_client_list_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_list_func2_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_info_t const *,apr_pool_t *)|svn_info_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_proplist_receiver2_t|svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_pool_t *)|svn_proplist_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_changelist_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t", "svn_client__layout_func_t|svn_error_t *(*)(void *,char const *,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_boolean_t,svn_revnum_t,svn_boolean_t,svn_depth_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t", "svn_client_info_receiver2_t|svn_error_t *(*)(void *,char const *,svn_client_info2_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_client_status_t const *,apr_pool_t *)|svn_client_status_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,apr_pool_t *)|svn_client_list_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_dirent_t const *,svn_lock_t const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_list_func2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_info_t const *,apr_pool_t *)|svn_info_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status3_t const *,apr_pool_t *)|svn_wc_status_func4_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void", "void (*)(void *,char const *,struct svn_wc_status2_t *)|svn_wc_status_func2_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void", "void (*)(void *,char const *,struct svn_wc_status_t *)|svn_wc_status_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)|svn_wc_status_func3_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)|svn_wc_status_func3_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void = {"_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void", "svn_wc_notify_func2_t|void (*)(void *,struct svn_wc_notify_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_boolean_t *,char const *,char const *,char const *,apr_pool_t *)|svn_client_patch_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_boolean_t *,char const *,svn_io_dirent2_t const *,apr_pool_t *)|svn_client_import_filter_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t", "svn_client_conflict_walk_func_t|struct svn_error_t *(*)(void *,svn_client_conflict_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,svn_revnum_t,apr_int64_t,svn_revnum_t,apr_hash_t *,svn_revnum_t,apr_hash_t *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_client_blame_receiver3_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_boolean_t *,char const *,char const *,char const *,apr_pool_t *)|svn_client_patch_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_boolean_t *,char const *,svn_io_dirent2_t const *,apr_pool_t *)|svn_client_import_filter_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_client_conflict_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_client_conflict_t *,apr_pool_t *)|svn_client_conflict_walk_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,svn_revnum_t,apr_int64_t,svn_revnum_t,apr_hash_t *,svn_revnum_t,apr_hash_t *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_client_blame_receiver3_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_array_header_t = {"_p_p_apr_array_header_t", "apr_array_header_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_auth_provider_object_t = {"_p_p_svn_auth_provider_object_t", "struct svn_auth_provider_object_t **|svn_auth_provider_object_t **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_svn_client__shelf_t = {"_p_p_svn_client__shelf_t", "struct svn_client__shelf_t **|svn_client__shelf_t **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_svn_client__shelf_version_t = {"_p_p_svn_client__shelf_version_t", "struct svn_client__shelf_version_t **|svn_client__shelf_version_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_client_commit_info_t = {"_p_p_svn_client_commit_info_t", "struct svn_client_commit_info_t **|svn_client_commit_info_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_client_conflict_t = {"_p_p_svn_client_conflict_t", "struct svn_client_conflict_t **|svn_client_conflict_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_client_ctx_t = {"_p_p_svn_client_ctx_t", "struct svn_client_ctx_t **|svn_client_ctx_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_commit_info_t = {"_p_p_svn_commit_info_t", "struct svn_commit_info_t **|svn_commit_info_t **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_ra_session_t = {"_p_p_svn_ra_session_t", "struct svn_ra_session_t **|svn_ra_session_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_string_t = {"_p_p_svn_string_t", "struct svn_string_t **|svn_string_t **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_auth_baton_t = {"_p_svn_auth_baton_t", "struct svn_auth_baton_t *|svn_auth_baton_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_auth_cred_simple_t = {"_p_svn_auth_cred_simple_t", "struct svn_auth_cred_simple_t *|svn_auth_cred_simple_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_auth_cred_ssl_client_cert_pw_t = {"_p_svn_auth_cred_ssl_client_cert_pw_t", "struct svn_auth_cred_ssl_client_cert_pw_t *|svn_auth_cred_ssl_client_cert_pw_t *", 0, 0, (void*)0, 0}; @@ -36142,6 +39250,9 @@ static swig_type_info _swigt__p_svn_cache_config_t = {"_p_svn_cache_config_t", " static swig_type_info _swigt__p_svn_checksum_ctx_t = {"_p_svn_checksum_ctx_t", "struct svn_checksum_ctx_t *|svn_checksum_ctx_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_checksum_kind_t = {"_p_svn_checksum_kind_t", "enum svn_checksum_kind_t *|svn_checksum_kind_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct svn_checksum_t *|svn_checksum_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_client__shelf_info_t = {"_p_svn_client__shelf_info_t", "struct svn_client__shelf_info_t *|svn_client__shelf_info_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_client__shelf_t = {"_p_svn_client__shelf_t", "struct svn_client__shelf_t *|svn_client__shelf_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_client__shelf_version_t = {"_p_svn_client__shelf_version_t", "struct svn_client__shelf_version_t *|svn_client__shelf_version_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_commit_info_t = {"_p_svn_client_commit_info_t", "struct svn_client_commit_info_t *|svn_client_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_commit_item2_t = {"_p_svn_client_commit_item2_t", "struct svn_client_commit_item2_t *|svn_client_commit_item2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_commit_item3_t = {"_p_svn_client_commit_item3_t", "struct svn_client_commit_item3_t *|svn_client_commit_item3_t *", 0, 0, (void*)0, 0}; @@ -36155,11 +39266,11 @@ static swig_type_info _swigt__p_svn_client_diff_summarize_kind_t = {"_p_svn_clie static swig_type_info _swigt__p_svn_client_diff_summarize_t = {"_p_svn_client_diff_summarize_t", "struct svn_client_diff_summarize_t *|svn_client_diff_summarize_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_info2_t = {"_p_svn_client_info2_t", "struct svn_client_info2_t *|svn_client_info2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_proplist_item_t = {"_p_svn_client_proplist_item_t", "struct svn_client_proplist_item_t *|svn_client_proplist_item_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_client_shelved_patch_info_t = {"_p_svn_client_shelved_patch_info_t", "struct svn_client_shelved_patch_info_t *|svn_client_shelved_patch_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_client_status_t = {"_p_svn_client_status_t", "struct svn_client_status_t *|svn_client_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_binary_patch_t = {"_p_svn_diff_binary_patch_t", "struct svn_diff_binary_patch_t *|svn_diff_binary_patch_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_conflict_display_style_t = {"_p_svn_diff_conflict_display_style_t", "enum svn_diff_conflict_display_style_t *|svn_diff_conflict_display_style_t *", 0, 0, (void*)0, 0}; @@ -36174,7 +39285,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_info_t = {"_p_svn_info_t", "struct svn_info_t *|svn_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; @@ -36191,6 +39302,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -36275,6 +39387,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void__p_svn_error_t, + &_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, @@ -36283,11 +39396,13 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, + &_swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t, + &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void, &_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void, &_swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, @@ -36303,12 +39418,16 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_p_apr_hash_t, &_swigt__p_p_char, &_swigt__p_p_svn_auth_provider_object_t, + &_swigt__p_p_svn_client__shelf_t, + &_swigt__p_p_svn_client__shelf_version_t, &_swigt__p_p_svn_client_commit_info_t, &_swigt__p_p_svn_client_conflict_t, &_swigt__p_p_svn_client_ctx_t, &_swigt__p_p_svn_commit_info_t, + &_swigt__p_p_svn_delta_editor_t, &_swigt__p_p_svn_ra_session_t, &_swigt__p_p_svn_string_t, + &_swigt__p_p_void, &_swigt__p_svn_auth_baton_t, &_swigt__p_svn_auth_cred_simple_t, &_swigt__p_svn_auth_cred_ssl_client_cert_pw_t, @@ -36323,6 +39442,9 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_checksum_ctx_t, &_swigt__p_svn_checksum_kind_t, &_swigt__p_svn_checksum_t, + &_swigt__p_svn_client__shelf_info_t, + &_swigt__p_svn_client__shelf_t, + &_swigt__p_svn_client__shelf_version_t, &_swigt__p_svn_client_commit_info_t, &_swigt__p_svn_client_commit_item2_t, &_swigt__p_svn_client_commit_item3_t, @@ -36336,11 +39458,11 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_client_diff_summarize_t, &_swigt__p_svn_client_info2_t, &_swigt__p_svn_client_proplist_item_t, - &_swigt__p_svn_client_shelved_patch_info_t, &_swigt__p_svn_client_status_t, &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_binary_patch_t, &_swigt__p_svn_diff_conflict_display_style_t, @@ -36372,6 +39494,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -36456,6 +39579,7 @@ static swig_cast_info _swigc__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc static swig_cast_info _swigc__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void__p_svn_error_t[] = { {&_swigt__p_f_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -36464,11 +39588,13 @@ static swig_cast_info _swigc__p_f_p_void_p_q_const__char_enum_svn_wc_notify_acti static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void[] = { {&_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void[] = { {&_swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -36484,12 +39610,16 @@ static swig_cast_info _swigc__p_p_apr_array_header_t[] = { {&_swigt__p_p_apr_ar static swig_cast_info _swigc__p_p_apr_hash_t[] = { {&_swigt__p_p_apr_hash_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_char[] = { {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_auth_provider_object_t[] = { {&_swigt__p_p_svn_auth_provider_object_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_svn_client__shelf_t[] = { {&_swigt__p_p_svn_client__shelf_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_svn_client__shelf_version_t[] = { {&_swigt__p_p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_client_commit_info_t[] = { {&_swigt__p_p_svn_client_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_client_conflict_t[] = { {&_swigt__p_p_svn_client_conflict_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_client_ctx_t[] = { {&_swigt__p_p_svn_client_ctx_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_commit_info_t[] = { {&_swigt__p_p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_svn_delta_editor_t[] = { {&_swigt__p_p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_ra_session_t[] = { {&_swigt__p_p_svn_ra_session_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_string_t[] = { {&_swigt__p_p_svn_string_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_void[] = { {&_swigt__p_p_void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_auth_baton_t[] = { {&_swigt__p_svn_auth_baton_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_auth_cred_simple_t[] = { {&_swigt__p_svn_auth_cred_simple_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_auth_cred_ssl_client_cert_pw_t[] = { {&_swigt__p_svn_auth_cred_ssl_client_cert_pw_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -36504,6 +39634,9 @@ static swig_cast_info _swigc__p_svn_cache_config_t[] = { {&_swigt__p_svn_cache_ static swig_cast_info _swigc__p_svn_checksum_ctx_t[] = { {&_swigt__p_svn_checksum_ctx_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_checksum_kind_t[] = { {&_swigt__p_svn_checksum_kind_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_client__shelf_info_t[] = { {&_swigt__p_svn_client__shelf_info_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_client__shelf_t[] = { {&_swigt__p_svn_client__shelf_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_client__shelf_version_t[] = { {&_swigt__p_svn_client__shelf_version_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_commit_info_t[] = { {&_swigt__p_svn_client_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_commit_item2_t[] = { {&_swigt__p_svn_client_commit_item2_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_commit_item3_t[] = { {&_swigt__p_svn_client_commit_item3_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -36517,11 +39650,11 @@ static swig_cast_info _swigc__p_svn_client_diff_summarize_kind_t[] = { {&_swigt static swig_cast_info _swigc__p_svn_client_diff_summarize_t[] = { {&_swigt__p_svn_client_diff_summarize_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_info2_t[] = { {&_swigt__p_svn_client_info2_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_proplist_item_t[] = { {&_swigt__p_svn_client_proplist_item_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_svn_client_shelved_patch_info_t[] = { {&_swigt__p_svn_client_shelved_patch_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_client_status_t[] = { {&_swigt__p_svn_client_status_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_binary_patch_t[] = { {&_swigt__p_svn_diff_binary_patch_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_conflict_display_style_t[] = { {&_swigt__p_svn_diff_conflict_display_style_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -36553,6 +39686,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -36637,6 +39771,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void__p_svn_error_t, + _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__svn_string_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, @@ -36645,11 +39780,13 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, + _swigc__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_svn_boolean_t_svn_revnum_t_svn_boolean_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t, + _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void, _swigc__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void, _swigc__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, @@ -36665,12 +39802,16 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_p_apr_hash_t, _swigc__p_p_char, _swigc__p_p_svn_auth_provider_object_t, + _swigc__p_p_svn_client__shelf_t, + _swigc__p_p_svn_client__shelf_version_t, _swigc__p_p_svn_client_commit_info_t, _swigc__p_p_svn_client_conflict_t, _swigc__p_p_svn_client_ctx_t, _swigc__p_p_svn_commit_info_t, + _swigc__p_p_svn_delta_editor_t, _swigc__p_p_svn_ra_session_t, _swigc__p_p_svn_string_t, + _swigc__p_p_void, _swigc__p_svn_auth_baton_t, _swigc__p_svn_auth_cred_simple_t, _swigc__p_svn_auth_cred_ssl_client_cert_pw_t, @@ -36685,6 +39826,9 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_checksum_ctx_t, _swigc__p_svn_checksum_kind_t, _swigc__p_svn_checksum_t, + _swigc__p_svn_client__shelf_info_t, + _swigc__p_svn_client__shelf_t, + _swigc__p_svn_client__shelf_version_t, _swigc__p_svn_client_commit_info_t, _swigc__p_svn_client_commit_item2_t, _swigc__p_svn_client_commit_item3_t, @@ -36698,11 +39842,11 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_client_diff_summarize_t, _swigc__p_svn_client_info2_t, _swigc__p_svn_client_proplist_item_t, - _swigc__p_svn_client_shelved_patch_info_t, _swigc__p_svn_client_status_t, _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_binary_patch_t, _swigc__p_svn_diff_conflict_display_style_t, @@ -36734,6 +39878,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, @@ -37270,6 +40415,7 @@ SWIGEXPORT void Init_client(void) { rb_define_module_function(mClient, "svn_client_switch3", _wrap_svn_client_switch3, -1); rb_define_module_function(mClient, "svn_client_switch2", _wrap_svn_client_switch2, -1); rb_define_module_function(mClient, "svn_client_switch", _wrap_svn_client_switch, -1); + rb_define_module_function(mClient, "svn_client__layout_list", _wrap_svn_client__layout_list, -1); rb_define_module_function(mClient, "svn_client_add5", _wrap_svn_client_add5, -1); rb_define_module_function(mClient, "svn_client_add4", _wrap_svn_client_add4, -1); rb_define_module_function(mClient, "svn_client_add3", _wrap_svn_client_add3, -1); @@ -37380,17 +40526,20 @@ SWIGEXPORT void Init_client(void) { rb_define_module_function(mClient, "svn_client_log3", _wrap_svn_client_log3, -1); rb_define_module_function(mClient, "svn_client_log2", _wrap_svn_client_log2, -1); rb_define_module_function(mClient, "svn_client_log", _wrap_svn_client_log, -1); + rb_define_module_function(mClient, "svn_client_blame6", _wrap_svn_client_blame6, -1); rb_define_module_function(mClient, "svn_client_blame5", _wrap_svn_client_blame5, -1); rb_define_module_function(mClient, "svn_client_blame4", _wrap_svn_client_blame4, -1); rb_define_module_function(mClient, "svn_client_blame3", _wrap_svn_client_blame3, -1); rb_define_module_function(mClient, "svn_client_blame2", _wrap_svn_client_blame2, -1); rb_define_module_function(mClient, "svn_client_blame", _wrap_svn_client_blame, -1); + rb_define_module_function(mClient, "svn_client_diff7", _wrap_svn_client_diff7, -1); rb_define_module_function(mClient, "svn_client_diff6", _wrap_svn_client_diff6, -1); rb_define_module_function(mClient, "svn_client_diff5", _wrap_svn_client_diff5, -1); rb_define_module_function(mClient, "svn_client_diff4", _wrap_svn_client_diff4, -1); rb_define_module_function(mClient, "svn_client_diff3", _wrap_svn_client_diff3, -1); rb_define_module_function(mClient, "svn_client_diff2", _wrap_svn_client_diff2, -1); rb_define_module_function(mClient, "svn_client_diff", _wrap_svn_client_diff, -1); + rb_define_module_function(mClient, "svn_client_diff_peg7", _wrap_svn_client_diff_peg7, -1); rb_define_module_function(mClient, "svn_client_diff_peg6", _wrap_svn_client_diff_peg6, -1); rb_define_module_function(mClient, "svn_client_diff_peg5", _wrap_svn_client_diff_peg5, -1); rb_define_module_function(mClient, "svn_client_diff_peg4", _wrap_svn_client_diff_peg4, -1); @@ -37425,6 +40574,7 @@ SWIGEXPORT void Init_client(void) { rb_define_module_function(mClient, "svn_client_upgrade", _wrap_svn_client_upgrade, -1); rb_define_module_function(mClient, "svn_client_relocate2", _wrap_svn_client_relocate2, -1); rb_define_module_function(mClient, "svn_client_relocate", _wrap_svn_client_relocate, -1); + rb_define_module_function(mClient, "svn_client_revert4", _wrap_svn_client_revert4, -1); rb_define_module_function(mClient, "svn_client_revert3", _wrap_svn_client_revert3, -1); rb_define_module_function(mClient, "svn_client_revert2", _wrap_svn_client_revert2, -1); rb_define_module_function(mClient, "svn_client_revert", _wrap_svn_client_revert, -1); @@ -37451,10 +40601,21 @@ SWIGEXPORT void Init_client(void) { rb_define_const(mClient, "Svn_client_conflict_option_incoming_move_file_text_merge", SWIG_From_int((int)(svn_client_conflict_option_incoming_move_file_text_merge))); rb_define_const(mClient, "Svn_client_conflict_option_incoming_move_dir_merge", SWIG_From_int((int)(svn_client_conflict_option_incoming_move_dir_merge))); rb_define_const(mClient, "Svn_client_conflict_option_local_move_file_text_merge", SWIG_From_int((int)(svn_client_conflict_option_local_move_file_text_merge))); + rb_define_const(mClient, "Svn_client_conflict_option_local_move_dir_merge", SWIG_From_int((int)(svn_client_conflict_option_local_move_dir_merge))); + rb_define_const(mClient, "Svn_client_conflict_option_sibling_move_file_text_merge", SWIG_From_int((int)(svn_client_conflict_option_sibling_move_file_text_merge))); + rb_define_const(mClient, "Svn_client_conflict_option_sibling_move_dir_merge", SWIG_From_int((int)(svn_client_conflict_option_sibling_move_dir_merge))); + rb_define_const(mClient, "Svn_client_conflict_option_both_moved_file_merge", SWIG_From_int((int)(svn_client_conflict_option_both_moved_file_merge))); + rb_define_const(mClient, "Svn_client_conflict_option_both_moved_file_move_merge", SWIG_From_int((int)(svn_client_conflict_option_both_moved_file_move_merge))); + rb_define_const(mClient, "Svn_client_conflict_option_both_moved_dir_merge", SWIG_From_int((int)(svn_client_conflict_option_both_moved_dir_merge))); + rb_define_const(mClient, "Svn_client_conflict_option_both_moved_dir_move_merge", SWIG_From_int((int)(svn_client_conflict_option_both_moved_dir_move_merge))); rb_define_module_function(mClient, "svn_client_conflict_option_set_merged_propval", _wrap_svn_client_conflict_option_set_merged_propval, -1); + rb_define_module_function(mClient, "svn_client_conflict_option_get_moved_to_repos_relpath_candidates2", _wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates2, -1); rb_define_module_function(mClient, "svn_client_conflict_option_get_moved_to_repos_relpath_candidates", _wrap_svn_client_conflict_option_get_moved_to_repos_relpath_candidates, -1); + rb_define_module_function(mClient, "svn_client_conflict_option_set_moved_to_repos_relpath2", _wrap_svn_client_conflict_option_set_moved_to_repos_relpath2, -1); rb_define_module_function(mClient, "svn_client_conflict_option_set_moved_to_repos_relpath", _wrap_svn_client_conflict_option_set_moved_to_repos_relpath, -1); + rb_define_module_function(mClient, "svn_client_conflict_option_get_moved_to_abspath_candidates2", _wrap_svn_client_conflict_option_get_moved_to_abspath_candidates2, -1); rb_define_module_function(mClient, "svn_client_conflict_option_get_moved_to_abspath_candidates", _wrap_svn_client_conflict_option_get_moved_to_abspath_candidates, -1); + rb_define_module_function(mClient, "svn_client_conflict_option_set_moved_to_abspath2", _wrap_svn_client_conflict_option_set_moved_to_abspath2, -1); rb_define_module_function(mClient, "svn_client_conflict_option_set_moved_to_abspath", _wrap_svn_client_conflict_option_set_moved_to_abspath, -1); rb_define_module_function(mClient, "svn_client_conflict_option_find_by_id", _wrap_svn_client_conflict_option_find_by_id, -1); rb_define_module_function(mClient, "svn_client_conflict_get", _wrap_svn_client_conflict_get, -1); @@ -37551,29 +40712,77 @@ SWIGEXPORT void Init_client(void) { rb_define_module_function(mClient, "svn_client_cat3", _wrap_svn_client_cat3, -1); rb_define_module_function(mClient, "svn_client_cat2", _wrap_svn_client_cat2, -1); rb_define_module_function(mClient, "svn_client_cat", _wrap_svn_client_cat, -1); - rb_define_module_function(mClient, "svn_client_shelve", _wrap_svn_client_shelve, -1); - rb_define_module_function(mClient, "svn_client_unshelve", _wrap_svn_client_unshelve, -1); - rb_define_module_function(mClient, "svn_client_shelves_delete", _wrap_svn_client_shelves_delete, -1); - - SwigClassSvn_client_shelved_patch_info_t.klass = rb_define_class_under(mClient, "Svn_client_shelved_patch_info_t", rb_cObject); - SWIG_TypeClientData(SWIGTYPE_p_svn_client_shelved_patch_info_t, (void *) &SwigClassSvn_client_shelved_patch_info_t); - rb_define_alloc_func(SwigClassSvn_client_shelved_patch_info_t.klass, _wrap_svn_client_shelved_patch_info_t_allocate); - rb_define_method(SwigClassSvn_client_shelved_patch_info_t.klass, "initialize", _wrap_new_svn_client_shelved_patch_info_t, -1); - rb_define_method(SwigClassSvn_client_shelved_patch_info_t.klass, "message=", _wrap_svn_client_shelved_patch_info_t_message_set, -1); - rb_define_method(SwigClassSvn_client_shelved_patch_info_t.klass, "message", _wrap_svn_client_shelved_patch_info_t_message_get, -1); - rb_define_method(SwigClassSvn_client_shelved_patch_info_t.klass, "patch_path=", _wrap_svn_client_shelved_patch_info_t_patch_path_set, -1); - rb_define_method(SwigClassSvn_client_shelved_patch_info_t.klass, "patch_path", _wrap_svn_client_shelved_patch_info_t_patch_path_get, -1); - rb_define_method(SwigClassSvn_client_shelved_patch_info_t.klass, "dirent=", _wrap_svn_client_shelved_patch_info_t_dirent_set, -1); - rb_define_method(SwigClassSvn_client_shelved_patch_info_t.klass, "dirent", _wrap_svn_client_shelved_patch_info_t_dirent_get, -1); - rb_define_method(SwigClassSvn_client_shelved_patch_info_t.klass, "mtime=", _wrap_svn_client_shelved_patch_info_t_mtime_set, -1); - rb_define_method(SwigClassSvn_client_shelved_patch_info_t.klass, "mtime", _wrap_svn_client_shelved_patch_info_t_mtime_get, -1); - SwigClassSvn_client_shelved_patch_info_t.mark = 0; - SwigClassSvn_client_shelved_patch_info_t.destroy = (void (*)(void *)) free_svn_client_shelved_patch_info_t; - SwigClassSvn_client_shelved_patch_info_t.trackObjects = 0; - rb_define_module_function(mClient, "svn_client_shelves_list", _wrap_svn_client_shelves_list, -1); - rb_define_module_function(mClient, "svn_client_shelves_any", _wrap_svn_client_shelves_any, -1); - rb_define_module_function(mClient, "svn_client_shelf_get_paths", _wrap_svn_client_shelf_get_paths, -1); - rb_define_module_function(mClient, "svn_client_shelf_has_changes", _wrap_svn_client_shelf_has_changes, -1); + + SwigClassSvn_client__shelf_t.klass = rb_define_class_under(mClient, "Svn_client__shelf_t", rb_cObject); + SWIG_TypeClientData(SWIGTYPE_p_svn_client__shelf_t, (void *) &SwigClassSvn_client__shelf_t); + rb_define_alloc_func(SwigClassSvn_client__shelf_t.klass, _wrap_svn_client__shelf_t_allocate); + rb_define_method(SwigClassSvn_client__shelf_t.klass, "initialize", _wrap_new_svn_client__shelf_t, -1); + rb_define_method(SwigClassSvn_client__shelf_t.klass, "name=", _wrap_svn_client__shelf_t_name_set, -1); + rb_define_method(SwigClassSvn_client__shelf_t.klass, "name", _wrap_svn_client__shelf_t_name_get, -1); + rb_define_method(SwigClassSvn_client__shelf_t.klass, "max_version=", _wrap_svn_client__shelf_t_max_version_set, -1); + rb_define_method(SwigClassSvn_client__shelf_t.klass, "max_version", _wrap_svn_client__shelf_t_max_version_get, -1); + rb_define_method(SwigClassSvn_client__shelf_t.klass, "wc_root_abspath=", _wrap_svn_client__shelf_t_wc_root_abspath_set, -1); + rb_define_method(SwigClassSvn_client__shelf_t.klass, "wc_root_abspath", _wrap_svn_client__shelf_t_wc_root_abspath_get, -1); + rb_define_method(SwigClassSvn_client__shelf_t.klass, "shelves_dir=", _wrap_svn_client__shelf_t_shelves_dir_set, -1); + rb_define_method(SwigClassSvn_client__shelf_t.klass, "shelves_dir", _wrap_svn_client__shelf_t_shelves_dir_get, -1); + rb_define_method(SwigClassSvn_client__shelf_t.klass, "revprops=", _wrap_svn_client__shelf_t_revprops_set, -1); + rb_define_method(SwigClassSvn_client__shelf_t.klass, "revprops", _wrap_svn_client__shelf_t_revprops_get, -1); + rb_define_method(SwigClassSvn_client__shelf_t.klass, "ctx=", _wrap_svn_client__shelf_t_ctx_set, -1); + rb_define_method(SwigClassSvn_client__shelf_t.klass, "ctx", _wrap_svn_client__shelf_t_ctx_get, -1); + rb_define_method(SwigClassSvn_client__shelf_t.klass, "pool=", _wrap_svn_client__shelf_t_pool_set, -1); + rb_define_method(SwigClassSvn_client__shelf_t.klass, "pool", _wrap_svn_client__shelf_t_pool_get, -1); + SwigClassSvn_client__shelf_t.mark = 0; + SwigClassSvn_client__shelf_t.destroy = (void (*)(void *)) free_svn_client__shelf_t; + SwigClassSvn_client__shelf_t.trackObjects = 0; + + SwigClassSvn_client__shelf_version_t.klass = rb_define_class_under(mClient, "Svn_client__shelf_version_t", rb_cObject); + SWIG_TypeClientData(SWIGTYPE_p_svn_client__shelf_version_t, (void *) &SwigClassSvn_client__shelf_version_t); + rb_define_alloc_func(SwigClassSvn_client__shelf_version_t.klass, _wrap_svn_client__shelf_version_t_allocate); + rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "initialize", _wrap_new_svn_client__shelf_version_t, -1); + rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "shelf=", _wrap_svn_client__shelf_version_t_shelf_set, -1); + rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "shelf", _wrap_svn_client__shelf_version_t_shelf_get, -1); + rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "mtime=", _wrap_svn_client__shelf_version_t_mtime_set, -1); + rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "mtime", _wrap_svn_client__shelf_version_t_mtime_get, -1); + rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "files_dir_abspath=", _wrap_svn_client__shelf_version_t_files_dir_abspath_set, -1); + rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "files_dir_abspath", _wrap_svn_client__shelf_version_t_files_dir_abspath_get, -1); + rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "version_number=", _wrap_svn_client__shelf_version_t_version_number_set, -1); + rb_define_method(SwigClassSvn_client__shelf_version_t.klass, "version_number", _wrap_svn_client__shelf_version_t_version_number_get, -1); + SwigClassSvn_client__shelf_version_t.mark = 0; + SwigClassSvn_client__shelf_version_t.destroy = (void (*)(void *)) free_svn_client__shelf_version_t; + SwigClassSvn_client__shelf_version_t.trackObjects = 0; + rb_define_module_function(mClient, "svn_client__shelf_open_or_create", _wrap_svn_client__shelf_open_or_create, -1); + rb_define_module_function(mClient, "svn_client__shelf_open_existing", _wrap_svn_client__shelf_open_existing, -1); + rb_define_module_function(mClient, "svn_client__shelf_close", _wrap_svn_client__shelf_close, -1); + rb_define_module_function(mClient, "svn_client__shelf_delete", _wrap_svn_client__shelf_delete, -1); + rb_define_module_function(mClient, "svn_client__shelf_mods_editor", _wrap_svn_client__shelf_mods_editor, -1); + rb_define_module_function(mClient, "svn_client__shelf_save_new_version3", _wrap_svn_client__shelf_save_new_version3, -1); + rb_define_module_function(mClient, "svn_client__shelf_delete_newer_versions", _wrap_svn_client__shelf_delete_newer_versions, -1); + rb_define_module_function(mClient, "svn_client__shelf_version_open", _wrap_svn_client__shelf_version_open, -1); + rb_define_module_function(mClient, "svn_client__shelf_get_newest_version", _wrap_svn_client__shelf_get_newest_version, -1); + rb_define_module_function(mClient, "svn_client__shelf_get_all_versions", _wrap_svn_client__shelf_get_all_versions, -1); + rb_define_module_function(mClient, "svn_client__shelf_apply", _wrap_svn_client__shelf_apply, -1); + rb_define_module_function(mClient, "svn_client__shelf_test_apply_file", _wrap_svn_client__shelf_test_apply_file, -1); + rb_define_module_function(mClient, "svn_client__shelf_unapply", _wrap_svn_client__shelf_unapply, -1); + rb_define_module_function(mClient, "svn_client__shelf_replay", _wrap_svn_client__shelf_replay, -1); + rb_define_module_function(mClient, "svn_client__shelf_paths_changed", _wrap_svn_client__shelf_paths_changed, -1); + rb_define_module_function(mClient, "svn_client__shelf_revprop_set", _wrap_svn_client__shelf_revprop_set, -1); + rb_define_module_function(mClient, "svn_client__shelf_revprop_set_all", _wrap_svn_client__shelf_revprop_set_all, -1); + rb_define_module_function(mClient, "svn_client__shelf_revprop_get", _wrap_svn_client__shelf_revprop_get, -1); + rb_define_module_function(mClient, "svn_client__shelf_revprop_list", _wrap_svn_client__shelf_revprop_list, -1); + rb_define_module_function(mClient, "svn_client__shelf_set_log_message", _wrap_svn_client__shelf_set_log_message, -1); + rb_define_module_function(mClient, "svn_client__shelf_get_log_message", _wrap_svn_client__shelf_get_log_message, -1); + + SwigClassSvn_client__shelf_info_t.klass = rb_define_class_under(mClient, "Svn_client__shelf_info_t", rb_cObject); + SWIG_TypeClientData(SWIGTYPE_p_svn_client__shelf_info_t, (void *) &SwigClassSvn_client__shelf_info_t); + rb_define_alloc_func(SwigClassSvn_client__shelf_info_t.klass, _wrap_svn_client__shelf_info_t_allocate); + rb_define_method(SwigClassSvn_client__shelf_info_t.klass, "initialize", _wrap_new_svn_client__shelf_info_t, -1); + rb_define_method(SwigClassSvn_client__shelf_info_t.klass, "mtime=", _wrap_svn_client__shelf_info_t_mtime_set, -1); + rb_define_method(SwigClassSvn_client__shelf_info_t.klass, "mtime", _wrap_svn_client__shelf_info_t_mtime_get, -1); + SwigClassSvn_client__shelf_info_t.mark = 0; + SwigClassSvn_client__shelf_info_t.destroy = (void (*)(void *)) free_svn_client__shelf_info_t; + SwigClassSvn_client__shelf_info_t.trackObjects = 0; + rb_define_module_function(mClient, "svn_client__shelf_list", _wrap_svn_client__shelf_list, -1); + rb_define_module_function(mClient, "svn_client__shelf_version_status_walk", _wrap_svn_client__shelf_version_status_walk, -1); rb_define_module_function(mClient, "svn_client_add_to_changelist", _wrap_svn_client_add_to_changelist, -1); rb_define_module_function(mClient, "svn_client_remove_from_changelists", _wrap_svn_client_remove_from_changelists, -1); rb_define_module_function(mClient, "svn_client_get_changelists", _wrap_svn_client_get_changelists, -1); @@ -37694,10 +40903,12 @@ SWIGEXPORT void Init_client(void) { rb_define_module_function(mClient, "svn_client_invoke_get_commit_log3", _wrap_svn_client_invoke_get_commit_log3, -1); rb_define_module_function(mClient, "svn_client_invoke_get_commit_log2", _wrap_svn_client_invoke_get_commit_log2, -1); rb_define_module_function(mClient, "svn_client_invoke_get_commit_log", _wrap_svn_client_invoke_get_commit_log, -1); + rb_define_module_function(mClient, "svn_client_invoke_blame_receiver4", _wrap_svn_client_invoke_blame_receiver4, -1); rb_define_module_function(mClient, "svn_client_invoke_blame_receiver3", _wrap_svn_client_invoke_blame_receiver3, -1); rb_define_module_function(mClient, "svn_client_invoke_blame_receiver2", _wrap_svn_client_invoke_blame_receiver2, -1); rb_define_module_function(mClient, "svn_client_invoke_blame_receiver", _wrap_svn_client_invoke_blame_receiver, -1); rb_define_module_function(mClient, "svn_client_invoke_diff_summarize_func", _wrap_svn_client_invoke_diff_summarize_func, -1); + rb_define_module_function(mClient, "svn_client_invoke__layout_func", _wrap_svn_client_invoke__layout_func, -1); rb_define_module_function(mClient, "svn_client_invoke_import_filter_func", _wrap_svn_client_invoke_import_filter_func, -1); rb_define_module_function(mClient, "svn_client_invoke_status_func", _wrap_svn_client_invoke_status_func, -1); rb_define_module_function(mClient, "svn_client_invoke_conflict_walk_func", _wrap_svn_client_invoke_conflict_walk_func, -1); diff --git a/subversion/bindings/swig/ruby/svn_delta.c b/subversion/bindings/swig/ruby/svn_delta.c index 15075eb..e549695 100644 --- a/subversion/bindings/swig/ruby/svn_delta.c +++ b/subversion/bindings/swig/ruby/svn_delta.c @@ -1814,102 +1814,106 @@ int SWIG_Ruby_arity( VALUE proc, int minimal ) #define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[8] #define SWIGTYPE_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[9] #define SWIGTYPE_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[10] -#define SWIGTYPE_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[11] -#define SWIGTYPE_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[12] -#define SWIGTYPE_p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[13] -#define SWIGTYPE_p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[14] -#define SWIGTYPE_p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[15] -#define SWIGTYPE_p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[16] -#define SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[17] -#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[18] -#define SWIGTYPE_p_f_p_void__p_unsigned_char swig_types[19] -#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[20] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[21] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t swig_types[22] -#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[23] -#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[24] -#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[25] -#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[26] -#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[27] -#define SWIGTYPE_p_int swig_types[28] -#define SWIGTYPE_p_long swig_types[29] -#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[30] -#define SWIGTYPE_p_p_svn_checksum_t swig_types[31] -#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[32] -#define SWIGTYPE_p_p_svn_txdelta_stream_t swig_types[33] -#define SWIGTYPE_p_p_svn_txdelta_window_t swig_types[34] -#define SWIGTYPE_p_p_void swig_types[35] -#define SWIGTYPE_p_svn_auth_baton_t swig_types[36] -#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[37] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[38] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[39] -#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[40] -#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[41] -#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[42] -#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[43] -#define SWIGTYPE_p_svn_auth_provider_t swig_types[44] -#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[45] -#define SWIGTYPE_p_svn_cache_config_t swig_types[46] -#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[47] -#define SWIGTYPE_p_svn_checksum_kind_t swig_types[48] -#define SWIGTYPE_p_svn_checksum_t swig_types[49] -#define SWIGTYPE_p_svn_commit_info_t swig_types[50] -#define SWIGTYPE_p_svn_config_t swig_types[51] -#define SWIGTYPE_p_svn_delta_editor_t swig_types[52] -#define SWIGTYPE_p_svn_depth_t swig_types[53] -#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[54] -#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[55] -#define SWIGTYPE_p_svn_diff_datasource_e swig_types[56] -#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[57] -#define SWIGTYPE_p_svn_diff_file_options_t swig_types[58] -#define SWIGTYPE_p_svn_diff_fns2_t swig_types[59] -#define SWIGTYPE_p_svn_diff_fns_t swig_types[60] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[61] -#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[62] -#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[63] -#define SWIGTYPE_p_svn_diff_t swig_types[64] -#define SWIGTYPE_p_svn_dirent_t swig_types[65] -#define SWIGTYPE_p_svn_errno_t swig_types[66] -#define SWIGTYPE_p_svn_error_t swig_types[67] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[68] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[69] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[70] -#define SWIGTYPE_p_svn_location_segment_t swig_types[71] -#define SWIGTYPE_p_svn_lock_t swig_types[72] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[73] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[74] -#define SWIGTYPE_p_svn_log_entry_t swig_types[75] -#define SWIGTYPE_p_svn_merge_range_t swig_types[76] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[77] -#define SWIGTYPE_p_svn_node_kind_t swig_types[78] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[79] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[80] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[81] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[82] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[83] -#define SWIGTYPE_p_svn_patch_file_t swig_types[84] -#define SWIGTYPE_p_svn_patch_t swig_types[85] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[86] -#define SWIGTYPE_p_svn_prop_kind swig_types[87] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[88] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[89] -#define SWIGTYPE_p_svn_stream_t swig_types[90] -#define SWIGTYPE_p_svn_string_t swig_types[91] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[92] -#define SWIGTYPE_p_svn_tristate_t swig_types[93] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[94] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[95] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[96] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[97] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[98] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[99] -#define SWIGTYPE_p_svn_version_extended_t swig_types[100] -#define SWIGTYPE_p_svn_version_t swig_types[101] -#define SWIGTYPE_p_unsigned_char swig_types[102] -#define SWIGTYPE_p_unsigned_long swig_types[103] -#define SWIGTYPE_p_void swig_types[104] -static swig_type_info *swig_types[106]; -static swig_module_info swig_module = {swig_types, 105, 0, 0, 0, 0}; +#define SWIGTYPE_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[11] +#define SWIGTYPE_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[12] +#define SWIGTYPE_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[13] +#define SWIGTYPE_p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[14] +#define SWIGTYPE_p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[15] +#define SWIGTYPE_p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[16] +#define SWIGTYPE_p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[17] +#define SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[18] +#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[19] +#define SWIGTYPE_p_f_p_void__p_unsigned_char swig_types[20] +#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[21] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[22] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t swig_types[23] +#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[24] +#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[25] +#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[26] +#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[27] +#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t swig_types[28] +#define SWIGTYPE_p_int swig_types[29] +#define SWIGTYPE_p_long swig_types[30] +#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[31] +#define SWIGTYPE_p_p_svn_checksum_t swig_types[32] +#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[33] +#define SWIGTYPE_p_p_svn_delta_path_driver_state_t swig_types[34] +#define SWIGTYPE_p_p_svn_txdelta_stream_t swig_types[35] +#define SWIGTYPE_p_p_svn_txdelta_window_t swig_types[36] +#define SWIGTYPE_p_p_void swig_types[37] +#define SWIGTYPE_p_svn_auth_baton_t swig_types[38] +#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[39] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[40] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[41] +#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[42] +#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[43] +#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[44] +#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[45] +#define SWIGTYPE_p_svn_auth_provider_t swig_types[46] +#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[47] +#define SWIGTYPE_p_svn_cache_config_t swig_types[48] +#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[49] +#define SWIGTYPE_p_svn_checksum_kind_t swig_types[50] +#define SWIGTYPE_p_svn_checksum_t swig_types[51] +#define SWIGTYPE_p_svn_commit_info_t swig_types[52] +#define SWIGTYPE_p_svn_config_t swig_types[53] +#define SWIGTYPE_p_svn_delta_editor_t swig_types[54] +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[55] +#define SWIGTYPE_p_svn_depth_t swig_types[56] +#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[57] +#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[58] +#define SWIGTYPE_p_svn_diff_datasource_e swig_types[59] +#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[60] +#define SWIGTYPE_p_svn_diff_file_options_t swig_types[61] +#define SWIGTYPE_p_svn_diff_fns2_t swig_types[62] +#define SWIGTYPE_p_svn_diff_fns_t swig_types[63] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[64] +#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[65] +#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[66] +#define SWIGTYPE_p_svn_diff_t swig_types[67] +#define SWIGTYPE_p_svn_dirent_t swig_types[68] +#define SWIGTYPE_p_svn_errno_t swig_types[69] +#define SWIGTYPE_p_svn_error_t swig_types[70] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[71] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[72] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[73] +#define SWIGTYPE_p_svn_location_segment_t swig_types[74] +#define SWIGTYPE_p_svn_lock_t swig_types[75] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[76] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[77] +#define SWIGTYPE_p_svn_log_entry_t swig_types[78] +#define SWIGTYPE_p_svn_merge_range_t swig_types[79] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[80] +#define SWIGTYPE_p_svn_node_kind_t swig_types[81] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[82] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[83] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[84] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[85] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[86] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[87] +#define SWIGTYPE_p_svn_patch_file_t swig_types[88] +#define SWIGTYPE_p_svn_patch_t swig_types[89] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[90] +#define SWIGTYPE_p_svn_prop_kind swig_types[91] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[92] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[93] +#define SWIGTYPE_p_svn_stream_t swig_types[94] +#define SWIGTYPE_p_svn_string_t swig_types[95] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[96] +#define SWIGTYPE_p_svn_tristate_t swig_types[97] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[98] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[99] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[100] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[101] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[102] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[103] +#define SWIGTYPE_p_svn_version_extended_t swig_types[104] +#define SWIGTYPE_p_svn_version_t swig_types[105] +#define SWIGTYPE_p_unsigned_char swig_types[106] +#define SWIGTYPE_p_unsigned_long swig_types[107] +#define SWIGTYPE_p_void swig_types[108] +static swig_type_info *swig_types[110]; +static swig_module_info swig_module = {swig_types, 109, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2014,7 +2018,7 @@ SWIG_ruby_failed(void) } -/*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args) { VALUE obj = args[0]; @@ -2059,7 +2063,7 @@ SWIG_AsVal_int (VALUE obj, int *val) } -/*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args) { VALUE obj = args[0]; @@ -2250,6 +2254,11 @@ static svn_error_t * svn_txdelta_invoke_stream_open_func( return _obj(txdelta_stream, baton, result_pool, scratch_pool); } +static svn_error_t * svn_delta_invoke_path_driver_cb_func2( + svn_delta_path_driver_cb_func2_t _obj, void **dir_baton, const svn_delta_editor_t *editor, void *edit_baton, void *parent_baton, void *callback_baton, const char *relpath, apr_pool_t *pool) { + return _obj(dir_baton, editor, edit_baton, parent_baton, callback_baton, relpath, pool); +} + static svn_error_t * svn_delta_invoke_path_driver_cb_func( svn_delta_path_driver_cb_func_t _obj, void **dir_baton, void *parent_baton, void *callback_baton, const char *path, apr_pool_t *pool) { return _obj(dir_baton, parent_baton, callback_baton, path, pool); @@ -5724,6 +5733,96 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_delta_path_driver3(int argc, VALUE *argv, VALUE self) { + svn_delta_editor_t *arg1 = (svn_delta_editor_t *) 0 ; + void *arg2 = (void *) 0 ; + apr_array_header_t *arg3 = (apr_array_header_t *) 0 ; + svn_boolean_t arg4 ; + svn_delta_path_driver_cb_func2_t arg5 = (svn_delta_path_driver_cb_func2_t) 0 ; + void *arg6 = (void *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp3 = 0 ; + int res3 = 0 ; + int res6 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg7); + _global_pool = arg7; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 5) || (argc > 6)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail; + } + { + if (RTEST(rb_obj_is_kind_of(argv[0], + svn_swig_rb_svn_delta_editor()))) { + arg1 = svn_swig_rb_to_swig_type(argv[0], + "svn_delta_editor_t *", + _global_pool); + arg2 = svn_swig_rb_to_swig_type(rb_funcall(argv[0], rb_intern("baton"), 0), + "void *", _global_pool); + } else { + svn_swig_rb_make_delta_editor(&arg1, &arg2, argv[0], _global_pool); + } + } + res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_apr_array_header_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "apr_array_header_t const *","svn_delta_path_driver3", 3, argv[1] )); + } + arg3 = (apr_array_header_t *)(argp3); + arg4 = RTEST(argv[2]); + { + int res = SWIG_ConvertFunctionPtr(argv[3], (void**)(&arg5), SWIGTYPE_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_delta_path_driver_cb_func2_t","svn_delta_path_driver3", 5, argv[3] )); + } + } + res6 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg6), 0, 0); + if (!SWIG_IsOK(res6)) { + SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","svn_delta_path_driver3", 6, argv[4] )); + } + if (argc > 5) { + + } + { + result = (svn_error_t *)svn_delta_path_driver3((struct svn_delta_editor_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5,arg6,arg7); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_delta_path_driver2(int argc, VALUE *argv, VALUE self) { svn_delta_editor_t *arg1 = (svn_delta_editor_t *) 0 ; @@ -5888,6 +5987,231 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_delta_path_driver_start(int argc, VALUE *argv, VALUE self) { + svn_delta_path_driver_state_t **arg1 = (svn_delta_path_driver_state_t **) 0 ; + svn_delta_editor_t *arg2 = (svn_delta_editor_t *) 0 ; + void *arg3 = (void *) 0 ; + svn_delta_path_driver_cb_func2_t arg4 = (svn_delta_path_driver_cb_func2_t) 0 ; + void *arg5 = (void *) 0 ; + apr_pool_t *arg6 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + svn_delta_path_driver_state_t *temp1 ; + int res5 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg6); + _global_pool = arg6; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + if ((argc < 3) || (argc > 4)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + } + { + if (RTEST(rb_obj_is_kind_of(argv[0], + svn_swig_rb_svn_delta_editor()))) { + arg2 = svn_swig_rb_to_swig_type(argv[0], + "svn_delta_editor_t *", + _global_pool); + arg3 = svn_swig_rb_to_swig_type(rb_funcall(argv[0], rb_intern("baton"), 0), + "void *", _global_pool); + } else { + svn_swig_rb_make_delta_editor(&arg2, &arg3, argv[0], _global_pool); + } + } + { + int res = SWIG_ConvertFunctionPtr(argv[1], (void**)(&arg4), SWIGTYPE_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_delta_path_driver_cb_func2_t","svn_delta_path_driver_start", 4, argv[1] )); + } + } + res5 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg5), 0, 0); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "void *","svn_delta_path_driver_start", 5, argv[2] )); + } + if (argc > 3) { + + } + { + result = (svn_error_t *)svn_delta_path_driver_start(arg1,(struct svn_delta_editor_t const *)arg2,arg3,arg4,arg5,arg6); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + /* FIXME: Missing argout typemap: svn_delta_path_driver_start arg 1 (svn_delta_path_driver_state_t **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_delta_path_driver_start is not implemented yet"); + + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_delta_path_driver_step(int argc, VALUE *argv, VALUE self) { + svn_delta_path_driver_state_t *arg1 = (svn_delta_path_driver_state_t *) 0 ; + char *arg2 = (char *) 0 ; + apr_pool_t *arg3 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3); + _global_pool = arg3; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 2) || (argc > 3)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_delta_path_driver_state_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_delta_path_driver_state_t *","svn_delta_path_driver_step", 1, argv[0] )); + } + arg1 = (svn_delta_path_driver_state_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_delta_path_driver_step", 2, argv[1] )); + } + arg2 = (char *)(buf2); + if (argc > 2) { + + } + { + result = (svn_error_t *)svn_delta_path_driver_step(arg1,(char const *)arg2,arg3); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_delta_path_driver_finish(int argc, VALUE *argv, VALUE self) { + svn_delta_path_driver_state_t *arg1 = (svn_delta_path_driver_state_t *) 0 ; + apr_pool_t *arg2 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg2); + _global_pool = arg2; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 1) || (argc > 2)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_delta_path_driver_state_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_delta_path_driver_state_t *","svn_delta_path_driver_finish", 1, argv[0] )); + } + arg1 = (svn_delta_path_driver_state_t *)(argp1); + if (argc > 1) { + + } + { + result = (svn_error_t *)svn_delta_path_driver_finish(arg1,arg2); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_delta_editor_invoke_set_target_revision(int argc, VALUE *argv, VALUE self) { svn_delta_editor_t *arg1 = (svn_delta_editor_t *) 0 ; @@ -7557,6 +7881,109 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_delta_invoke_path_driver_cb_func2(int argc, VALUE *argv, VALUE self) { + svn_delta_path_driver_cb_func2_t arg1 = (svn_delta_path_driver_cb_func2_t) 0 ; + void **arg2 = (void **) 0 ; + svn_delta_editor_t *arg3 = (svn_delta_editor_t *) 0 ; + void *arg4 = (void *) 0 ; + void *arg5 = (void *) 0 ; + void *arg6 = (void *) 0 ; + char *arg7 = (char *) 0 ; + apr_pool_t *arg8 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *temp2 ; + int res5 ; + int res6 ; + int res7 ; + char *buf7 = 0 ; + int alloc7 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg8); + _global_pool = arg8; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg2 = &temp2; + if ((argc < 5) || (argc > 6)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail; + } + { + int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_delta_path_driver_cb_func2_t","svn_delta_invoke_path_driver_cb_func2", 1, argv[0] )); + } + } + { + if (RTEST(rb_obj_is_kind_of(argv[1], + svn_swig_rb_svn_delta_editor()))) { + arg3 = svn_swig_rb_to_swig_type(argv[1], + "svn_delta_editor_t *", + _global_pool); + arg4 = svn_swig_rb_to_swig_type(rb_funcall(argv[1], rb_intern("baton"), 0), + "void *", _global_pool); + } else { + svn_swig_rb_make_delta_editor(&arg3, &arg4, argv[1], _global_pool); + } + } + res5 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg5), 0, 0); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "void *","svn_delta_invoke_path_driver_cb_func2", 5, argv[2] )); + } + res6 = SWIG_ConvertPtr(argv[3],SWIG_as_voidptrptr(&arg6), 0, 0); + if (!SWIG_IsOK(res6)) { + SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","svn_delta_invoke_path_driver_cb_func2", 6, argv[3] )); + } + res7 = SWIG_AsCharPtrAndSize(argv[4], &buf7, NULL, &alloc7); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "char const *","svn_delta_invoke_path_driver_cb_func2", 7, argv[4] )); + } + arg7 = (char *)(buf7); + if (argc > 5) { + + } + { + result = (svn_error_t *)svn_delta_invoke_path_driver_cb_func2(arg1,arg2,(struct svn_delta_editor_t const *)arg3,arg4,arg5,arg6,(char const *)arg7,arg8); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg2, SWIGTYPE_p_void, 0)); + } + if (alloc7 == SWIG_NEWOBJ) free((char*)buf7); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc7 == SWIG_NEWOBJ) free((char*)buf7); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_delta_invoke_path_driver_cb_func(int argc, VALUE *argv, VALUE self) { svn_delta_path_driver_cb_func_t arg1 = (svn_delta_path_driver_cb_func_t) 0 ; @@ -8761,31 +9188,33 @@ static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *| static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_size_t = {"_p_apr_size_t", "apr_size_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_stream_t **,void *,apr_pool_t *,apr_pool_t *)|svn_txdelta_stream_open_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_t **,void *,apr_pool_t *)|svn_txdelta_next_window_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_delta_path_driver_cb_func_t|struct svn_error_t *(*)(void **,void *,void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,void *,apr_pool_t *)|struct svn_error_t *(*)(char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "struct svn_error_t *(*)(char const *,void *,char const *,svn_revnum_t,apr_pool_t *,void **)|svn_error_t *(*)(char const *,void *,char const *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "svn_error_t *(*)(char const *,void *,svn_revnum_t,apr_pool_t *,void **)|struct svn_error_t *(*)(char const *,void *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_revnum_t,void *,apr_pool_t *)|struct svn_error_t *(*)(char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(struct svn_delta_editor_t const *,void *,char const *,svn_txdelta_stream_open_func_t,void *,apr_pool_t *)|struct svn_error_t *(*)(struct svn_delta_editor_t const *,void *,char const *,svn_txdelta_stream_open_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_stream_t **,void *,apr_pool_t *,apr_pool_t *)|svn_txdelta_stream_open_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_window_t **,void *,apr_pool_t *)|svn_txdelta_next_window_fn_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_delta_path_driver_cb_func2_t|svn_error_t *(*)(void **,svn_delta_editor_t const *,void *,void *,void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_delta_path_driver_cb_func_t|svn_error_t *(*)(void **,void *,void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "svn_error_t *(*)(char const *,void *,char const *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_q_const__char_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "svn_error_t *(*)(char const *,void *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__struct_svn_delta_editor_t_p_void_p_q_const__char_svn_txdelta_stream_open_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(struct svn_delta_editor_t const *,void *,char const *,svn_txdelta_stream_open_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void__p_unsigned_char = {"_p_f_p_void__p_unsigned_char", "unsigned char *(*)(void *)|svn_txdelta_md5_digest_fn_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_error_t *(*)(void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_pool_t *,svn_txdelta_window_handler_t *,void **)|svn_error_t *(*)(void *,char const *,apr_pool_t *,svn_txdelta_window_handler_t *,void **)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_string_t const *,apr_pool_t *)|svn_error_t *(*)(void *,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_file_rev_handler_old_t|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *,void **)|svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t_p_svn_txdelta_window_handler_t_p_p_void__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *,svn_txdelta_window_handler_t *,void **)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_file_rev_handler_old_t|svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,apr_pool_t *,void **)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_txdelta_window_handler_t *|struct svn_error_t *(**)(svn_txdelta_window_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(**)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_checksum_t = {"_p_p_svn_checksum_t", "struct svn_checksum_t **|svn_checksum_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_svn_delta_path_driver_state_t = {"_p_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t **|svn_delta_path_driver_state_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_txdelta_stream_t = {"_p_p_svn_txdelta_stream_t", "struct svn_txdelta_stream_t **|svn_txdelta_stream_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_txdelta_window_t = {"_p_p_svn_txdelta_window_t", "struct svn_txdelta_window_t **|svn_txdelta_window_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **", 0, 0, (void*)0, 0}; @@ -8806,6 +9235,7 @@ static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct s static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_binary_patch_t = {"_p_svn_diff_binary_patch_t", "struct svn_diff_binary_patch_t *|svn_diff_binary_patch_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_conflict_display_style_t = {"_p_svn_diff_conflict_display_style_t", "enum svn_diff_conflict_display_style_t *|svn_diff_conflict_display_style_t *", 0, 0, (void*)0, 0}; @@ -8820,7 +9250,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0}; @@ -8836,6 +9266,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -8871,6 +9302,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, + &_swigt__p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t, @@ -8893,6 +9325,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, &_swigt__p_p_svn_checksum_t, &_swigt__p_p_svn_delta_editor_t, + &_swigt__p_p_svn_delta_path_driver_state_t, &_swigt__p_p_svn_txdelta_stream_t, &_swigt__p_p_svn_txdelta_window_t, &_swigt__p_p_void, @@ -8913,6 +9346,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_binary_patch_t, &_swigt__p_svn_diff_conflict_display_style_t, @@ -8943,6 +9377,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -8978,6 +9413,7 @@ static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, static swig_cast_info _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t[] = { {&_swigt__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -9000,6 +9436,7 @@ static swig_cast_info _swigc__p_long[] = { {&_swigt__p_long, 0, 0, 0},{0, 0, 0, static swig_cast_info _swigc__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t[] = { {&_swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_checksum_t[] = { {&_swigt__p_p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_delta_editor_t[] = { {&_swigt__p_p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_svn_delta_path_driver_state_t[] = { {&_swigt__p_p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_txdelta_stream_t[] = { {&_swigt__p_p_svn_txdelta_stream_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_svn_txdelta_window_t[] = { {&_swigt__p_p_svn_txdelta_window_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_void[] = { {&_swigt__p_p_void, 0, 0, 0},{0, 0, 0, 0}}; @@ -9020,6 +9457,7 @@ static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_binary_patch_t[] = { {&_swigt__p_svn_diff_binary_patch_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_conflict_display_style_t[] = { {&_swigt__p_svn_diff_conflict_display_style_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -9050,6 +9488,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -9085,6 +9524,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_p_svn_txdelta_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, + _swigc__p_f_p_p_void_p_q_const__svn_delta_editor_t_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_q_const__char_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t_p_p_void__p_svn_error_t, @@ -9107,6 +9547,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, _swigc__p_p_svn_checksum_t, _swigc__p_p_svn_delta_editor_t, + _swigc__p_p_svn_delta_path_driver_state_t, _swigc__p_p_svn_txdelta_stream_t, _swigc__p_p_svn_txdelta_window_t, _swigc__p_p_void, @@ -9127,6 +9568,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_binary_patch_t, _swigc__p_svn_diff_conflict_display_style_t, @@ -9157,6 +9599,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, @@ -9545,8 +9988,12 @@ SWIGEXPORT void Init_delta(void) { rb_define_module_function(mDelta, "svn_delta_noop_window_handler", _wrap_svn_delta_noop_window_handler, -1); rb_define_module_function(mDelta, "svn_delta_get_cancellation_editor", _wrap_svn_delta_get_cancellation_editor, -1); rb_define_module_function(mDelta, "svn_delta_depth_filter_editor", _wrap_svn_delta_depth_filter_editor, -1); + rb_define_module_function(mDelta, "svn_delta_path_driver3", _wrap_svn_delta_path_driver3, -1); rb_define_module_function(mDelta, "svn_delta_path_driver2", _wrap_svn_delta_path_driver2, -1); rb_define_module_function(mDelta, "svn_delta_path_driver", _wrap_svn_delta_path_driver, -1); + rb_define_module_function(mDelta, "svn_delta_path_driver_start", _wrap_svn_delta_path_driver_start, -1); + rb_define_module_function(mDelta, "svn_delta_path_driver_step", _wrap_svn_delta_path_driver_step, -1); + rb_define_module_function(mDelta, "svn_delta_path_driver_finish", _wrap_svn_delta_path_driver_finish, -1); rb_define_module_function(mDelta, "svn_delta_editor_invoke_set_target_revision", _wrap_svn_delta_editor_invoke_set_target_revision, -1); rb_define_module_function(mDelta, "svn_delta_editor_invoke_open_root", _wrap_svn_delta_editor_invoke_open_root, -1); rb_define_module_function(mDelta, "svn_delta_editor_invoke_delete_entry", _wrap_svn_delta_editor_invoke_delete_entry, -1); @@ -9568,6 +10015,7 @@ SWIGEXPORT void Init_delta(void) { rb_define_module_function(mDelta, "svn_txdelta_invoke_next_window_fn", _wrap_svn_txdelta_invoke_next_window_fn, -1); rb_define_module_function(mDelta, "svn_txdelta_invoke_md5_digest_fn", _wrap_svn_txdelta_invoke_md5_digest_fn, -1); rb_define_module_function(mDelta, "svn_txdelta_invoke_stream_open_func", _wrap_svn_txdelta_invoke_stream_open_func, -1); + rb_define_module_function(mDelta, "svn_delta_invoke_path_driver_cb_func2", _wrap_svn_delta_invoke_path_driver_cb_func2, -1); rb_define_module_function(mDelta, "svn_delta_invoke_path_driver_cb_func", _wrap_svn_delta_invoke_path_driver_cb_func, -1); rb_define_module_function(mDelta, "svn_file_invoke_rev_handler", _wrap_svn_file_invoke_rev_handler, -1); rb_define_module_function(mDelta, "svn_file_invoke_rev_handler_old", _wrap_svn_file_invoke_rev_handler_old, -1); diff --git a/subversion/bindings/swig/ruby/svn_diff.c b/subversion/bindings/swig/ruby/svn_diff.c index de86a5b..e579c05 100644 --- a/subversion/bindings/swig/ruby/svn_diff.c +++ b/subversion/bindings/swig/ruby/svn_diff.c @@ -1856,25 +1856,26 @@ int SWIG_Ruby_arity( VALUE proc, int minimal ) #define SWIGTYPE_p_svn_opt_revision_t swig_types[50] #define SWIGTYPE_p_svn_opt_revision_value_t swig_types[51] #define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[52] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[53] -#define SWIGTYPE_p_svn_patch_file_t swig_types[54] -#define SWIGTYPE_p_svn_patch_t swig_types[55] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[56] -#define SWIGTYPE_p_svn_prop_kind swig_types[57] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[58] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[59] -#define SWIGTYPE_p_svn_stream_t swig_types[60] -#define SWIGTYPE_p_svn_string_t swig_types[61] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[62] -#define SWIGTYPE_p_svn_tristate_t swig_types[63] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[64] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[65] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[66] -#define SWIGTYPE_p_svn_version_extended_t swig_types[67] -#define SWIGTYPE_p_svn_version_t swig_types[68] -#define SWIGTYPE_p_unsigned_long swig_types[69] -static swig_type_info *swig_types[71]; -static swig_module_info swig_module = {swig_types, 70, 0, 0, 0, 0}; +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[53] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[54] +#define SWIGTYPE_p_svn_patch_file_t swig_types[55] +#define SWIGTYPE_p_svn_patch_t swig_types[56] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[57] +#define SWIGTYPE_p_svn_prop_kind swig_types[58] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[59] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[60] +#define SWIGTYPE_p_svn_stream_t swig_types[61] +#define SWIGTYPE_p_svn_string_t swig_types[62] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[63] +#define SWIGTYPE_p_svn_tristate_t swig_types[64] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[65] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[66] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[67] +#define SWIGTYPE_p_svn_version_extended_t swig_types[68] +#define SWIGTYPE_p_svn_version_t swig_types[69] +#define SWIGTYPE_p_unsigned_long swig_types[70] +static swig_type_info *swig_types[72]; +static swig_module_info swig_module = {swig_types, 71, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -1944,7 +1945,7 @@ static swig_type_info _swigt__p_apr_array_header_t = {"_p_apr_array_header_t", " static swig_type_info _swigt__p_apr_int32_t = {"_p_apr_int32_t", "apr_int32_t *|time_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *|svn_filesize_t *|apr_time_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_auth_baton_t = {"_p_svn_auth_baton_t", "struct svn_auth_baton_t *|svn_auth_baton_t *", 0, 0, (void*)0, 0}; @@ -1977,7 +1978,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0}; @@ -1993,6 +1994,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -2065,6 +2067,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -2137,6 +2140,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -2209,6 +2213,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, diff --git a/subversion/bindings/swig/ruby/svn_fs.c b/subversion/bindings/swig/ruby/svn_fs.c index 13bef56..6d365d1 100644 --- a/subversion/bindings/swig/ruby/svn_fs.c +++ b/subversion/bindings/swig/ruby/svn_fs.c @@ -1821,7 +1821,7 @@ int SWIG_Ruby_arity( VALUE proc, int minimal ) #define SWIGTYPE_p_f_p_void_long_long_p_apr_pool_t__void swig_types[15] #define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[16] #define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[17] -#define SWIGTYPE_p_f_p_void_p_struct_svn_error_t__void swig_types[18] +#define SWIGTYPE_p_f_p_void_p_svn_error_t__void swig_types[18] #define SWIGTYPE_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t swig_types[19] #define SWIGTYPE_p_int swig_types[20] #define SWIGTYPE_p_long swig_types[21] @@ -1862,79 +1862,82 @@ int SWIG_Ruby_arity( VALUE proc, int minimal ) #define SWIGTYPE_p_svn_commit_info_t swig_types[56] #define SWIGTYPE_p_svn_config_t swig_types[57] #define SWIGTYPE_p_svn_delta_editor_t swig_types[58] -#define SWIGTYPE_p_svn_depth_t swig_types[59] -#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[60] -#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[61] -#define SWIGTYPE_p_svn_diff_datasource_e swig_types[62] -#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[63] -#define SWIGTYPE_p_svn_diff_file_options_t swig_types[64] -#define SWIGTYPE_p_svn_diff_fns2_t swig_types[65] -#define SWIGTYPE_p_svn_diff_fns_t swig_types[66] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[67] -#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[68] -#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[69] -#define SWIGTYPE_p_svn_diff_t swig_types[70] -#define SWIGTYPE_p_svn_dirent_t swig_types[71] -#define SWIGTYPE_p_svn_errno_t swig_types[72] -#define SWIGTYPE_p_svn_error_t swig_types[73] -#define SWIGTYPE_p_svn_fs_access_t swig_types[74] -#define SWIGTYPE_p_svn_fs_dirent_t swig_types[75] -#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[76] -#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[77] -#define SWIGTYPE_p_svn_fs_history_t swig_types[78] -#define SWIGTYPE_p_svn_fs_id_t swig_types[79] -#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[80] -#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[81] -#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[82] -#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[83] -#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[84] -#define SWIGTYPE_p_svn_fs_path_change3_t swig_types[85] -#define SWIGTYPE_p_svn_fs_path_change_iterator_t swig_types[86] -#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[87] -#define SWIGTYPE_p_svn_fs_path_change_t swig_types[88] -#define SWIGTYPE_p_svn_fs_root_t swig_types[89] -#define SWIGTYPE_p_svn_fs_t swig_types[90] -#define SWIGTYPE_p_svn_fs_txn_t swig_types[91] -#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[92] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[93] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[94] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[95] -#define SWIGTYPE_p_svn_location_segment_t swig_types[96] -#define SWIGTYPE_p_svn_lock_t swig_types[97] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[98] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[99] -#define SWIGTYPE_p_svn_log_entry_t swig_types[100] -#define SWIGTYPE_p_svn_merge_range_t swig_types[101] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[102] -#define SWIGTYPE_p_svn_node_kind_t swig_types[103] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[104] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[105] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[106] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[107] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[108] -#define SWIGTYPE_p_svn_patch_file_t swig_types[109] -#define SWIGTYPE_p_svn_patch_t swig_types[110] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[111] -#define SWIGTYPE_p_svn_prop_kind swig_types[112] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[113] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[114] -#define SWIGTYPE_p_svn_stream_t swig_types[115] -#define SWIGTYPE_p_svn_string_t swig_types[116] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[117] -#define SWIGTYPE_p_svn_tristate_t swig_types[118] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[119] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[120] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[121] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[122] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[123] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[124] -#define SWIGTYPE_p_svn_version_extended_t swig_types[125] -#define SWIGTYPE_p_svn_version_t swig_types[126] -#define SWIGTYPE_p_unsigned_char swig_types[127] -#define SWIGTYPE_p_unsigned_long swig_types[128] -#define SWIGTYPE_p_void swig_types[129] -static swig_type_info *swig_types[131]; -static swig_module_info swig_module = {swig_types, 130, 0, 0, 0, 0}; +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[59] +#define SWIGTYPE_p_svn_depth_t swig_types[60] +#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[61] +#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[62] +#define SWIGTYPE_p_svn_diff_datasource_e swig_types[63] +#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[64] +#define SWIGTYPE_p_svn_diff_file_options_t swig_types[65] +#define SWIGTYPE_p_svn_diff_fns2_t swig_types[66] +#define SWIGTYPE_p_svn_diff_fns_t swig_types[67] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[68] +#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[69] +#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[70] +#define SWIGTYPE_p_svn_diff_t swig_types[71] +#define SWIGTYPE_p_svn_dirent_t swig_types[72] +#define SWIGTYPE_p_svn_errno_t swig_types[73] +#define SWIGTYPE_p_svn_error_t swig_types[74] +#define SWIGTYPE_p_svn_fs_access_t swig_types[75] +#define SWIGTYPE_p_svn_fs_dirent_t swig_types[76] +#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[77] +#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[78] +#define SWIGTYPE_p_svn_fs_history_t swig_types[79] +#define SWIGTYPE_p_svn_fs_id_t swig_types[80] +#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[81] +#define SWIGTYPE_p_svn_fs_ioctl_code_t swig_types[82] +#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[83] +#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[84] +#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[85] +#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[86] +#define SWIGTYPE_p_svn_fs_path_change3_t swig_types[87] +#define SWIGTYPE_p_svn_fs_path_change_iterator_t swig_types[88] +#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[89] +#define SWIGTYPE_p_svn_fs_path_change_t swig_types[90] +#define SWIGTYPE_p_svn_fs_root_t swig_types[91] +#define SWIGTYPE_p_svn_fs_t swig_types[92] +#define SWIGTYPE_p_svn_fs_txn_t swig_types[93] +#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[94] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[95] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[96] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[97] +#define SWIGTYPE_p_svn_location_segment_t swig_types[98] +#define SWIGTYPE_p_svn_lock_t swig_types[99] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[100] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[101] +#define SWIGTYPE_p_svn_log_entry_t swig_types[102] +#define SWIGTYPE_p_svn_merge_range_t swig_types[103] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[104] +#define SWIGTYPE_p_svn_node_kind_t swig_types[105] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[106] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[107] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[108] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[109] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[110] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[111] +#define SWIGTYPE_p_svn_patch_file_t swig_types[112] +#define SWIGTYPE_p_svn_patch_t swig_types[113] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[114] +#define SWIGTYPE_p_svn_prop_kind swig_types[115] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[116] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[117] +#define SWIGTYPE_p_svn_stream_t swig_types[118] +#define SWIGTYPE_p_svn_string_t swig_types[119] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[120] +#define SWIGTYPE_p_svn_tristate_t swig_types[121] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[122] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[123] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[124] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[125] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[126] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[127] +#define SWIGTYPE_p_svn_version_extended_t swig_types[128] +#define SWIGTYPE_p_svn_version_t swig_types[129] +#define SWIGTYPE_p_unsigned_char swig_types[130] +#define SWIGTYPE_p_unsigned_long swig_types[131] +#define SWIGTYPE_p_void swig_types[132] +static swig_type_info *swig_types[134]; +static swig_module_info swig_module = {swig_types, 133, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2122,7 +2125,7 @@ SWIG_ruby_failed(void) } -/*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args) { VALUE obj = args[0]; @@ -2167,7 +2170,7 @@ SWIG_AsVal_int (VALUE obj, int *val) } -/*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args) { VALUE obj = args[0]; @@ -14493,6 +14496,260 @@ fail: } +static swig_class SwigClassSvn_fs_ioctl_code_t; + +SWIGINTERN VALUE +_wrap_svn_fs_ioctl_code_t_fs_type_set(int argc, VALUE *argv, VALUE self) { + struct svn_fs_ioctl_code_t *arg1 = (struct svn_fs_ioctl_code_t *) 0 ; + char *arg2 = (char *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_ioctl_code_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_ioctl_code_t *","fs_type", 1, self )); + } + arg1 = (struct svn_fs_ioctl_code_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","fs_type", 2, argv[0] )); + } + arg2 = (char *)(buf2); + { + apr_size_t len = strlen(arg2) + 1; + char *copied; + if (arg1->fs_type) free((char *)arg1->fs_type); + copied = malloc(len); + memcpy(copied, arg2, len); + arg1->fs_type = copied; + } + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + return Qnil; +fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_fs_ioctl_code_t_fs_type_get(int argc, VALUE *argv, VALUE self) { + struct svn_fs_ioctl_code_t *arg1 = (struct svn_fs_ioctl_code_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + char *result = 0 ; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_ioctl_code_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_ioctl_code_t *","fs_type", 1, self )); + } + arg1 = (struct svn_fs_ioctl_code_t *)(argp1); + result = (char *) ((arg1)->fs_type); + { + if (result) { + vresult = rb_str_new2(result); + } else { + vresult = Qnil; + } + } + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_fs_ioctl_code_t_code_set(int argc, VALUE *argv, VALUE self) { + struct svn_fs_ioctl_code_t *arg1 = (struct svn_fs_ioctl_code_t *) 0 ; + int arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_ioctl_code_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_ioctl_code_t *","code", 1, self )); + } + arg1 = (struct svn_fs_ioctl_code_t *)(argp1); + ecode2 = SWIG_AsVal_int(argv[0], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","code", 2, argv[0] )); + } + arg2 = (int)(val2); + if (arg1) (arg1)->code = arg2; + return Qnil; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_fs_ioctl_code_t_code_get(int argc, VALUE *argv, VALUE self) { + struct svn_fs_ioctl_code_t *arg1 = (struct svn_fs_ioctl_code_t *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int result; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_ioctl_code_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_ioctl_code_t *","code", 1, self )); + } + arg1 = (struct svn_fs_ioctl_code_t *)(argp1); + result = (int) ((arg1)->code); + vresult = SWIG_From_int((int)(result)); + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_svn_fs_ioctl(int argc, VALUE *argv, VALUE self) { + svn_fs_t *arg1 = (svn_fs_t *) 0 ; + svn_fs_ioctl_code_t arg2 ; + void *arg3 = (void *) 0 ; + void **arg4 = (void **) 0 ; + svn_cancel_func_t arg5 = (svn_cancel_func_t) 0 ; + void *arg6 = (void *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; + apr_pool_t *arg8 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 ; + int res2 = 0 ; + int res3 ; + void *temp4 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg7); + _global_pool = arg7; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg8); + _global_pool = arg8; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg4 = &temp4; + if ((argc < 4) || (argc > 6)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_fs_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_fs_t *","svn_fs_ioctl", 1, argv[0] )); + } + arg1 = (svn_fs_t *)(argp1); + { + res2 = SWIG_ConvertPtr(argv[1], &argp2, SWIGTYPE_p_svn_fs_ioctl_code_t, 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_fs_ioctl_code_t","svn_fs_ioctl", 2, argv[1] )); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "svn_fs_ioctl_code_t","svn_fs_ioctl", 2, argv[1])); + } else { + arg2 = *((svn_fs_ioctl_code_t *)(argp2)); + } + } + res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","svn_fs_ioctl", 3, argv[2] )); + } + { + arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func; + arg6 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool); + } + if (argc > 4) { + + } + if (argc > 5) { + + } + { + if (!arg1) { + svn_swig_rb_raise_svn_fs_already_close(); + } + } + { + result = (svn_error_t *)svn_fs_ioctl(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + /* FIXME: Missing argout typemap: svn_fs_ioctl arg 4 (void **) */ + + + + + SWIG_exception(SWIG_ValueError, "svn_fs_ioctl is not implemented yet"); + + } + { + svn_swig_rb_set_baton(vresult, (VALUE)arg6); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_fs_invoke_warning_callback(int argc, VALUE *argv, VALUE self) { svn_fs_warning_callback_t arg1 = (svn_fs_warning_callback_t) 0 ; @@ -14506,7 +14763,7 @@ _wrap_svn_fs_invoke_warning_callback(int argc, VALUE *argv, VALUE self) { rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; } { - int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_p_struct_svn_error_t__void); + int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_p_svn_error_t__void); if (!SWIG_IsOK(res)) { SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_fs_warning_callback_t","svn_fs_invoke_warning_callback", 1, argv[0] )); } @@ -15231,24 +15488,24 @@ static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0 static swig_type_info _swigt__p_apr_uint64_t = {"_p_apr_uint64_t", "apr_uint64_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_long_p_void_p_apr_pool_t__void = {"_p_f_long_p_void_p_apr_pool_t__void", "void (*)(long,void *,apr_pool_t *)|svn_fs_progress_notify_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)|svn_fs_mergeinfo_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_fs_process_contents_func_t|struct svn_error_t *(*)(unsigned char const *,apr_size_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_uint64_t,svn_fs_upgrade_notify_action_t,apr_pool_t *)|svn_fs_upgrade_notify_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)|svn_fs_mergeinfo_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(unsigned char const *,apr_size_t,void *,apr_pool_t *)|svn_fs_process_contents_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_uint64_t,svn_fs_upgrade_notify_action_t,apr_pool_t *)|svn_fs_upgrade_notify_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_long_long_p_apr_pool_t__void = {"_p_f_p_void_long_long_p_apr_pool_t__void", "void (*)(void *,long,long,apr_pool_t *)|svn_fs_hotcopy_notify_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_fs_freeze_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_struct_svn_error_t__void = {"_p_f_p_void_p_struct_svn_error_t__void", "void (*)(void *,struct svn_error_t *)|svn_fs_warning_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_lock_t *,apr_pool_t *)|svn_fs_get_locks_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_pool_t *)|svn_fs_freeze_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_error_t__void = {"_p_f_p_void_p_svn_error_t__void", "void (*)(void *,svn_error_t *)|svn_fs_warning_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_lock_t *,apr_pool_t *)|svn_fs_get_locks_callback_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_array_header_t = {"_p_p_apr_array_header_t", "apr_array_header_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **|svn_mergeinfo_catalog_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_txdelta_window_handler_t *|struct svn_error_t *(**)(svn_txdelta_window_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(**)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_checksum_t = {"_p_p_svn_checksum_t", "struct svn_checksum_t **|svn_checksum_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_fs_access_t = {"_p_p_svn_fs_access_t", "struct svn_fs_access_t **|svn_fs_access_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_fs_history_t = {"_p_p_svn_fs_history_t", "struct svn_fs_history_t **|svn_fs_history_t **", 0, 0, (void*)0, 0}; @@ -15282,6 +15539,7 @@ static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct s static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_binary_patch_t = {"_p_svn_diff_binary_patch_t", "struct svn_diff_binary_patch_t *|svn_diff_binary_patch_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_conflict_display_style_t = {"_p_svn_diff_conflict_display_style_t", "enum svn_diff_conflict_display_style_t *|svn_diff_conflict_display_style_t *", 0, 0, (void*)0, 0}; @@ -15296,7 +15554,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_access_t = {"_p_svn_fs_access_t", "struct svn_fs_access_t *|svn_fs_access_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_dirent_t = {"_p_svn_fs_dirent_t", "struct svn_fs_dirent_t *|svn_fs_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_fsfs_info_t = {"_p_svn_fs_fsfs_info_t", "struct svn_fs_fsfs_info_t *|svn_fs_fsfs_info_t *", 0, 0, (void*)0, 0}; @@ -15304,6 +15562,7 @@ static swig_type_info _swigt__p_svn_fs_fsx_info_t = {"_p_svn_fs_fsx_info_t", "st static swig_type_info _swigt__p_svn_fs_history_t = {"_p_svn_fs_history_t", "struct svn_fs_history_t *|svn_fs_history_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_id_t = {"_p_svn_fs_id_t", "struct svn_fs_id_t *|svn_fs_id_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_info_placeholder_t = {"_p_svn_fs_info_placeholder_t", "struct svn_fs_info_placeholder_t *|svn_fs_info_placeholder_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_fs_ioctl_code_t = {"_p_svn_fs_ioctl_code_t", "struct svn_fs_ioctl_code_t *|svn_fs_ioctl_code_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "struct svn_fs_lock_target_t *|svn_fs_lock_target_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_node_relation_t = {"_p_svn_fs_node_relation_t", "enum svn_fs_node_relation_t *|svn_fs_node_relation_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_pack_notify_action_t = {"_p_svn_fs_pack_notify_action_t", "enum svn_fs_pack_notify_action_t *|svn_fs_pack_notify_action_t *", 0, 0, (void*)0, 0}; @@ -15331,6 +15590,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -15373,7 +15633,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_f_p_void_long_long_p_apr_pool_t__void, &_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, - &_swigt__p_f_p_void_p_struct_svn_error_t__void, + &_swigt__p_f_p_void_p_svn_error_t__void, &_swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_int, &_swigt__p_long, @@ -15414,6 +15674,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_binary_patch_t, &_swigt__p_svn_diff_conflict_display_style_t, @@ -15436,6 +15697,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_fs_history_t, &_swigt__p_svn_fs_id_t, &_swigt__p_svn_fs_info_placeholder_t, + &_swigt__p_svn_fs_ioctl_code_t, &_swigt__p_svn_fs_lock_target_t, &_swigt__p_svn_fs_node_relation_t, &_swigt__p_svn_fs_pack_notify_action_t, @@ -15463,6 +15725,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -15505,7 +15768,7 @@ static swig_cast_info _swigc__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_acti static swig_cast_info _swigc__p_f_p_void_long_long_p_apr_pool_t__void[] = { {&_swigt__p_f_p_void_long_long_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_f_p_void_p_struct_svn_error_t__void[] = { {&_swigt__p_f_p_void_p_struct_svn_error_t__void, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_void_p_svn_error_t__void[] = { {&_swigt__p_f_p_void_p_svn_error_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_long[] = { {&_swigt__p_long, 0, 0, 0},{0, 0, 0, 0}}; @@ -15546,6 +15809,7 @@ static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_binary_patch_t[] = { {&_swigt__p_svn_diff_binary_patch_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_conflict_display_style_t[] = { {&_swigt__p_svn_diff_conflict_display_style_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -15568,6 +15832,7 @@ static swig_cast_info _swigc__p_svn_fs_fsx_info_t[] = { {&_swigt__p_svn_fs_fsx_ static swig_cast_info _swigc__p_svn_fs_history_t[] = { {&_swigt__p_svn_fs_history_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_id_t[] = { {&_swigt__p_svn_fs_id_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_info_placeholder_t[] = { {&_swigt__p_svn_fs_info_placeholder_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_fs_ioctl_code_t[] = { {&_swigt__p_svn_fs_ioctl_code_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = { {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_node_relation_t[] = { {&_swigt__p_svn_fs_node_relation_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_pack_notify_action_t[] = { {&_swigt__p_svn_fs_pack_notify_action_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -15595,6 +15860,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -15637,7 +15903,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_f_p_void_long_long_p_apr_pool_t__void, _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, - _swigc__p_f_p_void_p_struct_svn_error_t__void, + _swigc__p_f_p_void_p_svn_error_t__void, _swigc__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, _swigc__p_int, _swigc__p_long, @@ -15678,6 +15944,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_binary_patch_t, _swigc__p_svn_diff_conflict_display_style_t, @@ -15700,6 +15967,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_fs_history_t, _swigc__p_svn_fs_id_t, _swigc__p_svn_fs_info_placeholder_t, + _swigc__p_svn_fs_ioctl_code_t, _swigc__p_svn_fs_lock_target_t, _swigc__p_svn_fs_node_relation_t, _swigc__p_svn_fs_pack_notify_action_t, @@ -15727,6 +15995,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, @@ -16290,6 +16559,17 @@ SWIGEXPORT void Init_fs(void) { SwigClassSvn_fs_info_placeholder_t.trackObjects = 0; rb_define_module_function(mFs, "svn_fs_info", _wrap_svn_fs_info, -1); rb_define_module_function(mFs, "svn_fs_info_dup", _wrap_svn_fs_info_dup, -1); + + SwigClassSvn_fs_ioctl_code_t.klass = rb_define_class_under(mFs, "Svn_fs_ioctl_code_t", rb_cObject); + SWIG_TypeClientData(SWIGTYPE_p_svn_fs_ioctl_code_t, (void *) &SwigClassSvn_fs_ioctl_code_t); + rb_undef_alloc_func(SwigClassSvn_fs_ioctl_code_t.klass); + rb_define_method(SwigClassSvn_fs_ioctl_code_t.klass, "fs_type=", _wrap_svn_fs_ioctl_code_t_fs_type_set, -1); + rb_define_method(SwigClassSvn_fs_ioctl_code_t.klass, "fs_type", _wrap_svn_fs_ioctl_code_t_fs_type_get, -1); + rb_define_method(SwigClassSvn_fs_ioctl_code_t.klass, "code=", _wrap_svn_fs_ioctl_code_t_code_set, -1); + rb_define_method(SwigClassSvn_fs_ioctl_code_t.klass, "code", _wrap_svn_fs_ioctl_code_t_code_get, -1); + SwigClassSvn_fs_ioctl_code_t.mark = 0; + SwigClassSvn_fs_ioctl_code_t.trackObjects = 0; + rb_define_module_function(mFs, "svn_fs_ioctl", _wrap_svn_fs_ioctl, -1); rb_define_module_function(mFs, "svn_fs_invoke_warning_callback", _wrap_svn_fs_invoke_warning_callback, -1); rb_define_module_function(mFs, "svn_fs_invoke_upgrade_notify", _wrap_svn_fs_invoke_upgrade_notify, -1); rb_define_module_function(mFs, "svn_fs_invoke_progress_notify_func", _wrap_svn_fs_invoke_progress_notify_func, -1); diff --git a/subversion/bindings/swig/ruby/svn_ra.c b/subversion/bindings/swig/ruby/svn_ra.c index 8049b2e..41349ab 100644 --- a/subversion/bindings/swig/ruby/svn_ra.c +++ b/subversion/bindings/swig/ruby/svn_ra.c @@ -1901,66 +1901,68 @@ int SWIG_Ruby_arity( VALUE proc, int minimal ) #define SWIGTYPE_p_svn_commit_info_t swig_types[95] #define SWIGTYPE_p_svn_config_t swig_types[96] #define SWIGTYPE_p_svn_delta_editor_t swig_types[97] -#define SWIGTYPE_p_svn_depth_t swig_types[98] -#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[99] -#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[100] -#define SWIGTYPE_p_svn_diff_datasource_e swig_types[101] -#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[102] -#define SWIGTYPE_p_svn_diff_file_options_t swig_types[103] -#define SWIGTYPE_p_svn_diff_fns2_t swig_types[104] -#define SWIGTYPE_p_svn_diff_fns_t swig_types[105] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[106] -#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[107] -#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[108] -#define SWIGTYPE_p_svn_diff_t swig_types[109] -#define SWIGTYPE_p_svn_dirent_t swig_types[110] -#define SWIGTYPE_p_svn_errno_t swig_types[111] -#define SWIGTYPE_p_svn_error_t swig_types[112] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[113] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[114] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[115] -#define SWIGTYPE_p_svn_location_segment_t swig_types[116] -#define SWIGTYPE_p_svn_lock_t swig_types[117] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[118] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[119] -#define SWIGTYPE_p_svn_log_entry_t swig_types[120] -#define SWIGTYPE_p_svn_merge_range_t swig_types[121] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[122] -#define SWIGTYPE_p_svn_node_kind_t swig_types[123] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[124] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[125] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[126] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[127] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[128] -#define SWIGTYPE_p_svn_patch_file_t swig_types[129] -#define SWIGTYPE_p_svn_patch_t swig_types[130] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[131] -#define SWIGTYPE_p_svn_prop_kind swig_types[132] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[133] -#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[134] -#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[135] -#define SWIGTYPE_p_svn_ra_plugin_t swig_types[136] -#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[137] -#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[138] -#define SWIGTYPE_p_svn_ra_reporter_t swig_types[139] -#define SWIGTYPE_p_svn_ra_session_t swig_types[140] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[141] -#define SWIGTYPE_p_svn_stream_t swig_types[142] -#define SWIGTYPE_p_svn_string_t swig_types[143] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[144] -#define SWIGTYPE_p_svn_tristate_t swig_types[145] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[146] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[147] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[148] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[149] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[150] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[151] -#define SWIGTYPE_p_svn_version_extended_t swig_types[152] -#define SWIGTYPE_p_svn_version_t swig_types[153] -#define SWIGTYPE_p_unsigned_long swig_types[154] -#define SWIGTYPE_p_void swig_types[155] -static swig_type_info *swig_types[157]; -static swig_module_info swig_module = {swig_types, 156, 0, 0, 0, 0}; +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[98] +#define SWIGTYPE_p_svn_depth_t swig_types[99] +#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[100] +#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[101] +#define SWIGTYPE_p_svn_diff_datasource_e swig_types[102] +#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[103] +#define SWIGTYPE_p_svn_diff_file_options_t swig_types[104] +#define SWIGTYPE_p_svn_diff_fns2_t swig_types[105] +#define SWIGTYPE_p_svn_diff_fns_t swig_types[106] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[107] +#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[108] +#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[109] +#define SWIGTYPE_p_svn_diff_t swig_types[110] +#define SWIGTYPE_p_svn_dirent_t swig_types[111] +#define SWIGTYPE_p_svn_errno_t swig_types[112] +#define SWIGTYPE_p_svn_error_t swig_types[113] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[114] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[115] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[116] +#define SWIGTYPE_p_svn_location_segment_t swig_types[117] +#define SWIGTYPE_p_svn_lock_t swig_types[118] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[119] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[120] +#define SWIGTYPE_p_svn_log_entry_t swig_types[121] +#define SWIGTYPE_p_svn_merge_range_t swig_types[122] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[123] +#define SWIGTYPE_p_svn_node_kind_t swig_types[124] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[125] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[126] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[127] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[128] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[129] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[130] +#define SWIGTYPE_p_svn_patch_file_t swig_types[131] +#define SWIGTYPE_p_svn_patch_t swig_types[132] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[133] +#define SWIGTYPE_p_svn_prop_kind swig_types[134] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[135] +#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[136] +#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[137] +#define SWIGTYPE_p_svn_ra_plugin_t swig_types[138] +#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[139] +#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[140] +#define SWIGTYPE_p_svn_ra_reporter_t swig_types[141] +#define SWIGTYPE_p_svn_ra_session_t swig_types[142] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[143] +#define SWIGTYPE_p_svn_stream_t swig_types[144] +#define SWIGTYPE_p_svn_string_t swig_types[145] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[146] +#define SWIGTYPE_p_svn_tristate_t swig_types[147] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[148] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[149] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[150] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[151] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[152] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[153] +#define SWIGTYPE_p_svn_version_extended_t swig_types[154] +#define SWIGTYPE_p_svn_version_t swig_types[155] +#define SWIGTYPE_p_unsigned_long swig_types[156] +#define SWIGTYPE_p_void swig_types[157] +static swig_type_info *swig_types[159]; +static swig_module_info swig_module = {swig_types, 158, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2097,7 +2099,7 @@ SWIG_ruby_failed(void) } -/*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args) { VALUE obj = args[0]; @@ -2142,7 +2144,7 @@ SWIG_AsVal_int (VALUE obj, int *val) } -/*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args) { VALUE obj = args[0]; @@ -16144,56 +16146,56 @@ static swig_type_info _swigt__p_apr_off_t = {"_p_apr_off_t", "apr_off_t *", 0, 0 static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void = {"_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void", "void (*)(apr_off_t,apr_off_t,void *,apr_pool_t *)|svn_ra_progress_notify_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t = {"_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t", "struct svn_error_t *(*)(int,apr_pool_t *,apr_hash_t *)|svn_ra_init_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(apr_file_t **,void *,apr_pool_t *)|struct svn_error_t *(*)(apr_file_t **,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|struct svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void **,char const *,svn_ra_callbacks_t const *,void *,apr_hash_t *,apr_pool_t *)|svn_error_t *(*)(void **,char const *,svn_ra_callbacks_t const *,void *,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_dirent_t *,void *,apr_pool_t *)|svn_ra_dirent_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_error_t *(*)(void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t **,char const *,svn_revnum_t,apr_array_header_t *,apr_pool_t *)|struct svn_error_t *(*)(void *,apr_hash_t **,char const *,svn_revnum_t,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const **,apr_pool_t *)|svn_ra_get_client_string_func_t|struct svn_error_t *(*)(void *,char const **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_delta_editor_t const **,void **,char const *,svn_commit_callback_t,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_delta_editor_t const **,void **,char const *,svn_commit_callback_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,char const *,svn_revnum_t,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,char const *,svn_revnum_t,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_stream_t **,svn_checksum_t const *,apr_pool_t *)|svn_ra_get_wc_contents_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_array_header_t const *,svn_revnum_t,svn_revnum_t,svn_boolean_t,svn_boolean_t,svn_log_message_receiver_t,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,apr_array_header_t const *,svn_revnum_t,svn_revnum_t,svn_boolean_t,svn_boolean_t,svn_log_message_receiver_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t = {"_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t", "svn_error_t *(*)(int,apr_pool_t *,apr_hash_t *)|svn_ra_init_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(apr_file_t **,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void **,char const *,svn_ra_callbacks_t const *,void *,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_dirent_t *,void *,apr_pool_t *)|svn_ra_dirent_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)|svn_commit_callback2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t **,char const *,svn_revnum_t,apr_array_header_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const **,apr_pool_t *)|svn_ra_get_client_string_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_delta_editor_t const **,void **,char const *,svn_commit_callback_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,char const *,svn_revnum_t,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t", "svn_ra_get_wc_contents_func_t|svn_error_t *(*)(void *,svn_stream_t **,svn_checksum_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_array_header_t const *,svn_revnum_t,svn_revnum_t,svn_boolean_t,svn_boolean_t,svn_log_message_receiver_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char__int = {"_p_f_p_void_p_q_const__char__int", "int (*)(void *,char const *)|svn_ra_check_tunnel_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_ra_invalidate_wc_props_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_string_t const **,apr_pool_t *)|svn_ra_get_wc_prop_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_string_t const *,apr_pool_t *)|svn_ra_set_wc_prop_func_t|svn_ra_push_wc_prop_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)|svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)|svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)|svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_boolean_t,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_ra_lock_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_ra_file_rev_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t **,svn_revnum_t *,apr_hash_t **,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t **,svn_revnum_t *,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_node_kind_t *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_node_kind_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_revnum_t,svn_ra_file_rev_handler_t,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_revnum_t,svn_ra_file_rev_handler_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t__p_svn_error_t", "svn_ra_get_latest_revnum_func_t|struct svn_error_t *(*)(void *,svn_revnum_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_time_t,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_revnum_t *,apr_time_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_revnum_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_ra_invalidate_wc_props_func_t|svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_ra_get_wc_prop_func_t|svn_error_t *(*)(void *,char const *,char const *,svn_string_t const **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_ra_set_wc_prop_func_t|svn_ra_push_wc_prop_func_t|svn_error_t *(*)(void *,char const *,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_boolean_t,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_ra_lock_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_ra_file_rev_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t **,svn_revnum_t *,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_node_kind_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_depth_t,svn_boolean_t,char const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_revnum_t,svn_ra_file_rev_handler_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t__p_svn_error_t", "svn_ra_get_latest_revnum_func_t|svn_error_t *(*)(void *,svn_revnum_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_time_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_void__void = {"_p_f_p_void_p_void__void", "svn_ra_close_tunnel_func_t|void (*)(void *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,apr_hash_t **,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t **,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t const *,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,void *,svn_delta_editor_t const **,void **,apr_hash_t *,apr_pool_t *)|svn_ra_replay_revstart_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,void *,svn_delta_editor_t const *,void *,apr_hash_t *,apr_pool_t *)|svn_ra_replay_revfinish_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t **,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_ra_replay_revstart_callback_t|svn_error_t *(*)(svn_revnum_t,void *,svn_delta_editor_t const **,void **,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_ra_replay_revfinish_callback_t|svn_error_t *(*)(svn_revnum_t,void *,svn_delta_editor_t const *,void *,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_void__p_svn_version_t = {"_p_f_void__p_svn_version_t", "struct svn_version_t *(*)(void)|svn_version_t *(*)(void)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; @@ -16201,7 +16203,7 @@ static swig_type_info _swigt__p_p_apr_array_header_t = {"_p_p_apr_array_header_t static swig_type_info _swigt__p_p_apr_file_t = {"_p_p_apr_file_t", "apr_file_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **|svn_mergeinfo_catalog_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_txdelta_window_handler_t *|struct svn_error_t *(**)(svn_txdelta_window_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(**)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_f_p_void_p_void__void = {"_p_p_f_p_void_p_void__void", "svn_ra_close_tunnel_func_t *|void (**)(void *,void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_dirent_t = {"_p_p_svn_dirent_t", "struct svn_dirent_t **|svn_dirent_t **", 0, 0, (void*)0, 0}; @@ -16233,6 +16235,7 @@ static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct s static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_binary_patch_t = {"_p_svn_diff_binary_patch_t", "struct svn_diff_binary_patch_t *|svn_diff_binary_patch_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_conflict_display_style_t = {"_p_svn_diff_conflict_display_style_t", "enum svn_diff_conflict_display_style_t *|svn_diff_conflict_display_style_t *", 0, 0, (void*)0, 0}; @@ -16247,7 +16250,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0}; @@ -16263,6 +16266,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -16391,6 +16395,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_binary_patch_t, &_swigt__p_svn_diff_conflict_display_style_t, @@ -16421,6 +16426,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -16549,6 +16555,7 @@ static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_binary_patch_t[] = { {&_swigt__p_svn_diff_binary_patch_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_conflict_display_style_t[] = { {&_swigt__p_svn_diff_conflict_display_style_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -16579,6 +16586,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -16707,6 +16715,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_binary_patch_t, _swigc__p_svn_diff_conflict_display_style_t, @@ -16737,6 +16746,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, diff --git a/subversion/bindings/swig/ruby/svn_repos.c b/subversion/bindings/swig/ruby/svn_repos.c index 4d8b5f5..0c3bfcd 100644 --- a/subversion/bindings/swig/ruby/svn_repos.c +++ b/subversion/bindings/swig/ruby/svn_repos.c @@ -1832,133 +1832,137 @@ int SWIG_Ruby_arity( VALUE proc, int minimal ) #define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[26] #define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[27] #define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void swig_types[28] -#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[29] -#define SWIGTYPE_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[30] -#define SWIGTYPE_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t swig_types[31] -#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[32] -#define SWIGTYPE_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[33] -#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[34] -#define SWIGTYPE_p_int swig_types[35] -#define SWIGTYPE_p_long swig_types[36] -#define SWIGTYPE_p_p_apr_array_header_t swig_types[37] -#define SWIGTYPE_p_p_apr_hash_t swig_types[38] -#define SWIGTYPE_p_p_char swig_types[39] -#define SWIGTYPE_p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[40] -#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[41] -#define SWIGTYPE_p_p_svn_authz_t swig_types[42] -#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[43] -#define SWIGTYPE_p_p_svn_dirent_t swig_types[44] -#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[45] -#define SWIGTYPE_p_p_svn_lock_t swig_types[46] -#define SWIGTYPE_p_p_svn_repos_parse_fns2_t swig_types[47] -#define SWIGTYPE_p_p_svn_repos_parse_fns3_t swig_types[48] -#define SWIGTYPE_p_p_svn_repos_parse_fns_t swig_types[49] -#define SWIGTYPE_p_p_svn_repos_t swig_types[50] -#define SWIGTYPE_p_p_svn_stream_t swig_types[51] -#define SWIGTYPE_p_p_svn_string_t swig_types[52] -#define SWIGTYPE_p_p_svn_version_t swig_types[53] -#define SWIGTYPE_p_p_void swig_types[54] -#define SWIGTYPE_p_svn_auth_baton_t swig_types[55] -#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[56] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[57] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[58] -#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[59] -#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[60] -#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[61] -#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[62] -#define SWIGTYPE_p_svn_auth_provider_t swig_types[63] -#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[64] -#define SWIGTYPE_p_svn_authz_t swig_types[65] -#define SWIGTYPE_p_svn_cache_config_t swig_types[66] -#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[67] -#define SWIGTYPE_p_svn_checksum_kind_t swig_types[68] -#define SWIGTYPE_p_svn_checksum_t swig_types[69] -#define SWIGTYPE_p_svn_commit_info_t swig_types[70] -#define SWIGTYPE_p_svn_config_t swig_types[71] -#define SWIGTYPE_p_svn_delta_editor_t swig_types[72] -#define SWIGTYPE_p_svn_depth_t swig_types[73] -#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[74] -#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[75] -#define SWIGTYPE_p_svn_diff_datasource_e swig_types[76] -#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[77] -#define SWIGTYPE_p_svn_diff_file_options_t swig_types[78] -#define SWIGTYPE_p_svn_diff_fns2_t swig_types[79] -#define SWIGTYPE_p_svn_diff_fns_t swig_types[80] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[81] -#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[82] -#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[83] -#define SWIGTYPE_p_svn_diff_t swig_types[84] -#define SWIGTYPE_p_svn_dirent_t swig_types[85] -#define SWIGTYPE_p_svn_errno_t swig_types[86] -#define SWIGTYPE_p_svn_error_t swig_types[87] -#define SWIGTYPE_p_svn_fs_access_t swig_types[88] -#define SWIGTYPE_p_svn_fs_dirent_t swig_types[89] -#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[90] -#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[91] -#define SWIGTYPE_p_svn_fs_history_t swig_types[92] -#define SWIGTYPE_p_svn_fs_id_t swig_types[93] -#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[94] -#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[95] -#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[96] -#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[97] -#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[98] -#define SWIGTYPE_p_svn_fs_path_change3_t swig_types[99] -#define SWIGTYPE_p_svn_fs_path_change_iterator_t swig_types[100] -#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[101] -#define SWIGTYPE_p_svn_fs_path_change_t swig_types[102] -#define SWIGTYPE_p_svn_fs_root_t swig_types[103] -#define SWIGTYPE_p_svn_fs_t swig_types[104] -#define SWIGTYPE_p_svn_fs_txn_t swig_types[105] -#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[106] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[107] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[108] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[109] -#define SWIGTYPE_p_svn_location_segment_t swig_types[110] -#define SWIGTYPE_p_svn_lock_t swig_types[111] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[112] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[113] -#define SWIGTYPE_p_svn_log_entry_t swig_types[114] -#define SWIGTYPE_p_svn_merge_range_t swig_types[115] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[116] -#define SWIGTYPE_p_svn_node_kind_t swig_types[117] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[118] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[119] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[120] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[121] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[122] -#define SWIGTYPE_p_svn_patch_file_t swig_types[123] -#define SWIGTYPE_p_svn_patch_t swig_types[124] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[125] -#define SWIGTYPE_p_svn_prop_kind swig_types[126] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[127] -#define SWIGTYPE_p_svn_repos_authz_access_t swig_types[128] -#define SWIGTYPE_p_svn_repos_log_entry_t swig_types[129] -#define SWIGTYPE_p_svn_repos_node_t swig_types[130] -#define SWIGTYPE_p_svn_repos_notify_action_t swig_types[131] -#define SWIGTYPE_p_svn_repos_notify_t swig_types[132] -#define SWIGTYPE_p_svn_repos_notify_warning_t swig_types[133] -#define SWIGTYPE_p_svn_repos_parse_fns2_t swig_types[134] -#define SWIGTYPE_p_svn_repos_parse_fns3_t swig_types[135] -#define SWIGTYPE_p_svn_repos_parse_fns_t swig_types[136] -#define SWIGTYPE_p_svn_repos_revision_access_level_t swig_types[137] -#define SWIGTYPE_p_svn_repos_t swig_types[138] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[139] -#define SWIGTYPE_p_svn_stream_t swig_types[140] -#define SWIGTYPE_p_svn_string_t swig_types[141] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[142] -#define SWIGTYPE_p_svn_tristate_t swig_types[143] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[144] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[145] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[146] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[147] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[148] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[149] -#define SWIGTYPE_p_svn_version_extended_t swig_types[150] -#define SWIGTYPE_p_svn_version_t swig_types[151] -#define SWIGTYPE_p_unsigned_long swig_types[152] -#define SWIGTYPE_p_void swig_types[153] -static swig_type_info *swig_types[155]; -static swig_module_info swig_module = {swig_types, 154, 0, 0, 0, 0}; +#define SWIGTYPE_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void swig_types[29] +#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[30] +#define SWIGTYPE_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[31] +#define SWIGTYPE_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t swig_types[32] +#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[33] +#define SWIGTYPE_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[34] +#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[35] +#define SWIGTYPE_p_int swig_types[36] +#define SWIGTYPE_p_long swig_types[37] +#define SWIGTYPE_p_p_apr_array_header_t swig_types[38] +#define SWIGTYPE_p_p_apr_hash_t swig_types[39] +#define SWIGTYPE_p_p_char swig_types[40] +#define SWIGTYPE_p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[41] +#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[42] +#define SWIGTYPE_p_p_svn_authz_t swig_types[43] +#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[44] +#define SWIGTYPE_p_p_svn_dirent_t swig_types[45] +#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[46] +#define SWIGTYPE_p_p_svn_lock_t swig_types[47] +#define SWIGTYPE_p_p_svn_repos_parse_fns2_t swig_types[48] +#define SWIGTYPE_p_p_svn_repos_parse_fns3_t swig_types[49] +#define SWIGTYPE_p_p_svn_repos_parse_fns_t swig_types[50] +#define SWIGTYPE_p_p_svn_repos_t swig_types[51] +#define SWIGTYPE_p_p_svn_stream_t swig_types[52] +#define SWIGTYPE_p_p_svn_string_t swig_types[53] +#define SWIGTYPE_p_p_svn_version_t swig_types[54] +#define SWIGTYPE_p_p_void swig_types[55] +#define SWIGTYPE_p_svn_auth_baton_t swig_types[56] +#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[57] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[58] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[59] +#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[60] +#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[61] +#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[62] +#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[63] +#define SWIGTYPE_p_svn_auth_provider_t swig_types[64] +#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[65] +#define SWIGTYPE_p_svn_authz_t swig_types[66] +#define SWIGTYPE_p_svn_cache_config_t swig_types[67] +#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[68] +#define SWIGTYPE_p_svn_checksum_kind_t swig_types[69] +#define SWIGTYPE_p_svn_checksum_t swig_types[70] +#define SWIGTYPE_p_svn_commit_info_t swig_types[71] +#define SWIGTYPE_p_svn_config_t swig_types[72] +#define SWIGTYPE_p_svn_delta_editor_t swig_types[73] +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[74] +#define SWIGTYPE_p_svn_depth_t swig_types[75] +#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[76] +#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[77] +#define SWIGTYPE_p_svn_diff_datasource_e swig_types[78] +#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[79] +#define SWIGTYPE_p_svn_diff_file_options_t swig_types[80] +#define SWIGTYPE_p_svn_diff_fns2_t swig_types[81] +#define SWIGTYPE_p_svn_diff_fns_t swig_types[82] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[83] +#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[84] +#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[85] +#define SWIGTYPE_p_svn_diff_t swig_types[86] +#define SWIGTYPE_p_svn_dirent_t swig_types[87] +#define SWIGTYPE_p_svn_errno_t swig_types[88] +#define SWIGTYPE_p_svn_error_t swig_types[89] +#define SWIGTYPE_p_svn_fs_access_t swig_types[90] +#define SWIGTYPE_p_svn_fs_dirent_t swig_types[91] +#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[92] +#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[93] +#define SWIGTYPE_p_svn_fs_history_t swig_types[94] +#define SWIGTYPE_p_svn_fs_id_t swig_types[95] +#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[96] +#define SWIGTYPE_p_svn_fs_ioctl_code_t swig_types[97] +#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[98] +#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[99] +#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[100] +#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[101] +#define SWIGTYPE_p_svn_fs_path_change3_t swig_types[102] +#define SWIGTYPE_p_svn_fs_path_change_iterator_t swig_types[103] +#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[104] +#define SWIGTYPE_p_svn_fs_path_change_t swig_types[105] +#define SWIGTYPE_p_svn_fs_root_t swig_types[106] +#define SWIGTYPE_p_svn_fs_t swig_types[107] +#define SWIGTYPE_p_svn_fs_txn_t swig_types[108] +#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[109] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[110] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[111] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[112] +#define SWIGTYPE_p_svn_location_segment_t swig_types[113] +#define SWIGTYPE_p_svn_lock_t swig_types[114] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[115] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[116] +#define SWIGTYPE_p_svn_log_entry_t swig_types[117] +#define SWIGTYPE_p_svn_merge_range_t swig_types[118] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[119] +#define SWIGTYPE_p_svn_node_kind_t swig_types[120] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[121] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[122] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[123] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[124] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[125] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[126] +#define SWIGTYPE_p_svn_patch_file_t swig_types[127] +#define SWIGTYPE_p_svn_patch_t swig_types[128] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[129] +#define SWIGTYPE_p_svn_prop_kind swig_types[130] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[131] +#define SWIGTYPE_p_svn_repos_authz_access_t swig_types[132] +#define SWIGTYPE_p_svn_repos_log_entry_t swig_types[133] +#define SWIGTYPE_p_svn_repos_node_t swig_types[134] +#define SWIGTYPE_p_svn_repos_notify_action_t swig_types[135] +#define SWIGTYPE_p_svn_repos_notify_t swig_types[136] +#define SWIGTYPE_p_svn_repos_notify_warning_t swig_types[137] +#define SWIGTYPE_p_svn_repos_parse_fns2_t swig_types[138] +#define SWIGTYPE_p_svn_repos_parse_fns3_t swig_types[139] +#define SWIGTYPE_p_svn_repos_parse_fns_t swig_types[140] +#define SWIGTYPE_p_svn_repos_revision_access_level_t swig_types[141] +#define SWIGTYPE_p_svn_repos_t swig_types[142] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[143] +#define SWIGTYPE_p_svn_stream_t swig_types[144] +#define SWIGTYPE_p_svn_string_t swig_types[145] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[146] +#define SWIGTYPE_p_svn_tristate_t swig_types[147] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[148] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[149] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[150] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[151] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[152] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[153] +#define SWIGTYPE_p_svn_version_extended_t swig_types[154] +#define SWIGTYPE_p_svn_version_t swig_types[155] +#define SWIGTYPE_p_unsigned_long swig_types[156] +#define SWIGTYPE_p_void swig_types[157] +static swig_type_info *swig_types[159]; +static swig_module_info swig_module = {swig_types, 158, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2036,7 +2040,7 @@ SWIG_ruby_failed(void) } -/*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args) { VALUE obj = args[0]; @@ -2178,7 +2182,7 @@ SWIG_FromCharPtr(const char *cptr) } -/*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args) { VALUE obj = args[0]; @@ -2423,6 +2427,11 @@ static svn_error_t * svn_repos_invoke_verify_callback( return _obj(baton, revision, verify_err, scratch_pool); } +static void svn_repos_invoke_authz_warning_func( + svn_repos_authz_warning_func_t _obj, void *baton, const svn_error_t *error, apr_pool_t *scratch_pool) { + _obj(baton, error, scratch_pool); +} + static VALUE @@ -4989,7 +4998,7 @@ _wrap_svn_repos_freeze(int argc, VALUE *argv, VALUE self) { } { - result = (svn_error_t *)svn_repos_freeze(arg1,arg2,arg3,arg4); + result = (svn_error_t *)svn_repos_freeze((apr_array_header_t const *)arg1,arg2,arg3,arg4); @@ -17765,6 +17774,131 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_repos_authz_read4(int argc, VALUE *argv, VALUE self) { + svn_authz_t **arg1 = (svn_authz_t **) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + svn_boolean_t arg4 ; + svn_repos_t *arg5 = (svn_repos_t *) 0 ; + svn_repos_authz_warning_func_t arg6 = (svn_repos_authz_warning_func_t) 0 ; + void *arg7 = (void *) 0 ; + apr_pool_t *arg8 = (apr_pool_t *) 0 ; + apr_pool_t *arg9 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + svn_authz_t *temp1 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + void *argp5 = 0 ; + int res5 = 0 ; + int res7 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg8); + _global_pool = arg8; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg9); + _global_pool = arg9; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + if ((argc < 6) || (argc > 8)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 6)",argc); SWIG_fail; + } + { + arg2 = StringValueCStr(argv[0]); + } + res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_repos_authz_read4", 3, argv[1] )); + } + arg3 = (char *)(buf3); + arg4 = RTEST(argv[2]); + res5 = SWIG_ConvertPtr(argv[3], &argp5,SWIGTYPE_p_svn_repos_t, 0 | 0 ); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "svn_repos_t *","svn_repos_authz_read4", 5, argv[3] )); + } + arg5 = (svn_repos_t *)(argp5); + { + int res = SWIG_ConvertFunctionPtr(argv[4], (void**)(&arg6), SWIGTYPE_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_authz_warning_func_t","svn_repos_authz_read4", 6, argv[4] )); + } + } + res7 = SWIG_ConvertPtr(argv[5],SWIG_as_voidptrptr(&arg7), 0, 0); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "void *","svn_repos_authz_read4", 7, argv[5] )); + } + if (argc > 6) { + + } + if (argc > 7) { + + } + { + if (!arg5) { + svn_swig_rb_raise_svn_repos_already_close(); + } + } + { + result = (svn_error_t *)svn_repos_authz_read4(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_authz_t, 0)); + } + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_repos_authz_read3(int argc, VALUE *argv, VALUE self) { svn_authz_t **arg1 = (svn_authz_t **) 0 ; @@ -18025,6 +18159,109 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_repos_authz_parse2(int argc, VALUE *argv, VALUE self) { + svn_authz_t **arg1 = (svn_authz_t **) 0 ; + svn_stream_t *arg2 = (svn_stream_t *) 0 ; + svn_stream_t *arg3 = (svn_stream_t *) 0 ; + svn_repos_authz_warning_func_t arg4 = (svn_repos_authz_warning_func_t) 0 ; + void *arg5 = (void *) 0 ; + apr_pool_t *arg6 = (apr_pool_t *) 0 ; + apr_pool_t *arg7 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + svn_authz_t *temp1 ; + int res5 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg6); + _global_pool = arg6; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg7); + _global_pool = arg7; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + arg1 = &temp1; + if ((argc < 4) || (argc > 6)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail; + } + { + arg2 = svn_swig_rb_make_stream(argv[0]); + } + { + arg3 = svn_swig_rb_make_stream(argv[1]); + } + { + int res = SWIG_ConvertFunctionPtr(argv[2], (void**)(&arg4), SWIGTYPE_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_authz_warning_func_t","svn_repos_authz_parse2", 4, argv[2] )); + } + } + res5 = SWIG_ConvertPtr(argv[3],SWIG_as_voidptrptr(&arg5), 0, 0); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "void *","svn_repos_authz_parse2", 5, argv[3] )); + } + if (argc > 4) { + + } + if (argc > 5) { + + } + { + result = (svn_error_t *)svn_repos_authz_parse2(arg1,arg2,arg3,arg4,arg5,arg6,arg7); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_authz_t, 0)); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_repos_authz_parse(int argc, VALUE *argv, VALUE self) { svn_authz_t **arg1 = (svn_authz_t **) 0 ; @@ -20449,6 +20686,70 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_repos_invoke_authz_warning_func(int argc, VALUE *argv, VALUE self) { + svn_repos_authz_warning_func_t arg1 = (svn_repos_authz_warning_func_t) 0 ; + void *arg2 = (void *) 0 ; + svn_error_t *arg3 = (svn_error_t *) 0 ; + apr_pool_t *arg4 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + int res2 ; + void *argp3 = 0 ; + int res3 = 0 ; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4); + _global_pool = arg4; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 3) || (argc > 4)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + } + { + int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_authz_warning_func_t","svn_repos_invoke_authz_warning_func", 1, argv[0] )); + } + } + res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_repos_invoke_authz_warning_func", 2, argv[1] )); + } + res3 = SWIG_ConvertPtr(argv[2], &argp3,SWIGTYPE_p_svn_error_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_error_t const *","svn_repos_invoke_authz_warning_func", 3, argv[2] )); + } + arg3 = (svn_error_t *)(argp3); + if (argc > 3) { + + } + { + svn_repos_invoke_authz_warning_func(arg1,arg2,(svn_error_t const *)arg3,arg4); + + + + } + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +fail: + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ @@ -20458,42 +20759,43 @@ static swig_type_info _swigt__p_apr_int32_t = {"_p_apr_int32_t", "apr_int32_t *| static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *|svn_filesize_t *|apr_time_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_int_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_int_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(int,void *,apr_pool_t *)|svn_error_t *(*)(int,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_void__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_stream_t **,void *)|svn_error_t *(*)(svn_stream_t **,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_void_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void **,apr_hash_t *,void *,apr_pool_t *)|svn_error_t *(*)(void **,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_dirent_t *,void *,apr_pool_t *)|svn_repos_dirent_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,void *,apr_pool_t *)|struct svn_error_t *(*)(char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)|svn_repos_mergeinfo_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_repos_authz_func_t|svn_repos_dump_filter_func_t|struct svn_error_t *(*)(svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_txdelta_window_handler_t_p_p_void_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_handler_t_p_p_void_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_handler_t *,void **,void *)|svn_error_t *(*)(svn_txdelta_window_handler_t *,void **,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_repos_freeze_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char__p_svn_error_t = {"_p_f_p_void_p_q_const__char__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *)|svn_error_t *(*)(void *,char const *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_string_t const *)|svn_error_t *(*)(void *,char const *,svn_string_t const *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_repos_file_rev_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_pool_t *)|svn_repos_history_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_int_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_int_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(int,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_void__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_stream_t **,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_void_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void **,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_dirent_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_dirent_t *,void *,apr_pool_t *)|svn_repos_dirent_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)|svn_repos_mergeinfo_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)|svn_commit_callback2_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)|svn_repos_authz_func_t|svn_repos_dump_filter_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_txdelta_window_handler_t_p_p_void_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_handler_t_p_p_void_p_void__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_window_handler_t *,void **,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_pool_t *)|svn_repos_freeze_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char__p_svn_error_t = {"_p_f_p_void_p_q_const__char__p_svn_error_t", "svn_error_t *(*)(void *,char const *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_string_t const *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_repos_file_rev_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_pool_t *)|svn_repos_history_func_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void = {"_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void", "svn_repos_notify_func_t|void (*)(void *,struct svn_repos_notify_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_repos_log_entry_t *,apr_pool_t *)|svn_repos_log_entry_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_repos_path_change_t *,apr_pool_t *)|svn_repos_path_change_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_repos_verify_callback_t|struct svn_error_t *(*)(void *,svn_revnum_t,svn_error_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_repos_authz_access_t,svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)|svn_repos_authz_callback_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void = {"_p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void", "void (*)(void *,svn_error_t const *,apr_pool_t *)|svn_repos_authz_warning_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_repos_log_entry_t *,apr_pool_t *)|svn_repos_log_entry_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_repos_path_change_t *,apr_pool_t *)|svn_repos_path_change_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t,svn_error_t *,apr_pool_t *)|svn_repos_verify_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_repos_authz_access_t,svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)|svn_repos_authz_callback_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_array_header_t = {"_p_p_apr_array_header_t", "apr_array_header_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **|svn_mergeinfo_catalog_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_repos_mergeinfo_receiver_t *|struct svn_error_t *(**)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_txdelta_window_handler_t *|struct svn_error_t *(**)(svn_txdelta_window_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_q_const__char_svn_mergeinfo_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(**)(char const *,svn_mergeinfo_t,void *,apr_pool_t *)|svn_repos_mergeinfo_receiver_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_error_t *(**)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_authz_t = {"_p_p_svn_authz_t", "struct svn_authz_t **|svn_authz_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_svn_dirent_t = {"_p_p_svn_dirent_t", "struct svn_dirent_t **|svn_dirent_t **", 0, 0, (void*)0, 0}; @@ -20525,6 +20827,7 @@ static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct s static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_binary_patch_t = {"_p_svn_diff_binary_patch_t", "struct svn_diff_binary_patch_t *|svn_diff_binary_patch_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_conflict_display_style_t = {"_p_svn_diff_conflict_display_style_t", "enum svn_diff_conflict_display_style_t *|svn_diff_conflict_display_style_t *", 0, 0, (void*)0, 0}; @@ -20539,7 +20842,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_access_t = {"_p_svn_fs_access_t", "struct svn_fs_access_t *|svn_fs_access_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_dirent_t = {"_p_svn_fs_dirent_t", "struct svn_fs_dirent_t *|svn_fs_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_fsfs_info_t = {"_p_svn_fs_fsfs_info_t", "struct svn_fs_fsfs_info_t *|svn_fs_fsfs_info_t *", 0, 0, (void*)0, 0}; @@ -20547,6 +20850,7 @@ static swig_type_info _swigt__p_svn_fs_fsx_info_t = {"_p_svn_fs_fsx_info_t", "st static swig_type_info _swigt__p_svn_fs_history_t = {"_p_svn_fs_history_t", "struct svn_fs_history_t *|svn_fs_history_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_id_t = {"_p_svn_fs_id_t", "struct svn_fs_id_t *|svn_fs_id_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_info_placeholder_t = {"_p_svn_fs_info_placeholder_t", "struct svn_fs_info_placeholder_t *|svn_fs_info_placeholder_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_fs_ioctl_code_t = {"_p_svn_fs_ioctl_code_t", "struct svn_fs_ioctl_code_t *|svn_fs_ioctl_code_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "struct svn_fs_lock_target_t *|svn_fs_lock_target_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_node_relation_t = {"_p_svn_fs_node_relation_t", "enum svn_fs_node_relation_t *|svn_fs_node_relation_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_fs_pack_notify_action_t = {"_p_svn_fs_pack_notify_action_t", "enum svn_fs_pack_notify_action_t *|svn_fs_pack_notify_action_t *", 0, 0, (void*)0, 0}; @@ -20574,6 +20878,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -20637,6 +20942,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, + &_swigt__p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, &_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t, @@ -20681,6 +20987,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_binary_patch_t, &_swigt__p_svn_diff_conflict_display_style_t, @@ -20703,6 +21010,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_fs_history_t, &_swigt__p_svn_fs_id_t, &_swigt__p_svn_fs_info_placeholder_t, + &_swigt__p_svn_fs_ioctl_code_t, &_swigt__p_svn_fs_lock_target_t, &_swigt__p_svn_fs_node_relation_t, &_swigt__p_svn_fs_pack_notify_action_t, @@ -20730,6 +21038,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -20793,6 +21102,7 @@ static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void[] = { {&_swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void[] = { {&_swigt__p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -20837,6 +21147,7 @@ static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_binary_patch_t[] = { {&_swigt__p_svn_diff_binary_patch_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_conflict_display_style_t[] = { {&_swigt__p_svn_diff_conflict_display_style_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -20859,6 +21170,7 @@ static swig_cast_info _swigc__p_svn_fs_fsx_info_t[] = { {&_swigt__p_svn_fs_fsx_ static swig_cast_info _swigc__p_svn_fs_history_t[] = { {&_swigt__p_svn_fs_history_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_id_t[] = { {&_swigt__p_svn_fs_id_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_info_placeholder_t[] = { {&_swigt__p_svn_fs_info_placeholder_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_fs_ioctl_code_t[] = { {&_swigt__p_svn_fs_ioctl_code_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = { {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_node_relation_t[] = { {&_swigt__p_svn_fs_node_relation_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_fs_pack_notify_action_t[] = { {&_swigt__p_svn_fs_pack_notify_action_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -20886,6 +21198,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -20949,6 +21262,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, + _swigc__p_f_p_void_p_q_const__svn_error_t_p_apr_pool_t__void, _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_svn_repos_log_entry_t_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_void_p_svn_repos_path_change_t_p_apr_pool_t__p_svn_error_t, @@ -20993,6 +21307,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_binary_patch_t, _swigc__p_svn_diff_conflict_display_style_t, @@ -21015,6 +21330,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_fs_history_t, _swigc__p_svn_fs_id_t, _swigc__p_svn_fs_info_placeholder_t, + _swigc__p_svn_fs_ioctl_code_t, _swigc__p_svn_fs_lock_target_t, _swigc__p_svn_fs_node_relation_t, _swigc__p_svn_fs_pack_notify_action_t, @@ -21042,6 +21358,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, @@ -21687,9 +22004,11 @@ SWIGEXPORT void Init_repos(void) { rb_define_module_function(mRepos, "svn_repos_get_fs_build_parser2", _wrap_svn_repos_get_fs_build_parser2, -1); rb_define_module_function(mRepos, "svn_repos_get_fs_build_parser", _wrap_svn_repos_get_fs_build_parser, -1); rb_define_module_function(mRepos, "svn_repos_authz_initialize", _wrap_svn_repos_authz_initialize, -1); + rb_define_module_function(mRepos, "svn_repos_authz_read4", _wrap_svn_repos_authz_read4, -1); rb_define_module_function(mRepos, "svn_repos_authz_read3", _wrap_svn_repos_authz_read3, -1); rb_define_module_function(mRepos, "svn_repos_authz_read2", _wrap_svn_repos_authz_read2, -1); rb_define_module_function(mRepos, "svn_repos_authz_read", _wrap_svn_repos_authz_read, -1); + rb_define_module_function(mRepos, "svn_repos_authz_parse2", _wrap_svn_repos_authz_parse2, -1); rb_define_module_function(mRepos, "svn_repos_authz_parse", _wrap_svn_repos_authz_parse, -1); rb_define_module_function(mRepos, "svn_repos_authz_check_access", _wrap_svn_repos_authz_check_access, -1); rb_define_const(mRepos, "Svn_repos_revision_access_none", SWIG_From_int((int)(svn_repos_revision_access_none))); @@ -21729,6 +22048,7 @@ SWIGEXPORT void Init_repos(void) { rb_define_module_function(mRepos, "svn_repos_invoke_log_entry_receiver", _wrap_svn_repos_invoke_log_entry_receiver, -1); rb_define_module_function(mRepos, "svn_repos_invoke_file_rev_handler", _wrap_svn_repos_invoke_file_rev_handler, -1); rb_define_module_function(mRepos, "svn_repos_invoke_verify_callback", _wrap_svn_repos_invoke_verify_callback, -1); + rb_define_module_function(mRepos, "svn_repos_invoke_authz_warning_func", _wrap_svn_repos_invoke_authz_warning_func, -1); { VALUE cSvnrepos; diff --git a/subversion/bindings/swig/ruby/svn_wc.c b/subversion/bindings/swig/ruby/svn_wc.c index bd5be8e..b1631b7 100644 --- a/subversion/bindings/swig/ruby/svn_wc.c +++ b/subversion/bindings/swig/ruby/svn_wc.c @@ -1891,100 +1891,102 @@ int SWIG_Ruby_arity( VALUE proc, int minimal ) #define SWIGTYPE_p_svn_commit_info_t swig_types[85] #define SWIGTYPE_p_svn_config_t swig_types[86] #define SWIGTYPE_p_svn_delta_editor_t swig_types[87] -#define SWIGTYPE_p_svn_depth_t swig_types[88] -#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[89] -#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[90] -#define SWIGTYPE_p_svn_diff_datasource_e swig_types[91] -#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[92] -#define SWIGTYPE_p_svn_diff_file_options_t swig_types[93] -#define SWIGTYPE_p_svn_diff_fns2_t swig_types[94] -#define SWIGTYPE_p_svn_diff_fns_t swig_types[95] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[96] -#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[97] -#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[98] -#define SWIGTYPE_p_svn_diff_t swig_types[99] -#define SWIGTYPE_p_svn_dirent_t swig_types[100] -#define SWIGTYPE_p_svn_errno_t swig_types[101] -#define SWIGTYPE_p_svn_error_t swig_types[102] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[103] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[104] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[105] -#define SWIGTYPE_p_svn_location_segment_t swig_types[106] -#define SWIGTYPE_p_svn_lock_t swig_types[107] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[108] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[109] -#define SWIGTYPE_p_svn_log_entry_t swig_types[110] -#define SWIGTYPE_p_svn_merge_range_t swig_types[111] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[112] -#define SWIGTYPE_p_svn_node_kind_t swig_types[113] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[114] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[115] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[116] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[117] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[118] -#define SWIGTYPE_p_svn_patch_file_t swig_types[119] -#define SWIGTYPE_p_svn_patch_t swig_types[120] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[121] -#define SWIGTYPE_p_svn_prop_kind swig_types[122] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[123] -#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[124] -#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[125] -#define SWIGTYPE_p_svn_ra_plugin_t swig_types[126] -#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[127] -#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[128] -#define SWIGTYPE_p_svn_ra_reporter_t swig_types[129] -#define SWIGTYPE_p_svn_ra_session_t swig_types[130] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[131] -#define SWIGTYPE_p_svn_stream_t swig_types[132] -#define SWIGTYPE_p_svn_string_t swig_types[133] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[134] -#define SWIGTYPE_p_svn_tristate_t swig_types[135] -#define SWIGTYPE_p_svn_txdelta_op_t swig_types[136] -#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[137] -#define SWIGTYPE_p_svn_txdelta_window_t swig_types[138] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[139] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[140] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[141] -#define SWIGTYPE_p_svn_version_extended_t swig_types[142] -#define SWIGTYPE_p_svn_version_t swig_types[143] -#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[144] -#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[145] -#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[146] -#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[147] -#define SWIGTYPE_p_svn_wc_conflict_description2_t swig_types[148] -#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[149] -#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[150] -#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[151] -#define SWIGTYPE_p_svn_wc_conflict_result_t swig_types[152] -#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[153] -#define SWIGTYPE_p_svn_wc_context_t swig_types[154] -#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[155] -#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[156] -#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[157] -#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[158] -#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[159] -#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[160] -#define SWIGTYPE_p_svn_wc_entry_t swig_types[161] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[162] -#define SWIGTYPE_p_svn_wc_external_item_t swig_types[163] -#define SWIGTYPE_p_svn_wc_info_t swig_types[164] -#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[165] -#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[166] -#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[167] -#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[168] -#define SWIGTYPE_p_svn_wc_notify_t swig_types[169] -#define SWIGTYPE_p_svn_wc_operation_t swig_types[170] -#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[171] -#define SWIGTYPE_p_svn_wc_schedule_t swig_types[172] -#define SWIGTYPE_p_svn_wc_status2_t swig_types[173] -#define SWIGTYPE_p_svn_wc_status3_t swig_types[174] -#define SWIGTYPE_p_svn_wc_status_t swig_types[175] -#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[176] -#define SWIGTYPE_p_unsigned_char swig_types[177] -#define SWIGTYPE_p_unsigned_long swig_types[178] -#define SWIGTYPE_p_void swig_types[179] -static swig_type_info *swig_types[181]; -static swig_module_info swig_module = {swig_types, 180, 0, 0, 0, 0}; +#define SWIGTYPE_p_svn_delta_path_driver_state_t swig_types[88] +#define SWIGTYPE_p_svn_depth_t swig_types[89] +#define SWIGTYPE_p_svn_diff_binary_patch_t swig_types[90] +#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[91] +#define SWIGTYPE_p_svn_diff_datasource_e swig_types[92] +#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[93] +#define SWIGTYPE_p_svn_diff_file_options_t swig_types[94] +#define SWIGTYPE_p_svn_diff_fns2_t swig_types[95] +#define SWIGTYPE_p_svn_diff_fns_t swig_types[96] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[97] +#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[98] +#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[99] +#define SWIGTYPE_p_svn_diff_t swig_types[100] +#define SWIGTYPE_p_svn_dirent_t swig_types[101] +#define SWIGTYPE_p_svn_errno_t swig_types[102] +#define SWIGTYPE_p_svn_error_t swig_types[103] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[104] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[105] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[106] +#define SWIGTYPE_p_svn_location_segment_t swig_types[107] +#define SWIGTYPE_p_svn_lock_t swig_types[108] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[109] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[110] +#define SWIGTYPE_p_svn_log_entry_t swig_types[111] +#define SWIGTYPE_p_svn_merge_range_t swig_types[112] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[113] +#define SWIGTYPE_p_svn_node_kind_t swig_types[114] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[115] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[116] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[117] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[118] +#define SWIGTYPE_p_svn_opt_subcommand_desc3_t swig_types[119] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[120] +#define SWIGTYPE_p_svn_patch_file_t swig_types[121] +#define SWIGTYPE_p_svn_patch_t swig_types[122] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[123] +#define SWIGTYPE_p_svn_prop_kind swig_types[124] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[125] +#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[126] +#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[127] +#define SWIGTYPE_p_svn_ra_plugin_t swig_types[128] +#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[129] +#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[130] +#define SWIGTYPE_p_svn_ra_reporter_t swig_types[131] +#define SWIGTYPE_p_svn_ra_session_t swig_types[132] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[133] +#define SWIGTYPE_p_svn_stream_t swig_types[134] +#define SWIGTYPE_p_svn_string_t swig_types[135] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[136] +#define SWIGTYPE_p_svn_tristate_t swig_types[137] +#define SWIGTYPE_p_svn_txdelta_op_t swig_types[138] +#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[139] +#define SWIGTYPE_p_svn_txdelta_window_t swig_types[140] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[141] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[142] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[143] +#define SWIGTYPE_p_svn_version_extended_t swig_types[144] +#define SWIGTYPE_p_svn_version_t swig_types[145] +#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[146] +#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[147] +#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[148] +#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[149] +#define SWIGTYPE_p_svn_wc_conflict_description2_t swig_types[150] +#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[151] +#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[152] +#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[153] +#define SWIGTYPE_p_svn_wc_conflict_result_t swig_types[154] +#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[155] +#define SWIGTYPE_p_svn_wc_context_t swig_types[156] +#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[157] +#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[158] +#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[159] +#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[160] +#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[161] +#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[162] +#define SWIGTYPE_p_svn_wc_entry_t swig_types[163] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[164] +#define SWIGTYPE_p_svn_wc_external_item_t swig_types[165] +#define SWIGTYPE_p_svn_wc_info_t swig_types[166] +#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[167] +#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[168] +#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[169] +#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[170] +#define SWIGTYPE_p_svn_wc_notify_t swig_types[171] +#define SWIGTYPE_p_svn_wc_operation_t swig_types[172] +#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[173] +#define SWIGTYPE_p_svn_wc_schedule_t swig_types[174] +#define SWIGTYPE_p_svn_wc_status2_t swig_types[175] +#define SWIGTYPE_p_svn_wc_status3_t swig_types[176] +#define SWIGTYPE_p_svn_wc_status_t swig_types[177] +#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[178] +#define SWIGTYPE_p_unsigned_char swig_types[179] +#define SWIGTYPE_p_unsigned_long swig_types[180] +#define SWIGTYPE_p_void swig_types[181] +static swig_type_info *swig_types[183]; +static swig_module_info swig_module = {swig_types, 182, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2132,7 +2134,7 @@ SWIG_ruby_failed(void) } -/*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args) { VALUE obj = args[0]; @@ -2212,7 +2214,7 @@ SWIGINTERN svn_wc_external_item2_t *svn_wc_external_item2_t_dup(struct svn_wc_ex return svn_wc_external_item2_dup(self, pool); } -/*@SWIG:/opt/svnrm-1.10/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/opt/svnrm/prefix/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args) { VALUE obj = args[0]; @@ -31741,6 +31743,113 @@ fail: } +SWIGINTERN VALUE +_wrap_svn_wc_revert6(int argc, VALUE *argv, VALUE self) { + svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ; + char *arg2 = (char *) 0 ; + svn_depth_t arg3 ; + svn_boolean_t arg4 ; + apr_array_header_t *arg5 = (apr_array_header_t *) 0 ; + svn_boolean_t arg6 ; + svn_boolean_t arg7 ; + svn_boolean_t arg8 ; + svn_cancel_func_t arg9 = (svn_cancel_func_t) 0 ; + void *arg10 = (void *) 0 ; + svn_wc_notify_func2_t arg11 = (svn_wc_notify_func2_t) 0 ; + void *arg12 = (void *) 0 ; + apr_pool_t *arg13 = (apr_pool_t *) 0 ; + VALUE _global_svn_swig_rb_pool ; + apr_pool_t *_global_pool ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + void *argp5 = 0 ; + int res5 = 0 ; + svn_error_t *result = 0 ; + VALUE vresult = Qnil; + + { + svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg13); + _global_pool = arg13; + svn_swig_rb_push_pool(_global_svn_swig_rb_pool); + } + if ((argc < 10) || (argc > 11)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 10)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_wc_context_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_wc_context_t *","svn_wc_revert6", 1, argv[0] )); + } + arg1 = (svn_wc_context_t *)(argp1); + res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_wc_revert6", 2, argv[1] )); + } + arg2 = (char *)(buf2); + { + arg3 = svn_swig_rb_to_depth(argv[2]); + } + arg4 = RTEST(argv[3]); + res5 = SWIG_ConvertPtr(argv[4], &argp5,SWIGTYPE_p_apr_array_header_t, 0 | 0 ); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "apr_array_header_t const *","svn_wc_revert6", 5, argv[4] )); + } + arg5 = (apr_array_header_t *)(argp5); + arg6 = RTEST(argv[5]); + arg7 = RTEST(argv[6]); + arg8 = RTEST(argv[7]); + { + arg9 = (svn_cancel_func_t) svn_swig_rb_cancel_func; + arg10 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool); + } + { + arg11 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2; + arg12 = (void *)svn_swig_rb_make_baton(argv[9], _global_svn_swig_rb_pool); + } + if (argc > 10) { + + } + { + result = (svn_error_t *)svn_wc_revert6(arg1,(char const *)arg2,arg3,arg4,(apr_array_header_t const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13); + + + + } + { + if (result) { + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + svn_swig_rb_handle_svn_error(result); + } + vresult = Qnil; + } + { + svn_swig_rb_set_baton(vresult, (VALUE)arg10); + } + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return vresult; +fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + { + VALUE target; + target = _global_vresult_address == &vresult ? self : vresult; + if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool)) + svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool); + svn_swig_rb_pop_pool(_global_svn_swig_rb_pool); + } + return Qnil; +} + + SWIGINTERN VALUE _wrap_svn_wc_revert5(int argc, VALUE *argv, VALUE self) { svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ; @@ -40303,49 +40412,49 @@ static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *| static swig_type_info _swigt__p_apr_off_t = {"_p_apr_off_t", "apr_off_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const **,char const **,void *,char const *,apr_pool_t *,apr_pool_t *)|svn_wc_upgrade_get_repos_info_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_string_t const **,svn_stream_t *,void *,apr_pool_t *)|svn_wc_canonicalize_svn_prop_get_file_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__svn_wc_entry_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_q_const__svn_wc_entry_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_wc_entry_t const *,void *,apr_pool_t *)|svn_error_t *(*)(char const *,svn_wc_entry_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_q_const__char_p_svn_error_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_error_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(char const *,svn_error_t *,void *,apr_pool_t *)|svn_error_t *(*)(char const *,svn_error_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)|struct svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)|svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)|struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,svn_revnum_t,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)|svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,char const *,svn_revnum_t,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,char const *,svn_revnum_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,char const *,svn_revnum_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,void *,apr_pool_t *)|svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t **,char const *,char const *,apr_pool_t *,apr_pool_t *)|svn_wc_dirents_func_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const **,char const **,void *,char const *,apr_pool_t *,apr_pool_t *)|svn_wc_upgrade_get_repos_info_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_string_t const **,svn_stream_t *,void *,apr_pool_t *)|svn_wc_canonicalize_svn_prop_get_file_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t|svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t|svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__svn_wc_entry_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_q_const__svn_wc_entry_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_wc_entry_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_q_const__char_p_svn_error_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__char_p_svn_error_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(char const *,svn_error_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,char const *,char const *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_revnum_t,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t = {"_p_f_p_svn_wc_adm_access_t_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void__p_svn_error_t", "svn_error_t *(*)(svn_wc_adm_access_t *,svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,char const *,char const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_boolean_t_p_svn_boolean_t_p_svn_boolean_t_p_q_const__char_svn_revnum_t_p_q_const__char_svn_revnum_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_boolean_t *,svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,char const *,svn_revnum_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__apr_array_header_t_p_apr_hash_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,char const *,svn_revnum_t,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_wc_notify_state_t_p_svn_wc_notify_state_t_p_svn_boolean_t_p_q_const__char_svn_boolean_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,svn_boolean_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_hash_t **,char const *,char const *,apr_pool_t *,apr_pool_t *)|svn_wc_dirents_func_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void = {"_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void", "void (*)(void *,char const *,enum svn_wc_notify_action_t,enum svn_node_kind_t,char const *,enum svn_wc_notify_state_t,enum svn_wc_notify_state_t,long)|svn_wc_notify_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t", "svn_wc_relocation_validator_t|struct svn_error_t *(*)(void *,char const *,char const *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_changelist_receiver_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,char const *,apr_pool_t *)|svn_wc_relocation_validator3_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_wc_relocation_validator2_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t", "svn_wc_external_update_t|struct svn_error_t *(*)(void *,char const *,svn_string_t const *,svn_string_t const *,svn_depth_t,apr_pool_t *)", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_wc_status3_t const *,apr_pool_t *)|svn_wc_status_func4_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t", "svn_wc_relocation_validator_t|svn_error_t *(*)(void *,char const *,char const *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_changelist_receiver_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,char const *,char const *,apr_pool_t *)|svn_wc_relocation_validator3_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_wc_relocation_validator2_t|svn_error_t *(*)(void *,char const *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t", "svn_wc_external_update_t|svn_error_t *(*)(void *,char const *,svn_string_t const *,svn_string_t const *,svn_depth_t,apr_pool_t *)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status3_t const *,apr_pool_t *)|svn_wc_status_func4_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void", "void (*)(void *,char const *,struct svn_wc_status2_t *)|svn_wc_status_func2_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void = {"_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void", "void (*)(void *,char const *,struct svn_wc_status_t *)|svn_wc_status_func_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)|svn_wc_status_func3_t", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)|svn_wc_get_file_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_wc_status2_t *,apr_pool_t *)|svn_wc_status_func3_t", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,svn_revnum_t,svn_stream_t *,svn_revnum_t *,apr_hash_t **,apr_pool_t *)|svn_wc_get_file_t", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void = {"_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void", "svn_wc_notify_func2_t|void (*)(void *,struct svn_wc_notify_t const *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_long = {"_p_long", "long *|svn_revnum_t *", 0, 0, (void*)0, 0}; @@ -40383,6 +40492,7 @@ static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct s static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_delta_path_driver_state_t = {"_p_svn_delta_path_driver_state_t", "struct svn_delta_path_driver_state_t *|svn_delta_path_driver_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_binary_patch_t = {"_p_svn_diff_binary_patch_t", "struct svn_diff_binary_patch_t *|svn_diff_binary_patch_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_diff_conflict_display_style_t = {"_p_svn_diff_conflict_display_style_t", "enum svn_diff_conflict_display_style_t *|svn_diff_conflict_display_style_t *", 0, 0, (void*)0, 0}; @@ -40397,7 +40507,7 @@ static swig_type_info _swigt__p_svn_diff_output_fns_t = {"_p_svn_diff_output_fns static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_t *|svn_diff_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "svn_error_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0}; @@ -40413,6 +40523,7 @@ static swig_type_info _swigt__p_svn_opt_revision_range_t = {"_p_svn_opt_revision static swig_type_info _swigt__p_svn_opt_revision_t = {"_p_svn_opt_revision_t", "struct svn_opt_revision_t *|svn_opt_revision_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_revision_value_t = {"_p_svn_opt_revision_value_t", "union svn_opt_revision_value_t *|svn_opt_revision_value_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc2_t = {"_p_svn_opt_subcommand_desc2_t", "struct svn_opt_subcommand_desc2_t *|svn_opt_subcommand_desc2_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_opt_subcommand_desc3_t = {"_p_svn_opt_subcommand_desc3_t", "struct svn_opt_subcommand_desc3_t *|svn_opt_subcommand_desc3_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_opt_subcommand_desc_t = {"_p_svn_opt_subcommand_desc_t", "struct svn_opt_subcommand_desc_t *|svn_opt_subcommand_desc_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_file_t = {"_p_svn_patch_file_t", "struct svn_patch_file_t *|svn_patch_file_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_patch_t = {"_p_svn_patch_t", "struct svn_patch_t *|svn_patch_t *", 0, 0, (void*)0, 0}; @@ -40565,6 +40676,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_commit_info_t, &_swigt__p_svn_config_t, &_swigt__p_svn_delta_editor_t, + &_swigt__p_svn_delta_path_driver_state_t, &_swigt__p_svn_depth_t, &_swigt__p_svn_diff_binary_patch_t, &_swigt__p_svn_diff_conflict_display_style_t, @@ -40595,6 +40707,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_opt_revision_t, &_swigt__p_svn_opt_revision_value_t, &_swigt__p_svn_opt_subcommand_desc2_t, + &_swigt__p_svn_opt_subcommand_desc3_t, &_swigt__p_svn_opt_subcommand_desc_t, &_swigt__p_svn_patch_file_t, &_swigt__p_svn_patch_t, @@ -40747,6 +40860,7 @@ static swig_cast_info _swigc__p_svn_checksum_t[] = { {&_swigt__p_svn_checksum_t static swig_cast_info _swigc__p_svn_commit_info_t[] = { {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_config_t[] = { {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_delta_editor_t[] = { {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_delta_path_driver_state_t[] = { {&_swigt__p_svn_delta_path_driver_state_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_depth_t[] = { {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_binary_patch_t[] = { {&_swigt__p_svn_diff_binary_patch_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_diff_conflict_display_style_t[] = { {&_swigt__p_svn_diff_conflict_display_style_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -40777,6 +40891,7 @@ static swig_cast_info _swigc__p_svn_opt_revision_range_t[] = { {&_swigt__p_svn_ static swig_cast_info _swigc__p_svn_opt_revision_t[] = { {&_swigt__p_svn_opt_revision_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_revision_value_t[] = { {&_swigt__p_svn_opt_revision_value_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc2_t[] = { {&_swigt__p_svn_opt_subcommand_desc2_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_opt_subcommand_desc3_t[] = { {&_swigt__p_svn_opt_subcommand_desc3_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_opt_subcommand_desc_t[] = { {&_swigt__p_svn_opt_subcommand_desc_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_file_t[] = { {&_swigt__p_svn_patch_file_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_patch_t[] = { {&_swigt__p_svn_patch_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -40929,6 +41044,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_commit_info_t, _swigc__p_svn_config_t, _swigc__p_svn_delta_editor_t, + _swigc__p_svn_delta_path_driver_state_t, _swigc__p_svn_depth_t, _swigc__p_svn_diff_binary_patch_t, _swigc__p_svn_diff_conflict_display_style_t, @@ -40959,6 +41075,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_opt_revision_t, _swigc__p_svn_opt_revision_value_t, _swigc__p_svn_opt_subcommand_desc2_t, + _swigc__p_svn_opt_subcommand_desc3_t, _swigc__p_svn_opt_subcommand_desc_t, _swigc__p_svn_patch_file_t, _swigc__p_svn_patch_t, @@ -42136,6 +42253,7 @@ SWIGEXPORT void Init_wc(void) { rb_define_module_function(mWc, "svn_wc_relocate3", _wrap_svn_wc_relocate3, -1); rb_define_module_function(mWc, "svn_wc_relocate2", _wrap_svn_wc_relocate2, -1); rb_define_module_function(mWc, "svn_wc_relocate", _wrap_svn_wc_relocate, -1); + rb_define_module_function(mWc, "svn_wc_revert6", _wrap_svn_wc_revert6, -1); rb_define_module_function(mWc, "svn_wc_revert5", _wrap_svn_wc_revert5, -1); rb_define_module_function(mWc, "svn_wc_revert4", _wrap_svn_wc_revert4, -1); rb_define_module_function(mWc, "svn_wc_revert3", _wrap_svn_wc_revert3, -1); diff --git a/subversion/bindings/swig/ruby/test/test_client.rb b/subversion/bindings/swig/ruby/test/test_client.rb index 7f3343b..85919f1 100644 --- a/subversion/bindings/swig/ruby/test/test_client.rb +++ b/subversion/bindings/swig/ruby/test/test_client.rb @@ -1087,7 +1087,7 @@ class SvnClientTest < Test::Unit::TestCase We haven't yet figured out what to expect in the case of an obstruction, but it is no longer an error. Commenting out this test until that decision is made (see issue #3680: - http://subversion.tigris.org/issues/show_bug.cgi?id=3680) + https://issues.apache.org/jira/browse/SVN-3680) def test_cleanup log = "sample log" diff --git a/subversion/bindings/swig/ruby/test/test_delta.rb b/subversion/bindings/swig/ruby/test/test_delta.rb index 541a4fe..113e01b 100644 --- a/subversion/bindings/swig/ruby/test/test_delta.rb +++ b/subversion/bindings/swig/ruby/test/test_delta.rb @@ -211,29 +211,32 @@ class SvnDeltaTest < Test::Unit::TestCase assert_equal(target_text, data) end - def test_path_driver - editor = Svn::Delta::BaseEditor.new - sorted_paths = [] - callback = Proc.new do |parent_baton, path| - sorted_paths << path - end - - targets = [ - "/", - "/file1", - "/dir1", - "/dir2/file2", - "/dir2/dir3/file3", - "/dir2/dir3/file4" - ] - 10.times do - x = rand(targets.size) - y = rand(targets.size) - targets[x], targets[y] = targets[y], targets[x] - end - Svn::Delta.path_driver(editor, 0, targets, &callback) - assert_equal(targets.sort, sorted_paths) - end +# Fails since r1852536: "delta path editor binding broken for root path" +# https://issues.apache.org/jira/browse/SVN-4805 +# +# def test_path_driver +# editor = Svn::Delta::BaseEditor.new +# sorted_paths = [] +# callback = Proc.new do |parent_baton, path| +# sorted_paths << path +# end +# +# targets = [ +# "/", +# "/file1", +# "/dir1", +# "/dir2/file2", +# "/dir2/dir3/file3", +# "/dir2/dir3/file4" +# ] +# 10.times do +# x = rand(targets.size) +# y = rand(targets.size) +# targets[x], targets[y] = targets[y], targets[x] +# end +# Svn::Delta.path_driver(editor, 0, targets, &callback) +# assert_equal(targets.sort, sorted_paths) +# end def test_changed dir = "changed_dir" diff --git a/subversion/bindings/swig/ruby/test/test_util.rb b/subversion/bindings/swig/ruby/test/test_util.rb index 5f9b1ac..fa8f53c 100644 --- a/subversion/bindings/swig/ruby/test/test_util.rb +++ b/subversion/bindings/swig/ruby/test/test_util.rb @@ -33,5 +33,6 @@ class SvnUtilTest < Test::Unit::TestCase assert_equal("Abc", Svn::Util.to_ruby_class_name("abc")) assert_equal("AbcDef", Svn::Util.to_ruby_class_name("abc_def")) assert_equal("AbcDef", Svn::Util.to_ruby_class_name("ABC_DEF")) + assert_equal("XFoo", Svn::Util.to_ruby_class_name("_foo")) end end diff --git a/subversion/include/private/svn_client_mtcc.h b/subversion/include/private/svn_client_mtcc.h index fe670b0..d8bc902 100644 --- a/subversion/include/private/svn_client_mtcc.h +++ b/subversion/include/private/svn_client_mtcc.h @@ -207,6 +207,17 @@ svn_client__mtcc_check_path(svn_node_kind_t *kind, /** Commits all operations stored in @a mtcc as a new revision and destroys * @a mtcc. * + * A log message is obtained from the log message callback in the client + * context in @a mtcc. + * + * @a revprop_table (if non-NULL) supplies additional revision properties; + * it may not supply any "svn:*" revision properties. + * + * As with svn_ra_get_commit_editor3(), after the commit has succeeded, + * it will invoke @a commit_callback (if non-NULL) with filled-in + * #svn_commit_info_t *, @a commit_baton, and @a scratch_pool or some subpool + * thereof as arguments. + * * @since New in 1.9. */ svn_error_t * diff --git a/subversion/include/private/svn_client_private.h b/subversion/include/private/svn_client_private.h index 892fc4b..d9e4a27 100644 --- a/subversion/include/private/svn_client_private.h +++ b/subversion/include/private/svn_client_private.h @@ -281,26 +281,6 @@ svn_client__wc_node_get_origin(svn_client__pathrev_t **origin_p, apr_pool_t *result_pool, apr_pool_t *scratch_pool); -/* Copy the file or directory on URL in some repository to DST_ABSPATH, - * copying node information and properties. Resolve URL using PEG_REV and - * REVISION. - * - * If URL specifies a directory, create the copy using depth DEPTH. - * - * If MAKE_PARENTS is TRUE and DST_ABSPATH doesn't have an added parent - * create missing parent directories - */ -svn_error_t * -svn_client__copy_foreign(const char *url, - const char *dst_abspath, - svn_opt_revision_t *peg_revision, - svn_opt_revision_t *revision, - svn_depth_t depth, - svn_boolean_t make_parents, - svn_boolean_t already_locked, - svn_client_ctx_t *ctx, - apr_pool_t *scratch_pool); - /* Same as the public svn_client_mergeinfo_log2 API, except for the addition * of the TARGET_MERGEINFO_CATALOG and RESULT_POOL parameters. * @@ -341,6 +321,236 @@ svn_client__mergeinfo_log(svn_boolean_t finding_merged, apr_pool_t *result_pool, apr_pool_t *scratch_pool); +/** Return a diff processor that will print a Subversion-style + * (not git-style) diff. + * + * @a anchor is optional (may be null), and is the 'anchor' path to prefix + * to the diff-processor paths before displaying. + * + * @a orig_path_1 and @a orig_path_2 are the two main root paths to be + * diffed; each may be a URL, a local WC path or a local unversioned path. + * + * Other arguments are as for svn_client_diff7() etc. + */ +svn_error_t * +svn_client__get_diff_writer_svn( + svn_diff_tree_processor_t **diff_processor, + const char *anchor, + const char *orig_path_1, + const char *orig_path_2, + const apr_array_header_t *options, + const char *relative_to_dir, + svn_boolean_t no_diff_added, + svn_boolean_t no_diff_deleted, + svn_boolean_t show_copies_as_adds, + svn_boolean_t ignore_content_type, + svn_boolean_t ignore_properties, + svn_boolean_t properties_only, + svn_boolean_t pretty_print_mergeinfo, + const char *header_encoding, + svn_stream_t *outstream, + svn_stream_t *errstream, + svn_client_ctx_t *ctx, + apr_pool_t *pool); + +/** Output the subtree of @a shelf_version rooted at @a shelf_relpath + * as a diff to @a diff_processor. + * + * ### depth and ignore_ancestry are currently ignored. + * + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_diff(svn_client__shelf_version_t *shelf_version, + const char *shelf_relpath, + svn_depth_t depth, + svn_boolean_t ignore_ancestry, + const svn_diff_tree_processor_t *diff_processor, + apr_pool_t *scratch_pool); + +/*** Editor for diff summary ***/ + +/* Set *DIFF_PROCESSOR to a diff processor that will report a diff summary + to SUMMARIZE_FUNC. + + SUMMARIZE_FUNC is called with SUMMARIZE_BATON as parameter by the + created callbacks for each changed item. +*/ +svn_error_t * +svn_client__get_diff_summarize_callbacks( + svn_diff_tree_processor_t **diff_processor, + svn_client_diff_summarize_func_t summarize_func, + void *summarize_baton, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + +/** Copy a directory tree or a file (according to @a kind) from @a src_url at + * @a src_rev, to @a dst_abspath in a WC. + * + * The caller should be holding a WC write lock that allows @a dst_abspath to + * be created, such as on the parent of @a dst_abspath. + * + * If not same repositories, then remove any svn:mergeinfo property. + * + * Use @a ra_session to fetch the data. The session may point to any URL + * within the source repository. + * + * This API does not process any externals definitions that may be present + * on copied directories. + */ +svn_error_t * +svn_client__repos_to_wc_copy_internal(svn_boolean_t *timestamp_sleep, + svn_node_kind_t kind, + const char *src_url, + svn_revnum_t src_rev, + const char *dst_abspath, + svn_ra_session_t *ra_session, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool); + +/** Copy a directory tree or a file (according to @a kind) from @a src_url at + * @a src_rev, to @a dst_abspath in a WC. + * + * The caller should be holding a WC write lock that allows @a dst_abspath to + * be created, such as on the parent of @a dst_abspath. + * + * If not same repositories, then remove any svn:mergeinfo property. + * + * Use @a ra_session to fetch the data. The session may point to a different + * URL after returning. + * + * This API does not process any externals definitions that may be present + * on copied directories. + */ +svn_error_t * +svn_client__repos_to_wc_copy_by_editor(svn_boolean_t *timestamp_sleep, + svn_node_kind_t kind, + const char *src_url, + svn_revnum_t src_rev, + const char *dst_abspath, + svn_ra_session_t *ra_session, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool); + +/** Return an editor for applying local modifications to a WC. + * + * Return an editor in @a *editor_p, @a *edit_baton_p that will apply + * local modifications to the WC subdirectory at @a dst_abspath. + * + * The @a path arguments to the editor methods shall be local WC paths, + * relative to @a dst_abspath. The @a copyfrom_path arguments to the + * editor methods shall be URLs. + * + * Send notifications via @a notify_func / @a notify_baton. + * ### INCOMPLETE + * + * @a ra_session is used to fetch the original content for copies. + * + * Ignore changes to non-regular property (entry-props, DAV/WC-props). + * + * Acquire the WC write lock in 'open_root' and release it in + * 'close_edit', in 'abort_edit', or when @a result_pool is cleared. + */ +svn_error_t * +svn_client__wc_editor(const svn_delta_editor_t **editor_p, + void **edit_baton_p, + const char *dst_abspath, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + svn_ra_session_t *ra_session, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool); + +/* Return an editor for applying local modifications to a WC. + * + * Like svn_client__wc_editor() but with additional options. + * + * If @a root_dir_add is true, then create and schedule for addition + * the root directory of this edit, else assume it is already a versioned, + * existing directory. + * + * If @a ignore_mergeinfo_changes is true, ignore any incoming changes + * to the 'svn:mergeinfo' property. + * + * If @a manage_wc_write_lock is true, acquire the WC write lock in + * 'open_root' and release it in 'close_edit', in 'abort_edit', or + * when @a result_pool is cleared. + */ +svn_error_t * +svn_client__wc_editor_internal(const svn_delta_editor_t **editor_p, + void **edit_baton_p, + const char *dst_abspath, + svn_boolean_t root_dir_add, + svn_boolean_t ignore_mergeinfo_changes, + svn_boolean_t manage_wc_write_lock, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + svn_ra_session_t *ra_session, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool); + +/** Send committable changes found in the WC to a delta-editor. + * + * Committable changes are found in TARGETS:DEPTH:CHANGELISTS. + * + * Send the changes to @a editor:@a edit_baton. The @a path arguments + * to the editor methods are URL-paths relative to the URL of + * @a src_wc_abspath. + * + * ### We will presumably need to change this so that the @a path + * arguments to the editor will be local WC relpaths, in order + * to handle switched paths. + * + * The @a copyfrom_path arguments to the editor methods are URLs. As the + * WC does not store copied-from-foreign-repository metadata, the URL will + * be in the same repository as the URL of its parent path. + * + * Compared with svn_client__do_commit(), this (like svn_client_commit6) + * handles: + * - condense targets and find committable paths + * - checking only one repository is involved + * + * Compared with svn_client_commit6(), this does not handle: + * - externals + * - log message + * - revprops + * - checking the commit includes both halves of each local move + * - changing the copy revision of each local move to ~HEAD + * - WC write locks + * - bumping revisions in WC + * - removing locks and changelists in WC + */ +svn_error_t * +svn_client__wc_replay(const char *src_wc_abspath, + const apr_array_header_t *targets, + svn_depth_t depth, + const apr_array_header_t *changelists, + const svn_delta_editor_t *editor, + void *edit_baton, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool); + +/** Copy local modifications from one WC subtree to another. + * + * Find local modifications under @a src_wc_abspath, in the same way as + * for a commit. + * + * Edit the WC at @a dst_wc_abspath, applying those modifications to the + * current working state to produce a new working state. + * + * The source and destination may be in the same WC or in different WCs. + */ +svn_error_t * +svn_client__wc_copy_mods(const char *src_wc_abspath, + const char *dst_wc_abspath, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/subversion/include/private/svn_diff_tree.h b/subversion/include/private/svn_diff_tree.h index 713644d..9c675d9 100644 --- a/subversion/include/private/svn_diff_tree.h +++ b/subversion/include/private/svn_diff_tree.h @@ -321,7 +321,6 @@ svn_diff__tree_processor_create(void *baton, */ /* Used by libsvn clients repository diff */ const svn_diff_tree_processor_t * svn_diff__tree_processor_reverse_create(const svn_diff_tree_processor_t * processor, - const char *prefix_relpath, apr_pool_t *result_pool); /** diff --git a/subversion/include/private/svn_dirent_uri_private.h b/subversion/include/private/svn_dirent_uri_private.h new file mode 100644 index 0000000..0da5f47 --- /dev/null +++ b/subversion/include/private/svn_dirent_uri_private.h @@ -0,0 +1,53 @@ +/* + * svn_dirent_uri_private.h : private definitions for dirents and URIs + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ + +#ifndef SVN_DIRENT_URI_PRIVATE_H +#define SVN_DIRENT_URI_PRIVATE_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/** + * Convert @a relpath from the local style to the canonical internal style. + * "Local style" means native path separators and "." for the empty path. + * + * Allocates the results in @a result_pool. Uses @a scratch_pool for + * temporary allocations. + * + * @since New in 1.7 (as svn_relpath__internal_style()). + * @since Name and signature changed in 1.12. + */ +svn_error_t * +svn_relpath__make_internal(const char **internal_style_relpath, + const char *relpath, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* SVN_DIRENT_URI_PRIVATE_H */ diff --git a/subversion/include/private/svn_element.h b/subversion/include/private/svn_element.h index c467175..9c7129a 100644 --- a/subversion/include/private/svn_element.h +++ b/subversion/include/private/svn_element.h @@ -348,7 +348,7 @@ svn_element__content_t * svn_element__tree_get(const svn_element__tree_t *tree, int eid); -svn_error_t * +void svn_element__tree_set(svn_element__tree_t *tree, int eid, const svn_element__content_t *element); diff --git a/subversion/include/private/svn_fs_fs_private.h b/subversion/include/private/svn_fs_fs_private.h index d2573d4..de57558 100644 --- a/subversion/include/private/svn_fs_fs_private.h +++ b/subversion/include/private/svn_fs_fs_private.h @@ -255,22 +255,6 @@ typedef struct svn_fs_fs__stats_t apr_hash_t *by_extension; } svn_fs_fs__stats_t; - -/* Scan all contents of the repository FS and return statistics in *STATS, - * allocated in RESULT_POOL. Report progress through PROGRESS_FUNC with - * PROGRESS_BATON, if PROGRESS_FUNC is not NULL. - * Use SCRATCH_POOL for temporary allocations. - */ -svn_error_t * -svn_fs_fs__get_stats(svn_fs_fs__stats_t **stats, - svn_fs_t *fs, - svn_fs_progress_notify_func_t progress_func, - void *progress_baton, - svn_cancel_func_t cancel_func, - void *cancel_baton, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool); - /* A node-revision ID in FSFS consists of 3 sub-IDs ("parts") that consist * of a creation REVISION number and some revision- / transaction-local * counter value (NUMBER). Old-style ID parts use global counter values. @@ -325,33 +309,49 @@ typedef svn_error_t * void *baton, apr_pool_t *scratch_pool); -/* Read the P2L index for the rev / pack file containing REVISION in FS. - * For each index entry, invoke CALLBACK_FUNC with CALLBACK_BATON. - * If not NULL, call CANCEL_FUNC with CANCEL_BATON from time to time. - * Use SCRATCH_POOL for temporary allocations. - */ -svn_error_t * -svn_fs_fs__dump_index(svn_fs_t *fs, - svn_revnum_t revision, - svn_fs_fs__dump_index_func_t callback_func, - void *callback_baton, - svn_cancel_func_t cancel_func, - void *cancel_baton, - apr_pool_t *scratch_pool); - - -/* Rewrite the respective index information of the rev / pack file in FS - * containing REVISION and use the svn_fs_fs__p2l_entry_t * array ENTRIES - * as the new index contents. Allocate temporaries from SCRATCH_POOL. - * - * Note that this becomes a no-op if ENTRIES is empty. You may use a zero- - * sized empty entry instead. - */ -svn_error_t * -svn_fs_fs__load_index(svn_fs_t *fs, - svn_revnum_t revision, - apr_array_header_t *entries, - apr_pool_t *scratch_pool); +typedef struct svn_fs_fs__ioctl_get_stats_input_t +{ + svn_fs_progress_notify_func_t progress_func; + void *progress_baton; +} svn_fs_fs__ioctl_get_stats_input_t; + +typedef struct svn_fs_fs__ioctl_get_stats_output_t +{ + svn_fs_fs__stats_t *stats; +} svn_fs_fs__ioctl_get_stats_output_t; + +SVN_FS_DECLARE_IOCTL_CODE(SVN_FS_FS__IOCTL_GET_STATS, SVN_FS_TYPE_FSFS, 1000); + +typedef struct svn_fs_fs__ioctl_dump_index_input_t +{ + svn_revnum_t revision; + svn_fs_fs__dump_index_func_t callback_func; + void *callback_baton; +} svn_fs_fs__ioctl_dump_index_input_t; + +SVN_FS_DECLARE_IOCTL_CODE(SVN_FS_FS__IOCTL_DUMP_INDEX, SVN_FS_TYPE_FSFS, 1001); + +typedef struct svn_fs_fs__ioctl_load_index_input_t +{ + svn_revnum_t revision; + /* Array of svn_fs_fs__p2l_entry_t * entries. */ + apr_array_header_t *entries; +} svn_fs_fs__ioctl_load_index_input_t; + +SVN_FS_DECLARE_IOCTL_CODE(SVN_FS_FS__IOCTL_LOAD_INDEX, SVN_FS_TYPE_FSFS, 1002); + +typedef struct svn_fs_fs__ioctl_revision_size_input_t +{ + svn_revnum_t revision; +} svn_fs_fs__ioctl_revision_size_input_t; + +typedef struct svn_fs_fs__ioctl_revision_size_output_t +{ + apr_off_t rev_size; +} svn_fs_fs__ioctl_revision_size_output_t; + +/* See svn_fs_fs__revision_size(). */ +SVN_FS_DECLARE_IOCTL_CODE(SVN_FS_FS__IOCTL_REVISION_SIZE, SVN_FS_TYPE_FSFS, 1003); #ifdef __cplusplus } diff --git a/subversion/include/private/svn_repos_private.h b/subversion/include/private/svn_repos_private.h index c65b73f..78e0829 100644 --- a/subversion/include/private/svn_repos_private.h +++ b/subversion/include/private/svn_repos_private.h @@ -31,6 +31,7 @@ #include "svn_types.h" #include "svn_repos.h" +#include "svn_delta.h" #include "svn_editor.h" #include "svn_config.h" @@ -296,6 +297,23 @@ svn_repos__dump_headers(svn_stream_t *stream, svn_repos__dumpfile_headers_t *headers, apr_pool_t *scratch_pool); +/* Write a magic header record to DUMP_STREAM specifying format version + * VERSION. + */ +svn_error_t * +svn_repos__dump_magic_header_record(svn_stream_t *dump_stream, + int version, + apr_pool_t *pool); + +/* Write a UUID record to DUMP_STREAM. + * + * If UUID is NULL then write nothing at all. + */ +svn_error_t * +svn_repos__dump_uuid_header_record(svn_stream_t *dump_stream, + const char *uuid, + apr_pool_t *pool); + /* Write a revision record to DUMP_STREAM for revision REVISION with revision * properies REVPROPS, creating appropriate headers. * @@ -349,6 +367,27 @@ svn_repos__dump_node_record(svn_stream_t *dump_stream, svn_boolean_t content_length_always, apr_pool_t *scratch_pool); +/** + * Get a dump editor @a editor along with a @a edit_baton allocated in + * @a pool. The editor will write output to @a stream. + * + * @a update_anchor_relpath is the repository relative path of the + * anchor of the update-style drive which will happen on @a *editor; + * if a replay-style drive will instead be used, it should be passed + * as @c NULL. + * + * In contrast to the dump editor used inside svn_repos_dump_fs4(), this + * one supports only deltas mode. + * + * ### TODO: Unify with the dump editor inside svn_repos_dump_fs4(). + */ +svn_error_t * +svn_repos__get_dump_editor(const svn_delta_editor_t **editor, + void **edit_baton, + svn_stream_t *stream, + const char *update_anchor_relpath, + apr_pool_t *pool); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/subversion/include/private/svn_sorts_private.h b/subversion/include/private/svn_sorts_private.h index 2d5f188..cee84cd 100644 --- a/subversion/include/private/svn_sorts_private.h +++ b/subversion/include/private/svn_sorts_private.h @@ -190,7 +190,7 @@ svn_priority_queue__size(svn_priority_queue__t *queue); /** * Returns a reference to the first element in the @a queue. The queue - * contents remains unchanged. If the @a queue is empty, #NULL will be + * contents remains unchanged. If the @a queue is empty, NULL will be * returned. */ void * @@ -212,7 +212,7 @@ svn_priority_queue__pop(svn_priority_queue__t *queue); /** * Append the new @a element to the @a queue. @a element must neither be - * #NULL nor the first element as returned by #svn_priority_queue__peek. + * NULL nor the first element as returned by #svn_priority_queue__peek. */ void svn_priority_queue__push(svn_priority_queue__t *queue, const void *element); diff --git a/subversion/include/private/svn_subr_private.h b/subversion/include/private/svn_subr_private.h index d18c564..468b7cc 100644 --- a/subversion/include/private/svn_subr_private.h +++ b/subversion/include/private/svn_subr_private.h @@ -389,27 +389,27 @@ svn_hash__make(apr_pool_t *pool); /** Struct that represents a key value pair read from a serialized hash * representation. There are special cases that can also be represented: - * a #NULL @a key signifies the end of the hash, a #NULL @a val for non- + * a NULL @a key signifies the end of the hash, a NULL @a val for non- * NULL keys is only possible in incremental mode describes a deletion. * * @since New in 1.9. */ typedef struct svn_hash__entry_t { - /** 0-terminated Key. #NULL if this contains no data at all because we + /** 0-terminated Key. NULL if this contains no data at all because we * encountered the end of the hash. */ char *key; - /** Length of @a key. Must be 0 if @a key is #NULL. */ + /** Length of @a key. Must be 0 if @a key is NULL. */ apr_size_t keylen; - /** 0-terminated value stored with the key. If this is #NULL for a + /** 0-terminated value stored with the key. If this is NULL for a * non-NULL @a key, then this means that the key shall be removed from - * the hash (only used in incremental mode). Must be #NULL if @a key is - * #NULL. */ + * the hash (only used in incremental mode). Must be NULL if @a key is + * NULL. */ char *val; - /** Length of @a val. Must be 0 if @a val is #NULL. */ + /** Length of @a val. Must be 0 if @a val is NULL. */ apr_size_t vallen; } svn_hash__entry_t; diff --git a/subversion/include/private/svn_wc_private.h b/subversion/include/private/svn_wc_private.h index 521d092..bd28b69 100644 --- a/subversion/include/private/svn_wc_private.h +++ b/subversion/include/private/svn_wc_private.h @@ -348,19 +348,21 @@ svn_wc__get_wcroot(const char **wcroot_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool); -/** Set @a *dir to the abspath of the directory in which shelved patches - * are stored, which is inside the WC's administrative directory, and ensure - * the directory exists. +/** Set @a *dir to the abspath of the directory in which administrative + * data for experimental features may be stored. This directory is inside + * the WC's administrative directory. Ensure the directory exists. * * @a local_abspath is any path in the WC, and is used to find the WC root. + * + * @warning EXPERIMENTAL. */ SVN_EXPERIMENTAL svn_error_t * -svn_wc__get_shelves_dir(char **dir, - svn_wc_context_t *wc_ctx, - const char *local_abspath, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool); +svn_wc__get_experimental_dir(char **dir, + svn_wc_context_t *wc_ctx, + const char *local_abspath, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); /** * The following are temporary APIs to aid in the transition from wc-1 to @@ -537,7 +539,7 @@ svn_wc__node_get_origin(svn_boolean_t *is_copy, * If @a base_only is TRUE then only the base node will be examined, * otherwise the current base or working node will be examined. * - * If a value is not interesting you can pass #NULL. + * If a value is not interesting you can pass NULL. * * If @a local_abspath is not in the working copy, return * @c SVN_ERR_WC_PATH_NOT_FOUND. Use @a scratch_pool for all temporary @@ -615,6 +617,42 @@ svn_wc__node_get_base(svn_node_kind_t *kind, apr_pool_t *scratch_pool); +/* Return an array of const char * elements, which represent local absolute + * paths for nodes, within the working copy indicated by WRI_ABSPATH, which + * have a basename matching BASENAME and have node kind KIND. + * If no such nodes exist, return an empty array. + * + * This function returns only paths to nodes which are present in the highest + * layer of the WC. In other words, paths to deleted and/or excluded nodes are + * never returned. + */ +svn_error_t * +svn_wc__find_working_nodes_with_basename(apr_array_header_t **abspaths, + const char *wri_abspath, + const char *basename, + svn_node_kind_t kind, + svn_wc_context_t *wc_ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + +/* Return an array of const char * elements, which represent local absolute + * paths for nodes, within the working copy indicated by WRI_ABSPATH, which + * are copies of REPOS_RELPATH and have node kind KIND. + * If no such nodes exist, return an empty array. + * + * This function returns only paths to nodes which are present in the highest + * layer of the WC. In other words, paths to deleted and/or excluded nodes are + * never returned. + */ +svn_error_t * +svn_wc__find_copies_of_repos_path(apr_array_header_t **abspaths, + const char *wri_abspath, + const char *repos_relpath, + svn_node_kind_t kind, + svn_wc_context_t *wc_ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + /* Get the working revision of @a local_abspath using @a wc_ctx. If @a * local_abspath is not in the working copy, return @c * SVN_ERR_WC_PATH_NOT_FOUND. @@ -2044,15 +2082,19 @@ svn_wc__acquire_write_lock_for_resolve(const char **lock_root_abspath, /* The implemementation of svn_wc_diff6(), but reporting to a diff processor * - * If ROOT_RELPATH is not NULL, set *ROOT_RELPATH to the target of the diff - * within the diff namespace. ("" or a single path component). + * New mode, when ANCHOR_AT_GIVEN_PATHS is true: + * + * Anchor the DIFF_PROCESSOR at LOCAL_ABSPATH. + * + * Backward compatibility mode for svn_wc_diff6(), + * when ANCHOR_AT_GIVEN_PATHS is false: * - * If ROOT_IS_FILE is NOT NULL set it - * the first processor call. (The anchor is LOCAL_ABSPATH or an ancestor of it) + * Send diff processor relpaths relative to LOCAL_ABSPATH if it is a + * directory; otherwise, relative to the parent of LOCAL_ABSPATH. + * This matches the "anchor and target" semantics of svn_wc_diff6(). */ svn_error_t * -svn_wc__diff7(const char **root_relpath, - svn_boolean_t *root_is_dir, +svn_wc__diff7(svn_boolean_t anchor_at_given_paths, svn_wc_context_t *wc_ctx, const char *local_abspath, svn_depth_t depth, diff --git a/subversion/include/svn_client.h b/subversion/include/svn_client.h index 06dbbc3..57a5208 100644 --- a/subversion/include/svn_client.h +++ b/subversion/include/svn_client.h @@ -500,7 +500,7 @@ typedef struct svn_client_commit_item3_t * contents in @c incoming_prop_changes->pool, so that it has the * same lifetime as this data structure. * - * See http://subversion.tigris.org/issues/show_bug.cgi?id=806 for a + * See https://issues.apache.org/jira/browse/SVN-806 for a * description of what would happen if the post-commit process * didn't group these changes together with all other changes to the * item. @@ -520,7 +520,7 @@ typedef struct svn_client_commit_item3_t /** * When processing the commit this contains the relative path for - * the commit session. #NULL until the commit item is preprocessed. + * the commit session. NULL until the commit item is preprocessed. * @since New in 1.7. */ const char *session_relpath; @@ -736,16 +736,11 @@ typedef svn_error_t *(*svn_client_get_commit_log_t)( * @{ */ -/** Callback type used by svn_client_blame5() to notify the caller +/** Callback type used by svn_client_blame6() to notify the caller * that line @a line_no of the blamed file was last changed in @a revision * which has the revision properties @a rev_props, and that the contents were * @a line. * - * @a start_revnum and @a end_revnum contain the start and end revision - * number of the entire blame operation, as determined from the repository - * inside svn_client_blame5(). This can be useful for the blame receiver - * to format the blame output. - * * If svn_client_blame5() was called with @a include_merged_revisions set to * TRUE, @a merged_revision, @a merged_rev_props and @a merged_path will be * set, otherwise they will be NULL. @a merged_path will be set to the @@ -758,6 +753,49 @@ typedef svn_error_t *(*svn_client_get_commit_log_t)( * will be true if the reason there is no blame information is that the line * was modified locally. In all other cases @a local_change will be false. * + * Character Encoding and Line Splitting: + * + * It is up to the client to determine the character encoding. The @a line + * content is delivered without any encoding conversion. The line splitting + * is designed to work with ASCII-compatible encodings including UTF-8. Any + * of the byte sequences LF ("\n"), CR ("\n"), CR LF ("\r\n") ends a line + * and is not included in @a line. The @a line content can include all other + * byte values including zero (ASCII NUL). + * + * @note That is how line splitting is done on the final file content, from + * which this callback is driven. It is not entirely clear whether the line + * splitting used to calculate diffs between each revision and assign a + * revision number to each line is exactly compatible with this in all cases. + * + * Blaming files that have svn:mime-type set to something other + * than text/... requires the @a ignore_mime_type flag to be set to + * true when calling the svn_client_blame6 function. + * + * @since New in 1.12. + */ +typedef svn_error_t *(*svn_client_blame_receiver4_t)( + void *baton, + apr_int64_t line_no, + svn_revnum_t revision, + apr_hash_t *rev_props, + svn_revnum_t merged_revision, + apr_hash_t *merged_rev_props, + const char *merged_path, + const svn_string_t *line, + svn_boolean_t local_change, + apr_pool_t *pool); + +/** + * Similar to #svn_client_blame_receiver4_t, but with the @a line parameter + * as a (const char*) instead of an svn_string_t, and the parameters + * @a start_revnum and @a end_revnum contain the start and end revision + * number of the entire blame operation, as resolved from the repository + * inside svn_client_blame6(). + * + * @deprecated Provided for backward compatibility with the 1.11 API. + * To replace @a start_revnum and @a end_revnum, see the corresponding + * output parameters in svn_client_blame6(). + * * @since New in 1.7. */ typedef svn_error_t *(*svn_client_blame_receiver3_t)( @@ -1547,6 +1585,38 @@ svn_client_switch(svn_revnum_t *result_rev, /** @} */ +/** Callback for svn_client__layout_list() + * + * @warning EXPERIMENTAL. + */ +typedef svn_error_t * (*svn_client__layout_func_t)( + void *layout_baton, + const char *local_abspath, + const char *repos_root_url, + svn_boolean_t not_present, + svn_boolean_t url_changed, + const char *url, + svn_boolean_t revision_changed, + svn_revnum_t revision, + svn_boolean_t depth_changed, + svn_depth_t depth, + apr_pool_t *scratch_pool); + +/** + * Describe the layout of the working copy below @a local_abspath to + * the callback @a layout. + * + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__layout_list(const char *local_abspath, + svn_client__layout_func_t layout, + void *layout_baton, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool); + + /** * @defgroup Add Begin versioning files/directories in a working copy. * @@ -2888,6 +2958,12 @@ svn_client_log(const apr_array_header_t *targets, * #SVN_RA_CAPABILITY_GET_FILE_REVS_REVERSE) and the client is 1.9.0 or * newer. * + * Before the first call to @a receiver, set @a *start_revnum_p and + * @a *end_revnum_p to the start and end revision number of the entire + * blame operation, as resolved from the repository. This can be useful + * for the blame receiver to format the blame output. Any or both of these + * arguments may be @c NULL. + * * Use @a diff_options to determine how to compare different revisions of the * target. * @@ -2896,8 +2972,33 @@ svn_client_log(const apr_array_header_t *targets, * * Use @a pool for any temporary allocation. * + * @since New in 1.12. + */ +svn_error_t * +svn_client_blame6(svn_revnum_t *start_revnum_p, + svn_revnum_t *end_revnum_p, + const char *path_or_url, + const svn_opt_revision_t *peg_revision, + const svn_opt_revision_t *start, + const svn_opt_revision_t *end, + const svn_diff_file_options_t *diff_options, + svn_boolean_t ignore_mime_type, + svn_boolean_t include_merged_revisions, + svn_client_blame_receiver4_t receiver, + void *receiver_baton, + svn_client_ctx_t *ctx, + apr_pool_t *pool); + + +/** + * Similar to svn_client_blame6(), but with #svn_client_blame_receiver3_t + * as the receiver. + * + * @deprecated Provided for backwards compatibility with the 1.11 API. + * * @since New in 1.7. */ +SVN_DEPRECATED svn_error_t * svn_client_blame5(const char *path_or_url, const svn_opt_revision_t *peg_revision, @@ -2911,9 +3012,8 @@ svn_client_blame5(const char *path_or_url, svn_client_ctx_t *ctx, apr_pool_t *pool); - /** - * Similar to svn_client_blame5(), but with #svn_client_blame_receiver3_t + * Similar to svn_client_blame5(), but with #svn_client_blame_receiver2_t * as the receiver. * * @deprecated Provided for backwards compatibility with the 1.6 API. @@ -3060,11 +3160,17 @@ svn_client_blame(const char *path_or_url, * The above two options are mutually exclusive. It is an error to set * both to TRUE. * + * If @a pretty_print_mergeinfo is true, then describe 'svn:mergeinfo' + * property changes in a human-readable form that says what changes were + * merged or reverse merged; otherwise (or if the mergeinfo property values + * don't parse correctly) display them just like any other property. + * * Generated headers are encoded using @a header_encoding. * - * Diff output will not be generated for binary files, unless @a - * ignore_content_type is TRUE, in which case diffs will be shown - * regardless of the content types. + * If either side has an svn:mime-type property that indicates 'binary' + * content, then if @a ignore_content_type is set, attempt to produce the + * diff in the usual way, otherwise produce a 'GIT binary diff' in git mode + * or print a warning message in non-git mode. * * @a diff_options (an array of const char *) is used to pass * additional command line options to the diff processes invoked to compare @@ -3090,8 +3196,39 @@ svn_client_blame(const char *path_or_url, * @note @a relative_to_dir doesn't affect the path index generated by * external diff programs. * + * @since New in 1.11. + */ +svn_error_t * +svn_client_diff7(const apr_array_header_t *diff_options, + const char *path_or_url1, + const svn_opt_revision_t *revision1, + const char *path_or_url2, + const svn_opt_revision_t *revision2, + const char *relative_to_dir, + svn_depth_t depth, + svn_boolean_t ignore_ancestry, + svn_boolean_t no_diff_added, + svn_boolean_t no_diff_deleted, + svn_boolean_t show_copies_as_adds, + svn_boolean_t ignore_content_type, + svn_boolean_t ignore_properties, + svn_boolean_t properties_only, + svn_boolean_t use_git_diff_format, + svn_boolean_t pretty_print_mergeinfo, + const char *header_encoding, + svn_stream_t *outstream, + svn_stream_t *errstream, + const apr_array_header_t *changelists, + svn_client_ctx_t *ctx, + apr_pool_t *pool); + +/** Similar to svn_client_diff7(), but with @a pretty_print_mergeinfo + * always passed as @c TRUE. + * + * @deprecated Provided for backward compatibility with the 1.10 API. * @since New in 1.8. */ +SVN_DEPRECATED svn_error_t * svn_client_diff6(const apr_array_header_t *diff_options, const char *path_or_url1, @@ -3249,14 +3386,45 @@ svn_client_diff(const apr_array_header_t *diff_options, * be either a working-copy path or URL. * * If @a peg_revision is #svn_opt_revision_unspecified, behave - * identically to svn_client_diff6(), using @a path_or_url for both of that + * identically to svn_client_diff7(), using @a path_or_url for both of that * function's @a path_or_url1 and @a path_or_url2 arguments. * - * All other options are handled identically to svn_client_diff6(). + * All other options are handled identically to svn_client_diff7(). * * @since New in 1.8. */ svn_error_t * +svn_client_diff_peg7(const apr_array_header_t *diff_options, + const char *path_or_url, + const svn_opt_revision_t *peg_revision, + const svn_opt_revision_t *start_revision, + const svn_opt_revision_t *end_revision, + const char *relative_to_dir, + svn_depth_t depth, + svn_boolean_t ignore_ancestry, + svn_boolean_t no_diff_added, + svn_boolean_t no_diff_deleted, + svn_boolean_t show_copies_as_adds, + svn_boolean_t ignore_content_type, + svn_boolean_t ignore_properties, + svn_boolean_t properties_only, + svn_boolean_t use_git_diff_format, + svn_boolean_t pretty_print_mergeinfo, + const char *header_encoding, + svn_stream_t *outstream, + svn_stream_t *errstream, + const apr_array_header_t *changelists, + svn_client_ctx_t *ctx, + apr_pool_t *pool); + +/** Similar to svn_client_diff_peg7(), but with @a pretty_print_mergeinfo + * always passed as @c TRUE. + * + * @deprecated Provided for backward compatibility with the 1.7 API. + * @since New in 1.7. + */ +SVN_DEPRECATED +svn_error_t * svn_client_diff_peg6(const apr_array_header_t *diff_options, const char *path_or_url, const svn_opt_revision_t *peg_revision, @@ -3419,7 +3587,7 @@ svn_client_diff_peg(const apr_array_header_t *diff_options, * Calls @a summarize_func with @a summarize_baton for each difference * with a #svn_client_diff_summarize_t structure describing the difference. * - * See svn_client_diff6() for a description of the other parameters. + * See svn_client_diff7() for a description of the other parameters. * * @since New in 1.5. */ @@ -4274,17 +4442,23 @@ svn_client_relocate(const char *dir, /** * Restore the pristine version of working copy @a paths, - * effectively undoing any local mods. For each path in @a paths, - * revert it if it is a file. Else if it is a directory, revert - * according to @a depth: + * effectively undoing any local mods. This means returning each + * path's versioned status to 'unmodified' and changing its on-disk + * state to match that. + * + * If an item was in a state of conflict, reverting also marks the + * conflict as resolved. If there are conflict marker files attached + * to the item, these are removed. * * @a paths is an array of (const char *) local WC paths. * - * If @a depth is #svn_depth_empty, revert just the properties on - * the directory; else if #svn_depth_files, revert the properties + * For each path in @a paths, revert it if it is a file. Else if it is + * a directory, revert according to @a depth: + * If @a depth is #svn_depth_empty, revert just + * the directory; else if #svn_depth_files, revert the directory * and any files immediately under the directory; else if * #svn_depth_immediates, revert all of the preceding plus - * properties on immediate subdirectories; else if #svn_depth_infinity, + * immediate subdirectories; else if #svn_depth_infinity, * revert path and everything under it fully recursively. * * @a changelists is an array of const char * changelist @@ -4296,9 +4470,14 @@ svn_client_relocate(const char *dir, * If @a clear_changelists is TRUE, then changelist information for the * paths is cleared while reverting. * - * If @a metadata_only is TRUE, the files and directories aren't changed - * by the operation. If there are conflict marker files attached to the - * targets these are removed. + * The @a metadata_only and @a added_keep_local options control the + * extent of reverting. If @a metadata_only is TRUE, the working copy + * files are untouched, but if there are conflict marker files attached + * to these files these markers are removed. Otherwise, if + * @a added_keep_local is TRUE, then all items are reverted except an + * item that was scheduled as plain 'add' (not a copy) will not be + * removed from the working copy. Otherwise, all items are reverted and + * their on-disk state changed to match. * * If @a ctx->notify_func2 is non-NULL, then for each item reverted, * call @a ctx->notify_func2 with @a ctx->notify_baton2 and the path of @@ -4308,8 +4487,28 @@ svn_client_relocate(const char *dir, * then do not error, just invoke @a ctx->notify_func2 with @a * ctx->notify_baton2, using notification code #svn_wc_notify_skip. * + * @warning The 'revert' command intentionally and permanently loses + * local modifications. + * + * @since New in 1.11. + */ +svn_error_t * +svn_client_revert4(const apr_array_header_t *paths, + svn_depth_t depth, + const apr_array_header_t *changelists, + svn_boolean_t clear_changelists, + svn_boolean_t metadata_only, + svn_boolean_t added_keep_local, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool); + +/** Similar to svn_client_revert4(), but with @a added_keep_local set to + * TRUE. + * * @since New in 1.9. + * @deprecated Provided for backwards compatibility with the 1.10 API. */ +SVN_DEPRECATED svn_error_t * svn_client_revert3(const apr_array_header_t *paths, svn_depth_t depth, @@ -4427,7 +4626,18 @@ typedef enum svn_client_conflict_option_id_t { svn_client_conflict_option_incoming_move_dir_merge, /* Options for local move vs incoming edit on merge. */ - svn_client_conflict_option_local_move_file_text_merge + svn_client_conflict_option_local_move_file_text_merge, + svn_client_conflict_option_local_move_dir_merge, /**< @since New in 1.11. */ + + /* Options for local missing vs incoming edit on merge. */ + svn_client_conflict_option_sibling_move_file_text_merge, /**< @since New in 1.11. */ + svn_client_conflict_option_sibling_move_dir_merge, /**< @since New in 1.11. */ + + /* Options for local move vs incoming move on merge. */ + svn_client_conflict_option_both_moved_file_merge, /*< @since New in 1.12 */ + svn_client_conflict_option_both_moved_file_move_merge, /*< @since New in 1.12 */ + svn_client_conflict_option_both_moved_dir_merge, /*< @since New in 1.12 */ + svn_client_conflict_option_both_moved_dir_move_merge, /*< @since New in 1.12 */ } svn_client_conflict_option_id_t; /** @@ -4448,26 +4658,45 @@ svn_client_conflict_option_set_merged_propval( const svn_string_t *merged_propval); /** - * Get a list of possible repository paths which can be applied to the - * svn_client_conflict_option_incoming_move_file_text_merge or - * svn_client_conflict_option_incoming_move_dir_merge resolution - * @a option. (If a different option is passed in, this function will - * raise an assertion failure.) - * - * In some situations, there can be multiple possible destinations for an - * incoming move. One such situation is where a file was copied and moved - * in the same revision: svn cp a b; svn mv a c; svn commit + * Get a list of possible repository paths which can be applied to @a option. + * + * In some situations, there can be multiple possible destinations for a move. + * One such situation is where a file was copied and moved in the same revision: + * svn cp a b; svn mv a c; svn commit * When this move is merged elsewhere, both b and c will appear as valid move * destinations to the conflict resolver. To resolve such ambiguity, the client * may call this function to obtain a list of possible destinations the user * may choose from. * + * @a *possible_moved_to_repos_relpaths is set to NULL if the @a option does + * not support multiple move targets. API users may assume that only one option + * among those which can be applied to a conflict supports move targets. + * * The array is allocated in @a result_pool and will have "const char *" * elements pointing to strings also allocated in @a result_pool. * All paths are relpaths, and relative to the repository root. * - * @see svn_client_conflict_option_set_moved_to_repos_relpath() + * @see svn_client_conflict_option_set_moved_to_repos_relpath2() + * @since New in 1.11. + */ +svn_error_t * +svn_client_conflict_option_get_moved_to_repos_relpath_candidates2( + apr_array_header_t **possible_moved_to_repos_relpaths, + svn_client_conflict_option_t *option, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + +/** + * Get a list of possible repository paths which can be applied to the + * svn_client_conflict_option_incoming_move_file_text_merge, or the + * svn_client_conflict_option_incoming_move_dir_merge resolution @a option. + * + * In SVN 1.10, if a different option is passed in, this function will + * raise an assertion failure. Otherwise this function behaves just like + * svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(). + * * @since New in 1.10. + * @deprecated use svn_client_conflict_option_get_moved_to_repos_relpath_candidates2() */ svn_error_t * svn_client_conflict_option_get_moved_to_repos_relpath_candidates( @@ -4477,10 +4706,9 @@ svn_client_conflict_option_get_moved_to_repos_relpath_candidates( apr_pool_t *scratch_pool); /** - * Set the preferred moved target repository path for the - * svn_client_conflict_option_incoming_move_file_text_merge or - * svn_client_conflict_option_incoming_move_dir_merge resolution option. - * + * Set the preferred moved target repository path. If @a option is not + * applicable to a moved target repository path, do nothing. + * * @a preferred_move_target_idx must be a valid index into the list returned * by svn_client_conflict_option_get_moved_to_repos_relpath_candidates(). * @@ -4489,7 +4717,23 @@ svn_client_conflict_option_get_moved_to_repos_relpath_candidates( * svn_client_conflict_option_get_description(). Call these functions again * to get updated descriptions containing the newly selected move target. * + * @since New in 1.11. + */ +svn_error_t * +svn_client_conflict_option_set_moved_to_repos_relpath2( + svn_client_conflict_option_t *option, + int preferred_move_target_idx, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool); + +/** + * Like svn_client_conflict_option_set_moved_to_repos_relpath2(), except + * that in SVN 1.10 it raises an assertion failure if an option other + * than svn_client_conflict_option_incoming_move_file_text_merge or + * svn_client_conflict_option_incoming_move_dir_merge is passed. + * * @since New in 1.10. + * @deprecated use svn_client_conflict_option_set_moved_to_repos_relpath2() */ svn_error_t * svn_client_conflict_option_set_moved_to_repos_relpath( @@ -4500,24 +4744,45 @@ svn_client_conflict_option_set_moved_to_repos_relpath( /** * Get a list of possible moved-to abspaths in the working copy which can be - * applied to the svn_client_conflict_option_incoming_move_file_text_merge - * or svn_client_conflict_option_incoming_move_dir_merge resolution @a option. - * (If a different option is passed in, this function will raise an assertion - * failure.) - * - * All paths in the returned list correspond to the repository path which - * is assumed to be the destination of the incoming move operation. - * To support cases where this destination path is ambiguous, the client may - * call svn_client_conflict_option_get_moved_to_repos_relpath_candidates() - * before calling this function to let the user select a repository path first. + * applied to @a option. + * + * All working copy paths in the returned list correspond to one repository + * path which is be one of the possible destinations of a move operation. + * More than one repository-side move target candidate may exist; call + * svn_client_conflict_option_get_moved_to_repos_relpath_candidates() before + * calling this function to let the user select a repository path first. + * Otherwise, one of the repository-side paths will be selected internally. * + * @a *possible_moved_to_abspaths is set to NULL if the @a option does not + * support multiple move targets. API users may assume that only one option + * among those which can be applied to a conflict supports move targets. + * * If no possible moved-to paths can be found, return an empty array. * This doesn't mean that no move happened in the repository. It is possible * that the move destination is outside the scope of the current working copy, * for example, in which case the conflict must be resolved in some other way. * - * @see svn_client_conflict_option_set_moved_to_abspath() + * @see svn_client_conflict_option_set_moved_to_abspath2() + * @since New in 1.11. + */ +svn_error_t * +svn_client_conflict_option_get_moved_to_abspath_candidates2( + apr_array_header_t **possible_moved_to_abspaths, + svn_client_conflict_option_t *option, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + +/** + * Get a list of possible moved-to abspaths in the working copy which can be + * svn_client_conflict_option_incoming_move_file_text_merge, or the + * svn_client_conflict_option_incoming_move_dir_merge resolution @a option. + * + * In SVN 1.10, if a different option is passed in, this function will + * raise an assertion failure. Otherwise this function behaves just like + * svn_client_conflict_option_get_moved_to_abspath_candidates2(). + * * @since New in 1.10. + * @deprecated use svn_client_conflict_option_get_moved_to_abspath_candidates2() */ svn_error_t * svn_client_conflict_option_get_moved_to_abspath_candidates( @@ -4527,14 +4792,34 @@ svn_client_conflict_option_get_moved_to_abspath_candidates( apr_pool_t *scratch_pool); /** - * Set the preferred moved target abspath for the - * svn_client_conflict_option_incoming_move_file_text_merge or - * svn_client_conflict_option_incoming_move_dir_merge resolution option. + * Set the preferred moved target working copy path. If @a option is not + * applicable to a moved target working copy path, do nothing. * * @a preferred_move_target_idx must be a valid index into the list - * returned by svn_client_conflict_option_get_moved_to_abspath_candidates(). + * returned by svn_client_conflict_option_get_moved_to_abspath_candidates2(). * + * This function can be called multiple times. + * It affects the output of svn_client_conflict_tree_get_description() and + * svn_client_conflict_option_get_description(). Call these functions again + * to get updated descriptions containing the newly selected move target. + * + * @since New in 1.11. + */ +svn_error_t * +svn_client_conflict_option_set_moved_to_abspath2( + svn_client_conflict_option_t *option, + int preferred_move_target_idx, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool); + +/** + * Like svn_client_conflict_option_set_moved_to_abspath2(), except that + * in SVN 1.10 this function raises an assertion failure if an option + * other than svn_client_conflict_option_incoming_move_file_text_merge or + * svn_client_conflict_option_incoming_move_dir_merge is passed. + * * @since New in 1.10. + * @deprecated use svn_client_conflict_option_set_moved_to_abspath2() */ svn_error_t * svn_client_conflict_option_set_moved_to_abspath( @@ -4583,7 +4868,7 @@ typedef svn_error_t *(*svn_client_conflict_walk_func_t)( /** * Walk all conflicts within the specified @a depth of @a local_abspath. - * Pass each conflict found during the walk to the @conflict_walk_func + * Pass each conflict found during the walk to the @a conflict_walk_func * callback, along with @a conflict_walk_func_baton. * Use cancellation and notification support provided by client context @a ctx. * @@ -4881,7 +5166,7 @@ svn_client_conflict_get_repos_info(const char **repos_root_url, * Any output parameter may be set to @c NULL by the caller to indicate that * a particular piece of information should not be returned. * - * In case of tree conflicts, this path@revision does not necessarily exist + * In case of tree conflicts, this "path@revision" does not necessarily exist * in the repository, and it does not necessarily represent the incoming * change which is responsible for the occurance of the tree conflict. * The responsible incoming change is generally located somewhere between @@ -6549,7 +6834,7 @@ svn_client_list2(const char *path_or_url, /** * Similar to svn_client_list2(), but with @a recurse instead of @a depth. - * If @a recurse is TRUE, pass #svn_depth_files for @a depth; else + * If @a recurse is FALSE, pass #svn_depth_immediates for @a depth; else * pass #svn_depth_infinity. * * @since New in 1.4. @@ -6715,151 +7000,433 @@ svn_client_cat(svn_stream_t *out, -/** Shelving commands +/** Shelving v2, with checkpoints * - * @defgroup svn_client_shelve_funcs Client Shelving Functions + * @defgroup svn_client_shelves_checkpoints Shelves and checkpoints * @{ */ -/** Shelve a change. +/** A shelf. * - * Shelve as @a name the local modifications found by @a paths, @a depth, - * @a changelists. Revert the shelved change from the WC unless @a keep_local - * is true. + * @warning EXPERIMENTAL. + */ +typedef struct svn_client__shelf_t +{ + /* Public fields (read-only for public use) */ + const char *name; + int max_version; /**< @deprecated */ + + /* Private fields */ + const char *wc_root_abspath; + const char *shelves_dir; + apr_hash_t *revprops; /**< non-null; allocated in POOL */ + svn_client_ctx_t *ctx; + apr_pool_t *pool; +} svn_client__shelf_t; + +/** One version of a shelved change-set. * - * If @a dry_run is true, don't actually do it. + * @warning EXPERIMENTAL. + */ +typedef struct svn_client__shelf_version_t +{ + /* Public fields (read-only for public use) */ + svn_client__shelf_t *shelf; + apr_time_t mtime; /**< time-stamp of this version */ + + /* Private fields */ + const char *files_dir_abspath; /**< abspath of the storage area */ + int version_number; /**< version number starting from 1 */ +} svn_client__shelf_version_t; + +/** Open an existing shelf or create a new shelf. + * + * Create a new shelf (containing no versions) if a shelf named @a name + * is not found. + * + * The shelf should be closed after use by calling svn_client_shelf_close(). + * + * @a local_abspath is any path in the WC and is used to find the WC root. * - * @since New in 1.10. * @warning EXPERIMENTAL. */ SVN_EXPERIMENTAL svn_error_t * -svn_client_shelve(const char *name, - const apr_array_header_t *paths, - svn_depth_t depth, - const apr_array_header_t *changelists, - svn_boolean_t keep_local, - svn_boolean_t dry_run, - svn_client_ctx_t *ctx, - apr_pool_t *pool); +svn_client__shelf_open_or_create(svn_client__shelf_t **shelf_p, + const char *name, + const char *local_abspath, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool); -/** Unshelve the shelved change @a name. +/** Open an existing shelf named @a name, or error if it doesn't exist. + * + * The shelf should be closed after use by calling svn_client_shelf_close(). * * @a local_abspath is any path in the WC and is used to find the WC root. - * Rename the shelved patch to add a '.bak' extension unless @a keep is true. * - * If @a dry_run is true, don't actually do it. + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_open_existing(svn_client__shelf_t **shelf_p, + const char *name, + const char *local_abspath, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool); + +/** Close @a shelf. + * + * If @a shelf is NULL, do nothing; otherwise @a shelf must be an open shelf. * - * @since New in 1.10. * @warning EXPERIMENTAL. */ SVN_EXPERIMENTAL svn_error_t * -svn_client_unshelve(const char *name, - const char *local_abspath, - svn_boolean_t keep, - svn_boolean_t dry_run, - svn_client_ctx_t *ctx, - apr_pool_t *pool); +svn_client__shelf_close(svn_client__shelf_t *shelf, + apr_pool_t *scratch_pool); -/** Delete the shelved patch @a name. +/** Delete the shelf named @a name, or error if it doesn't exist. * * @a local_abspath is any path in the WC and is used to find the WC root. * - * If @a dry_run is true, don't actually do it. + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_delete(const char *name, + const char *local_abspath, + svn_boolean_t dry_run, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool); + +/** Get an editor that, when driven, will store changes in @a shelf_version. * - * @since New in 1.10. * @warning EXPERIMENTAL. */ SVN_EXPERIMENTAL svn_error_t * -svn_client_shelves_delete(const char *name, - const char *local_abspath, - svn_boolean_t dry_run, - svn_client_ctx_t *ctx, - apr_pool_t *pool); +svn_client__shelf_mods_editor(const svn_delta_editor_t **editor_p, + void **edit_baton_p, + svn_client__shelf_version_t *shelf_version, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool); -/** Information about a shelved patch. +/** Save the local modifications found by @a paths, @a depth, + * @a changelists as a new version of @a shelf. + * + * If any paths are shelved, create a new shelf-version and return the new + * shelf-version in @a *new_version_p, else set @a *new_version_p to null. + * @a new_version_p may be null if that output is not wanted; a new shelf- + * version is still saved and may be found through @a shelf. + * + * @a paths are relative to the CWD, or absolute. + * + * For each successfully shelved path: call @a shelved_func (if not null) + * with @a shelved_baton. + * + * If any paths cannot be shelved: if @a not_shelved_func is given, call + * it with @a not_shelved_baton for each such path, and still create a new + * shelf-version if any paths are shelved. + * + * This function does not revert the changes from the WC; use + * svn_client_shelf_unapply() for that. * - * @since New in 1.10. * @warning EXPERIMENTAL. */ -typedef struct svn_client_shelved_patch_info_t -{ - const char *message; /* first line of log message */ - const char *patch_path; /* abspath of the patch file */ - svn_io_dirent2_t *dirent; /* info about the patch file */ - apr_time_t mtime; /* a copy of dirent->mtime */ -} svn_client_shelved_patch_info_t; +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_save_new_version3(svn_client__shelf_version_t **new_version_p, + svn_client__shelf_t *shelf, + const apr_array_header_t *paths, + svn_depth_t depth, + const apr_array_header_t *changelists, + svn_client_status_func_t shelved_func, + void *shelved_baton, + svn_client_status_func_t not_shelved_func, + void *not_shelved_baton, + apr_pool_t *scratch_pool); -/** Set @a *shelved_patch_infos to a hash, keyed by patch name, of pointers to - * @c svn_client_shelved_patch_info_t structures. +/** Delete all newer versions of @a shelf newer than @a shelf_version. * - * @a local_abspath is any path in the WC and is used to find the WC root. + * If @a shelf_version is null, delete all versions of @a shelf. (The + * shelf will still exist, with any log message and other revprops, but + * with no versions in it.) + * + * Leave the shelf's log message and other revprops unchanged. + * + * Any #svn_client__shelf_version_t object that refers to a deleted version + * will become invalid: attempting to use it will give undefined behaviour. + * The given @a shelf_version will remain valid. * - * @since New in 1.10. * @warning EXPERIMENTAL. */ SVN_EXPERIMENTAL svn_error_t * -svn_client_shelves_list(apr_hash_t **shelved_patch_infos, - const char *local_abspath, - svn_client_ctx_t *ctx, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool); +svn_client__shelf_delete_newer_versions(svn_client__shelf_t *shelf, + svn_client__shelf_version_t *shelf_version, + apr_pool_t *scratch_pool); -/** Set @a *any_shelved to indicate if there are any shelved changes in this WC. +/** Return in @a shelf_version an existing version of @a shelf, given its + * @a version_number (starting from 1). Error if that version doesn't exist. * - * This shall provide the answer fast, regardless of how many changes - * are stored, unlike svn_client_shelves_list(). + * There is no need to "close" it after use. * - * ### Initial implementation isn't O(1) fast -- it just calls - * svn_client_shelves_list(). + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_version_open(svn_client__shelf_version_t **shelf_version_p, + svn_client__shelf_t *shelf, + int version_number, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + +/** Return in @a shelf_version the newest version of @a shelf. * - * @a local_abspath is any path in the WC and is used to find the WC root. + * Set @a shelf_version to null if no versions exist. * - * @since New in 1.10. * @warning EXPERIMENTAL. */ SVN_EXPERIMENTAL svn_error_t * -svn_client_shelves_any(svn_boolean_t *any_shelved, - const char *local_abspath, - svn_client_ctx_t *ctx, +svn_client__shelf_get_newest_version(svn_client__shelf_version_t **shelf_version_p, + svn_client__shelf_t *shelf, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + +/** Return in @a versions_p an array of (#svn_client__shelf_version_t *) + * containing all versions of @a shelf. + * + * The versions will be in chronological order, oldest to newest. + * + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_get_all_versions(apr_array_header_t **versions_p, + svn_client__shelf_t *shelf, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + +/** Apply @a shelf_version to the WC. + * + * If @a dry_run is true, try applying the shelf-version to the WC and + * report the full set of notifications about successes and conflicts, + * but leave the WC untouched. + * + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_apply(svn_client__shelf_version_t *shelf_version, + svn_boolean_t dry_run, apr_pool_t *scratch_pool); +/** Test whether we can successfully apply the changes for @a file_relpath + * in @a shelf_version to the WC. + * + * Set @a *conflict_p to true if the changes conflict with the WC state, + * else to false. + * + * If @a file_relpath is not found in @a shelf_version, set @a *conflict_p + * to FALSE. + * + * @a file_relpath is relative to the WC root. + * + * A conflict means the shelf cannot be applied successfully to the WC + * because the change to be applied is not compatible with the current + * working state of the WC file. Examples are a text conflict, or the + * file does not exist or is a directory, or the shelf is trying to add + * the file but it already exists, or trying to delete it but it does not + * exist. + * + * Return an error only if something is broken, e.g. unable to read data + * from the specified shelf-version. + * + * Leave the WC untouched. + * + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_test_apply_file(svn_boolean_t *conflict_p, + svn_client__shelf_version_t *shelf_version, + const char *file_relpath, + apr_pool_t *scratch_pool); + +/** Reverse-apply @a shelf_version to the WC. + * + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_unapply(svn_client__shelf_version_t *shelf_version, + svn_boolean_t dry_run, + apr_pool_t *scratch_pool); + +/** Send committable changes found in a shelf to a delta-editor. + * + * Push changes from the @a shelf_version subtree at @a top_relpath + * to @a editor : @a edit_baton. + * + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_replay(svn_client__shelf_version_t *shelf_version, + const char *top_relpath, + const svn_delta_editor_t *editor, + void *edit_baton, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + apr_pool_t *scratch_pool); + /** Set @a *affected_paths to a hash with one entry for each path affected - * by the shelf @a name. The hash key is the old path and value is - * the new path, both relative to the WC root. The key and value are the - * same except when a path is moved or copied. + * by the @a shelf_version. + * + * The hash key is the path of the affected file, relative to the WC root. + * + * (Future possibility: When moves and copies are supported, the hash key + * is the old path and value is the new path.) * - * @since New in 1.10. * @warning EXPERIMENTAL. */ SVN_EXPERIMENTAL svn_error_t * -svn_client_shelf_get_paths(apr_hash_t **affected_paths, - const char *name, - const char *local_abspath, - svn_client_ctx_t *ctx, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool); +svn_client__shelf_paths_changed(apr_hash_t **affected_paths, + svn_client__shelf_version_t *shelf_version, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); -/** Set @a *has_changes to indicate whether the shelf @a name - * contains any modifications, in other words if svn_client_shelf_get_paths() - * would return a non-empty set of paths. +/** Set @a shelf's revprop @a prop_name to @a prop_val. + * + * This can be used to set or change the shelf's log message + * (property name "svn:log" or #SVN_PROP_REVISION_LOG). + * + * If @a prop_val is NULL, delete the property (if present). * - * @since New in 1.10. * @warning EXPERIMENTAL. */ SVN_EXPERIMENTAL svn_error_t * -svn_client_shelf_has_changes(svn_boolean_t *has_changes, - const char *name, - const char *local_abspath, - svn_client_ctx_t *ctx, +svn_client__shelf_revprop_set(svn_client__shelf_t *shelf, + const char *prop_name, + const svn_string_t *prop_val, apr_pool_t *scratch_pool); +/** Set @a shelf's revprops to @a revprop_table. + * + * This deletes all previous revprops. + * + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_revprop_set_all(svn_client__shelf_t *shelf, + apr_hash_t *revprop_table, + apr_pool_t *scratch_pool); + +/** Get @a shelf's revprop @a prop_name into @a *prop_val. + * + * If the property is not present, set @a *prop_val to NULL. + * + * This can be used to get the shelf's log message + * (property name "svn:log" or #SVN_PROP_REVISION_LOG). + * + * The lifetime of the result is limited to that of @a shelf and/or + * of @a result_pool. + * + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_revprop_get(svn_string_t **prop_val, + svn_client__shelf_t *shelf, + const char *prop_name, + apr_pool_t *result_pool); + +/** Get @a shelf's revprops into @a props. + * + * The lifetime of the result is limited to that of @a shelf and/or + * of @a result_pool. + * + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_revprop_list(apr_hash_t **props, + svn_client__shelf_t *shelf, + apr_pool_t *result_pool); + +/** Set the log message in @a shelf to @a log_message. + * + * If @a log_message is null, delete the log message. + * + * Similar to svn_client_shelf_revprop_set(... SVN_PROP_REVISION_LOG ...). + * + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_set_log_message(svn_client__shelf_t *shelf, + const char *log_message, + apr_pool_t *scratch_pool); + +/** Get the log message in @a shelf into @a *log_message. + * + * Set @a *log_message to NULL if there is no log message. + * + * Similar to svn_client_shelf_revprop_get(... SVN_PROP_REVISION_LOG ...). + * + * The result is allocated in @a result_pool. + * + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_get_log_message(char **log_message, + svn_client__shelf_t *shelf, + apr_pool_t *result_pool); + +/** Information about a shelf. + * + * @warning EXPERIMENTAL. + */ +typedef struct svn_client__shelf_info_t +{ + apr_time_t mtime; /**< mtime of the latest change */ +} svn_client__shelf_info_t; + +/** Set @a *shelf_infos to a hash, keyed by shelf name, of pointers to + * @c svn_client_shelf_info_t structures, one for each shelf in the + * given WC. + * + * @a local_abspath is any path in the WC and is used to find the WC root. + * + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_list(apr_hash_t **shelf_infos, + const char *local_abspath, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + +/** Report the shelved status of all the shelved paths in @a shelf_version + * via @a walk_func(@a walk_baton, ...). + * + * @warning EXPERIMENTAL. + */ +SVN_EXPERIMENTAL +svn_error_t * +svn_client__shelf_version_status_walk(svn_client__shelf_version_t *shelf_version, + const char *wc_relpath, + svn_wc_status_func4_t walk_func, + void *walk_baton, + apr_pool_t *scratch_pool); /** @} */ /** Changelist commands @@ -6868,15 +7435,6 @@ svn_client_shelf_has_changes(svn_boolean_t *has_changes, * @{ */ -/** Implementation note: - * - * For now, changelists are implemented by scattering the - * associations across multiple .svn/entries files in a working copy. - * However, this client API was written so that we have the option of - * changing the underlying implementation -- we may someday want to - * store changelist definitions in a centralized database. - */ - /** * Add each path in @a paths (recursing to @a depth as necessary) to * @a changelist. If a path is already a member of another diff --git a/subversion/include/svn_delta.h b/subversion/include/svn_delta.h index c15788e..ee9e11f 100644 --- a/subversion/include/svn_delta.h +++ b/subversion/include/svn_delta.h @@ -495,6 +495,10 @@ svn_txdelta_send_contents(const unsigned char *contents, * since there's nothing else in the delta application's context to * supply a path for error messages.) * + * The @a source stream will NOT be closed. The @a target stream will be + * closed when the window handler is given a null window to signal the + * end of the delta. + * * @note To avoid lifetime issues, @a error_info is copied into * @a pool or a subpool thereof. */ @@ -859,7 +863,7 @@ svn_txdelta_skip_svndiff_window(apr_file_t *file, * @c apply_textdelta / @c apply_textdelta_stream and @c close_file * should not refer to a parent directory baton UNLESS the editor has * taken precautions to allocate it in a pool of the appropriate - * lifetime (the @a dir_pool passed to @c open_directory and + * lifetime (the @a result_pool passed to @c open_directory and * @c add_directory definitely does not have the proper lifetime). * In general, it is recommended to simply avoid keeping a parent * directory baton in a file baton. @@ -1285,24 +1289,47 @@ svn_delta_depth_filter_editor(const svn_delta_editor_t **editor, /** Callback function type for svn_delta_path_driver(). * * The handler of this callback is given the callback baton @a - * callback_baton, @a path which is a relpath relative to the + * callback_baton, @a editor and @a edit_baton which represent the + * editor being driven, @a relpath which is a relpath relative to the * root of the edit, and the @a parent_baton which represents - * path's parent directory as created by the editor passed to - * svn_delta_path_driver(). + * @a relpath's parent directory as created by the editor. + * + * If the handler deletes the node at @a relpath (and does not replace it + * with an added directory) it must set @a *dir_baton to null or leave + * it unchanged. * - * If @a path represents a directory, the handler must return a @a - * *dir_baton for @a path, generated from the same editor (so that the - * driver can later close that directory). + * If the handler opens (or adds) a directory at @a relpath, it must set + * @a *dir_baton to the directory baton for @a relpath, generated from + * the same editor. The driver will close the directory later. * - * If, however, @a path represents a file, the handler should NOT - * return any file batons. It can close any opened or added files - * immediately, or delay that close until the end of the edit when - * svn_delta_path_driver() returns. + * If the handler opens (or adds) a file at @a relpath, the handler must + * set @a *dir_baton to null or leave it unchanged. The handler must + * either close the file immediately, or delay that close until the end + * of the edit when svn_delta_path_driver() returns. * * Finally, if @a parent_baton is @c NULL, then the root of the edit * is also one of the paths passed to svn_delta_path_driver(). The * handler of this callback must call the editor's open_root() * function and return the top-level root dir baton in @a *dir_baton. + * + * @since New in 1.12. + */ +typedef svn_error_t *(*svn_delta_path_driver_cb_func2_t)( + void **dir_baton, + const svn_delta_editor_t *editor, + void *edit_baton, + void *parent_baton, + void *callback_baton, + const char *relpath, + apr_pool_t *pool); + +/** Like #svn_delta_path_driver_cb_func2_t but without the @a editor and + * @a edit_baton parameters. The user must arrange for the editor to be + * passed through @a callback_baton (if required, which it usually is). + * And @a path could possibly have a '/' prefix instead of being a relpath; + * see the note on svn_delta_path_driver2(). + * + * @deprecated Provided for backward compatibility with the 1.11 API. */ typedef svn_error_t *(*svn_delta_path_driver_cb_func_t)( void **dir_baton, @@ -1312,24 +1339,51 @@ typedef svn_error_t *(*svn_delta_path_driver_cb_func_t)( apr_pool_t *pool); -/** Drive @a editor (with its @a edit_baton) to visit each path in @a paths. +/** Drive @a editor (with its @a edit_baton) to visit each path in @a relpaths. + * * As each path is hit as part of the editor drive, use * @a callback_func and @a callback_baton to allow the caller to handle * the portion of the editor drive related to that path. * - * Each path in @a paths is a (const char *) relpath, relative - * to the root path of the @a edit. The editor drive will be - * performed in the same order as @a paths. The paths should be sorted - * using something like svn_sort_compare_paths to ensure that a depth-first - * pattern is observed for directory/file baton creation. If @a sort_paths + * Each path in @a relpaths is a (const char *) relpath, relative + * to the root path of the edit. The editor drive will be + * performed in the same order as @a relpaths. The paths should be sorted + * using something like svn_sort_compare_paths() to ensure that each + * directory in the depth-first walk is visited only once. If @a sort_paths * is set, the function will sort the paths for you. Some callers may need * further customization of the order (ie. libsvn_delta/compat.c). * + * If the first target path (after any requested sorting) is @c "" (the + * root of the edit), the callback function will be responsible for + * calling the editor's @c open_root method; otherwise, this function + * will call @c open_root. + * * Use @a scratch_pool for all necessary allocations. * - * @since New in 1.8. + * @since New in 1.12. */ svn_error_t * +svn_delta_path_driver3(const svn_delta_editor_t *editor, + void *edit_baton, + const apr_array_header_t *relpaths, + svn_boolean_t sort_paths, + svn_delta_path_driver_cb_func2_t callback_func, + void *callback_baton, + apr_pool_t *pool); + +/** Like svn_delta_path_driver3() but with a different callback function + * signature. + * + * Optionally, paths in @a paths could have a '/' prefix instead of being + * relpaths. If any of them do, then (since 1.12) ALL paths sent to the + * callback will have a '/' prefix. + * + * @deprecated Provided for backward compatibility with the 1.11 API. + * @since New in 1.8. Before 1.12, paths sent to the callback were the + * exact paths passed in @a paths. + */ +SVN_DEPRECATED +svn_error_t * svn_delta_path_driver2(const svn_delta_editor_t *editor, void *edit_baton, const apr_array_header_t *paths, @@ -1358,6 +1412,80 @@ svn_delta_path_driver(const svn_delta_editor_t *editor, void *callback_baton, apr_pool_t *scratch_pool); + +/** A state object for the path driver that is obtained from + * svn_delta_path_driver_start() and driven by + * svn_delta_path_driver_step() and svn_delta_path_driver_finish(). + * + * @since New in 1.12. + */ +typedef struct svn_delta_path_driver_state_t svn_delta_path_driver_state_t; + +/** Return a path driver object that can drive @a editor (with its + * @a edit_baton) to visit a series of paths. + * + * As each path is hit as part of the editor drive, the path driver will + * call @a callback_func and @a callback_baton to allow the caller to handle + * the portion of the editor drive related to that path. + * + * This will not call the editor's open_root method; for that, see + * svn_delta_path_driver_step(). + * + * @since New in 1.12. + */ +svn_error_t * +svn_delta_path_driver_start(svn_delta_path_driver_state_t **state_p, + const svn_delta_editor_t *editor, + void *edit_baton, + svn_delta_path_driver_cb_func2_t callback_func, + void *callback_baton, + apr_pool_t *result_pool); + +/** Visit @a relpath. + * + * @a state is the object returned by svn_delta_path_driver_start(). + * + * @a relpath is a relpath relative to the root path of the edit. + * + * This function uses the editor and the callback that were originally + * supplied to svn_delta_path_driver_start(). + * + * This drives the editor in a depth-first order, closing and then opening + * directories if necessary to move from the last visited path to the new + * path, as required by the editor driving rules. + * + * This then calls the callback to allow the caller to handle + * the portion of the editor drive related to that path. + * + * If the first path to visit is @c "" (the root of the edit), the + * callback function will be responsible for calling the editor's + * @c open_root method; otherwise, this function will call @c open_root. + * + * The order of paths to visit should in general be sorted using something + * like svn_sort_compare_paths() to ensure that each directory in the + * depth-first walk is visited only once. Some editors may rely on such a + * restriction. + * + * @since New in 1.12. + */ +svn_error_t * +svn_delta_path_driver_step(svn_delta_path_driver_state_t *state, + const char *relpath, + apr_pool_t *scratch_pool); + +/** Finish driving the editor. + * + * @a state is the object returned by svn_delta_path_driver_start(). + * + * This drives the editor to close any open directories and then calls + * the editor's @c close_edit method. + * + * @since New in 1.12. + */ +svn_error_t * +svn_delta_path_driver_finish(svn_delta_path_driver_state_t *state, + apr_pool_t *scratch_pool); + /** @} */ diff --git a/subversion/include/svn_dirent_uri.h b/subversion/include/svn_dirent_uri.h index 94856f2..cf8152b 100644 --- a/subversion/include/svn_dirent_uri.h +++ b/subversion/include/svn_dirent_uri.h @@ -60,12 +60,14 @@ * form, except: * * - @c svn_dirent_canonicalize() + * - @c svn_dirent_canonicalize_safe() * - @c svn_dirent_is_canonical() * - @c svn_dirent_internal_style() * - @c svn_relpath_canonicalize() + * - @c svn_relpath_canonicalize_safe() * - @c svn_relpath_is_canonical() - * - @c svn_relpath__internal_style() * - @c svn_uri_canonicalize() + * - @c svn_uri_canonicalize_safe() * - @c svn_uri_is_canonical() * * The Subversion codebase also recognizes some other classes of path: @@ -144,17 +146,47 @@ extern "C" { #endif /* __cplusplus */ -/** Convert @a dirent from the local style to the canonical internal style. +/** + * Convert @a dirent from the local style to the canonical internal style. * "Local style" means native path separators and "." for the empty path. * * Allocate the result in @a result_pool. * + * @warning This function may call @c abort() if the @a dirent parameter + * is not a valid local-style path. + * Use svn_dirent_internal_style_safe() for tainted input. + * * @since New in 1.6. */ const char * svn_dirent_internal_style(const char *dirent, apr_pool_t *result_pool); +/** + * Convert @a dirent from the local style to the canonical internal style + * and return it in @a *internal_style_dirent. "Local style" means native + * path separators and "." for the empty path. + * + * Similar to svn_dirent_internal_style() (which see), but returns an error + * if the @a dirent can not be canonicalized or of the result does not pass + * the svn_dirent_is_canonical() test. + * + * If the function fails and @a non_canonical_result is not @c NULL, the + * result of the failed canonicalization attempt (which may be @c NULL) + * will be returned in @a *non_canonical_result. + * + * Allocates the results in @a result_pool. Uses @a scratch_pool for + * temporary allocations. + * + * @since New in 1.12. + */ +svn_error_t * +svn_dirent_internal_style_safe(const char **internal_style_dirent, + const char **non_canonical_result, + const char *dirent, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + /** Convert @a dirent from the internal style to the local style. * "Local style" means native path separators and "." for the empty path. * If the input is not canonical, the output may not be canonical. @@ -167,18 +199,6 @@ const char * svn_dirent_local_style(const char *dirent, apr_pool_t *result_pool); -/** Convert @a relpath from the local style to the canonical internal style. - * "Local style" means native path separators and "." for the empty path. - * - * Allocate the result in @a result_pool. - * - * @since New in 1.7. - */ -const char * -svn_relpath__internal_style(const char *relpath, - apr_pool_t *result_pool); - - /** Join a base dirent (@a base) with a component (@a component). * * If either @a base or @a component is the empty string, then the other @@ -453,7 +473,8 @@ svn_boolean_t svn_uri_is_root(const char *uri, apr_size_t len); -/** Return a new dirent like @a dirent, but transformed such that some types +/** + * Return a new dirent like @a dirent, but transformed such that some types * of dirent specification redundancies are removed. * * This involves: @@ -467,14 +488,43 @@ svn_uri_is_root(const char *uri, * * Allocate the result in @a result_pool. * + * @warning This function may call @c abort() if @a dirent can not be + * canonicalized. + * Use svn_dirent_canonicalize_safe() for tainted input. + * * @since New in 1.6. */ const char * svn_dirent_canonicalize(const char *dirent, apr_pool_t *result_pool); +/** + * Return a new @a *canonical_dirent like @a dirent, but transformed such + * that some types of dirent specification redundancies are removed. + * + * Similar to svn_dirent_canonicalize() (which see), but returns an error + * if the @a dirent can not be canonicalized or of the result does not pass + * the svn_dirent_is_canonical() test. + * + * If the function fails and @a non_canonical_result is not @c NULL, the + * result of the failed canonicalization attempt (which may be @c NULL) + * will be returned in @a *non_canonical_result. + * + * Allocates the results in @a result_pool. Uses @a scratch_pool for + * temporary allocations. + * + * @since New in 1.12. + */ +svn_error_t * +svn_dirent_canonicalize_safe(const char **canonical_dirent, + const char **non_canonical_result, + const char *dirent, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + -/** Return a new relpath like @a relpath, but transformed such that some types +/** + * Return a new relpath like @a relpath, but transformed such that some types * of relpath specification redundancies are removed. * * This involves: @@ -486,14 +536,44 @@ svn_dirent_canonicalize(const char *dirent, * * Allocate the result in @a result_pool. * + * @warning This function may call @c abort() if @a relpath can not be + * canonicalized. + * Use svn_relpath_canonicalize_safe() for tainted input. + * * @since New in 1.7. */ const char * svn_relpath_canonicalize(const char *relpath, apr_pool_t *result_pool); +/** + * Return a new @a *canonical_relpath like @a relpath, but transformed such + * that some types of relpath specification redundancies are removed. + * + * Similar to svn_relpath_canonicalize() (which see), but returns an error + * if the @a relpath can not be canonicalized or of the result does not + * pass the svn_relpath_is_canonical() test. + * + * If the function fails and @a non_canonical_result is not @c NULL, the + * result of the failed canonicalization attempt (which may be @c NULL) + * will be returned in @a *non_canonical_result. + * + * Allocates the results in @a result_pool. Uses @a scratch_pool for + * temporary allocations. + * + * @since New in 1.12. + */ + +svn_error_t * +svn_relpath_canonicalize_safe(const char **canonical_relpath, + const char **non_canonical_result, + const char *relpath, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + -/** Return a new uri like @a uri, but transformed such that some types +/** + * Return a new uri like @a uri, but transformed such that some types * of uri specification redundancies are removed. * * This involves: @@ -510,12 +590,41 @@ svn_relpath_canonicalize(const char *relpath, * * Allocate the result in @a result_pool. * - * @since New in 1.7. + * @warning This function may call @c abort() if @a uri can not be + * canonicalized. + * Use svn_uri_canonicalize_safe() for tainted input. + * + * @since New in 1.7. */ const char * svn_uri_canonicalize(const char *uri, apr_pool_t *result_pool); +/** + * Return a new @a *canonical_uri like @a uri, but transformed such that + * some types of uri specification redundancies are removed. + * + * Similar to svn_uri_canonicalize() (which see), but returns an error if + * the @a uri can not be canonicalized or of the result does not pass the + * svn_uri_is_canonical() test. + * + * If the function fails and @a non_canonical_result is not @c NULL, the + * result of the failed canonicalization attempt (which may be @c NULL) + * will be returned in @a *non_canonical_result. + * + * Allocates the results in @a result_pool. Uses @a scratch_pool for + * temporary allocations. + * + * @since New in 1.12. + */ +svn_error_t * +svn_uri_canonicalize_safe(const char **canonical_uri, + const char **non_canonical_result, + const char *uri, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + + /** Return @c TRUE iff @a dirent is canonical. * * Use @a scratch_pool for temporary allocations. diff --git a/subversion/include/svn_error_codes.h b/subversion/include/svn_error_codes.h index f95f0a0..ba63b6f 100644 --- a/subversion/include/svn_error_codes.h +++ b/subversion/include/svn_error_codes.h @@ -888,6 +888,11 @@ SVN_ERROR_START SVN_ERR_FS_CATEGORY_START + 67, "Content checksums supposedly match but content does not.") + /** @since New in 1.13. */ + SVN_ERRDEF(SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE, + SVN_ERR_FS_CATEGORY_START + 68, + "Unrecognized filesystem I/O control code") + /* repos errors */ SVN_ERRDEF(SVN_ERR_REPOS_LOCKED, @@ -1482,6 +1487,11 @@ SVN_ERROR_START SVN_ERR_MISC_CATEGORY_START + 46, "LZ4 decompression failed") + /** @since New in 1.12. */ + SVN_ERRDEF(SVN_ERR_CANONICALIZATION_FAILED, + SVN_ERR_MISC_CATEGORY_START + 47, + "Could not canonicalize path or URI") + /* command-line client errors */ SVN_ERRDEF(SVN_ERR_CL_ARG_PARSING_ERROR, diff --git a/subversion/include/svn_fs.h b/subversion/include/svn_fs.h index 179774e..198757c 100644 --- a/subversion/include/svn_fs.h +++ b/subversion/include/svn_fs.h @@ -1744,7 +1744,7 @@ svn_fs_paths_changed3(svn_fs_path_change_iterator_t **iterator, * * Use @a pool for all allocations, including the hash and its values. * - * @note Retrieving the #node_rev_id element of #svn_fs_path_change2_t may + * @note Retrieving the #svn_fs_path_change2_t.node_rev_id element may * be expensive in some FS backends. * * @since New in 1.6. @@ -1828,9 +1828,9 @@ svn_fs_node_history(svn_fs_history_t **history_p, * the same as the original. This will happen if the original * location was an interesting one (where the node was modified, or * took place in a copy event). This behavior allows looping callers - * to avoid the calling svn_fs_history_location() on the object - * returned by svn_fs_node_history(), and instead go ahead and begin - * calling svn_fs_history_prev(). + * to avoid calling svn_fs_history_location() on the object returned + * by svn_fs_node_history(), and instead go ahead and begin calling + * svn_fs_history_prev(). * * @note This function uses node-id ancestry alone to determine * modifiedness, and therefore does NOT claim that in any of the @@ -2492,7 +2492,7 @@ svn_fs_file_md5_checksum(unsigned char digest[], * svn_fs_file_contents(). In that case, the result of reading from * @a *contents is undefined. * - * ### @todo kff: I am worried about lifetime issues with this pool vs + * @todo kff: I am worried about lifetime issues with this pool vs * the trail created farther down the call stack. Trace this function * to investigate... */ @@ -3503,6 +3503,54 @@ svn_fs_info_dup(const void *info, apr_pool_t *result_pool, apr_pool_t *scratch_pool); +/** + * A structure specifying the filesystem-specific input/output operation. + * + * @see svn_fs_ioctl() + * + * @since New in 1.13. + */ +typedef struct svn_fs_ioctl_code_t +{ + const char *fs_type; + int code; +} svn_fs_ioctl_code_t; + +/** + * A convenience macro to declare #svn_fs_ioctl_code_t codes. + * + * @since New in 1.13. + */ +#define SVN_FS_DECLARE_IOCTL_CODE(name, fs_type, code) \ + static const svn_fs_ioctl_code_t name = { fs_type, code } + +/** + * Issue a filesystem-specific input/output operation defined by @a ctlcode + * (usually, a low-level operation which cannot be expressed by other + * filesystem APIs). If @a fs is @c NULL, issue a global operation. + * If @a fs is not @c NULL, issue an operation that is specific to this + * filesystem instance. + * + * If the filesystem cannot handle this ioctl code, return the + * #SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE error. + * + * Allocate the result in @a result_pool, use @a scratch_pool for temporary + * allocations. + * + * @see #svn_fs_ioctl_code_t + * + * @since New in 1.13. + */ +svn_error_t * +svn_fs_ioctl(svn_fs_t *fs, + svn_fs_ioctl_code_t ctlcode, + void *input, + void **output_p, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + /** @} */ #ifdef __cplusplus diff --git a/subversion/include/svn_opt.h b/subversion/include/svn_opt.h index 1c85b61..6644d56 100644 --- a/subversion/include/svn_opt.h +++ b/subversion/include/svn_opt.h @@ -27,6 +27,8 @@ #ifndef SVN_OPT_H #define SVN_OPT_H +#include "svn_opt_impl.h" + #include #include #include @@ -69,15 +71,51 @@ typedef svn_error_t *(svn_opt_subcommand_t)( /** The maximum number of options that can be accepted by a subcommand. */ #define SVN_OPT_MAX_OPTIONS 50 +/** The maximum number of paragraphs of help text a subcommand can have. + * @since New in 1.11. */ +#define SVN_OPT_MAX_PARAGRAPHS 100 + /** Options that have no short option char should use an identifying * integer equal to or greater than this. */ #define SVN_OPT_FIRST_LONGOPT_ID 256 +/** One element of a subcommand dispatch table. + * + * @since New in 1.11. + */ +typedef struct svn_opt_subcommand_desc3_t +{ + /** The full name of this command. */ + const char *name; + + /** The function this command invokes. */ + svn_opt_subcommand_t *cmd_func; + + /** A list of alias names for this command (e.g., 'up' for 'update'). */ + const char *aliases[SVN_OPT_MAX_ALIASES]; + + /** A multi-paragraph string describing this command. */ + const char *help[SVN_OPT_MAX_PARAGRAPHS]; + + /** A list of options accepted by this command. Each value in the + * array is a unique enum (the 2nd field in apr_getopt_option_t) + */ + int valid_options[SVN_OPT_MAX_OPTIONS]; + + /** A list of option help descriptions, keyed by the option unique enum + * (the 2nd field in apr_getopt_option_t), which override the generic + * descriptions given in an apr_getopt_option_t on a per-subcommand basis. + */ + struct { int optch; const char *desc; } desc_overrides[SVN_OPT_MAX_OPTIONS]; +} svn_opt_subcommand_desc3_t; + + /** One element of a subcommand dispatch table. * * @since New in 1.4. + * @deprecated Provided for backward compatibility with the 1.10 API. */ typedef struct svn_opt_subcommand_desc2_t { @@ -139,8 +177,21 @@ typedef struct svn_opt_subcommand_desc_t * Return the entry in @a table whose name matches @a cmd_name, or @c NULL if * none. @a cmd_name may be an alias. * + * @since New in 1.11. + */ +const svn_opt_subcommand_desc3_t * +svn_opt_get_canonical_subcommand3(const svn_opt_subcommand_desc3_t *table, + const char *cmd_name); + + +/** + * Same as svn_opt_get_canonical_subcommand3(), but with a different + * version of the subcommand description table. + * * @since New in 1.4. + * @deprecated Provided for backward compatibility with the 1.10 API. */ +SVN_DEPRECATED const svn_opt_subcommand_desc2_t * svn_opt_get_canonical_subcommand2(const svn_opt_subcommand_desc2_t *table, const char *cmd_name); @@ -170,8 +221,22 @@ svn_opt_get_canonical_subcommand(const svn_opt_subcommand_desc_t *table, * * The returned value may be statically allocated, or allocated in @a pool. * + * @since New in 1.11. + */ +const apr_getopt_option_t * +svn_opt_get_option_from_code3(int code, + const apr_getopt_option_t *option_table, + const svn_opt_subcommand_desc3_t *command, + apr_pool_t *pool); + +/** + * Same as svn_opt_get_option_from_code3(), but with a different + * version of the subcommand description table. + * * @since New in 1.4. + * @deprecated Provided for backward compatibility with the 1.10 API. */ +SVN_DEPRECATED const apr_getopt_option_t * svn_opt_get_option_from_code2(int code, const apr_getopt_option_t *option_table, @@ -198,8 +263,21 @@ svn_opt_get_option_from_code(int code, * non-NULL, it is a zero-terminated array, and all subcommands take * the options listed in it. * + * @since New in 1.11. + */ +svn_boolean_t +svn_opt_subcommand_takes_option4(const svn_opt_subcommand_desc3_t *command, + int option_code, + const int *global_options); + +/** + * Same as svn_opt_subcommand_takes_option4(), but with a different + * version of the subcommand description table. + * * @since New in 1.5. + * @deprecated Provided for backward compatibility with the 1.10 API. */ +SVN_DEPRECATED svn_boolean_t svn_opt_subcommand_takes_option3(const svn_opt_subcommand_desc2_t *command, int option_code, @@ -235,7 +313,7 @@ svn_opt_subcommand_takes_option(const svn_opt_subcommand_desc_t *command, /** * Print a generic (not command-specific) usage message to @a stream. * - * ### @todo Why is @a stream a stdio file instead of an svn stream? + * @todo Why is @a stream a stdio file instead of an svn stream? * * If @a header is non-NULL, print @a header followed by a newline. Then * loop over @a cmd_table printing the usage for each command (getting @@ -244,8 +322,24 @@ svn_opt_subcommand_takes_option(const svn_opt_subcommand_desc_t *command, * * Use @a pool for temporary allocation. * + * @since New in 1.11. + */ +void +svn_opt_print_generic_help3(const char *header, + const svn_opt_subcommand_desc3_t *cmd_table, + const apr_getopt_option_t *opt_table, + const char *footer, + apr_pool_t *pool, + FILE *stream); + +/** + * Same as svn_opt_print_generic_help3(), but with a different + * version of the subcommand description table. + * * @since New in 1.4. + * @deprecated Provided for backward compatibility with the 1.10 API. */ +SVN_DEPRECATED void svn_opt_print_generic_help2(const char *header, const svn_opt_subcommand_desc2_t *cmd_table, @@ -297,8 +391,23 @@ svn_opt_format_option(const char **string, * use that second name as an alias for the first name. This additional * behaviour is new in 1.7. * + * @since New in 1.11. + */ +void +svn_opt_subcommand_help4(const char *subcommand, + const svn_opt_subcommand_desc3_t *table, + const apr_getopt_option_t *options_table, + const int *global_options, + apr_pool_t *pool); + +/** + * Same as svn_opt_subcommand_help4(), but with a different + * version of the subcommand description table. + * * @since New in 1.5. + * @deprecated Provided for backward compatibility with the 1.10 API. */ +SVN_DEPRECATED void svn_opt_subcommand_help3(const char *subcommand, const svn_opt_subcommand_desc2_t *table, @@ -336,43 +445,7 @@ svn_opt_subcommand_help(const char *subcommand, /* Parsing revision and date options. */ - -/** - * Various ways of specifying revisions. - * - * @note - * In contexts where local mods are relevant, the `working' kind - * refers to the uncommitted "working" revision, which may be modified - * with respect to its base revision. In other contexts, `working' - * should behave the same as `committed' or `current'. - */ -enum svn_opt_revision_kind { - /** No revision information given. */ - svn_opt_revision_unspecified, - - /** revision given as number */ - svn_opt_revision_number, - - /** revision given as date */ - svn_opt_revision_date, - - /** rev of most recent change */ - svn_opt_revision_committed, - - /** (rev of most recent change) - 1 */ - svn_opt_revision_previous, - - /** .svn/entries current revision */ - svn_opt_revision_base, - - /** current, plus local mods */ - svn_opt_revision_working, - - /** repository youngest */ - svn_opt_revision_head - - /* please update svn_opt__revision_to_string() when extending this enum */ -}; +/* NOTE: svn_opt_revision_kind is defined in svn_opt_impl.h */ /** * A revision value, which can be specified as a number or a date. @@ -700,9 +773,30 @@ svn_opt_parse_path(svn_opt_revision_t *rev, * --version flag *and* subcommand arguments on a help command line. * The logic for handling such a situation should be in one place. * - * @since New in 1.8. + * @since New in 1.11. */ +svn_error_t * +svn_opt_print_help5(apr_getopt_t *os, + const char *pgm_name, + svn_boolean_t print_version, + svn_boolean_t quiet, + svn_boolean_t verbose, + const char *version_footer, + const char *header, + const svn_opt_subcommand_desc3_t *cmd_table, + const apr_getopt_option_t *option_table, + const int *global_options, + const char *footer, + apr_pool_t *pool); +/** + * Same as svn_opt_print_help5(), but with a different + * version of the subcommand description table. + * + * @since New in 1.8. + * @deprecated Provided for backward compatibility with the 1.10 API. + */ +SVN_DEPRECATED svn_error_t * svn_opt_print_help4(apr_getopt_t *os, const char *pgm_name, diff --git a/subversion/include/svn_opt_impl.h b/subversion/include/svn_opt_impl.h new file mode 100644 index 0000000..73fd2f3 --- /dev/null +++ b/subversion/include/svn_opt_impl.h @@ -0,0 +1,86 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + * + * @file svn_opt_impl.h + * @brief Option and argument parsing for Subversion command lines + * (common implementation) + * + * @warning This is a @b private implementation-specific header file. + * User code should include @ref svn_opt.h instead. + */ + +/* NOTE: + * This file *must not* include or depend on any other header except + * the C standard library headers. + */ + +#ifndef SVN_OPT_IMPL_H +#define SVN_OPT_IMPL_H + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + + +/** + * Various ways of specifying revisions. + * + * @note + * In contexts where local mods are relevant, the `working' kind + * refers to the uncommitted "working" revision, which may be modified + * with respect to its base revision. In other contexts, `working' + * should behave the same as `committed' or `current'. + */ +/* NOTE: Update svnxx/revision.hpp when changing this enum. */ +enum svn_opt_revision_kind { + /** No revision information given. */ + svn_opt_revision_unspecified, + + /** revision given as number */ + svn_opt_revision_number, + + /** revision given as date */ + svn_opt_revision_date, + + /** rev of most recent change */ + svn_opt_revision_committed, + + /** (rev of most recent change) - 1 */ + svn_opt_revision_previous, + + /** .svn/entries current revision */ + svn_opt_revision_base, + + /** current, plus local mods */ + svn_opt_revision_working, + + /** repository youngest */ + svn_opt_revision_head + + /* please update svn_opt__revision_to_string() when extending this enum */ +}; + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* SVN_OPT_IMPL_H */ diff --git a/subversion/include/svn_props.h b/subversion/include/svn_props.h index 7ea8bba..8b044b0 100644 --- a/subversion/include/svn_props.h +++ b/subversion/include/svn_props.h @@ -415,19 +415,26 @@ svn_prop_name_is_valid(const char *prop_name); /** Describes external items to check out into this directory. * * The format is a series of lines, each in the following format: - * [-r REV] URL[@PEG] LOCALPATH + * + * [-r REV] URL[@PEG] LOCALPATH + * * LOCALPATH is relative to the directory having this property. * REV pins the external to revision REV. * URL may be a full URL or a relative URL starting with one of: - * ../ to the parent directory of the extracted external - * ^/ to the repository root - * / to the server root - * // to the URL scheme + * + * ../ to the parent directory of the extracted external + * ^/ to the repository root + * / to the server root + * // to the URL scheme + * * The following format is supported for interoperability with * Subversion 1.4 and earlier clients: - * LOCALPATH [-r PEG] URL + * + * LOCALPATH [-r PEG] URL + * * The ambiguous format 'relative_path relative_path' is taken as * 'relative_url relative_path' with peg revision support. + * * Lines starting with a '#' character are ignored. */ #define SVN_PROP_EXTERNALS SVN_PROP_PREFIX "externals" diff --git a/subversion/include/svn_ra.h b/subversion/include/svn_ra.h index 030458d..d3b0550 100644 --- a/subversion/include/svn_ra.h +++ b/subversion/include/svn_ra.h @@ -229,7 +229,7 @@ typedef void (*svn_ra_progress_notify_func_t)(apr_off_t progress, * * @a revision is the target revision number of the received replay report. * - * @a editor and @a edit_baton should provided by the callback implementation. + * @a *editor and @a *edit_baton should provided by the callback implementation. * * @a replay_baton is the baton as originally passed to replay_range. * @@ -253,7 +253,7 @@ typedef svn_error_t *(*svn_ra_replay_revstart_callback_t)( * * @a revision is the target revision number of the received replay report. * - * @a editor and @a edit_baton should provided by the callback implementation. + * @a editor and @a edit_baton are the values provided by the REVSTART callback. * * @a replay_baton is the baton as originally passed to replay_range. * @@ -555,9 +555,9 @@ typedef struct svn_ra_callbacks2_t /** Fetch working copy properties. * - *

     ### we might have a problem if the RA layer ever wants a property
-   * ### that corresponds to a different revision of the file than
-   * ### what is in the WC. we'll cross that bridge one day...
    + * @note we might have a problem if the RA layer ever wants a property + * that corresponds to a different revision of the file than + * what is in the WC. we'll cross that bridge one day... */ svn_ra_get_wc_prop_func_t get_wc_prop; @@ -1857,7 +1857,7 @@ svn_ra_get_location_segments(svn_ra_session_t *session, * @note Prior to Subversion 1.9, this function may request delta handlers * from @a handler even for empty text deltas. Starting with 1.9, the * delta handler / baton return arguments passed to @a handler will be - * #NULL unless there is an actual difference in the file contents between + * NULL unless there is an actual difference in the file contents between * the current and the previous call. * * @since New in 1.5. diff --git a/subversion/include/svn_repos.h b/subversion/include/svn_repos.h index 9bb462a..1df4452 100644 --- a/subversion/include/svn_repos.h +++ b/subversion/include/svn_repos.h @@ -861,7 +861,7 @@ typedef svn_error_t *(*svn_repos_freeze_func_t)(void *baton, apr_pool_t *pool); * @since New in 1.8. */ svn_error_t * -svn_repos_freeze(apr_array_header_t *paths, +svn_repos_freeze(const apr_array_header_t *paths, svn_repos_freeze_func_t freeze_func, void *freeze_baton, apr_pool_t *pool); @@ -1036,7 +1036,10 @@ svn_repos_hooks_setenv(svn_repos_t *repos, * * @a send_copyfrom_args instructs the driver to send 'copyfrom' * arguments to the editor's add_file() and add_directory() methods, - * whenever it deems feasible. + * and therefore to send their content as deltas against the copy source, + * whenever it deems feasible. The implementation only does so for + * add_file(), and only when the file itself is the copy root (not when + * the file is part of a copied subtree). * * Use @a authz_read_func and @a authz_read_baton (if not @c NULL) to * avoid sending data through @a editor/@a edit_baton which is not @@ -2404,7 +2407,7 @@ svn_repos_fs_get_mergeinfo(svn_mergeinfo_catalog_t *catalog, * @note Prior to Subversion 1.9, this function may request delta handlers * from @a handler even for empty text deltas. Starting with 1.9, the * delta handler / baton return arguments passed to @a handler will be - * #NULL unless there is an actual difference in the file contents between + * NULL unless there is an actual difference in the file contents between * the current and the previous call. * * @since New in 1.5. @@ -3803,7 +3806,7 @@ typedef struct svn_repos_parse_fns3_t * * @since New in 1.8. - * @since Starting in 1.10, @a parse_fns may contain #NULL pointers for + * @since Starting in 1.10, @a parse_fns may contain NULL pointers for * those callbacks that the caller is not interested in. */ svn_error_t * @@ -4143,6 +4146,19 @@ typedef struct svn_authz_t svn_authz_t; svn_error_t * svn_repos_authz_initialize(apr_pool_t *pool); +/** + * Callback for reporting authz file parsing warnings. + * + * The implementation may use @a scratch_pool for temporary + * allocations but should not assume that the lifetime of that pool + * persists past the callback invocation. + * + * The implementation @e must @e not clear @a error. + */ +typedef void (*svn_repos_authz_warning_func_t)(void *baton, + const svn_error_t *error, + apr_pool_t *scratch_pool); + /** * Read authz configuration data from @a path (a dirent, an absolute file url * or a registry path) into @a *authz_p, allocated in @a pool. @@ -4161,8 +4177,31 @@ svn_repos_authz_initialize(apr_pool_t *pool); * repository instance. Otherwise, set it to NULL and the repositories will * be opened as needed. * + * If the @a warning_func callback is not @c NULL, it is called + * (with @a warning_baton) to report non-fatal warnings emitted by + * the parser. + * + * @since New in 1.12. + */ +svn_error_t * +svn_repos_authz_read4(svn_authz_t **authz_p, + const char *path, + const char *groups_path, + svn_boolean_t must_exist, + svn_repos_t *repos_hint, + svn_repos_authz_warning_func_t warning_func, + void *warning_baton, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + +/** + * Similar to svn_repos_authz_read3(), but with @a warning_func and + * @a warning_baton set to @c NULL. + * * @since New in 1.10. + * @deprecated Provided for backward compatibility with the 1.11 API. */ +SVN_DEPRECATED svn_error_t * svn_repos_authz_read3(svn_authz_t **authz_p, const char *path, @@ -4203,12 +4242,35 @@ svn_repos_authz_read(svn_authz_t **authz_p, /** * Read authz configuration data from @a stream into @a *authz_p, - * allocated in @a pool. + * allocated in @a result_pool. * * If @a groups_stream is set, use the global groups parsed from it. * + * If the @a warning_func callback is not @c NULL, it is called + * (with @a warning_baton) to report non-fatal warnings emitted by + * the parser. + * + * Uses @a scratch_pool for temporary aloocations. + * + * @since New in 1.12. + */ +svn_error_t * +svn_repos_authz_parse2(svn_authz_t **authz_p, + svn_stream_t *stream, + svn_stream_t *groups_stream, + svn_repos_authz_warning_func_t warning_func, + void *warning_baton, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + +/** + * Similar to svn_repos_authz_parse2(), but with @a warning_func and + * @a warning_baton set to @c NULL. + * * @since New in 1.8. + * @deprecated Provided for backward compatibility with the 1.11 API. */ +SVN_DEPRECATED svn_error_t * svn_repos_authz_parse(svn_authz_t **authz_p, svn_stream_t *stream, diff --git a/subversion/include/svn_time.h b/subversion/include/svn_time.h index 76517ca..ac857fb 100644 --- a/subversion/include/svn_time.h +++ b/subversion/include/svn_time.h @@ -38,14 +38,21 @@ extern "C" { /** Convert @a when to a const char * representation allocated - * in @a pool. Use svn_time_from_cstring() for the reverse - * conversion. + * in @a pool. + * + * @see svn_time_from_cstring() for the reverse conversion. */ const char * svn_time_to_cstring(apr_time_t when, apr_pool_t *pool); /** Convert @a data to an @c apr_time_t @a when. + * + * @see svn_time_to_cstring() for the reverse conversion. + * + * @deprecated Also accepts a format that was used before Subversion 0.14. + * See implementation for details. Use of this format is deprecated. + * * Use @a pool for temporary memory allocation. */ svn_error_t * diff --git a/subversion/include/svn_types.h b/subversion/include/svn_types.h index 394eda8..d9f98f2 100644 --- a/subversion/include/svn_types.h +++ b/subversion/include/svn_types.h @@ -27,6 +27,8 @@ #ifndef SVN_TYPES_H #define SVN_TYPES_H +#include "svn_types_impl.h" + /* ### this should go away, but it causes too much breakage right now */ #include #include /* for ULONG_MAX */ @@ -303,28 +305,7 @@ apr_hash_this_val(apr_hash_index_t *hi); -/** The various types of nodes in the Subversion filesystem. */ -typedef enum svn_node_kind_t -{ - /** absent */ - svn_node_none, - - /** regular file */ - svn_node_file, - - /** directory */ - svn_node_dir, - - /** something's here, but we don't know what */ - svn_node_unknown, - - /** - * symbolic link - * @note This value is not currently used by the public API. - * @since New in 1.8. - */ - svn_node_symlink -} svn_node_kind_t; +/* NOTE: svn_node_kind_t is defined in svn_types_impl.h */ /** Return a constant string expressing @a kind as an English word, e.g., * "file", "dir", etc. The string is not localized, as it may be used for @@ -346,23 +327,7 @@ svn_node_kind_t svn_node_kind_from_word(const char *word); -/** Generic three-state property to represent an unknown value for values - * that are just like booleans. The values have been set deliberately to - * make tristates disjoint from #svn_boolean_t. - * - * @note It is unsafe to use apr_pcalloc() to allocate these, since '0' is - * not a valid value. - * - * @since New in 1.7. */ -typedef enum svn_tristate_t -{ - /** state known to be false (the constant does not evaulate to false) */ - svn_tristate_false = 2, - /** state known to be true */ - svn_tristate_true, - /** state could be true or false */ - svn_tristate_unknown -} svn_tristate_t; +/* NOTE: svn_tristate_t is defined in svn_types_impl.h */ /** Return a constant string "true", "false" or NULL representing the value of * @a tristate. @@ -422,15 +387,11 @@ svn_tristate__from_word(const char * word); -/** A revision number. */ -typedef long int svn_revnum_t; +/* NOTE: svn_revnum_t and SVN_INVALID_REVNUM are defined in svn_types_impl.h */ /** Valid revision numbers begin at 0 */ #define SVN_IS_VALID_REVNUM(n) ((n) >= 0) -/** The 'official' invalid revision num */ -#define SVN_INVALID_REVNUM ((svn_revnum_t) -1) - /** Not really invalid...just unimportant -- one day, this can be its * own unique value, for now, just make it the same as * #SVN_INVALID_REVNUM. @@ -494,55 +455,7 @@ enum svn_recurse_kind svn_recursive }; -/** The concept of depth for directories. - * - * @note This is similar to, but not exactly the same as, the WebDAV - * and LDAP concepts of depth. - * - * @since New in 1.5. - */ -typedef enum svn_depth_t -{ - /* The order of these depths is important: the higher the number, - the deeper it descends. This allows us to compare two depths - numerically to decide which should govern. */ - - /** Depth undetermined or ignored. In some contexts, this means the - client should choose an appropriate default depth. The server - will generally treat it as #svn_depth_infinity. */ - svn_depth_unknown = -2, - - /** Exclude (i.e., don't descend into) directory D. - @note In Subversion 1.5, svn_depth_exclude is *not* supported - anywhere in the client-side (libsvn_wc/libsvn_client/etc) code; - it is only supported as an argument to set_path functions in the - ra and repos reporters. (This will enable future versions of - Subversion to run updates, etc, against 1.5 servers with proper - svn_depth_exclude behavior, once we get a chance to implement - client-side support for svn_depth_exclude.) - */ - svn_depth_exclude = -1, - - /** Just the named directory D, no entries. Updates will not pull in - any files or subdirectories not already present. */ - svn_depth_empty = 0, - - /** D + its file children, but not subdirs. Updates will pull in any - files not already present, but not subdirectories. */ - svn_depth_files = 1, - - /** D + immediate children (D and its entries). Updates will pull in - any files or subdirectories not already present; those - subdirectories' this_dir entries will have depth-empty. */ - svn_depth_immediates = 2, - - /** D + all descendants (full recursion from D). Updates will pull - in any files or subdirectories not already present; those - subdirectories' this_dir entries will have depth-infinity. - Equivalent to the pre-1.5 default update behavior. */ - svn_depth_infinity = 3 - -} svn_depth_t; +/* NOTE: svn_depth_t is defined in svn_types_impl.h */ /** Return a constant string expressing @a depth as an English word, * e.g., "infinity", "immediates", etc. The string is not localized, diff --git a/subversion/include/svn_types_impl.h b/subversion/include/svn_types_impl.h new file mode 100644 index 0000000..625597f --- /dev/null +++ b/subversion/include/svn_types_impl.h @@ -0,0 +1,157 @@ +/** + * @copyright + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * @endcopyright + * + * @file svn_types_impl.h + * @brief Subversion's data types (common implementation) + * + * @warning This is a @b private implementation-specific header file. + * User code should include @ref svn_types.h instead. + */ + +/* NOTE: + * This file *must not* include or depend on any other header except + * the C standard library headers. + */ + +#ifndef SVN_TYPES_IMPL_H +#define SVN_TYPES_IMPL_H + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + + +#ifndef DOXYGEN +/* Forward declaration of the error object. */ +struct svn_error_t; +#endif + + +/** The various types of nodes in the Subversion filesystem. */ +typedef enum svn_node_kind_t +{ + /** absent */ + svn_node_none, + + /** regular file */ + svn_node_file, + + /** directory */ + svn_node_dir, + + /** something's here, but we don't know what */ + svn_node_unknown, + + /** + * symbolic link + * @note This value is not currently used by the public API. + * @since New in 1.8. + */ + svn_node_symlink +} svn_node_kind_t; + + +/** Generic three-state property to represent an unknown value for values + * that are just like booleans. The values have been set deliberately to + * make tristates disjoint from #svn_boolean_t. + * + * @note It is unsafe to use apr_pcalloc() to allocate these, since '0' is + * not a valid value. + * + * @since New in 1.7. */ +/* NOTE: Update svnxx/tristate.hpp when changing this enum. */ +typedef enum svn_tristate_t +{ + /** state known to be false (the constant does not evaulate to false) */ + svn_tristate_false = 2, + /** state known to be true */ + svn_tristate_true, + /** state could be true or false */ + svn_tristate_unknown +} svn_tristate_t; + + +/** A revision number. */ +/* NOTE: Update svnxx/revision.hpp when changing this typedef. */ +typedef long int svn_revnum_t; + +/** The 'official' invalid revision number. */ +/* NOTE: Update svnxx/revision.hpp when changing this definition. */ +#define SVN_INVALID_REVNUM ((svn_revnum_t) -1) + + +/** The concept of depth for directories. + * + * @note This is similar to, but not exactly the same as, the WebDAV + * and LDAP concepts of depth. + * + * @since New in 1.5. + */ +/* NOTE: Update svnxx/depth.hpp when changing this enum. */ +typedef enum svn_depth_t +{ + /* The order of these depths is important: the higher the number, + the deeper it descends. This allows us to compare two depths + numerically to decide which should govern. */ + + /** Depth undetermined or ignored. In some contexts, this means the + client should choose an appropriate default depth. The server + will generally treat it as #svn_depth_infinity. */ + svn_depth_unknown = -2, + + /** Exclude (i.e., don't descend into) directory D. + @note In Subversion 1.5, svn_depth_exclude is *not* supported + anywhere in the client-side (libsvn_wc/libsvn_client/etc) code; + it is only supported as an argument to set_path functions in the + ra and repos reporters. (This will enable future versions of + Subversion to run updates, etc, against 1.5 servers with proper + svn_depth_exclude behavior, once we get a chance to implement + client-side support for svn_depth_exclude.) + */ + svn_depth_exclude = -1, + + /** Just the named directory D, no entries. Updates will not pull in + any files or subdirectories not already present. */ + svn_depth_empty = 0, + + /** D + its file children, but not subdirs. Updates will pull in any + files not already present, but not subdirectories. */ + svn_depth_files = 1, + + /** D + immediate children (D and its entries). Updates will pull in + any files or subdirectories not already present; those + subdirectories' this_dir entries will have depth-empty. */ + svn_depth_immediates = 2, + + /** D + all descendants (full recursion from D). Updates will pull + in any files or subdirectories not already present; those + subdirectories' this_dir entries will have depth-infinity. + Equivalent to the pre-1.5 default update behavior. */ + svn_depth_infinity = 3 + +} svn_depth_t; + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* SVN_TYPES_IMPL_H */ diff --git a/subversion/include/svn_utf.h b/subversion/include/svn_utf.h index 4a2c137..c65afc7 100644 --- a/subversion/include/svn_utf.h +++ b/subversion/include/svn_utf.h @@ -212,7 +212,7 @@ svn_utf_cstring_from_utf8_ex(const char **dest, * so when we can detect that at configure time, things will change. * Also, this should (?) be moved to apr/apu eventually. * - * See http://subversion.tigris.org/issues/show_bug.cgi?id=807 for + * See https://issues.apache.org/jira/browse/SVN-807 for * details. */ const char * diff --git a/subversion/include/svn_version.h b/subversion/include/svn_version.h index 386ae07..c43f483 100644 --- a/subversion/include/svn_version.h +++ b/subversion/include/svn_version.h @@ -61,7 +61,7 @@ extern "C" { * Modify when new functionality is added or new interfaces are * defined, but all changes are backward compatible. */ -#define SVN_VER_MINOR 10 +#define SVN_VER_MINOR 13 /** * Patch number. @@ -70,7 +70,7 @@ extern "C" { * * @since New in 1.1. */ -#define SVN_VER_PATCH 6 +#define SVN_VER_PATCH 0 /** @deprecated Provided for backward compatibility with the 1.0 API. */ @@ -93,7 +93,7 @@ extern "C" { * * Always change this at the same time as SVN_VER_NUMTAG. */ -#define SVN_VER_TAG " (r1863367)" +#define SVN_VER_TAG " (r1867053)" /** Number tag: a string describing the version. @@ -117,7 +117,7 @@ extern "C" { * file version. Its value remains 0 in the repository except in release * tags where it is the revision from which the tag was created. */ -#define SVN_VER_REVISION 1863367 +#define SVN_VER_REVISION 1867053 /* Version strings composed from the above definitions. */ diff --git a/subversion/include/svn_wc.h b/subversion/include/svn_wc.h index e632673..cd018ae 100644 --- a/subversion/include/svn_wc.h +++ b/subversion/include/svn_wc.h @@ -7602,9 +7602,14 @@ svn_wc_relocate(const char *path, * If @a clear_changelists is TRUE, then changelist information for the * paths is cleared. * - * If @a metadata_only is TRUE, the working copy files are untouched, but - * if there are conflict marker files attached to these files these - * markers are removed. + * The @a metadata_only and @a added_keep_local options control the + * extent of reverting. If @a metadata_only is TRUE, the working copy + * files are untouched, but if there are conflict marker files attached + * to these files these markers are removed. Otherwise, if + * @a added_keep_local is TRUE, then all items are reverted except an + * item that was scheduled as plain 'add' (not a copy) will not be + * removed from the working copy. Otherwise, all items are reverted and + * their on-disk state changed to match. * * If @a cancel_func is non-NULL, call it with @a cancel_baton at * various points during the reversion process. If it returns an @@ -7622,8 +7627,30 @@ svn_wc_relocate(const char *path, * If @a path is not under version control, return the error * #SVN_ERR_UNVERSIONED_RESOURCE. * + * @since New in 1.11. + */ +svn_error_t * +svn_wc_revert6(svn_wc_context_t *wc_ctx, + const char *local_abspath, + svn_depth_t depth, + svn_boolean_t use_commit_times, + const apr_array_header_t *changelist_filter, + svn_boolean_t clear_changelists, + svn_boolean_t metadata_only, + svn_boolean_t added_keep_local, + svn_cancel_func_t cancel_func, + void *cancel_baton, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + apr_pool_t *scratch_pool); + +/** Similar to svn_wc_revert6() but with @a added_keep_local always + * set to TRUE. + * * @since New in 1.9. + * @deprecated Provided for backward compatibility with the 1.10 API. */ +SVN_DEPRECATED svn_error_t * svn_wc_revert5(svn_wc_context_t *wc_ctx, const char *local_abspath, diff --git a/subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring.pc.in b/subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring.pc.in index a787178..114c8bb 100644 --- a/subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring.pc.in +++ b/subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_auth_gnome_keyring Description: Subversion GNOME Keyring Library Version: @PACKAGE_VERSION@ -Requires: apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_subr @SVN_GNOME_KEYRING_PCLIBS@ -Libs: -L${libdir} -lsvn_auth_gnome_keyring -Cflags: -I${includedir} +Requires: apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_subr, @SVN_GNOME_KEYRING_PCLIBS@ +Libs: -L${libdir} -lsvn_auth_gnome_keyring-1 +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_auth_kwallet/libsvn_auth_kwallet.pc.in b/subversion/libsvn_auth_kwallet/libsvn_auth_kwallet.pc.in index fa65cfa..8d4d72b 100644 --- a/subversion/libsvn_auth_kwallet/libsvn_auth_kwallet.pc.in +++ b/subversion/libsvn_auth_kwallet/libsvn_auth_kwallet.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_auth_kwallet Description: Subversion KWallet Library Version: @PACKAGE_VERSION@ -Requires: apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_subr -Libs: -L${libdir} -lsvn_auth_kwallet @SVN_KWALLET_LIBS@ -Cflags: -I${includedir} +Requires: apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_subr +Libs: -L${libdir} -lsvn_auth_kwallet-1 @SVN_KWALLET_LIBS@ +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_client/add.c b/subversion/libsvn_client/add.c index ce7891a..3bb548a 100644 --- a/subversion/libsvn_client/add.c +++ b/subversion/libsvn_client/add.c @@ -983,12 +983,13 @@ svn_client_add5(const char *path, static svn_error_t * path_driver_cb_func(void **dir_baton, + const svn_delta_editor_t *editor, + void *edit_baton, void *parent_baton, void *callback_baton, const char *path, apr_pool_t *pool) { - const svn_delta_editor_t *editor = callback_baton; SVN_ERR(svn_path_check_valid(path, pool)); return editor->add_directory(path, parent_baton, NULL, SVN_INVALID_REVNUM, pool, dir_baton); @@ -1177,8 +1178,8 @@ mkdir_urls(const apr_array_header_t *urls, /* Call the path-based editor driver. */ err = svn_error_trace( - svn_delta_path_driver2(editor, edit_baton, targets, TRUE, - path_driver_cb_func, (void *)editor, pool)); + svn_delta_path_driver3(editor, edit_baton, targets, TRUE, + path_driver_cb_func, NULL, pool)); if (err) { diff --git a/subversion/libsvn_client/blame.c b/subversion/libsvn_client/blame.c index b9363e2..ab48d40 100644 --- a/subversion/libsvn_client/blame.c +++ b/subversion/libsvn_client/blame.c @@ -656,14 +656,16 @@ normalize_blames(struct blame_chain *chain, } svn_error_t * -svn_client_blame5(const char *target, +svn_client_blame6(svn_revnum_t *start_revnum_p, + svn_revnum_t *end_revnum_p, + const char *target, const svn_opt_revision_t *peg_revision, const svn_opt_revision_t *start, const svn_opt_revision_t *end, const svn_diff_file_options_t *diff_options, svn_boolean_t ignore_mime_type, svn_boolean_t include_merged_revisions, - svn_client_blame_receiver3_t receiver, + svn_client_blame_receiver4_t receiver, void *receiver_baton, svn_client_ctx_t *ctx, apr_pool_t *pool) @@ -696,10 +698,13 @@ svn_client_blame5(const char *target, SVN_ERR(svn_client__get_revision_number(&start_revnum, NULL, ctx->wc_ctx, target_abspath_or_url, ra_session, start, pool)); - + if (start_revnum_p) + *start_revnum_p = start_revnum; SVN_ERR(svn_client__get_revision_number(&end_revnum, NULL, ctx->wc_ctx, target_abspath_or_url, ra_session, end, pool)); + if (end_revnum_p) + *end_revnum_p = end_revnum; { svn_client__pathrev_t *loc; @@ -941,18 +946,21 @@ svn_client_blame5(const char *target, SVN_ERR(ctx->cancel_func(ctx->cancel_baton)); if (!eof || sb->len) { + svn_string_t line; + line.data = sb->data; + line.len = sb->len; if (walk->rev) - SVN_ERR(receiver(receiver_baton, start_revnum, end_revnum, + SVN_ERR(receiver(receiver_baton, line_no, walk->rev->revision, walk->rev->rev_props, merged_rev, merged_rev_props, merged_path, - sb->data, FALSE, iterpool)); + &line, FALSE, iterpool)); else - SVN_ERR(receiver(receiver_baton, start_revnum, end_revnum, + SVN_ERR(receiver(receiver_baton, line_no, SVN_INVALID_REVNUM, NULL, SVN_INVALID_REVNUM, NULL, NULL, - sb->data, TRUE, iterpool)); + &line, TRUE, iterpool)); } if (eof) break; } diff --git a/subversion/libsvn_client/client.h b/subversion/libsvn_client/client.h index c0a7947..97cd1e2 100644 --- a/subversion/libsvn_client/client.h +++ b/subversion/libsvn_client/client.h @@ -682,34 +682,6 @@ svn_client__get_diff_editor2(const svn_delta_editor_t **editor, /* ---------------------------------------------------------------- */ -/*** Editor for diff summary ***/ - -/* Set *DIFF_PROCESSOR to a diff processor that will report a diff summary - to SUMMARIZE_FUNC. - - P_ROOT_RELPATH will return a pointer to a string that must be set to - the root of the operation before the processor is called. - - ORIGINAL_PATH specifies the original path and will be used with - **ANCHOR_PATH to create paths as the user originally provided them - to the diff function. - - SUMMARIZE_FUNC is called with SUMMARIZE_BATON as parameter by the - created callbacks for each changed item. -*/ -svn_error_t * -svn_client__get_diff_summarize_callbacks( - const svn_diff_tree_processor_t **diff_processor, - const char ***p_root_relpath, - svn_client_diff_summarize_func_t summarize_func, - void *summarize_baton, - const char *original_target, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool); - -/* ---------------------------------------------------------------- */ - - /*** Copy Stuff ***/ /* This structure is used to associate a specific copy or move SRC with a @@ -754,40 +726,23 @@ typedef struct svn_client__copy_pair_t /*** Commit Stuff ***/ -/* WARNING: This is all new, untested, un-peer-reviewed conceptual - stuff. +/* The "Harvest Committables" System - The day that 'svn switch' came into existence, our old commit - crawler (svn_wc_crawl_local_mods) became obsolete. It relied far - too heavily on the on-disk hierarchy of files and directories, and - simply had no way to support disjoint working copy trees or nest - working copies. The primary reason for this is that commit - process, in order to guarantee atomicity, is a single drive of a + The commit process requires, per repository, a single drive of a commit editor which is based not on working copy paths, but on - URLs. With the completion of 'svn switch', it became all too - likely that the on-disk working copy hierarchy would no longer be - guaranteed to map to a similar in-repository hierarchy. - - Aside from this new brokenness of the old system, an unrelated - feature request had cropped up -- the ability to know in advance of - your commit, exactly what would be committed (so that log messages - could be initially populated with this information). Since the old - crawler discovered commit candidates while in the process of - committing, it was impossible to harvest this information upfront. - As a workaround, svn_wc_statuses() was used to stat the whole - working copy for changes before the commit started...and then the - commit would again stat the whole tree for changes. - - Enter the new system. + URLs. The on-disk working copy hierarchy does not, in general, + map to a similar in-repository hierarchy, due to switched subtrees + and disjoint working copies. + + Also we wish to know exactly what would be committed, in advance of + the commit, so that a log message editor can be initially populated + with this information. The primary goal of this system is very straightforward: harvest all commit candidate information up front, and cache enough info in the process to use this to drive a URL-sorted commit. - *** END-OF-KNOWLEDGE *** - - The prototypes below are still in development. In general, the - idea is that commit-y processes ('svn mkdir URL', 'svn delete URL', + The idea is that commit-y processes ('svn mkdir URL', 'svn delete URL', 'svn commit', 'svn copy WC_PATH URL', 'svn copy URL1 URL2', 'svn move URL1 URL2', others?) generate the cached commit candidate information, and hand this information off to a consumer which is @@ -844,7 +799,7 @@ typedef svn_error_t *(*svn_client__check_url_kind_t)(void *baton, - if the candidate has a lock token, add it to the LOCK_TOKENS hash. - if the candidate is a directory scheduled for deletion, crawl - the directories children recursively for any lock tokens and + the directory's children recursively for any lock tokens and add them to the LOCK_TOKENS array. At the successful return of this function, COMMITTABLES will point @@ -915,6 +870,18 @@ svn_client__condense_commit_items(const char **base_url, apr_array_header_t *commit_items, apr_pool_t *pool); +/* Rewrite the COMMIT_ITEMS array to be sorted by URL. + Rewrite the items' URLs to be relative to BASE_URL. + + COMMIT_ITEMS is an array of (svn_client_commit_item3_t *) items. + + Afterwards, some of the items in COMMIT_ITEMS may contain data + allocated in POOL. */ +svn_error_t * +svn_client__condense_commit_items2(const char *base_url, + apr_array_header_t *commit_items, + apr_pool_t *pool); + /* Commit the items in the COMMIT_ITEMS array using EDITOR/EDIT_BATON to describe the committed local mods. Prior to this call, COMMIT_ITEMS should have been run through (and BASE_URL generated @@ -1129,24 +1096,26 @@ svn_client__resolve_conflicts(svn_boolean_t *conflicts_remain, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool); -/* Produce a diff with depth DEPTH between two files or two directories at - * LEFT_ABSPATH1 and RIGHT_ABSPATH, using the provided diff callbacks to - * show changes in files. The files and directories involved may be part of - * a working copy or they may be unversioned. For versioned files, show - * property changes, too. +/* Produce a diff with depth DEPTH between the file or directory at + * LEFT_ABSPATH and the file or directory at RIGHT_ABSPATH, reporting + * differences to DIFF_PROCESSOR. + * + * The files and directories involved may be part of a working copy or + * they may be unversioned. For versioned files, show property changes, + * too. * - * If ANCHOR_ABSPATH is not null, set it to the anchor of the diff before - * the first processor call. (The anchor is LEFT_ABSPATH or an ancestor of it) + * No copy or move information is reported to the diff processor. + * + * Anchor the DIFF_PROCESSOR at the requested diff targets (LEFT_ABSPATH, + * RIGHT_ABSPATH). As any children reached by recursion are matched by + * name, a diff processor relpath applies equally to both sides of the diff. */ svn_error_t * -svn_client__arbitrary_nodes_diff(const char **root_relpath, - svn_boolean_t *root_is_dir, - const char *left_abspath, +svn_client__arbitrary_nodes_diff(const char *left_abspath, const char *right_abspath, svn_depth_t depth, const svn_diff_tree_processor_t *diff_processor, svn_client_ctx_t *ctx, - apr_pool_t *result_pool, apr_pool_t *scratch_pool); diff --git a/subversion/libsvn_client/commit.c b/subversion/libsvn_client/commit.c index 4a945c8..df2f5f7 100644 --- a/subversion/libsvn_client/commit.c +++ b/subversion/libsvn_client/commit.c @@ -500,6 +500,129 @@ append_externals_as_explicit_targets(apr_array_header_t *rel_targets, return SVN_NO_ERROR; } +/* Crawl the working copy for commit items. + */ +static svn_error_t * +harvest_committables(apr_array_header_t **commit_items_p, + apr_hash_t **committables_by_path_p, + apr_hash_t **lock_tokens, + const char *base_dir_abspath, + const apr_array_header_t *targets, + int depth_empty_start, + svn_depth_t depth, + svn_boolean_t just_locked, + const apr_array_header_t *changelists, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + struct check_url_kind_baton cukb; + svn_client__committables_t *committables; + apr_hash_index_t *hi; + + /* Prepare for when we have a copy containing not-present nodes. */ + cukb.pool = scratch_pool; + cukb.session = NULL; /* ### Can we somehow reuse session? */ + cukb.repos_root_url = NULL; + cukb.ctx = ctx; + + SVN_ERR(svn_client__harvest_committables(&committables, lock_tokens, + base_dir_abspath, targets, + depth_empty_start, depth, + just_locked, + changelists, + check_url_kind, &cukb, + ctx, result_pool, scratch_pool)); + if (apr_hash_count(committables->by_repository) == 0) + { + *commit_items_p = NULL; + return SVN_NO_ERROR; /* Nothing to do */ + } + else if (apr_hash_count(committables->by_repository) > 1) + { + return svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, NULL, + _("Commit can only commit to a single repository at a time.\n" + "Are all targets part of the same working copy?")); + } + + hi = apr_hash_first(scratch_pool, committables->by_repository); + *commit_items_p = apr_hash_this_val(hi); + if (committables_by_path_p) + *committables_by_path_p = committables->by_path; + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__wc_replay(const char *src_wc_abspath, + const apr_array_header_t *targets, + svn_depth_t depth, + const apr_array_header_t *changelists, + const svn_delta_editor_t *editor, + void *edit_baton, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + svn_client_ctx_t *ctx, + apr_pool_t *pool) +{ + const char *base_abspath; + apr_array_header_t *rel_targets; + apr_hash_t *lock_tokens; + apr_array_header_t *commit_items; + svn_client__pathrev_t *base; + const char *base_url; + svn_wc_notify_func2_t saved_notify_func; + void *saved_notify_baton; + + /* Condense the target list. This makes all targets absolute. */ + SVN_ERR(svn_dirent_condense_targets(&base_abspath, &rel_targets, targets, + FALSE, pool, pool)); + + /* No targets means nothing to commit, so just return. */ + if (base_abspath == NULL) + return SVN_NO_ERROR; + + SVN_ERR_ASSERT(rel_targets != NULL); + + /* If we calculated only a base and no relative targets, this + must mean that we are being asked to commit (effectively) a + single path. */ + if (rel_targets->nelts == 0) + APR_ARRAY_PUSH(rel_targets, const char *) = ""; + + /* Crawl the working copy for commit items. */ + SVN_ERR(harvest_committables(&commit_items, NULL /*committables_by_path_p*/, + &lock_tokens, + base_abspath, rel_targets, + -1 /*depth_empty_start*/, + depth, + FALSE /*just_locked*/, + changelists, + ctx, pool, pool)); + if (!commit_items) + { + return SVN_NO_ERROR; + } + + SVN_ERR(svn_client__wc_node_get_base(&base, + src_wc_abspath, ctx->wc_ctx, pool, pool)); + base_url = base->url; + /* Sort our COMMIT_ITEMS by URL and find their relative URL-paths. */ + SVN_ERR(svn_client__condense_commit_items2(base_url, commit_items, pool)); + + saved_notify_func = ctx->notify_func2; + saved_notify_baton = ctx->notify_baton2; + ctx->notify_func2 = notify_func; + ctx->notify_baton2 = notify_baton; + /* BASE_URL is only used here in notifications & errors */ + SVN_ERR(svn_client__do_commit(base_url, commit_items, + editor, edit_baton, + NULL /*notify_prefix*/, NULL /*sha1_checksums*/, + ctx, pool, pool)); + ctx->notify_func2 = saved_notify_func; + ctx->notify_baton2 = saved_notify_baton; + return SVN_NO_ERROR; +} + svn_error_t * svn_client_commit6(const apr_array_header_t *targets, svn_depth_t depth, @@ -525,7 +648,7 @@ svn_client_commit6(const apr_array_header_t *targets, apr_array_header_t *rel_targets; apr_array_header_t *lock_targets; apr_array_header_t *locks_obtained; - svn_client__committables_t *committables; + apr_hash_t *committables_by_path; apr_hash_t *lock_tokens; apr_hash_t *sha1_checksums; apr_array_header_t *commit_items; @@ -615,55 +738,27 @@ svn_client_commit6(const apr_array_header_t *targets, pool); /* Crawl the working copy for commit items. */ - { - struct check_url_kind_baton cukb; - - /* Prepare for when we have a copy containing not-present nodes. */ - cukb.pool = iterpool; - cukb.session = NULL; /* ### Can we somehow reuse session? */ - cukb.repos_root_url = NULL; - cukb.ctx = ctx; - - cmt_err = svn_error_trace( - svn_client__harvest_committables(&committables, - &lock_tokens, - base_abspath, - rel_targets, - depth_empty_after, - depth, - ! keep_locks, - changelists, - check_url_kind, - &cukb, - ctx, - pool, - iterpool)); - - svn_pool_clear(iterpool); - } + cmt_err = svn_error_trace( + harvest_committables(&commit_items, &committables_by_path, + &lock_tokens, + base_abspath, + rel_targets, + depth_empty_after, + depth, + ! keep_locks, + changelists, + ctx, + pool, + iterpool)); + svn_pool_clear(iterpool); if (cmt_err) goto cleanup; - if (apr_hash_count(committables->by_repository) == 0) + if (!commit_items) { goto cleanup; /* Nothing to do */ } - else if (apr_hash_count(committables->by_repository) > 1) - { - cmt_err = svn_error_create( - SVN_ERR_UNSUPPORTED_FEATURE, NULL, - _("Commit can only commit to a single repository at a time.\n" - "Are all targets part of the same working copy?")); - goto cleanup; - } - - { - apr_hash_index_t *hi = apr_hash_first(iterpool, - committables->by_repository); - - commit_items = apr_hash_this_val(hi); - } /* If our array of targets contains only locks (and no actual file or prop modifications), then we return here to avoid committing a @@ -713,7 +808,7 @@ svn_client_commit6(const apr_array_header_t *targets, if (moved_from_abspath && delete_op_root_abspath) { svn_client_commit_item3_t *delete_half = - svn_hash_gets(committables->by_path, delete_op_root_abspath); + svn_hash_gets(committables_by_path, delete_op_root_abspath); if (!delete_half) { @@ -769,7 +864,7 @@ svn_client_commit6(const apr_array_header_t *targets, if (moved_to_abspath && copy_op_root_abspath && strcmp(moved_to_abspath, copy_op_root_abspath) == 0 && - svn_hash_gets(committables->by_path, copy_op_root_abspath) + svn_hash_gets(committables_by_path, copy_op_root_abspath) == NULL) { cmt_err = svn_error_createf( diff --git a/subversion/libsvn_client/commit_util.c b/subversion/libsvn_client/commit_util.c index 1f3d877..2be3ecd 100644 --- a/subversion/libsvn_client/commit_util.c +++ b/subversion/libsvn_client/commit_util.c @@ -1392,6 +1392,29 @@ sort_commit_item_urls(const void *a, const void *b) } +svn_error_t * +svn_client__condense_commit_items2(const char *base_url, + apr_array_header_t *commit_items, + apr_pool_t *pool) +{ + apr_array_header_t *ci = commit_items; /* convenience */ + int i; + + /* Sort our commit items by their URLs. */ + svn_sort__array(ci, sort_commit_item_urls); + + /* Hack BASE_URL off each URL; store the result as session_relpath. */ + for (i = 0; i < ci->nelts; i++) + { + svn_client_commit_item3_t *this_item + = APR_ARRAY_IDX(ci, i, svn_client_commit_item3_t *); + + this_item->session_relpath = svn_uri_skip_ancestor(base_url, + this_item->url, pool); + } + + return SVN_NO_ERROR; +} svn_error_t * svn_client__condense_commit_items(const char **base_url, @@ -1501,8 +1524,6 @@ struct file_mod_t /* A baton for use while driving a path-based editor driver for commit */ struct item_commit_baton { - const svn_delta_editor_t *editor; /* commit editor */ - void *edit_baton; /* commit editor's baton */ apr_hash_t *file_mods; /* hash: path->file_mod_t */ const char *notify_path_prefix; /* notification path prefix (NULL is okay, else abs path) */ @@ -1524,6 +1545,8 @@ struct item_commit_baton * This implements svn_delta_path_driver_cb_func_t. */ static svn_error_t * do_item_commit(void **dir_baton, + const svn_delta_editor_t *editor, + void *edit_baton, void *parent_baton, void *callback_baton, const char *path, @@ -1535,7 +1558,6 @@ do_item_commit(void **dir_baton, svn_node_kind_t kind = item->kind; void *file_baton = NULL; apr_pool_t *file_pool = NULL; - const svn_delta_editor_t *editor = icb->editor; apr_hash_t *file_mods = icb->file_mods; svn_client_ctx_t *ctx = icb->ctx; svn_error_t *err; @@ -1737,7 +1759,7 @@ do_item_commit(void **dir_baton, { if (! parent_baton) { - err = editor->open_root(icb->edit_baton, item->revision, + err = editor->open_root(edit_baton, item->revision, pool, dir_baton); } else @@ -1871,8 +1893,6 @@ svn_client__do_commit(const char *base_url, } /* Setup the callback baton. */ - cb_baton.editor = editor; - cb_baton.edit_baton = edit_baton; cb_baton.file_mods = file_mods; cb_baton.notify_path_prefix = notify_path_prefix; cb_baton.ctx = ctx; @@ -1880,7 +1900,7 @@ svn_client__do_commit(const char *base_url, cb_baton.base_url = base_url; /* Drive the commit editor! */ - SVN_ERR(svn_delta_path_driver2(editor, edit_baton, paths, TRUE, + SVN_ERR(svn_delta_path_driver3(editor, edit_baton, paths, TRUE, do_item_commit, &cb_baton, scratch_pool)); /* Transmit outstanding text deltas. */ diff --git a/subversion/libsvn_client/conflicts.c b/subversion/libsvn_client/conflicts.c index d1a2ae2..920c55e 100644 --- a/subversion/libsvn_client/conflicts.c +++ b/subversion/libsvn_client/conflicts.c @@ -255,7 +255,7 @@ struct repos_move_info { /* The revision in which this move was committed. */ svn_revnum_t rev; - /* The author who commited the revision in which this move was committed. */ + /* The author who committed the revision in which this move was committed. */ const char *rev_author; /* The repository relpath the node was moved from in this revision. */ @@ -2350,6 +2350,8 @@ struct conflict_tree_local_missing_details /* If not SVN_INVALID_REVNUM, the node was deleted in DELETED_REV. */ svn_revnum_t deleted_rev; + /* ### Add 'added_rev', like in conflict_tree_incoming_delete_details? */ + /* Author who committed DELETED_REV. */ const char *deleted_rev_author; @@ -2357,21 +2359,49 @@ struct conflict_tree_local_missing_details const char *deleted_repos_relpath; /* Move information about the conflict victim. If not NULL, this is an - * array of repos_move_info elements. Each element is the head of a - * move chain which starts in DELETED_REV. */ + * array of 'struct repos_move_info *' elements. Each element is the + * head of a move chain which starts in DELETED_REV. */ apr_array_header_t *moves; + /* If moves is not NULL, a map of repos_relpaths and working copy nodes. + * + * Each key is a "const char *" repository relpath corresponding to a + * possible repository-side move destination node in the revision which + * is the merge-right revision in case of a merge. + * + * Each value is an apr_array_header_t *. + * Each array consists of "const char *" absolute paths to working copy + * nodes which correspond to the repository node selected by the map key. + * Each such working copy node is a potential local move target which can + * be chosen to find a suitable merge target when resolving a tree conflict. + * + * This may be an empty hash map in case if there is no move target path + * in the working copy. */ + apr_hash_t *wc_move_targets; + + /* If not NULL, the preferred move target repository relpath. This is our key + * into the WC_MOVE_TARGETS map above (can be overridden by the user). */ + const char *move_target_repos_relpath; + + /* The current index into the list of working copy nodes corresponding to + * MOVE_TARGET_REPOS_REPLATH (can be overridden by the user). */ + int wc_move_target_idx; + /* Move information about siblings. Siblings are nodes which share * a youngest common ancestor with the conflict victim. E.g. in case * of a merge operation they are part of the merge source branch. - * If not NULL, this is an array of repos_move_info elements. + * If not NULL, this is an array of 'struct repos_move_info *' elements. * Each element is the head of a move chain, which starts at some * point in history after siblings and conflict victim forked off * their common ancestor. */ apr_array_header_t *sibling_moves; - /* If not NULL, this is the move target abspath. */ - const char *moved_to_abspath; + /* List of nodes in the WC which are suitable merge targets for changes + * merged from any moved sibling. Array elements are 'const char *' + * absolute paths of working copy nodes. This array contains multiple + * elements only if ambiguous matches were found in the WC. */ + apr_array_header_t *wc_siblings; + int preferred_sibling_idx; }; static svn_error_t * @@ -2590,6 +2620,168 @@ find_moves_in_natural_history(apr_array_header_t **moves, return SVN_NO_ERROR; } +static svn_error_t * +collect_sibling_move_candidates(apr_array_header_t *candidates, + const char *victim_abspath, + svn_node_kind_t victim_kind, + struct repos_move_info *move, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + const char *basename; + apr_array_header_t *abspaths; + int i; + + basename = svn_relpath_basename(move->moved_from_repos_relpath, scratch_pool); + SVN_ERR(svn_wc__find_working_nodes_with_basename(&abspaths, victim_abspath, + basename, victim_kind, + ctx->wc_ctx, result_pool, + scratch_pool)); + apr_array_cat(candidates, abspaths); + + if (move->next) + { + apr_pool_t *iterpool = svn_pool_create(scratch_pool); + for (i = 0; i < move->next->nelts; i++) + { + struct repos_move_info *next_move; + next_move = APR_ARRAY_IDX(move->next, i, struct repos_move_info *); + SVN_ERR(collect_sibling_move_candidates(candidates, victim_abspath, + victim_kind, next_move, ctx, + result_pool, iterpool)); + svn_pool_clear(iterpool); + } + svn_pool_destroy(iterpool); + } + + return SVN_NO_ERROR; +} + +/* Follow each move chain starting a MOVE all the way to the end to find + * the possible working copy locations for VICTIM_ABSPATH which corresponds + * to VICTIM_REPOS_REPLATH@VICTIM_REVISION. + * Add each such location to the WC_MOVE_TARGETS hash table, keyed on the + * repos_relpath which is the corresponding move destination in the repository. + * This function is recursive. */ +static svn_error_t * +follow_move_chains(apr_hash_t *wc_move_targets, + struct repos_move_info *move, + svn_client_ctx_t *ctx, + const char *victim_abspath, + svn_node_kind_t victim_node_kind, + const char *victim_repos_relpath, + svn_revnum_t victim_revision, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + apr_array_header_t *candidate_abspaths; + + /* Gather candidate nodes which represent this moved_to_repos_relpath. */ + SVN_ERR(svn_wc__guess_incoming_move_target_nodes( + &candidate_abspaths, ctx->wc_ctx, + victim_abspath, victim_node_kind, + move->moved_to_repos_relpath, + scratch_pool, scratch_pool)); + + if (candidate_abspaths->nelts > 0) + { + apr_array_header_t *moved_to_abspaths; + int i; + apr_pool_t *iterpool = svn_pool_create(scratch_pool); + + moved_to_abspaths = apr_array_make(result_pool, 1, + sizeof (const char *)); + + for (i = 0; i < candidate_abspaths->nelts; i++) + { + const char *candidate_abspath; + const char *repos_root_url; + const char *repos_uuid; + const char *candidate_repos_relpath; + svn_revnum_t candidate_revision; + + svn_pool_clear(iterpool); + + candidate_abspath = APR_ARRAY_IDX(candidate_abspaths, i, + const char *); + SVN_ERR(svn_wc__node_get_origin(NULL, &candidate_revision, + &candidate_repos_relpath, + &repos_root_url, + &repos_uuid, + NULL, NULL, + ctx->wc_ctx, + candidate_abspath, + FALSE, + iterpool, iterpool)); + + if (candidate_revision == SVN_INVALID_REVNUM) + continue; + + /* If the conflict victim and the move target candidate + * are not from the same revision we must ensure that + * they are related. */ + if (candidate_revision != victim_revision) + { + svn_client__pathrev_t *yca_loc; + svn_error_t *err; + + err = find_yca(&yca_loc, victim_repos_relpath, + victim_revision, + candidate_repos_relpath, + candidate_revision, + repos_root_url, repos_uuid, + NULL, ctx, iterpool, iterpool); + if (err) + { + if (err->apr_err == SVN_ERR_FS_NOT_FOUND) + { + svn_error_clear(err); + yca_loc = NULL; + } + else + return svn_error_trace(err); + } + + if (yca_loc == NULL) + continue; + } + + APR_ARRAY_PUSH(moved_to_abspaths, const char *) = + apr_pstrdup(result_pool, candidate_abspath); + } + svn_pool_destroy(iterpool); + + svn_hash_sets(wc_move_targets, move->moved_to_repos_relpath, + moved_to_abspaths); + } + + if (move->next) + { + int i; + apr_pool_t *iterpool; + + /* Recurse into each of the possible move chains. */ + iterpool = svn_pool_create(scratch_pool); + for (i = 0; i < move->next->nelts; i++) + { + struct repos_move_info *next_move; + + svn_pool_clear(iterpool); + + next_move = APR_ARRAY_IDX(move->next, i, struct repos_move_info *); + SVN_ERR(follow_move_chains(wc_move_targets, next_move, + ctx, victim_abspath, victim_node_kind, + victim_repos_relpath, victim_revision, + result_pool, iterpool)); + + } + svn_pool_destroy(iterpool); + } + + return SVN_NO_ERROR; +} + /* Implements tree_conflict_get_details_func_t. */ static svn_error_t * conflict_tree_get_details_local_missing(svn_client_conflict_t *conflict, @@ -2603,12 +2795,15 @@ conflict_tree_get_details_local_missing(svn_client_conflict_t *conflict, svn_revnum_t old_rev; svn_revnum_t new_rev; svn_revnum_t deleted_rev; + svn_node_kind_t old_kind; + svn_node_kind_t new_kind; const char *deleted_rev_author; svn_node_kind_t replacing_node_kind; const char *deleted_basename; struct conflict_tree_local_missing_details *details; apr_array_header_t *moves = NULL; apr_array_header_t *sibling_moves = NULL; + apr_array_header_t *wc_siblings = NULL; const char *related_repos_relpath; svn_revnum_t related_peg_rev; const char *repos_root_url; @@ -2619,10 +2814,10 @@ conflict_tree_get_details_local_missing(svn_client_conflict_t *conflict, svn_revnum_t end_rev; SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( - &old_repos_relpath, &old_rev, NULL, conflict, + &old_repos_relpath, &old_rev, &old_kind, conflict, scratch_pool, scratch_pool)); SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( - &new_repos_relpath, &new_rev, NULL, conflict, + &new_repos_relpath, &new_rev, &new_kind, conflict, scratch_pool, scratch_pool)); /* Scan the conflict victim's parent's log to find a revision which @@ -2638,6 +2833,11 @@ conflict_tree_get_details_local_missing(svn_client_conflict_t *conflict, scratch_pool, scratch_pool)); + /* If the parent is not part of the repository-side tree checked out + * into this working copy, then bail. We do not support this case yet. */ + if (parent_peg_rev == SVN_INVALID_REVNUM) + return SVN_NO_ERROR; + /* Pick the younger incoming node as our 'related node' which helps * pin-pointing the deleted conflict victim in history. */ related_repos_relpath = @@ -2693,6 +2893,9 @@ conflict_tree_get_details_local_missing(svn_client_conflict_t *conflict, { const char *victim_abspath; svn_node_kind_t related_node_kind; + apr_array_header_t *candidates; + int i; + apr_pool_t *iterpool; /* ### The following describes all moves in terms of forward-merges, * should do we something else for reverse-merges? */ @@ -2726,7 +2929,81 @@ conflict_tree_get_details_local_missing(svn_client_conflict_t *conflict, if (sibling_moves == NULL) return SVN_NO_ERROR; - /* ## TODO: Find the missing node in the WC. */ + /* Find the missing node in the WC. In theory, this requires tracing + * back history of every node in the WC to check for a YCA with the + * conflict victim. This operation would obviously be quite expensive. + * + * However, assuming that the victim was not moved in the merge target, + * we can take a short-cut: The basename of the node cannot have changed, + * so we can limit history tracing to nodes with a matching basename. + * + * This approach solves the conflict case where an edit to a file which + * was moved on one branch is cherry-picked to another branch where the + * corresponding file has not been moved (yet). It does not solve move + * vs. move conflicts, but such conflicts are not yet supported by the + * resolver anyway and are hard to solve without server-side support. */ + iterpool = svn_pool_create(scratch_pool); + for (i = 0; i < sibling_moves->nelts; i++) + { + struct repos_move_info *move; + int j; + + svn_pool_clear(iterpool); + + move = APR_ARRAY_IDX(sibling_moves, i, struct repos_move_info *); + candidates = apr_array_make(iterpool, 1, sizeof(const char *)); + SVN_ERR(collect_sibling_move_candidates(candidates, victim_abspath, + old_rev < new_rev + ? new_kind : old_kind, + move, ctx, iterpool, + iterpool)); + + /* Determine whether a candidate node shares a YCA with the victim. */ + for (j = 0; j < candidates->nelts; j++) + { + const char *candidate_abspath; + const char *candidate_repos_relpath; + svn_revnum_t candidate_revision; + svn_error_t *err; + + candidate_abspath = APR_ARRAY_IDX(candidates, j, const char *); + SVN_ERR(svn_wc__node_get_origin(NULL, &candidate_revision, + &candidate_repos_relpath, + NULL, NULL, NULL, NULL, + ctx->wc_ctx, + candidate_abspath, + FALSE, + iterpool, iterpool)); + err = find_yca(&yca_loc, + old_rev < new_rev + ? new_repos_relpath : old_repos_relpath, + old_rev < new_rev ? new_rev : old_rev, + candidate_repos_relpath, + candidate_revision, + repos_root_url, repos_uuid, + NULL, ctx, iterpool, iterpool); + if (err) + { + if (err->apr_err == SVN_ERR_FS_NOT_FOUND) + { + svn_error_clear(err); + yca_loc = NULL; + } + else + return svn_error_trace(err); + } + + if (yca_loc) + { + if (wc_siblings == NULL) + wc_siblings = apr_array_make(conflict->pool, 1, + sizeof(const char *)); + APR_ARRAY_PUSH(wc_siblings, const char *) = + apr_pstrdup(conflict->pool, candidate_abspath); + } + } + } + svn_pool_destroy(iterpool); } details = apr_pcalloc(conflict->pool, sizeof(*details)); @@ -2737,8 +3014,83 @@ conflict_tree_get_details_local_missing(svn_client_conflict_t *conflict, deleted_basename, conflict->pool); details->moves = moves; - details->sibling_moves = sibling_moves; + if (details->moves != NULL) + { + apr_pool_t *iterpool; + int i; + + details->wc_move_targets = apr_hash_make(conflict->pool); + iterpool = svn_pool_create(scratch_pool); + for (i = 0; i < details->moves->nelts; i++) + { + struct repos_move_info *move; + + svn_pool_clear(iterpool); + move = APR_ARRAY_IDX(details->moves, i, struct repos_move_info *); + SVN_ERR(follow_move_chains(details->wc_move_targets, move, ctx, + conflict->local_abspath, + new_kind, + new_repos_relpath, + new_rev, + scratch_pool, iterpool)); + } + svn_pool_destroy(iterpool); + + if (apr_hash_count(details->wc_move_targets) > 0) + { + apr_array_header_t *move_target_repos_relpaths; + const svn_sort__item_t *item; + + /* Initialize to the first possible move target. Hopefully, + * in most cases there will only be one candidate anyway. */ + move_target_repos_relpaths = svn_sort__hash( + details->wc_move_targets, + svn_sort_compare_items_as_paths, + scratch_pool); + item = &APR_ARRAY_IDX(move_target_repos_relpaths, + 0, svn_sort__item_t); + details->move_target_repos_relpath = item->key; + details->wc_move_target_idx = 0; + } + else + { + details->move_target_repos_relpath = NULL; + details->wc_move_target_idx = 0; + } + } + details->sibling_moves = sibling_moves; + details->wc_siblings = wc_siblings; + if (details->wc_move_targets && apr_hash_count(details->wc_move_targets) == 1) + { + apr_array_header_t *wc_abspaths; + + wc_abspaths = svn_hash_gets(details->wc_move_targets, + details->move_target_repos_relpath); + if (wc_abspaths->nelts == 1) + { + svn_node_kind_t kind = old_rev < new_rev ? new_kind : old_kind; + + if (kind == svn_node_file) + conflict->recommended_option_id = + svn_client_conflict_option_local_move_file_text_merge; + else if (kind == svn_node_dir) + conflict->recommended_option_id = + svn_client_conflict_option_local_move_dir_merge; + } + } + else if (details->wc_siblings && details->wc_siblings->nelts == 1) + { + svn_node_kind_t kind = old_rev < new_rev ? new_kind : old_kind; + + if (kind == svn_node_file) + conflict->recommended_option_id = + svn_client_conflict_option_sibling_move_file_text_merge; + else if (kind == svn_node_dir) + conflict->recommended_option_id = + svn_client_conflict_option_sibling_move_dir_merge; + } + conflict->tree_conflict_local_details = details; return SVN_NO_ERROR; @@ -4647,181 +4999,49 @@ get_incoming_delete_details_for_reverse_addition( return SVN_NO_ERROR; } -/* Follow each move chain starting a MOVE all the way to the end to find - * the possible working copy locations for VICTIM_ABSPATH which corresponds - * to VICTIM_REPOS_REPLATH@VICTIM_REVISION. - * Add each such location to the WC_MOVE_TARGETS hash table, keyed on the - * repos_relpath which is the corresponding move destination in the repository. - * This function is recursive. */ static svn_error_t * -follow_move_chains(apr_hash_t *wc_move_targets, - struct repos_move_info *move, - svn_client_ctx_t *ctx, - const char *victim_abspath, - svn_node_kind_t victim_node_kind, - const char *victim_repos_relpath, - svn_revnum_t victim_revision, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) +init_wc_move_targets(struct conflict_tree_incoming_delete_details *details, + svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) { - /* If this is the end of a move chain, look for matching paths in - * the working copy and add them to our collection if found. */ - if (move->next == NULL) - { - apr_array_header_t *candidate_abspaths; + int i; + const char *victim_abspath; + svn_node_kind_t victim_node_kind; + const char *incoming_new_repos_relpath; + svn_revnum_t incoming_new_pegrev; - /* Gather candidate nodes which represent this moved_to_repos_relpath. */ - SVN_ERR(svn_wc__guess_incoming_move_target_nodes( - &candidate_abspaths, ctx->wc_ctx, - victim_abspath, victim_node_kind, - move->moved_to_repos_relpath, - scratch_pool, scratch_pool)); - if (candidate_abspaths->nelts > 0) - { - apr_array_header_t *moved_to_abspaths; - int i; - apr_pool_t *iterpool = svn_pool_create(scratch_pool); + victim_abspath = svn_client_conflict_get_local_abspath(conflict); + victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); + /* ### Should we get the old location in case of reverse-merges? */ + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( + &incoming_new_repos_relpath, &incoming_new_pegrev, + NULL, conflict, + scratch_pool, scratch_pool)); + details->wc_move_targets = apr_hash_make(conflict->pool); + for (i = 0; i < details->moves->nelts; i++) + { + struct repos_move_info *move; - moved_to_abspaths = apr_array_make(result_pool, 1, - sizeof (const char *)); + move = APR_ARRAY_IDX(details->moves, i, struct repos_move_info *); + SVN_ERR(follow_move_chains(details->wc_move_targets, move, + ctx, victim_abspath, + victim_node_kind, + incoming_new_repos_relpath, + incoming_new_pegrev, + conflict->pool, scratch_pool)); + } - for (i = 0; i < candidate_abspaths->nelts; i++) - { - const char *candidate_abspath; - const char *repos_root_url; - const char *repos_uuid; - const char *candidate_repos_relpath; - svn_revnum_t candidate_revision; + /* Initialize to the first possible move target. Hopefully, + * in most cases there will only be one candidate anyway. */ + details->move_target_repos_relpath = + get_moved_to_repos_relpath(details, scratch_pool); + details->wc_move_target_idx = 0; - svn_pool_clear(iterpool); - - candidate_abspath = APR_ARRAY_IDX(candidate_abspaths, i, - const char *); - SVN_ERR(svn_wc__node_get_origin(NULL, &candidate_revision, - &candidate_repos_relpath, - &repos_root_url, - &repos_uuid, - NULL, NULL, - ctx->wc_ctx, - candidate_abspath, - FALSE, - iterpool, iterpool)); - - if (candidate_revision == SVN_INVALID_REVNUM) - continue; - - /* If the conflict victim and the move target candidate - * are not from the same revision we must ensure that - * they are related. */ - if (candidate_revision != victim_revision) - { - svn_client__pathrev_t *yca_loc; - svn_error_t *err; - - err = find_yca(&yca_loc, victim_repos_relpath, - victim_revision, - candidate_repos_relpath, - candidate_revision, - repos_root_url, repos_uuid, - NULL, ctx, iterpool, iterpool); - if (err) - { - if (err->apr_err == SVN_ERR_FS_NOT_FOUND) - { - svn_error_clear(err); - yca_loc = NULL; - } - else - return svn_error_trace(err); - } - - if (yca_loc == NULL) - continue; - } - - APR_ARRAY_PUSH(moved_to_abspaths, const char *) = - apr_pstrdup(result_pool, candidate_abspath); - } - svn_pool_destroy(iterpool); - - svn_hash_sets(wc_move_targets, move->moved_to_repos_relpath, - moved_to_abspaths); - } - } - else - { - int i; - apr_pool_t *iterpool; - - /* Recurse into each of the possible move chains. */ - iterpool = svn_pool_create(scratch_pool); - for (i = 0; i < move->next->nelts; i++) - { - struct repos_move_info *next_move; - - svn_pool_clear(iterpool); - - next_move = APR_ARRAY_IDX(move->next, i, struct repos_move_info *); - SVN_ERR(follow_move_chains(wc_move_targets, next_move, - ctx, victim_abspath, victim_node_kind, - victim_repos_relpath, victim_revision, - result_pool, iterpool)); - - } - svn_pool_destroy(iterpool); - } - - return SVN_NO_ERROR; -} - -static svn_error_t * -init_wc_move_targets(struct conflict_tree_incoming_delete_details *details, - svn_client_conflict_t *conflict, - svn_client_ctx_t *ctx, - apr_pool_t *scratch_pool) -{ - int i; - const char *victim_abspath; - svn_node_kind_t victim_node_kind; - const char *incoming_new_repos_relpath; - svn_revnum_t incoming_new_pegrev; - svn_wc_operation_t operation; - - victim_abspath = svn_client_conflict_get_local_abspath(conflict); - victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); - operation = svn_client_conflict_get_operation(conflict); - /* ### Should we get the old location in case of reverse-merges? */ - SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( - &incoming_new_repos_relpath, &incoming_new_pegrev, - NULL, conflict, - scratch_pool, scratch_pool)); - details->wc_move_targets = apr_hash_make(conflict->pool); - for (i = 0; i < details->moves->nelts; i++) - { - struct repos_move_info *move; - - move = APR_ARRAY_IDX(details->moves, i, struct repos_move_info *); - SVN_ERR(follow_move_chains(details->wc_move_targets, move, - ctx, victim_abspath, - victim_node_kind, - incoming_new_repos_relpath, - incoming_new_pegrev, - conflict->pool, scratch_pool)); - } - - /* Initialize to the first possible move target. Hopefully, - * in most cases there will only be one candidate anyway. */ - details->move_target_repos_relpath = - get_moved_to_repos_relpath(details, scratch_pool); - details->wc_move_target_idx = 0; - - /* If only one move target exists after an update or switch, - * recommend a resolution option which follows the incoming move. */ - if (apr_hash_count(details->wc_move_targets) == 1 && - (operation == svn_wc_operation_update || - operation == svn_wc_operation_switch)) - { - apr_array_header_t *wc_abspaths; + /* If only one move target exists recommend a resolution option. */ + if (apr_hash_count(details->wc_move_targets) == 1) + { + apr_array_header_t *wc_abspaths; wc_abspaths = svn_hash_gets(details->wc_move_targets, details->move_target_repos_relpath); @@ -4832,7 +5052,10 @@ init_wc_move_targets(struct conflict_tree_incoming_delete_details *details, /* Only one of these will be present for any given conflict. */ svn_client_conflict_option_incoming_move_file_text_merge, svn_client_conflict_option_incoming_move_dir_merge, - svn_client_conflict_option_local_move_file_text_merge + svn_client_conflict_option_local_move_file_text_merge, + svn_client_conflict_option_local_move_dir_merge, + svn_client_conflict_option_sibling_move_file_text_merge, + svn_client_conflict_option_sibling_move_dir_merge, }; apr_array_header_t *options; @@ -4889,6 +5112,7 @@ conflict_tree_get_details_incoming_delete(svn_client_conflict_t *conflict, const char *parent_repos_relpath; svn_revnum_t parent_peg_rev; svn_revnum_t deleted_rev; + svn_revnum_t end_rev; const char *deleted_rev_author; svn_node_kind_t replacing_node_kind; apr_array_header_t *moves; @@ -4921,12 +5145,15 @@ conflict_tree_get_details_incoming_delete(svn_client_conflict_t *conflict, related_peg_rev = SVN_INVALID_REVNUM; } + end_rev = (new_kind == svn_node_none ? 0 : old_rev); + if (end_rev >= parent_peg_rev) + end_rev = (parent_peg_rev > 0 ? parent_peg_rev - 1 : 0); + SVN_ERR(find_revision_for_suspected_deletion( &deleted_rev, &deleted_rev_author, &replacing_node_kind, &moves, conflict, svn_dirent_basename(conflict->local_abspath, scratch_pool), - parent_repos_relpath, parent_peg_rev, - new_kind == svn_node_none ? 0 : old_rev, + parent_repos_relpath, parent_peg_rev, end_rev, related_repos_relpath, related_peg_rev, ctx, conflict->pool, scratch_pool)); if (deleted_rev == SVN_INVALID_REVNUM) @@ -5952,8 +6179,11 @@ describe_incoming_edit_list_modified_revs(apr_array_header_t *edits, { if (i == edits->nelts - (max_revs_to_display / 2)) s = apr_psprintf(result_pool, - _("%s\n [%d revisions omitted for " - "brevity],\n"), + Q_("%s\n [%d revision omitted for " + "brevity],\n", + "%s\n [%d revisions omitted for " + "brevity],\n", + num_revs_to_skip), s, num_revs_to_skip); s = apr_psprintf(result_pool, _("%s r%ld by %s%s"), s, @@ -6725,8 +6955,9 @@ resolve_merge_incoming_added_file_text_update( /* Revert the path in order to restore the repository's line of * history, which is part of the BASE tree. This revert operation * is why are being careful about not losing the temporary copy. */ - err = svn_wc_revert5(ctx->wc_ctx, local_abspath, svn_depth_empty, + err = svn_wc_revert6(ctx->wc_ctx, local_abspath, svn_depth_empty, FALSE, NULL, TRUE, FALSE, + TRUE /*added_keep_local*/, NULL, NULL, /* no cancellation */ ctx->notify_func2, ctx->notify_baton2, scratch_pool); @@ -7543,7 +7774,6 @@ merge_newly_added_dir(const char *added_repos_relpath, diff_processor = processor; if (reverse_merge) diff_processor = svn_diff__tree_processor_reverse_create(diff_processor, - NULL, scratch_pool); /* Filter the first path component using a filter processor, until we fixed @@ -7726,8 +7956,9 @@ resolve_update_incoming_added_dir_merge(svn_client_conflict_option_t *option, * files with files from the repository is impossible because there is * no known merge base. No unversioned data will be lost, and any * differences to files in the repository will show up in 'svn diff'. */ - err = svn_wc_revert5(ctx->wc_ctx, local_abspath, svn_depth_infinity, + err = svn_wc_revert6(ctx->wc_ctx, local_abspath, svn_depth_infinity, FALSE, NULL, TRUE, TRUE /* metadata_only */, + TRUE /*added_keep_local*/, NULL, NULL, /* no cancellation */ ctx->notify_func2, ctx->notify_baton2, scratch_pool); @@ -7754,35 +7985,6 @@ resolve_update_incoming_added_dir_merge(svn_client_conflict_option_t *option, return SVN_NO_ERROR; } -/* A baton for notification_adjust_func(). */ -struct notification_adjust_baton -{ - svn_wc_notify_func2_t inner_func; - void *inner_baton; - const char *checkout_abspath; - const char *final_abspath; -}; - -/* A svn_wc_notify_func2_t function that wraps BATON->inner_func (whose - * baton is BATON->inner_baton) and adjusts the notification paths that - * start with BATON->checkout_abspath to start instead with - * BATON->final_abspath. */ -static void -notification_adjust_func(void *baton, - const svn_wc_notify_t *notify, - apr_pool_t *pool) -{ - struct notification_adjust_baton *nb = baton; - svn_wc_notify_t *inner_notify = svn_wc_dup_notify(notify, pool); - const char *relpath; - - relpath = svn_dirent_skip_ancestor(nb->checkout_abspath, notify->path); - inner_notify->path = svn_dirent_join(nb->final_abspath, relpath, pool); - - if (nb->inner_func) - nb->inner_func(nb->inner_baton, inner_notify, pool); -} - /* Resolve a dir/dir "incoming add vs local obstruction" tree conflict by * replacing the local directory with the incoming directory. * If MERGE_DIRS is set, also merge the directories after replacing. */ @@ -7801,14 +8003,8 @@ merge_incoming_added_dir_replace(svn_client_conflict_option_t *option, svn_revnum_t incoming_new_pegrev; const char *local_abspath; const char *lock_abspath; - const char *tmpdir_abspath, *tmp_abspath; svn_error_t *err; - svn_revnum_t copy_src_revnum; - svn_opt_revision_t copy_src_peg_revision; svn_boolean_t timestamp_sleep; - svn_wc_notify_func2_t old_notify_func2 = ctx->notify_func2; - void *old_notify_baton2 = ctx->notify_baton2; - struct notification_adjust_baton nb; local_abspath = svn_client_conflict_get_local_abspath(conflict); @@ -7829,46 +8025,6 @@ merge_incoming_added_dir_replace(svn_client_conflict_option_t *option, if (corrected_url) url = corrected_url; - - /* Find a temporary location in which to check out the copy source. */ - SVN_ERR(svn_wc__get_tmpdir(&tmpdir_abspath, ctx->wc_ctx, local_abspath, - scratch_pool, scratch_pool)); - - SVN_ERR(svn_io_open_unique_file3(NULL, &tmp_abspath, tmpdir_abspath, - svn_io_file_del_on_close, - scratch_pool, scratch_pool)); - - /* Make a new checkout of the requested source. While doing so, - * resolve copy_src_revnum to an actual revision number in case it - * was until now 'invalid' meaning 'head'. Ask this function not to - * sleep for timestamps, by passing a sleep_needed output param. - * Send notifications for all nodes except the root node, and adjust - * them to refer to the destination rather than this temporary path. */ - - nb.inner_func = ctx->notify_func2; - nb.inner_baton = ctx->notify_baton2; - nb.checkout_abspath = tmp_abspath; - nb.final_abspath = local_abspath; - ctx->notify_func2 = notification_adjust_func; - ctx->notify_baton2 = &nb; - - copy_src_peg_revision.kind = svn_opt_revision_number; - copy_src_peg_revision.value.number = incoming_new_pegrev; - - err = svn_client__checkout_internal(©_src_revnum, ×tamp_sleep, - url, tmp_abspath, - ©_src_peg_revision, - ©_src_peg_revision, - svn_depth_infinity, - TRUE, /* we want to ignore externals */ - FALSE, /* we don't allow obstructions */ - ra_session, ctx, scratch_pool); - - ctx->notify_func2 = old_notify_func2; - ctx->notify_baton2 = old_notify_baton2; - - SVN_ERR(err); - /* ### The following WC modifications should be atomic. */ SVN_ERR(svn_wc__acquire_write_lock_for_resolve(&lock_abspath, ctx->wc_ctx, @@ -7885,31 +8041,11 @@ merge_incoming_added_dir_replace(svn_client_conflict_option_t *option, if (err) goto unlock_wc; - /* Schedule dst_path for addition in parent, with copy history. - Don't send any notification here. - Then remove the temporary checkout's .svn dir in preparation for - moving the rest of it into the final destination. */ - err = svn_wc_copy3(ctx->wc_ctx, tmp_abspath, local_abspath, - TRUE /* metadata_only */, - NULL, NULL, /* don't allow user to cancel here */ - NULL, NULL, scratch_pool); - if (err) - goto unlock_wc; - - err = svn_wc__acquire_write_lock(NULL, ctx->wc_ctx, tmp_abspath, - FALSE, scratch_pool, scratch_pool); - if (err) - goto unlock_wc; - err = svn_wc_remove_from_revision_control2(ctx->wc_ctx, - tmp_abspath, - FALSE, FALSE, - NULL, NULL, /* don't cancel */ - scratch_pool); - if (err) - goto unlock_wc; - - /* Move the temporary disk tree into place. */ - err = svn_io_file_rename2(tmp_abspath, local_abspath, FALSE, scratch_pool); + err = svn_client__repos_to_wc_copy_by_editor(×tamp_sleep, + svn_node_dir, + url, incoming_new_pegrev, + local_abspath, + ra_session, ctx, scratch_pool); if (err) goto unlock_wc; @@ -8346,7 +8482,9 @@ resolve_incoming_move_file_text_merge(svn_client_conflict_option_t *option, apr_pool_t *scratch_pool) { svn_client_conflict_option_id_t option_id; - const char *local_abspath; + const char *victim_abspath; + const char *merge_source_abspath; + svn_wc_conflict_reason_t local_change; svn_wc_operation_t operation; const char *lock_abspath; svn_error_t *err; @@ -8372,7 +8510,8 @@ resolve_incoming_move_file_text_merge(svn_client_conflict_option_t *option, const char *moved_to_abspath; const char *incoming_abspath = NULL; - local_abspath = svn_client_conflict_get_local_abspath(conflict); + victim_abspath = svn_client_conflict_get_local_abspath(conflict); + local_change = svn_client_conflict_get_local_change(conflict); operation = svn_client_conflict_get_operation(conflict); details = conflict->tree_conflict_incoming_details; if (details == NULL || details->moves == NULL) @@ -8380,20 +8519,20 @@ resolve_incoming_move_file_text_merge(svn_client_conflict_option_t *option, _("The specified conflict resolution option " "requires details for tree conflict at '%s' " "to be fetched from the repository first."), - svn_dirent_local_style(local_abspath, + svn_dirent_local_style(victim_abspath, scratch_pool)); if (operation == svn_wc_operation_none) return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL, _("Invalid operation code '%d' recorded for " "conflict at '%s'"), operation, - svn_dirent_local_style(local_abspath, + svn_dirent_local_style(victim_abspath, scratch_pool)); option_id = svn_client_conflict_option_get_id(option); SVN_ERR_ASSERT(option_id == svn_client_conflict_option_incoming_move_file_text_merge || option_id == - svn_client_conflict_option_incoming_move_dir_merge); + svn_client_conflict_option_both_moved_file_move_merge); SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL, conflict, scratch_pool, @@ -8408,7 +8547,7 @@ resolve_incoming_move_file_text_merge(svn_client_conflict_option_t *option, scratch_pool)); /* Set up temporary storage for the common ancestor version of the file. */ - SVN_ERR(svn_wc__get_tmpdir(&wc_tmpdir, ctx->wc_ctx, local_abspath, + SVN_ERR(svn_wc__get_tmpdir(&wc_tmpdir, ctx->wc_ctx, victim_abspath, scratch_pool, scratch_pool)); SVN_ERR(svn_stream_open_unique(&ancestor_stream, &ancestor_abspath, wc_tmpdir, @@ -8438,21 +8577,41 @@ resolve_incoming_move_file_text_merge(svn_client_conflict_option_t *option, details->wc_move_target_idx, const char *); + if (local_change == svn_wc_conflict_reason_missing) + { + /* This is an incoming move vs local move conflict. + * Merge from the local move's target location to the + * incoming move's target location. */ + struct conflict_tree_local_missing_details *local_details; + apr_array_header_t *moves; + + local_details = conflict->tree_conflict_local_details; + moves = svn_hash_gets(local_details->wc_move_targets, + local_details->move_target_repos_relpath); + merge_source_abspath = + APR_ARRAY_IDX(moves, local_details->wc_move_target_idx, const char *); + } + else + merge_source_abspath = victim_abspath; + /* ### The following WC modifications should be atomic. */ SVN_ERR(svn_wc__acquire_write_lock_for_resolve( &lock_abspath, ctx->wc_ctx, - svn_dirent_get_longest_ancestor(local_abspath, + svn_dirent_get_longest_ancestor(victim_abspath, moved_to_abspath, scratch_pool), scratch_pool, scratch_pool)); - err = verify_local_state_for_incoming_delete(conflict, option, ctx, - scratch_pool); - if (err) - goto unlock_wc; + if (local_change != svn_wc_conflict_reason_missing) + { + err = verify_local_state_for_incoming_delete(conflict, option, ctx, + scratch_pool); + if (err) + goto unlock_wc; + } /* Get a copy of the conflict victim's properties. */ - err = svn_wc_prop_list2(&victim_props, ctx->wc_ctx, local_abspath, + err = svn_wc_prop_list2(&victim_props, ctx->wc_ctx, merge_source_abspath, scratch_pool, scratch_pool); if (err) goto unlock_wc; @@ -8506,7 +8665,7 @@ resolve_incoming_move_file_text_merge(svn_client_conflict_option_t *option, * the conflict victim ('mine'), and the moved file ('theirs') which * was brought in by the update/switch operation and occupies the path * of the merge target. */ - err = svn_io_copy_file(local_abspath, moved_to_abspath, FALSE, + err = svn_io_copy_file(merge_source_abspath, moved_to_abspath, FALSE, scratch_pool); if (err) goto unlock_wc; @@ -8546,7 +8705,7 @@ resolve_incoming_move_file_text_merge(svn_client_conflict_option_t *option, err = svn_io_remove_file2(moved_to_abspath, FALSE, scratch_pool); if (err) goto unlock_wc; - err = svn_wc__move2(ctx->wc_ctx, local_abspath, moved_to_abspath, + err = svn_wc__move2(ctx->wc_ctx, merge_source_abspath, moved_to_abspath, FALSE, /* ordinary (not meta-data only) move */ FALSE, /* mixed-revisions don't apply to files */ NULL, NULL, /* don't allow user to cancel here */ @@ -8604,19 +8763,27 @@ resolve_incoming_move_file_text_merge(svn_client_conflict_option_t *option, operation == svn_wc_operation_switch) { /* Delete the tree conflict victim (clears the tree conflict marker). */ - err = svn_wc_delete4(ctx->wc_ctx, local_abspath, FALSE, FALSE, + err = svn_wc_delete4(ctx->wc_ctx, victim_abspath, FALSE, FALSE, NULL, NULL, /* don't allow user to cancel here */ NULL, NULL, /* no extra notification */ scratch_pool); if (err) goto unlock_wc; } + else if (local_change == svn_wc_conflict_reason_missing) + { + /* Clear tree conflict marker. */ + err = svn_wc__del_tree_conflict(ctx->wc_ctx, victim_abspath, + scratch_pool); + if (err) + goto unlock_wc; + } if (ctx->notify_func2) { svn_wc_notify_t *notify; - notify = svn_wc_create_notify(local_abspath, svn_wc_notify_resolved_tree, + notify = svn_wc_create_notify(victim_abspath, svn_wc_notify_resolved_tree, scratch_pool); ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); } @@ -8637,53 +8804,66 @@ unlock_wc: return SVN_NO_ERROR; } -/* Implements conflict_option_resolve_func_t. */ +/* Implements conflict_option_resolve_func_t. + * Resolve an incoming move vs local move conflict by merging from the + * incoming move's target location to the local move's target location, + * overriding the incoming move. */ static svn_error_t * -resolve_incoming_move_dir_merge(svn_client_conflict_option_t *option, - svn_client_conflict_t *conflict, - svn_client_ctx_t *ctx, - apr_pool_t *scratch_pool) +resolve_both_moved_file_text_merge(svn_client_conflict_option_t *option, + svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) { svn_client_conflict_option_id_t option_id; - const char *local_abspath; + const char *victim_abspath; + const char *local_moved_to_abspath; svn_wc_operation_t operation; const char *lock_abspath; svn_error_t *err; const char *repos_root_url; - const char *repos_uuid; const char *incoming_old_repos_relpath; svn_revnum_t incoming_old_pegrev; const char *incoming_new_repos_relpath; svn_revnum_t incoming_new_pegrev; - const char *victim_repos_relpath; - svn_revnum_t victim_peg_rev; - const char *moved_to_repos_relpath; - svn_revnum_t moved_to_peg_rev; - struct conflict_tree_incoming_delete_details *details; + const char *wc_tmpdir; + const char *ancestor_abspath; + svn_stream_t *ancestor_stream; + apr_hash_t *ancestor_props; + apr_hash_t *incoming_props; + apr_hash_t *local_props; + const char *ancestor_url; + const char *corrected_url; + svn_ra_session_t *ra_session; + svn_wc_merge_outcome_t merge_content_outcome; + svn_wc_notify_state_t merge_props_outcome; + apr_array_header_t *propdiffs; + struct conflict_tree_incoming_delete_details *incoming_details; apr_array_header_t *possible_moved_to_abspaths; - const char *moved_to_abspath; - const char *incoming_old_url; - svn_opt_revision_t incoming_old_opt_rev; - svn_client__conflict_report_t *conflict_report; - svn_boolean_t is_copy; - svn_boolean_t is_modified; + const char *incoming_moved_to_abspath; + struct conflict_tree_local_missing_details *local_details; + apr_array_header_t *local_moves; - local_abspath = svn_client_conflict_get_local_abspath(conflict); + victim_abspath = svn_client_conflict_get_local_abspath(conflict); operation = svn_client_conflict_get_operation(conflict); - details = conflict->tree_conflict_incoming_details; - if (details == NULL || details->moves == NULL) + incoming_details = conflict->tree_conflict_incoming_details; + if (incoming_details == NULL || incoming_details->moves == NULL) return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, _("The specified conflict resolution option " "requires details for tree conflict at '%s' " "to be fetched from the repository first."), - svn_dirent_local_style(local_abspath, + svn_dirent_local_style(victim_abspath, scratch_pool)); + if (operation == svn_wc_operation_none) + return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL, + _("Invalid operation code '%d' recorded for " + "conflict at '%s'"), operation, + svn_dirent_local_style(victim_abspath, + scratch_pool)); option_id = svn_client_conflict_option_get_id(option); - SVN_ERR_ASSERT(option_id == - svn_client_conflict_option_incoming_move_dir_merge); + SVN_ERR_ASSERT(option_id == svn_client_conflict_option_both_moved_file_merge); - SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, &repos_uuid, + SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL, conflict, scratch_pool, scratch_pool)); SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( @@ -8695,166 +8875,129 @@ resolve_incoming_move_dir_merge(svn_client_conflict_option_t *option, NULL, conflict, scratch_pool, scratch_pool)); - /* Get repository location of the moved-away node (the conflict victim). */ - if (operation == svn_wc_operation_update || - operation == svn_wc_operation_switch) - { - victim_repos_relpath = incoming_old_repos_relpath; - victim_peg_rev = incoming_old_pegrev; - } - else if (operation == svn_wc_operation_merge) - SVN_ERR(svn_wc__node_get_repos_info(&victim_peg_rev, &victim_repos_relpath, - NULL, NULL, ctx->wc_ctx, local_abspath, - scratch_pool, scratch_pool)); + /* Set up temporary storage for the common ancestor version of the file. */ + SVN_ERR(svn_wc__get_tmpdir(&wc_tmpdir, ctx->wc_ctx, victim_abspath, + scratch_pool, scratch_pool)); + SVN_ERR(svn_stream_open_unique(&ancestor_stream, + &ancestor_abspath, wc_tmpdir, + svn_io_file_del_on_pool_cleanup, + scratch_pool, scratch_pool)); + + /* Fetch the ancestor file's content. */ + ancestor_url = svn_path_url_add_component2(repos_root_url, + incoming_old_repos_relpath, + scratch_pool); + SVN_ERR(svn_client__open_ra_session_internal(&ra_session, &corrected_url, + ancestor_url, NULL, NULL, + FALSE, FALSE, ctx, + scratch_pool, scratch_pool)); + SVN_ERR(svn_ra_get_file(ra_session, "", incoming_old_pegrev, + ancestor_stream, NULL, /* fetched_rev */ + &ancestor_props, scratch_pool)); + filter_props(ancestor_props, scratch_pool); + + /* Close stream to flush ancestor file to disk. */ + SVN_ERR(svn_stream_close(ancestor_stream)); - /* Get repository location of the moved-here node (incoming move). */ possible_moved_to_abspaths = - svn_hash_gets(details->wc_move_targets, - get_moved_to_repos_relpath(details, scratch_pool)); - moved_to_abspath = APR_ARRAY_IDX(possible_moved_to_abspaths, - details->wc_move_target_idx, - const char *); + svn_hash_gets(incoming_details->wc_move_targets, + get_moved_to_repos_relpath(incoming_details, scratch_pool)); + incoming_moved_to_abspath = + APR_ARRAY_IDX(possible_moved_to_abspaths, + incoming_details->wc_move_target_idx, const char *); + + local_details = conflict->tree_conflict_local_details; + local_moves = svn_hash_gets(local_details->wc_move_targets, + local_details->move_target_repos_relpath); + local_moved_to_abspath = + APR_ARRAY_IDX(local_moves, local_details->wc_move_target_idx, const char *); /* ### The following WC modifications should be atomic. */ - SVN_ERR(svn_wc__acquire_write_lock_for_resolve( &lock_abspath, ctx->wc_ctx, - svn_dirent_get_longest_ancestor(local_abspath, - moved_to_abspath, + svn_dirent_get_longest_ancestor(victim_abspath, + local_moved_to_abspath, scratch_pool), scratch_pool, scratch_pool)); - err = svn_wc__node_get_origin(&is_copy, &moved_to_peg_rev, - &moved_to_repos_relpath, - NULL, NULL, NULL, NULL, - ctx->wc_ctx, moved_to_abspath, FALSE, - scratch_pool, scratch_pool); + /* Get a copy of the incoming moved item's properties. */ + err = svn_wc_prop_list2(&incoming_props, ctx->wc_ctx, + incoming_moved_to_abspath, + scratch_pool, scratch_pool); if (err) goto unlock_wc; - if (!is_copy && operation == svn_wc_operation_merge) - { - err = svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, - _("Cannot resolve tree conflict on '%s' " - "(expected a copied item at '%s', but the " - "item is not a copy)"), - svn_dirent_local_style(local_abspath, - scratch_pool), - svn_dirent_local_style(moved_to_abspath, - scratch_pool)); - goto unlock_wc; - } - - if (moved_to_repos_relpath == NULL || moved_to_peg_rev == SVN_INVALID_REVNUM) - { - err = svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, - _("Cannot resolve tree conflict on '%s' " - "(could not determine origin of '%s')"), - svn_dirent_local_style(local_abspath, - scratch_pool), - svn_dirent_local_style(moved_to_abspath, - scratch_pool)); - goto unlock_wc; - } - err = verify_local_state_for_incoming_delete(conflict, option, ctx, - scratch_pool); + /* Get a copy of the local move target's properties. */ + err = svn_wc_prop_list2(&local_props, ctx->wc_ctx, + local_moved_to_abspath, + scratch_pool, scratch_pool); if (err) goto unlock_wc; - if (operation == svn_wc_operation_merge) - { - const char *move_target_url; - svn_opt_revision_t incoming_new_opt_rev; - - /* Revert the incoming move target directory. */ - SVN_ERR(svn_wc_revert5(ctx->wc_ctx, moved_to_abspath, svn_depth_infinity, - FALSE, NULL, TRUE, FALSE, - NULL, NULL, /* no cancellation */ - ctx->notify_func2, ctx->notify_baton2, - scratch_pool)); + /* Create a property diff for the files. */ + err = svn_prop_diffs(&propdiffs, incoming_props, local_props, + scratch_pool); + if (err) + goto unlock_wc; - /* The move operation is not part of natural history. We must replicate - * this move in our history. Record a move in the working copy. */ - err = svn_wc__move2(ctx->wc_ctx, local_abspath, moved_to_abspath, - FALSE, /* this is not a meta-data only move */ - TRUE, /* allow mixed-revisions just in case */ - NULL, NULL, /* don't allow user to cancel here */ - ctx->notify_func2, ctx->notify_baton2, - scratch_pool); - if (err) - goto unlock_wc; + /* Perform the file merge. */ + err = svn_wc_merge5(&merge_content_outcome, &merge_props_outcome, + ctx->wc_ctx, ancestor_abspath, + incoming_moved_to_abspath, local_moved_to_abspath, + NULL, NULL, NULL, /* labels */ + NULL, NULL, /* conflict versions */ + FALSE, /* dry run */ + NULL, NULL, /* diff3_cmd, merge_options */ + apr_hash_count(ancestor_props) ? ancestor_props : NULL, + propdiffs, + NULL, NULL, /* conflict func/baton */ + NULL, NULL, /* don't allow user to cancel here */ + scratch_pool); + if (err) + goto unlock_wc; - /* Merge INCOMING_OLD_URL@MERGE_LEFT->MOVE_TARGET_URL@MERGE_RIGHT - * into move target. */ - incoming_old_url = apr_pstrcat(scratch_pool, repos_root_url, "/", - incoming_old_repos_relpath, SVN_VA_NULL); - incoming_old_opt_rev.kind = svn_opt_revision_number; - incoming_old_opt_rev.value.number = incoming_old_pegrev; - move_target_url = apr_pstrcat(scratch_pool, repos_root_url, "/", - get_moved_to_repos_relpath(details, - scratch_pool), - SVN_VA_NULL); - incoming_new_opt_rev.kind = svn_opt_revision_number; - incoming_new_opt_rev.value.number = incoming_new_pegrev; - err = svn_client__merge_locked(&conflict_report, - incoming_old_url, &incoming_old_opt_rev, - move_target_url, &incoming_new_opt_rev, - moved_to_abspath, svn_depth_infinity, - TRUE, TRUE, /* do a no-ancestry merge */ - FALSE, FALSE, FALSE, - TRUE, /* Allow mixed-rev just in case, - * since conflict victims can't be - * updated to straighten out - * mixed-rev trees. */ - NULL, ctx, scratch_pool, scratch_pool); - if (err) - goto unlock_wc; - } - else + if (ctx->notify_func2) { - SVN_ERR_ASSERT(operation == svn_wc_operation_update || - operation == svn_wc_operation_switch); + svn_wc_notify_t *notify; - /* Merge local modifications into the incoming move target dir. */ - err = svn_wc__has_local_mods(&is_modified, ctx->wc_ctx, local_abspath, - TRUE, ctx->cancel_func, ctx->cancel_baton, - scratch_pool); - if (err) - goto unlock_wc; + /* Tell the world about the file merge that just happened. */ + notify = svn_wc_create_notify(local_moved_to_abspath, + svn_wc_notify_update_update, + scratch_pool); + if (merge_content_outcome == svn_wc_merge_conflict) + notify->content_state = svn_wc_notify_state_conflicted; + else + notify->content_state = svn_wc_notify_state_merged; + notify->prop_state = merge_props_outcome; + notify->kind = svn_node_file; + ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); + } - if (is_modified) - { - err = svn_wc__conflict_tree_update_incoming_move(ctx->wc_ctx, - local_abspath, - moved_to_abspath, - ctx->cancel_func, - ctx->cancel_baton, - ctx->notify_func2, - ctx->notify_baton2, - scratch_pool); - if (err) - goto unlock_wc; - } + /* Revert local addition of the incoming move's target. */ + err = svn_wc_revert6(ctx->wc_ctx, incoming_moved_to_abspath, + svn_depth_infinity, FALSE, NULL, TRUE, FALSE, + FALSE /*added_keep_local*/, + NULL, NULL, /* no cancellation */ + ctx->notify_func2, ctx->notify_baton2, + scratch_pool); + if (err) + goto unlock_wc; - /* The move operation is part of our natural history. - * Delete the tree conflict victim (clears the tree conflict marker). */ - err = svn_wc_delete4(ctx->wc_ctx, local_abspath, FALSE, FALSE, - NULL, NULL, /* don't allow user to cancel here */ - NULL, NULL, /* no extra notification */ - scratch_pool); - if (err) - goto unlock_wc; - } + err = svn_wc__del_tree_conflict(ctx->wc_ctx, victim_abspath, scratch_pool); + if (err) + goto unlock_wc; if (ctx->notify_func2) { svn_wc_notify_t *notify; - notify = svn_wc_create_notify(local_abspath, svn_wc_notify_resolved_tree, + notify = svn_wc_create_notify(victim_abspath, svn_wc_notify_resolved_tree, scratch_pool); ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); } + svn_io_sleep_for_timestamps(local_moved_to_abspath, scratch_pool); + conflict->resolution_tree = option_id; unlock_wc: @@ -8866,13 +9009,19 @@ unlock_wc: return SVN_NO_ERROR; } -/* Implements conflict_option_resolve_func_t. */ +/* Implements conflict_option_resolve_func_t. + * Resolve an incoming move vs local move conflict by moving the locally moved + * directory to the incoming move target location, and then merging changes. */ static svn_error_t * -resolve_local_move_file_merge(svn_client_conflict_option_t *option, - svn_client_conflict_t *conflict, - svn_client_ctx_t *ctx, - apr_pool_t *scratch_pool) +resolve_both_moved_dir_merge(svn_client_conflict_option_t *option, + svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) { + svn_client_conflict_option_id_t option_id; + const char *victim_abspath; + const char *local_moved_to_abspath; + svn_wc_operation_t operation; const char *lock_abspath; svn_error_t *err; const char *repos_root_url; @@ -8880,23 +9029,39 @@ resolve_local_move_file_merge(svn_client_conflict_option_t *option, svn_revnum_t incoming_old_pegrev; const char *incoming_new_repos_relpath; svn_revnum_t incoming_new_pegrev; - const char *wc_tmpdir; - const char *ancestor_tmp_abspath; - const char *incoming_tmp_abspath; - apr_hash_t *ancestor_props; - apr_hash_t *incoming_props; - svn_stream_t *stream; - const char *url; - const char *corrected_url; - const char *old_session_url; - svn_ra_session_t *ra_session; - svn_wc_merge_outcome_t merge_content_outcome; - svn_wc_notify_state_t merge_props_outcome; - apr_array_header_t *propdiffs; - struct conflict_tree_local_missing_details *details; + const char *incoming_moved_repos_relpath; + struct conflict_tree_incoming_delete_details *incoming_details; + apr_array_header_t *possible_moved_to_abspaths; + const char *incoming_moved_to_abspath; + struct conflict_tree_local_missing_details *local_details; + apr_array_header_t *local_moves; + svn_client__conflict_report_t *conflict_report; + const char *incoming_old_url; + const char *incoming_moved_url; + svn_opt_revision_t incoming_old_opt_rev; + svn_opt_revision_t incoming_moved_opt_rev; - details = conflict->tree_conflict_local_details; + victim_abspath = svn_client_conflict_get_local_abspath(conflict); + operation = svn_client_conflict_get_operation(conflict); + incoming_details = conflict->tree_conflict_incoming_details; + if (incoming_details == NULL || incoming_details->moves == NULL) + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("The specified conflict resolution option " + "requires details for tree conflict at '%s' " + + "to be fetched from the repository first."), + svn_dirent_local_style(victim_abspath, + scratch_pool)); + if (operation == svn_wc_operation_none) + return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL, + _("Invalid operation code '%d' recorded for " + "conflict at '%s'"), operation, + svn_dirent_local_style(victim_abspath, + scratch_pool)); + option_id = svn_client_conflict_option_get_id(option); + SVN_ERR_ASSERT(option_id == svn_client_conflict_option_both_moved_dir_merge); + SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL, conflict, scratch_pool, scratch_pool)); @@ -8909,1006 +9074,2665 @@ resolve_local_move_file_merge(svn_client_conflict_option_t *option, NULL, conflict, scratch_pool, scratch_pool)); - SVN_ERR(svn_wc__get_tmpdir(&wc_tmpdir, ctx->wc_ctx, - details->moved_to_abspath, - scratch_pool, scratch_pool)); - - /* Fetch the common ancestor file's content. */ - SVN_ERR(svn_stream_open_unique(&stream, &ancestor_tmp_abspath, wc_tmpdir, - svn_io_file_del_on_pool_cleanup, - scratch_pool, scratch_pool)); - url = svn_path_url_add_component2(repos_root_url, - incoming_old_repos_relpath, - scratch_pool); - SVN_ERR(svn_client__open_ra_session_internal(&ra_session, &corrected_url, - url, NULL, NULL, - FALSE, FALSE, ctx, - scratch_pool, scratch_pool)); - SVN_ERR(svn_ra_get_file(ra_session, "", incoming_old_pegrev, stream, NULL, - &ancestor_props, scratch_pool)); - filter_props(ancestor_props, scratch_pool); - - /* Close stream to flush the file to disk. */ - SVN_ERR(svn_stream_close(stream)); - - /* Do the same for the incoming file's content. */ - SVN_ERR(svn_stream_open_unique(&stream, &incoming_tmp_abspath, wc_tmpdir, - svn_io_file_del_on_pool_cleanup, - scratch_pool, scratch_pool)); - url = svn_path_url_add_component2(repos_root_url, - incoming_new_repos_relpath, - scratch_pool); - SVN_ERR(svn_client__ensure_ra_session_url(&old_session_url, ra_session, - url, scratch_pool)); - SVN_ERR(svn_ra_get_file(ra_session, "", incoming_new_pegrev, stream, NULL, - &incoming_props, scratch_pool)); - /* Close stream to flush the file to disk. */ - SVN_ERR(svn_stream_close(stream)); - - filter_props(incoming_props, scratch_pool); - - /* Create a property diff for the files. */ - SVN_ERR(svn_prop_diffs(&propdiffs, incoming_props, ancestor_props, - scratch_pool)); + possible_moved_to_abspaths = + svn_hash_gets(incoming_details->wc_move_targets, + get_moved_to_repos_relpath(incoming_details, scratch_pool)); + incoming_moved_to_abspath = + APR_ARRAY_IDX(possible_moved_to_abspaths, + incoming_details->wc_move_target_idx, const char *); + + local_details = conflict->tree_conflict_local_details; + local_moves = svn_hash_gets(local_details->wc_move_targets, + local_details->move_target_repos_relpath); + local_moved_to_abspath = + APR_ARRAY_IDX(local_moves, local_details->wc_move_target_idx, const char *); /* ### The following WC modifications should be atomic. */ SVN_ERR(svn_wc__acquire_write_lock_for_resolve( &lock_abspath, ctx->wc_ctx, - svn_dirent_get_longest_ancestor(conflict->local_abspath, - details->moved_to_abspath, + svn_dirent_get_longest_ancestor(victim_abspath, + local_moved_to_abspath, scratch_pool), scratch_pool, scratch_pool)); - /* Perform the file merge. */ - err = svn_wc_merge5(&merge_content_outcome, &merge_props_outcome, - ctx->wc_ctx, - ancestor_tmp_abspath, incoming_tmp_abspath, - details->moved_to_abspath, - NULL, NULL, NULL, /* labels */ - NULL, NULL, /* conflict versions */ - FALSE, /* dry run */ - NULL, NULL, /* diff3_cmd, merge_options */ - apr_hash_count(ancestor_props) ? ancestor_props : NULL, - propdiffs, - NULL, NULL, /* conflict func/baton */ - NULL, NULL, /* don't allow user to cancel here */ - scratch_pool); - svn_io_sleep_for_timestamps(details->moved_to_abspath, scratch_pool); + /* Perform the merge. */ + incoming_old_url = apr_pstrcat(scratch_pool, repos_root_url, "/", + incoming_old_repos_relpath, SVN_VA_NULL); + incoming_old_opt_rev.kind = svn_opt_revision_number; + incoming_old_opt_rev.value.number = incoming_old_pegrev; + + incoming_moved_repos_relpath = + get_moved_to_repos_relpath(incoming_details, scratch_pool); + incoming_moved_url = apr_pstrcat(scratch_pool, repos_root_url, "/", + incoming_moved_repos_relpath, SVN_VA_NULL); + incoming_moved_opt_rev.kind = svn_opt_revision_number; + incoming_moved_opt_rev.value.number = incoming_new_pegrev; + err = svn_client__merge_locked(&conflict_report, + incoming_old_url, &incoming_old_opt_rev, + incoming_moved_url, &incoming_moved_opt_rev, + local_moved_to_abspath, svn_depth_infinity, + TRUE, TRUE, /* do a no-ancestry merge */ + FALSE, FALSE, FALSE, + TRUE, /* Allow mixed-rev just in case, + * since conflict victims can't be + * updated to straighten out + * mixed-rev trees. */ + NULL, ctx, scratch_pool, scratch_pool); if (err) - return svn_error_compose_create(err, - svn_wc__release_write_lock(ctx->wc_ctx, - lock_abspath, - scratch_pool)); + goto unlock_wc; - err = svn_wc__del_tree_conflict(ctx->wc_ctx, conflict->local_abspath, - scratch_pool); - err = svn_error_compose_create(err, - svn_wc__release_write_lock(ctx->wc_ctx, - lock_abspath, - scratch_pool)); + /* Revert local addition of the incoming move's target. */ + err = svn_wc_revert6(ctx->wc_ctx, incoming_moved_to_abspath, + svn_depth_infinity, FALSE, NULL, TRUE, FALSE, + FALSE /*added_keep_local*/, + NULL, NULL, /* no cancellation */ + ctx->notify_func2, ctx->notify_baton2, + scratch_pool); if (err) - return svn_error_trace(err); + goto unlock_wc; + + err = svn_wc__del_tree_conflict(ctx->wc_ctx, victim_abspath, scratch_pool); + if (err) + goto unlock_wc; if (ctx->notify_func2) { svn_wc_notify_t *notify; - /* Tell the world about the file merge that just happened. */ - notify = svn_wc_create_notify(details->moved_to_abspath, - svn_wc_notify_update_update, - scratch_pool); - if (merge_content_outcome == svn_wc_merge_conflict) - notify->content_state = svn_wc_notify_state_conflicted; - else - notify->content_state = svn_wc_notify_state_merged; - notify->prop_state = merge_props_outcome; - notify->kind = svn_node_file; - ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); - - /* And also about the successfully resolved tree conflict. */ - notify = svn_wc_create_notify(conflict->local_abspath, - svn_wc_notify_resolved_tree, + notify = svn_wc_create_notify(victim_abspath, svn_wc_notify_resolved_tree, scratch_pool); ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); } - conflict->resolution_tree = svn_client_conflict_option_get_id(option); - - return SVN_NO_ERROR; -} - -static svn_error_t * -assert_text_conflict(svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) -{ - svn_boolean_t text_conflicted; + svn_io_sleep_for_timestamps(local_moved_to_abspath, scratch_pool); - SVN_ERR(svn_client_conflict_get_conflicted(&text_conflicted, NULL, NULL, - conflict, scratch_pool, - scratch_pool)); + conflict->resolution_tree = option_id; - SVN_ERR_ASSERT(text_conflicted); /* ### return proper error? */ +unlock_wc: + err = svn_error_compose_create(err, svn_wc__release_write_lock(ctx->wc_ctx, + lock_abspath, + scratch_pool)); + SVN_ERR(err); return SVN_NO_ERROR; } +/* Implements conflict_option_resolve_func_t. + * Resolve an incoming move vs local move conflict by merging from the + * incoming move's target location to the local move's target location, + * overriding the incoming move. */ static svn_error_t * -assert_prop_conflict(svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) +resolve_both_moved_dir_move_merge(svn_client_conflict_option_t *option, + svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) { - apr_array_header_t *props_conflicted; - - SVN_ERR(svn_client_conflict_get_conflicted(NULL, &props_conflicted, NULL, - conflict, scratch_pool, - scratch_pool)); - - /* ### return proper error? */ - SVN_ERR_ASSERT(props_conflicted && props_conflicted->nelts > 0); + svn_client_conflict_option_id_t option_id; + const char *victim_abspath; + const char *local_moved_to_abspath; + svn_wc_operation_t operation; + const char *lock_abspath; + svn_error_t *err; + const char *repos_root_url; + const char *incoming_old_repos_relpath; + svn_revnum_t incoming_old_pegrev; + const char *incoming_new_repos_relpath; + svn_revnum_t incoming_new_pegrev; + struct conflict_tree_incoming_delete_details *incoming_details; + apr_array_header_t *possible_moved_to_abspaths; + const char *incoming_moved_to_abspath; + struct conflict_tree_local_missing_details *local_details; + apr_array_header_t *local_moves; + svn_client__conflict_report_t *conflict_report; + const char *incoming_old_url; + const char *incoming_moved_url; + svn_opt_revision_t incoming_old_opt_rev; + svn_opt_revision_t incoming_moved_opt_rev; - return SVN_NO_ERROR; -} + victim_abspath = svn_client_conflict_get_local_abspath(conflict); + operation = svn_client_conflict_get_operation(conflict); + incoming_details = conflict->tree_conflict_incoming_details; + if (incoming_details == NULL || incoming_details->moves == NULL) + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("The specified conflict resolution option " + "requires details for tree conflict at '%s' " -static svn_error_t * -assert_tree_conflict(svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) -{ - svn_boolean_t tree_conflicted; + "to be fetched from the repository first."), + svn_dirent_local_style(victim_abspath, + scratch_pool)); + if (operation == svn_wc_operation_none) + return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL, + _("Invalid operation code '%d' recorded for " + "conflict at '%s'"), operation, + svn_dirent_local_style(victim_abspath, + scratch_pool)); - SVN_ERR(svn_client_conflict_get_conflicted(NULL, NULL, &tree_conflicted, + option_id = svn_client_conflict_option_get_id(option); + SVN_ERR_ASSERT(option_id == + svn_client_conflict_option_both_moved_dir_move_merge); + + SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL, conflict, scratch_pool, scratch_pool)); + SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( + &incoming_old_repos_relpath, &incoming_old_pegrev, + NULL, conflict, scratch_pool, + scratch_pool)); + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( + &incoming_new_repos_relpath, &incoming_new_pegrev, + NULL, conflict, scratch_pool, + scratch_pool)); - SVN_ERR_ASSERT(tree_conflicted); /* ### return proper error? */ - - return SVN_NO_ERROR; -} - -/* Helper to add to conflict resolution option to array of OPTIONS. - * Resolution option object will be allocated from OPTIONS->POOL - * and DESCRIPTION will be copied to this pool. - * Returns pointer to the created conflict resolution option. */ -static svn_client_conflict_option_t * -add_resolution_option(apr_array_header_t *options, - svn_client_conflict_t *conflict, - svn_client_conflict_option_id_t id, - const char *label, - const char *description, - conflict_option_resolve_func_t resolve_func) -{ - svn_client_conflict_option_t *option; - - option = apr_pcalloc(options->pool, sizeof(*option)); - option->pool = options->pool; - option->id = id; - option->label = apr_pstrdup(option->pool, label); - option->description = apr_pstrdup(option->pool, description); - option->conflict = conflict; - option->do_resolve_func = resolve_func; - - APR_ARRAY_PUSH(options, const svn_client_conflict_option_t *) = option; - - return option; -} - -svn_error_t * -svn_client_conflict_text_get_resolution_options(apr_array_header_t **options, - svn_client_conflict_t *conflict, - svn_client_ctx_t *ctx, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) -{ - const char *mime_type; + possible_moved_to_abspaths = + svn_hash_gets(incoming_details->wc_move_targets, + get_moved_to_repos_relpath(incoming_details, scratch_pool)); + incoming_moved_to_abspath = + APR_ARRAY_IDX(possible_moved_to_abspaths, + incoming_details->wc_move_target_idx, const char *); + + local_details = conflict->tree_conflict_local_details; + local_moves = svn_hash_gets(local_details->wc_move_targets, + local_details->move_target_repos_relpath); + local_moved_to_abspath = + APR_ARRAY_IDX(local_moves, local_details->wc_move_target_idx, const char *); - SVN_ERR(assert_text_conflict(conflict, scratch_pool)); + /* ### The following WC modifications should be atomic. */ + SVN_ERR(svn_wc__acquire_write_lock_for_resolve( + &lock_abspath, ctx->wc_ctx, + svn_dirent_get_longest_ancestor(victim_abspath, + local_moved_to_abspath, + scratch_pool), + scratch_pool, scratch_pool)); - *options = apr_array_make(result_pool, 7, - sizeof(svn_client_conflict_option_t *)); + /* Revert the incoming move target directory. */ + err = svn_wc_revert6(ctx->wc_ctx, incoming_moved_to_abspath, + svn_depth_infinity, + FALSE, NULL, TRUE, FALSE, + TRUE /*added_keep_local*/, + NULL, NULL, /* no cancellation */ + ctx->notify_func2, ctx->notify_baton2, + scratch_pool); + if (err) + goto unlock_wc; - add_resolution_option(*options, conflict, - svn_client_conflict_option_postpone, - _("Postpone"), - _("skip this conflict and leave it unresolved"), - resolve_postpone); + /* The move operation is not part of natural history. We must replicate + * this move in our history. Record a move in the working copy. */ + err = svn_wc__move2(ctx->wc_ctx, local_moved_to_abspath, + incoming_moved_to_abspath, + FALSE, /* this is not a meta-data only move */ + TRUE, /* allow mixed-revisions just in case */ + NULL, NULL, /* don't allow user to cancel here */ + ctx->notify_func2, ctx->notify_baton2, + scratch_pool); + if (err) + goto unlock_wc; - mime_type = svn_client_conflict_text_get_mime_type(conflict); - if (mime_type && svn_mime_type_is_binary(mime_type)) - { - /* Resolver options for a binary file conflict. */ - add_resolution_option(*options, conflict, - svn_client_conflict_option_base_text, - _("Accept base"), - _("discard local and incoming changes for this binary file"), - resolve_text_conflict); + /* Merge INCOMING_OLD_URL@MERGE_LEFT->INCOMING_MOVED_URL@MERGE_RIGHT + * into the locally moved merge target. */ + incoming_old_url = apr_pstrcat(scratch_pool, repos_root_url, "/", + incoming_old_repos_relpath, SVN_VA_NULL); + incoming_old_opt_rev.kind = svn_opt_revision_number; + incoming_old_opt_rev.value.number = incoming_old_pegrev; + + incoming_moved_url = apr_pstrcat(scratch_pool, repos_root_url, "/", + incoming_details->move_target_repos_relpath, + SVN_VA_NULL); + incoming_moved_opt_rev.kind = svn_opt_revision_number; + incoming_moved_opt_rev.value.number = incoming_new_pegrev; + err = svn_client__merge_locked(&conflict_report, + incoming_old_url, &incoming_old_opt_rev, + incoming_moved_url, &incoming_moved_opt_rev, + incoming_moved_to_abspath, svn_depth_infinity, + TRUE, TRUE, /* do a no-ancestry merge */ + FALSE, FALSE, FALSE, + TRUE, /* Allow mixed-rev just in case, + * since conflict victims can't be + * updated to straighten out + * mixed-rev trees. */ + NULL, ctx, scratch_pool, scratch_pool); + if (err) + goto unlock_wc; - add_resolution_option(*options, conflict, - svn_client_conflict_option_incoming_text, - _("Accept incoming"), - _("accept incoming version of binary file"), - resolve_text_conflict); + err = svn_wc__del_tree_conflict(ctx->wc_ctx, victim_abspath, scratch_pool); + if (err) + goto unlock_wc; - add_resolution_option(*options, conflict, - svn_client_conflict_option_working_text, - _("Mark as resolved"), - _("accept binary file as it appears in the working copy"), - resolve_text_conflict); - } - else + if (ctx->notify_func2) { - /* Resolver options for a text file conflict. */ - add_resolution_option(*options, conflict, - svn_client_conflict_option_base_text, - _("Accept base"), - _("discard local and incoming changes for this file"), - resolve_text_conflict); - - add_resolution_option(*options, conflict, - svn_client_conflict_option_incoming_text, - _("Accept incoming"), - _("accept incoming version of entire file"), - resolve_text_conflict); + svn_wc_notify_t *notify; - add_resolution_option(*options, conflict, - svn_client_conflict_option_working_text, - _("Reject incoming"), - _("reject all incoming changes for this file"), - resolve_text_conflict); + notify = svn_wc_create_notify(victim_abspath, svn_wc_notify_resolved_tree, + scratch_pool); + ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); + } - add_resolution_option(*options, conflict, - svn_client_conflict_option_incoming_text_where_conflicted, - _("Accept incoming for conflicts"), - _("accept changes only where they conflict"), - resolve_text_conflict); + svn_io_sleep_for_timestamps(local_moved_to_abspath, scratch_pool); - add_resolution_option(*options, conflict, - svn_client_conflict_option_working_text_where_conflicted, - _("Reject conflicts"), - _("reject changes which conflict and accept the rest"), - resolve_text_conflict); + conflict->resolution_tree = option_id; - add_resolution_option(*options, conflict, - svn_client_conflict_option_merged_text, - _("Mark as resolved"), - _("accept the file as it appears in the working copy"), - resolve_text_conflict); - } +unlock_wc: + err = svn_error_compose_create(err, svn_wc__release_write_lock(ctx->wc_ctx, + lock_abspath, + scratch_pool)); + SVN_ERR(err); return SVN_NO_ERROR; } -svn_error_t * -svn_client_conflict_prop_get_resolution_options(apr_array_header_t **options, - svn_client_conflict_t *conflict, - svn_client_ctx_t *ctx, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) +/* Implements conflict_option_resolve_func_t. */ +static svn_error_t * +resolve_incoming_move_dir_merge(svn_client_conflict_option_t *option, + svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) { - SVN_ERR(assert_prop_conflict(conflict, scratch_pool)); - - *options = apr_array_make(result_pool, 7, - sizeof(svn_client_conflict_option_t *)); - - add_resolution_option(*options, conflict, - svn_client_conflict_option_postpone, - _("Postpone"), - _("skip this conflict and leave it unresolved"), - resolve_postpone); - - add_resolution_option(*options, conflict, - svn_client_conflict_option_base_text, + svn_client_conflict_option_id_t option_id; + const char *local_abspath; + svn_wc_operation_t operation; + const char *lock_abspath; + svn_error_t *err; + const char *repos_root_url; + const char *repos_uuid; + const char *incoming_old_repos_relpath; + svn_revnum_t incoming_old_pegrev; + const char *incoming_new_repos_relpath; + svn_revnum_t incoming_new_pegrev; + const char *victim_repos_relpath; + svn_revnum_t victim_peg_rev; + const char *moved_to_repos_relpath; + svn_revnum_t moved_to_peg_rev; + struct conflict_tree_incoming_delete_details *details; + apr_array_header_t *possible_moved_to_abspaths; + const char *moved_to_abspath; + const char *incoming_old_url; + svn_opt_revision_t incoming_old_opt_rev; + svn_client__conflict_report_t *conflict_report; + svn_boolean_t is_copy; + svn_boolean_t is_modified; + + local_abspath = svn_client_conflict_get_local_abspath(conflict); + operation = svn_client_conflict_get_operation(conflict); + details = conflict->tree_conflict_incoming_details; + if (details == NULL || details->moves == NULL) + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("The specified conflict resolution option " + "requires details for tree conflict at '%s' " + "to be fetched from the repository first."), + svn_dirent_local_style(local_abspath, + scratch_pool)); + + option_id = svn_client_conflict_option_get_id(option); + SVN_ERR_ASSERT(option_id == + svn_client_conflict_option_incoming_move_dir_merge); + + SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, &repos_uuid, + conflict, scratch_pool, + scratch_pool)); + SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( + &incoming_old_repos_relpath, &incoming_old_pegrev, + NULL, conflict, scratch_pool, + scratch_pool)); + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( + &incoming_new_repos_relpath, &incoming_new_pegrev, + NULL, conflict, scratch_pool, + scratch_pool)); + + /* Get repository location of the moved-away node (the conflict victim). */ + if (operation == svn_wc_operation_update || + operation == svn_wc_operation_switch) + { + victim_repos_relpath = incoming_old_repos_relpath; + victim_peg_rev = incoming_old_pegrev; + } + else if (operation == svn_wc_operation_merge) + SVN_ERR(svn_wc__node_get_repos_info(&victim_peg_rev, &victim_repos_relpath, + NULL, NULL, ctx->wc_ctx, local_abspath, + scratch_pool, scratch_pool)); + + /* Get repository location of the moved-here node (incoming move). */ + possible_moved_to_abspaths = + svn_hash_gets(details->wc_move_targets, + get_moved_to_repos_relpath(details, scratch_pool)); + moved_to_abspath = APR_ARRAY_IDX(possible_moved_to_abspaths, + details->wc_move_target_idx, + const char *); + + /* ### The following WC modifications should be atomic. */ + + SVN_ERR(svn_wc__acquire_write_lock_for_resolve( + &lock_abspath, ctx->wc_ctx, + svn_dirent_get_longest_ancestor(local_abspath, + moved_to_abspath, + scratch_pool), + scratch_pool, scratch_pool)); + + err = svn_wc__node_get_origin(&is_copy, &moved_to_peg_rev, + &moved_to_repos_relpath, + NULL, NULL, NULL, NULL, + ctx->wc_ctx, moved_to_abspath, FALSE, + scratch_pool, scratch_pool); + if (err) + goto unlock_wc; + if (!is_copy && operation == svn_wc_operation_merge) + { + err = svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("Cannot resolve tree conflict on '%s' " + "(expected a copied item at '%s', but the " + "item is not a copy)"), + svn_dirent_local_style(local_abspath, + scratch_pool), + svn_dirent_local_style(moved_to_abspath, + scratch_pool)); + goto unlock_wc; + } + + if (moved_to_repos_relpath == NULL || moved_to_peg_rev == SVN_INVALID_REVNUM) + { + err = svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("Cannot resolve tree conflict on '%s' " + "(could not determine origin of '%s')"), + svn_dirent_local_style(local_abspath, + scratch_pool), + svn_dirent_local_style(moved_to_abspath, + scratch_pool)); + goto unlock_wc; + } + + err = verify_local_state_for_incoming_delete(conflict, option, ctx, + scratch_pool); + if (err) + goto unlock_wc; + + if (operation == svn_wc_operation_merge) + { + const char *move_target_url; + svn_opt_revision_t incoming_new_opt_rev; + + /* Revert the incoming move target directory. */ + err = svn_wc_revert6(ctx->wc_ctx, moved_to_abspath, svn_depth_infinity, + FALSE, NULL, TRUE, FALSE, + TRUE /*added_keep_local*/, + NULL, NULL, /* no cancellation */ + ctx->notify_func2, ctx->notify_baton2, + scratch_pool); + if (err) + goto unlock_wc; + + /* The move operation is not part of natural history. We must replicate + * this move in our history. Record a move in the working copy. */ + err = svn_wc__move2(ctx->wc_ctx, local_abspath, moved_to_abspath, + FALSE, /* this is not a meta-data only move */ + TRUE, /* allow mixed-revisions just in case */ + NULL, NULL, /* don't allow user to cancel here */ + ctx->notify_func2, ctx->notify_baton2, + scratch_pool); + if (err) + goto unlock_wc; + + /* Merge INCOMING_OLD_URL@MERGE_LEFT->MOVE_TARGET_URL@MERGE_RIGHT + * into move target. */ + incoming_old_url = apr_pstrcat(scratch_pool, repos_root_url, "/", + incoming_old_repos_relpath, SVN_VA_NULL); + incoming_old_opt_rev.kind = svn_opt_revision_number; + incoming_old_opt_rev.value.number = incoming_old_pegrev; + move_target_url = apr_pstrcat(scratch_pool, repos_root_url, "/", + get_moved_to_repos_relpath(details, + scratch_pool), + SVN_VA_NULL); + incoming_new_opt_rev.kind = svn_opt_revision_number; + incoming_new_opt_rev.value.number = incoming_new_pegrev; + err = svn_client__merge_locked(&conflict_report, + incoming_old_url, &incoming_old_opt_rev, + move_target_url, &incoming_new_opt_rev, + moved_to_abspath, svn_depth_infinity, + TRUE, TRUE, /* do a no-ancestry merge */ + FALSE, FALSE, FALSE, + TRUE, /* Allow mixed-rev just in case, + * since conflict victims can't be + * updated to straighten out + * mixed-rev trees. */ + NULL, ctx, scratch_pool, scratch_pool); + if (err) + goto unlock_wc; + } + else + { + SVN_ERR_ASSERT(operation == svn_wc_operation_update || + operation == svn_wc_operation_switch); + + /* Merge local modifications into the incoming move target dir. */ + err = svn_wc__has_local_mods(&is_modified, ctx->wc_ctx, local_abspath, + TRUE, ctx->cancel_func, ctx->cancel_baton, + scratch_pool); + if (err) + goto unlock_wc; + + if (is_modified) + { + err = svn_wc__conflict_tree_update_incoming_move(ctx->wc_ctx, + local_abspath, + moved_to_abspath, + ctx->cancel_func, + ctx->cancel_baton, + ctx->notify_func2, + ctx->notify_baton2, + scratch_pool); + if (err) + goto unlock_wc; + } + + /* The move operation is part of our natural history. + * Delete the tree conflict victim (clears the tree conflict marker). */ + err = svn_wc_delete4(ctx->wc_ctx, local_abspath, FALSE, FALSE, + NULL, NULL, /* don't allow user to cancel here */ + NULL, NULL, /* no extra notification */ + scratch_pool); + if (err) + goto unlock_wc; + } + + if (ctx->notify_func2) + { + svn_wc_notify_t *notify; + + notify = svn_wc_create_notify(local_abspath, svn_wc_notify_resolved_tree, + scratch_pool); + ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); + } + + conflict->resolution_tree = option_id; + +unlock_wc: + err = svn_error_compose_create(err, svn_wc__release_write_lock(ctx->wc_ctx, + lock_abspath, + scratch_pool)); + SVN_ERR(err); + + return SVN_NO_ERROR; +} + +/* Implements conflict_option_resolve_func_t. + * Handles svn_client_conflict_option_local_move_file_text_merge + * and svn_client_conflict_option_sibling_move_file_text_merge. */ +static svn_error_t * +resolve_local_move_file_merge(svn_client_conflict_option_t *option, + svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + const char *lock_abspath; + svn_error_t *err; + const char *repos_root_url; + const char *incoming_old_repos_relpath; + svn_revnum_t incoming_old_pegrev; + const char *incoming_new_repos_relpath; + svn_revnum_t incoming_new_pegrev; + const char *wc_tmpdir; + const char *ancestor_tmp_abspath; + const char *incoming_tmp_abspath; + apr_hash_t *ancestor_props; + apr_hash_t *incoming_props; + svn_stream_t *stream; + const char *url; + const char *corrected_url; + const char *old_session_url; + svn_ra_session_t *ra_session; + svn_wc_merge_outcome_t merge_content_outcome; + svn_wc_notify_state_t merge_props_outcome; + apr_array_header_t *propdiffs; + struct conflict_tree_local_missing_details *details; + const char *merge_target_abspath; + const char *wcroot_abspath; + + SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, + conflict->local_abspath, scratch_pool, + scratch_pool)); + + details = conflict->tree_conflict_local_details; + + SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL, + conflict, scratch_pool, + scratch_pool)); + SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( + &incoming_old_repos_relpath, &incoming_old_pegrev, + NULL, conflict, scratch_pool, + scratch_pool)); + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( + &incoming_new_repos_relpath, &incoming_new_pegrev, + NULL, conflict, scratch_pool, + scratch_pool)); + + if (details->wc_siblings) + { + merge_target_abspath = APR_ARRAY_IDX(details->wc_siblings, + details->preferred_sibling_idx, + const char *); + } + else if (details->wc_move_targets && details->move_target_repos_relpath) + { + apr_array_header_t *moves; + moves = svn_hash_gets(details->wc_move_targets, + details->move_target_repos_relpath); + merge_target_abspath = APR_ARRAY_IDX(moves, details->wc_move_target_idx, + const char *); + } + else + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("Corresponding working copy node not found " + "for '%s'"), + svn_dirent_local_style( + svn_dirent_skip_ancestor( + wcroot_abspath, conflict->local_abspath), + scratch_pool)); + + SVN_ERR(svn_wc__get_tmpdir(&wc_tmpdir, ctx->wc_ctx, + merge_target_abspath, + scratch_pool, scratch_pool)); + + /* Fetch the common ancestor file's content. */ + SVN_ERR(svn_stream_open_unique(&stream, &ancestor_tmp_abspath, wc_tmpdir, + svn_io_file_del_on_pool_cleanup, + scratch_pool, scratch_pool)); + url = svn_path_url_add_component2(repos_root_url, + incoming_old_repos_relpath, + scratch_pool); + SVN_ERR(svn_client__open_ra_session_internal(&ra_session, &corrected_url, + url, NULL, NULL, + FALSE, FALSE, ctx, + scratch_pool, scratch_pool)); + SVN_ERR(svn_ra_get_file(ra_session, "", incoming_old_pegrev, stream, NULL, + &ancestor_props, scratch_pool)); + filter_props(ancestor_props, scratch_pool); + + /* Close stream to flush the file to disk. */ + SVN_ERR(svn_stream_close(stream)); + + /* Do the same for the incoming file's content. */ + SVN_ERR(svn_stream_open_unique(&stream, &incoming_tmp_abspath, wc_tmpdir, + svn_io_file_del_on_pool_cleanup, + scratch_pool, scratch_pool)); + url = svn_path_url_add_component2(repos_root_url, + incoming_new_repos_relpath, + scratch_pool); + SVN_ERR(svn_client__ensure_ra_session_url(&old_session_url, ra_session, + url, scratch_pool)); + SVN_ERR(svn_ra_get_file(ra_session, "", incoming_new_pegrev, stream, NULL, + &incoming_props, scratch_pool)); + /* Close stream to flush the file to disk. */ + SVN_ERR(svn_stream_close(stream)); + + filter_props(incoming_props, scratch_pool); + + /* Create a property diff for the files. */ + SVN_ERR(svn_prop_diffs(&propdiffs, incoming_props, ancestor_props, + scratch_pool)); + + /* ### The following WC modifications should be atomic. */ + SVN_ERR(svn_wc__acquire_write_lock_for_resolve( + &lock_abspath, ctx->wc_ctx, + svn_dirent_get_longest_ancestor(conflict->local_abspath, + merge_target_abspath, + scratch_pool), + scratch_pool, scratch_pool)); + + /* Perform the file merge. */ + err = svn_wc_merge5(&merge_content_outcome, &merge_props_outcome, + ctx->wc_ctx, + ancestor_tmp_abspath, incoming_tmp_abspath, + merge_target_abspath, + NULL, NULL, NULL, /* labels */ + NULL, NULL, /* conflict versions */ + FALSE, /* dry run */ + NULL, NULL, /* diff3_cmd, merge_options */ + apr_hash_count(ancestor_props) ? ancestor_props : NULL, + propdiffs, + NULL, NULL, /* conflict func/baton */ + NULL, NULL, /* don't allow user to cancel here */ + scratch_pool); + svn_io_sleep_for_timestamps(merge_target_abspath, scratch_pool); + if (err) + return svn_error_compose_create(err, + svn_wc__release_write_lock(ctx->wc_ctx, + lock_abspath, + scratch_pool)); + + err = svn_wc__del_tree_conflict(ctx->wc_ctx, conflict->local_abspath, + scratch_pool); + err = svn_error_compose_create(err, + svn_wc__release_write_lock(ctx->wc_ctx, + lock_abspath, + scratch_pool)); + if (err) + return svn_error_trace(err); + + if (ctx->notify_func2) + { + svn_wc_notify_t *notify; + + /* Tell the world about the file merge that just happened. */ + notify = svn_wc_create_notify(merge_target_abspath, + svn_wc_notify_update_update, + scratch_pool); + if (merge_content_outcome == svn_wc_merge_conflict) + notify->content_state = svn_wc_notify_state_conflicted; + else + notify->content_state = svn_wc_notify_state_merged; + notify->prop_state = merge_props_outcome; + notify->kind = svn_node_file; + ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); + + /* And also about the successfully resolved tree conflict. */ + notify = svn_wc_create_notify(conflict->local_abspath, + svn_wc_notify_resolved_tree, + scratch_pool); + ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); + } + + conflict->resolution_tree = svn_client_conflict_option_get_id(option); + + return SVN_NO_ERROR; +} + +/* Implements conflict_option_resolve_func_t. */ +static svn_error_t * +resolve_local_move_dir_merge(svn_client_conflict_option_t *option, + svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + const char *lock_abspath; + svn_error_t *err; + const char *repos_root_url; + const char *incoming_old_repos_relpath; + svn_revnum_t incoming_old_pegrev; + const char *incoming_new_repos_relpath; + svn_revnum_t incoming_new_pegrev; + struct conflict_tree_local_missing_details *details; + const char *merge_target_abspath; + const char *incoming_old_url; + const char *incoming_new_url; + svn_opt_revision_t incoming_old_opt_rev; + svn_opt_revision_t incoming_new_opt_rev; + svn_client__conflict_report_t *conflict_report; + + details = conflict->tree_conflict_local_details; + + SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL, + conflict, scratch_pool, + scratch_pool)); + SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( + &incoming_old_repos_relpath, &incoming_old_pegrev, + NULL, conflict, scratch_pool, + scratch_pool)); + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( + &incoming_new_repos_relpath, &incoming_new_pegrev, + NULL, conflict, scratch_pool, + scratch_pool)); + + if (details->wc_move_targets) + { + apr_array_header_t *moves; + + moves = svn_hash_gets(details->wc_move_targets, + details->move_target_repos_relpath); + merge_target_abspath = + APR_ARRAY_IDX(moves, details->wc_move_target_idx, const char *); + } + else + merge_target_abspath = APR_ARRAY_IDX(details->wc_siblings, + details->preferred_sibling_idx, + const char *); + + /* ### The following WC modifications should be atomic. */ + SVN_ERR(svn_wc__acquire_write_lock_for_resolve( + &lock_abspath, ctx->wc_ctx, + svn_dirent_get_longest_ancestor(conflict->local_abspath, + merge_target_abspath, + scratch_pool), + scratch_pool, scratch_pool)); + + /* Resolve to current working copy state. + * svn_client__merge_locked() requires this. */ + err = svn_wc__del_tree_conflict(ctx->wc_ctx, conflict->local_abspath, + scratch_pool); + if (err) + goto unlock_wc; + + /* Merge outstanding changes to the merge target. */ + incoming_old_url = apr_pstrcat(scratch_pool, repos_root_url, "/", + incoming_old_repos_relpath, SVN_VA_NULL); + incoming_old_opt_rev.kind = svn_opt_revision_number; + incoming_old_opt_rev.value.number = incoming_old_pegrev; + incoming_new_url = apr_pstrcat(scratch_pool, repos_root_url, "/", + incoming_new_repos_relpath, SVN_VA_NULL); + incoming_new_opt_rev.kind = svn_opt_revision_number; + incoming_new_opt_rev.value.number = incoming_new_pegrev; + err = svn_client__merge_locked(&conflict_report, + incoming_old_url, &incoming_old_opt_rev, + incoming_new_url, &incoming_new_opt_rev, + merge_target_abspath, svn_depth_infinity, + TRUE, TRUE, /* do a no-ancestry merge */ + FALSE, FALSE, FALSE, + TRUE, /* Allow mixed-rev just in case, + * since conflict victims can't be + * updated to straighten out + * mixed-rev trees. */ + NULL, ctx, scratch_pool, scratch_pool); +unlock_wc: + svn_io_sleep_for_timestamps(merge_target_abspath, scratch_pool); + err = svn_error_compose_create(err, + svn_wc__release_write_lock(ctx->wc_ctx, + lock_abspath, + scratch_pool)); + if (err) + return svn_error_trace(err); + + if (ctx->notify_func2) + { + svn_wc_notify_t *notify; + + /* Tell the world about the file merge that just happened. */ + notify = svn_wc_create_notify(merge_target_abspath, + svn_wc_notify_update_update, + scratch_pool); + if (conflict_report) + notify->content_state = svn_wc_notify_state_conflicted; + else + notify->content_state = svn_wc_notify_state_merged; + notify->kind = svn_node_dir; + ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); + + /* And also about the successfully resolved tree conflict. */ + notify = svn_wc_create_notify(conflict->local_abspath, + svn_wc_notify_resolved_tree, + scratch_pool); + ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); + } + + conflict->resolution_tree = svn_client_conflict_option_get_id(option); + + return SVN_NO_ERROR; +} + +static svn_error_t * +assert_text_conflict(svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) +{ + svn_boolean_t text_conflicted; + + SVN_ERR(svn_client_conflict_get_conflicted(&text_conflicted, NULL, NULL, + conflict, scratch_pool, + scratch_pool)); + + SVN_ERR_ASSERT(text_conflicted); /* ### return proper error? */ + + return SVN_NO_ERROR; +} + +static svn_error_t * +assert_prop_conflict(svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) +{ + apr_array_header_t *props_conflicted; + + SVN_ERR(svn_client_conflict_get_conflicted(NULL, &props_conflicted, NULL, + conflict, scratch_pool, + scratch_pool)); + + /* ### return proper error? */ + SVN_ERR_ASSERT(props_conflicted && props_conflicted->nelts > 0); + + return SVN_NO_ERROR; +} + +static svn_error_t * +assert_tree_conflict(svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) +{ + svn_boolean_t tree_conflicted; + + SVN_ERR(svn_client_conflict_get_conflicted(NULL, NULL, &tree_conflicted, + conflict, scratch_pool, + scratch_pool)); + + SVN_ERR_ASSERT(tree_conflicted); /* ### return proper error? */ + + return SVN_NO_ERROR; +} + +/* Helper to add to conflict resolution option to array of OPTIONS. + * Resolution option object will be allocated from OPTIONS->POOL + * and DESCRIPTION will be copied to this pool. + * Returns pointer to the created conflict resolution option. */ +static svn_client_conflict_option_t * +add_resolution_option(apr_array_header_t *options, + svn_client_conflict_t *conflict, + svn_client_conflict_option_id_t id, + const char *label, + const char *description, + conflict_option_resolve_func_t resolve_func) +{ + svn_client_conflict_option_t *option; + + option = apr_pcalloc(options->pool, sizeof(*option)); + option->pool = options->pool; + option->id = id; + option->label = apr_pstrdup(option->pool, label); + option->description = apr_pstrdup(option->pool, description); + option->conflict = conflict; + option->do_resolve_func = resolve_func; + + APR_ARRAY_PUSH(options, const svn_client_conflict_option_t *) = option; + + return option; +} + +svn_error_t * +svn_client_conflict_text_get_resolution_options(apr_array_header_t **options, + svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + const char *mime_type; + + SVN_ERR(assert_text_conflict(conflict, scratch_pool)); + + *options = apr_array_make(result_pool, 7, + sizeof(svn_client_conflict_option_t *)); + + add_resolution_option(*options, conflict, + svn_client_conflict_option_postpone, + _("Postpone"), + _("skip this conflict and leave it unresolved"), + resolve_postpone); + + mime_type = svn_client_conflict_text_get_mime_type(conflict); + if (mime_type && svn_mime_type_is_binary(mime_type)) + { + /* Resolver options for a binary file conflict. */ + add_resolution_option(*options, conflict, + svn_client_conflict_option_base_text, + _("Accept base"), + _("discard local and incoming changes for this binary file"), + resolve_text_conflict); + + add_resolution_option(*options, conflict, + svn_client_conflict_option_incoming_text, + _("Accept incoming"), + _("accept incoming version of binary file"), + resolve_text_conflict); + + add_resolution_option(*options, conflict, + svn_client_conflict_option_working_text, + _("Mark as resolved"), + _("accept binary file as it appears in the working copy"), + resolve_text_conflict); + } + else + { + /* Resolver options for a text file conflict. */ + add_resolution_option(*options, conflict, + svn_client_conflict_option_base_text, + _("Accept base"), + _("discard local and incoming changes for this file"), + resolve_text_conflict); + + add_resolution_option(*options, conflict, + svn_client_conflict_option_incoming_text, + _("Accept incoming"), + _("accept incoming version of entire file"), + resolve_text_conflict); + + add_resolution_option(*options, conflict, + svn_client_conflict_option_working_text, + _("Reject incoming"), + _("reject all incoming changes for this file"), + resolve_text_conflict); + + add_resolution_option(*options, conflict, + svn_client_conflict_option_incoming_text_where_conflicted, + _("Accept incoming for conflicts"), + _("accept incoming changes only where they conflict"), + resolve_text_conflict); + + add_resolution_option(*options, conflict, + svn_client_conflict_option_working_text_where_conflicted, + _("Reject conflicts"), + _("reject incoming changes which conflict and accept the rest"), + resolve_text_conflict); + + add_resolution_option(*options, conflict, + svn_client_conflict_option_merged_text, + _("Mark as resolved"), + _("accept the file as it appears in the working copy"), + resolve_text_conflict); + } + + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client_conflict_prop_get_resolution_options(apr_array_header_t **options, + svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + SVN_ERR(assert_prop_conflict(conflict, scratch_pool)); + + *options = apr_array_make(result_pool, 7, + sizeof(svn_client_conflict_option_t *)); + + add_resolution_option(*options, conflict, + svn_client_conflict_option_postpone, + _("Postpone"), + _("skip this conflict and leave it unresolved"), + resolve_postpone); + + add_resolution_option(*options, conflict, + svn_client_conflict_option_base_text, _("Accept base"), _("discard local and incoming changes for this property"), resolve_prop_conflict); - add_resolution_option(*options, conflict, - svn_client_conflict_option_incoming_text, - _("Accept incoming"), - _("accept incoming version of entire property value"), - resolve_prop_conflict); + add_resolution_option(*options, conflict, + svn_client_conflict_option_incoming_text, + _("Accept incoming"), + _("accept incoming version of entire property value"), + resolve_prop_conflict); + + add_resolution_option(*options, conflict, + svn_client_conflict_option_working_text, + _("Mark as resolved"), + _("accept working copy version of entire property value"), + resolve_prop_conflict); + + add_resolution_option(*options, conflict, + svn_client_conflict_option_incoming_text_where_conflicted, + _("Accept incoming for conflicts"), + _("accept incoming changes only where they conflict"), + resolve_prop_conflict); + + add_resolution_option(*options, conflict, + svn_client_conflict_option_working_text_where_conflicted, + _("Reject conflicts"), + _("reject changes which conflict and accept the rest"), + resolve_prop_conflict); + + add_resolution_option(*options, conflict, + svn_client_conflict_option_merged_text, + _("Accept merged"), + _("accept merged version of property value"), + resolve_prop_conflict); + + return SVN_NO_ERROR; +} + +/* Configure 'accept current wc state' resolution option for a tree conflict. */ +static svn_error_t * +configure_option_accept_current_wc_state(svn_client_conflict_t *conflict, + apr_array_header_t *options) +{ + svn_wc_operation_t operation; + svn_wc_conflict_action_t incoming_change; + svn_wc_conflict_reason_t local_change; + conflict_option_resolve_func_t do_resolve_func; + + operation = svn_client_conflict_get_operation(conflict); + incoming_change = svn_client_conflict_get_incoming_change(conflict); + local_change = svn_client_conflict_get_local_change(conflict); + + if ((operation == svn_wc_operation_update || + operation == svn_wc_operation_switch) && + (local_change == svn_wc_conflict_reason_moved_away || + local_change == svn_wc_conflict_reason_deleted || + local_change == svn_wc_conflict_reason_replaced) && + incoming_change == svn_wc_conflict_action_edit) + { + /* We must break moves if the user accepts the current working copy + * state instead of updating a moved-away node or updating children + * moved outside of deleted or replaced directory nodes. + * Else such moves would be left in an invalid state. */ + do_resolve_func = resolve_update_break_moved_away; + } + else + do_resolve_func = resolve_accept_current_wc_state; + + add_resolution_option(options, conflict, + svn_client_conflict_option_accept_current_wc_state, + _("Mark as resolved"), + _("accept current working copy state"), + do_resolve_func); + + return SVN_NO_ERROR; +} + +/* Configure 'update move destination' resolution option for a tree conflict. */ +static svn_error_t * +configure_option_update_move_destination(svn_client_conflict_t *conflict, + apr_array_header_t *options) +{ + svn_wc_operation_t operation; + svn_wc_conflict_action_t incoming_change; + svn_wc_conflict_reason_t local_change; + + operation = svn_client_conflict_get_operation(conflict); + incoming_change = svn_client_conflict_get_incoming_change(conflict); + local_change = svn_client_conflict_get_local_change(conflict); + + if ((operation == svn_wc_operation_update || + operation == svn_wc_operation_switch) && + incoming_change == svn_wc_conflict_action_edit && + local_change == svn_wc_conflict_reason_moved_away) + { + add_resolution_option( + options, conflict, + svn_client_conflict_option_update_move_destination, + _("Update move destination"), + _("apply incoming changes to move destination"), + resolve_update_moved_away_node); + } + + return SVN_NO_ERROR; +} + +/* Configure 'update raise moved away children' resolution option for a tree + * conflict. */ +static svn_error_t * +configure_option_update_raise_moved_away_children( + svn_client_conflict_t *conflict, + apr_array_header_t *options) +{ + svn_wc_operation_t operation; + svn_wc_conflict_action_t incoming_change; + svn_wc_conflict_reason_t local_change; + svn_node_kind_t victim_node_kind; + + operation = svn_client_conflict_get_operation(conflict); + incoming_change = svn_client_conflict_get_incoming_change(conflict); + local_change = svn_client_conflict_get_local_change(conflict); + victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); + + if ((operation == svn_wc_operation_update || + operation == svn_wc_operation_switch) && + incoming_change == svn_wc_conflict_action_edit && + (local_change == svn_wc_conflict_reason_deleted || + local_change == svn_wc_conflict_reason_replaced) && + victim_node_kind == svn_node_dir) + { + add_resolution_option( + options, conflict, + svn_client_conflict_option_update_any_moved_away_children, + _("Update any moved-away children"), + _("prepare for updating moved-away children, if any"), + resolve_update_raise_moved_away); + } + + return SVN_NO_ERROR; +} + +/* Configure 'incoming add ignore' resolution option for a tree conflict. */ +static svn_error_t * +configure_option_incoming_add_ignore(svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_array_header_t *options, + apr_pool_t *scratch_pool) +{ + svn_wc_operation_t operation; + svn_wc_conflict_action_t incoming_change; + svn_wc_conflict_reason_t local_change; + const char *incoming_new_repos_relpath; + svn_revnum_t incoming_new_pegrev; + svn_node_kind_t victim_node_kind; + + operation = svn_client_conflict_get_operation(conflict); + incoming_change = svn_client_conflict_get_incoming_change(conflict); + local_change = svn_client_conflict_get_local_change(conflict); + victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( + &incoming_new_repos_relpath, &incoming_new_pegrev, + NULL, conflict, scratch_pool, + scratch_pool)); + + /* This option is only available for directories. */ + if (victim_node_kind == svn_node_dir && + incoming_change == svn_wc_conflict_action_add && + (local_change == svn_wc_conflict_reason_obstructed || + local_change == svn_wc_conflict_reason_added)) + { + const char *description; + const char *wcroot_abspath; + + SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, + conflict->local_abspath, scratch_pool, + scratch_pool)); + if (operation == svn_wc_operation_merge) + description = + apr_psprintf(scratch_pool, + _("ignore and do not add '^/%s@%ld' here"), + incoming_new_repos_relpath, incoming_new_pegrev); + else if (operation == svn_wc_operation_update || + operation == svn_wc_operation_switch) + { + if (victim_node_kind == svn_node_file) + description = + apr_psprintf(scratch_pool, + _("replace '^/%s@%ld' with the locally added file"), + incoming_new_repos_relpath, incoming_new_pegrev); + else if (victim_node_kind == svn_node_dir) + description = + apr_psprintf(scratch_pool, + _("replace '^/%s@%ld' with the locally added " + "directory"), + incoming_new_repos_relpath, incoming_new_pegrev); + else + description = + apr_psprintf(scratch_pool, + _("replace '^/%s@%ld' with the locally added item"), + incoming_new_repos_relpath, incoming_new_pegrev); + } + else + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("unexpected operation code '%d'"), + operation); + add_resolution_option( + options, conflict, svn_client_conflict_option_incoming_add_ignore, + _("Ignore incoming addition"), description, resolve_incoming_add_ignore); + } + + return SVN_NO_ERROR; +} + +/* Configure 'incoming added file text merge' resolution option for a tree + * conflict. */ +static svn_error_t * +configure_option_incoming_added_file_text_merge(svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_array_header_t *options, + apr_pool_t *scratch_pool) +{ + svn_wc_operation_t operation; + svn_wc_conflict_action_t incoming_change; + svn_wc_conflict_reason_t local_change; + svn_node_kind_t victim_node_kind; + const char *incoming_new_repos_relpath; + svn_revnum_t incoming_new_pegrev; + svn_node_kind_t incoming_new_kind; + + operation = svn_client_conflict_get_operation(conflict); + incoming_change = svn_client_conflict_get_incoming_change(conflict); + local_change = svn_client_conflict_get_local_change(conflict); + victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( + &incoming_new_repos_relpath, &incoming_new_pegrev, + &incoming_new_kind, conflict, scratch_pool, + scratch_pool)); + + if (victim_node_kind == svn_node_file && + incoming_new_kind == svn_node_file && + incoming_change == svn_wc_conflict_action_add && + (local_change == svn_wc_conflict_reason_obstructed || + local_change == svn_wc_conflict_reason_unversioned || + local_change == svn_wc_conflict_reason_added)) + { + const char *description; + const char *wcroot_abspath; + + SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, + conflict->local_abspath, scratch_pool, + scratch_pool)); + + if (operation == svn_wc_operation_merge) + description = + apr_psprintf(scratch_pool, _("merge '^/%s@%ld' into '%s'"), + incoming_new_repos_relpath, incoming_new_pegrev, + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, + conflict->local_abspath), + scratch_pool)); + else + description = + apr_psprintf(scratch_pool, _("merge local '%s' and '^/%s@%ld'"), + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, + conflict->local_abspath), + scratch_pool), + incoming_new_repos_relpath, incoming_new_pegrev); + + add_resolution_option( + options, conflict, + svn_client_conflict_option_incoming_added_file_text_merge, + _("Merge the files"), description, + operation == svn_wc_operation_merge + ? resolve_merge_incoming_added_file_text_merge + : resolve_merge_incoming_added_file_text_update); + } + + return SVN_NO_ERROR; +} + +/* Configure 'incoming added file replace and merge' resolution option for a + * tree conflict. */ +static svn_error_t * +configure_option_incoming_added_file_replace_and_merge( + svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_array_header_t *options, + apr_pool_t *scratch_pool) +{ + svn_wc_operation_t operation; + svn_wc_conflict_action_t incoming_change; + svn_wc_conflict_reason_t local_change; + svn_node_kind_t victim_node_kind; + const char *incoming_new_repos_relpath; + svn_revnum_t incoming_new_pegrev; + svn_node_kind_t incoming_new_kind; + + operation = svn_client_conflict_get_operation(conflict); + incoming_change = svn_client_conflict_get_incoming_change(conflict); + local_change = svn_client_conflict_get_local_change(conflict); + victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( + &incoming_new_repos_relpath, &incoming_new_pegrev, + &incoming_new_kind, conflict, scratch_pool, + scratch_pool)); + + if (operation == svn_wc_operation_merge && + victim_node_kind == svn_node_file && + incoming_new_kind == svn_node_file && + incoming_change == svn_wc_conflict_action_add && + local_change == svn_wc_conflict_reason_obstructed) + { + const char *wcroot_abspath; + const char *description; + + SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, + conflict->local_abspath, scratch_pool, + scratch_pool)); + description = + apr_psprintf(scratch_pool, + _("delete '%s', copy '^/%s@%ld' here, and merge the files"), + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, + conflict->local_abspath), + scratch_pool), + incoming_new_repos_relpath, incoming_new_pegrev); + + add_resolution_option( + options, conflict, + svn_client_conflict_option_incoming_added_file_replace_and_merge, + _("Replace and merge"), + description, resolve_merge_incoming_added_file_replace_and_merge); + } + + return SVN_NO_ERROR; +} + +/* Configure 'incoming added dir merge' resolution option for a tree + * conflict. */ +static svn_error_t * +configure_option_incoming_added_dir_merge(svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_array_header_t *options, + apr_pool_t *scratch_pool) +{ + svn_wc_operation_t operation; + svn_wc_conflict_action_t incoming_change; + svn_wc_conflict_reason_t local_change; + svn_node_kind_t victim_node_kind; + const char *incoming_new_repos_relpath; + svn_revnum_t incoming_new_pegrev; + svn_node_kind_t incoming_new_kind; + + operation = svn_client_conflict_get_operation(conflict); + incoming_change = svn_client_conflict_get_incoming_change(conflict); + local_change = svn_client_conflict_get_local_change(conflict); + victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( + &incoming_new_repos_relpath, &incoming_new_pegrev, + &incoming_new_kind, conflict, scratch_pool, + scratch_pool)); + + if (victim_node_kind == svn_node_dir && + incoming_new_kind == svn_node_dir && + incoming_change == svn_wc_conflict_action_add && + (local_change == svn_wc_conflict_reason_added || + (operation == svn_wc_operation_merge && + local_change == svn_wc_conflict_reason_obstructed) || + (operation != svn_wc_operation_merge && + local_change == svn_wc_conflict_reason_unversioned))) + { + const char *description; + const char *wcroot_abspath; + + SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, + conflict->local_abspath, scratch_pool, + scratch_pool)); + if (operation == svn_wc_operation_merge) + { + if (conflict->tree_conflict_incoming_details == NULL) + return SVN_NO_ERROR; + + description = + apr_psprintf(scratch_pool, _("merge '^/%s@%ld' into '%s'"), + incoming_new_repos_relpath, incoming_new_pegrev, + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, + conflict->local_abspath), + scratch_pool)); + } + else + description = + apr_psprintf(scratch_pool, _("merge local '%s' and '^/%s@%ld'"), + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, + conflict->local_abspath), + scratch_pool), + incoming_new_repos_relpath, incoming_new_pegrev); + + add_resolution_option(options, conflict, + svn_client_conflict_option_incoming_added_dir_merge, + _("Merge the directories"), description, + operation == svn_wc_operation_merge + ? resolve_merge_incoming_added_dir_merge + : resolve_update_incoming_added_dir_merge); + } + + return SVN_NO_ERROR; +} + +/* Configure 'incoming added dir replace' resolution option for a tree + * conflict. */ +static svn_error_t * +configure_option_incoming_added_dir_replace(svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_array_header_t *options, + apr_pool_t *scratch_pool) +{ + svn_wc_operation_t operation; + svn_wc_conflict_action_t incoming_change; + svn_wc_conflict_reason_t local_change; + svn_node_kind_t victim_node_kind; + const char *incoming_new_repos_relpath; + svn_revnum_t incoming_new_pegrev; + svn_node_kind_t incoming_new_kind; + + operation = svn_client_conflict_get_operation(conflict); + incoming_change = svn_client_conflict_get_incoming_change(conflict); + local_change = svn_client_conflict_get_local_change(conflict); + victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( + &incoming_new_repos_relpath, &incoming_new_pegrev, + &incoming_new_kind, conflict, scratch_pool, + scratch_pool)); + + if (operation == svn_wc_operation_merge && + victim_node_kind == svn_node_dir && + incoming_new_kind == svn_node_dir && + incoming_change == svn_wc_conflict_action_add && + local_change == svn_wc_conflict_reason_obstructed) + { + const char *description; + const char *wcroot_abspath; + + SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, + conflict->local_abspath, scratch_pool, + scratch_pool)); + description = + apr_psprintf(scratch_pool, _("delete '%s' and copy '^/%s@%ld' here"), + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, + conflict->local_abspath), + scratch_pool), + incoming_new_repos_relpath, incoming_new_pegrev); + add_resolution_option( + options, conflict, + svn_client_conflict_option_incoming_added_dir_replace, + _("Delete my directory and replace it with incoming directory"), + description, resolve_merge_incoming_added_dir_replace); + } + + return SVN_NO_ERROR; +} + +/* Configure 'incoming added dir replace and merge' resolution option + * for a tree conflict. */ +static svn_error_t * +configure_option_incoming_added_dir_replace_and_merge( + svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_array_header_t *options, + apr_pool_t *scratch_pool) +{ + svn_wc_operation_t operation; + svn_wc_conflict_action_t incoming_change; + svn_wc_conflict_reason_t local_change; + svn_node_kind_t victim_node_kind; + const char *incoming_new_repos_relpath; + svn_revnum_t incoming_new_pegrev; + svn_node_kind_t incoming_new_kind; + + operation = svn_client_conflict_get_operation(conflict); + incoming_change = svn_client_conflict_get_incoming_change(conflict); + local_change = svn_client_conflict_get_local_change(conflict); + victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( + &incoming_new_repos_relpath, &incoming_new_pegrev, + &incoming_new_kind, conflict, scratch_pool, + scratch_pool)); + + if (operation == svn_wc_operation_merge && + victim_node_kind == svn_node_dir && + incoming_new_kind == svn_node_dir && + incoming_change == svn_wc_conflict_action_add && + local_change == svn_wc_conflict_reason_obstructed) + { + const char *description; + const char *wcroot_abspath; + + SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, + conflict->local_abspath, scratch_pool, + scratch_pool)); + description = + apr_psprintf(scratch_pool, + _("delete '%s', copy '^/%s@%ld' here, and merge the directories"), + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, + conflict->local_abspath), + scratch_pool), + incoming_new_repos_relpath, incoming_new_pegrev); + + add_resolution_option( + options, conflict, + svn_client_conflict_option_incoming_added_dir_replace_and_merge, + _("Replace and merge"), + description, resolve_merge_incoming_added_dir_replace_and_merge); + } + + return SVN_NO_ERROR; +} + +/* Configure 'incoming delete ignore' resolution option for a tree conflict. */ +static svn_error_t * +configure_option_incoming_delete_ignore(svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_array_header_t *options, + apr_pool_t *scratch_pool) +{ + svn_wc_operation_t operation; + svn_wc_conflict_action_t incoming_change; + svn_wc_conflict_reason_t local_change; + const char *incoming_new_repos_relpath; + svn_revnum_t incoming_new_pegrev; + + operation = svn_client_conflict_get_operation(conflict); + incoming_change = svn_client_conflict_get_incoming_change(conflict); + local_change = svn_client_conflict_get_local_change(conflict); + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( + &incoming_new_repos_relpath, &incoming_new_pegrev, + NULL, conflict, scratch_pool, + scratch_pool)); + + if (incoming_change == svn_wc_conflict_action_delete) + { + const char *description; + struct conflict_tree_incoming_delete_details *incoming_details; + svn_boolean_t is_incoming_move; + + incoming_details = conflict->tree_conflict_incoming_details; + is_incoming_move = (incoming_details != NULL && + incoming_details->moves != NULL); + if (local_change == svn_wc_conflict_reason_moved_away || + local_change == svn_wc_conflict_reason_edited) + { + /* An option which ignores the incoming deletion makes no sense + * if we know there was a local move and/or an incoming move. */ + if (is_incoming_move) + return SVN_NO_ERROR; + } + else if (local_change == svn_wc_conflict_reason_deleted) + { + /* If the local item was deleted and conflict details were fetched + * and indicate that there was no move, then this is an actual + * 'delete vs delete' situation. An option which ignores the incoming + * deletion makes no sense in that case because there is no local + * node to preserve. */ + if (!is_incoming_move) + return SVN_NO_ERROR; + } + else if (local_change == svn_wc_conflict_reason_missing && + operation == svn_wc_operation_merge) + { + struct conflict_tree_local_missing_details *local_details; + svn_boolean_t is_local_move; /* "local" to branch history */ + + local_details = conflict->tree_conflict_local_details; + is_local_move = (local_details != NULL && + local_details->moves != NULL); + + if (is_incoming_move || is_local_move) + return SVN_NO_ERROR; + } + + description = + apr_psprintf(scratch_pool, _("ignore the deletion of '^/%s@%ld'"), + incoming_new_repos_relpath, incoming_new_pegrev); + + add_resolution_option(options, conflict, + svn_client_conflict_option_incoming_delete_ignore, + _("Ignore incoming deletion"), description, + resolve_incoming_delete_ignore); + } + + return SVN_NO_ERROR; +} + +/* Configure 'incoming delete accept' resolution option for a tree conflict. */ +static svn_error_t * +configure_option_incoming_delete_accept(svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_array_header_t *options, + apr_pool_t *scratch_pool) +{ + svn_wc_conflict_action_t incoming_change; + svn_wc_conflict_reason_t local_change; + const char *incoming_new_repos_relpath; + svn_revnum_t incoming_new_pegrev; + + incoming_change = svn_client_conflict_get_incoming_change(conflict); + local_change = svn_client_conflict_get_local_change(conflict); + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( + &incoming_new_repos_relpath, &incoming_new_pegrev, + NULL, conflict, scratch_pool, + scratch_pool)); + + if (incoming_change == svn_wc_conflict_action_delete) + { + struct conflict_tree_incoming_delete_details *incoming_details; + svn_boolean_t is_incoming_move; + + incoming_details = conflict->tree_conflict_incoming_details; + is_incoming_move = (incoming_details != NULL && + incoming_details->moves != NULL); + if (is_incoming_move && + (local_change == svn_wc_conflict_reason_edited || + local_change == svn_wc_conflict_reason_moved_away || + local_change == svn_wc_conflict_reason_missing)) + { + /* An option which accepts the incoming deletion makes no sense + * if we know there was a local move and/or an incoming move. */ + return SVN_NO_ERROR; + } + else + { + const char *description; + const char *wcroot_abspath; + const char *local_abspath; + + SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, + conflict->local_abspath, scratch_pool, + scratch_pool)); + local_abspath = svn_client_conflict_get_local_abspath(conflict); + description = + apr_psprintf(scratch_pool, _("accept the deletion of '%s'"), + svn_dirent_local_style(svn_dirent_skip_ancestor(wcroot_abspath, + local_abspath), + scratch_pool)); + add_resolution_option( + options, conflict, + svn_client_conflict_option_incoming_delete_accept, + _("Accept incoming deletion"), description, + resolve_incoming_delete_accept); + } + } + + return SVN_NO_ERROR; +} + +static svn_error_t * +describe_incoming_move_merge_conflict_option( + const char **description, + svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + const char *moved_to_abspath, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + svn_wc_operation_t operation; + const char *victim_abspath; + svn_node_kind_t victim_node_kind; + const char *wcroot_abspath; - add_resolution_option(*options, conflict, - svn_client_conflict_option_working_text, - _("Mark as resolved"), - _("accept working copy version of entire property value"), - resolve_prop_conflict); + victim_abspath = svn_client_conflict_get_local_abspath(conflict); + victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); + SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, + victim_abspath, scratch_pool, + scratch_pool)); - add_resolution_option(*options, conflict, - svn_client_conflict_option_incoming_text_where_conflicted, - _("Accept incoming for conflicts"), - _("accept incoming changes only where they conflict"), - resolve_prop_conflict); + operation = svn_client_conflict_get_operation(conflict); + if (operation == svn_wc_operation_merge) + { + const char *incoming_moved_abspath = NULL; - add_resolution_option(*options, conflict, - svn_client_conflict_option_working_text_where_conflicted, - _("Reject conflicts"), - _("reject changes which conflict and accept the rest"), - resolve_prop_conflict); + if (victim_node_kind == svn_node_none) + { + /* This is an incoming move vs local move conflict. */ + struct conflict_tree_incoming_delete_details *details; - add_resolution_option(*options, conflict, - svn_client_conflict_option_merged_text, - _("Accept merged"), - _("accept merged version of property value"), - resolve_prop_conflict); + details = conflict->tree_conflict_incoming_details; + if (details->wc_move_targets) + { + apr_array_header_t *moves; + + moves = svn_hash_gets(details->wc_move_targets, + details->move_target_repos_relpath); + incoming_moved_abspath = + APR_ARRAY_IDX(moves, details->wc_move_target_idx, + const char *); + } + } + + if (incoming_moved_abspath) + { + /* The 'move and merge' option follows the incoming move; note that + * moved_to_abspath points to the current location of an item which + * was moved in the history of our merge target branch. If the user + * chooses 'move and merge', that item will be moved again (i.e. it + * will be moved to and merged with incoming_moved_abspath's item). */ + *description = + apr_psprintf( + result_pool, _("move '%s' to '%s' and merge"), + svn_dirent_local_style(svn_dirent_skip_ancestor(wcroot_abspath, + moved_to_abspath), + scratch_pool), + svn_dirent_local_style(svn_dirent_skip_ancestor( + wcroot_abspath, + incoming_moved_abspath), + scratch_pool)); + } + else + { + *description = + apr_psprintf( + result_pool, _("move '%s' to '%s' and merge"), + svn_dirent_local_style(svn_dirent_skip_ancestor(wcroot_abspath, + victim_abspath), + scratch_pool), + svn_dirent_local_style(svn_dirent_skip_ancestor(wcroot_abspath, + moved_to_abspath), + scratch_pool)); + } + } + else + *description = + apr_psprintf( + result_pool, _("move and merge local changes from '%s' into '%s'"), + svn_dirent_local_style(svn_dirent_skip_ancestor(wcroot_abspath, + victim_abspath), + scratch_pool), + svn_dirent_local_style(svn_dirent_skip_ancestor(wcroot_abspath, + moved_to_abspath), + scratch_pool)); return SVN_NO_ERROR; } -/* Configure 'accept current wc state' resolution option for a tree conflict. */ +/* Configure 'incoming move file merge' resolution option for + * a tree conflict. */ static svn_error_t * -configure_option_accept_current_wc_state(svn_client_conflict_t *conflict, - apr_array_header_t *options) +configure_option_incoming_move_file_merge(svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_array_header_t *options, + apr_pool_t *scratch_pool) { - svn_wc_operation_t operation; + svn_node_kind_t victim_node_kind; svn_wc_conflict_action_t incoming_change; svn_wc_conflict_reason_t local_change; - conflict_option_resolve_func_t do_resolve_func; + const char *incoming_old_repos_relpath; + svn_revnum_t incoming_old_pegrev; + svn_node_kind_t incoming_old_kind; + const char *incoming_new_repos_relpath; + svn_revnum_t incoming_new_pegrev; + svn_node_kind_t incoming_new_kind; - operation = svn_client_conflict_get_operation(conflict); incoming_change = svn_client_conflict_get_incoming_change(conflict); local_change = svn_client_conflict_get_local_change(conflict); + victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); + SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( + &incoming_old_repos_relpath, &incoming_old_pegrev, + &incoming_old_kind, conflict, scratch_pool, + scratch_pool)); + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( + &incoming_new_repos_relpath, &incoming_new_pegrev, + &incoming_new_kind, conflict, scratch_pool, + scratch_pool)); - if ((operation == svn_wc_operation_update || - operation == svn_wc_operation_switch) && - (local_change == svn_wc_conflict_reason_moved_away || - local_change == svn_wc_conflict_reason_deleted || - local_change == svn_wc_conflict_reason_replaced) && - incoming_change == svn_wc_conflict_action_edit) + if (victim_node_kind == svn_node_file && + incoming_old_kind == svn_node_file && + incoming_new_kind == svn_node_none && + incoming_change == svn_wc_conflict_action_delete && + local_change == svn_wc_conflict_reason_edited) { - /* We must break moves if the user accepts the current working copy - * state instead of updating a moved-away node or updating children - * moved outside of deleted or replaced directory nodes. - * Else such moves would be left in an invalid state. */ - do_resolve_func = resolve_update_break_moved_away; - } - else - do_resolve_func = resolve_accept_current_wc_state; + struct conflict_tree_incoming_delete_details *details; + const char *description; + apr_array_header_t *move_target_wc_abspaths; + const char *moved_to_abspath; - add_resolution_option(options, conflict, - svn_client_conflict_option_accept_current_wc_state, - _("Mark as resolved"), - _("accept current working copy state"), - do_resolve_func); + details = conflict->tree_conflict_incoming_details; + if (details == NULL || details->moves == NULL) + return SVN_NO_ERROR; + + if (apr_hash_count(details->wc_move_targets) == 0) + return SVN_NO_ERROR; + + move_target_wc_abspaths = + svn_hash_gets(details->wc_move_targets, + get_moved_to_repos_relpath(details, scratch_pool)); + moved_to_abspath = APR_ARRAY_IDX(move_target_wc_abspaths, + details->wc_move_target_idx, + const char *); + SVN_ERR(describe_incoming_move_merge_conflict_option(&description, + conflict, ctx, + moved_to_abspath, + scratch_pool, + scratch_pool)); + add_resolution_option( + options, conflict, + svn_client_conflict_option_incoming_move_file_text_merge, + _("Move and merge"), description, + resolve_incoming_move_file_text_merge); + } return SVN_NO_ERROR; } -/* Configure 'update move destination' resolution option for a tree conflict. */ +/* Configure 'incoming move dir merge' resolution option for + * a tree conflict. */ static svn_error_t * -configure_option_update_move_destination(svn_client_conflict_t *conflict, - apr_array_header_t *options) +configure_option_incoming_dir_merge(svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_array_header_t *options, + apr_pool_t *scratch_pool) { - svn_wc_operation_t operation; + svn_node_kind_t victim_node_kind; svn_wc_conflict_action_t incoming_change; svn_wc_conflict_reason_t local_change; + const char *incoming_old_repos_relpath; + svn_revnum_t incoming_old_pegrev; + svn_node_kind_t incoming_old_kind; + const char *incoming_new_repos_relpath; + svn_revnum_t incoming_new_pegrev; + svn_node_kind_t incoming_new_kind; - operation = svn_client_conflict_get_operation(conflict); incoming_change = svn_client_conflict_get_incoming_change(conflict); local_change = svn_client_conflict_get_local_change(conflict); + victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); + SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( + &incoming_old_repos_relpath, &incoming_old_pegrev, + &incoming_old_kind, conflict, scratch_pool, + scratch_pool)); + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( + &incoming_new_repos_relpath, &incoming_new_pegrev, + &incoming_new_kind, conflict, scratch_pool, + scratch_pool)); - if ((operation == svn_wc_operation_update || - operation == svn_wc_operation_switch) && - incoming_change == svn_wc_conflict_action_edit && - local_change == svn_wc_conflict_reason_moved_away) + if (victim_node_kind == svn_node_dir && + incoming_old_kind == svn_node_dir && + incoming_new_kind == svn_node_none && + incoming_change == svn_wc_conflict_action_delete && + local_change == svn_wc_conflict_reason_edited) { - add_resolution_option( - options, conflict, - svn_client_conflict_option_update_move_destination, - _("Update move destination"), - _("apply incoming changes to move destination"), - resolve_update_moved_away_node); + struct conflict_tree_incoming_delete_details *details; + const char *description; + apr_array_header_t *move_target_wc_abspaths; + const char *moved_to_abspath; + + details = conflict->tree_conflict_incoming_details; + if (details == NULL || details->moves == NULL) + return SVN_NO_ERROR; + + if (apr_hash_count(details->wc_move_targets) == 0) + return SVN_NO_ERROR; + + move_target_wc_abspaths = + svn_hash_gets(details->wc_move_targets, + get_moved_to_repos_relpath(details, scratch_pool)); + moved_to_abspath = APR_ARRAY_IDX(move_target_wc_abspaths, + details->wc_move_target_idx, + const char *); + SVN_ERR(describe_incoming_move_merge_conflict_option(&description, + conflict, ctx, + moved_to_abspath, + scratch_pool, + scratch_pool)); + add_resolution_option(options, conflict, + svn_client_conflict_option_incoming_move_dir_merge, + _("Move and merge"), description, + resolve_incoming_move_dir_merge); } return SVN_NO_ERROR; } -/* Configure 'update raise moved away children' resolution option for a tree - * conflict. */ +/* Configure 'local move file merge' resolution option for + * a tree conflict. */ static svn_error_t * -configure_option_update_raise_moved_away_children( +configure_option_local_move_file_or_dir_merge( svn_client_conflict_t *conflict, - apr_array_header_t *options) + svn_client_ctx_t *ctx, + apr_array_header_t *options, + apr_pool_t *scratch_pool) { svn_wc_operation_t operation; svn_wc_conflict_action_t incoming_change; svn_wc_conflict_reason_t local_change; - svn_node_kind_t victim_node_kind; + const char *incoming_old_repos_relpath; + svn_revnum_t incoming_old_pegrev; + svn_node_kind_t incoming_old_kind; + const char *incoming_new_repos_relpath; + svn_revnum_t incoming_new_pegrev; + svn_node_kind_t incoming_new_kind; operation = svn_client_conflict_get_operation(conflict); incoming_change = svn_client_conflict_get_incoming_change(conflict); local_change = svn_client_conflict_get_local_change(conflict); - victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); + SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( + &incoming_old_repos_relpath, &incoming_old_pegrev, + &incoming_old_kind, conflict, scratch_pool, + scratch_pool)); + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( + &incoming_new_repos_relpath, &incoming_new_pegrev, + &incoming_new_kind, conflict, scratch_pool, + scratch_pool)); + + if (operation == svn_wc_operation_merge && + incoming_change == svn_wc_conflict_action_edit && + local_change == svn_wc_conflict_reason_missing) + { + struct conflict_tree_local_missing_details *details; + const char *wcroot_abspath; + + SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, + conflict->local_abspath, + scratch_pool, scratch_pool)); + + details = conflict->tree_conflict_local_details; + if (details != NULL && details->moves != NULL && + details->move_target_repos_relpath != NULL) + { + apr_array_header_t *moves; + const char *moved_to_abspath; + const char *description; + + moves = svn_hash_gets(details->wc_move_targets, + details->move_target_repos_relpath); + moved_to_abspath = + APR_ARRAY_IDX(moves, details->wc_move_target_idx, const char *); + + description = + apr_psprintf( + scratch_pool, _("apply changes to move destination '%s'"), + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, moved_to_abspath), + scratch_pool)); - if ((operation == svn_wc_operation_update || - operation == svn_wc_operation_switch) && - incoming_change == svn_wc_conflict_action_edit && - (local_change == svn_wc_conflict_reason_deleted || - local_change == svn_wc_conflict_reason_replaced) && - victim_node_kind == svn_node_dir) - { - add_resolution_option( - options, conflict, - svn_client_conflict_option_update_any_moved_away_children, - _("Update any moved-away children"), - _("prepare for updating moved-away children, if any"), - resolve_update_raise_moved_away); + if ((incoming_old_kind == svn_node_file || + incoming_old_kind == svn_node_none) && + (incoming_new_kind == svn_node_file || + incoming_new_kind == svn_node_none)) + { + add_resolution_option( + options, conflict, + svn_client_conflict_option_local_move_file_text_merge, + _("Apply to move destination"), + description, resolve_local_move_file_merge); + } + else + { + add_resolution_option( + options, conflict, + svn_client_conflict_option_local_move_dir_merge, + _("Apply to move destination"), + description, resolve_local_move_dir_merge); + } + } } return SVN_NO_ERROR; } -/* Configure 'incoming add ignore' resolution option for a tree conflict. */ +/* Configure 'sibling move file/dir merge' resolution option for + * a tree conflict. */ static svn_error_t * -configure_option_incoming_add_ignore(svn_client_conflict_t *conflict, - svn_client_ctx_t *ctx, - apr_array_header_t *options, - apr_pool_t *scratch_pool) +configure_option_sibling_move_merge(svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_array_header_t *options, + apr_pool_t *scratch_pool) { svn_wc_operation_t operation; svn_wc_conflict_action_t incoming_change; svn_wc_conflict_reason_t local_change; + const char *incoming_old_repos_relpath; + svn_revnum_t incoming_old_pegrev; + svn_node_kind_t incoming_old_kind; const char *incoming_new_repos_relpath; svn_revnum_t incoming_new_pegrev; - svn_node_kind_t victim_node_kind; + svn_node_kind_t incoming_new_kind; operation = svn_client_conflict_get_operation(conflict); incoming_change = svn_client_conflict_get_incoming_change(conflict); local_change = svn_client_conflict_get_local_change(conflict); - victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); + SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( + &incoming_old_repos_relpath, &incoming_old_pegrev, + &incoming_old_kind, conflict, scratch_pool, + scratch_pool)); SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( &incoming_new_repos_relpath, &incoming_new_pegrev, - NULL, conflict, scratch_pool, + &incoming_new_kind, conflict, scratch_pool, scratch_pool)); - /* This option is only available for directories. */ - if (victim_node_kind == svn_node_dir && - incoming_change == svn_wc_conflict_action_add && - (local_change == svn_wc_conflict_reason_obstructed || - local_change == svn_wc_conflict_reason_added)) + if (operation == svn_wc_operation_merge && + incoming_change == svn_wc_conflict_action_edit && + local_change == svn_wc_conflict_reason_missing) { - const char *description; + struct conflict_tree_local_missing_details *details; const char *wcroot_abspath; SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, - conflict->local_abspath, scratch_pool, - scratch_pool)); - if (operation == svn_wc_operation_merge) - description = - apr_psprintf(scratch_pool, - _("ignore and do not add '^/%s@%ld' here"), - incoming_new_repos_relpath, incoming_new_pegrev); - else if (operation == svn_wc_operation_update || - operation == svn_wc_operation_switch) + conflict->local_abspath, + scratch_pool, scratch_pool)); + + details = conflict->tree_conflict_local_details; + if (details != NULL && details->wc_siblings != NULL) { - if (victim_node_kind == svn_node_file) - description = - apr_psprintf(scratch_pool, - _("replace '^/%s@%ld' with the locally added file"), - incoming_new_repos_relpath, incoming_new_pegrev); - else if (victim_node_kind == svn_node_dir) - description = - apr_psprintf(scratch_pool, - _("replace '^/%s@%ld' with the locally added " - "directory"), - incoming_new_repos_relpath, incoming_new_pegrev); + const char *description; + const char *sibling; + + sibling = + apr_pstrdup(conflict->pool, + APR_ARRAY_IDX(details->wc_siblings, + details->preferred_sibling_idx, + const char *)); + description = + apr_psprintf( + scratch_pool, _("apply changes to '%s'"), + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, sibling), + scratch_pool)); + + if ((incoming_old_kind == svn_node_file || + incoming_old_kind == svn_node_none) && + (incoming_new_kind == svn_node_file || + incoming_new_kind == svn_node_none)) + { + add_resolution_option( + options, conflict, + svn_client_conflict_option_sibling_move_file_text_merge, + _("Apply to corresponding local location"), + description, resolve_local_move_file_merge); + } else - description = - apr_psprintf(scratch_pool, - _("replace '^/%s@%ld' with the locally added item"), - incoming_new_repos_relpath, incoming_new_pegrev); + { + add_resolution_option( + options, conflict, + svn_client_conflict_option_sibling_move_dir_merge, + _("Apply to corresponding local location"), + description, resolve_local_move_dir_merge); + } } - else - return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, - _("unexpected operation code '%d'"), - operation); - add_resolution_option( - options, conflict, svn_client_conflict_option_incoming_add_ignore, - _("Ignore incoming addition"), description, resolve_incoming_add_ignore); } return SVN_NO_ERROR; } -/* Configure 'incoming added file text merge' resolution option for a tree - * conflict. */ +struct conflict_tree_update_local_moved_away_details { + /* + * This array consists of "const char *" absolute paths to working copy + * nodes which are uncomitted copies and correspond to the repository path + * of the conflict victim. + * Each such working copy node is a potential local move target which can + * be chosen to find a suitable merge target when resolving a tree conflict. + * + * This may be an empty array in case if there is no move target path in + * the working copy. */ + apr_array_header_t *wc_move_targets; + + /* Current index into the list of working copy paths in WC_MOVE_TARGETS. */ + int preferred_move_target_idx; +}; + +/* Implements conflict_option_resolve_func_t. + * Resolve an incoming move vs local move conflict by merging from the + * incoming move's target location to the local move's target location, + * overriding the incoming move. The original local move was broken during + * update/switch, so overriding the incoming move involves recording a new + * move from the incoming move's target location to the local move's target + * location. */ static svn_error_t * -configure_option_incoming_added_file_text_merge(svn_client_conflict_t *conflict, - svn_client_ctx_t *ctx, - apr_array_header_t *options, - apr_pool_t *scratch_pool) +resolve_both_moved_file_update_keep_local_move( + svn_client_conflict_option_t *option, + svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) { + svn_client_conflict_option_id_t option_id; + const char *victim_abspath; + const char *local_moved_to_abspath; svn_wc_operation_t operation; - svn_wc_conflict_action_t incoming_change; - svn_wc_conflict_reason_t local_change; - svn_node_kind_t victim_node_kind; + const char *lock_abspath; + svn_error_t *err; + const char *repos_root_url; + const char *incoming_old_repos_relpath; + svn_revnum_t incoming_old_pegrev; const char *incoming_new_repos_relpath; svn_revnum_t incoming_new_pegrev; - svn_node_kind_t incoming_new_kind; + const char *wc_tmpdir; + const char *ancestor_abspath; + svn_stream_t *ancestor_stream; + apr_hash_t *ancestor_props; + apr_hash_t *incoming_props; + apr_hash_t *local_props; + const char *ancestor_url; + const char *corrected_url; + svn_ra_session_t *ra_session; + svn_wc_merge_outcome_t merge_content_outcome; + svn_wc_notify_state_t merge_props_outcome; + apr_array_header_t *propdiffs; + struct conflict_tree_incoming_delete_details *incoming_details; + apr_array_header_t *possible_moved_to_abspaths; + const char *incoming_moved_to_abspath; + struct conflict_tree_update_local_moved_away_details *local_details; + victim_abspath = svn_client_conflict_get_local_abspath(conflict); operation = svn_client_conflict_get_operation(conflict); - incoming_change = svn_client_conflict_get_incoming_change(conflict); - local_change = svn_client_conflict_get_local_change(conflict); - victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); + incoming_details = conflict->tree_conflict_incoming_details; + if (incoming_details == NULL || incoming_details->moves == NULL) + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("The specified conflict resolution option " + "requires details for tree conflict at '%s' " + "to be fetched from the repository first."), + svn_dirent_local_style(victim_abspath, + scratch_pool)); + if (operation == svn_wc_operation_none) + return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL, + _("Invalid operation code '%d' recorded for " + "conflict at '%s'"), operation, + svn_dirent_local_style(victim_abspath, + scratch_pool)); + + option_id = svn_client_conflict_option_get_id(option); + SVN_ERR_ASSERT(option_id == svn_client_conflict_option_both_moved_file_merge); + + SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL, + conflict, scratch_pool, + scratch_pool)); + SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( + &incoming_old_repos_relpath, &incoming_old_pegrev, + NULL, conflict, scratch_pool, + scratch_pool)); SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( &incoming_new_repos_relpath, &incoming_new_pegrev, - &incoming_new_kind, conflict, scratch_pool, + NULL, conflict, scratch_pool, scratch_pool)); - if (victim_node_kind == svn_node_file && - incoming_new_kind == svn_node_file && - incoming_change == svn_wc_conflict_action_add && - (local_change == svn_wc_conflict_reason_obstructed || - local_change == svn_wc_conflict_reason_unversioned || - local_change == svn_wc_conflict_reason_added)) + /* Set up temporary storage for the common ancestor version of the file. */ + SVN_ERR(svn_wc__get_tmpdir(&wc_tmpdir, ctx->wc_ctx, victim_abspath, + scratch_pool, scratch_pool)); + SVN_ERR(svn_stream_open_unique(&ancestor_stream, + &ancestor_abspath, wc_tmpdir, + svn_io_file_del_on_pool_cleanup, + scratch_pool, scratch_pool)); + + /* Fetch the ancestor file's content. */ + ancestor_url = svn_path_url_add_component2(repos_root_url, + incoming_old_repos_relpath, + scratch_pool); + SVN_ERR(svn_client__open_ra_session_internal(&ra_session, &corrected_url, + ancestor_url, NULL, NULL, + FALSE, FALSE, ctx, + scratch_pool, scratch_pool)); + SVN_ERR(svn_ra_get_file(ra_session, "", incoming_old_pegrev, + ancestor_stream, NULL, /* fetched_rev */ + &ancestor_props, scratch_pool)); + filter_props(ancestor_props, scratch_pool); + + /* Close stream to flush ancestor file to disk. */ + SVN_ERR(svn_stream_close(ancestor_stream)); + + possible_moved_to_abspaths = + svn_hash_gets(incoming_details->wc_move_targets, + get_moved_to_repos_relpath(incoming_details, scratch_pool)); + incoming_moved_to_abspath = + APR_ARRAY_IDX(possible_moved_to_abspaths, + incoming_details->wc_move_target_idx, const char *); + + local_details = conflict->tree_conflict_local_details; + local_moved_to_abspath = + APR_ARRAY_IDX(local_details->wc_move_targets, + local_details->preferred_move_target_idx, const char *); + + /* ### The following WC modifications should be atomic. */ + SVN_ERR(svn_wc__acquire_write_lock_for_resolve( + &lock_abspath, ctx->wc_ctx, + svn_dirent_get_longest_ancestor(victim_abspath, + local_moved_to_abspath, + scratch_pool), + scratch_pool, scratch_pool)); + + /* Get a copy of the incoming moved item's properties. */ + err = svn_wc_prop_list2(&incoming_props, ctx->wc_ctx, + incoming_moved_to_abspath, + scratch_pool, scratch_pool); + if (err) + goto unlock_wc; + + /* Get a copy of the local move target's properties. */ + err = svn_wc_prop_list2(&local_props, ctx->wc_ctx, + local_moved_to_abspath, + scratch_pool, scratch_pool); + if (err) + goto unlock_wc; + + /* Create a property diff for the files. */ + err = svn_prop_diffs(&propdiffs, incoming_props, local_props, + scratch_pool); + if (err) + goto unlock_wc; + + /* Perform the file merge. */ + err = svn_wc_merge5(&merge_content_outcome, &merge_props_outcome, + ctx->wc_ctx, ancestor_abspath, + incoming_moved_to_abspath, local_moved_to_abspath, + NULL, NULL, NULL, /* labels */ + NULL, NULL, /* conflict versions */ + FALSE, /* dry run */ + NULL, NULL, /* diff3_cmd, merge_options */ + apr_hash_count(ancestor_props) ? ancestor_props : NULL, + propdiffs, + NULL, NULL, /* conflict func/baton */ + NULL, NULL, /* don't allow user to cancel here */ + scratch_pool); + if (err) + goto unlock_wc; + + if (ctx->notify_func2) + { + svn_wc_notify_t *notify; + + /* Tell the world about the file merge that just happened. */ + notify = svn_wc_create_notify(local_moved_to_abspath, + svn_wc_notify_update_update, + scratch_pool); + if (merge_content_outcome == svn_wc_merge_conflict) + notify->content_state = svn_wc_notify_state_conflicted; + else + notify->content_state = svn_wc_notify_state_merged; + notify->prop_state = merge_props_outcome; + notify->kind = svn_node_file; + ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); + } + + /* Record a new move which overrides the incoming move. */ + err = svn_wc__move2(ctx->wc_ctx, incoming_moved_to_abspath, + local_moved_to_abspath, + TRUE, /* meta-data only move */ + FALSE, /* mixed-revisions don't apply to files */ + NULL, NULL, /* don't allow user to cancel here */ + NULL, NULL, /* no extra notification */ + scratch_pool); + if (err) + goto unlock_wc; + + /* Remove moved-away file from disk. */ + err = svn_io_remove_file2(incoming_moved_to_abspath, TRUE, scratch_pool); + if (err) + goto unlock_wc; + + err = svn_wc__del_tree_conflict(ctx->wc_ctx, victim_abspath, scratch_pool); + if (err) + goto unlock_wc; + + if (ctx->notify_func2) { - const char *description; - const char *wcroot_abspath; + svn_wc_notify_t *notify; - SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, - conflict->local_abspath, scratch_pool, - scratch_pool)); + notify = svn_wc_create_notify(victim_abspath, svn_wc_notify_resolved_tree, + scratch_pool); + ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); + } - if (operation == svn_wc_operation_merge) - description = - apr_psprintf(scratch_pool, _("merge '^/%s@%ld' into '%s'"), - incoming_new_repos_relpath, incoming_new_pegrev, - svn_dirent_local_style( - svn_dirent_skip_ancestor(wcroot_abspath, - conflict->local_abspath), - scratch_pool)); - else - description = - apr_psprintf(scratch_pool, _("merge local '%s' and '^/%s@%ld'"), - svn_dirent_local_style( - svn_dirent_skip_ancestor(wcroot_abspath, - conflict->local_abspath), - scratch_pool), - incoming_new_repos_relpath, incoming_new_pegrev); + svn_io_sleep_for_timestamps(local_moved_to_abspath, scratch_pool); - add_resolution_option( - options, conflict, - svn_client_conflict_option_incoming_added_file_text_merge, - _("Merge the files"), description, - operation == svn_wc_operation_merge - ? resolve_merge_incoming_added_file_text_merge - : resolve_merge_incoming_added_file_text_update); - } + conflict->resolution_tree = option_id; + +unlock_wc: + err = svn_error_compose_create(err, svn_wc__release_write_lock(ctx->wc_ctx, + lock_abspath, + scratch_pool)); + SVN_ERR(err); return SVN_NO_ERROR; } -/* Configure 'incoming added file replace and merge' resolution option for a - * tree conflict. */ +/* Implements conflict_option_resolve_func_t. + * Resolve an incoming move vs local move conflict by merging from the + * local move's target location to the incoming move's target location, + * and reverting the local move. */ static svn_error_t * -configure_option_incoming_added_file_replace_and_merge( +resolve_both_moved_file_update_keep_incoming_move( + svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, - apr_array_header_t *options, apr_pool_t *scratch_pool) { + svn_client_conflict_option_id_t option_id; + const char *victim_abspath; + const char *local_moved_to_abspath; svn_wc_operation_t operation; - svn_wc_conflict_action_t incoming_change; - svn_wc_conflict_reason_t local_change; - svn_node_kind_t victim_node_kind; + const char *lock_abspath; + svn_error_t *err; + const char *repos_root_url; + const char *incoming_old_repos_relpath; + svn_revnum_t incoming_old_pegrev; const char *incoming_new_repos_relpath; svn_revnum_t incoming_new_pegrev; - svn_node_kind_t incoming_new_kind; + const char *wc_tmpdir; + const char *ancestor_abspath; + svn_stream_t *ancestor_stream; + apr_hash_t *ancestor_props; + apr_hash_t *incoming_props; + apr_hash_t *local_props; + const char *ancestor_url; + const char *corrected_url; + svn_ra_session_t *ra_session; + svn_wc_merge_outcome_t merge_content_outcome; + svn_wc_notify_state_t merge_props_outcome; + apr_array_header_t *propdiffs; + struct conflict_tree_incoming_delete_details *incoming_details; + apr_array_header_t *possible_moved_to_abspaths; + const char *incoming_moved_to_abspath; + struct conflict_tree_update_local_moved_away_details *local_details; + victim_abspath = svn_client_conflict_get_local_abspath(conflict); operation = svn_client_conflict_get_operation(conflict); - incoming_change = svn_client_conflict_get_incoming_change(conflict); - local_change = svn_client_conflict_get_local_change(conflict); - victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); + incoming_details = conflict->tree_conflict_incoming_details; + if (incoming_details == NULL || incoming_details->moves == NULL) + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("The specified conflict resolution option " + "requires details for tree conflict at '%s' " + "to be fetched from the repository first."), + svn_dirent_local_style(victim_abspath, + scratch_pool)); + if (operation == svn_wc_operation_none) + return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL, + _("Invalid operation code '%d' recorded for " + "conflict at '%s'"), operation, + svn_dirent_local_style(victim_abspath, + scratch_pool)); + + option_id = svn_client_conflict_option_get_id(option); + SVN_ERR_ASSERT(option_id == + svn_client_conflict_option_both_moved_file_move_merge); + + SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL, + conflict, scratch_pool, + scratch_pool)); + SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( + &incoming_old_repos_relpath, &incoming_old_pegrev, + NULL, conflict, scratch_pool, + scratch_pool)); SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( &incoming_new_repos_relpath, &incoming_new_pegrev, - &incoming_new_kind, conflict, scratch_pool, + NULL, conflict, scratch_pool, scratch_pool)); - if (operation == svn_wc_operation_merge && - victim_node_kind == svn_node_file && - incoming_new_kind == svn_node_file && - incoming_change == svn_wc_conflict_action_add && - local_change == svn_wc_conflict_reason_obstructed) - { - const char *wcroot_abspath; - const char *description; + /* Set up temporary storage for the common ancestor version of the file. */ + SVN_ERR(svn_wc__get_tmpdir(&wc_tmpdir, ctx->wc_ctx, victim_abspath, + scratch_pool, scratch_pool)); + SVN_ERR(svn_stream_open_unique(&ancestor_stream, + &ancestor_abspath, wc_tmpdir, + svn_io_file_del_on_pool_cleanup, + scratch_pool, scratch_pool)); - SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, - conflict->local_abspath, scratch_pool, - scratch_pool)); - description = - apr_psprintf(scratch_pool, - _("delete '%s', copy '^/%s@%ld' here, and merge the files"), - svn_dirent_local_style( - svn_dirent_skip_ancestor(wcroot_abspath, - conflict->local_abspath), - scratch_pool), - incoming_new_repos_relpath, incoming_new_pegrev); + /* Fetch the ancestor file's content. */ + ancestor_url = svn_path_url_add_component2(repos_root_url, + incoming_old_repos_relpath, + scratch_pool); + SVN_ERR(svn_client__open_ra_session_internal(&ra_session, &corrected_url, + ancestor_url, NULL, NULL, + FALSE, FALSE, ctx, + scratch_pool, scratch_pool)); + SVN_ERR(svn_ra_get_file(ra_session, "", incoming_old_pegrev, + ancestor_stream, NULL, /* fetched_rev */ + &ancestor_props, scratch_pool)); + filter_props(ancestor_props, scratch_pool); - add_resolution_option( - options, conflict, - svn_client_conflict_option_incoming_added_file_replace_and_merge, - _("Replace and merge"), - description, resolve_merge_incoming_added_file_replace_and_merge); - } + /* Close stream to flush ancestor file to disk. */ + SVN_ERR(svn_stream_close(ancestor_stream)); - return SVN_NO_ERROR; -} + possible_moved_to_abspaths = + svn_hash_gets(incoming_details->wc_move_targets, + get_moved_to_repos_relpath(incoming_details, scratch_pool)); + incoming_moved_to_abspath = + APR_ARRAY_IDX(possible_moved_to_abspaths, + incoming_details->wc_move_target_idx, const char *); -/* Configure 'incoming added dir merge' resolution option for a tree - * conflict. */ -static svn_error_t * -configure_option_incoming_added_dir_merge(svn_client_conflict_t *conflict, - svn_client_ctx_t *ctx, - apr_array_header_t *options, - apr_pool_t *scratch_pool) -{ - svn_wc_operation_t operation; - svn_wc_conflict_action_t incoming_change; - svn_wc_conflict_reason_t local_change; - svn_node_kind_t victim_node_kind; - const char *incoming_new_repos_relpath; - svn_revnum_t incoming_new_pegrev; - svn_node_kind_t incoming_new_kind; + local_details = conflict->tree_conflict_local_details; + local_moved_to_abspath = + APR_ARRAY_IDX(local_details->wc_move_targets, + local_details->preferred_move_target_idx, const char *); - operation = svn_client_conflict_get_operation(conflict); - incoming_change = svn_client_conflict_get_incoming_change(conflict); - local_change = svn_client_conflict_get_local_change(conflict); - victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); - SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( - &incoming_new_repos_relpath, &incoming_new_pegrev, - &incoming_new_kind, conflict, scratch_pool, - scratch_pool)); + /* ### The following WC modifications should be atomic. */ + SVN_ERR(svn_wc__acquire_write_lock_for_resolve( + &lock_abspath, ctx->wc_ctx, + svn_dirent_get_longest_ancestor(victim_abspath, + local_moved_to_abspath, + scratch_pool), + scratch_pool, scratch_pool)); - if (victim_node_kind == svn_node_dir && - incoming_new_kind == svn_node_dir && - incoming_change == svn_wc_conflict_action_add && - (local_change == svn_wc_conflict_reason_added || - (operation == svn_wc_operation_merge && - local_change == svn_wc_conflict_reason_obstructed) || - (operation != svn_wc_operation_merge && - local_change == svn_wc_conflict_reason_unversioned))) - { - const char *description; - const char *wcroot_abspath; + /* Get a copy of the incoming moved item's properties. */ + err = svn_wc_prop_list2(&incoming_props, ctx->wc_ctx, + incoming_moved_to_abspath, + scratch_pool, scratch_pool); + if (err) + goto unlock_wc; - SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, - conflict->local_abspath, scratch_pool, - scratch_pool)); - if (operation == svn_wc_operation_merge) - { - if (conflict->tree_conflict_incoming_details == NULL) - return SVN_NO_ERROR; + /* Get a copy of the local move target's properties. */ + err = svn_wc_prop_list2(&local_props, ctx->wc_ctx, + local_moved_to_abspath, + scratch_pool, scratch_pool); + if (err) + goto unlock_wc; - description = - apr_psprintf(scratch_pool, _("merge '^/%s@%ld' into '%s'"), - incoming_new_repos_relpath, incoming_new_pegrev, - svn_dirent_local_style( - svn_dirent_skip_ancestor(wcroot_abspath, - conflict->local_abspath), - scratch_pool)); - } - else - description = - apr_psprintf(scratch_pool, _("merge local '%s' and '^/%s@%ld'"), - svn_dirent_local_style( - svn_dirent_skip_ancestor(wcroot_abspath, - conflict->local_abspath), - scratch_pool), - incoming_new_repos_relpath, incoming_new_pegrev); + /* Create a property diff for the files. */ + err = svn_prop_diffs(&propdiffs, incoming_props, local_props, + scratch_pool); + if (err) + goto unlock_wc; - add_resolution_option(options, conflict, - svn_client_conflict_option_incoming_added_dir_merge, - _("Merge the directories"), description, - operation == svn_wc_operation_merge - ? resolve_merge_incoming_added_dir_merge - : resolve_update_incoming_added_dir_merge); + /* Perform the file merge. */ + err = svn_wc_merge5(&merge_content_outcome, &merge_props_outcome, + ctx->wc_ctx, ancestor_abspath, + local_moved_to_abspath, incoming_moved_to_abspath, + NULL, NULL, NULL, /* labels */ + NULL, NULL, /* conflict versions */ + FALSE, /* dry run */ + NULL, NULL, /* diff3_cmd, merge_options */ + apr_hash_count(ancestor_props) ? ancestor_props : NULL, + propdiffs, + NULL, NULL, /* conflict func/baton */ + NULL, NULL, /* don't allow user to cancel here */ + scratch_pool); + if (err) + goto unlock_wc; + + if (ctx->notify_func2) + { + svn_wc_notify_t *notify; + + /* Tell the world about the file merge that just happened. */ + notify = svn_wc_create_notify(local_moved_to_abspath, + svn_wc_notify_update_update, + scratch_pool); + if (merge_content_outcome == svn_wc_merge_conflict) + notify->content_state = svn_wc_notify_state_conflicted; + else + notify->content_state = svn_wc_notify_state_merged; + notify->prop_state = merge_props_outcome; + notify->kind = svn_node_file; + ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); } - return SVN_NO_ERROR; -} - -/* Configure 'incoming added dir replace' resolution option for a tree - * conflict. */ -static svn_error_t * -configure_option_incoming_added_dir_replace(svn_client_conflict_t *conflict, - svn_client_ctx_t *ctx, - apr_array_header_t *options, - apr_pool_t *scratch_pool) -{ - svn_wc_operation_t operation; - svn_wc_conflict_action_t incoming_change; - svn_wc_conflict_reason_t local_change; - svn_node_kind_t victim_node_kind; - const char *incoming_new_repos_relpath; - svn_revnum_t incoming_new_pegrev; - svn_node_kind_t incoming_new_kind; + /* Revert the copy-half of the local move. The delete-half of this move + * has already been deleted during the update/switch operation. */ + err = svn_wc_revert6(ctx->wc_ctx, local_moved_to_abspath, svn_depth_empty, + FALSE, NULL, TRUE, FALSE, + TRUE /*added_keep_local*/, + NULL, NULL, /* no cancellation */ + ctx->notify_func2, ctx->notify_baton2, + scratch_pool); + if (err) + goto unlock_wc; - operation = svn_client_conflict_get_operation(conflict); - incoming_change = svn_client_conflict_get_incoming_change(conflict); - local_change = svn_client_conflict_get_local_change(conflict); - victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); - SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( - &incoming_new_repos_relpath, &incoming_new_pegrev, - &incoming_new_kind, conflict, scratch_pool, - scratch_pool)); + err = svn_wc__del_tree_conflict(ctx->wc_ctx, victim_abspath, scratch_pool); + if (err) + goto unlock_wc; - if (operation == svn_wc_operation_merge && - victim_node_kind == svn_node_dir && - incoming_new_kind == svn_node_dir && - incoming_change == svn_wc_conflict_action_add && - local_change == svn_wc_conflict_reason_obstructed) + if (ctx->notify_func2) { - const char *description; - const char *wcroot_abspath; + svn_wc_notify_t *notify; - SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, - conflict->local_abspath, scratch_pool, - scratch_pool)); - description = - apr_psprintf(scratch_pool, _("delete '%s' and copy '^/%s@%ld' here"), - svn_dirent_local_style( - svn_dirent_skip_ancestor(wcroot_abspath, - conflict->local_abspath), - scratch_pool), - incoming_new_repos_relpath, incoming_new_pegrev); - add_resolution_option( - options, conflict, - svn_client_conflict_option_incoming_added_dir_replace, - _("Delete my directory and replace it with incoming directory"), - description, resolve_merge_incoming_added_dir_replace); + notify = svn_wc_create_notify(victim_abspath, svn_wc_notify_resolved_tree, + scratch_pool); + ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); } + svn_io_sleep_for_timestamps(local_moved_to_abspath, scratch_pool); + + conflict->resolution_tree = option_id; + +unlock_wc: + err = svn_error_compose_create(err, svn_wc__release_write_lock(ctx->wc_ctx, + lock_abspath, + scratch_pool)); + SVN_ERR(err); + return SVN_NO_ERROR; } -/* Configure 'incoming added dir replace and merge' resolution option - * for a tree conflict. */ +/* Implements tree_conflict_get_details_func_t. */ static svn_error_t * -configure_option_incoming_added_dir_replace_and_merge( +conflict_tree_get_details_update_local_moved_away( svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, - apr_array_header_t *options, apr_pool_t *scratch_pool) { - svn_wc_operation_t operation; - svn_wc_conflict_action_t incoming_change; - svn_wc_conflict_reason_t local_change; - svn_node_kind_t victim_node_kind; - const char *incoming_new_repos_relpath; - svn_revnum_t incoming_new_pegrev; - svn_node_kind_t incoming_new_kind; + struct conflict_tree_update_local_moved_away_details *details; + const char *incoming_old_repos_relpath; + svn_node_kind_t incoming_old_kind; - operation = svn_client_conflict_get_operation(conflict); - incoming_change = svn_client_conflict_get_incoming_change(conflict); - local_change = svn_client_conflict_get_local_change(conflict); - victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); - SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( - &incoming_new_repos_relpath, &incoming_new_pegrev, - &incoming_new_kind, conflict, scratch_pool, - scratch_pool)); + SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( + &incoming_old_repos_relpath, NULL, &incoming_old_kind, + conflict, scratch_pool, scratch_pool)); - if (operation == svn_wc_operation_merge && - victim_node_kind == svn_node_dir && - incoming_new_kind == svn_node_dir && - incoming_change == svn_wc_conflict_action_add && - local_change == svn_wc_conflict_reason_obstructed) - { - const char *description; - const char *wcroot_abspath; + details = apr_pcalloc(conflict->pool, sizeof(*details)); - SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, - conflict->local_abspath, scratch_pool, - scratch_pool)); - description = - apr_psprintf(scratch_pool, - _("delete '%s', copy '^/%s@%ld' here, and merge the directories"), - svn_dirent_local_style( - svn_dirent_skip_ancestor(wcroot_abspath, - conflict->local_abspath), - scratch_pool), - incoming_new_repos_relpath, incoming_new_pegrev); + details->wc_move_targets = apr_array_make(conflict->pool, 1, + sizeof(const char *)); + + /* Search the WC for copies of the conflict victim. */ + SVN_ERR(svn_wc__find_copies_of_repos_path(&details->wc_move_targets, + conflict->local_abspath, + incoming_old_repos_relpath, + incoming_old_kind, + ctx->wc_ctx, + conflict->pool, + scratch_pool)); - add_resolution_option( - options, conflict, - svn_client_conflict_option_incoming_added_dir_replace_and_merge, - _("Replace and merge"), - description, resolve_merge_incoming_added_dir_replace_and_merge); - } + conflict->tree_conflict_local_details = details; return SVN_NO_ERROR; } -/* Configure 'incoming delete ignore' resolution option for a tree conflict. */ static svn_error_t * -configure_option_incoming_delete_ignore(svn_client_conflict_t *conflict, - svn_client_ctx_t *ctx, - apr_array_header_t *options, - apr_pool_t *scratch_pool) +get_both_moved_file_paths(const char **incoming_moved_to_abspath, + const char **local_moved_to_abspath, + svn_client_conflict_t *conflict, + apr_pool_t *scratch_pool) { + struct conflict_tree_incoming_delete_details *incoming_details; + apr_array_header_t *incoming_move_target_wc_abspaths; svn_wc_operation_t operation; - svn_wc_conflict_action_t incoming_change; - svn_wc_conflict_reason_t local_change; - const char *incoming_new_repos_relpath; - svn_revnum_t incoming_new_pegrev; operation = svn_client_conflict_get_operation(conflict); - incoming_change = svn_client_conflict_get_incoming_change(conflict); - local_change = svn_client_conflict_get_local_change(conflict); - SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( - &incoming_new_repos_relpath, &incoming_new_pegrev, - NULL, conflict, scratch_pool, - scratch_pool)); - if (incoming_change == svn_wc_conflict_action_delete) - { - const char *description; - struct conflict_tree_incoming_delete_details *incoming_details; - svn_boolean_t is_incoming_move; + *incoming_moved_to_abspath = NULL; + *local_moved_to_abspath = NULL; - incoming_details = conflict->tree_conflict_incoming_details; - is_incoming_move = (incoming_details != NULL && - incoming_details->moves != NULL); - if (local_change == svn_wc_conflict_reason_moved_away || - local_change == svn_wc_conflict_reason_edited) - { - /* An option which ignores the incoming deletion makes no sense - * if we know there was a local move and/or an incoming move. */ - if (is_incoming_move) - return SVN_NO_ERROR; - } - else if (local_change == svn_wc_conflict_reason_deleted) - { - /* If the local item was deleted and conflict details were fetched - * and indicate that there was no move, then this is an actual - * 'delete vs delete' situation. An option which ignores the incoming - * deletion makes no sense in that case because there is no local - * node to preserve. */ - if (!is_incoming_move) - return SVN_NO_ERROR; - } - else if (local_change == svn_wc_conflict_reason_missing && - operation == svn_wc_operation_merge) - { - struct conflict_tree_local_missing_details *local_details; - svn_boolean_t is_local_move; /* "local" to branch history */ + incoming_details = conflict->tree_conflict_incoming_details; + if (incoming_details == NULL || incoming_details->moves == NULL || + apr_hash_count(incoming_details->wc_move_targets) == 0) + return SVN_NO_ERROR; - local_details = conflict->tree_conflict_local_details; - is_local_move = (local_details != NULL && - local_details->moves != NULL); + incoming_move_target_wc_abspaths = + svn_hash_gets(incoming_details->wc_move_targets, + get_moved_to_repos_relpath(incoming_details, + scratch_pool)); + *incoming_moved_to_abspath = + APR_ARRAY_IDX(incoming_move_target_wc_abspaths, + incoming_details->wc_move_target_idx, const char *); - if (!is_incoming_move && !is_local_move) - return SVN_NO_ERROR; - } + if (operation == svn_wc_operation_merge) + { + struct conflict_tree_local_missing_details *local_details; + apr_array_header_t *local_moves; - description = - apr_psprintf(scratch_pool, _("ignore the deletion of '^/%s@%ld'"), - incoming_new_repos_relpath, incoming_new_pegrev); + local_details = conflict->tree_conflict_local_details; + if (local_details == NULL || + apr_hash_count(local_details->wc_move_targets) == 0) + return SVN_NO_ERROR; - add_resolution_option(options, conflict, - svn_client_conflict_option_incoming_delete_ignore, - _("Ignore incoming deletion"), description, - resolve_incoming_delete_ignore); + local_moves = svn_hash_gets(local_details->wc_move_targets, + local_details->move_target_repos_relpath); + *local_moved_to_abspath = + APR_ARRAY_IDX(local_moves, local_details->wc_move_target_idx, + const char *); + } + else + { + struct conflict_tree_update_local_moved_away_details *local_details; + + local_details = conflict->tree_conflict_local_details; + if (local_details == NULL || + local_details->wc_move_targets->nelts == 0) + return SVN_NO_ERROR; + + *local_moved_to_abspath = + APR_ARRAY_IDX(local_details->wc_move_targets, + local_details->preferred_move_target_idx, + const char *); } return SVN_NO_ERROR; } -/* Configure 'incoming delete accept' resolution option for a tree conflict. */ static svn_error_t * -configure_option_incoming_delete_accept(svn_client_conflict_t *conflict, - svn_client_ctx_t *ctx, - apr_array_header_t *options, - apr_pool_t *scratch_pool) -{ - svn_wc_conflict_action_t incoming_change; - svn_wc_conflict_reason_t local_change; - const char *incoming_new_repos_relpath; - svn_revnum_t incoming_new_pegrev; - - incoming_change = svn_client_conflict_get_incoming_change(conflict); - local_change = svn_client_conflict_get_local_change(conflict); - SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( - &incoming_new_repos_relpath, &incoming_new_pegrev, - NULL, conflict, scratch_pool, - scratch_pool)); - - if (incoming_change == svn_wc_conflict_action_delete) - { - struct conflict_tree_incoming_delete_details *incoming_details; - svn_boolean_t is_incoming_move; - - incoming_details = conflict->tree_conflict_incoming_details; - is_incoming_move = (incoming_details != NULL && - incoming_details->moves != NULL); - if (is_incoming_move && - (local_change == svn_wc_conflict_reason_edited || - local_change == svn_wc_conflict_reason_moved_away)) - { - /* An option which accepts the incoming deletion makes no sense - * if we know there was a local move and/or an incoming move. */ - return SVN_NO_ERROR; - } - else - { - const char *description; - const char *wcroot_abspath; - const char *local_abspath; - - SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, - conflict->local_abspath, scratch_pool, - scratch_pool)); - local_abspath = svn_client_conflict_get_local_abspath(conflict); - description = - apr_psprintf(scratch_pool, _("accept the deletion of '%s'"), - svn_dirent_local_style(svn_dirent_skip_ancestor(wcroot_abspath, - local_abspath), - scratch_pool)); - add_resolution_option( - options, conflict, - svn_client_conflict_option_incoming_delete_accept, - _("Accept incoming deletion"), description, - resolve_incoming_delete_accept); - } +conflict_tree_get_description_update_both_moved_file_merge( + const char **description, + svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + const char *incoming_moved_to_abspath; + const char *local_moved_to_abspath; + svn_wc_operation_t operation; + const char *wcroot_abspath; + + *description = NULL; + + SVN_ERR(get_both_moved_file_paths(&incoming_moved_to_abspath, + &local_moved_to_abspath, + conflict, scratch_pool)); + if (incoming_moved_to_abspath == NULL || local_moved_to_abspath == NULL) + return SVN_NO_ERROR; + + SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, + conflict->local_abspath, scratch_pool, + scratch_pool)); + + operation = svn_client_conflict_get_operation(conflict); + + if (operation == svn_wc_operation_merge) + { + /* In case of a merge, the incoming move has A+ (copied) status... */ + *description = + apr_psprintf( + scratch_pool, + _("apply changes to '%s' and revert addition of '%s'"), + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, local_moved_to_abspath), + scratch_pool), + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, incoming_moved_to_abspath), + scratch_pool)); + } + else + { + /* ...but in case of update/switch the local move has "A+" status. */ + *description = + apr_psprintf( + scratch_pool, + _("override incoming move and merge incoming changes from '%s' " + "to '%s'"), + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, incoming_moved_to_abspath), + scratch_pool), + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, local_moved_to_abspath), + scratch_pool)); } return SVN_NO_ERROR; } static svn_error_t * -describe_incoming_move_merge_conflict_option( +conflict_tree_get_description_update_both_moved_file_move_merge( const char **description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, - struct conflict_tree_incoming_delete_details *details, apr_pool_t *result_pool, apr_pool_t *scratch_pool) { - apr_array_header_t *move_target_wc_abspaths; + const char *incoming_moved_to_abspath; + const char *local_moved_to_abspath; svn_wc_operation_t operation; - const char *victim_abspath; - const char *moved_to_abspath; const char *wcroot_abspath; - move_target_wc_abspaths = - svn_hash_gets(details->wc_move_targets, - get_moved_to_repos_relpath(details, scratch_pool)); - moved_to_abspath = APR_ARRAY_IDX(move_target_wc_abspaths, - details->wc_move_target_idx, - const char *); + *description = NULL; + + SVN_ERR(get_both_moved_file_paths(&incoming_moved_to_abspath, + &local_moved_to_abspath, + conflict, scratch_pool)); + if (incoming_moved_to_abspath == NULL || local_moved_to_abspath == NULL) + return SVN_NO_ERROR; - victim_abspath = svn_client_conflict_get_local_abspath(conflict); SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, - victim_abspath, scratch_pool, + conflict->local_abspath, scratch_pool, scratch_pool)); operation = svn_client_conflict_get_operation(conflict); + if (operation == svn_wc_operation_merge) - *description = - apr_psprintf( - result_pool, _("move '%s' to '%s' and merge"), - svn_dirent_local_style(svn_dirent_skip_ancestor(wcroot_abspath, - victim_abspath), - scratch_pool), - svn_dirent_local_style(svn_dirent_skip_ancestor(wcroot_abspath, - moved_to_abspath), - scratch_pool)); + { + SVN_ERR(describe_incoming_move_merge_conflict_option( + description, conflict, ctx, local_moved_to_abspath, + scratch_pool, scratch_pool)); + } else - *description = - apr_psprintf( - result_pool, _("move and merge local changes from '%s' into '%s'"), - svn_dirent_local_style(svn_dirent_skip_ancestor(wcroot_abspath, - victim_abspath), - scratch_pool), - svn_dirent_local_style(svn_dirent_skip_ancestor(wcroot_abspath, - moved_to_abspath), - scratch_pool)); + { + *description = + apr_psprintf( + scratch_pool, + _("accept incoming move and merge local changes from " + "'%s' to '%s'"), + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, local_moved_to_abspath), + scratch_pool), + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, incoming_moved_to_abspath), + scratch_pool)); + } return SVN_NO_ERROR; } -/* Configure 'incoming move file merge' resolution option for - * a tree conflict. */ +/* Configure 'both moved file merge' resolution options for a tree conflict. */ static svn_error_t * -configure_option_incoming_move_file_merge(svn_client_conflict_t *conflict, - svn_client_ctx_t *ctx, - apr_array_header_t *options, - apr_pool_t *scratch_pool) +configure_option_both_moved_file_merge(svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_array_header_t *options, + apr_pool_t *scratch_pool) { + svn_wc_operation_t operation; svn_node_kind_t victim_node_kind; svn_wc_conflict_action_t incoming_change; svn_wc_conflict_reason_t local_change; @@ -9918,9 +11742,16 @@ configure_option_incoming_move_file_merge(svn_client_conflict_t *conflict, const char *incoming_new_repos_relpath; svn_revnum_t incoming_new_pegrev; svn_node_kind_t incoming_new_kind; + const char *wcroot_abspath; + + SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, + conflict->local_abspath, scratch_pool, + scratch_pool)); + + operation = svn_client_conflict_get_operation(conflict); + victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); incoming_change = svn_client_conflict_get_incoming_change(conflict); local_change = svn_client_conflict_get_local_change(conflict); - victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( &incoming_old_repos_relpath, &incoming_old_pegrev, &incoming_old_kind, conflict, scratch_pool, @@ -9930,45 +11761,57 @@ configure_option_incoming_move_file_merge(svn_client_conflict_t *conflict, &incoming_new_kind, conflict, scratch_pool, scratch_pool)); - if (victim_node_kind == svn_node_file && + /* ### what about the switch operation? */ + if (((operation == svn_wc_operation_merge && + victim_node_kind == svn_node_none) || + (operation == svn_wc_operation_update && + victim_node_kind == svn_node_file)) && incoming_old_kind == svn_node_file && incoming_new_kind == svn_node_none && - incoming_change == svn_wc_conflict_action_delete && - local_change == svn_wc_conflict_reason_edited) + ((operation == svn_wc_operation_merge && + local_change == svn_wc_conflict_reason_missing) || + (operation == svn_wc_operation_update && + local_change == svn_wc_conflict_reason_moved_away)) && + incoming_change == svn_wc_conflict_action_delete) { - struct conflict_tree_incoming_delete_details *details; const char *description; - details = conflict->tree_conflict_incoming_details; - if (details == NULL || details->moves == NULL) - return SVN_NO_ERROR; + SVN_ERR(conflict_tree_get_description_update_both_moved_file_merge( + &description, conflict, ctx, conflict->pool, scratch_pool)); - if (apr_hash_count(details->wc_move_targets) == 0) + if (description == NULL) /* details not fetched yet */ return SVN_NO_ERROR; - SVN_ERR(describe_incoming_move_merge_conflict_option(&description, - conflict, ctx, - details, - scratch_pool, - scratch_pool)); add_resolution_option( - options, conflict, - svn_client_conflict_option_incoming_move_file_text_merge, + options, conflict, svn_client_conflict_option_both_moved_file_merge, + _("Merge to corresponding local location"), + description, + operation == svn_wc_operation_merge ? + resolve_both_moved_file_text_merge : + resolve_both_moved_file_update_keep_local_move); + + SVN_ERR(conflict_tree_get_description_update_both_moved_file_move_merge( + &description, conflict, ctx, conflict->pool, scratch_pool)); + + add_resolution_option(options, conflict, + svn_client_conflict_option_both_moved_file_move_merge, _("Move and merge"), description, - resolve_incoming_move_file_text_merge); + operation == svn_wc_operation_merge ? + resolve_incoming_move_file_text_merge : + resolve_both_moved_file_update_keep_incoming_move); } return SVN_NO_ERROR; } -/* Configure 'incoming move dir merge' resolution option for - * a tree conflict. */ +/* Configure 'both moved dir merge' resolution options for a tree conflict. */ static svn_error_t * -configure_option_incoming_dir_merge(svn_client_conflict_t *conflict, - svn_client_ctx_t *ctx, - apr_array_header_t *options, - apr_pool_t *scratch_pool) +configure_option_both_moved_dir_merge(svn_client_conflict_t *conflict, + svn_client_ctx_t *ctx, + apr_array_header_t *options, + apr_pool_t *scratch_pool) { + svn_wc_operation_t operation; svn_node_kind_t victim_node_kind; svn_wc_conflict_action_t incoming_change; svn_wc_conflict_reason_t local_change; @@ -9978,10 +11821,16 @@ configure_option_incoming_dir_merge(svn_client_conflict_t *conflict, const char *incoming_new_repos_relpath; svn_revnum_t incoming_new_pegrev; svn_node_kind_t incoming_new_kind; + const char *wcroot_abspath; + + SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, + conflict->local_abspath, scratch_pool, + scratch_pool)); + operation = svn_client_conflict_get_operation(conflict); + victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); incoming_change = svn_client_conflict_get_incoming_change(conflict); local_change = svn_client_conflict_get_local_change(conflict); - victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( &incoming_old_repos_relpath, &incoming_old_pegrev, &incoming_old_kind, conflict, scratch_pool, @@ -9991,216 +11840,213 @@ configure_option_incoming_dir_merge(svn_client_conflict_t *conflict, &incoming_new_kind, conflict, scratch_pool, scratch_pool)); - if (victim_node_kind == svn_node_dir && + if (operation == svn_wc_operation_merge && + victim_node_kind == svn_node_none && incoming_old_kind == svn_node_dir && incoming_new_kind == svn_node_none && - incoming_change == svn_wc_conflict_action_delete && - local_change == svn_wc_conflict_reason_edited) + local_change == svn_wc_conflict_reason_missing && + incoming_change == svn_wc_conflict_action_delete) { - struct conflict_tree_incoming_delete_details *details; + struct conflict_tree_incoming_delete_details *incoming_details; + struct conflict_tree_local_missing_details *local_details; const char *description; + apr_array_header_t *local_moves; + const char *local_moved_to_abspath; + const char *incoming_moved_to_abspath; + apr_array_header_t *incoming_move_target_wc_abspaths; - details = conflict->tree_conflict_incoming_details; - if (details == NULL || details->moves == NULL) - return SVN_NO_ERROR; + incoming_details = conflict->tree_conflict_incoming_details; + if (incoming_details == NULL || incoming_details->moves == NULL || + apr_hash_count(incoming_details->wc_move_targets) == 0) + return SVN_NO_ERROR; - if (apr_hash_count(details->wc_move_targets) == 0) - return SVN_NO_ERROR; + local_details = conflict->tree_conflict_local_details; + if (local_details == NULL || + apr_hash_count(local_details->wc_move_targets) == 0) + return SVN_NO_ERROR; - SVN_ERR(describe_incoming_move_merge_conflict_option(&description, - conflict, ctx, - details, - scratch_pool, - scratch_pool)); + local_moves = svn_hash_gets(local_details->wc_move_targets, + local_details->move_target_repos_relpath); + local_moved_to_abspath = + APR_ARRAY_IDX(local_moves, local_details->wc_move_target_idx, + const char *); + + incoming_move_target_wc_abspaths = + svn_hash_gets(incoming_details->wc_move_targets, + get_moved_to_repos_relpath(incoming_details, + scratch_pool)); + incoming_moved_to_abspath = + APR_ARRAY_IDX(incoming_move_target_wc_abspaths, + incoming_details->wc_move_target_idx, const char *); + + description = + apr_psprintf( + scratch_pool, _("apply changes to '%s' and revert addition of '%s'"), + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, local_moved_to_abspath), + scratch_pool), + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, incoming_moved_to_abspath), + scratch_pool)); + add_resolution_option( + options, conflict, svn_client_conflict_option_both_moved_dir_merge, + _("Merge to corresponding local location"), + description, resolve_both_moved_dir_merge); + + SVN_ERR(describe_incoming_move_merge_conflict_option( + &description, conflict, ctx, local_moved_to_abspath, + scratch_pool, scratch_pool)); add_resolution_option(options, conflict, - svn_client_conflict_option_incoming_move_dir_merge, - _("Move and merge"), description, - resolve_incoming_move_dir_merge); + svn_client_conflict_option_both_moved_dir_move_merge, + _("Move and merge"), description, + resolve_both_moved_dir_move_merge); } return SVN_NO_ERROR; } -/* Configure 'local move file merge' resolution option for - * a tree conflict. */ +/* Return a copy of the repos replath candidate list. */ static svn_error_t * -configure_option_local_move_file_merge(svn_client_conflict_t *conflict, - svn_client_ctx_t *ctx, - apr_array_header_t *options, - apr_pool_t *scratch_pool) +get_repos_relpath_candidates( + apr_array_header_t **possible_moved_to_repos_relpaths, + apr_hash_t *wc_move_targets, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) { - svn_wc_operation_t operation; - svn_wc_conflict_action_t incoming_change; - svn_wc_conflict_reason_t local_change; - const char *incoming_new_repos_relpath; - svn_revnum_t incoming_new_pegrev; + apr_array_header_t *sorted_repos_relpaths; + int i; - operation = svn_client_conflict_get_operation(conflict); - incoming_change = svn_client_conflict_get_incoming_change(conflict); - local_change = svn_client_conflict_get_local_change(conflict); - SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( - &incoming_new_repos_relpath, &incoming_new_pegrev, - NULL, conflict, scratch_pool, - scratch_pool)); + sorted_repos_relpaths = svn_sort__hash(wc_move_targets, + svn_sort_compare_items_as_paths, + scratch_pool); - if (operation == svn_wc_operation_merge && - incoming_change == svn_wc_conflict_action_edit && - local_change == svn_wc_conflict_reason_missing) + *possible_moved_to_repos_relpaths = + apr_array_make(result_pool, sorted_repos_relpaths->nelts, + sizeof (const char *)); + for (i = 0; i < sorted_repos_relpaths->nelts; i++) { - struct conflict_tree_local_missing_details *details; - - details = conflict->tree_conflict_local_details; - if (details != NULL && details->moves != NULL) - { - apr_hash_t *wc_move_targets = apr_hash_make(scratch_pool); - apr_pool_t *iterpool; - int i; - - iterpool = svn_pool_create(scratch_pool); - for (i = 0; i < details->moves->nelts; i++) - { - struct repos_move_info *move; - - svn_pool_clear(iterpool); - move = APR_ARRAY_IDX(details->moves, i, struct repos_move_info *); - SVN_ERR(follow_move_chains(wc_move_targets, move, ctx, - conflict->local_abspath, - svn_node_file, - incoming_new_repos_relpath, - incoming_new_pegrev, - scratch_pool, iterpool)); - } - svn_pool_destroy(iterpool); - - if (apr_hash_count(wc_move_targets) > 0) - { - apr_array_header_t *move_target_repos_relpaths; - const svn_sort__item_t *item; - apr_array_header_t *moved_to_abspaths; - const char *description; - const char *wcroot_abspath; - - /* Initialize to the first possible move target. Hopefully, - * in most cases there will only be one candidate anyway. */ - move_target_repos_relpaths = svn_sort__hash( - wc_move_targets, - svn_sort_compare_items_as_paths, - scratch_pool); - item = &APR_ARRAY_IDX(move_target_repos_relpaths, - 0, svn_sort__item_t); - moved_to_abspaths = item->value; - details->moved_to_abspath = - apr_pstrdup(conflict->pool, - APR_ARRAY_IDX(moved_to_abspaths, 0, const char *)); - - SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, - conflict->local_abspath, - scratch_pool, scratch_pool)); - description = - apr_psprintf( - scratch_pool, _("apply changes to move destination '%s'"), - svn_dirent_local_style( - svn_dirent_skip_ancestor(wcroot_abspath, - details->moved_to_abspath), - scratch_pool)); + svn_sort__item_t item; + const char *repos_relpath; - add_resolution_option( - options, conflict, - svn_client_conflict_option_local_move_file_text_merge, - _("Apply to move destination"), - description, resolve_local_move_file_merge); - } - else - details->moved_to_abspath = NULL; - } + item = APR_ARRAY_IDX(sorted_repos_relpaths, i, svn_sort__item_t); + repos_relpath = item.key; + APR_ARRAY_PUSH(*possible_moved_to_repos_relpaths, const char *) = + apr_pstrdup(result_pool, repos_relpath); } return SVN_NO_ERROR; } svn_error_t * -svn_client_conflict_option_get_moved_to_repos_relpath_candidates( +svn_client_conflict_option_get_moved_to_repos_relpath_candidates2( apr_array_header_t **possible_moved_to_repos_relpaths, svn_client_conflict_option_t *option, apr_pool_t *result_pool, apr_pool_t *scratch_pool) { svn_client_conflict_t *conflict = option->conflict; - struct conflict_tree_incoming_delete_details *details; const char *victim_abspath; - apr_array_header_t *sorted_repos_relpaths; - int i; + svn_wc_operation_t operation; + svn_wc_conflict_action_t incoming_change; + svn_wc_conflict_reason_t local_change; + svn_client_conflict_option_id_t id; - SVN_ERR_ASSERT(svn_client_conflict_option_get_id(option) == - svn_client_conflict_option_incoming_move_file_text_merge || - svn_client_conflict_option_get_id(option) == - svn_client_conflict_option_incoming_move_dir_merge); + id = svn_client_conflict_option_get_id(option); + if (id != svn_client_conflict_option_incoming_move_file_text_merge && + id != svn_client_conflict_option_incoming_move_dir_merge && + id != svn_client_conflict_option_local_move_file_text_merge && + id != svn_client_conflict_option_local_move_dir_merge && + id != svn_client_conflict_option_sibling_move_file_text_merge && + id != svn_client_conflict_option_sibling_move_dir_merge && + id != svn_client_conflict_option_both_moved_file_merge && + id != svn_client_conflict_option_both_moved_file_move_merge && + id != svn_client_conflict_option_both_moved_dir_merge && + id != svn_client_conflict_option_both_moved_dir_move_merge) + { + /* We cannot operate on this option. */ + *possible_moved_to_repos_relpaths = NULL; + return SVN_NO_ERROR; + } victim_abspath = svn_client_conflict_get_local_abspath(conflict); - details = conflict->tree_conflict_incoming_details; - if (details == NULL || details->wc_move_targets == NULL) - return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, - _("Getting a list of possible move targets " - "requires details for tree conflict at '%s' " - "to be fetched from the repository first"), - svn_dirent_local_style(victim_abspath, - scratch_pool)); + operation = svn_client_conflict_get_operation(conflict); + incoming_change = svn_client_conflict_get_incoming_change(conflict); + local_change = svn_client_conflict_get_local_change(conflict); - /* Return a copy of the repos replath candidate list. */ - sorted_repos_relpaths = svn_sort__hash(details->wc_move_targets, - svn_sort_compare_items_as_paths, - scratch_pool); + if (operation == svn_wc_operation_merge && + incoming_change == svn_wc_conflict_action_edit && + local_change == svn_wc_conflict_reason_missing) + { + struct conflict_tree_local_missing_details *details; - *possible_moved_to_repos_relpaths = apr_array_make( - result_pool, - sorted_repos_relpaths->nelts, - sizeof (const char *)); - for (i = 0; i < sorted_repos_relpaths->nelts; i++) + details = conflict->tree_conflict_local_details; + if (details == NULL || + (details->wc_move_targets == NULL && details->wc_siblings == NULL)) + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("Getting a list of possible move targets " + "requires details for tree conflict at '%s' " + "to be fetched from the repository first"), + svn_dirent_local_style(victim_abspath, + scratch_pool)); + + if (details->wc_move_targets) + SVN_ERR(get_repos_relpath_candidates(possible_moved_to_repos_relpaths, + details->wc_move_targets, + result_pool, scratch_pool)); + else + *possible_moved_to_repos_relpaths = NULL; + } + else { - svn_sort__item_t item; - const char *repos_relpath; + struct conflict_tree_incoming_delete_details *details; - item = APR_ARRAY_IDX(sorted_repos_relpaths, i, svn_sort__item_t); - repos_relpath = item.key; - APR_ARRAY_PUSH(*possible_moved_to_repos_relpaths, const char *) = - apr_pstrdup(result_pool, repos_relpath); + details = conflict->tree_conflict_incoming_details; + if (details == NULL || details->wc_move_targets == NULL) + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("Getting a list of possible move targets " + "requires details for tree conflict at '%s' " + "to be fetched from the repository first"), + svn_dirent_local_style(victim_abspath, + scratch_pool)); + + SVN_ERR(get_repos_relpath_candidates(possible_moved_to_repos_relpaths, + details->wc_move_targets, + result_pool, scratch_pool)); } return SVN_NO_ERROR; } svn_error_t * -svn_client_conflict_option_set_moved_to_repos_relpath( +svn_client_conflict_option_get_moved_to_repos_relpath_candidates( + apr_array_header_t **possible_moved_to_repos_relpaths, svn_client_conflict_option_t *option, - int preferred_move_target_idx, - svn_client_ctx_t *ctx, + apr_pool_t *result_pool, apr_pool_t *scratch_pool) { - svn_client_conflict_t *conflict = option->conflict; - struct conflict_tree_incoming_delete_details *details; - const char *victim_abspath; + /* The only difference to API version 2 is an assertion failure if + * an unexpected option is passed. + * We do not emulate this old behaviour since clients written against + * the previous API will just keep working. */ + return svn_error_trace( + svn_client_conflict_option_get_moved_to_repos_relpath_candidates2( + possible_moved_to_repos_relpaths, option, result_pool, scratch_pool)); +} + +static svn_error_t * +set_wc_move_target(const char **new_hash_key, + apr_hash_t *wc_move_targets, + int preferred_move_target_idx, + const char *victim_abspath, + apr_pool_t *scratch_pool) +{ apr_array_header_t *move_target_repos_relpaths; svn_sort__item_t item; const char *move_target_repos_relpath; apr_hash_index_t *hi; - SVN_ERR_ASSERT(svn_client_conflict_option_get_id(option) == - svn_client_conflict_option_incoming_move_file_text_merge || - svn_client_conflict_option_get_id(option) == - svn_client_conflict_option_incoming_move_dir_merge); - - victim_abspath = svn_client_conflict_get_local_abspath(conflict); - details = conflict->tree_conflict_incoming_details; - if (details == NULL || details->wc_move_targets == NULL) - return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, - _("Setting a move target requires details " - "for tree conflict at '%s' to be fetched " - "from the repository first"), - svn_dirent_local_style(victim_abspath, - scratch_pool)); - if (preferred_move_target_idx < 0 || - preferred_move_target_idx >= apr_hash_count(details->wc_move_targets)) + preferred_move_target_idx >= apr_hash_count(wc_move_targets)) return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL, _("Index '%d' is out of bounds of the possible " "move target list for '%s'"), @@ -10209,15 +12055,14 @@ svn_client_conflict_option_set_moved_to_repos_relpath( scratch_pool)); /* Translate the index back into a hash table key. */ - move_target_repos_relpaths = - svn_sort__hash(details->wc_move_targets, - svn_sort_compare_items_as_paths, - scratch_pool); + move_target_repos_relpaths = svn_sort__hash(wc_move_targets, + svn_sort_compare_items_as_paths, + scratch_pool); item = APR_ARRAY_IDX(move_target_repos_relpaths, preferred_move_target_idx, svn_sort__item_t); move_target_repos_relpath = item.key; /* Find our copy of the hash key and remember the user's preference. */ - for (hi = apr_hash_first(scratch_pool, details->wc_move_targets); + for (hi = apr_hash_first(scratch_pool, wc_move_targets); hi != NULL; hi = apr_hash_next(hi)) { @@ -10225,16 +12070,7 @@ svn_client_conflict_option_set_moved_to_repos_relpath( if (strcmp(move_target_repos_relpath, repos_relpath) == 0) { - details->move_target_repos_relpath = repos_relpath; - details->wc_move_target_idx = 0; - /* Update option description. */ - SVN_ERR(describe_incoming_move_merge_conflict_option( - &option->description, - conflict, ctx, - details, - conflict->pool, - scratch_pool)); - + *new_hash_key = repos_relpath; return SVN_NO_ERROR; } } @@ -10248,106 +12084,500 @@ svn_client_conflict_option_set_moved_to_repos_relpath( } svn_error_t * -svn_client_conflict_option_get_moved_to_abspath_candidates( +svn_client_conflict_option_set_moved_to_repos_relpath2( + svn_client_conflict_option_t *option, + int preferred_move_target_idx, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + svn_client_conflict_t *conflict = option->conflict; + const char *victim_abspath; + svn_wc_operation_t operation; + svn_wc_conflict_action_t incoming_change; + svn_wc_conflict_reason_t local_change; + svn_client_conflict_option_id_t id; + + id = svn_client_conflict_option_get_id(option); + if (id != svn_client_conflict_option_incoming_move_file_text_merge && + id != svn_client_conflict_option_incoming_move_dir_merge && + id != svn_client_conflict_option_local_move_file_text_merge && + id != svn_client_conflict_option_local_move_dir_merge && + id != svn_client_conflict_option_sibling_move_file_text_merge && + id != svn_client_conflict_option_sibling_move_dir_merge && + id != svn_client_conflict_option_both_moved_file_merge && + id != svn_client_conflict_option_both_moved_file_move_merge && + id != svn_client_conflict_option_both_moved_dir_merge && + id != svn_client_conflict_option_both_moved_dir_move_merge) + return SVN_NO_ERROR; /* We cannot operate on this option. Nothing to do. */ + + victim_abspath = svn_client_conflict_get_local_abspath(conflict); + operation = svn_client_conflict_get_operation(conflict); + incoming_change = svn_client_conflict_get_incoming_change(conflict); + local_change = svn_client_conflict_get_local_change(conflict); + + if (operation == svn_wc_operation_merge && + incoming_change == svn_wc_conflict_action_edit && + local_change == svn_wc_conflict_reason_missing) + { + struct conflict_tree_local_missing_details *details; + + details = conflict->tree_conflict_local_details; + if (details == NULL || details->wc_move_targets == NULL) + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("Setting a move target requires details " + "for tree conflict at '%s' to be fetched " + "from the repository first"), + svn_dirent_local_style(victim_abspath, + scratch_pool)); + + SVN_ERR(set_wc_move_target(&details->move_target_repos_relpath, + details->wc_move_targets, + preferred_move_target_idx, + victim_abspath, scratch_pool)); + details->wc_move_target_idx = 0; + + /* Update option description. */ + SVN_ERR(conflict_tree_get_description_local_missing( + &option->description, conflict, ctx, + conflict->pool, scratch_pool)); + } + else + { + struct conflict_tree_incoming_delete_details *details; + apr_array_header_t *move_target_wc_abspaths; + const char *moved_to_abspath; + + details = conflict->tree_conflict_incoming_details; + if (details == NULL || details->wc_move_targets == NULL) + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("Setting a move target requires details " + "for tree conflict at '%s' to be fetched " + "from the repository first"), + svn_dirent_local_style(victim_abspath, + scratch_pool)); + + SVN_ERR(set_wc_move_target(&details->move_target_repos_relpath, + details->wc_move_targets, + preferred_move_target_idx, + victim_abspath, scratch_pool)); + details->wc_move_target_idx = 0; + + /* Update option description. */ + move_target_wc_abspaths = + svn_hash_gets(details->wc_move_targets, + get_moved_to_repos_relpath(details, scratch_pool)); + moved_to_abspath = APR_ARRAY_IDX(move_target_wc_abspaths, + details->wc_move_target_idx, + const char *); + SVN_ERR(describe_incoming_move_merge_conflict_option( + &option->description, + conflict, ctx, + moved_to_abspath, + conflict->pool, + scratch_pool)); + } + + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client_conflict_option_set_moved_to_repos_relpath( + svn_client_conflict_option_t *option, + int preferred_move_target_idx, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + /* The only difference to API version 2 is an assertion failure if + * an unexpected option is passed. + * We do not emulate this old behaviour since clients written against + * the previous API will just keep working. */ + return svn_error_trace( + svn_client_conflict_option_set_moved_to_repos_relpath2(option, + preferred_move_target_idx, ctx, scratch_pool)); +} + +svn_error_t * +svn_client_conflict_option_get_moved_to_abspath_candidates2( apr_array_header_t **possible_moved_to_abspaths, svn_client_conflict_option_t *option, apr_pool_t *result_pool, apr_pool_t *scratch_pool) { svn_client_conflict_t *conflict = option->conflict; - struct conflict_tree_incoming_delete_details *details; const char *victim_abspath; - apr_array_header_t *move_target_wc_abspaths; + svn_wc_operation_t operation; + svn_wc_conflict_action_t incoming_change; + svn_wc_conflict_reason_t local_change; int i; + svn_client_conflict_option_id_t id; - SVN_ERR_ASSERT(svn_client_conflict_option_get_id(option) == - svn_client_conflict_option_incoming_move_file_text_merge || - svn_client_conflict_option_get_id(option) == - svn_client_conflict_option_incoming_move_dir_merge); + id = svn_client_conflict_option_get_id(option); + if (id != svn_client_conflict_option_incoming_move_file_text_merge && + id != svn_client_conflict_option_incoming_move_dir_merge && + id != svn_client_conflict_option_local_move_file_text_merge && + id != svn_client_conflict_option_local_move_dir_merge && + id != svn_client_conflict_option_sibling_move_file_text_merge && + id != svn_client_conflict_option_sibling_move_dir_merge && + id != svn_client_conflict_option_both_moved_file_merge && + id != svn_client_conflict_option_both_moved_file_move_merge && + id != svn_client_conflict_option_both_moved_dir_merge && + id != svn_client_conflict_option_both_moved_dir_move_merge) + { + /* We cannot operate on this option. */ + *possible_moved_to_abspaths = NULL; + return NULL; + } victim_abspath = svn_client_conflict_get_local_abspath(conflict); - details = conflict->tree_conflict_incoming_details; - if (details == NULL || details->wc_move_targets == NULL) - return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, - _("Getting a list of possible move targets " - "requires details for tree conflict at '%s' " - "to be fetched from the repository first"), - svn_dirent_local_style(victim_abspath, - scratch_pool)); + operation = svn_client_conflict_get_operation(conflict); + incoming_change = svn_client_conflict_get_incoming_change(conflict); + local_change = svn_client_conflict_get_local_change(conflict); - move_target_wc_abspaths = - svn_hash_gets(details->wc_move_targets, - get_moved_to_repos_relpath(details, scratch_pool)); + if (operation == svn_wc_operation_merge && + incoming_change == svn_wc_conflict_action_edit && + local_change == svn_wc_conflict_reason_missing) + { + struct conflict_tree_local_missing_details *details; - /* Return a copy of the option's move target candidate list. */ - *possible_moved_to_abspaths = - apr_array_make(result_pool, move_target_wc_abspaths->nelts, - sizeof (const char *)); - for (i = 0; i < move_target_wc_abspaths->nelts; i++) + details = conflict->tree_conflict_local_details; + if (details == NULL || + (details->wc_move_targets == NULL && details->wc_siblings == NULL)) + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("Getting a list of possible move siblings " + "requires details for tree conflict at '%s' " + "to be fetched from the repository first"), + svn_dirent_local_style(victim_abspath, + scratch_pool)); + + *possible_moved_to_abspaths = apr_array_make(result_pool, 1, + sizeof (const char *)); + if (details->wc_move_targets) + { + apr_array_header_t *move_target_wc_abspaths; + move_target_wc_abspaths = + svn_hash_gets(details->wc_move_targets, + details->move_target_repos_relpath); + for (i = 0; i < move_target_wc_abspaths->nelts; i++) + { + const char *moved_to_abspath; + + moved_to_abspath = APR_ARRAY_IDX(move_target_wc_abspaths, i, + const char *); + APR_ARRAY_PUSH(*possible_moved_to_abspaths, const char *) = + apr_pstrdup(result_pool, moved_to_abspath); + } + } + + /* ### Siblings are actually 'corresponding nodes', not 'move targets'. + ### But we provide them here to avoid another API function. */ + if (details->wc_siblings) + { + for (i = 0; i < details->wc_siblings->nelts; i++) + { + const char *sibling_abspath; + + sibling_abspath = APR_ARRAY_IDX(details->wc_siblings, i, + const char *); + APR_ARRAY_PUSH(*possible_moved_to_abspaths, const char *) = + apr_pstrdup(result_pool, sibling_abspath); + } + } + } + else if ((operation == svn_wc_operation_update || + operation == svn_wc_operation_switch) && + incoming_change == svn_wc_conflict_action_delete && + local_change == svn_wc_conflict_reason_moved_away) { - const char *moved_to_abspath; + struct conflict_tree_update_local_moved_away_details *details; - moved_to_abspath = APR_ARRAY_IDX(move_target_wc_abspaths, i, - const char *); - APR_ARRAY_PUSH(*possible_moved_to_abspaths, const char *) = - apr_pstrdup(result_pool, moved_to_abspath); + details = conflict->tree_conflict_local_details; + if (details == NULL || details->wc_move_targets == NULL) + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("Getting a list of possible move targets " + "requires details for tree conflict at '%s' " + "to be fetched from the repository first"), + svn_dirent_local_style(victim_abspath, + scratch_pool)); + + /* Return a copy of the option's move target candidate list. */ + *possible_moved_to_abspaths = + apr_array_make(result_pool, details->wc_move_targets->nelts, + sizeof (const char *)); + for (i = 0; i < details->wc_move_targets->nelts; i++) + { + const char *moved_to_abspath; + + moved_to_abspath = APR_ARRAY_IDX(details->wc_move_targets, i, + const char *); + APR_ARRAY_PUSH(*possible_moved_to_abspaths, const char *) = + apr_pstrdup(result_pool, moved_to_abspath); + } + } + else + { + struct conflict_tree_incoming_delete_details *details; + apr_array_header_t *move_target_wc_abspaths; + + details = conflict->tree_conflict_incoming_details; + if (details == NULL || details->wc_move_targets == NULL) + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("Getting a list of possible move targets " + "requires details for tree conflict at '%s' " + "to be fetched from the repository first"), + svn_dirent_local_style(victim_abspath, + scratch_pool)); + + move_target_wc_abspaths = + svn_hash_gets(details->wc_move_targets, + get_moved_to_repos_relpath(details, scratch_pool)); + + /* Return a copy of the option's move target candidate list. */ + *possible_moved_to_abspaths = + apr_array_make(result_pool, move_target_wc_abspaths->nelts, + sizeof (const char *)); + for (i = 0; i < move_target_wc_abspaths->nelts; i++) + { + const char *moved_to_abspath; + + moved_to_abspath = APR_ARRAY_IDX(move_target_wc_abspaths, i, + const char *); + APR_ARRAY_PUSH(*possible_moved_to_abspaths, const char *) = + apr_pstrdup(result_pool, moved_to_abspath); + } } return SVN_NO_ERROR; } svn_error_t * -svn_client_conflict_option_set_moved_to_abspath( +svn_client_conflict_option_get_moved_to_abspath_candidates( + apr_array_header_t **possible_moved_to_abspaths, + svn_client_conflict_option_t *option, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + /* The only difference to API version 2 is an assertion failure if + * an unexpected option is passed. + * We do not emulate this old behaviour since clients written against + * the previous API will just keep working. */ + return svn_error_trace( + svn_client_conflict_option_get_moved_to_abspath_candidates2( + possible_moved_to_abspaths, option, result_pool, scratch_pool)); +} + +svn_error_t * +svn_client_conflict_option_set_moved_to_abspath2( svn_client_conflict_option_t *option, int preferred_move_target_idx, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) { svn_client_conflict_t *conflict = option->conflict; - struct conflict_tree_incoming_delete_details *details; const char *victim_abspath; - apr_array_header_t *move_target_wc_abspaths; + svn_wc_operation_t operation; + svn_wc_conflict_action_t incoming_change; + svn_wc_conflict_reason_t local_change; + svn_client_conflict_option_id_t id; - SVN_ERR_ASSERT(svn_client_conflict_option_get_id(option) == - svn_client_conflict_option_incoming_move_file_text_merge || - svn_client_conflict_option_get_id(option) == - svn_client_conflict_option_incoming_move_dir_merge); + id = svn_client_conflict_option_get_id(option); + if (id != svn_client_conflict_option_incoming_move_file_text_merge && + id != svn_client_conflict_option_incoming_move_dir_merge && + id != svn_client_conflict_option_local_move_file_text_merge && + id != svn_client_conflict_option_local_move_dir_merge && + id != svn_client_conflict_option_sibling_move_file_text_merge && + id != svn_client_conflict_option_sibling_move_dir_merge && + id != svn_client_conflict_option_both_moved_file_merge && + id != svn_client_conflict_option_both_moved_file_move_merge && + id != svn_client_conflict_option_both_moved_dir_merge && + id != svn_client_conflict_option_both_moved_dir_move_merge) + return NULL; /* We cannot operate on this option. Nothing to do. */ victim_abspath = svn_client_conflict_get_local_abspath(conflict); - details = conflict->tree_conflict_incoming_details; - if (details == NULL || details->wc_move_targets == NULL) - return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, - _("Setting a move target requires details " - "for tree conflict at '%s' to be fetched " - "from the repository first"), - svn_dirent_local_style(victim_abspath, - scratch_pool)); + operation = svn_client_conflict_get_operation(conflict); + incoming_change = svn_client_conflict_get_incoming_change(conflict); + local_change = svn_client_conflict_get_local_change(conflict); - move_target_wc_abspaths = - svn_hash_gets(details->wc_move_targets, - get_moved_to_repos_relpath(details, scratch_pool)); + if (operation == svn_wc_operation_merge && + incoming_change == svn_wc_conflict_action_edit && + local_change == svn_wc_conflict_reason_missing) + { + struct conflict_tree_local_missing_details *details; + const char *wcroot_abspath; + const char *preferred_sibling; - if (preferred_move_target_idx < 0 || - preferred_move_target_idx > move_target_wc_abspaths->nelts) - return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL, - _("Index '%d' is out of bounds of the possible " - "move target list for '%s'"), - preferred_move_target_idx, - svn_dirent_local_style(victim_abspath, - scratch_pool)); + SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, + ctx->wc_ctx, + conflict->local_abspath, + scratch_pool, + scratch_pool)); + + details = conflict->tree_conflict_local_details; + if (details == NULL || (details->wc_siblings == NULL && + details->wc_move_targets == NULL)) + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("Setting a move target requires details " + "for tree conflict at '%s' to be fetched " + "from the repository first"), + svn_dirent_local_style(victim_abspath, + scratch_pool)); + + if (details->wc_siblings) + { + if (preferred_move_target_idx < 0 || + preferred_move_target_idx > details->wc_siblings->nelts) + return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL, + _("Index '%d' is out of bounds of the " + "possible move sibling list for '%s'"), + preferred_move_target_idx, + svn_dirent_local_style(victim_abspath, + scratch_pool)); + /* Record the user's preference. */ + details->preferred_sibling_idx = preferred_move_target_idx; + + /* Update option description. */ + preferred_sibling = APR_ARRAY_IDX(details->wc_siblings, + details->preferred_sibling_idx, + const char *); + option->description = + apr_psprintf( + conflict->pool, _("apply changes to '%s'"), + svn_dirent_local_style( + svn_dirent_skip_ancestor(wcroot_abspath, preferred_sibling), + scratch_pool)); + } + else if (details->wc_move_targets) + { + apr_array_header_t *move_target_wc_abspaths; + move_target_wc_abspaths = + svn_hash_gets(details->wc_move_targets, + details->move_target_repos_relpath); + + if (preferred_move_target_idx < 0 || + preferred_move_target_idx > move_target_wc_abspaths->nelts) + return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL, + _("Index '%d' is out of bounds of the possible " + "move target list for '%s'"), + preferred_move_target_idx, + svn_dirent_local_style(victim_abspath, + scratch_pool)); + + /* Record the user's preference. */ + details->wc_move_target_idx = preferred_move_target_idx; + + /* Update option description. */ + SVN_ERR(conflict_tree_get_description_local_missing( + &option->description, conflict, ctx, + conflict->pool, scratch_pool)); + } + } + else if ((operation == svn_wc_operation_update || + operation == svn_wc_operation_switch) && + incoming_change == svn_wc_conflict_action_delete && + local_change == svn_wc_conflict_reason_moved_away) + { + struct conflict_tree_update_local_moved_away_details *details; + + details = conflict->tree_conflict_local_details; + if (details == NULL || details->wc_move_targets == NULL) + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("Setting a move target requires details " + "for tree conflict at '%s' to be fetched " + "from the repository first"), + svn_dirent_local_style(victim_abspath, + scratch_pool)); + + if (preferred_move_target_idx < 0 || + preferred_move_target_idx > details->wc_move_targets->nelts) + return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL, + _("Index '%d' is out of bounds of the " + "possible move target list for '%s'"), + preferred_move_target_idx, + svn_dirent_local_style(victim_abspath, + scratch_pool)); + + /* Record the user's preference. */ + details->preferred_move_target_idx = preferred_move_target_idx; + + /* Update option description. */ + if (id == svn_client_conflict_option_both_moved_file_merge) + SVN_ERR(conflict_tree_get_description_update_both_moved_file_merge( + &option->description, conflict, ctx, conflict->pool, + scratch_pool)); + else if (id == svn_client_conflict_option_both_moved_file_move_merge) + SVN_ERR(conflict_tree_get_description_update_both_moved_file_move_merge( + &option->description, conflict, ctx, conflict->pool, scratch_pool)); +#if 0 /* ### TODO: Also handle options for directories! */ + else if (id == svn_client_conflict_option_both_moved_dir_merge) + { + } + else if (id == svn_client_conflict_option_both_moved_dir_move_merge) + { + } +#endif + else + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("Unexpected option id '%d'"), id); + } + else + { + struct conflict_tree_incoming_delete_details *details; + apr_array_header_t *move_target_wc_abspaths; + const char *moved_to_abspath; - /* Record the user's preference. */ - details->wc_move_target_idx = preferred_move_target_idx; + details = conflict->tree_conflict_incoming_details; + if (details == NULL || details->wc_move_targets == NULL) + return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, + _("Setting a move target requires details " + "for tree conflict at '%s' to be fetched " + "from the repository first"), + svn_dirent_local_style(victim_abspath, + scratch_pool)); - /* Update option description. */ - SVN_ERR(describe_incoming_move_merge_conflict_option(&option->description, - conflict, ctx, - details, - conflict->pool, + move_target_wc_abspaths = + svn_hash_gets(details->wc_move_targets, + get_moved_to_repos_relpath(details, scratch_pool)); + + if (preferred_move_target_idx < 0 || + preferred_move_target_idx > move_target_wc_abspaths->nelts) + return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL, + _("Index '%d' is out of bounds of the possible " + "move target list for '%s'"), + preferred_move_target_idx, + svn_dirent_local_style(victim_abspath, scratch_pool)); + + /* Record the user's preference. */ + details->wc_move_target_idx = preferred_move_target_idx; + + /* Update option description. */ + moved_to_abspath = APR_ARRAY_IDX(move_target_wc_abspaths, + details->wc_move_target_idx, + const char *); + SVN_ERR(describe_incoming_move_merge_conflict_option(&option->description, + conflict, ctx, + moved_to_abspath, + conflict->pool, + scratch_pool)); + } return SVN_NO_ERROR; } +svn_error_t * +svn_client_conflict_option_set_moved_to_abspath( + svn_client_conflict_option_t *option, + int preferred_move_target_idx, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + /* The only difference to API version 2 is an assertion failure if + * an unexpected option is passed. + * We do not emulate this old behaviour since clients written against + * the previous API will just keep working. */ + return svn_error_trace( + svn_client_conflict_option_set_moved_to_abspath2(option, + preferred_move_target_idx, ctx, scratch_pool)); +} + svn_error_t * svn_client_conflict_tree_get_resolution_options(apr_array_header_t **options, svn_client_conflict_t *conflict, @@ -10401,8 +12631,15 @@ svn_client_conflict_tree_get_resolution_options(apr_array_header_t **options, scratch_pool)); SVN_ERR(configure_option_incoming_dir_merge(conflict, ctx, *options, scratch_pool)); - SVN_ERR(configure_option_local_move_file_merge(conflict, ctx, *options, + SVN_ERR(configure_option_local_move_file_or_dir_merge(conflict, ctx, + *options, + scratch_pool)); + SVN_ERR(configure_option_sibling_move_merge(conflict, ctx, *options, + scratch_pool)); + SVN_ERR(configure_option_both_moved_file_merge(conflict, ctx, *options, scratch_pool)); + SVN_ERR(configure_option_both_moved_dir_merge(conflict, ctx, *options, + scratch_pool)); return SVN_NO_ERROR; } @@ -10947,6 +13184,7 @@ conflict_type_specific_setup(svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) { svn_boolean_t tree_conflicted; + svn_wc_operation_t operation; svn_wc_conflict_action_t incoming_change; svn_wc_conflict_reason_t local_change; @@ -10963,6 +13201,7 @@ conflict_type_specific_setup(svn_client_conflict_t *conflict, conflict->tree_conflict_get_local_description_func = conflict_tree_get_local_description_generic; + operation = svn_client_conflict_get_operation(conflict); incoming_change = svn_client_conflict_get_incoming_change(conflict); local_change = svn_client_conflict_get_local_change(conflict); @@ -10997,6 +13236,12 @@ conflict_type_specific_setup(svn_client_conflict_t *conflict, conflict->tree_conflict_get_local_details_func = conflict_tree_get_details_local_missing; } + else if (local_change == svn_wc_conflict_reason_moved_away && + operation == svn_wc_operation_update /* ### what about switch? */) + { + conflict->tree_conflict_get_local_details_func = + conflict_tree_get_details_update_local_moved_away; + } return SVN_NO_ERROR; } diff --git a/subversion/libsvn_client/copy.c b/subversion/libsvn_client/copy.c index 8b63ee8..b3f2bac 100644 --- a/subversion/libsvn_client/copy.c +++ b/subversion/libsvn_client/copy.c @@ -578,7 +578,7 @@ pin_externals_prop(svn_string_t **pinned_externals, static svn_error_t * resolve_pinned_externals(apr_hash_t **pinned_externals, const apr_hash_t *externals_to_pin, - svn_client__copy_pair_t *pair, + const svn_client__copy_pair_t *pair, svn_ra_session_t *ra_session, const char *repos_root_url, svn_client_ctx_t *ctx, @@ -1099,14 +1099,13 @@ verify_wc_dsts(const apr_array_header_t *copy_pairs, return SVN_NO_ERROR; } +/* Verify that the WC sources in COPY_PAIRS exist, and set pair->src_kind + for each. + */ static svn_error_t * -verify_wc_srcs_and_dsts(const apr_array_header_t *copy_pairs, - svn_boolean_t make_parents, - svn_boolean_t is_move, - svn_boolean_t metadata_only, - svn_client_ctx_t *ctx, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) +verify_wc_srcs(const apr_array_header_t *copy_pairs, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) { int i; apr_pool_t *iterpool = svn_pool_create(scratch_pool); @@ -1133,10 +1132,6 @@ verify_wc_srcs_and_dsts(const apr_array_header_t *copy_pairs, pair->src_abspath_or_url, scratch_pool)); } - - SVN_ERR(verify_wc_dsts(copy_pairs, make_parents, is_move, metadata_only, ctx, - result_pool, iterpool)); - svn_pool_destroy(iterpool); return SVN_NO_ERROR; @@ -1163,10 +1158,6 @@ typedef struct path_driver_info_t or move operation. */ struct path_driver_cb_baton { - /* The editor (and its state) used to perform the operation. */ - const svn_delta_editor_t *editor; - void *edit_baton; - /* A hash of path -> path_driver_info_t *'s. */ apr_hash_t *action_hash; @@ -1176,6 +1167,8 @@ struct path_driver_cb_baton static svn_error_t * path_driver_cb_func(void **dir_baton, + const svn_delta_editor_t *editor, + void *edit_baton, void *parent_baton, void *callback_baton, const char *path, @@ -1196,9 +1189,9 @@ path_driver_cb_func(void **dir_baton, /* Check to see if we need to add the path as a parent directory. */ if (path_info->dir_add) { - return cb_baton->editor->add_directory(path, parent_baton, NULL, - SVN_INVALID_REVNUM, pool, - dir_baton); + return editor->add_directory(path, parent_baton, NULL, + SVN_INVALID_REVNUM, pool, + dir_baton); } /* If this is a resurrection, we know the source and dest paths are @@ -1230,8 +1223,8 @@ path_driver_cb_func(void **dir_baton, if (do_delete) { - SVN_ERR(cb_baton->editor->delete_entry(path, SVN_INVALID_REVNUM, - parent_baton, pool)); + SVN_ERR(editor->delete_entry(path, SVN_INVALID_REVNUM, + parent_baton, pool)); } if (do_add) { @@ -1240,40 +1233,40 @@ path_driver_cb_func(void **dir_baton, if (path_info->src_kind == svn_node_file) { void *file_baton; - SVN_ERR(cb_baton->editor->add_file(path, parent_baton, - path_info->src_url, - path_info->src_revnum, - pool, &file_baton)); + SVN_ERR(editor->add_file(path, parent_baton, + path_info->src_url, + path_info->src_revnum, + pool, &file_baton)); if (path_info->mergeinfo) - SVN_ERR(cb_baton->editor->change_file_prop(file_baton, - SVN_PROP_MERGEINFO, - path_info->mergeinfo, - pool)); - SVN_ERR(cb_baton->editor->close_file(file_baton, NULL, pool)); + SVN_ERR(editor->change_file_prop(file_baton, + SVN_PROP_MERGEINFO, + path_info->mergeinfo, + pool)); + SVN_ERR(editor->close_file(file_baton, NULL, pool)); } else { - SVN_ERR(cb_baton->editor->add_directory(path, parent_baton, - path_info->src_url, - path_info->src_revnum, - pool, dir_baton)); + SVN_ERR(editor->add_directory(path, parent_baton, + path_info->src_url, + path_info->src_revnum, + pool, dir_baton)); if (path_info->mergeinfo) - SVN_ERR(cb_baton->editor->change_dir_prop(*dir_baton, - SVN_PROP_MERGEINFO, - path_info->mergeinfo, - pool)); + SVN_ERR(editor->change_dir_prop(*dir_baton, + SVN_PROP_MERGEINFO, + path_info->mergeinfo, + pool)); } } if (path_info->externals) { if (*dir_baton == NULL) - SVN_ERR(cb_baton->editor->open_directory(path, parent_baton, - SVN_INVALID_REVNUM, - pool, dir_baton)); + SVN_ERR(editor->open_directory(path, parent_baton, + SVN_INVALID_REVNUM, + pool, dir_baton)); - SVN_ERR(cb_baton->editor->change_dir_prop(*dir_baton, SVN_PROP_EXTERNALS, - path_info->externals, pool)); + SVN_ERR(editor->change_dir_prop(*dir_baton, SVN_PROP_EXTERNALS, + path_info->externals, pool)); } return SVN_NO_ERROR; @@ -1857,13 +1850,11 @@ repos_to_repos_copy(const apr_array_header_t *copy_pairs, pool)); /* Setup the callback baton. */ - cb_baton.editor = editor; - cb_baton.edit_baton = edit_baton; cb_baton.action_hash = action_hash; cb_baton.is_move = is_move; /* Call the path-based editor driver. */ - err = svn_delta_path_driver2(editor, edit_baton, paths, TRUE, + err = svn_delta_path_driver3(editor, edit_baton, paths, TRUE, path_driver_cb_func, &cb_baton, pool); if (err) { @@ -2318,9 +2309,15 @@ struct notification_adjust_baton }; /* A svn_wc_notify_func2_t function that wraps BATON->inner_func (whose - * baton is BATON->inner_baton) and adjusts the notification paths that - * start with BATON->checkout_abspath to start instead with - * BATON->final_abspath. */ + * baton is BATON->inner_baton) to turn the result of a 'checkout' into + * what we want to see for a 'copy to WC' operation. + * + * - Adjust the notification paths that start with BATON->checkout_abspath + * to start instead with BATON->final_abspath. + * - Change start-of-update notification into a plain WC 'add' for the root. + * - Change checkout 'add' notifications into a plain WC 'add'. + * - Discard 'update_completed' notifications. + */ static void notification_adjust_func(void *baton, const svn_wc_notify_t *notify, @@ -2333,18 +2330,372 @@ notification_adjust_func(void *baton, relpath = svn_dirent_skip_ancestor(nb->checkout_abspath, notify->path); inner_notify->path = svn_dirent_join(nb->final_abspath, relpath, pool); + /* Convert 'update' notifications to plain 'add' notifications; discard + notifications about checkout/update starting/finishing. */ + if (notify->action == svn_wc_notify_update_started /* root */ + || notify->action == svn_wc_notify_update_add) /* non-root */ + { + inner_notify->action = svn_wc_notify_add; + } + else if (notify->action == svn_wc_notify_update_update + || notify->action == svn_wc_notify_update_completed) + { + /* update_update happens only for a prop mod on root; the root was + already notified so discard this */ + return; + } + if (nb->inner_func) nb->inner_func(nb->inner_baton, inner_notify, pool); } +/** Copy a directory tree from a remote repository. + * + * Copy from RA_SESSION:LOCATION to WC_CTX:DST_ABSPATH. + * + * Create the directory DST_ABSPATH, if not present. Its parent should be + * already under version control in the WC and in a suitable state for + * scheduling the addition of a child. + * + * Ignore any incoming non-regular properties (entry-props, DAV/WC-props). + * Remove any incoming 'svn:mergeinfo' properties. + */ +static svn_error_t * +copy_foreign_dir(svn_ra_session_t *ra_session, + const svn_client__pathrev_t *location, + const char *dst_abspath, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + svn_cancel_func_t cancel_func, + void *cancel_baton, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + const svn_delta_editor_t *editor; + void *eb; + const svn_delta_editor_t *wrapped_editor; + void *wrapped_baton; + const svn_ra_reporter3_t *reporter; + void *reporter_baton; + + /* Get a WC editor. It does not need an RA session because we will not + be sending it any 'copy from' requests, only 'add' requests. */ + SVN_ERR(svn_client__wc_editor_internal(&editor, &eb, + dst_abspath, + TRUE /*root_dir_add*/, + TRUE /*ignore_mergeinfo_changes*/, + FALSE /*manage_wc_write_lock*/, + notify_func, notify_baton, + NULL /*ra_session*/, + ctx, scratch_pool)); + + SVN_ERR(svn_delta_get_cancellation_editor(cancel_func, cancel_baton, + editor, eb, + &wrapped_editor, &wrapped_baton, + scratch_pool)); + + SVN_ERR(svn_ra_do_update3(ra_session, &reporter, &reporter_baton, + location->rev, "", svn_depth_infinity, + FALSE, FALSE, wrapped_editor, wrapped_baton, + scratch_pool, scratch_pool)); + + SVN_ERR(reporter->set_path(reporter_baton, "", location->rev, + svn_depth_infinity /* irrelevant */, + TRUE /*start_empty*/, + NULL, scratch_pool)); + + SVN_ERR(reporter->finish_report(reporter_baton, scratch_pool)); + + return SVN_NO_ERROR; +} + +/* Implementation of svn_client__repos_to_wc_copy() for a dir. + */ +static svn_error_t * +svn_client__repos_to_wc_copy_dir(svn_boolean_t *timestamp_sleep, + const char *src_url, + svn_revnum_t src_revnum, + const char *dst_abspath, + svn_boolean_t same_repositories, + svn_ra_session_t *ra_session, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + const char *tmpdir_abspath, *tmp_abspath; + + SVN_ERR_ASSERT(svn_dirent_is_absolute(dst_abspath)); + + if (!same_repositories) + { + svn_client__pathrev_t *location; + + *timestamp_sleep = TRUE; + + /* ### Reparenting "ra_session" can't be right, can it? As this is + a foreign repo, surely we need a new RA session? */ + SVN_ERR(svn_client__pathrev_create_with_session(&location, ra_session, + src_revnum, src_url, + scratch_pool)); + SVN_ERR(svn_ra_reparent(ra_session, src_url, scratch_pool)); + SVN_ERR(copy_foreign_dir(ra_session, location, + dst_abspath, + ctx->notify_func2, ctx->notify_baton2, + ctx->cancel_func, ctx->cancel_baton, + ctx, scratch_pool)); + + return SVN_NO_ERROR; + } + + /* Find a temporary location in which to check out the copy source. */ + SVN_ERR(svn_wc__get_tmpdir(&tmpdir_abspath, ctx->wc_ctx, dst_abspath, + scratch_pool, scratch_pool)); + + /* Get a temporary path. The crude way we do this is to create a + temporary file, remember its name, and let it be deleted immediately. */ + SVN_ERR(svn_io_open_unique_file3(NULL, &tmp_abspath, tmpdir_abspath, + svn_io_file_del_on_close, + scratch_pool, scratch_pool)); + + /* Make a new checkout of the requested source. While doing so, + * resolve copy_src_revnum to an actual revision number in case it + * was until now 'invalid' meaning 'head'. Ask this function not to + * sleep for timestamps, by passing a sleep_needed output param. + * Send notifications for all nodes except the root node, and adjust + * them to refer to the destination rather than this temporary path. */ + { + svn_wc_notify_func2_t old_notify_func2 = ctx->notify_func2; + void *old_notify_baton2 = ctx->notify_baton2; + struct notification_adjust_baton nb; + svn_error_t *err; + svn_opt_revision_t copy_src_revision; + + copy_src_revision.kind = svn_opt_revision_number; + copy_src_revision.value.number = src_revnum; + + nb.inner_func = ctx->notify_func2; + nb.inner_baton = ctx->notify_baton2; + nb.checkout_abspath = tmp_abspath; + nb.final_abspath = dst_abspath; + ctx->notify_func2 = notification_adjust_func; + ctx->notify_baton2 = &nb; + + err = svn_client__checkout_internal(NULL /*result_rev*/, timestamp_sleep, + src_url, + tmp_abspath, + ©_src_revision, + ©_src_revision, + svn_depth_infinity, + TRUE /*ignore_externals*/, + FALSE, /* we don't allow obstructions */ + ra_session, ctx, scratch_pool); + + ctx->notify_func2 = old_notify_func2; + ctx->notify_baton2 = old_notify_baton2; + + SVN_ERR(err); + } + + /* Schedule dst_path for addition in parent, with copy history. + Don't send any notification here. + Then remove the temporary checkout's .svn dir in preparation for + moving the rest of it into the final destination. */ + SVN_ERR(svn_wc_copy3(ctx->wc_ctx, tmp_abspath, dst_abspath, + TRUE /* metadata_only */, + NULL, NULL, /* don't allow user to cancel here */ + NULL, NULL, scratch_pool)); + SVN_ERR(svn_wc__acquire_write_lock(NULL, ctx->wc_ctx, tmp_abspath, + FALSE, scratch_pool, scratch_pool)); + SVN_ERR(svn_wc_remove_from_revision_control2(ctx->wc_ctx, + tmp_abspath, + FALSE, FALSE, + NULL, NULL, /* don't cancel */ + scratch_pool)); + + /* Move the temporary disk tree into place. */ + SVN_ERR(svn_io_file_rename2(tmp_abspath, dst_abspath, FALSE, scratch_pool)); + + return SVN_NO_ERROR; +} + +/* Implementation of svn_client__repos_to_wc_copy() for a file. + * + * This has no 'ignore_externals' parameter because we don't support the + * 'svn:externals' property being set on a file. + */ +static svn_error_t * +svn_client__repos_to_wc_copy_file(svn_boolean_t *timestamp_sleep, + const char *src_url, + svn_revnum_t src_rev, + const char *dst_abspath, + svn_boolean_t same_repositories, + svn_ra_session_t *ra_session, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + const char *src_rel; + apr_hash_t *new_props; + svn_stream_t *new_base_contents = svn_stream_buffered(scratch_pool); + + SVN_ERR(svn_ra_get_path_relative_to_session(ra_session, &src_rel, src_url, + scratch_pool)); + /* Fetch the file content. */ + SVN_ERR(svn_ra_get_file(ra_session, src_rel, src_rev, + new_base_contents, NULL, &new_props, + scratch_pool)); + if (!same_repositories) + svn_hash_sets(new_props, SVN_PROP_MERGEINFO, NULL); + + *timestamp_sleep = TRUE; + SVN_ERR(svn_wc_add_repos_file4( + ctx->wc_ctx, dst_abspath, + new_base_contents, NULL, new_props, NULL, + same_repositories ? src_url : NULL, + same_repositories ? src_rev : SVN_INVALID_REVNUM, + ctx->cancel_func, ctx->cancel_baton, + scratch_pool)); + /* Do our own notification for the root node, even if we could possibly + have delegated it. See also issue #2198. */ + if (ctx->notify_func2) + { + svn_wc_notify_t *notify + = svn_wc_create_notify(dst_abspath, svn_wc_notify_add, scratch_pool); + + notify->kind = svn_node_file; + ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool); + } + return SVN_NO_ERROR; +} + +/* Are RA_SESSION and the versioned *parent* dir of WC_TARGET_ABSPATH in + * the same repository? + */ +static svn_error_t * +is_same_repository(svn_boolean_t *same_repository, + svn_ra_session_t *ra_session, + const char *wc_target_abspath, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + const char *src_uuid, *dst_uuid; + + /* Get the repository UUIDs of copy source URL and WC parent path */ + SVN_ERR(svn_ra_get_uuid2(ra_session, &src_uuid, scratch_pool)); + SVN_ERR(svn_client_get_repos_root(NULL /*root_url*/, &dst_uuid, + svn_dirent_dirname(wc_target_abspath, + scratch_pool), + ctx, scratch_pool, scratch_pool)); + *same_repository = (strcmp(src_uuid, dst_uuid) == 0); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__repos_to_wc_copy_internal(svn_boolean_t *timestamp_sleep, + svn_node_kind_t kind, + const char *src_url, + svn_revnum_t src_rev, + const char *dst_abspath, + svn_ra_session_t *ra_session, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + const char *old_session_url; + svn_boolean_t timestamp_sleep_ignored; + svn_boolean_t same_repositories; + + SVN_ERR(svn_client__ensure_ra_session_url(&old_session_url, ra_session, + src_url, scratch_pool)); + + SVN_ERR(is_same_repository(&same_repositories, + ra_session, dst_abspath, ctx, scratch_pool)); + + if (!timestamp_sleep) + timestamp_sleep = ×tamp_sleep_ignored; + + if (kind == svn_node_dir) + { + SVN_ERR(svn_client__repos_to_wc_copy_dir(timestamp_sleep, + src_url, src_rev, + dst_abspath, + same_repositories, + ra_session, + ctx, scratch_pool)); + } + else if (kind == svn_node_file) + { + SVN_ERR(svn_client__repos_to_wc_copy_file(timestamp_sleep, + src_url, src_rev, + dst_abspath, + same_repositories, + ra_session, + ctx, scratch_pool)); + } + + /* Reparent the session back to the original URL. */ + SVN_ERR(svn_ra_reparent(ra_session, old_session_url, scratch_pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__repos_to_wc_copy_by_editor(svn_boolean_t *timestamp_sleep, + svn_node_kind_t kind, + const char *src_url, + svn_revnum_t src_rev, + const char *dst_abspath, + svn_ra_session_t *ra_session, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + const svn_delta_editor_t *editor; + void *eb; + const char *src_anchor = svn_uri_dirname(src_url, scratch_pool); + const char *dst_target = svn_dirent_basename(dst_abspath, scratch_pool); + void *rb, *db; + + SVN_ERR(svn_ra_reparent(ra_session, src_anchor, scratch_pool)); + + SVN_ERR(svn_client__wc_editor_internal( + &editor, &eb, + svn_dirent_dirname(dst_abspath, scratch_pool), + FALSE /*root_dir_add*/, + FALSE /*ignore_mergeinfo_changes*/, + FALSE /*manage_wc_write_lock*/, + ctx->notify_func2, ctx->notify_baton2, + ra_session, + ctx, scratch_pool)); + + SVN_ERR(editor->open_root(eb, SVN_INVALID_REVNUM, scratch_pool, &rb)); + if (kind == svn_node_dir) + { + SVN_ERR(editor->add_directory(dst_target, rb, + src_url, src_rev, + scratch_pool, + &db)); + SVN_ERR(editor->close_directory(db, scratch_pool)); + } + else + { + SVN_ERR(editor->add_file(dst_target, rb, + src_url, src_rev, + scratch_pool, + &db)); + SVN_ERR(editor->close_file(db, NULL, scratch_pool)); + } + SVN_ERR(editor->close_edit(eb, scratch_pool)); + + if (timestamp_sleep) + *timestamp_sleep = TRUE; + return SVN_NO_ERROR; +} + /* Peform each individual copy operation for a repos -> wc copy. A helper for repos_to_wc_copy(). - Resolve PAIR->src_revnum to a real revision number if it isn't already. */ + PAIR->src_revnum PAIR->src_abspath_or_url should already have been + resolved to the operative revision number and operative URL. + */ static svn_error_t * repos_to_wc_copy_single(svn_boolean_t *timestamp_sleep, - svn_client__copy_pair_t *pair, - svn_boolean_t same_repositories, + const svn_client__copy_pair_t *pair, svn_boolean_t ignore_externals, svn_boolean_t pin_externals, const apr_hash_t *externals_to_pin, @@ -2354,9 +2705,14 @@ repos_to_wc_copy_single(svn_boolean_t *timestamp_sleep, { apr_hash_t *src_mergeinfo; const char *dst_abspath = pair->dst_abspath_or_url; + svn_boolean_t same_repositories; + SVN_ERR_ASSERT(SVN_IS_VALID_REVNUM(pair->src_revnum)); + SVN_ERR_ASSERT(svn_path_is_url(pair->src_abspath_or_url)); SVN_ERR_ASSERT(svn_dirent_is_absolute(dst_abspath)); + SVN_ERR(is_same_repository(&same_repositories, + ra_session, dst_abspath, ctx, pool)); if (!same_repositories && ctx->notify_func2) { svn_wc_notify_t *notify; @@ -2372,135 +2728,59 @@ repos_to_wc_copy_single(svn_boolean_t *timestamp_sleep, SVN_ERR(ctx->cancel_func(ctx->cancel_baton)); } - if (pair->src_kind == svn_node_dir) + SVN_ERR(svn_client__repos_to_wc_copy_by_editor( + timestamp_sleep, + pair->src_kind, + pair->src_abspath_or_url, + pair->src_revnum, + dst_abspath, + ra_session, ctx, pool)); + + /* Fetch externals, pinning them if requested */ + if (!ignore_externals && pair->src_kind == svn_node_dir) { if (same_repositories) { - const char *tmpdir_abspath, *tmp_abspath; - - /* Find a temporary location in which to check out the copy source. */ - SVN_ERR(svn_wc__get_tmpdir(&tmpdir_abspath, ctx->wc_ctx, dst_abspath, - pool, pool)); - - SVN_ERR(svn_io_open_unique_file3(NULL, &tmp_abspath, tmpdir_abspath, - svn_io_file_del_on_close, pool, pool)); - - /* Make a new checkout of the requested source. While doing so, - * resolve pair->src_revnum to an actual revision number in case it - * was until now 'invalid' meaning 'head'. Ask this function not to - * sleep for timestamps, by passing a sleep_needed output param. - * Send notifications for all nodes except the root node, and adjust - * them to refer to the destination rather than this temporary path. */ - { - svn_wc_notify_func2_t old_notify_func2 = ctx->notify_func2; - void *old_notify_baton2 = ctx->notify_baton2; - struct notification_adjust_baton nb; - svn_error_t *err; - - nb.inner_func = ctx->notify_func2; - nb.inner_baton = ctx->notify_baton2; - nb.checkout_abspath = tmp_abspath; - nb.final_abspath = dst_abspath; - ctx->notify_func2 = notification_adjust_func; - ctx->notify_baton2 = &nb; - - /* Avoid a chicken-and-egg problem: - * If pinning externals we'll need to adjust externals - * properties before checking out any externals. - * But copy needs to happen before pinning because else there - * are no svn:externals properties to pin. */ - if (pin_externals) - ignore_externals = TRUE; - - err = svn_client__checkout_internal(&pair->src_revnum, timestamp_sleep, - pair->src_original, - tmp_abspath, - &pair->src_peg_revision, - &pair->src_op_revision, - svn_depth_infinity, - ignore_externals, FALSE, - ra_session, ctx, pool); - - ctx->notify_func2 = old_notify_func2; - ctx->notify_baton2 = old_notify_baton2; - - SVN_ERR(err); - } - - *timestamp_sleep = TRUE; - - /* Schedule dst_path for addition in parent, with copy history. - Don't send any notification here. - Then remove the temporary checkout's .svn dir in preparation for - moving the rest of it into the final destination. */ - SVN_ERR(svn_wc_copy3(ctx->wc_ctx, tmp_abspath, dst_abspath, - TRUE /* metadata_only */, - ctx->cancel_func, ctx->cancel_baton, - NULL, NULL, pool)); - SVN_ERR(svn_wc__acquire_write_lock(NULL, ctx->wc_ctx, tmp_abspath, - FALSE, pool, pool)); - SVN_ERR(svn_wc_remove_from_revision_control2(ctx->wc_ctx, - tmp_abspath, - FALSE, FALSE, - ctx->cancel_func, - ctx->cancel_baton, - pool)); - - /* Move the temporary disk tree into place. */ - SVN_ERR(svn_io_file_rename2(tmp_abspath, dst_abspath, FALSE, pool)); - } - else - { - *timestamp_sleep = TRUE; - - SVN_ERR(svn_client__copy_foreign(pair->src_original, - dst_abspath, - &pair->src_peg_revision, - &pair->src_op_revision, - svn_depth_infinity, - FALSE /* make_parents */, - TRUE /* already_locked */, - ctx, pool)); - - return SVN_NO_ERROR; - } - - if (pin_externals) - { - apr_hash_t *pinned_externals; - apr_hash_index_t *hi; - apr_pool_t *iterpool; const char *repos_root_url; apr_hash_t *new_externals; apr_hash_t *new_depths; SVN_ERR(svn_ra_get_repos_root2(ra_session, &repos_root_url, pool)); - SVN_ERR(resolve_pinned_externals(&pinned_externals, - externals_to_pin, pair, - ra_session, repos_root_url, - ctx, pool, pool)); - iterpool = svn_pool_create(pool); - for (hi = apr_hash_first(pool, pinned_externals); - hi; - hi = apr_hash_next(hi)) + if (pin_externals) { - const char *dst_relpath = apr_hash_this_key(hi); - svn_string_t *externals_propval = apr_hash_this_val(hi); - const char *local_abspath; + apr_hash_t *pinned_externals; + apr_hash_index_t *hi; + apr_pool_t *iterpool; + + SVN_ERR(resolve_pinned_externals(&pinned_externals, + externals_to_pin, pair, + ra_session, repos_root_url, + ctx, pool, pool)); + + iterpool = svn_pool_create(pool); + for (hi = apr_hash_first(pool, pinned_externals); + hi; + hi = apr_hash_next(hi)) + { + const char *dst_relpath = apr_hash_this_key(hi); + svn_string_t *externals_propval = apr_hash_this_val(hi); + const char *local_abspath; - svn_pool_clear(iterpool); + svn_pool_clear(iterpool); - local_abspath = svn_dirent_join(pair->dst_abspath_or_url, - dst_relpath, iterpool); - /* ### use a work queue? */ - SVN_ERR(svn_wc_prop_set4(ctx->wc_ctx, local_abspath, - SVN_PROP_EXTERNALS, externals_propval, - svn_depth_empty, TRUE /* skip_checks */, - NULL /* changelist_filter */, - ctx->cancel_func, ctx->cancel_baton, - NULL, NULL, /* no extra notification */ - iterpool)); + local_abspath = svn_dirent_join(pair->dst_abspath_or_url, + dst_relpath, iterpool); + /* ### use a work queue? */ + SVN_ERR(svn_wc_prop_set4(ctx->wc_ctx, local_abspath, + SVN_PROP_EXTERNALS, externals_propval, + svn_depth_empty, TRUE /* skip_checks */, + NULL /* changelist_filter */, + ctx->cancel_func, ctx->cancel_baton, + NULL, NULL, /* no extra notification */ + iterpool)); + } + svn_pool_destroy(iterpool); } /* Now update all externals in the newly created copy. */ @@ -2509,51 +2789,20 @@ repos_to_wc_copy_single(svn_boolean_t *timestamp_sleep, ctx->wc_ctx, dst_abspath, svn_depth_infinity, - iterpool, iterpool)); + pool, pool)); SVN_ERR(svn_client__handle_externals(new_externals, new_depths, repos_root_url, dst_abspath, svn_depth_infinity, timestamp_sleep, ra_session, - ctx, iterpool)); - svn_pool_destroy(iterpool); + ctx, pool)); } - } /* end directory case */ - - else if (pair->src_kind == svn_node_file) - { - apr_hash_t *new_props; - const char *src_rel; - svn_stream_t *new_base_contents = svn_stream_buffered(pool); - - SVN_ERR(svn_ra_get_path_relative_to_session(ra_session, &src_rel, - pair->src_abspath_or_url, - pool)); - /* Fetch the file content. While doing so, resolve pair->src_revnum - * to an actual revision number if it's 'invalid' meaning 'head'. */ - SVN_ERR(svn_ra_get_file(ra_session, src_rel, pair->src_revnum, - new_base_contents, - &pair->src_revnum, &new_props, pool)); - - if (new_props && ! same_repositories) - svn_hash_sets(new_props, SVN_PROP_MERGEINFO, NULL); - - *timestamp_sleep = TRUE; - - SVN_ERR(svn_wc_add_repos_file4( - ctx->wc_ctx, dst_abspath, - new_base_contents, NULL, new_props, NULL, - same_repositories ? pair->src_abspath_or_url : NULL, - same_repositories ? pair->src_revnum : SVN_INVALID_REVNUM, - ctx->cancel_func, ctx->cancel_baton, - pool)); } if (same_repositories) { - /* Record the implied mergeinfo (before the notification callback - is invoked for the root node). */ + /* Record the implied mergeinfo. */ SVN_ERR(svn_client__get_repos_mergeinfo(&src_mergeinfo, ra_session, pair->src_abspath_or_url, pair->src_revnum, @@ -2561,18 +2810,9 @@ repos_to_wc_copy_single(svn_boolean_t *timestamp_sleep, TRUE /*squelch_incapable*/, pool)); SVN_ERR(extend_wc_mergeinfo(dst_abspath, src_mergeinfo, ctx, pool)); - } - /* Do our own notification for the root node, even if we could possibly - have delegated it. See also issue #1552. - - ### Maybe this notification should mention the mergeinfo change. */ - if (ctx->notify_func2) - { - svn_wc_notify_t *notify = svn_wc_create_notify( - dst_abspath, svn_wc_notify_add, pool); - notify->kind = pair->src_kind; - ctx->notify_func2(ctx->notify_baton2, notify, pool); + /* ### Maybe the notification should mention this mergeinfo change. */ + /* ### Maybe we should do this during rather than after the copy. */ } return SVN_NO_ERROR; @@ -2590,38 +2830,8 @@ repos_to_wc_copy_locked(svn_boolean_t *timestamp_sleep, apr_pool_t *scratch_pool) { int i; - svn_boolean_t same_repositories; apr_pool_t *iterpool = svn_pool_create(scratch_pool); - /* We've already checked for physical obstruction by a working file. - But there could also be logical obstruction by an entry whose - working file happens to be missing.*/ - SVN_ERR(verify_wc_dsts(copy_pairs, FALSE, FALSE, FALSE /* metadata_only */, - ctx, scratch_pool, iterpool)); - - /* Decide whether the two repositories are the same or not. */ - { - const char *parent_abspath; - const char *src_uuid, *dst_uuid; - - /* Get the repository uuid of SRC_URL */ - SVN_ERR(svn_ra_get_uuid2(ra_session, &src_uuid, iterpool)); - - /* Get repository uuid of dst's parent directory, since dst may - not exist. ### TODO: we should probably walk up the wc here, - in case the parent dir has an imaginary URL. */ - if (copy_pairs->nelts == 1) - parent_abspath = svn_dirent_dirname(top_dst_abspath, scratch_pool); - else - parent_abspath = top_dst_abspath; - - SVN_ERR(svn_client_get_repos_root(NULL /* root_url */, &dst_uuid, - parent_abspath, ctx, - iterpool, iterpool)); - /* ### Also check repos_root_url? */ - same_repositories = (strcmp(src_uuid, dst_uuid) == 0); - } - /* Perform the move for each of the copy_pairs. */ for (i = 0; i < copy_pairs->nelts; i++) { @@ -2634,7 +2844,6 @@ repos_to_wc_copy_locked(svn_boolean_t *timestamp_sleep, SVN_ERR(repos_to_wc_copy_single(timestamp_sleep, APR_ARRAY_IDX(copy_pairs, i, svn_client__copy_pair_t *), - same_repositories, ignore_externals, pin_externals, externals_to_pin, ra_session, ctx, iterpool)); @@ -2647,7 +2856,6 @@ repos_to_wc_copy_locked(svn_boolean_t *timestamp_sleep, static svn_error_t * repos_to_wc_copy(svn_boolean_t *timestamp_sleep, const apr_array_header_t *copy_pairs, - svn_boolean_t make_parents, svn_boolean_t ignore_externals, svn_boolean_t pin_externals, const apr_hash_t *externals_to_pin, @@ -2701,8 +2909,6 @@ repos_to_wc_copy(svn_boolean_t *timestamp_sleep, { svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i, svn_client__copy_pair_t *); - svn_node_kind_t dst_parent_kind, dst_kind; - const char *dst_parent; const char *src_rel; svn_pool_clear(iterpool); @@ -2726,43 +2932,6 @@ repos_to_wc_copy(svn_boolean_t *timestamp_sleep, _("Path '%s' not found in head revision"), pair->src_abspath_or_url); } - - /* Figure out about dst. */ - SVN_ERR(svn_io_check_path(pair->dst_abspath_or_url, &dst_kind, - iterpool)); - if (dst_kind != svn_node_none) - { - return svn_error_createf( - SVN_ERR_ENTRY_EXISTS, NULL, - _("Path '%s' already exists"), - svn_dirent_local_style(pair->dst_abspath_or_url, pool)); - } - - /* Make sure the destination parent is a directory and produce a clear - error message if it is not. */ - dst_parent = svn_dirent_dirname(pair->dst_abspath_or_url, iterpool); - SVN_ERR(svn_io_check_path(dst_parent, &dst_parent_kind, iterpool)); - if (make_parents && dst_parent_kind == svn_node_none) - { - SVN_ERR(svn_client__make_local_parents(dst_parent, TRUE, ctx, - iterpool)); - } - else if (make_parents && dst_parent_kind == svn_node_dir) - { - SVN_ERR(svn_wc_read_kind2(&dst_parent_kind, ctx->wc_ctx, dst_parent, - FALSE, TRUE, iterpool)); - if (dst_parent_kind == svn_node_none) - { - SVN_ERR(svn_client__make_local_parents(dst_parent, TRUE, ctx, - iterpool)); - } - } - else if (dst_parent_kind != svn_node_dir) - { - return svn_error_createf(SVN_ERR_WC_NOT_WORKING_COPY, NULL, - _("Path '%s' is not a directory"), - svn_dirent_local_style(dst_parent, pool)); - } } svn_pool_destroy(iterpool); @@ -3085,8 +3254,9 @@ try_copy(svn_boolean_t *timestamp_sleep, /* Now, call the right handler for the operation. */ if ((! srcs_are_urls) && (! dst_is_url)) { - SVN_ERR(verify_wc_srcs_and_dsts(copy_pairs, make_parents, is_move, - metadata_only, ctx, pool, pool)); + SVN_ERR(verify_wc_srcs(copy_pairs, ctx, pool)); + SVN_ERR(verify_wc_dsts(copy_pairs, make_parents, is_move, metadata_only, + ctx, pool, pool)); /* Copy or move all targets. */ if (is_move) @@ -3116,9 +3286,13 @@ try_copy(svn_boolean_t *timestamp_sleep, } else if ((srcs_are_urls) && (! dst_is_url)) { + SVN_ERR(verify_wc_dsts(copy_pairs, make_parents, + FALSE, FALSE /* metadata_only */, + ctx, pool, pool)); + return svn_error_trace( repos_to_wc_copy(timestamp_sleep, - copy_pairs, make_parents, ignore_externals, + copy_pairs, ignore_externals, pin_externals, externals_to_pin, ctx, pool)); } else diff --git a/subversion/libsvn_client/copy_foreign.c b/subversion/libsvn_client/copy_foreign.c deleted file mode 100644 index cfe6aea..0000000 --- a/subversion/libsvn_client/copy_foreign.c +++ /dev/null @@ -1,575 +0,0 @@ -/* - * copy_foreign.c: copy from other repository support. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ - -/* ==================================================================== */ - -/*** Includes. ***/ - -#include -#include "svn_hash.h" -#include "svn_client.h" -#include "svn_delta.h" -#include "svn_dirent_uri.h" -#include "svn_error.h" -#include "svn_error_codes.h" -#include "svn_path.h" -#include "svn_pools.h" -#include "svn_props.h" -#include "svn_ra.h" -#include "svn_wc.h" - -#include - -#include "client.h" -#include "private/svn_subr_private.h" -#include "private/svn_wc_private.h" -#include "svn_private_config.h" - -struct edit_baton_t -{ - apr_pool_t *pool; - const char *anchor_abspath; - - svn_wc_context_t *wc_ctx; - svn_wc_notify_func2_t notify_func; - void *notify_baton; -}; - -struct dir_baton_t -{ - apr_pool_t *pool; - - struct dir_baton_t *pb; - struct edit_baton_t *eb; - - const char *local_abspath; - - svn_boolean_t created; - apr_hash_t *properties; - - int users; -}; - -/* svn_delta_editor_t function */ -static svn_error_t * -edit_open(void *edit_baton, - svn_revnum_t base_revision, - apr_pool_t *result_pool, - void **root_baton) -{ - struct edit_baton_t *eb = edit_baton; - apr_pool_t *dir_pool = svn_pool_create(eb->pool); - struct dir_baton_t *db = apr_pcalloc(dir_pool, sizeof(*db)); - - db->pool = dir_pool; - db->eb = eb; - db->users = 1; - db->local_abspath = eb->anchor_abspath; - - SVN_ERR(svn_io_make_dir_recursively(eb->anchor_abspath, dir_pool)); - - *root_baton = db; - - return SVN_NO_ERROR; -} - -/* svn_delta_editor_t function */ -static svn_error_t * -edit_close(void *edit_baton, - apr_pool_t *scratch_pool) -{ - return SVN_NO_ERROR; -} - -static svn_error_t * -dir_add(const char *path, - void *parent_baton, - const char *copyfrom_path, - svn_revnum_t copyfrom_revision, - apr_pool_t *result_pool, - void **child_baton) -{ - struct dir_baton_t *pb = parent_baton; - struct edit_baton_t *eb = pb->eb; - apr_pool_t *dir_pool = svn_pool_create(pb->pool); - struct dir_baton_t *db = apr_pcalloc(dir_pool, sizeof(*db)); - svn_boolean_t under_root; - - pb->users++; - - db->pb = pb; - db->eb = pb->eb; - db->pool = dir_pool; - db->users = 1; - - SVN_ERR(svn_dirent_is_under_root(&under_root, &db->local_abspath, - eb->anchor_abspath, path, db->pool)); - if (! under_root) - { - return svn_error_createf( - SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL, - _("Path '%s' is not in the working copy"), - svn_dirent_local_style(path, db->pool)); - } - - SVN_ERR(svn_io_make_dir_recursively(db->local_abspath, db->pool)); - - *child_baton = db; - return SVN_NO_ERROR; -} - -static svn_error_t * -dir_change_prop(void *dir_baton, - const char *name, - const svn_string_t *value, - apr_pool_t *scratch_pool) -{ - struct dir_baton_t *db = dir_baton; - struct edit_baton_t *eb = db->eb; - svn_prop_kind_t prop_kind; - - prop_kind = svn_property_kind2(name); - - if (prop_kind != svn_prop_regular_kind - || ! strcmp(name, SVN_PROP_MERGEINFO)) - { - /* We can't handle DAV, ENTRY and merge specific props here */ - return SVN_NO_ERROR; - } - - if (! db->created) - { - /* We can still store them in the hash for immediate addition - with the svn_wc_add_from_disk3() call */ - if (! db->properties) - db->properties = apr_hash_make(db->pool); - - if (value != NULL) - svn_hash_sets(db->properties, apr_pstrdup(db->pool, name), - svn_string_dup(value, db->pool)); - } - else - { - /* We have already notified for this directory, so don't do that again */ - SVN_ERR(svn_wc_prop_set4(eb->wc_ctx, db->local_abspath, name, value, - svn_depth_empty, FALSE, NULL, - NULL, NULL, /* Cancellation */ - NULL, NULL, /* Notification */ - scratch_pool)); - } - - return SVN_NO_ERROR; -} - -/* Releases the directory baton if there are no more users */ -static svn_error_t * -maybe_done(struct dir_baton_t *db) -{ - db->users--; - - if (db->users == 0) - { - struct dir_baton_t *pb = db->pb; - - svn_pool_clear(db->pool); - - if (pb) - SVN_ERR(maybe_done(pb)); - } - - return SVN_NO_ERROR; -} - -static svn_error_t * -ensure_added(struct dir_baton_t *db, - apr_pool_t *scratch_pool) -{ - if (db->created) - return SVN_NO_ERROR; - - if (db->pb) - SVN_ERR(ensure_added(db->pb, scratch_pool)); - - db->created = TRUE; - - /* Add the directory with all the already collected properties */ - SVN_ERR(svn_wc_add_from_disk3(db->eb->wc_ctx, - db->local_abspath, - db->properties, - TRUE /* skip checks */, - db->eb->notify_func, - db->eb->notify_baton, - scratch_pool)); - - return SVN_NO_ERROR; -} - -static svn_error_t * -dir_close(void *dir_baton, - apr_pool_t *scratch_pool) -{ - struct dir_baton_t *db = dir_baton; - /*struct edit_baton_t *eb = db->eb;*/ - - SVN_ERR(ensure_added(db, scratch_pool)); - - SVN_ERR(maybe_done(db)); - - return SVN_NO_ERROR; -} - -struct file_baton_t -{ - apr_pool_t *pool; - - struct dir_baton_t *pb; - struct edit_baton_t *eb; - - const char *local_abspath; - apr_hash_t *properties; - - svn_boolean_t writing; - unsigned char digest[APR_MD5_DIGESTSIZE]; - - const char *tmp_path; -}; - -static svn_error_t * -file_add(const char *path, - void *parent_baton, - const char *copyfrom_path, - svn_revnum_t copyfrom_revision, - apr_pool_t *result_pool, - void **file_baton) -{ - struct dir_baton_t *pb = parent_baton; - struct edit_baton_t *eb = pb->eb; - apr_pool_t *file_pool = svn_pool_create(pb->pool); - struct file_baton_t *fb = apr_pcalloc(file_pool, sizeof(*fb)); - svn_boolean_t under_root; - - pb->users++; - - fb->pool = file_pool; - fb->eb = eb; - fb->pb = pb; - - SVN_ERR(svn_dirent_is_under_root(&under_root, &fb->local_abspath, - eb->anchor_abspath, path, fb->pool)); - if (! under_root) - { - return svn_error_createf( - SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL, - _("Path '%s' is not in the working copy"), - svn_dirent_local_style(path, fb->pool)); - } - - *file_baton = fb; - return SVN_NO_ERROR; -} - -static svn_error_t * -file_change_prop(void *file_baton, - const char *name, - const svn_string_t *value, - apr_pool_t *scratch_pool) -{ - struct file_baton_t *fb = file_baton; - svn_prop_kind_t prop_kind; - - prop_kind = svn_property_kind2(name); - - if (prop_kind != svn_prop_regular_kind - || ! strcmp(name, SVN_PROP_MERGEINFO)) - { - /* We can't handle DAV, ENTRY and merge specific props here */ - return SVN_NO_ERROR; - } - - /* We store all properties in the hash for immediate addition - with the svn_wc_add_from_disk3() call */ - if (! fb->properties) - fb->properties = apr_hash_make(fb->pool); - - if (value != NULL) - svn_hash_sets(fb->properties, apr_pstrdup(fb->pool, name), - svn_string_dup(value, fb->pool)); - - return SVN_NO_ERROR; -} - -static svn_error_t * -file_textdelta(void *file_baton, - const char *base_checksum, - apr_pool_t *result_pool, - svn_txdelta_window_handler_t *handler, - void **handler_baton) -{ - struct file_baton_t *fb = file_baton; - svn_stream_t *target; - - SVN_ERR_ASSERT(! fb->writing); - - SVN_ERR(svn_stream_open_writable(&target, fb->local_abspath, fb->pool, - fb->pool)); - - fb->writing = TRUE; - svn_txdelta_apply(svn_stream_empty(fb->pool) /* source */, - target, - fb->digest, - fb->local_abspath, - fb->pool, - /* Provide the handler directly */ - handler, handler_baton); - - return SVN_NO_ERROR; -} - -static svn_error_t * -file_close(void *file_baton, - const char *text_checksum, - apr_pool_t *scratch_pool) -{ - struct file_baton_t *fb = file_baton; - struct edit_baton_t *eb = fb->eb; - struct dir_baton_t *pb = fb->pb; - - SVN_ERR(ensure_added(pb, fb->pool)); - - if (text_checksum) - { - svn_checksum_t *expected_checksum; - svn_checksum_t *actual_checksum; - - SVN_ERR(svn_checksum_parse_hex(&expected_checksum, svn_checksum_md5, - text_checksum, fb->pool)); - actual_checksum = svn_checksum__from_digest_md5(fb->digest, fb->pool); - - if (! svn_checksum_match(expected_checksum, actual_checksum)) - return svn_error_trace( - svn_checksum_mismatch_err(expected_checksum, - actual_checksum, - fb->pool, - _("Checksum mismatch for '%s'"), - svn_dirent_local_style( - fb->local_abspath, - fb->pool))); - } - - SVN_ERR(svn_wc_add_from_disk3(eb->wc_ctx, fb->local_abspath, fb->properties, - TRUE /* skip checks */, - eb->notify_func, eb->notify_baton, - fb->pool)); - - svn_pool_destroy(fb->pool); - SVN_ERR(maybe_done(pb)); - - return SVN_NO_ERROR; -} - -static svn_error_t * -copy_foreign_dir(svn_ra_session_t *ra_session, - svn_client__pathrev_t *location, - svn_wc_context_t *wc_ctx, - const char *dst_abspath, - svn_depth_t depth, - svn_wc_notify_func2_t notify_func, - void *notify_baton, - svn_cancel_func_t cancel_func, - void *cancel_baton, - apr_pool_t *scratch_pool) -{ - struct edit_baton_t eb; - svn_delta_editor_t *editor = svn_delta_default_editor(scratch_pool); - const svn_delta_editor_t *wrapped_editor; - void *wrapped_baton; - const svn_ra_reporter3_t *reporter; - void *reporter_baton; - - eb.pool = scratch_pool; - eb.anchor_abspath = dst_abspath; - - eb.wc_ctx = wc_ctx; - eb.notify_func = notify_func; - eb.notify_baton = notify_baton; - - editor->open_root = edit_open; - editor->close_edit = edit_close; - - editor->add_directory = dir_add; - editor->change_dir_prop = dir_change_prop; - editor->close_directory = dir_close; - - editor->add_file = file_add; - editor->change_file_prop = file_change_prop; - editor->apply_textdelta = file_textdelta; - editor->close_file = file_close; - - SVN_ERR(svn_delta_get_cancellation_editor(cancel_func, cancel_baton, - editor, &eb, - &wrapped_editor, &wrapped_baton, - scratch_pool)); - - SVN_ERR(svn_ra_do_update3(ra_session, &reporter, &reporter_baton, - location->rev, "", svn_depth_infinity, - FALSE, FALSE, wrapped_editor, wrapped_baton, - scratch_pool, scratch_pool)); - - SVN_ERR(reporter->set_path(reporter_baton, "", location->rev, depth, - TRUE /* incomplete */, - NULL, scratch_pool)); - - SVN_ERR(reporter->finish_report(reporter_baton, scratch_pool)); - - return SVN_NO_ERROR; -} - - -svn_error_t * -svn_client__copy_foreign(const char *url, - const char *dst_abspath, - svn_opt_revision_t *peg_revision, - svn_opt_revision_t *revision, - svn_depth_t depth, - svn_boolean_t make_parents, - svn_boolean_t already_locked, - svn_client_ctx_t *ctx, - apr_pool_t *scratch_pool) -{ - svn_ra_session_t *ra_session; - svn_client__pathrev_t *loc; - svn_node_kind_t kind; - svn_node_kind_t wc_kind; - const char *dir_abspath; - - SVN_ERR_ASSERT(svn_path_is_url(url)); - SVN_ERR_ASSERT(svn_dirent_is_absolute(dst_abspath)); - - /* Do we need to validate/update revisions? */ - - SVN_ERR(svn_client__ra_session_from_path2(&ra_session, &loc, - url, NULL, - peg_revision, - revision, ctx, - scratch_pool)); - - SVN_ERR(svn_ra_check_path(ra_session, "", loc->rev, &kind, scratch_pool)); - - if (kind != svn_node_file && kind != svn_node_dir) - return svn_error_createf( - SVN_ERR_ILLEGAL_TARGET, NULL, - _("'%s' is not a valid location inside a repository"), - url); - - SVN_ERR(svn_wc_read_kind2(&wc_kind, ctx->wc_ctx, dst_abspath, FALSE, TRUE, - scratch_pool)); - - if (wc_kind != svn_node_none) - { - return svn_error_createf( - SVN_ERR_ENTRY_EXISTS, NULL, - _("'%s' is already under version control"), - svn_dirent_local_style(dst_abspath, scratch_pool)); - } - - dir_abspath = svn_dirent_dirname(dst_abspath, scratch_pool); - SVN_ERR(svn_wc_read_kind2(&wc_kind, ctx->wc_ctx, dir_abspath, - FALSE, FALSE, scratch_pool)); - - if (wc_kind == svn_node_none) - { - if (make_parents) - SVN_ERR(svn_client__make_local_parents(dir_abspath, make_parents, ctx, - scratch_pool)); - - SVN_ERR(svn_wc_read_kind2(&wc_kind, ctx->wc_ctx, dir_abspath, - FALSE, FALSE, scratch_pool)); - } - - if (wc_kind != svn_node_dir) - return svn_error_createf( - SVN_ERR_ENTRY_NOT_FOUND, NULL, - _("Can't add '%s', because no parent directory is found"), - svn_dirent_local_style(dst_abspath, scratch_pool)); - - - if (kind == svn_node_file) - { - svn_stream_t *target; - apr_hash_t *props; - apr_hash_index_t *hi; - SVN_ERR(svn_stream_open_writable(&target, dst_abspath, scratch_pool, - scratch_pool)); - - SVN_ERR(svn_ra_get_file(ra_session, "", loc->rev, target, NULL, &props, - scratch_pool)); - - if (props != NULL) - for (hi = apr_hash_first(scratch_pool, props); hi; - hi = apr_hash_next(hi)) - { - const char *name = apr_hash_this_key(hi); - - if (svn_property_kind2(name) != svn_prop_regular_kind - || ! strcmp(name, SVN_PROP_MERGEINFO)) - { - /* We can't handle DAV, ENTRY and merge specific props here */ - svn_hash_sets(props, name, NULL); - } - } - - if (!already_locked) - SVN_WC__CALL_WITH_WRITE_LOCK( - svn_wc_add_from_disk3(ctx->wc_ctx, dst_abspath, props, - TRUE /* skip checks */, - ctx->notify_func2, ctx->notify_baton2, - scratch_pool), - ctx->wc_ctx, dir_abspath, FALSE, scratch_pool); - else - SVN_ERR(svn_wc_add_from_disk3(ctx->wc_ctx, dst_abspath, props, - TRUE /* skip checks */, - ctx->notify_func2, ctx->notify_baton2, - scratch_pool)); - } - else - { - if (!already_locked) - SVN_WC__CALL_WITH_WRITE_LOCK( - copy_foreign_dir(ra_session, loc, - ctx->wc_ctx, dst_abspath, - depth, - ctx->notify_func2, ctx->notify_baton2, - ctx->cancel_func, ctx->cancel_baton, - scratch_pool), - ctx->wc_ctx, dir_abspath, FALSE, scratch_pool); - else - SVN_ERR(copy_foreign_dir(ra_session, loc, - ctx->wc_ctx, dst_abspath, - depth, - ctx->notify_func2, ctx->notify_baton2, - ctx->cancel_func, ctx->cancel_baton, - scratch_pool)); - } - - return SVN_NO_ERROR; -} diff --git a/subversion/libsvn_client/delete.c b/subversion/libsvn_client/delete.c index 943cdd9..29a3395 100644 --- a/subversion/libsvn_client/delete.c +++ b/subversion/libsvn_client/delete.c @@ -181,12 +181,13 @@ can_delete_node(svn_boolean_t *target_missing, static svn_error_t * path_driver_cb_func(void **dir_baton, + const svn_delta_editor_t *editor, + void *edit_baton, void *parent_baton, void *callback_baton, const char *path, apr_pool_t *pool) { - const svn_delta_editor_t *editor = callback_baton; *dir_baton = NULL; return editor->delete_entry(path, SVN_INVALID_REVNUM, parent_baton, pool); } @@ -248,8 +249,8 @@ single_repos_delete(svn_ra_session_t *ra_session, pool)); /* Call the path-based editor driver. */ - err = svn_delta_path_driver2(editor, edit_baton, relpaths, TRUE, - path_driver_cb_func, (void *)editor, pool); + err = svn_delta_path_driver3(editor, edit_baton, relpaths, TRUE, + path_driver_cb_func, NULL, pool); if (err) { diff --git a/subversion/libsvn_client/deprecated.c b/subversion/libsvn_client/deprecated.c index dc20b27..b8e2026 100644 --- a/subversion/libsvn_client/deprecated.c +++ b/subversion/libsvn_client/deprecated.c @@ -166,6 +166,61 @@ svn_client_mkdir(svn_client_commit_info_t **commit_info_p, } /*** From blame.c ***/ +struct blame_receiver_wrapper_baton3 { + void *baton; + svn_client_blame_receiver3_t receiver; + svn_revnum_t start_revnum; + svn_revnum_t end_revnum; +}; + +static svn_error_t * +blame_wrapper_receiver3(void *baton, + apr_int64_t line_no, + svn_revnum_t revision, + apr_hash_t *rev_props, + svn_revnum_t merged_revision, + apr_hash_t *merged_rev_props, + const char *merged_path, + const svn_string_t *line, + svn_boolean_t local_change, + apr_pool_t *pool) +{ + struct blame_receiver_wrapper_baton3 *brwb = baton; + + if (brwb->receiver) + return brwb->receiver(brwb->baton, brwb->start_revnum, brwb->end_revnum, + line_no, + revision, rev_props, merged_revision, + merged_rev_props, merged_path, line->data, + local_change, pool); + + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client_blame5(const char *target, + const svn_opt_revision_t *peg_revision, + const svn_opt_revision_t *start, + const svn_opt_revision_t *end, + const svn_diff_file_options_t *diff_options, + svn_boolean_t ignore_mime_type, + svn_boolean_t include_merged_revisions, + svn_client_blame_receiver3_t receiver, + void *receiver_baton, + svn_client_ctx_t *ctx, + apr_pool_t *pool) +{ + struct blame_receiver_wrapper_baton3 baton; + + baton.receiver = receiver; + baton.baton = receiver_baton; + + return svn_client_blame6(&baton.start_revnum, &baton.end_revnum, + target, peg_revision, start, end, + diff_options, + ignore_mime_type, include_merged_revisions, + blame_wrapper_receiver3, &baton, ctx, pool); +} struct blame_receiver_wrapper_baton2 { void *baton; @@ -935,6 +990,42 @@ svn_client_delete(svn_client_commit_info_t **commit_info_p, /*** From diff.c ***/ +svn_error_t * +svn_client_diff6(const apr_array_header_t *diff_options, + const char *path_or_url1, + const svn_opt_revision_t *revision1, + const char *path_or_url2, + const svn_opt_revision_t *revision2, + const char *relative_to_dir, + svn_depth_t depth, + svn_boolean_t ignore_ancestry, + svn_boolean_t no_diff_added, + svn_boolean_t no_diff_deleted, + svn_boolean_t show_copies_as_adds, + svn_boolean_t ignore_content_type, + svn_boolean_t ignore_properties, + svn_boolean_t properties_only, + svn_boolean_t use_git_diff_format, + const char *header_encoding, + svn_stream_t *outstream, + svn_stream_t *errstream, + const apr_array_header_t *changelists, + svn_client_ctx_t *ctx, + apr_pool_t *pool) +{ + return svn_client_diff7(diff_options, + path_or_url1, revision1, + path_or_url2, revision2, + relative_to_dir, depth, + ignore_ancestry, no_diff_added, + no_diff_deleted, show_copies_as_adds, + ignore_content_type, ignore_properties, + properties_only, use_git_diff_format, + TRUE /*pretty_print_mergeinfo*/, + header_encoding, + outstream, errstream, changelists, ctx, pool); +} + svn_error_t * svn_client_diff5(const apr_array_header_t *diff_options, const char *path1, @@ -1057,6 +1148,53 @@ svn_client_diff(const apr_array_header_t *options, outfile, errfile, ctx, pool); } +svn_error_t * +svn_client_diff_peg6(const apr_array_header_t *options, + const char *path_or_url, + const svn_opt_revision_t *peg_revision, + const svn_opt_revision_t *start_revision, + const svn_opt_revision_t *end_revision, + const char *relative_to_dir, + svn_depth_t depth, + svn_boolean_t ignore_ancestry, + svn_boolean_t no_diff_added, + svn_boolean_t no_diff_deleted, + svn_boolean_t show_copies_as_adds, + svn_boolean_t ignore_content_type, + svn_boolean_t ignore_properties, + svn_boolean_t properties_only, + svn_boolean_t use_git_diff_format, + const char *header_encoding, + svn_stream_t *outstream, + svn_stream_t *errstream, + const apr_array_header_t *changelists, + svn_client_ctx_t *ctx, + apr_pool_t *pool) +{ + return svn_client_diff_peg7(options, + path_or_url, + peg_revision, + start_revision, + end_revision, + relative_to_dir, + depth, + ignore_ancestry, + no_diff_added, + no_diff_deleted, + show_copies_as_adds, + ignore_content_type, + ignore_properties, + properties_only, + use_git_diff_format, + TRUE /*pretty_print_mergeinfo*/, + header_encoding, + outstream, + errstream, + changelists, + ctx, + pool); +} + svn_error_t * svn_client_diff_peg5(const apr_array_header_t *diff_options, const char *path, @@ -1643,7 +1781,7 @@ svn_client_log(const apr_array_header_t *targets, * we just invoke the receiver manually on a hand-constructed log * message for revision 0. * - * See also http://subversion.tigris.org/issues/show_bug.cgi?id=692. + * See also https://issues.apache.org/jira/browse/SVN-692. */ if (err && (err->apr_err == SVN_ERR_FS_NO_SUCH_REVISION) && (start->kind == svn_opt_revision_head) @@ -2852,6 +2990,22 @@ svn_client_resolved(const char *path, svn_wc_conflict_choose_merged, ctx, pool); } /*** From revert.c ***/ +svn_error_t * +svn_client_revert3(const apr_array_header_t *paths, + svn_depth_t depth, + const apr_array_header_t *changelists, + svn_boolean_t clear_changelists, + svn_boolean_t metadata_only, + svn_client_ctx_t *ctx, + apr_pool_t *pool) +{ + SVN_ERR(svn_client_revert4(paths, depth, changelists, + clear_changelists, metadata_only, + TRUE /*added_keep_local*/, + ctx, pool)); + return SVN_NO_ERROR; +} + svn_error_t * svn_client_revert2(const apr_array_header_t *paths, svn_depth_t depth, diff --git a/subversion/libsvn_client/diff.c b/subversion/libsvn_client/diff.c index ba6e91e..30d00b0 100644 --- a/subversion/libsvn_client/diff.c +++ b/subversion/libsvn_client/diff.c @@ -23,6 +23,9 @@ /* ==================================================================== */ +/* We define this here to remove any further warnings about the usage of + experimental functions in this file. */ +#define SVN_EXPERIMENTAL /*** Includes. ***/ @@ -66,6 +69,31 @@ _("Path '%s' must be an immediate child of " \ "the directory '%s'"), path, relative_to_dir) +/* State provided by the diff drivers; used by the diff writer */ +typedef struct diff_driver_info_t +{ + /* The anchor to prefix before wc paths */ + const char *anchor; + + /* Relative path of ra session from repos_root_url. + + Used only in printing git diff headers. The repository-root-relative + path of ... ### what user-visible property of the diff? */ + const char *session_relpath; + + /* Used only in printing git diff headers. Used to find the + repository-root-relative path of a WC path. */ + svn_wc_context_t *wc_ctx; + + /* The original targets passed to the diff command. We may need + these to construct distinctive diff labels when comparing the + same relative path in the same revision, under different anchors + (for example, when comparing a trunk against a branch). */ + const char *orig_path_1; + const char *orig_path_2; +} diff_driver_info_t; + + /* Calculate the repository relative path of DIFF_RELPATH, using * SESSION_RELPATH and WC_CTX, and return the result in *REPOS_RELPATH. * ORIG_TARGET is the related original target passed to the diff command, @@ -120,25 +148,47 @@ make_repos_relpath(const char **repos_relpath, return SVN_NO_ERROR; } -/* Adjust *INDEX_PATH, *ORIG_PATH_1 and *ORIG_PATH_2, representing the changed - * node and the two original targets passed to the diff command, to handle the - * case when we're dealing with different anchors. RELATIVE_TO_DIR is the - * directory the diff target should be considered relative to. - * ANCHOR is the local path where the diff editor is anchored. The resulting - * values are allocated in RESULT_POOL and temporary allocations are performed - * in SCRATCH_POOL. */ +/* Adjust paths to handle the case when we're dealing with different anchors. + * + * Set *INDEX_PATH to the new relative path. Set *LABEL_PATH1 and + * *LABEL_PATH2 to that path annotated with the unique parts of ORIG_PATH_1 + * and ORIG_PATH_2 respectively, like this: + * + * INDEX_PATH: "path" + * LABEL_PATH1: "path\t(.../branches/branch1)" + * LABEL_PATH2: "path\t(.../trunk)" + * + * Make the output paths relative to RELATIVE_TO_DIR (if not null) by + * removing it from the beginning of (ANCHOR + RELPATH). + * + * ANCHOR (if not null) is the local path where the diff editor is anchored. + * RELPATH is the path to the changed node within the diff editor, so + * relative to ANCHOR. + * + * RELATIVE_TO_DIR and ANCHOR are of the same form -- either absolute local + * paths or relative paths relative to the same base. + * + * ORIG_PATH_1 and ORIG_PATH_2 represent the two original target paths or + * URLs passed to the diff command. + * + * Allocate results in RESULT_POOL (or as a pointer to RELPATH) and + * temporary data in SCRATCH_POOL. + */ static svn_error_t * adjust_paths_for_diff_labels(const char **index_path, - const char **orig_path_1, - const char **orig_path_2, + const char **label_path1, + const char **label_path2, const char *relative_to_dir, const char *anchor, + const char *relpath, + const char *orig_path_1, + const char *orig_path_2, apr_pool_t *result_pool, apr_pool_t *scratch_pool) { - const char *new_path = *index_path; - const char *new_path1 = *orig_path_1; - const char *new_path2 = *orig_path_2; + const char *new_path = relpath; + const char *new_path1 = orig_path_1; + const char *new_path2 = orig_path_2; if (anchor) new_path = svn_dirent_join(anchor, new_path, result_pool); @@ -177,6 +227,7 @@ adjust_paths_for_diff_labels(const char **index_path, /* ### BH: We can now just construct the repos_relpath, etc. as the anchor is available. See also make_repos_relpath() */ + /* Remove the common prefix of NEW_PATH1 and NEW_PATH2. */ is_url1 = svn_path_is_url(new_path1); is_url2 = svn_path_is_url(new_path2); @@ -220,8 +271,8 @@ adjust_paths_for_diff_labels(const char **index_path, new_path2 = apr_psprintf(result_pool, "%s\t(.../%s)", new_path, new_path2); *index_path = new_path; - *orig_path_1 = new_path1; - *orig_path_2 = new_path2; + *label_path1 = new_path1; + *label_path2 = new_path2; return SVN_NO_ERROR; } @@ -383,28 +434,33 @@ maybe_print_mode_change(svn_stream_t *os, } /* Print a git diff header showing the OPERATION to the stream OS using - * HEADER_ENCODING. Return suitable diff labels for the git diff in *LABEL1 - * and *LABEL2. REPOS_RELPATH1 and REPOS_RELPATH2 are relative to reposroot. - * are the paths passed to the original diff command. REV1 and REV2 are - * revisions being diffed. COPYFROM_PATH and COPYFROM_REV indicate where the + * HEADER_ENCODING. + * + * Return suitable diff labels for the git diff in *LABEL1 and *LABEL2. + * + * REV1 and REV2 are the revisions being diffed. + * COPYFROM_PATH and COPYFROM_REV indicate where the * diffed item was copied from. * Use SCRATCH_POOL for temporary allocations. */ static svn_error_t * print_git_diff_header(svn_stream_t *os, const char **label1, const char **label2, svn_diff_operation_kind_t operation, - const char *repos_relpath1, - const char *repos_relpath2, svn_revnum_t rev1, svn_revnum_t rev2, + const char *diff_relpath, const char *copyfrom_path, svn_revnum_t copyfrom_rev, apr_hash_t *left_props, apr_hash_t *right_props, const char *git_index_shas, const char *header_encoding, + const diff_driver_info_t *ddi, apr_pool_t *scratch_pool) { + const char *repos_relpath1; + const char *repos_relpath2; + const char *copyfrom_repos_relpath = NULL; svn_boolean_t exec_bit1 = (svn_prop_get_value(left_props, SVN_PROP_EXECUTABLE) != NULL); svn_boolean_t exec_bit2 = (svn_prop_get_value(right_props, @@ -414,6 +470,26 @@ print_git_diff_header(svn_stream_t *os, svn_boolean_t symlink_bit2 = (svn_prop_get_value(right_props, SVN_PROP_SPECIAL) != NULL); + SVN_ERR(make_repos_relpath(&repos_relpath1, diff_relpath, + ddi->orig_path_1, + ddi->session_relpath, + ddi->wc_ctx, + ddi->anchor, + scratch_pool, scratch_pool)); + SVN_ERR(make_repos_relpath(&repos_relpath2, diff_relpath, + ddi->orig_path_2, + ddi->session_relpath, + ddi->wc_ctx, + ddi->anchor, + scratch_pool, scratch_pool)); + if (copyfrom_path) + SVN_ERR(make_repos_relpath(©from_repos_relpath, copyfrom_path, + ddi->orig_path_2, + ddi->session_relpath, + ddi->wc_ctx, + ddi->anchor, + scratch_pool, scratch_pool)); + if (operation == svn_diff_op_deleted) { SVN_ERR(print_git_diff_header_deleted(os, header_encoding, @@ -487,26 +563,45 @@ print_git_diff_header(svn_stream_t *os, return SVN_NO_ERROR; } +/* Print the "Index:" and "=====" lines. + * Show the paths in platform-independent format ('/' separators) + */ +static svn_error_t * +print_diff_index_header(svn_stream_t *outstream, + const char *header_encoding, + const char *index_path, + const char *suffix, + apr_pool_t *scratch_pool) +{ + SVN_ERR(svn_stream_printf_from_utf8(outstream, + header_encoding, scratch_pool, + "Index: %s%s" APR_EOL_STR + SVN_DIFF__EQUAL_STRING APR_EOL_STR, + index_path, suffix)); + return SVN_NO_ERROR; +} + /* A helper func that writes out verbal descriptions of property diffs to OUTSTREAM. Of course, OUTSTREAM will probably be whatever was - passed to svn_client_diff6(), which is probably stdout. + passed to svn_client_diff7(), which is probably stdout. ### FIXME needs proper docstring If USE_GIT_DIFF_FORMAT is TRUE, pring git diff headers, which always - show paths relative to the repository root. RA_SESSION and WC_CTX are - needed to normalize paths relative the repository root, and are ignored - if USE_GIT_DIFF_FORMAT is FALSE. - - ANCHOR is the local path where the diff editor is anchored. */ + show paths relative to the repository root. DDI->session_relpath and + DDI->wc_ctx are needed to normalize paths relative the repository root, + and are ignored if USE_GIT_DIFF_FORMAT is FALSE. + + If @a pretty_print_mergeinfo is true, then describe 'svn:mergeinfo' + property changes in a human-readable form that says what changes were + merged or reverse merged; otherwise (or if the mergeinfo property values + don't parse correctly) display them just like any other property. + */ static svn_error_t * display_prop_diffs(const apr_array_header_t *propchanges, apr_hash_t *left_props, apr_hash_t *right_props, const char *diff_relpath, - const char *anchor, - const char *orig_path1, - const char *orig_path2, svn_revnum_t rev1, svn_revnum_t rev2, const char *encoding, @@ -514,32 +609,29 @@ display_prop_diffs(const apr_array_header_t *propchanges, const char *relative_to_dir, svn_boolean_t show_diff_header, svn_boolean_t use_git_diff_format, - const char *ra_session_relpath, + svn_boolean_t pretty_print_mergeinfo, + const diff_driver_info_t *ddi, svn_cancel_func_t cancel_func, void *cancel_baton, - svn_wc_context_t *wc_ctx, apr_pool_t *scratch_pool) { const char *repos_relpath1 = NULL; - const char *repos_relpath2 = NULL; - const char *index_path = diff_relpath; - const char *adjusted_path1 = orig_path1; - const char *adjusted_path2 = orig_path2; + const char *index_path; + const char *label_path1, *label_path2; if (use_git_diff_format) { - SVN_ERR(make_repos_relpath(&repos_relpath1, diff_relpath, orig_path1, - ra_session_relpath, wc_ctx, anchor, - scratch_pool, scratch_pool)); - SVN_ERR(make_repos_relpath(&repos_relpath2, diff_relpath, orig_path2, - ra_session_relpath, wc_ctx, anchor, + SVN_ERR(make_repos_relpath(&repos_relpath1, diff_relpath, ddi->orig_path_1, + ddi->session_relpath, ddi->wc_ctx, ddi->anchor, scratch_pool, scratch_pool)); } /* If we're creating a diff on the wc root, path would be empty. */ - SVN_ERR(adjust_paths_for_diff_labels(&index_path, &adjusted_path1, - &adjusted_path2, - relative_to_dir, anchor, + SVN_ERR(adjust_paths_for_diff_labels(&index_path, + &label_path1, &label_path2, + relative_to_dir, ddi->anchor, + diff_relpath, + ddi->orig_path_1, ddi->orig_path_2, scratch_pool, scratch_pool)); if (show_diff_header) @@ -547,27 +639,21 @@ display_prop_diffs(const apr_array_header_t *propchanges, const char *label1; const char *label2; - label1 = diff_label(adjusted_path1, rev1, scratch_pool); - label2 = diff_label(adjusted_path2, rev2, scratch_pool); - - /* ### Should we show the paths in platform specific format, - * ### diff_content_changed() does not! */ + label1 = diff_label(label_path1, rev1, scratch_pool); + label2 = diff_label(label_path2, rev2, scratch_pool); - SVN_ERR(svn_stream_printf_from_utf8(outstream, encoding, scratch_pool, - "Index: %s" APR_EOL_STR - SVN_DIFF__EQUAL_STRING APR_EOL_STR, - index_path)); + SVN_ERR(print_diff_index_header(outstream, encoding, + index_path, "", scratch_pool)); if (use_git_diff_format) SVN_ERR(print_git_diff_header(outstream, &label1, &label2, svn_diff_op_modified, - repos_relpath1, repos_relpath2, - rev1, rev2, NULL, - SVN_INVALID_REVNUM, - left_props, - right_props, + rev1, rev2, + diff_relpath, + NULL, SVN_INVALID_REVNUM, + left_props, right_props, NULL, - encoding, scratch_pool)); + encoding, ddi, scratch_pool)); /* --- label1 * +++ label2 */ @@ -588,7 +674,7 @@ display_prop_diffs(const apr_array_header_t *propchanges, SVN_ERR(svn_diff__display_prop_diffs( outstream, encoding, propchanges, left_props, - TRUE /* pretty_print_mergeinfo */, + pretty_print_mergeinfo, -1 /* context_size */, cancel_func, cancel_baton, scratch_pool)); @@ -599,24 +685,6 @@ display_prop_diffs(const apr_array_header_t *propchanges, /*** Callbacks for 'svn diff', invoked by the repos-diff editor. ***/ -/* State provided by the diff drivers; used by the diff writer */ -typedef struct diff_driver_info_t -{ - /* The anchor to prefix before wc paths */ - const char *anchor; - - /* Relative path of ra session from repos_root_url */ - const char *session_relpath; - - /* The original targets passed to the diff command. We may need - these to construct distinctive diff labels when comparing the - same relative path in the same revision, under different anchors - (for example, when comparing a trunk against a branch). */ - const char *orig_path_1; - const char *orig_path_2; -} diff_driver_info_t; - - /* Diff writer state */ typedef struct diff_writer_info_t { @@ -668,11 +736,12 @@ typedef struct diff_writer_info_t /* Whether to ignore copyfrom information when showing adds */ svn_boolean_t show_copies_as_adds; + /* Whether to show mergeinfo prop changes in human-readable form */ + svn_boolean_t pretty_print_mergeinfo; + /* Empty files for creating diffs or NULL if not used yet */ const char *empty_file; - svn_wc_context_t *wc_ctx; - svn_cancel_func_t cancel_func; void *cancel_baton; @@ -708,9 +777,6 @@ diff_props_changed(const char *diff_relpath, * dir_props_changed(). */ SVN_ERR(display_prop_diffs(props, left_props, right_props, diff_relpath, - dwi->ddi.anchor, - dwi->ddi.orig_path_1, - dwi->ddi.orig_path_2, rev1, rev2, dwi->header_encoding, @@ -718,10 +784,10 @@ diff_props_changed(const char *diff_relpath, dwi->relative_to_dir, show_diff_header, dwi->use_git_diff_format, - dwi->ddi.session_relpath, + dwi->pretty_print_mergeinfo, + &dwi->ddi, dwi->cancel_func, dwi->cancel_baton, - dwi->wc_ctx, scratch_pool)); } @@ -785,9 +851,12 @@ transform_link_to_git(const char **new_tmpfile, } /* Show differences between TMPFILE1 and TMPFILE2. DIFF_RELPATH, REV1, and - REV2 are used in the headers to indicate the file and revisions. If either - MIMETYPE1 or MIMETYPE2 indicate binary content, don't show a diff, - but instead print a warning message. + REV2 are used in the headers to indicate the file and revisions. + + If either side has an svn:mime-type property that indicates 'binary' + content, then if DWI->force_binary is set, attempt to produce the + diff in the usual way, otherwise produce a 'GIT binary diff' in git mode + or print a warning message in non-git mode. If FORCE_DIFF is TRUE, always write a diff, even for empty diffs. @@ -812,9 +881,8 @@ diff_content_changed(svn_boolean_t *wrote_header, svn_stream_t *outstream = dwi->outstream; const char *label1, *label2; svn_boolean_t mt1_binary = FALSE, mt2_binary = FALSE; - const char *index_path = diff_relpath; - const char *path1 = dwi->ddi.orig_path_1; - const char *path2 = dwi->ddi.orig_path_2; + const char *index_path; + const char *label_path1, *label_path2; const char *mimetype1 = svn_prop_get_value(left_props, SVN_PROP_MIME_TYPE); const char *mimetype2 = svn_prop_get_value(right_props, SVN_PROP_MIME_TYPE); const char *index_shas = NULL; @@ -824,12 +892,15 @@ diff_content_changed(svn_boolean_t *wrote_header, return SVN_NO_ERROR; /* Generate the diff headers. */ - SVN_ERR(adjust_paths_for_diff_labels(&index_path, &path1, &path2, + SVN_ERR(adjust_paths_for_diff_labels(&index_path, + &label_path1, &label_path2, rel_to_dir, dwi->ddi.anchor, + diff_relpath, + dwi->ddi.orig_path_1, dwi->ddi.orig_path_2, scratch_pool, scratch_pool)); - label1 = diff_label(path1, rev1, scratch_pool); - label2 = diff_label(path2, rev2, scratch_pool); + label1 = diff_label(label_path1, rev1, scratch_pool); + label2 = diff_label(label_path2, rev2, scratch_pool); /* Possible easy-out: if either mime-type is binary and force was not specified, don't attempt to generate a viewable diff at all. @@ -869,12 +940,8 @@ diff_content_changed(svn_boolean_t *wrote_header, if (! dwi->force_binary && (mt1_binary || mt2_binary)) { /* Print out the diff header. */ - SVN_ERR(svn_stream_printf_from_utf8(outstream, - dwi->header_encoding, scratch_pool, - "Index: %s" APR_EOL_STR - SVN_DIFF__EQUAL_STRING APR_EOL_STR, - index_path)); - + SVN_ERR(print_diff_index_header(outstream, dwi->header_encoding, + index_path, "", scratch_pool)); *wrote_header = TRUE; /* ### Print git diff headers. */ @@ -883,40 +950,17 @@ diff_content_changed(svn_boolean_t *wrote_header, { svn_stream_t *left_stream; svn_stream_t *right_stream; - const char *repos_relpath1; - const char *repos_relpath2; - const char *copyfrom_repos_relpath = NULL; - - SVN_ERR(make_repos_relpath(&repos_relpath1, diff_relpath, - dwi->ddi.orig_path_1, - dwi->ddi.session_relpath, - dwi->wc_ctx, - dwi->ddi.anchor, - scratch_pool, scratch_pool)); - SVN_ERR(make_repos_relpath(&repos_relpath2, diff_relpath, - dwi->ddi.orig_path_2, - dwi->ddi.session_relpath, - dwi->wc_ctx, - dwi->ddi.anchor, - scratch_pool, scratch_pool)); - if (copyfrom_path) - SVN_ERR(make_repos_relpath(©from_repos_relpath, copyfrom_path, - dwi->ddi.orig_path_2, - dwi->ddi.session_relpath, - dwi->wc_ctx, - dwi->ddi.anchor, - scratch_pool, scratch_pool)); - SVN_ERR(print_git_diff_header(outstream, &label1, &label2, + + SVN_ERR(print_git_diff_header(outstream, + &label1, &label2, operation, - repos_relpath1, repos_relpath2, rev1, rev2, - copyfrom_repos_relpath, - copyfrom_rev, - left_props, - right_props, + diff_relpath, + copyfrom_path, copyfrom_rev, + left_props, right_props, index_shas, dwi->header_encoding, - scratch_pool)); + &dwi->ddi, scratch_pool)); SVN_ERR(svn_stream_open_readonly(&left_stream, tmpfile1, scratch_pool, scratch_pool)); @@ -973,11 +1017,9 @@ diff_content_changed(svn_boolean_t *wrote_header, int exitcode; /* Print out the diff header. */ - SVN_ERR(svn_stream_printf_from_utf8(outstream, - dwi->header_encoding, scratch_pool, - "Index: %s" APR_EOL_STR - SVN_DIFF__EQUAL_STRING APR_EOL_STR, - index_path)); + SVN_ERR(print_diff_index_header(outstream, dwi->header_encoding, + index_path, "", scratch_pool)); + *wrote_header = TRUE; /* ### Do we want to add git diff headers here too? I'd say no. The * ### 'Index' and '===' line is something subversion has added. The rest @@ -1030,10 +1072,6 @@ diff_content_changed(svn_boolean_t *wrote_header, scratch_pool), NULL, NULL, scratch_pool)); } - - /* If we have printed a diff for this path, mark it as visited. */ - if (exitcode == 1) - *wrote_header = TRUE; } else /* use libsvn_diff to generate the diff */ { @@ -1048,49 +1086,22 @@ diff_content_changed(svn_boolean_t *wrote_header, || svn_diff_contains_diffs(diff)) { /* Print out the diff header. */ - SVN_ERR(svn_stream_printf_from_utf8(outstream, - dwi->header_encoding, scratch_pool, - "Index: %s" APR_EOL_STR - SVN_DIFF__EQUAL_STRING APR_EOL_STR, - index_path)); + SVN_ERR(print_diff_index_header(outstream, dwi->header_encoding, + index_path, "", scratch_pool)); + *wrote_header = TRUE; if (dwi->use_git_diff_format) { - const char *repos_relpath1; - const char *repos_relpath2; - const char *copyfrom_repos_relpath = NULL; - - SVN_ERR(make_repos_relpath(&repos_relpath1, diff_relpath, - dwi->ddi.orig_path_1, - dwi->ddi.session_relpath, - dwi->wc_ctx, - dwi->ddi.anchor, - scratch_pool, scratch_pool)); - SVN_ERR(make_repos_relpath(&repos_relpath2, diff_relpath, - dwi->ddi.orig_path_2, - dwi->ddi.session_relpath, - dwi->wc_ctx, - dwi->ddi.anchor, - scratch_pool, scratch_pool)); - if (copyfrom_path) - SVN_ERR(make_repos_relpath(©from_repos_relpath, - copyfrom_path, - dwi->ddi.orig_path_2, - dwi->ddi.session_relpath, - dwi->wc_ctx, - dwi->ddi.anchor, - scratch_pool, scratch_pool)); - SVN_ERR(print_git_diff_header(outstream, &label1, &label2, + SVN_ERR(print_git_diff_header(outstream, + &label1, &label2, operation, - repos_relpath1, repos_relpath2, rev1, rev2, - copyfrom_repos_relpath, - copyfrom_rev, - left_props, - right_props, + diff_relpath, + copyfrom_path, copyfrom_rev, + left_props, right_props, index_shas, dwi->header_encoding, - scratch_pool)); + &dwi->ddi, scratch_pool)); } /* Output the actual diff */ @@ -1102,10 +1113,6 @@ diff_content_changed(svn_boolean_t *wrote_header, dwi->options.for_internal->context_size, dwi->cancel_func, dwi->cancel_baton, scratch_pool)); - - /* If we have printed a diff for this path, mark it as visited. */ - if (dwi->use_git_diff_format || svn_diff_contains_diffs(diff)) - *wrote_header = TRUE; } } @@ -1180,11 +1187,9 @@ diff_file_added(const char *relpath, index_path = svn_dirent_join(dwi->ddi.anchor, relpath, scratch_pool); - SVN_ERR(svn_stream_printf_from_utf8(dwi->outstream, - dwi->header_encoding, scratch_pool, - "Index: %s (added)" APR_EOL_STR - SVN_DIFF__EQUAL_STRING APR_EOL_STR, - index_path)); + SVN_ERR(print_diff_index_header(dwi->outstream, dwi->header_encoding, + index_path, " (added)", + scratch_pool)); wrote_header = TRUE; return SVN_NO_ERROR; } @@ -1270,11 +1275,9 @@ diff_file_deleted(const char *relpath, index_path = svn_dirent_join(dwi->ddi.anchor, relpath, scratch_pool); - SVN_ERR(svn_stream_printf_from_utf8(dwi->outstream, - dwi->header_encoding, scratch_pool, - "Index: %s (deleted)" APR_EOL_STR - SVN_DIFF__EQUAL_STRING APR_EOL_STR, - index_path)); + SVN_ERR(print_diff_index_header(dwi->outstream, dwi->header_encoding, + index_path, " (deleted)", + scratch_pool)); } else { @@ -1537,11 +1540,22 @@ check_diff_target_exists(const char *url, /** Prepare a repos repos diff between PATH_OR_URL1 and * PATH_OR_URL2@PEG_REVISION, in the revision range REVISION1:REVISION2. - * Return URLs and peg revisions in *URL1, *REV1 and in *URL2, *REV2. - * Return suitable anchors in *ANCHOR1 and *ANCHOR2, and targets in - * *TARGET1 and *TARGET2, based on *URL1 and *URL2. - * Indicate the corresponding node kinds in *KIND1 and *KIND2, and verify + * + * Return the resolved URL and peg revision pairs in *URL1, *REV1 and in + * *URL2, *REV2. + * + * Return suitable anchor URL and target pairs in *ANCHOR1, *TARGET1 and + * in *ANCHOR2, *TARGET2, corresponding to *URL1 and *URL2. + * + * (The choice of anchor URLs here appears to be: start with *URL1, *URL2; + * then take the parent dir on both sides, unless either of *URL1 or *URL2 + * is the repository root or the parent dir of *URL1 is unreadable.) + * + * Set *KIND1 and *KIND2 to the node kinds of *URL1 and *URL2, and verify * that at least one of the diff targets exists. + * + * Set *RA_SESSION to an RA session parented at the URL *ANCHOR1. + * * Use client context CTX. Do all allocations in POOL. */ static svn_error_t * diff_prepare_repos_repos(const char **url1, @@ -1766,8 +1780,8 @@ diff_prepare_repos_repos(const char **url1, /* A Theoretical Note From Ben, regarding do_diff(). - This function is really svn_client_diff6(). If you read the public - API description for svn_client_diff6(), it sounds quite Grand. It + This function is really svn_client_diff7(). If you read the public + API description for svn_client_diff7(), it sounds quite Grand. It sounds really generalized and abstract and beautiful: that it will diff any two paths, be they working-copy paths or URLs, at any two revisions. @@ -1791,7 +1805,7 @@ diff_prepare_repos_repos(const char **url1, pigeonholed into one of these use-cases, we currently bail with a friendly apology. - Perhaps someday a brave soul will truly make svn_client_diff6() + Perhaps someday a brave soul will truly make svn_client_diff7() perfectly general. For now, we live with the 90% case. Certainly, the commandline client only calls this function in legal ways. When there are other users of svn_client.h, maybe this will become @@ -1804,7 +1818,7 @@ static svn_error_t * unsupported_diff_error(svn_error_t *child_err) { return svn_error_create(SVN_ERR_INCORRECT_PARAMS, child_err, - _("Sorry, svn_client_diff6 was called in a way " + _("Sorry, svn_client_diff7 was called in a way " "that is not yet supported")); } @@ -1813,12 +1827,14 @@ unsupported_diff_error(svn_error_t *child_err) PATH1 and PATH2 are both working copy paths. REVISION1 and REVISION2 are their respective revisions. - All other options are the same as those passed to svn_client_diff6(). */ + For now, require PATH1=PATH2, REVISION1='base', REVISION2='working', + otherwise return an error. + + Anchor DIFF_PROCESSOR at the requested diff targets. + + All other options are the same as those passed to svn_client_diff7(). */ static svn_error_t * -diff_wc_wc(const char **root_relpath, - svn_boolean_t *root_is_dir, - struct diff_driver_info_t *ddi, - const char *path1, +diff_wc_wc(const char *path1, const svn_opt_revision_t *revision1, const char *path2, const svn_opt_revision_t *revision2, @@ -1844,24 +1860,12 @@ diff_wc_wc(const char **root_relpath, && (revision2->kind == svn_opt_revision_working)))) return unsupported_diff_error( svn_error_create(SVN_ERR_INCORRECT_PARAMS, NULL, - _("Only diffs between a path's text-base " - "and its working files are supported at this time" + _("A non-URL diff at this time must be either from " + "a path's base to the same path's working version " + "or between the working versions of two paths" ))); - if (ddi) - { - svn_node_kind_t kind; - - SVN_ERR(svn_wc_read_kind2(&kind, ctx->wc_ctx, abspath1, - TRUE, FALSE, scratch_pool)); - - if (kind != svn_node_dir) - ddi->anchor = svn_dirent_dirname(path1, scratch_pool); - else - ddi->anchor = path1; - } - - SVN_ERR(svn_wc__diff7(root_relpath, root_is_dir, + SVN_ERR(svn_wc__diff7(TRUE, ctx->wc_ctx, abspath1, depth, ignore_ancestry, changelists, diff_processor, @@ -1878,11 +1882,31 @@ diff_wc_wc(const char **root_relpath, and the actual two paths compared are determined by following copy history from PATH_OR_URL2. - All other options are the same as those passed to svn_client_diff6(). */ + If DDI is null, anchor the DIFF_PROCESSOR at the requested diff + targets. (This case is used by diff-summarize.) + + If DDI is non-null: Set DDI->orig_path_* to the two diff target URLs as + resolved at the given revisions; set DDI->anchor to an anchor WC path + if either of PATH_OR_URL* is given as a WC path, else to null; set + DDI->session_relpath to the repository-relpath of the anchor URL for + DDI->orig_path_1. Anchor the DIFF_PROCESSOR at the anchor chosen + for the underlying diff implementation if the target on either side + is a file, else at the actual requested targets. + + (The choice of WC anchor implementated here for DDI->anchor appears to + be: choose PATH_OR_URL2 (if it's a WC path) or else PATH_OR_URL1 (if + it's a WC path); then take its parent dir unless both resolved URLs + refer to directories.) + + (For the choice of URL anchor for DDI->session_relpath, see + diff_prepare_repos_repos().) + + ### Bizarre anchoring. TODO: always anchor DIFF_PROCESSOR at the + requested targets. + + All other options are the same as those passed to svn_client_diff7(). */ static svn_error_t * -diff_repos_repos(const char **root_relpath, - svn_boolean_t *root_is_dir, - struct diff_driver_info_t *ddi, +diff_repos_repos(struct diff_driver_info_t *ddi, const char *path_or_url1, const char *path_or_url2, const svn_opt_revision_t *revision1, @@ -1974,14 +1998,16 @@ diff_repos_repos(const char **root_relpath, target1 = str_tmp; diff_processor = svn_diff__tree_processor_reverse_create(diff_processor, - NULL, scratch_pool); } /* Filter the first path component using a filter processor, until we fixed the diff processing to handle this directly */ - if (root_relpath) - *root_relpath = apr_pstrdup(result_pool, target1); + if (!ddi) + { + diff_processor = svn_diff__tree_processor_filter_create( + diff_processor, target1, scratch_pool); + } else if ((kind1 != svn_node_file && kind2 != svn_node_file) && target1[0] != '\0') { @@ -2048,11 +2074,17 @@ diff_repos_repos(const char **root_relpath, If REVERSE is TRUE, the diff will be reported in reverse. - All other options are the same as those passed to svn_client_diff6(). */ + If DDI is null, anchor the DIFF_PROCESSOR at the requested diff + targets. (This case is used by diff-summarize.) + + If DDI is non-null: Set DDI->orig_path_* to the URLs of the two diff + targets as resolved at the given revisions; set DDI->anchor to a WC path + anchor for PATH2; set DDI->session_relpath to the repository-relpath of + the URL of that same anchor WC path. + + All other options are the same as those passed to svn_client_diff7(). */ static svn_error_t * -diff_repos_wc(const char **root_relpath, - svn_boolean_t *root_is_dir, - struct diff_driver_info_t *ddi, +diff_repos_wc(struct diff_driver_info_t *ddi, const char *path_or_url1, const svn_opt_revision_t *revision1, const svn_opt_revision_t *peg_revision1, @@ -2130,11 +2162,6 @@ diff_repos_wc(const char **root_relpath, target = ""; } - if (root_relpath) - *root_relpath = apr_pstrdup(result_pool, target); - if (root_is_dir) - *root_is_dir = (*target == '\0'); - /* Fetch the URL of the anchor directory. */ SVN_ERR(svn_dirent_get_absolute(&anchor_abspath, anchor, scratch_pool)); SVN_ERR(svn_wc__node_get_url(&anchor_url, ctx->wc_ctx, anchor_abspath, @@ -2143,7 +2170,7 @@ diff_repos_wc(const char **root_relpath, target_url = NULL; } - else /* is_copy && revision2->kind == svn_opt_revision_base */ + else /* is_copy && revision2->kind != svn_opt_revision_base */ { #if 0 svn_node_kind_t kind; @@ -2232,10 +2259,14 @@ diff_repos_wc(const char **root_relpath, anchor_url, result_pool); } + else + { + diff_processor = svn_diff__tree_processor_filter_create( + diff_processor, target, scratch_pool); + } if (reverse) - diff_processor = svn_diff__tree_processor_reverse_create( - diff_processor, NULL, scratch_pool); + diff_processor = svn_diff__tree_processor_reverse_create(diff_processor, scratch_pool); /* Use the diff editor to generate the diff. */ SVN_ERR(svn_ra_has_capability(ra_session, &server_supports_depth, @@ -2311,12 +2342,84 @@ diff_repos_wc(const char **root_relpath, return SVN_NO_ERROR; } +/* Run diff on shelf SHELF_NAME, if it exists. + */ +static svn_error_t * +diff_shelf(const char *shelf_name, + const char *target_abspath, + svn_depth_t depth, + svn_boolean_t ignore_ancestry, + const svn_diff_tree_processor_t *diff_processor, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + svn_error_t *err; + svn_client__shelf_t *shelf; + svn_client__shelf_version_t *shelf_version; + const char *wc_relpath; + + err = svn_client__shelf_open_existing(&shelf, + shelf_name, target_abspath, + ctx, scratch_pool); + if (err && err->apr_err == SVN_ERR_ILLEGAL_TARGET) + { + svn_error_clear(err); + return SVN_NO_ERROR; + } + else + SVN_ERR(err); + + SVN_ERR(svn_client__shelf_version_open(&shelf_version, + shelf, shelf->max_version, + scratch_pool, scratch_pool)); + wc_relpath = svn_dirent_skip_ancestor(shelf->wc_root_abspath, target_abspath); + SVN_ERR(svn_client__shelf_diff(shelf_version, wc_relpath, + depth, ignore_ancestry, + diff_processor, scratch_pool)); + SVN_ERR(svn_client__shelf_close(shelf, scratch_pool)); + + return SVN_NO_ERROR; +} + +/* Run diff on all shelves named in CHANGELISTS by a changelist name + * of the form "svn:shelf:SHELF_NAME", if they exist. + */ +static svn_error_t * +diff_shelves(const apr_array_header_t *changelists, + const char *target_abspath, + svn_depth_t depth, + svn_boolean_t ignore_ancestry, + const svn_diff_tree_processor_t *diff_processor, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + static const char PREFIX[] = "svn:shelf:"; + static const int PREFIX_LEN = 10; + int i; + + if (! changelists) + return SVN_NO_ERROR; + for (i = 0; i < changelists->nelts; i++) + { + const char *cl = APR_ARRAY_IDX(changelists, i, const char *); + + if (strncmp(cl, PREFIX, PREFIX_LEN) == 0) + { + const char *shelf_name = cl + PREFIX_LEN; + + SVN_ERR(diff_shelf(shelf_name, target_abspath, + depth, ignore_ancestry, + diff_processor, ctx, scratch_pool)); + } + } + + return SVN_NO_ERROR; +} + /* This is basically just the guts of svn_client_diff[_summarize][_peg]6(). */ static svn_error_t * -do_diff(const char **root_relpath, - svn_boolean_t *root_is_dir, - diff_driver_info_t *ddi, +do_diff(diff_driver_info_t *ddi, const char *path_or_url1, const char *path_or_url2, const svn_opt_revision_t *revision1, @@ -2344,8 +2447,7 @@ do_diff(const char **root_relpath, if (is_repos2) { /* Ignores changelists. */ - SVN_ERR(diff_repos_repos(root_relpath, root_is_dir, - ddi, + SVN_ERR(diff_repos_repos(ddi, path_or_url1, path_or_url2, revision1, revision2, peg_revision, depth, ignore_ancestry, @@ -2355,7 +2457,7 @@ do_diff(const char **root_relpath, } else /* path_or_url2 is a working copy path */ { - SVN_ERR(diff_repos_wc(root_relpath, root_is_dir, ddi, + SVN_ERR(diff_repos_wc(ddi, path_or_url1, revision1, no_peg_revision ? revision1 : peg_revision, @@ -2370,7 +2472,7 @@ do_diff(const char **root_relpath, { if (is_repos2) { - SVN_ERR(diff_repos_wc(root_relpath, root_is_dir, ddi, + SVN_ERR(diff_repos_wc(ddi, path_or_url2, revision2, no_peg_revision ? revision2 : peg_revision, @@ -2394,19 +2496,51 @@ do_diff(const char **root_relpath, SVN_ERR(svn_dirent_get_absolute(&abspath2, path_or_url2, scratch_pool)); - /* ### What about ddi? */ + if (ddi) + { + svn_node_kind_t kind1, kind2; + + SVN_ERR(svn_io_check_resolved_path(abspath1, &kind1, + scratch_pool)); + SVN_ERR(svn_io_check_resolved_path(abspath2, &kind2, + scratch_pool)); + if (kind1 == svn_node_dir && kind2 == svn_node_dir) + { + ddi->anchor = ""; + } + else + { + ddi->anchor = svn_dirent_basename(abspath1, NULL); + } + ddi->orig_path_1 = path_or_url1; + ddi->orig_path_2 = path_or_url2; + } + /* Ignores changelists, ignore_ancestry */ - SVN_ERR(svn_client__arbitrary_nodes_diff(root_relpath, root_is_dir, - abspath1, abspath2, + SVN_ERR(svn_client__arbitrary_nodes_diff(abspath1, abspath2, depth, diff_processor, - ctx, - result_pool, scratch_pool)); + ctx, scratch_pool)); } else { - SVN_ERR(diff_wc_wc(root_relpath, root_is_dir, ddi, - path_or_url1, revision1, + if (ddi) + { + ddi->anchor = path_or_url1; + ddi->orig_path_1 = path_or_url1; + ddi->orig_path_2 = path_or_url2; + } + + { + const char *abspath1; + + SVN_ERR(svn_dirent_get_absolute(&abspath1, path_or_url1, + scratch_pool)); + SVN_ERR(diff_shelves(changelists, abspath1, + depth, ignore_ancestry, + diff_processor, ctx, scratch_pool)); + } + SVN_ERR(diff_wc_wc(path_or_url1, revision1, path_or_url2, revision2, depth, ignore_ancestry, changelists, diff_processor, ctx, @@ -2482,6 +2616,115 @@ create_diff_writer_info(diff_writer_info_t *dwi, return SVN_NO_ERROR; } +/* Set up *DIFF_PROCESSOR and *DDI for normal and git-style diffs (but not + * summary diffs). + */ +static svn_error_t * +get_diff_processor(svn_diff_tree_processor_t **diff_processor, + struct diff_driver_info_t **ddi, + const apr_array_header_t *options, + const char *relative_to_dir, + svn_boolean_t no_diff_added, + svn_boolean_t no_diff_deleted, + svn_boolean_t show_copies_as_adds, + svn_boolean_t ignore_content_type, + svn_boolean_t ignore_properties, + svn_boolean_t properties_only, + svn_boolean_t use_git_diff_format, + svn_boolean_t pretty_print_mergeinfo, + const char *header_encoding, + svn_stream_t *outstream, + svn_stream_t *errstream, + svn_client_ctx_t *ctx, + apr_pool_t *pool) +{ + diff_writer_info_t *dwi = apr_pcalloc(pool, sizeof(*dwi)); + svn_diff_tree_processor_t *processor; + + /* setup callback and baton */ + + SVN_ERR(create_diff_writer_info(dwi, options, + ctx->config, pool)); + dwi->pool = pool; + dwi->outstream = outstream; + dwi->errstream = errstream; + dwi->header_encoding = header_encoding; + + dwi->force_binary = ignore_content_type; + dwi->ignore_properties = ignore_properties; + dwi->properties_only = properties_only; + dwi->relative_to_dir = relative_to_dir; + dwi->use_git_diff_format = use_git_diff_format; + dwi->no_diff_added = no_diff_added; + dwi->no_diff_deleted = no_diff_deleted; + dwi->show_copies_as_adds = show_copies_as_adds; + dwi->pretty_print_mergeinfo = pretty_print_mergeinfo; + + dwi->cancel_func = ctx->cancel_func; + dwi->cancel_baton = ctx->cancel_baton; + + dwi->ddi.wc_ctx = ctx->wc_ctx; + dwi->ddi.session_relpath = NULL; + dwi->ddi.anchor = NULL; + + processor = svn_diff__tree_processor_create(dwi, pool); + + processor->dir_added = diff_dir_added; + processor->dir_changed = diff_dir_changed; + processor->dir_deleted = diff_dir_deleted; + + processor->file_added = diff_file_added; + processor->file_changed = diff_file_changed; + processor->file_deleted = diff_file_deleted; + + *diff_processor = processor; + *ddi = &dwi->ddi; + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__get_diff_writer_svn( + svn_diff_tree_processor_t **diff_processor, + const char *anchor, + const char *orig_path_1, + const char *orig_path_2, + const apr_array_header_t *options, + const char *relative_to_dir, + svn_boolean_t no_diff_added, + svn_boolean_t no_diff_deleted, + svn_boolean_t show_copies_as_adds, + svn_boolean_t ignore_content_type, + svn_boolean_t ignore_properties, + svn_boolean_t properties_only, + svn_boolean_t pretty_print_mergeinfo, + const char *header_encoding, + svn_stream_t *outstream, + svn_stream_t *errstream, + svn_client_ctx_t *ctx, + apr_pool_t *pool) +{ + struct diff_driver_info_t *ddi; + + SVN_ERR(get_diff_processor(diff_processor, &ddi, + options, + relative_to_dir, + no_diff_added, + no_diff_deleted, + show_copies_as_adds, + ignore_content_type, + ignore_properties, + properties_only, + FALSE /*use_git_diff_format*/, + pretty_print_mergeinfo, + header_encoding, + outstream, errstream, + ctx, pool)); + ddi->anchor = anchor; + ddi->orig_path_1 = orig_path_1; + ddi->orig_path_2 = orig_path_2; + return SVN_NO_ERROR; +} + /*----------------------------------------------------------------------- */ /*** Public Interfaces. ***/ @@ -2519,7 +2762,7 @@ create_diff_writer_info(diff_writer_info_t *dwi, * These cases require server communication. */ svn_error_t * -svn_client_diff6(const apr_array_header_t *options, +svn_client_diff7(const apr_array_header_t *options, const char *path_or_url1, const svn_opt_revision_t *revision1, const char *path_or_url2, @@ -2534,6 +2777,7 @@ svn_client_diff6(const apr_array_header_t *options, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, + svn_boolean_t pretty_print_mergeinfo, const char *header_encoding, svn_stream_t *outstream, svn_stream_t *errstream, @@ -2541,10 +2785,9 @@ svn_client_diff6(const apr_array_header_t *options, svn_client_ctx_t *ctx, apr_pool_t *pool) { - diff_writer_info_t dwi = { 0 }; svn_opt_revision_t peg_revision; - const svn_diff_tree_processor_t *diff_processor; - svn_diff_tree_processor_t *processor; + svn_diff_tree_processor_t *diff_processor; + struct diff_driver_info_t *ddi; if (ignore_properties && properties_only) return svn_error_create(SVN_ERR_INCORRECT_PARAMS, NULL, @@ -2554,50 +2797,26 @@ svn_client_diff6(const apr_array_header_t *options, /* We will never do a pegged diff from here. */ peg_revision.kind = svn_opt_revision_unspecified; - /* setup callback and baton */ - dwi.ddi.orig_path_1 = path_or_url1; - dwi.ddi.orig_path_2 = path_or_url2; - - SVN_ERR(create_diff_writer_info(&dwi, options, - ctx->config, pool)); - dwi.pool = pool; - dwi.outstream = outstream; - dwi.errstream = errstream; - dwi.header_encoding = header_encoding; - - dwi.force_binary = ignore_content_type; - dwi.ignore_properties = ignore_properties; - dwi.properties_only = properties_only; - dwi.relative_to_dir = relative_to_dir; - dwi.use_git_diff_format = use_git_diff_format; - dwi.no_diff_added = no_diff_added; - dwi.no_diff_deleted = no_diff_deleted; - dwi.show_copies_as_adds = show_copies_as_adds; - - dwi.cancel_func = ctx->cancel_func; - dwi.cancel_baton = ctx->cancel_baton; - - dwi.wc_ctx = ctx->wc_ctx; - dwi.ddi.session_relpath = NULL; - dwi.ddi.anchor = NULL; - - processor = svn_diff__tree_processor_create(&dwi, pool); - - processor->dir_added = diff_dir_added; - processor->dir_changed = diff_dir_changed; - processor->dir_deleted = diff_dir_deleted; - - processor->file_added = diff_file_added; - processor->file_changed = diff_file_changed; - processor->file_deleted = diff_file_deleted; - - diff_processor = processor; - /* --show-copies-as-adds and --git imply --notice-ancestry */ if (show_copies_as_adds || use_git_diff_format) ignore_ancestry = FALSE; - return svn_error_trace(do_diff(NULL, NULL, &dwi.ddi, + SVN_ERR(get_diff_processor(&diff_processor, &ddi, + options, + relative_to_dir, + no_diff_added, + no_diff_deleted, + show_copies_as_adds, + ignore_content_type, + ignore_properties, + properties_only, + use_git_diff_format, + pretty_print_mergeinfo, + header_encoding, + outstream, errstream, + ctx, pool)); + + return svn_error_trace(do_diff(ddi, path_or_url1, path_or_url2, revision1, revision2, &peg_revision, TRUE /* no_peg_revision */, @@ -2607,7 +2826,7 @@ svn_client_diff6(const apr_array_header_t *options, } svn_error_t * -svn_client_diff_peg6(const apr_array_header_t *options, +svn_client_diff_peg7(const apr_array_header_t *options, const char *path_or_url, const svn_opt_revision_t *peg_revision, const svn_opt_revision_t *start_revision, @@ -2622,6 +2841,7 @@ svn_client_diff_peg6(const apr_array_header_t *options, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, + svn_boolean_t pretty_print_mergeinfo, const char *header_encoding, svn_stream_t *outstream, svn_stream_t *errstream, @@ -2629,59 +2849,34 @@ svn_client_diff_peg6(const apr_array_header_t *options, svn_client_ctx_t *ctx, apr_pool_t *pool) { - diff_writer_info_t dwi = { 0 }; - const svn_diff_tree_processor_t *diff_processor; - svn_diff_tree_processor_t *processor; + svn_diff_tree_processor_t *diff_processor; + struct diff_driver_info_t *ddi; if (ignore_properties && properties_only) return svn_error_create(SVN_ERR_INCORRECT_PARAMS, NULL, _("Cannot ignore properties and show only " "properties at the same time")); - /* setup callback and baton */ - dwi.ddi.orig_path_1 = path_or_url; - dwi.ddi.orig_path_2 = path_or_url; - - SVN_ERR(create_diff_writer_info(&dwi, options, - ctx->config, pool)); - dwi.pool = pool; - dwi.outstream = outstream; - dwi.errstream = errstream; - dwi.header_encoding = header_encoding; - - dwi.force_binary = ignore_content_type; - dwi.ignore_properties = ignore_properties; - dwi.properties_only = properties_only; - dwi.relative_to_dir = relative_to_dir; - dwi.use_git_diff_format = use_git_diff_format; - dwi.no_diff_added = no_diff_added; - dwi.no_diff_deleted = no_diff_deleted; - dwi.show_copies_as_adds = show_copies_as_adds; - - dwi.cancel_func = ctx->cancel_func; - dwi.cancel_baton = ctx->cancel_baton; - - dwi.wc_ctx = ctx->wc_ctx; - dwi.ddi.session_relpath = NULL; - dwi.ddi.anchor = NULL; - - processor = svn_diff__tree_processor_create(&dwi, pool); - - processor->dir_added = diff_dir_added; - processor->dir_changed = diff_dir_changed; - processor->dir_deleted = diff_dir_deleted; - - processor->file_added = diff_file_added; - processor->file_changed = diff_file_changed; - processor->file_deleted = diff_file_deleted; - - diff_processor = processor; - /* --show-copies-as-adds and --git imply --notice-ancestry */ if (show_copies_as_adds || use_git_diff_format) ignore_ancestry = FALSE; - return svn_error_trace(do_diff(NULL, NULL, &dwi.ddi, + SVN_ERR(get_diff_processor(&diff_processor, &ddi, + options, + relative_to_dir, + no_diff_added, + no_diff_deleted, + show_copies_as_adds, + ignore_content_type, + ignore_properties, + properties_only, + use_git_diff_format, + pretty_print_mergeinfo, + header_encoding, + outstream, errstream, + ctx, pool)); + + return svn_error_trace(do_diff(ddi, path_or_url, path_or_url, start_revision, end_revision, peg_revision, FALSE /* no_peg_revision */, @@ -2703,19 +2898,17 @@ svn_client_diff_summarize2(const char *path_or_url1, svn_client_ctx_t *ctx, apr_pool_t *pool) { - const svn_diff_tree_processor_t *diff_processor; + svn_diff_tree_processor_t *diff_processor; svn_opt_revision_t peg_revision; - const char **p_root_relpath; /* We will never do a pegged diff from here. */ peg_revision.kind = svn_opt_revision_unspecified; - SVN_ERR(svn_client__get_diff_summarize_callbacks( - &diff_processor, &p_root_relpath, + SVN_ERR(svn_client__get_diff_summarize_callbacks(&diff_processor, summarize_func, summarize_baton, - path_or_url1, pool, pool)); + pool, pool)); - return svn_error_trace(do_diff(p_root_relpath, NULL, NULL, + return svn_error_trace(do_diff(NULL, path_or_url1, path_or_url2, revision1, revision2, &peg_revision, TRUE /* no_peg_revision */, @@ -2737,15 +2930,13 @@ svn_client_diff_summarize_peg2(const char *path_or_url, svn_client_ctx_t *ctx, apr_pool_t *pool) { - const svn_diff_tree_processor_t *diff_processor; - const char **p_root_relpath; + svn_diff_tree_processor_t *diff_processor; - SVN_ERR(svn_client__get_diff_summarize_callbacks( - &diff_processor, &p_root_relpath, + SVN_ERR(svn_client__get_diff_summarize_callbacks(&diff_processor, summarize_func, summarize_baton, - path_or_url, pool, pool)); + pool, pool)); - return svn_error_trace(do_diff(p_root_relpath, NULL, NULL, + return svn_error_trace(do_diff(NULL, path_or_url, path_or_url, start_revision, end_revision, peg_revision, FALSE /* no_peg_revision */, diff --git a/subversion/libsvn_client/diff_local.c b/subversion/libsvn_client/diff_local.c index 056ee53..feac90d 100644 --- a/subversion/libsvn_client/diff_local.c +++ b/subversion/libsvn_client/diff_local.c @@ -647,20 +647,17 @@ do_dir_diff(const char *left_abspath, } svn_error_t * -svn_client__arbitrary_nodes_diff(const char **root_relpath, - svn_boolean_t *root_is_dir, - const char *left_abspath, +svn_client__arbitrary_nodes_diff(const char *left_abspath, const char *right_abspath, svn_depth_t depth, const svn_diff_tree_processor_t *diff_processor, svn_client_ctx_t *ctx, - apr_pool_t *result_pool, apr_pool_t *scratch_pool) { svn_node_kind_t left_kind; svn_node_kind_t right_kind; - const char *left_root_abspath; - const char *right_root_abspath; + const char *left_root_abspath = left_abspath; + const char *right_root_abspath = right_abspath; svn_boolean_t left_before_right = TRUE; /* Future argument? */ if (depth == svn_depth_unknown) @@ -669,28 +666,6 @@ svn_client__arbitrary_nodes_diff(const char **root_relpath, SVN_ERR(svn_io_check_resolved_path(left_abspath, &left_kind, scratch_pool)); SVN_ERR(svn_io_check_resolved_path(right_abspath, &right_kind, scratch_pool)); - if (left_kind == svn_node_dir && right_kind == svn_node_dir) - { - left_root_abspath = left_abspath; - right_root_abspath = right_abspath; - - if (root_relpath) - *root_relpath = ""; - if (root_is_dir) - *root_is_dir = TRUE; - } - else - { - svn_dirent_split(&left_root_abspath, root_relpath, left_abspath, - scratch_pool); - right_root_abspath = svn_dirent_dirname(right_abspath, scratch_pool); - - if (root_relpath) - *root_relpath = apr_pstrdup(result_pool, *root_relpath); - if (root_is_dir) - *root_is_dir = FALSE; - } - if (left_kind == svn_node_dir && right_kind == svn_node_dir) { SVN_ERR(do_dir_diff(left_abspath, right_abspath, @@ -710,79 +685,48 @@ svn_client__arbitrary_nodes_diff(const char **root_relpath, else if (left_kind == svn_node_file || left_kind == svn_node_dir || right_kind == svn_node_file || right_kind == svn_node_dir) { - void *dir_baton; - svn_boolean_t skip = FALSE; - svn_boolean_t skip_children = FALSE; - svn_diff_source_t *left_src; - svn_diff_source_t *right_src; - - left_src = svn_diff__source_create(SVN_INVALID_REVNUM, scratch_pool); - right_src = svn_diff__source_create(SVN_INVALID_REVNUM, scratch_pool); - - /* The root is replaced... */ - /* Report delete and/or add */ - - SVN_ERR(diff_processor->dir_opened(&dir_baton, &skip, &skip_children, "", - left_src, - right_src, - NULL /* copyfrom_src */, - NULL, - diff_processor, - scratch_pool, scratch_pool)); - - if (skip) - return SVN_NO_ERROR; - else if (!skip_children) + /* The root is added/deleted/replaced. Report delete and/or add. */ + if (left_before_right) { - if (left_before_right) - { - if (left_kind == svn_node_file) - SVN_ERR(do_file_diff(left_abspath, right_abspath, - left_root_abspath, right_root_abspath, - TRUE, FALSE, NULL /* parent_baton */, - diff_processor, ctx, scratch_pool)); - else if (left_kind == svn_node_dir) - SVN_ERR(do_dir_diff(left_abspath, right_abspath, - left_root_abspath, right_root_abspath, - TRUE, FALSE, left_before_right, - depth, NULL /* parent_baton */, - diff_processor, ctx, scratch_pool)); - } - - if (right_kind == svn_node_file) + if (left_kind == svn_node_file) SVN_ERR(do_file_diff(left_abspath, right_abspath, left_root_abspath, right_root_abspath, - FALSE, TRUE, NULL /* parent_baton */, + TRUE, FALSE, NULL /* parent_baton */, diff_processor, ctx, scratch_pool)); - else if (right_kind == svn_node_dir) + else if (left_kind == svn_node_dir) SVN_ERR(do_dir_diff(left_abspath, right_abspath, left_root_abspath, right_root_abspath, - FALSE, TRUE, left_before_right, + TRUE, FALSE, left_before_right, depth, NULL /* parent_baton */, diff_processor, ctx, scratch_pool)); - - if (! left_before_right) - { - if (left_kind == svn_node_file) - SVN_ERR(do_file_diff(left_abspath, right_abspath, - left_root_abspath, right_root_abspath, - TRUE, FALSE, NULL /* parent_baton */, - diff_processor, ctx, scratch_pool)); - else if (left_kind == svn_node_dir) - SVN_ERR(do_dir_diff(left_abspath, right_abspath, - left_root_abspath, right_root_abspath, - TRUE, FALSE, left_before_right, - depth, NULL /* parent_baton */, - diff_processor, ctx, scratch_pool)); - } } - SVN_ERR(diff_processor->dir_closed("", - left_src, - right_src, - dir_baton, - diff_processor, - scratch_pool)); + if (right_kind == svn_node_file) + SVN_ERR(do_file_diff(left_abspath, right_abspath, + left_root_abspath, right_root_abspath, + FALSE, TRUE, NULL /* parent_baton */, + diff_processor, ctx, scratch_pool)); + else if (right_kind == svn_node_dir) + SVN_ERR(do_dir_diff(left_abspath, right_abspath, + left_root_abspath, right_root_abspath, + FALSE, TRUE, left_before_right, + depth, NULL /* parent_baton */, + diff_processor, ctx, scratch_pool)); + + if (! left_before_right) + { + if (left_kind == svn_node_file) + SVN_ERR(do_file_diff(left_abspath, right_abspath, + left_root_abspath, right_root_abspath, + TRUE, FALSE, NULL /* parent_baton */, + diff_processor, ctx, scratch_pool)); + else if (left_kind == svn_node_dir) + SVN_ERR(do_dir_diff(left_abspath, right_abspath, + left_root_abspath, right_root_abspath, + TRUE, FALSE, left_before_right, + depth, NULL /* parent_baton */, + diff_processor, ctx, scratch_pool)); + } } else return svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL, diff --git a/subversion/libsvn_client/diff_summarize.c b/subversion/libsvn_client/diff_summarize.c index 9e258cd..f4972a3 100644 --- a/subversion/libsvn_client/diff_summarize.c +++ b/subversion/libsvn_client/diff_summarize.c @@ -36,11 +36,6 @@ /* Diff callbacks baton. */ struct summarize_baton_t { - apr_pool_t *baton_pool; /* For allocating skip_path */ - - /* The target path of the diff, relative to the anchor; "" if target == anchor. */ - const char *skip_relpath; - /* The summarize callback passed down from the API */ svn_client_diff_summarize_func_t summarize_func; @@ -49,9 +44,8 @@ struct summarize_baton_t { }; /* Call B->summarize_func with B->summarize_func_baton, passing it a - * summary object composed from PATH (but made to be relative to the target - * of the diff), SUMMARIZE_KIND, PROP_CHANGED (or FALSE if the action is an - * add or delete) and NODE_KIND. */ + * summary object composed from PATH, SUMMARIZE_KIND, PROP_CHANGED (or + * FALSE if the action is an add or delete) and NODE_KIND. */ static svn_error_t * send_summary(struct summarize_baton_t *b, const char *path, @@ -65,9 +59,7 @@ send_summary(struct summarize_baton_t *b, SVN_ERR_ASSERT(summarize_kind != svn_client_diff_summarize_kind_normal || prop_changed); - /* PATH is relative to the anchor of the diff, but SUM->path needs to be - relative to the target of the diff. */ - sum->path = svn_relpath_skip_ancestor(b->skip_relpath, path); + sum->path = path; sum->summarize_kind = summarize_kind; if (summarize_kind == svn_client_diff_summarize_kind_modified || summarize_kind == svn_client_diff_summarize_kind_normal) @@ -265,18 +257,15 @@ diff_file_deleted(const char *relpath, svn_error_t * svn_client__get_diff_summarize_callbacks( - const svn_diff_tree_processor_t **diff_processor, - const char ***p_root_relpath, + svn_diff_tree_processor_t **diff_processor, svn_client_diff_summarize_func_t summarize_func, void *summarize_baton, - const char *original_target, apr_pool_t *result_pool, apr_pool_t *scratch_pool) { svn_diff_tree_processor_t *dp; struct summarize_baton_t *b = apr_pcalloc(result_pool, sizeof(*b)); - b->baton_pool = result_pool; b->summarize_func = summarize_func; b->summarize_func_baton = summarize_baton; @@ -293,7 +282,6 @@ svn_client__get_diff_summarize_callbacks( dp->dir_added = diff_dir_added; *diff_processor = dp; - *p_root_relpath = &b->skip_relpath; return SVN_NO_ERROR; } diff --git a/subversion/libsvn_client/export.c b/subversion/libsvn_client/export.c index 2fc2dc8..b335f2a 100644 --- a/subversion/libsvn_client/export.c +++ b/subversion/libsvn_client/export.c @@ -453,12 +453,12 @@ export_node(void *baton, * If PATH exists but is a file, then error with SVN_ERR_WC_NOT_WORKING_COPY. * * If PATH is a already a directory, then error with - * SVN_ERR_WC_OBSTRUCTED_UPDATE, unless FORCE, in which case just + * SVN_ERR_WC_OBSTRUCTED_UPDATE, unless OVERWRITE, in which case just * export into PATH with no error. */ static svn_error_t * open_root_internal(const char *path, - svn_boolean_t force, + svn_boolean_t overwrite, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *pool) @@ -472,7 +472,7 @@ open_root_internal(const char *path, return svn_error_createf(SVN_ERR_WC_NOT_WORKING_COPY, NULL, _("'%s' exists and is not a directory"), svn_dirent_local_style(path, pool)); - else if ((kind != svn_node_dir) || (! force)) + else if ((kind != svn_node_dir) || (! overwrite)) return svn_error_createf(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL, _("'%s' already exists"), svn_dirent_local_style(path, pool)); @@ -501,7 +501,7 @@ struct edit_baton const char *repos_root_url; const char *root_path; const char *root_url; - svn_boolean_t force; + svn_boolean_t overwrite; svn_revnum_t *target_revision; apr_hash_t *externals; const char *native_eol; @@ -587,7 +587,7 @@ open_root(void *edit_baton, struct edit_baton *eb = edit_baton; struct dir_baton *db = apr_pcalloc(pool, sizeof(*db)); - SVN_ERR(open_root_internal(eb->root_path, eb->force, + SVN_ERR(open_root_internal(eb->root_path, eb->overwrite, eb->notify_func, eb->notify_baton, pool)); /* Build our dir baton. */ @@ -621,7 +621,7 @@ add_directory(const char *path, return svn_error_createf(SVN_ERR_WC_NOT_WORKING_COPY, NULL, _("'%s' exists and is not a directory"), svn_dirent_local_style(full_path, pool)); - else if (! (kind == svn_node_dir && eb->force)) + else if (! (kind == svn_node_dir && eb->overwrite)) return svn_error_createf(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL, _("'%s' already exists"), svn_dirent_local_style(full_path, pool)); @@ -1077,7 +1077,7 @@ add_directory_ev2(void *baton, return svn_error_createf(SVN_ERR_WC_NOT_WORKING_COPY, NULL, _("'%s' exists and is not a directory"), svn_dirent_local_style(full_path, scratch_pool)); - else if (! (kind == svn_node_dir && eb->force)) + else if (! (kind == svn_node_dir && eb->overwrite)) return svn_error_createf(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL, _("'%s' already exists"), svn_dirent_local_style(full_path, scratch_pool)); @@ -1141,7 +1141,7 @@ get_editor_ev2(const svn_delta_editor_t **export_editor, exb, result_pool)); /* Create the root of the export. */ - SVN_ERR(open_root_internal(eb->root_path, eb->force, eb->notify_func, + SVN_ERR(open_root_internal(eb->root_path, eb->overwrite, eb->notify_func, eb->notify_baton, scratch_pool)); return SVN_NO_ERROR; @@ -1153,7 +1153,6 @@ export_file_ev2(const char *from_url, struct edit_baton *eb, svn_client__pathrev_t *loc, svn_ra_session_t *ra_session, - svn_boolean_t overwrite, apr_pool_t *scratch_pool) { apr_hash_t *props; @@ -1177,7 +1176,7 @@ export_file_ev2(const char *from_url, SVN_ERR(svn_io_check_path(to_path, &to_kind, scratch_pool)); if ((to_kind == svn_node_file || to_kind == svn_node_unknown) && - ! overwrite) + ! eb->overwrite) return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL, _("Destination file '%s' exists, and " "will not be overwritten unless forced"), @@ -1207,7 +1206,6 @@ export_file(const char *from_url, struct edit_baton *eb, svn_client__pathrev_t *loc, svn_ra_session_t *ra_session, - svn_boolean_t overwrite, apr_pool_t *scratch_pool) { apr_hash_t *props; @@ -1232,7 +1230,7 @@ export_file(const char *from_url, SVN_ERR(svn_io_check_path(to_path, &to_kind, scratch_pool)); if ((to_kind == svn_node_file || to_kind == svn_node_unknown) && - ! overwrite) + ! eb->overwrite) return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL, _("Destination file '%s' exists, and " "will not be overwritten unless forced"), @@ -1289,7 +1287,6 @@ export_directory(const char *from_url, struct edit_baton *eb, svn_client__pathrev_t *loc, svn_ra_session_t *ra_session, - svn_boolean_t overwrite, svn_boolean_t ignore_externals, svn_boolean_t ignore_keywords, svn_depth_t depth, @@ -1344,7 +1341,7 @@ export_directory(const char *from_url, SVN_ERR(svn_io_check_path(to_path, &kind, scratch_pool)); if (kind == svn_node_none) SVN_ERR(open_root_internal - (to_path, overwrite, ctx->notify_func2, + (to_path, eb->overwrite, ctx->notify_func2, ctx->notify_baton2, scratch_pool)); if (! ignore_externals && depth == svn_depth_infinity) @@ -1415,7 +1412,7 @@ svn_client_export5(svn_revnum_t *result_rev, SVN_ERR(svn_ra_get_repos_root2(ra_session, &eb->repos_root_url, pool)); eb->root_path = to_path; eb->root_url = loc->url; - eb->force = overwrite; + eb->overwrite = overwrite; eb->target_revision = &edit_revision; eb->externals = apr_hash_make(pool); eb->native_eol = native_eol; @@ -1431,15 +1428,15 @@ svn_client_export5(svn_revnum_t *result_rev, { if (!ENABLE_EV2_IMPL) SVN_ERR(export_file(from_url, to_path, eb, loc, ra_session, - overwrite, pool)); + pool)); else SVN_ERR(export_file_ev2(from_url, to_path, eb, loc, - ra_session, overwrite, pool)); + ra_session, pool)); } else if (kind == svn_node_dir) { SVN_ERR(export_directory(from_url, to_path, - eb, loc, ra_session, overwrite, + eb, loc, ra_session, ignore_externals, ignore_keywords, depth, native_eol, ctx, pool)); } diff --git a/subversion/libsvn_client/info.c b/subversion/libsvn_client/info.c index 3331647..0f03c67 100644 --- a/subversion/libsvn_client/info.c +++ b/subversion/libsvn_client/info.c @@ -167,7 +167,8 @@ build_info_from_dirent(svn_client_info2_t **info, #define DIRENT_FIELDS (SVN_DIRENT_KIND | \ SVN_DIRENT_CREATED_REV | \ SVN_DIRENT_TIME | \ - SVN_DIRENT_LAST_AUTHOR) + SVN_DIRENT_LAST_AUTHOR | \ + SVN_DIRENT_SIZE) /* Helper func for recursively fetching svn_dirent_t's from a remote diff --git a/subversion/libsvn_client/layout.c b/subversion/libsvn_client/layout.c new file mode 100644 index 0000000..bfa7ec1 --- /dev/null +++ b/subversion/libsvn_client/layout.c @@ -0,0 +1,289 @@ +/* +* layout.c: code to list and update the working copy layout +* +* ==================================================================== +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +* ==================================================================== +*/ + +/* ==================================================================== */ + + + +/*** Includes. ***/ + +#include "svn_hash.h" +#include "svn_dirent_uri.h" +#include "svn_path.h" +#include "svn_wc.h" +#include "svn_client.h" +#include "svn_error.h" +#include "svn_pools.h" +#include "client.h" + +#include "svn_private_config.h" +#include "private/svn_wc_private.h" + +struct layout_item_t +{ + const char *local_abspath; + const char *url; + svn_revnum_t revision; + svn_depth_t depth; + struct layout_item_t *ancestor; + apr_pool_t *pool; +}; + +struct client_layout_baton_t +{ + const char *root_abspath; + svn_wc_context_t *wc_ctx; + const char *repos_root_url; + + struct layout_item_t *stack; + apr_pool_t *root_pool; + + svn_client__layout_func_t layout; + void *layout_baton; +}; + + +static svn_error_t * +layout_set_path(void *report_baton, + const char *path, + svn_revnum_t revision, + svn_depth_t depth, + svn_boolean_t start_empty, + const char *lock_token, + apr_pool_t *pool) +{ + struct client_layout_baton_t *lb = report_baton; + const char *local_abspath = svn_dirent_join(lb->root_abspath, path, pool); + struct layout_item_t *it; + apr_pool_t *item_pool; + svn_depth_t expected_depth; + + while (lb->stack + && !svn_dirent_is_ancestor(lb->stack->local_abspath, local_abspath)) + { + it = lb->stack; + lb->stack = it->ancestor; + svn_pool_destroy(it->pool); + } + + item_pool = svn_pool_create(lb->stack ? lb->stack->pool + : lb->root_pool); + + it = apr_pcalloc(item_pool, sizeof(*it)); + it->pool = item_pool; + it->local_abspath = apr_pstrdup(item_pool, local_abspath); + it->depth = depth; + it->revision = revision; + if (lb->stack) + { + it->url = svn_path_url_add_component2( + lb->stack->url, + svn_dirent_skip_ancestor(lb->stack->local_abspath, + local_abspath), + item_pool); + } + else + { + const char *repos_relpath, *repos_root_url; + + SVN_ERR(svn_wc__node_get_base(NULL, NULL, &repos_relpath, + &repos_root_url, NULL, NULL, + lb->wc_ctx, local_abspath, + FALSE /* ignore_enoent */, + pool, pool)); + + lb->repos_root_url = apr_pstrdup(lb->root_pool, repos_root_url); + it->url = svn_path_url_add_component2(repos_root_url, repos_relpath, + item_pool); + } + it->ancestor = lb->stack; + lb->stack = it; + + if (!it->ancestor) + expected_depth = depth; + else if (it->ancestor->depth == svn_depth_infinity) + expected_depth = svn_depth_infinity; + else + expected_depth = svn_depth_empty; + + return svn_error_trace(lb->layout(lb->layout_baton, + it->local_abspath, + lb->repos_root_url, + FALSE /* not-present */, + FALSE /* url changed */, + it->url, + it->ancestor + ? it->ancestor->revision != it->revision + : FALSE, + it->revision, + (depth != expected_depth), + it->depth, + pool)); + } + +static svn_error_t * +layout_link_path(void *report_baton, + const char *path, + const char *url, + svn_revnum_t revision, + svn_depth_t depth, + svn_boolean_t start_empty, + const char *lock_token, + apr_pool_t *pool) +{ + struct client_layout_baton_t *lb = report_baton; + const char *local_abspath = svn_dirent_join(lb->root_abspath, path, pool); + struct layout_item_t *it; + apr_pool_t *item_pool; + svn_depth_t expected_depth; + + SVN_ERR_ASSERT(lb->stack); /* Always below root entry */ + + while (!svn_dirent_is_ancestor(lb->stack->local_abspath, local_abspath)) + { + it = lb->stack; + lb->stack = it->ancestor; + svn_pool_destroy(it->pool); + } + + item_pool = svn_pool_create(lb->stack ? lb->stack->pool + : lb->root_pool); + + it = apr_pcalloc(item_pool, sizeof(*it)); + it->pool = item_pool; + it->local_abspath = apr_pstrdup(item_pool, local_abspath); + it->depth = depth; + it->revision = revision; + it->url = apr_pstrdup(item_pool, url); + + it->ancestor = lb->stack; + lb->stack = it; + + if (it->ancestor->depth == svn_depth_infinity) + expected_depth = svn_depth_infinity; + else + expected_depth = svn_depth_empty; + + return svn_error_trace(lb->layout(lb->layout_baton, + it->local_abspath, + lb->repos_root_url, + FALSE /* not-present */, + TRUE /* url changed */, + it->url, + it->ancestor + ? it->ancestor->revision != it->revision + : FALSE, + it->revision, + (depth != expected_depth), + it->depth, + pool)); +} + +static svn_error_t * +layout_delete_path(void *report_baton, + const char *path, + apr_pool_t *pool) +{ + struct client_layout_baton_t *lb = report_baton; + const char *local_abspath = svn_dirent_join(lb->root_abspath, path, pool); + struct layout_item_t *it; + + SVN_ERR_ASSERT(lb->stack); /* Always below root entry */ + + while (!svn_dirent_is_ancestor(lb->stack->local_abspath, local_abspath)) + { + it = lb->stack; + lb->stack = it->ancestor; + svn_pool_destroy(it->pool); + } + + return svn_error_trace(lb->layout(lb->layout_baton, + local_abspath, + lb->repos_root_url, + TRUE /* not-present */, + FALSE /* url changed */, + NULL /* no-url */, + FALSE /* revision changed */, + SVN_INVALID_REVNUM, + FALSE /* depth changed */, + svn_depth_unknown, + pool)); +} + +static svn_error_t * +layout_finish_report(void *report_baton, + apr_pool_t *pool) +{ + /*struct client_layout_baton_t *lb = report_baton;*/ + return SVN_NO_ERROR; +} + +static svn_error_t * +layout_abort_report(void *report_baton, + apr_pool_t *pool) +{ + /*struct client_layout_baton_t *lb = report_baton;*/ + return SVN_NO_ERROR; +} + +static const svn_ra_reporter3_t layout_reporter = +{ + layout_set_path, + layout_delete_path, + layout_link_path, + layout_finish_report, + layout_abort_report +}; + +svn_error_t * +svn_client__layout_list(const char *local_abspath, + svn_client__layout_func_t layout, + void *layout_baton, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + struct client_layout_baton_t lb; + + lb.root_abspath = local_abspath; + lb.root_pool = scratch_pool; + lb.wc_ctx = ctx->wc_ctx; + lb.repos_root_url = NULL; /* Filled in later */ + lb.stack = NULL; + + lb.layout = layout; + lb.layout_baton = layout_baton; + + /* Drive the reporter structure, describing the revisions within + LOCAL_ABSPATH. */ + SVN_ERR(svn_wc_crawl_revisions5(ctx->wc_ctx, local_abspath, + &layout_reporter, &lb, + FALSE /* restore_files */, + svn_depth_infinity, + TRUE /* honor_depth_exclude */, + FALSE /* depth_compatibility_trick */, + FALSE /* use_commit_times */, + ctx->cancel_func, ctx->cancel_baton, + ctx->notify_func2, ctx->notify_baton2, + scratch_pool)); + return SVN_NO_ERROR; +} diff --git a/subversion/libsvn_client/libsvn_client.pc.in b/subversion/libsvn_client/libsvn_client.pc.in index 7cc7865..4e475d8 100644 --- a/subversion/libsvn_client/libsvn_client.pc.in +++ b/subversion/libsvn_client/libsvn_client.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_client Description: Subversion Client Library Version: @PACKAGE_VERSION@ -Requires: apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr -Libs: -L${libdir} -lsvn_client -Cflags: -I${includedir} +Requires: apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_wc, libsvn_ra, libsvn_delta, libsvn_diff, libsvn_subr +Libs: -L${libdir} -lsvn_client-1 +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_client/list.c b/subversion/libsvn_client/list.c index 78433c3..d52de6d 100644 --- a/subversion/libsvn_client/list.c +++ b/subversion/libsvn_client/list.c @@ -394,7 +394,7 @@ list_internal(const char *path_or_url, svn_membuf__create(&scratch_buffer, 256, pool); /* Report the dirent for the target. */ - if (match_patterns(svn_dirent_dirname(fs_path, pool), patterns, + if (match_patterns(svn_dirent_basename(fs_path, pool), patterns, &scratch_buffer)) SVN_ERR(list_func(baton, "", dirent, locks ? (svn_hash_gets(locks, fs_path)) diff --git a/subversion/libsvn_client/merge.c b/subversion/libsvn_client/merge.c index 21341b9..72e5c5a 100644 --- a/subversion/libsvn_client/merge.c +++ b/subversion/libsvn_client/merge.c @@ -215,6 +215,21 @@ /*** Repos-Diff Editor Callbacks ***/ +struct merge_cmd_baton_t; + +struct notify_begin_state_t +{ + /* Cache of which abspath was last notified. */ + const char *last_abspath; + + /* Reference to the main merge baton */ + struct merge_cmd_baton_t *merge_b; + + /* the wrapped notification callback */ + svn_wc_notify_func2_t notify_func2; + void *notify_baton2; +}; + typedef struct merge_cmd_baton_t { svn_boolean_t force_delete; /* Delete a file/dir even if modified */ svn_boolean_t dry_run; @@ -242,11 +257,15 @@ typedef struct merge_cmd_baton_t { /* Rangelist containing single range which describes the gap, if any, in the natural history of the merge source currently being processed. - See http://subversion.tigris.org/issues/show_bug.cgi?id=3432. + See https://issues.apache.org/jira/browse/SVN-3432. Updated during each call to do_directory_merge(). May be NULL if there is no gap. */ svn_rangelist_t *implicit_src_gap; + /* Reference to the one-and-only CHILDREN_WITH_MERGEINFO (see global + comment) or a similar list for single-file-merges */ + const apr_array_header_t *children_with_mergeinfo; + svn_client_ctx_t *ctx; /* Client context for callbacks, etc. */ /* The list of any paths which remained in conflict after a @@ -319,17 +338,10 @@ typedef struct merge_cmd_baton_t { or do_file_merge() in do_merge(). */ apr_pool_t *pool; - - /* State for notify_merge_begin() */ - struct notify_begin_state_t - { - /* Cache of which abspath was last notified. */ - const char *last_abspath; - - /* Reference to the one-and-only CHILDREN_WITH_MERGEINFO (see global - comment) or a similar list for single-file-merges */ - const apr_array_header_t *nodes_with_mergeinfo; - } notify_begin; + /* Our notification callback, that adds a 'begin' notification */ + svn_wc_notify_func2_t notify_func; + void *notify_baton; + struct notify_begin_state_t notify_begin; } merge_cmd_baton_t; @@ -340,17 +352,25 @@ typedef struct merge_cmd_baton_t { merge source is an ancestor of the right-side (or vice-versa), the merge source is in the same repository as the merge target, and we are not ignoring mergeinfo. */ -#define HONOR_MERGEINFO(merge_b) ((merge_b)->mergeinfo_capable \ - && (merge_b)->merge_source.ancestral \ - && (merge_b)->same_repos \ - && (! (merge_b)->ignore_mergeinfo)) +static svn_boolean_t +HONOR_MERGEINFO(const merge_cmd_baton_t *merge_b) +{ + return (merge_b->mergeinfo_capable + && merge_b->merge_source.ancestral + && merge_b->same_repos + && (!merge_b->ignore_mergeinfo)); +} /* Return TRUE iff we should be recording mergeinfo for the merge described by MERGE_B. Specifically, that is if we are honoring mergeinfo and the merge is not a dry run. */ -#define RECORD_MERGEINFO(merge_b) (HONOR_MERGEINFO(merge_b) \ - && !(merge_b)->dry_run) +static svn_boolean_t +RECORD_MERGEINFO(const merge_cmd_baton_t *merge_b) +{ + return (HONOR_MERGEINFO(merge_b) + && !merge_b->dry_run); +} /*-----------------------------------------------------------------------*/ @@ -1226,13 +1246,6 @@ struct merge_file_baton_t svn_boolean_t add_is_replace; /* Add is second part of replace */ }; -/* Forward declaration */ -static svn_error_t * -notify_merge_begin(merge_cmd_baton_t *merge_b, - const char *local_abspath, - svn_boolean_t delete_action, - apr_pool_t *scratch_pool); - /* Record the skip for future processing and (later) produce the skip notification */ static svn_error_t * @@ -1253,18 +1266,16 @@ record_skip(merge_cmd_baton_t *merge_b, store_path(merge_b->skipped_abspaths, local_abspath); } - if (merge_b->ctx->notify_func2) + if (merge_b->notify_func) { svn_wc_notify_t *notify; - SVN_ERR(notify_merge_begin(merge_b, local_abspath, FALSE, scratch_pool)); - notify = svn_wc_create_notify(local_abspath, action, scratch_pool); notify->kind = kind; notify->content_state = notify->prop_state = state; - merge_b->ctx->notify_func2(merge_b->ctx->notify_baton2, notify, - scratch_pool); + merge_b->notify_func(merge_b->notify_baton, notify, + scratch_pool); } return SVN_NO_ERROR; } @@ -1364,7 +1375,7 @@ record_tree_conflict(merge_cmd_baton_t *merge_b, * but figure out the actual revision range merged. */ (void)find_nearest_ancestor_with_intersecting_ranges( &(range.start), &(range.end), - merge_b->notify_begin.nodes_with_mergeinfo, + merge_b->children_with_mergeinfo, action != svn_wc_conflict_action_delete, local_abspath); loc1 = svn_client__pathrev_dup(merge_b->merge_source.loc1, @@ -1423,18 +1434,16 @@ record_tree_conflict(merge_cmd_baton_t *merge_b, } /* On a replacement we currently get two tree conflicts */ - if (merge_b->ctx->notify_func2 && notify_tc) + if (merge_b->notify_func && notify_tc) { svn_wc_notify_t *notify; - SVN_ERR(notify_merge_begin(merge_b, local_abspath, FALSE, scratch_pool)); - notify = svn_wc_create_notify(local_abspath, svn_wc_notify_tree_conflict, scratch_pool); notify->kind = local_node_kind; - merge_b->ctx->notify_func2(merge_b->ctx->notify_baton2, notify, - scratch_pool); + merge_b->notify_func(merge_b->notify_baton, notify, + scratch_pool); } return SVN_NO_ERROR; @@ -1455,21 +1464,19 @@ record_update_add(merge_cmd_baton_t *merge_b, store_path(merge_b->merged_abspaths, local_abspath); } - if (merge_b->ctx->notify_func2) + if (merge_b->notify_func) { svn_wc_notify_t *notify; svn_wc_notify_action_t action = svn_wc_notify_update_add; - SVN_ERR(notify_merge_begin(merge_b, local_abspath, FALSE, scratch_pool)); - if (notify_replaced) action = svn_wc_notify_update_replace; notify = svn_wc_create_notify(local_abspath, action, scratch_pool); notify->kind = kind; - merge_b->ctx->notify_func2(merge_b->ctx->notify_baton2, notify, - scratch_pool); + merge_b->notify_func(merge_b->notify_baton, notify, + scratch_pool); } return SVN_NO_ERROR; @@ -1490,20 +1497,18 @@ record_update_update(merge_cmd_baton_t *merge_b, store_path(merge_b->merged_abspaths, local_abspath); } - if (merge_b->ctx->notify_func2) + if (merge_b->notify_func) { svn_wc_notify_t *notify; - SVN_ERR(notify_merge_begin(merge_b, local_abspath, FALSE, scratch_pool)); - notify = svn_wc_create_notify(local_abspath, svn_wc_notify_update_update, scratch_pool); notify->kind = kind; notify->content_state = content_state; notify->prop_state = prop_state; - merge_b->ctx->notify_func2(merge_b->ctx->notify_baton2, notify, - scratch_pool); + merge_b->notify_func(merge_b->notify_baton, notify, + scratch_pool); } return SVN_NO_ERROR; @@ -1529,8 +1534,6 @@ record_update_delete(merge_cmd_baton_t *merge_b, store_path(merge_b->merged_abspaths, local_abspath); } - SVN_ERR(notify_merge_begin(merge_b, local_abspath, TRUE, scratch_pool)); - if (parent_db) { const char *dup_abspath = apr_pstrdup(parent_db->pool, local_abspath); @@ -1552,7 +1555,7 @@ handle_pending_notifications(merge_cmd_baton_t *merge_b, struct merge_dir_baton_t *db, apr_pool_t *scratch_pool) { - if (merge_b->ctx->notify_func2 && db->pending_deletes) + if (merge_b->notify_func && db->pending_deletes) { apr_hash_index_t *hi; @@ -1569,8 +1572,8 @@ handle_pending_notifications(merge_cmd_baton_t *merge_b, notify->kind = svn_node_kind_from_word( apr_hash_this_val(hi)); - merge_b->ctx->notify_func2(merge_b->ctx->notify_baton2, - notify, scratch_pool); + merge_b->notify_func(merge_b->notify_baton, + notify, scratch_pool); } db->pending_deletes = NULL; @@ -1620,13 +1623,10 @@ mark_dir_edited(merge_cmd_baton_t *merge_b, for clarity we produce a skip for this node that most likely isn't touched by the merge itself */ - if (merge_b->ctx->notify_func2) + if (merge_b->notify_func) { svn_wc_notify_t *notify; - SVN_ERR(notify_merge_begin(merge_b, local_abspath, FALSE, - scratch_pool)); - notify = svn_wc_create_notify( local_abspath, (db->tree_conflict_reason == CONFLICT_REASON_SKIP) @@ -1636,9 +1636,9 @@ mark_dir_edited(merge_cmd_baton_t *merge_b, notify->kind = svn_node_dir; notify->content_state = notify->prop_state = db->skip_reason; - merge_b->ctx->notify_func2(merge_b->ctx->notify_baton2, - notify, - scratch_pool); + merge_b->notify_func(merge_b->notify_baton, + notify, + scratch_pool); } if (merge_b->merge_source.ancestral @@ -1706,21 +1706,18 @@ mark_file_edited(merge_cmd_baton_t *merge_b, for clarity we produce a skip for this node that most likely isn't touched by the merge itself */ - if (merge_b->ctx->notify_func2) + if (merge_b->notify_func) { svn_wc_notify_t *notify; - SVN_ERR(notify_merge_begin(merge_b, local_abspath, FALSE, - scratch_pool)); - notify = svn_wc_create_notify(local_abspath, svn_wc_notify_skip, scratch_pool); notify->kind = svn_node_file; notify->content_state = notify->prop_state = fb->skip_reason; - merge_b->ctx->notify_func2(merge_b->ctx->notify_baton2, - notify, - scratch_pool); + merge_b->notify_func(merge_b->notify_baton, + notify, + scratch_pool); } if (merge_b->merge_source.ancestral @@ -3413,6 +3410,49 @@ merge_node_absent(const char *relpath, return SVN_NO_ERROR; } +/* Return a diff processor that will apply the merge to the WC. + */ +static svn_diff_tree_processor_t * +merge_apply_processor(merge_cmd_baton_t *merge_cmd_baton, + apr_pool_t *result_pool) +{ + svn_diff_tree_processor_t *merge_processor; + + merge_processor = svn_diff__tree_processor_create(merge_cmd_baton, + result_pool); + + merge_processor->dir_opened = merge_dir_opened; + merge_processor->dir_changed = merge_dir_changed; + merge_processor->dir_added = merge_dir_added; + merge_processor->dir_deleted = merge_dir_deleted; + merge_processor->dir_closed = merge_dir_closed; + + merge_processor->file_opened = merge_file_opened; + merge_processor->file_changed = merge_file_changed; + merge_processor->file_added = merge_file_added; + merge_processor->file_deleted = merge_file_deleted; + /* Not interested in file_closed() */ + + merge_processor->node_absent = merge_node_absent; + + return merge_processor; +} + +/* Initialize minimal dir baton to allow calculating 'R'eplace + from 'D'elete + 'A'dd. */ +static void * +open_dir_for_replace_single_file(apr_pool_t *result_pool) +{ + struct merge_dir_baton_t *dir_baton = apr_pcalloc(result_pool, sizeof(*dir_baton)); + + dir_baton->pool = result_pool; + dir_baton->tree_conflict_reason = CONFLICT_REASON_NONE; + dir_baton->tree_conflict_action = svn_wc_conflict_action_edit; + dir_baton->skip_reason = svn_wc_notify_state_unknown; + + return dir_baton; +} + /*-----------------------------------------------------------------------*/ /*** Merge Notification ***/ @@ -3608,20 +3648,9 @@ notify_merge_completed(const char *target_abspath, } } -/* Is the notification the result of a real operative merge? */ -#define IS_OPERATIVE_NOTIFICATION(notify) \ - (notify->content_state == svn_wc_notify_state_conflicted \ - || notify->content_state == svn_wc_notify_state_merged \ - || notify->content_state == svn_wc_notify_state_changed \ - || notify->prop_state == svn_wc_notify_state_conflicted \ - || notify->prop_state == svn_wc_notify_state_merged \ - || notify->prop_state == svn_wc_notify_state_changed \ - || notify->action == svn_wc_notify_update_add \ - || notify->action == svn_wc_notify_tree_conflict) - /* Remove merge source gaps from range used for merge notifications. - See http://subversion.tigris.org/issues/show_bug.cgi?id=4138 + See https://issues.apache.org/jira/browse/SVN-4138 If IMPLICIT_SRC_GAP is not NULL then it is a rangelist containing a single range (see the implicit_src_gap member of merge_cmd_baton_t). @@ -3656,27 +3685,28 @@ remove_source_gap(svn_merge_range_t *range, * This calls the client's notification receiver (as found in the client * context), with a WC abspath. */ -static svn_error_t * -notify_merge_begin(merge_cmd_baton_t *merge_b, +static void +notify_merge_begin(struct notify_begin_state_t *notify_begin_state, const char *local_abspath, svn_boolean_t delete_action, apr_pool_t *scratch_pool) { + merge_cmd_baton_t *merge_b = notify_begin_state->merge_b; svn_wc_notify_t *notify; svn_merge_range_t n_range = {SVN_INVALID_REVNUM, SVN_INVALID_REVNUM, TRUE}; const char *notify_abspath; - if (! merge_b->ctx->notify_func2) - return SVN_NO_ERROR; + if (! notify_begin_state->notify_func2) + return; /* If our merge sources are ancestors of one another... */ if (merge_b->merge_source.ancestral) { const svn_client__merge_path_t *child; - /* Find NOTIFY->PATH's nearest ancestor in - NOTIFY->CHILDREN_WITH_MERGEINFO. Normally we consider a child in - NOTIFY->CHILDREN_WITH_MERGEINFO representing PATH to be an + /* Find LOCAL_ABSPATH's nearest ancestor in + CHILDREN_WITH_MERGEINFO. Normally we consider a child in + CHILDREN_WITH_MERGEINFO representing PATH to be an ancestor of PATH, but if this is a deletion of PATH then the notification must be for a proper ancestor of PATH. This ensures we don't get notifications like: @@ -3692,47 +3722,47 @@ notify_merge_begin(merge_cmd_baton_t *merge_b, child = find_nearest_ancestor_with_intersecting_ranges( &(n_range.start), &(n_range.end), - merge_b->notify_begin.nodes_with_mergeinfo, + merge_b->children_with_mergeinfo, ! delete_action, local_abspath); if (!child && delete_action) { /* Triggered by file replace in single-file-merge */ - child = find_nearest_ancestor(merge_b->notify_begin.nodes_with_mergeinfo, + child = find_nearest_ancestor(merge_b->children_with_mergeinfo, TRUE, local_abspath); } assert(child != NULL); /* Should always find the merge anchor */ if (! child) - return SVN_NO_ERROR; + return; - if (merge_b->notify_begin.last_abspath != NULL - && strcmp(child->abspath, merge_b->notify_begin.last_abspath) == 0) + if (notify_begin_state->last_abspath != NULL + && strcmp(child->abspath, notify_begin_state->last_abspath) == 0) { /* Don't notify the same merge again */ - return SVN_NO_ERROR; + return; } - merge_b->notify_begin.last_abspath = child->abspath; + notify_begin_state->last_abspath = child->abspath; if (child->absent || child->remaining_ranges->nelts == 0 || !SVN_IS_VALID_REVNUM(n_range.start)) { /* No valid information for an header */ - return SVN_NO_ERROR; + return; } notify_abspath = child->abspath; } else { - if (merge_b->notify_begin.last_abspath) - return SVN_NO_ERROR; /* already notified */ + if (notify_begin_state->last_abspath) + return; /* already notified */ notify_abspath = merge_b->target->abspath; /* Store something in last_abspath. Any value would do */ - merge_b->notify_begin.last_abspath = merge_b->target->abspath; + notify_begin_state->last_abspath = merge_b->target->abspath; } notify = svn_wc_create_notify(notify_abspath, @@ -3753,10 +3783,23 @@ notify_merge_begin(merge_cmd_baton_t *merge_b, notify->merge_range = NULL; } - merge_b->ctx->notify_func2(merge_b->ctx->notify_baton2, notify, - scratch_pool); + notify_begin_state->notify_func2(notify_begin_state->notify_baton2, notify, + scratch_pool); +} - return SVN_NO_ERROR; +/* Our notification callback, that adds a 'begin' notification */ +static void +notify_merging(void *baton, + const svn_wc_notify_t *notify, + apr_pool_t *pool) +{ + struct notify_begin_state_t *b = baton; + + notify_merge_begin(b, notify->path, + notify->action == svn_wc_notify_update_delete, + pool); + + b->notify_func2(b->notify_baton2, notify, pool); } /* Set *OUT_RANGELIST to the intersection of IN_RANGELIST with the simple @@ -5445,7 +5488,7 @@ record_skips_in_mergeinfo(const char *mergeinfo_path, ### TODO: An empty range is fine if the skipped path doesn't ### inherit any mergeinfo from a parent, but if it does ### we need to account for that. See issue #3440 - ### http://subversion.tigris.org/issues/show_bug.cgi?id=3440. */ + ### https://issues.apache.org/jira/browse/SVN-3440. */ svn_hash_sets(merges, skipped_abspath, apr_array_make(scratch_pool, 0, sizeof(svn_merge_range_t *))); @@ -7596,16 +7639,15 @@ do_file_merge(svn_mergeinfo_catalog_t result_catalog, /* ### Create a fake copy of merge_target as we don't keep remaining_ranges in sync (yet). */ - target_info = apr_pcalloc(scratch_pool, sizeof(*target_info)); - - target_info->abspath = merge_target->abspath; + target_info = svn_client__merge_path_create(merge_target->abspath, + scratch_pool); target_info->remaining_ranges = ranges_to_merge; APR_ARRAY_PUSH(child_with_mergeinfo, svn_client__merge_path_t *) = target_info; /* And store in baton to allow using it from notify_merge_begin() */ - merge_b->notify_begin.nodes_with_mergeinfo = child_with_mergeinfo; + merge_b->children_with_mergeinfo = child_with_mergeinfo; } while (ranges_to_merge->nelts > 0) @@ -7648,19 +7690,10 @@ do_file_merge(svn_mergeinfo_catalog_t result_catalog, do a text-n-props merge; otherwise, do a delete-n-add merge. */ if (! (merge_b->diff_ignore_ancestry || sources_related)) { - struct merge_dir_baton_t dir_baton; + void *dir_baton = open_dir_for_replace_single_file(iterpool); void *file_baton; svn_boolean_t skip; - /* Initialize minimal dir baton to allow calculating 'R'eplace - from 'D'elete + 'A'dd. */ - - memset(&dir_baton, 0, sizeof(dir_baton)); - dir_baton.pool = iterpool; - dir_baton.tree_conflict_reason = CONFLICT_REASON_NONE; - dir_baton.tree_conflict_action = svn_wc_conflict_action_edit; - dir_baton.skip_reason = svn_wc_notify_state_unknown; - /* Delete... */ file_baton = NULL; skip = FALSE; @@ -7668,7 +7701,7 @@ do_file_merge(svn_mergeinfo_catalog_t result_catalog, left_source, NULL /* right_source */, NULL /* copyfrom_source */, - &dir_baton, + dir_baton, processor, iterpool, iterpool)); if (! skip) @@ -7687,7 +7720,7 @@ do_file_merge(svn_mergeinfo_catalog_t result_catalog, NULL /* left_source */, right_source, NULL /* copyfrom_source */, - &dir_baton, + dir_baton, processor, iterpool, iterpool)); if (! skip) @@ -7819,7 +7852,7 @@ do_file_merge(svn_mergeinfo_catalog_t result_catalog, } } - merge_b->notify_begin.nodes_with_mergeinfo = NULL; + merge_b->children_with_mergeinfo = NULL; svn_pool_destroy(iterpool); @@ -7878,7 +7911,7 @@ process_children_with_new_mergeinfo(merge_cmd_baton_t *merge_b, was added (with preexisting mergeinfo) by the merge. That's actually more correct, since the inherited mergeinfo likely describes non-existent or unrelated merge history, but it's not quite so simple - as that, see http://subversion.tigris.org/issues/show_bug.cgi?id=4309 + as that, see https://issues.apache.org/jira/browse/SVN-4309 */ /* Get the path's new explicit mergeinfo... */ @@ -8269,7 +8302,7 @@ flag_subtrees_needing_mergeinfo(svn_boolean_t operative_merge, merge_b->target->abspath, depth, merge_b->ctx->wc_ctx, merge_b->ra_session1, scratch_pool, iterpool)); - /* Issue #4056: Walk NOTIFY_B->CHILDREN_WITH_MERGEINFO reverse depth-first + /* Issue #4056: Walk CHILDREN_WITH_MERGEINFO reverse depth-first order. This way each child knows if it has operative missing/switched children which necessitates non-inheritable mergeinfo. */ for (i = children_with_mergeinfo->nelts - 1; i >= 0; i--) @@ -8432,7 +8465,7 @@ flag_subtrees_needing_mergeinfo(svn_boolean_t operative_merge, } else /* child->record_mergeinfo */ { - /* If CHILD is in NOTIFY_B->CHILDREN_WITH_MERGEINFO simply + /* If CHILD is in CHILDREN_WITH_MERGEINFO simply because it had no explicit mergeinfo of its own at the start of the merge but is the child of of some path with non-inheritable mergeinfo, then the explicit mergeinfo it @@ -8457,7 +8490,7 @@ flag_subtrees_needing_mergeinfo(svn_boolean_t operative_merge, If RESULT_CATALOG is NULL then record mergeinfo describing a merge of MERGED_RANGE->START:MERGED_RANGE->END from the repository relative path MERGEINFO_FSPATH to the merge target (and possibly its subtrees) described - by NOTIFY_B->CHILDREN_WITH_MERGEINFO -- see the global comment + by CHILDREN_WITH_MERGEINFO -- see the global comment 'THE CHILDREN_WITH_MERGEINFO ARRAY'. Obviously this should only be called if recording mergeinfo -- see doc string for RECORD_MERGEINFO(). @@ -8508,7 +8541,7 @@ record_mergeinfo_for_dir_merge(svn_mergeinfo_catalog_t result_catalog, range.inheritable = TRUE; /* Remove absent children at or under MERGE_B->target->abspath from - NOTIFY_B->CHILDREN_WITH_MERGEINFO + CHILDREN_WITH_MERGEINFO before we calculate the merges performed. */ remove_absent_children(merge_b->target->abspath, children_with_mergeinfo); @@ -9334,7 +9367,7 @@ do_mergeinfo_aware_dir_merge(svn_mergeinfo_catalog_t result_catalog, /* Point our RA_SESSION to the URL of our youngest merge source side. */ ra_session = is_rollback ? merge_b->ra_session1 : merge_b->ra_session2; - /* Fill NOTIFY_B->CHILDREN_WITH_MERGEINFO with child paths (const + /* Fill CHILDREN_WITH_MERGEINFO with child paths (const svn_client__merge_path_t *) which might have intersecting merges because they meet one or more of the criteria described in get_mergeinfo_paths(). Here the paths are arranged in a depth @@ -9344,13 +9377,13 @@ do_mergeinfo_aware_dir_merge(svn_mergeinfo_catalog_t result_catalog, merge_b->dry_run, merge_b->same_repos, merge_b->ctx, scratch_pool, scratch_pool)); - /* The first item from the NOTIFY_B->CHILDREN_WITH_MERGEINFO is always + /* The first item from the CHILDREN_WITH_MERGEINFO is always the target thanks to depth-first ordering. */ target_merge_path = APR_ARRAY_IDX(children_with_mergeinfo, 0, svn_client__merge_path_t *); /* If we are honoring mergeinfo, then for each item in - NOTIFY_B->CHILDREN_WITH_MERGEINFO, we need to calculate what needs to be + CHILDREN_WITH_MERGEINFO, we need to calculate what needs to be merged, and then merge it. Otherwise, we just merge what we were asked to merge across the whole tree. */ SVN_ERR(populate_remaining_ranges(children_with_mergeinfo, @@ -9370,7 +9403,7 @@ do_mergeinfo_aware_dir_merge(svn_mergeinfo_catalog_t result_catalog, /* The merge target TARGET_ABSPATH and/or its subtrees may not need all of SOURCE->rev1:rev2 applied. So examine - NOTIFY_B->CHILDREN_WITH_MERGEINFO to find the oldest starting + CHILDREN_WITH_MERGEINFO to find the oldest starting revision that actually needs to be merged (for reverse merges this is the youngest starting revision). @@ -9408,7 +9441,7 @@ do_mergeinfo_aware_dir_merge(svn_mergeinfo_catalog_t result_catalog, /* Is there anything to merge? */ if (SVN_IS_VALID_REVNUM(start_rev)) { - /* Now examine NOTIFY_B->CHILDREN_WITH_MERGEINFO to find the oldest + /* Now examine CHILDREN_WITH_MERGEINFO to find the oldest ending revision that actually needs to be merged (for reverse merges this is the youngest ending revision). */ svn_revnum_t end_rev = @@ -9417,7 +9450,7 @@ do_mergeinfo_aware_dir_merge(svn_mergeinfo_catalog_t result_catalog, /* While END_REV is valid, do the following: - 1. Tweak each NOTIFY_B->CHILDREN_WITH_MERGEINFO element so that + 1. Tweak each CHILDREN_WITH_MERGEINFO element so that the element's remaining_ranges member has as its first element a range that ends with end_rev. @@ -9425,17 +9458,17 @@ do_mergeinfo_aware_dir_merge(svn_mergeinfo_catalog_t result_catalog, on MERGE_B->target->abspath for start_rev:end_rev. 3. Remove the first element from each - NOTIFY_B->CHILDREN_WITH_MERGEINFO element's remaining_ranges + CHILDREN_WITH_MERGEINFO element's remaining_ranges member. - 4. Again examine NOTIFY_B->CHILDREN_WITH_MERGEINFO to find the most + 4. Again examine CHILDREN_WITH_MERGEINFO to find the most inclusive starting revision that actually needs to be merged and update start_rev. This prevents us from needlessly contacting the repository and doing a diff where we describe the entire target tree as *not* needing any of the requested range. This can happen whenever we have mergeinfo with gaps in it for the merge source. - 5. Again examine NOTIFY_B->CHILDREN_WITH_MERGEINFO to find the most + 5. Again examine CHILDREN_WITH_MERGEINFO to find the most inclusive ending revision that actually needs to be merged and update end_rev. @@ -9496,14 +9529,14 @@ do_mergeinfo_aware_dir_merge(svn_mergeinfo_catalog_t result_catalog, /* If any paths picked up explicit mergeinfo as a result of the merge we need to make sure any mergeinfo those paths inherited is recorded and then add these paths to - NOTIFY_B->CHILDREN_WITH_MERGEINFO.*/ + CHILDREN_WITH_MERGEINFO.*/ SVN_ERR(process_children_with_new_mergeinfo( merge_b, children_with_mergeinfo, scratch_pool)); /* If any subtrees had their explicit mergeinfo deleted as a result of the merge then remove these paths from - NOTIFY_B->CHILDREN_WITH_MERGEINFO since there is no need + CHILDREN_WITH_MERGEINFO since there is no need to consider these subtrees for subsequent editor drives nor do we want to record mergeinfo on them describing the merge itself. */ @@ -9634,7 +9667,7 @@ do_directory_merge(svn_mergeinfo_catalog_t result_catalog, apr_array_make(scratch_pool, 16, sizeof(svn_client__merge_path_t *)); /* And make it read-only accessible from the baton */ - merge_b->notify_begin.nodes_with_mergeinfo = children_with_mergeinfo; + merge_b->children_with_mergeinfo = children_with_mergeinfo; /* If we are not honoring mergeinfo we can skip right to the business of merging changes! */ @@ -9652,7 +9685,7 @@ do_directory_merge(svn_mergeinfo_catalog_t result_catalog, processor, depth, merge_b, result_pool, scratch_pool)); - merge_b->notify_begin.nodes_with_mergeinfo = NULL; + merge_b->children_with_mergeinfo = NULL; return SVN_NO_ERROR; } @@ -9889,28 +9922,13 @@ do_merge(apr_hash_t **modified_subtrees, merge_cmd_baton.added_abspaths = apr_hash_make(result_pool); merge_cmd_baton.tree_conflicted_abspaths = apr_hash_make(result_pool); - { - svn_diff_tree_processor_t *merge_processor; - - merge_processor = svn_diff__tree_processor_create(&merge_cmd_baton, - scratch_pool); - - merge_processor->dir_opened = merge_dir_opened; - merge_processor->dir_changed = merge_dir_changed; - merge_processor->dir_added = merge_dir_added; - merge_processor->dir_deleted = merge_dir_deleted; - merge_processor->dir_closed = merge_dir_closed; - - merge_processor->file_opened = merge_file_opened; - merge_processor->file_changed = merge_file_changed; - merge_processor->file_added = merge_file_added; - merge_processor->file_deleted = merge_file_deleted; - /* Not interested in file_closed() */ - - merge_processor->node_absent = merge_node_absent; + merge_cmd_baton.notify_func = notify_merging; + merge_cmd_baton.notify_baton = &merge_cmd_baton.notify_begin; + merge_cmd_baton.notify_begin.merge_b = &merge_cmd_baton; + merge_cmd_baton.notify_begin.notify_func2 = ctx->notify_func2; + merge_cmd_baton.notify_begin.notify_baton2 = ctx->notify_baton2; - processor = merge_processor; - } + processor = merge_apply_processor(&merge_cmd_baton, scratch_pool); if (src_session) { diff --git a/subversion/libsvn_client/patch.c b/subversion/libsvn_client/patch.c index 1b2d86b..549d20c 100644 --- a/subversion/libsvn_client/patch.c +++ b/subversion/libsvn_client/patch.c @@ -343,7 +343,9 @@ strip_path(const char **result, const char *path, int strip_count, components = svn_path_decompose(path, scratch_pool); if (strip_count > components->nelts) return svn_error_createf(SVN_ERR_CLIENT_PATCH_BAD_STRIP_COUNT, NULL, - _("Cannot strip %u components from '%s'"), + Q_("Cannot strip %u component from '%s'", + "Cannot strip %u components from '%s'", + strip_count), strip_count, svn_dirent_local_style(path, scratch_pool)); @@ -1018,6 +1020,7 @@ init_patch_target(patch_target_t **patch_target, target_content_t *content; svn_boolean_t has_text_changes = FALSE; svn_boolean_t follow_moves; + const char *tempdir_abspath; has_text_changes = ((patch->hunks && patch->hunks->nelts > 0) || patch->binary_patch); @@ -1223,8 +1226,10 @@ init_patch_target(patch_target_t **patch_target, } /* Open a temporary file to write the patched result to. */ + SVN_ERR(svn_wc__get_tmpdir(&tempdir_abspath, wc_ctx, + target->local_abspath, scratch_pool, scratch_pool)); SVN_ERR(svn_io_open_unique_file3(&target->patched_file, - &target->patched_path, NULL, + &target->patched_path, tempdir_abspath, remove_tempfiles ? svn_io_file_del_on_pool_cleanup : svn_io_file_del_none, @@ -1236,7 +1241,7 @@ init_patch_target(patch_target_t **patch_target, /* Open a temporary stream to write rejected hunks to. */ SVN_ERR(svn_stream_open_unique(&target->reject_stream, - &target->reject_path, NULL, + &target->reject_path, tempdir_abspath, remove_tempfiles ? svn_io_file_del_on_pool_cleanup : svn_io_file_del_none, @@ -2145,8 +2150,8 @@ reject_hunk(patch_target_t *target, target_content_t *content, if (prop_name) { /* ### Print 'Added', 'Deleted' or 'Modified' instead of 'Property'. */ - svn_stream_printf(target->reject_stream, - pool, "Property: %s" APR_EOL_STR, prop_name); + SVN_ERR(svn_stream_printf(target->reject_stream, + pool, "Property: %s" APR_EOL_STR, prop_name)); atat = prop_atat; } else diff --git a/subversion/libsvn_client/repos_diff.c b/subversion/libsvn_client/repos_diff.c index 58fe8aa..17b537c 100644 --- a/subversion/libsvn_client/repos_diff.c +++ b/subversion/libsvn_client/repos_diff.c @@ -51,6 +51,7 @@ #include "private/svn_subr_private.h" #include "private/svn_wc_private.h" #include "private/svn_editor.h" +#include "private/svn_sorts_private.h" /* Overall crawler editor baton. */ struct edit_baton { @@ -380,7 +381,7 @@ get_file_from_ra(struct file_baton *fb, way. Hence this little hack: We populate FILE_BATON->PROPCHANGES only with *actual* property changes. - See http://subversion.tigris.org/issues/show_bug.cgi?id=3657#desc9 and + See https://issues.apache.org/jira/browse/SVN-3657#desc9 and http://svn.haxx.se/dev/archive-2010-08/0351.shtml for more details. */ static void @@ -404,15 +405,9 @@ remove_non_prop_changes(apr_hash_t *pristine_props, if (old_val && svn_string_compare(old_val, change->value)) { - int j; - - /* Remove the matching change by shifting the rest */ - for (j = i; j < changes->nelts - 1; j++) - { - APR_ARRAY_IDX(changes, j, svn_prop_t) - = APR_ARRAY_IDX(changes, j+1, svn_prop_t); - } - changes->nelts--; + /* Remove the matching change and re-check the current index */ + svn_sort__array_delete(changes, i, 1); + i--; } } } diff --git a/subversion/libsvn_client/revert.c b/subversion/libsvn_client/revert.c index d827014..cec28f2 100644 --- a/subversion/libsvn_client/revert.c +++ b/subversion/libsvn_client/revert.c @@ -51,6 +51,7 @@ struct revert_with_write_lock_baton { const apr_array_header_t *changelists; svn_boolean_t clear_changelists; svn_boolean_t metadata_only; + svn_boolean_t added_keep_local; svn_client_ctx_t *ctx; }; @@ -80,13 +81,14 @@ revert(void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) struct revert_with_write_lock_baton *b = baton; svn_error_t *err; - err = svn_wc_revert5(b->ctx->wc_ctx, + err = svn_wc_revert6(b->ctx->wc_ctx, b->local_abspath, b->depth, b->use_commit_times, b->changelists, b->clear_changelists, b->metadata_only, + b->added_keep_local, b->ctx->cancel_func, b->ctx->cancel_baton, b->ctx->notify_func2, b->ctx->notify_baton2, scratch_pool); @@ -123,11 +125,12 @@ revert(void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) svn_error_t * -svn_client_revert3(const apr_array_header_t *paths, +svn_client_revert4(const apr_array_header_t *paths, svn_depth_t depth, const apr_array_header_t *changelists, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, + svn_boolean_t added_keep_local, svn_client_ctx_t *ctx, apr_pool_t *pool) { @@ -183,6 +186,7 @@ svn_client_revert3(const apr_array_header_t *paths, baton.changelists = changelists; baton.clear_changelists = clear_changelists; baton.metadata_only = metadata_only; + baton.added_keep_local = added_keep_local; baton.ctx = ctx; err = svn_wc__is_wcroot(&wc_root, ctx->wc_ctx, local_abspath, iterpool); diff --git a/subversion/libsvn_client/shelf.c b/subversion/libsvn_client/shelf.c new file mode 100644 index 0000000..a666efc --- /dev/null +++ b/subversion/libsvn_client/shelf.c @@ -0,0 +1,1273 @@ +/* + * shelf.c: implementation of shelving + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ + +/* ==================================================================== */ + +/* We define this here to remove any further warnings about the usage of + experimental functions in this file. */ +#define SVN_EXPERIMENTAL + +#include "svn_client.h" +#include "svn_wc.h" +#include "svn_pools.h" +#include "svn_dirent_uri.h" +#include "svn_path.h" +#include "svn_hash.h" +#include "svn_utf.h" +#include "svn_ctype.h" +#include "svn_props.h" + +#include "client.h" +#include "private/svn_client_private.h" +#include "private/svn_wc_private.h" +#include "private/svn_sorts_private.h" +#include "svn_private_config.h" + + +static svn_error_t * +shelf_name_encode(char **encoded_name_p, + const char *name, + apr_pool_t *result_pool) +{ + char *encoded_name + = apr_palloc(result_pool, strlen(name) * 2 + 1); + char *out_pos = encoded_name; + + if (name[0] == '\0') + return svn_error_create(SVN_ERR_BAD_CHANGELIST_NAME, NULL, + _("Shelf name cannot be the empty string")); + + while (*name) + { + apr_snprintf(out_pos, 3, "%02x", (unsigned char)(*name++)); + out_pos += 2; + } + *encoded_name_p = encoded_name; + return SVN_NO_ERROR; +} + +static svn_error_t * +shelf_name_decode(char **decoded_name_p, + const char *codename, + apr_pool_t *result_pool) +{ + svn_stringbuf_t *sb + = svn_stringbuf_create_ensure(strlen(codename) / 2, result_pool); + const char *input = codename; + + while (*input) + { + int c; + int nchars; + int nitems = sscanf(input, "%02x%n", &c, &nchars); + + if (nitems != 1 || nchars != 2) + return svn_error_createf(SVN_ERR_BAD_CHANGELIST_NAME, NULL, + _("Shelve: Bad encoded name '%s'"), codename); + svn_stringbuf_appendbyte(sb, c); + input += 2; + } + *decoded_name_p = sb->data; + return SVN_NO_ERROR; +} + +/* Set *NAME to the shelf name from FILENAME, if FILENAME names a '.current' + * file, else to NULL. */ +static svn_error_t * +shelf_name_from_filename(char **name, + const char *filename, + apr_pool_t *result_pool) +{ + size_t len = strlen(filename); + static const char suffix[] = ".current"; + size_t suffix_len = sizeof(suffix) - 1; + + if (len > suffix_len && strcmp(filename + len - suffix_len, suffix) == 0) + { + char *codename = apr_pstrndup(result_pool, filename, len - suffix_len); + SVN_ERR(shelf_name_decode(name, codename, result_pool)); + } + else + { + *name = NULL; + } + return SVN_NO_ERROR; +} + +/* Set *DIR to the shelf storage directory inside the WC's administrative + * area. Ensure the directory exists. */ +static svn_error_t * +get_shelves_dir(char **dir, + svn_wc_context_t *wc_ctx, + const char *local_abspath, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + char *experimental_abspath; + + SVN_ERR(svn_wc__get_experimental_dir(&experimental_abspath, + wc_ctx, local_abspath, + scratch_pool, scratch_pool)); + *dir = svn_dirent_join(experimental_abspath, "shelves/v3", result_pool); + + /* Ensure the directory exists. (Other versions of svn don't create it.) */ + SVN_ERR(svn_io_make_dir_recursively(*dir, scratch_pool)); + + return SVN_NO_ERROR; +} + +/* Set *ABSPATH to the abspath of the file storage dir for SHELF + * version VERSION, no matter whether it exists. + */ +static svn_error_t * +shelf_version_files_dir_abspath(const char **abspath, + svn_client__shelf_t *shelf, + int version, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + char *codename; + char *filename; + + SVN_ERR(shelf_name_encode(&codename, shelf->name, result_pool)); + filename = apr_psprintf(scratch_pool, "%s-%03d.wc", codename, version); + *abspath = svn_dirent_join(shelf->shelves_dir, filename, result_pool); + return SVN_NO_ERROR; +} + +/* Create a shelf-version object for a version that may or may not already + * exist on disk. + */ +static svn_error_t * +shelf_version_create(svn_client__shelf_version_t **new_version_p, + svn_client__shelf_t *shelf, + int version_number, + apr_pool_t *result_pool) +{ + svn_client__shelf_version_t *shelf_version + = apr_pcalloc(result_pool, sizeof(*shelf_version)); + + shelf_version->shelf = shelf; + shelf_version->version_number = version_number; + SVN_ERR(shelf_version_files_dir_abspath(&shelf_version->files_dir_abspath, + shelf, version_number, + result_pool, result_pool)); + *new_version_p = shelf_version; + return SVN_NO_ERROR; +} + +/* Delete the storage for SHELF:VERSION. */ +static svn_error_t * +shelf_version_delete(svn_client__shelf_t *shelf, + int version, + apr_pool_t *scratch_pool) +{ + const char *files_dir_abspath; + + SVN_ERR(shelf_version_files_dir_abspath(&files_dir_abspath, + shelf, version, + scratch_pool, scratch_pool)); + SVN_ERR(svn_io_remove_dir2(files_dir_abspath, TRUE /*ignore_enoent*/, + NULL, NULL, /*cancel*/ + scratch_pool)); + return SVN_NO_ERROR; +} + +/* */ +static svn_error_t * +get_log_abspath(char **log_abspath, + svn_client__shelf_t *shelf, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + char *codename; + const char *filename; + + SVN_ERR(shelf_name_encode(&codename, shelf->name, result_pool)); + filename = apr_pstrcat(scratch_pool, codename, ".log", SVN_VA_NULL); + *log_abspath = svn_dirent_join(shelf->shelves_dir, filename, result_pool); + return SVN_NO_ERROR; +} + +/* Set SHELF->revprops by reading from its storage (the '.log' file). + * Set SHELF->revprops to empty if the storage file does not exist; this + * is not an error. + */ +static svn_error_t * +shelf_read_revprops(svn_client__shelf_t *shelf, + apr_pool_t *scratch_pool) +{ + char *log_abspath; + svn_error_t *err; + svn_stream_t *stream; + + SVN_ERR(get_log_abspath(&log_abspath, shelf, scratch_pool, scratch_pool)); + + shelf->revprops = apr_hash_make(shelf->pool); + err = svn_stream_open_readonly(&stream, log_abspath, + scratch_pool, scratch_pool); + if (err && APR_STATUS_IS_ENOENT(err->apr_err)) + { + svn_error_clear(err); + return SVN_NO_ERROR; + } + else + SVN_ERR(err); + SVN_ERR(svn_hash_read2(shelf->revprops, stream, "PROPS-END", shelf->pool)); + SVN_ERR(svn_stream_close(stream)); + return SVN_NO_ERROR; +} + +/* Write SHELF's revprops to its file storage. + */ +static svn_error_t * +shelf_write_revprops(svn_client__shelf_t *shelf, + apr_pool_t *scratch_pool) +{ + char *log_abspath; + apr_file_t *file; + svn_stream_t *stream; + + SVN_ERR(get_log_abspath(&log_abspath, shelf, scratch_pool, scratch_pool)); + + SVN_ERR(svn_io_file_open(&file, log_abspath, + APR_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_TRUNCATE, + APR_FPROT_OS_DEFAULT, scratch_pool)); + stream = svn_stream_from_aprfile2(file, FALSE /*disown*/, scratch_pool); + + SVN_ERR(svn_hash_write2(shelf->revprops, stream, "PROPS-END", scratch_pool)); + SVN_ERR(svn_stream_close(stream)); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_revprop_set(svn_client__shelf_t *shelf, + const char *prop_name, + const svn_string_t *prop_val, + apr_pool_t *scratch_pool) +{ + svn_hash_sets(shelf->revprops, apr_pstrdup(shelf->pool, prop_name), + svn_string_dup(prop_val, shelf->pool)); + SVN_ERR(shelf_write_revprops(shelf, scratch_pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_revprop_set_all(svn_client__shelf_t *shelf, + apr_hash_t *revprop_table, + apr_pool_t *scratch_pool) +{ + if (revprop_table) + shelf->revprops = svn_prop_hash_dup(revprop_table, shelf->pool); + else + shelf->revprops = apr_hash_make(shelf->pool); + + SVN_ERR(shelf_write_revprops(shelf, scratch_pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_revprop_get(svn_string_t **prop_val, + svn_client__shelf_t *shelf, + const char *prop_name, + apr_pool_t *result_pool) +{ + *prop_val = svn_hash_gets(shelf->revprops, prop_name); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_revprop_list(apr_hash_t **props, + svn_client__shelf_t *shelf, + apr_pool_t *result_pool) +{ + *props = shelf->revprops; + return SVN_NO_ERROR; +} + +/* */ +static svn_error_t * +get_current_abspath(char **current_abspath, + svn_client__shelf_t *shelf, + apr_pool_t *result_pool) +{ + char *codename; + char *filename; + + SVN_ERR(shelf_name_encode(&codename, shelf->name, result_pool)); + filename = apr_psprintf(result_pool, "%s.current", codename); + *current_abspath = svn_dirent_join(shelf->shelves_dir, filename, result_pool); + return SVN_NO_ERROR; +} + +/* Read SHELF->max_version from its storage (the '.current' file). + * Set SHELF->max_version to -1 if that file does not exist. + */ +static svn_error_t * +shelf_read_current(svn_client__shelf_t *shelf, + apr_pool_t *scratch_pool) +{ + char *current_abspath; + svn_error_t *err; + + SVN_ERR(get_current_abspath(¤t_abspath, shelf, scratch_pool)); + err = svn_io_read_version_file(&shelf->max_version, + current_abspath, scratch_pool); + if (err) + { + shelf->max_version = -1; + svn_error_clear(err); + return SVN_NO_ERROR; + } + return SVN_NO_ERROR; +} + +/* */ +static svn_error_t * +shelf_write_current(svn_client__shelf_t *shelf, + apr_pool_t *scratch_pool) +{ + char *current_abspath; + + SVN_ERR(get_current_abspath(¤t_abspath, shelf, scratch_pool)); + SVN_ERR(svn_io_write_version_file(current_abspath, shelf->max_version, + scratch_pool)); + return SVN_NO_ERROR; +} + +/*-------------------------------------------------------------------------*/ +/* Status Reporting */ + +/* Adjust a status STATUS_IN obtained from the shelf storage WC, to add + * shelf-related metadata: + * - changelist: 'svn:shelf:SHELFNAME' + */ +static svn_error_t * +status_augment(svn_wc_status3_t **status_p, + const svn_wc_status3_t *status_in, + svn_client__shelf_version_t *shelf_version, + apr_pool_t *result_pool) +{ + *status_p = svn_wc_dup_status3(status_in, result_pool); + (*status_p)->changelist = apr_psprintf(result_pool, "svn:shelf:%s", + shelf_version->shelf->name); + return SVN_NO_ERROR; +} + +/* Read status from shelf storage. + */ +static svn_error_t * +status_read(svn_wc_status3_t **status, + svn_client__shelf_version_t *shelf_version, + const char *relpath, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + svn_client_ctx_t *ctx = shelf_version->shelf->ctx; + char *abspath + = svn_dirent_join(shelf_version->files_dir_abspath, relpath, + scratch_pool); + + SVN_ERR(svn_wc_status3(status, ctx->wc_ctx, abspath, + result_pool, scratch_pool)); + SVN_ERR(status_augment(status, *status, shelf_version, result_pool)); + return SVN_NO_ERROR; +} + +/* A visitor function type for use with shelf_status_walk(). + * The same as svn_wc_status_func4_t except relpath instead of abspath. + */ +typedef svn_error_t *(*shelf_status_visitor_t)(void *baton, + const char *relpath, + const svn_wc_status3_t *status, + apr_pool_t *scratch_pool); + +/* Baton for shelved_files_walk_visitor(). */ +struct shelf_status_baton_t +{ + svn_client__shelf_version_t *shelf_version; + shelf_status_visitor_t walk_func; + void *walk_baton; +}; + +/* Convert a svn_wc_status_func4_t callback invocation to call a + * shelf_status_visitor_t callback. + * + * Call BATON->walk_func(BATON->walk_baton, relpath, ...) for the shelved + * storage path ABSPATH, converting ABSPATH to a WC-relative path, and + * augmenting the STATUS. + * + * The opposite of wc_status_visitor(). + * + * Implements svn_wc_status_func4_t. */ +static svn_error_t * +shelf_status_visitor(void *baton, + const char *abspath, + const svn_wc_status3_t *status, + apr_pool_t *scratch_pool) +{ + struct shelf_status_baton_t *b = baton; + const char *relpath; + svn_wc_status3_t *new_status; + + relpath = svn_dirent_skip_ancestor(b->shelf_version->files_dir_abspath, + abspath); + SVN_ERR(status_augment(&new_status, status, b->shelf_version, scratch_pool)); + SVN_ERR(b->walk_func(b->walk_baton, relpath, new_status, scratch_pool)); + return SVN_NO_ERROR; +} + +/* Report the shelved status of the path SHELF_VERSION:WC_RELPATH + * via WALK_FUNC(WALK_BATON, ...). + */ +static svn_error_t * +shelf_status_visit_path(svn_client__shelf_version_t *shelf_version, + const char *wc_relpath, + shelf_status_visitor_t walk_func, + void *walk_baton, + apr_pool_t *scratch_pool) +{ + svn_wc_status3_t *status; + + SVN_ERR(status_read(&status, shelf_version, wc_relpath, + scratch_pool, scratch_pool)); + SVN_ERR(walk_func(walk_baton, wc_relpath, status, scratch_pool)); + return SVN_NO_ERROR; +} + +/* Report the shelved status of all the shelved paths in SHELF_VERSION + * at and under WC_RELPATH, via WALK_FUNC(WALK_BATON, ...). + */ +static svn_error_t * +shelf_status_walk(svn_client__shelf_version_t *shelf_version, + const char *wc_relpath, + shelf_status_visitor_t walk_func, + void *walk_baton, + apr_pool_t *scratch_pool) +{ + svn_client_ctx_t *ctx = shelf_version->shelf->ctx; + char *walk_root_abspath + = svn_dirent_join(shelf_version->files_dir_abspath, wc_relpath, + scratch_pool); + struct shelf_status_baton_t baton; + svn_error_t *err; + + baton.shelf_version = shelf_version; + baton.walk_func = walk_func; + baton.walk_baton = walk_baton; + err = svn_wc_walk_status(ctx->wc_ctx, walk_root_abspath, + svn_depth_infinity, + FALSE /*get_all*/, + TRUE /*no_ignore*/, + FALSE /*ignore_text_mods*/, + NULL /*ignore_patterns: use the defaults*/, + shelf_status_visitor, &baton, + NULL, NULL, /*cancellation*/ + scratch_pool); + if (err && APR_STATUS_IS_ENOENT(err->apr_err)) + svn_error_clear(err); + else + SVN_ERR(err); + + return SVN_NO_ERROR; +} + +/* Baton for wc_status_visitor(). */ +typedef struct wc_status_baton_t +{ + svn_client__shelf_version_t *shelf_version; + svn_wc_status_func4_t walk_func; + void *walk_baton; +} wc_status_baton_t; + +/* Convert a shelf_status_visitor_t callback invocation to call a + * svn_wc_status_func4_t callback. + * + * Call BATON->walk_func(BATON->walk_baton, abspath, ...) for the WC- + * relative path RELPATH, converting RELPATH to an abspath in the user's WC. + * + * The opposite of shelf_status_visitor(). + * + * Implements shelf_status_visitor_t. */ +static svn_error_t * +wc_status_visitor(void *baton, + const char *relpath, + const svn_wc_status3_t *status, + apr_pool_t *scratch_pool) +{ + struct wc_status_baton_t *b = baton; + svn_client__shelf_t *shelf = b->shelf_version->shelf; + const char *abspath = svn_dirent_join(shelf->wc_root_abspath, relpath, + scratch_pool); + SVN_ERR(b->walk_func(b->walk_baton, abspath, status, scratch_pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_version_status_walk(svn_client__shelf_version_t *shelf_version, + const char *wc_relpath, + svn_wc_status_func4_t walk_func, + void *walk_baton, + apr_pool_t *scratch_pool) +{ + wc_status_baton_t baton; + + baton.shelf_version = shelf_version; + baton.walk_func = walk_func; + baton.walk_baton = walk_baton; + SVN_ERR(shelf_status_walk(shelf_version, wc_relpath, + wc_status_visitor, &baton, + scratch_pool)); + return SVN_NO_ERROR; +} + +/*-------------------------------------------------------------------------*/ +/* Shelf Storage */ + +/* Construct a shelf object representing an empty shelf: no versions, + * no revprops, no looking to see if such a shelf exists on disk. + */ +static svn_error_t * +shelf_construct(svn_client__shelf_t **shelf_p, + const char *name, + const char *local_abspath, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool) +{ + svn_client__shelf_t *shelf = apr_palloc(result_pool, sizeof(*shelf)); + char *shelves_dir; + + SVN_ERR(svn_client_get_wc_root(&shelf->wc_root_abspath, + local_abspath, ctx, + result_pool, result_pool)); + SVN_ERR(get_shelves_dir(&shelves_dir, ctx->wc_ctx, local_abspath, + result_pool, result_pool)); + shelf->shelves_dir = shelves_dir; + shelf->ctx = ctx; + shelf->pool = result_pool; + + shelf->name = apr_pstrdup(result_pool, name); + shelf->revprops = apr_hash_make(result_pool); + shelf->max_version = 0; + + *shelf_p = shelf; + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_open_existing(svn_client__shelf_t **shelf_p, + const char *name, + const char *local_abspath, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool) +{ + SVN_ERR(shelf_construct(shelf_p, name, + local_abspath, ctx, result_pool)); + SVN_ERR(shelf_read_revprops(*shelf_p, result_pool)); + SVN_ERR(shelf_read_current(*shelf_p, result_pool)); + if ((*shelf_p)->max_version < 0) + { + return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL, + _("Shelf '%s' not found"), + name); + } + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_open_or_create(svn_client__shelf_t **shelf_p, + const char *name, + const char *local_abspath, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool) +{ + svn_client__shelf_t *shelf; + + SVN_ERR(shelf_construct(&shelf, name, + local_abspath, ctx, result_pool)); + SVN_ERR(shelf_read_revprops(shelf, result_pool)); + SVN_ERR(shelf_read_current(shelf, result_pool)); + if (shelf->max_version < 0) + { + shelf->max_version = 0; + SVN_ERR(shelf_write_current(shelf, result_pool)); + } + *shelf_p = shelf; + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_close(svn_client__shelf_t *shelf, + apr_pool_t *scratch_pool) +{ + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_delete(const char *name, + const char *local_abspath, + svn_boolean_t dry_run, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + svn_client__shelf_t *shelf; + int i; + char *abspath; + + SVN_ERR(svn_client__shelf_open_existing(&shelf, name, + local_abspath, ctx, scratch_pool)); + + /* Remove the versions. */ + for (i = shelf->max_version; i > 0; i--) + { + SVN_ERR(shelf_version_delete(shelf, i, scratch_pool)); + } + + /* Remove the other files */ + SVN_ERR(get_log_abspath(&abspath, shelf, scratch_pool, scratch_pool)); + SVN_ERR(svn_io_remove_file2(abspath, TRUE /*ignore_enoent*/, scratch_pool)); + SVN_ERR(get_current_abspath(&abspath, shelf, scratch_pool)); + SVN_ERR(svn_io_remove_file2(abspath, TRUE /*ignore_enoent*/, scratch_pool)); + + SVN_ERR(svn_client__shelf_close(shelf, scratch_pool)); + return SVN_NO_ERROR; +} + +/* Baton for paths_changed_visitor(). */ +struct paths_changed_walk_baton_t +{ + apr_hash_t *paths_hash; + const char *wc_root_abspath; + apr_pool_t *pool; +}; + +/* Add to the list(s) in BATON, the RELPATH of a shelved 'binary' file. + * Implements shelved_files_walk_func_t. */ +static svn_error_t * +paths_changed_visitor(void *baton, + const char *relpath, + const svn_wc_status3_t *s, + apr_pool_t *scratch_pool) +{ + struct paths_changed_walk_baton_t *b = baton; + + relpath = apr_pstrdup(b->pool, relpath); + svn_hash_sets(b->paths_hash, relpath, relpath); + return SVN_NO_ERROR; +} + +/* Get the paths changed, relative to WC root or as abspaths, as a hash + * and/or an array (in no particular order). + */ +static svn_error_t * +shelf_paths_changed(apr_hash_t **paths_hash_p, + apr_array_header_t **paths_array_p, + svn_client__shelf_version_t *shelf_version, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + svn_client__shelf_t *shelf = shelf_version->shelf; + apr_hash_t *paths_hash = apr_hash_make(result_pool); + struct paths_changed_walk_baton_t baton; + + baton.paths_hash = paths_hash; + baton.wc_root_abspath = shelf->wc_root_abspath; + baton.pool = result_pool; + SVN_ERR(shelf_status_walk(shelf_version, "", + paths_changed_visitor, &baton, + scratch_pool)); + + if (paths_hash_p) + *paths_hash_p = paths_hash; + if (paths_array_p) + SVN_ERR(svn_hash_keys(paths_array_p, paths_hash, result_pool)); + + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_paths_changed(apr_hash_t **affected_paths, + svn_client__shelf_version_t *shelf_version, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + SVN_ERR(shelf_paths_changed(affected_paths, NULL, shelf_version, + result_pool, scratch_pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_replay(svn_client__shelf_version_t *shelf_version, + const char *top_relpath, + const svn_delta_editor_t *editor, + void *edit_baton, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + apr_pool_t *scratch_pool) +{ + svn_client_ctx_t *ctx = shelf_version->shelf->ctx; + apr_array_header_t *src_targets = apr_array_make(scratch_pool, 1, + sizeof(char *)); + const char *src_wc_abspath + = svn_dirent_join(shelf_version->files_dir_abspath, top_relpath, scratch_pool); + + APR_ARRAY_PUSH(src_targets, const char *) = src_wc_abspath; + SVN_ERR(svn_client__wc_replay(src_wc_abspath, + src_targets, svn_depth_infinity, NULL, + editor, edit_baton, + notify_func, notify_baton, + ctx, scratch_pool)); + return SVN_NO_ERROR; +} + +/* Baton for test_apply_file_visitor(). */ +struct test_apply_files_baton_t +{ + svn_client__shelf_version_t *shelf_version; + svn_boolean_t conflict; /* would it conflict? */ + svn_client_ctx_t *ctx; +}; + +/* Ideally, set BATON->conflict if we can't apply a change to WC + * at RELPATH without conflict. But in fact, just check + * if WC at RELPATH is locally modified. + * + * Implements shelved_files_walk_func_t. */ +static svn_error_t * +test_apply_file_visitor(void *baton, + const char *relpath, + const svn_wc_status3_t *s, + apr_pool_t *scratch_pool) +{ + struct test_apply_files_baton_t *b = baton; + const char *wc_root_abspath = b->shelf_version->shelf->wc_root_abspath; + const char *to_wc_abspath = svn_dirent_join(wc_root_abspath, relpath, + scratch_pool); + svn_wc_status3_t *status; + + SVN_ERR(svn_wc_status3(&status, b->ctx->wc_ctx, to_wc_abspath, + scratch_pool, scratch_pool)); + switch (status->node_status) + { + case svn_wc_status_normal: + case svn_wc_status_none: + break; + default: + b->conflict = TRUE; + } + + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_test_apply_file(svn_boolean_t *conflict_p, + svn_client__shelf_version_t *shelf_version, + const char *file_relpath, + apr_pool_t *scratch_pool) +{ + struct test_apply_files_baton_t baton = {0}; + + baton.shelf_version = shelf_version; + baton.conflict = FALSE; + baton.ctx = shelf_version->shelf->ctx; + SVN_ERR(shelf_status_visit_path(shelf_version, file_relpath, + test_apply_file_visitor, &baton, + scratch_pool)); + *conflict_p = baton.conflict; + + return SVN_NO_ERROR; +} + +static svn_error_t * +wc_mods_editor(const svn_delta_editor_t **editor_p, + void **edit_baton_p, + const char *dst_wc_abspath, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + svn_client__pathrev_t *base; + const char *dst_wc_url; + svn_ra_session_t *ra_session; + + /* We'll need an RA session to obtain the base of any copies */ + SVN_ERR(svn_client__wc_node_get_base(&base, + dst_wc_abspath, ctx->wc_ctx, + scratch_pool, scratch_pool)); + dst_wc_url = base->url; + SVN_ERR(svn_client_open_ra_session2(&ra_session, + dst_wc_url, dst_wc_abspath, + ctx, result_pool, scratch_pool)); + SVN_ERR(svn_client__wc_editor(editor_p, edit_baton_p, + dst_wc_abspath, + notify_func, notify_baton, + ra_session, ctx, result_pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_mods_editor(const svn_delta_editor_t **editor_p, + void **edit_baton_p, + svn_client__shelf_version_t *shelf_version, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool) +{ + SVN_ERR(wc_mods_editor(editor_p, edit_baton_p, + shelf_version->files_dir_abspath, + notify_func, notify_baton, + ctx, result_pool, result_pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_apply(svn_client__shelf_version_t *shelf_version, + svn_boolean_t dry_run, + apr_pool_t *scratch_pool) +{ + svn_client__shelf_t *shelf = shelf_version->shelf; + const svn_delta_editor_t *editor; + void *edit_baton; + + SVN_ERR(wc_mods_editor(&editor, &edit_baton, + shelf->wc_root_abspath, + NULL, NULL, /*notification*/ + shelf->ctx, scratch_pool, scratch_pool)); + + SVN_ERR(svn_client__shelf_replay(shelf_version, "", + editor, edit_baton, + shelf->ctx->notify_func2, shelf->ctx->notify_baton2, + scratch_pool)); + + svn_io_sleep_for_timestamps(shelf->wc_root_abspath, + scratch_pool); + return SVN_NO_ERROR; +} + +/* Baton for paths_changed_visitor(). */ +struct unapply_walk_baton_t +{ + const char *wc_root_abspath; + svn_boolean_t dry_run; + svn_boolean_t use_commit_times; + svn_client_ctx_t *ctx; + apr_pool_t *pool; +}; + +/* Revert the change at RELPATH in the user's WC. + * Implements shelved_files_walk_func_t. */ +static svn_error_t * +unapply_visitor(void *baton, + const char *relpath, + const svn_wc_status3_t *s, + apr_pool_t *scratch_pool) +{ + struct unapply_walk_baton_t *b = baton; + const char *abspath = svn_dirent_join(b->wc_root_abspath, relpath, + scratch_pool); + + if (!b->dry_run) + { + apr_array_header_t *targets + = apr_array_make(scratch_pool, 1, sizeof(char *)); + svn_depth_t depth; + + APR_ARRAY_PUSH(targets, const char *) = abspath; + + /* If the local modification is a "delete" then revert it all + (recursively). Otherwise we'd have to walk paths in + top-down order to revert a delete, whereas we need bottom-up + order to revert children of an added directory. */ + if (s->node_status == svn_wc_status_deleted + || s->node_status == svn_wc_status_replaced + || s->node_status == svn_wc_status_added) + depth = svn_depth_infinity; + else + depth = svn_depth_empty; + SVN_ERR(svn_wc_revert6(b->ctx->wc_ctx, + abspath, + depth, + b->use_commit_times, + NULL /*changelists*/, + FALSE /*clear_changelists*/, + FALSE /*metadata_only*/, + FALSE /*added_keep_local*/, + b->ctx->cancel_func, b->ctx->cancel_baton, + NULL, NULL, /*notification*/ + scratch_pool)); + } + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_unapply(svn_client__shelf_version_t *shelf_version, + svn_boolean_t dry_run, + apr_pool_t *scratch_pool) +{ + svn_client_ctx_t *ctx = shelf_version->shelf->ctx; + svn_client__shelf_t *shelf = shelf_version->shelf; + struct unapply_walk_baton_t baton; + svn_config_t *cfg; + + baton.wc_root_abspath = shelf->wc_root_abspath; + baton.dry_run = dry_run; + baton.ctx = ctx; + baton.pool = scratch_pool; + + cfg = ctx->config ? svn_hash_gets(ctx->config, SVN_CONFIG_CATEGORY_CONFIG) + : NULL; + SVN_ERR(svn_config_get_bool(cfg, &baton.use_commit_times, + SVN_CONFIG_SECTION_MISCELLANY, + SVN_CONFIG_OPTION_USE_COMMIT_TIMES, FALSE)); + + SVN_WC__CALL_WITH_WRITE_LOCK( + shelf_status_walk(shelf_version, "", + unapply_visitor, &baton, + scratch_pool), + ctx->wc_ctx, shelf_version->shelf->wc_root_abspath, + FALSE /*lock_anchor*/, scratch_pool); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_delete_newer_versions(svn_client__shelf_t *shelf, + svn_client__shelf_version_t *shelf_version, + apr_pool_t *scratch_pool) +{ + int previous_version = shelf_version ? shelf_version->version_number : 0; + int i; + + /* Delete any newer checkpoints */ + for (i = shelf->max_version; i > previous_version; i--) + { + SVN_ERR(shelf_version_delete(shelf, i, scratch_pool)); + } + + shelf->max_version = previous_version; + SVN_ERR(shelf_write_current(shelf, scratch_pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_diff(svn_client__shelf_version_t *shelf_version, + const char *shelf_relpath, + svn_depth_t depth, + svn_boolean_t ignore_ancestry, + const svn_diff_tree_processor_t *diff_processor, + apr_pool_t *scratch_pool) +{ + svn_client_ctx_t *ctx = shelf_version->shelf->ctx; + char *local_abspath + = svn_dirent_join(shelf_version->files_dir_abspath, shelf_relpath, + scratch_pool); + + if (shelf_version->version_number == 0) + return SVN_NO_ERROR; + + SVN_ERR(svn_wc__diff7(FALSE /*anchor_at_given_paths*/, + ctx->wc_ctx, local_abspath, + depth, + ignore_ancestry, + NULL /*changelists*/, + diff_processor, + NULL, NULL, /*cancellation*/ + scratch_pool, scratch_pool)); + return SVN_NO_ERROR; +} + +/* Populate the storage a new shelf-version object NEW_SHELF_VERSION, + * by creating a shelf storage WC with its base state copied from the + * 'real' WC. + */ +static svn_error_t * +shelf_copy_base(svn_client__shelf_version_t *new_shelf_version, + apr_pool_t *scratch_pool) +{ + svn_client_ctx_t *ctx = new_shelf_version->shelf->ctx; + const char *users_wc_abspath = new_shelf_version->shelf->wc_root_abspath; + svn_client__pathrev_t *users_wc_root_base; + svn_opt_revision_t users_wc_root_rev; + svn_ra_session_t *ra_session = NULL; + svn_boolean_t sleep_here = FALSE; + + SVN_ERR(svn_client__wc_node_get_base(&users_wc_root_base, + users_wc_abspath, ctx->wc_ctx, + scratch_pool, scratch_pool)); + + /* ### We need to read and recreate the mixed-rev, switched-URL, + mixed-depth WC state; but for a rough start we'll just use + HEAD, unswitched, depth-infinity. */ + users_wc_root_rev.kind = svn_opt_revision_head; + + /* ### TODO: Create an RA session that reads from the user's WC. + For a rough start, we'll just let 'checkout' read from the repo. */ + + SVN_ERR(svn_client__checkout_internal(NULL /*result_rev*/, &sleep_here, + users_wc_root_base->url, + new_shelf_version->files_dir_abspath, + &users_wc_root_rev, &users_wc_root_rev, + svn_depth_infinity, + TRUE /*ignore_externals*/, + FALSE /*allow_unver_obstructions*/, + ra_session, + ctx, scratch_pool)); + /* ### hopefully we won't eventually need to sleep_here... */ + if (sleep_here) + svn_io_sleep_for_timestamps(new_shelf_version->files_dir_abspath, + scratch_pool); + return SVN_NO_ERROR; +} + +/* */ +struct shelf_save_notifer_baton_t +{ + svn_client__shelf_version_t *shelf_version; + svn_wc_notify_func2_t notify_func; + void *notify_baton; + svn_client_status_func_t shelved_func; + void *shelved_baton; + svn_boolean_t any_shelved; +}; + +/* */ +static void +shelf_save_notifier(void *baton, + const svn_wc_notify_t *notify, + apr_pool_t *pool) +{ + struct shelf_save_notifer_baton_t *nb = baton; + const char *wc_relpath + = svn_dirent_skip_ancestor(nb->shelf_version->shelf->wc_root_abspath, + notify->path); + svn_client_status_t *cst = NULL; +#if 0 + svn_wc_status3_t *wc_status; + + svn_error_clear(status_read(&wc_status, nb->shelf_version, wc_relpath, + pool, pool)); + svn_error_clear(svn_client__create_status( + &cst, nb->shelf_version->shelf->ctx->wc_ctx, + notify->path, wc_status, pool, pool)); +#endif + svn_error_clear(nb->shelved_func(nb->shelved_baton, wc_relpath, cst, pool)); + nb->any_shelved = TRUE; + + nb->notify_func(nb->notify_baton, notify, pool); +} + +svn_error_t * +svn_client__shelf_save_new_version3(svn_client__shelf_version_t **new_version_p, + svn_client__shelf_t *shelf, + const apr_array_header_t *paths, + svn_depth_t depth, + const apr_array_header_t *changelists, + svn_client_status_func_t shelved_func, + void *shelved_baton, + svn_client_status_func_t not_shelved_func, + void *not_shelved_baton, + apr_pool_t *scratch_pool) +{ + svn_client_ctx_t *ctx = shelf->ctx; + int next_version = shelf->max_version + 1; + svn_client__shelf_version_t *new_shelf_version; + struct shelf_save_notifer_baton_t nb; + const svn_delta_editor_t *editor; + void *edit_baton; + + SVN_ERR(shelf_version_create(&new_shelf_version, + shelf, next_version, scratch_pool)); + SVN_ERR(shelf_copy_base(new_shelf_version, scratch_pool)); + + nb.shelf_version = new_shelf_version; + nb.notify_func = ctx->notify_func2; + nb.notify_baton = ctx->notify_baton2; + nb.shelved_func = shelved_func; + nb.shelved_baton = shelved_baton; + nb.any_shelved = FALSE; + SVN_ERR(svn_client__shelf_mods_editor(&editor, &edit_baton, + new_shelf_version, + NULL, NULL, /*notification*/ + ctx, scratch_pool)); + SVN_ERR(svn_client__wc_replay(shelf->wc_root_abspath, + paths, depth, changelists, + editor, edit_baton, + shelf_save_notifier, &nb, + ctx, scratch_pool)); + + if (nb.any_shelved) + { + shelf->max_version = next_version; + SVN_ERR(shelf_write_current(shelf, scratch_pool)); + + if (new_version_p) + SVN_ERR(svn_client__shelf_version_open(new_version_p, shelf, next_version, + scratch_pool, scratch_pool)); + } + else + { + if (new_version_p) + *new_version_p = NULL; + } + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_get_log_message(char **log_message, + svn_client__shelf_t *shelf, + apr_pool_t *result_pool) +{ + svn_string_t *propval = svn_hash_gets(shelf->revprops, SVN_PROP_REVISION_LOG); + + if (propval) + *log_message = apr_pstrdup(result_pool, propval->data); + else + *log_message = NULL; + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_set_log_message(svn_client__shelf_t *shelf, + const char *message, + apr_pool_t *scratch_pool) +{ + svn_string_t *propval + = message ? svn_string_create(message, shelf->pool) : NULL; + + SVN_ERR(svn_client__shelf_revprop_set(shelf, SVN_PROP_REVISION_LOG, propval, + scratch_pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_list(apr_hash_t **shelf_infos, + const char *local_abspath, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + const char *wc_root_abspath; + char *shelves_dir; + apr_hash_t *dirents; + apr_hash_index_t *hi; + + SVN_ERR(svn_wc__get_wcroot(&wc_root_abspath, ctx->wc_ctx, local_abspath, + scratch_pool, scratch_pool)); + SVN_ERR(get_shelves_dir(&shelves_dir, ctx->wc_ctx, local_abspath, + scratch_pool, scratch_pool)); + SVN_ERR(svn_io_get_dirents3(&dirents, shelves_dir, FALSE /*only_check_type*/, + result_pool, scratch_pool)); + + *shelf_infos = apr_hash_make(result_pool); + + /* Remove non-shelves */ + for (hi = apr_hash_first(scratch_pool, dirents); hi; hi = apr_hash_next(hi)) + { + const char *filename = apr_hash_this_key(hi); + svn_io_dirent2_t *dirent = apr_hash_this_val(hi); + char *name = NULL; + + svn_error_clear(shelf_name_from_filename(&name, filename, result_pool)); + if (name && dirent->kind == svn_node_file) + { + svn_client__shelf_info_t *info + = apr_palloc(result_pool, sizeof(*info)); + + info->mtime = dirent->mtime; + svn_hash_sets(*shelf_infos, name, info); + } + } + + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_version_open(svn_client__shelf_version_t **shelf_version_p, + svn_client__shelf_t *shelf, + int version_number, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + svn_client__shelf_version_t *shelf_version; + const svn_io_dirent2_t *dirent; + + SVN_ERR(shelf_version_create(&shelf_version, + shelf, version_number, result_pool)); + SVN_ERR(svn_io_stat_dirent2(&dirent, + shelf_version->files_dir_abspath, + FALSE /*verify_truename*/, + TRUE /*ignore_enoent*/, + result_pool, scratch_pool)); + if (dirent->kind == svn_node_none) + { + return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL, + _("Shelf '%s' version %d not found"), + shelf->name, version_number); + } + shelf_version->mtime = dirent->mtime; + *shelf_version_p = shelf_version; + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_get_newest_version(svn_client__shelf_version_t **shelf_version_p, + svn_client__shelf_t *shelf, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + if (shelf->max_version == 0) + { + *shelf_version_p = NULL; + return SVN_NO_ERROR; + } + + SVN_ERR(svn_client__shelf_version_open(shelf_version_p, + shelf, shelf->max_version, + result_pool, scratch_pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__shelf_get_all_versions(apr_array_header_t **versions_p, + svn_client__shelf_t *shelf, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + int i; + + *versions_p = apr_array_make(result_pool, shelf->max_version - 1, + sizeof(svn_client__shelf_version_t *)); + + for (i = 1; i <= shelf->max_version; i++) + { + svn_client__shelf_version_t *shelf_version; + + SVN_ERR(svn_client__shelf_version_open(&shelf_version, + shelf, i, + result_pool, scratch_pool)); + APR_ARRAY_PUSH(*versions_p, svn_client__shelf_version_t *) = shelf_version; + } + return SVN_NO_ERROR; +} diff --git a/subversion/libsvn_client/shelve.c b/subversion/libsvn_client/shelve.c deleted file mode 100644 index 4eeb4dd..0000000 --- a/subversion/libsvn_client/shelve.c +++ /dev/null @@ -1,560 +0,0 @@ -/* - * shelve.c: implementation of the 'shelve' commands - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ - -/* ==================================================================== */ - -/* We define this here to remove any further warnings about the usage of - experimental functions in this file. */ -#define SVN_EXPERIMENTAL - -#include "svn_client.h" -#include "svn_wc.h" -#include "svn_pools.h" -#include "svn_dirent_uri.h" -#include "svn_path.h" -#include "svn_hash.h" -#include "svn_utf.h" -#include "svn_ctype.h" - -#include "client.h" -#include "private/svn_client_private.h" -#include "private/svn_wc_private.h" -#include "svn_private_config.h" - - -static svn_error_t * -shelf_name_encode(char **encoded_name_p, - const char *name, - apr_pool_t *result_pool) -{ - char *encoded_name - = apr_palloc(result_pool, strlen(name) * 2 + 1); - char *out_pos = encoded_name; - - if (name[0] == '\0') - return svn_error_create(SVN_ERR_BAD_CHANGELIST_NAME, NULL, - _("Shelf name cannot be the empty string")); - - while (*name) - { - apr_snprintf(out_pos, 3, "%02x", (unsigned char)(*name++)); - out_pos += 2; - } - *encoded_name_p = encoded_name; - return SVN_NO_ERROR; -} - -static svn_error_t * -shelf_name_decode(char **decoded_name_p, - const char *codename, - apr_pool_t *result_pool) -{ - svn_stringbuf_t *sb - = svn_stringbuf_create_ensure(strlen(codename) / 2, result_pool); - const char *input = codename; - - while (*input) - { - int c; - int nchars; - int nitems = sscanf(input, "%02x%n", &c, &nchars); - - if (nitems != 1 || nchars != 2) - return svn_error_createf(SVN_ERR_BAD_CHANGELIST_NAME, NULL, - _("Shelve: Bad encoded name '%s'"), codename); - svn_stringbuf_appendbyte(sb, c); - input += 2; - } - *decoded_name_p = sb->data; - return SVN_NO_ERROR; -} - -/* Set *NAME to the shelf name from FILENAME. */ -static svn_error_t * -shelf_name_from_filename(char **name, - const char *filename, - apr_pool_t *result_pool) -{ - size_t len = strlen(filename); - - if (len > 6 && strcmp(filename + len - 6, ".patch") == 0) - { - char *codename = apr_pstrndup(result_pool, filename, len - 6); - SVN_ERR(shelf_name_decode(name, codename, result_pool)); - } - return SVN_NO_ERROR; -} - -/* Set *PATCH_ABSPATH to the abspath of the patch file for shelved change - * NAME, no matter whether it exists. - */ -static svn_error_t * -get_patch_abspath(char **patch_abspath, - const char *name, - const char *wc_root_abspath, - svn_client_ctx_t *ctx, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) -{ - char *dir; - char *filename; - - SVN_ERR(svn_wc__get_shelves_dir(&dir, ctx->wc_ctx, wc_root_abspath, - scratch_pool, scratch_pool)); - SVN_ERR(shelf_name_encode(&filename, name, scratch_pool)); - filename = apr_pstrcat(scratch_pool, filename, ".patch", SVN_VA_NULL); - *patch_abspath = svn_dirent_join(dir, filename, result_pool); - return SVN_NO_ERROR; -} - -/** Write local changes to a patch file for shelved change @a name. - * - * @a message: An optional log message. - * - * @a wc_root_abspath: The WC root dir. - * - * @a overwrite_existing: If a file at @a patch_abspath exists, overwrite it. - * - * @a paths, @a depth, @a changelists: The selection of local paths to diff. - */ -static svn_error_t * -shelf_write_patch(const char *name, - const char *message, - const char *wc_root_abspath, - svn_boolean_t overwrite_existing, - const apr_array_header_t *paths, - svn_depth_t depth, - const apr_array_header_t *changelists, - svn_client_ctx_t *ctx, - apr_pool_t *scratch_pool) -{ - char *patch_abspath; - apr_int32_t flag; - apr_file_t *outfile; - svn_stream_t *outstream; - svn_stream_t *errstream; - apr_pool_t *iterpool = svn_pool_create(scratch_pool); - int i; - svn_opt_revision_t peg_revision = {svn_opt_revision_unspecified, {0}}; - svn_opt_revision_t start_revision = {svn_opt_revision_base, {0}}; - svn_opt_revision_t end_revision = {svn_opt_revision_working, {0}}; - - SVN_ERR(get_patch_abspath(&patch_abspath, name, wc_root_abspath, - ctx, scratch_pool, scratch_pool)); - - /* Get streams for the output and any error output of the diff. */ - /* ### svn_stream_open_writable() doesn't work here: the buffering - goes wrong so that diff headers appear after their hunks. - For now, fix by opening the file without APR_BUFFERED. */ - flag = APR_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_TRUNCATE; - if (! overwrite_existing) - flag |= APR_FOPEN_EXCL; - SVN_ERR(svn_io_file_open(&outfile, patch_abspath, - flag, APR_FPROT_OS_DEFAULT, scratch_pool)); - outstream = svn_stream_from_aprfile2(outfile, FALSE /*disown*/, scratch_pool); - SVN_ERR(svn_stream_for_stderr(&errstream, scratch_pool)); - - /* Write the patch file header (log message, etc.) */ - if (message) - { - SVN_ERR(svn_stream_printf(outstream, scratch_pool, "%s\n", - message)); - } - SVN_ERR(svn_stream_printf(outstream, scratch_pool, - "--This line, and those below, will be ignored--\n\n")); - SVN_ERR(svn_stream_printf(outstream, scratch_pool, - "--This patch was generated by 'svn shelve'--\n\n")); - - for (i = 0; i < paths->nelts; i++) - { - const char *path = APR_ARRAY_IDX(paths, i, const char *); - apr_hash_t *old_config; - svn_error_t *err; - - if (svn_path_is_url(path)) - return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL, - _("'%s' is not a local path"), path); - SVN_ERR(svn_dirent_get_absolute(&path, path, scratch_pool)); - - /* Ensure we use internal diff, not any configured external diff-cmd. */ - old_config = ctx->config; - ctx->config = NULL; - err = svn_client_diff_peg6( - NULL /*options*/, - path, - &peg_revision, - &start_revision, - &end_revision, - wc_root_abspath, - depth, - TRUE /*notice_ancestry*/, - FALSE /*no_diff_added*/, - FALSE /*no_diff_deleted*/, - TRUE /*show_copies_as_adds*/, - FALSE /*ignore_content_type: FALSE -> omit binary files*/, - FALSE /*ignore_properties*/, - FALSE /*properties_only*/, - FALSE /*use_git_diff_format*/, - SVN_APR_LOCALE_CHARSET, - outstream, - errstream, - changelists, - ctx, iterpool); - ctx->config = old_config; - SVN_ERR(err); - } - - SVN_ERR(svn_stream_close(outstream)); - SVN_ERR(svn_stream_close(errstream)); - - return SVN_NO_ERROR; -} - -/** Apply the patch file for shelved change @a name to the WC. - * - * @a wc_root_abspath: The WC root dir. - * - * @a reverse: Apply the patch in reverse. - * - * @a dry_run: Don't really apply the changes, just notify what would be done. - */ -static svn_error_t * -shelf_apply_patch(const char *name, - const char *wc_root_abspath, - svn_boolean_t reverse, - svn_boolean_t dry_run, - svn_client_ctx_t *ctx, - apr_pool_t *scratch_pool) -{ - char *patch_abspath; - - SVN_ERR(get_patch_abspath(&patch_abspath, name, wc_root_abspath, - ctx, scratch_pool, scratch_pool)); - SVN_ERR(svn_client_patch(patch_abspath, wc_root_abspath, - dry_run, 0 /*strip*/, - reverse, - FALSE /*ignore_whitespace*/, - TRUE /*remove_tempfiles*/, NULL, NULL, - ctx, scratch_pool)); - - return SVN_NO_ERROR; -} - -/** Delete the patch file for shelved change @a name. - * - * @a wc_root_abspath: The WC root dir. - */ -static svn_error_t * -shelf_delete_patch(const char *name, - const char *wc_root_abspath, - svn_client_ctx_t *ctx, - apr_pool_t *scratch_pool) -{ - char *patch_abspath, *to_abspath; - - SVN_ERR(get_patch_abspath(&patch_abspath, name, wc_root_abspath, - ctx, scratch_pool, scratch_pool)); - to_abspath = apr_pstrcat(scratch_pool, patch_abspath, ".bak", SVN_VA_NULL); - - /* remove any previous backup */ - SVN_ERR(svn_io_remove_file2(to_abspath, TRUE /*ignore_enoent*/, - scratch_pool)); - - /* move the patch to a backup file */ - SVN_ERR(svn_io_file_rename2(patch_abspath, to_abspath, FALSE /*flush_to_disk*/, - scratch_pool)); - return SVN_NO_ERROR; -} - -svn_error_t * -svn_client_shelve(const char *name, - const apr_array_header_t *paths, - svn_depth_t depth, - const apr_array_header_t *changelists, - svn_boolean_t keep_local, - svn_boolean_t dry_run, - svn_client_ctx_t *ctx, - apr_pool_t *pool) -{ - const char *local_abspath; - const char *wc_root_abspath; - const char *message = ""; - svn_error_t *err; - - /* ### TODO: check all paths are in same WC; for now use first path */ - SVN_ERR(svn_dirent_get_absolute(&local_abspath, - APR_ARRAY_IDX(paths, 0, char *), pool)); - SVN_ERR(svn_client_get_wc_root(&wc_root_abspath, - local_abspath, ctx, pool, pool)); - - /* Fetch the log message and any other revprops */ - if (SVN_CLIENT__HAS_LOG_MSG_FUNC(ctx)) - { - const char *tmp_file; - apr_array_header_t *commit_items = apr_array_make(pool, 1, sizeof(void *)); - - SVN_ERR(svn_client__get_log_msg(&message, &tmp_file, commit_items, - ctx, pool)); - if (! message) - return SVN_NO_ERROR; - } - - err = shelf_write_patch(name, message, wc_root_abspath, - FALSE /*overwrite_existing*/, - paths, depth, changelists, - ctx, pool); - if (err && APR_STATUS_IS_EEXIST(err->apr_err)) - { - return svn_error_quick_wrapf(err, - "Shelved change '%s' already exists", - name); - } - else - SVN_ERR(err); - - if (!keep_local) - { - /* Reverse-apply the patch. This should be a safer way to remove those - changes from the WC than running a 'revert' operation. */ - SVN_ERR(shelf_apply_patch(name, wc_root_abspath, - TRUE /*reverse*/, dry_run, - ctx, pool)); - } - - if (dry_run) - { - SVN_ERR(shelf_delete_patch(name, wc_root_abspath, - ctx, pool)); - } - - return SVN_NO_ERROR; -} - -svn_error_t * -svn_client_unshelve(const char *name, - const char *local_abspath, - svn_boolean_t keep, - svn_boolean_t dry_run, - svn_client_ctx_t *ctx, - apr_pool_t *pool) -{ - const char *wc_root_abspath; - svn_error_t *err; - - SVN_ERR(svn_client_get_wc_root(&wc_root_abspath, - local_abspath, ctx, pool, pool)); - - /* Apply the patch. */ - err = shelf_apply_patch(name, wc_root_abspath, - FALSE /*reverse*/, dry_run, - ctx, pool); - if (err && err->apr_err == SVN_ERR_ILLEGAL_TARGET) - { - return svn_error_quick_wrapf(err, - "Shelved change '%s' not found", - name); - } - else - SVN_ERR(err); - - /* Remove the patch. */ - if (! keep && ! dry_run) - { - SVN_ERR(shelf_delete_patch(name, wc_root_abspath, - ctx, pool)); - } - - return SVN_NO_ERROR; -} - -svn_error_t * -svn_client_shelves_delete(const char *name, - const char *local_abspath, - svn_boolean_t dry_run, - svn_client_ctx_t *ctx, - apr_pool_t *pool) -{ - const char *wc_root_abspath; - - SVN_ERR(svn_client_get_wc_root(&wc_root_abspath, - local_abspath, ctx, pool, pool)); - - /* Remove the patch. */ - if (! dry_run) - { - svn_error_t *err; - - err = shelf_delete_patch(name, wc_root_abspath, - ctx, pool); - if (err && APR_STATUS_IS_ENOENT(err->apr_err)) - { - return svn_error_quick_wrapf(err, - "Shelved change '%s' not found", - name); - } - else - SVN_ERR(err); - } - - return SVN_NO_ERROR; -} - -svn_error_t * -svn_client_shelf_get_paths(apr_hash_t **affected_paths, - const char *name, - const char *local_abspath, - svn_client_ctx_t *ctx, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) -{ - const char *wc_root_abspath; - char *patch_abspath; - svn_patch_file_t *patch_file; - apr_pool_t *iterpool = svn_pool_create(scratch_pool); - apr_hash_t *paths = apr_hash_make(result_pool); - - SVN_ERR(svn_client_get_wc_root(&wc_root_abspath, - local_abspath, ctx, scratch_pool, scratch_pool)); - SVN_ERR(get_patch_abspath(&patch_abspath, name, wc_root_abspath, - ctx, scratch_pool, scratch_pool)); - SVN_ERR(svn_diff_open_patch_file(&patch_file, patch_abspath, result_pool)); - - while (1) - { - svn_patch_t *patch; - - svn_pool_clear(iterpool); - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, - FALSE /*reverse*/, - FALSE /*ignore_whitespace*/, - iterpool, iterpool)); - if (! patch) - break; - svn_hash_sets(paths, - apr_pstrdup(result_pool, patch->old_filename), - apr_pstrdup(result_pool, patch->new_filename)); - } - SVN_ERR(svn_diff_close_patch_file(patch_file, iterpool)); - svn_pool_destroy(iterpool); - - *affected_paths = paths; - return SVN_NO_ERROR; -} - -svn_error_t * -svn_client_shelf_has_changes(svn_boolean_t *has_changes, - const char *name, - const char *local_abspath, - svn_client_ctx_t *ctx, - apr_pool_t *scratch_pool) -{ - apr_hash_t *patch_paths; - - SVN_ERR(svn_client_shelf_get_paths(&patch_paths, name, local_abspath, - ctx, scratch_pool, scratch_pool)); - *has_changes = (apr_hash_count(patch_paths) != 0); - return SVN_NO_ERROR; -} - -/* Set *LOGMSG to the log message stored in the file PATCH_ABSPATH. - * - * ### Currently just reads the first line. - */ -static svn_error_t * -read_logmsg_from_patch(const char **logmsg, - const char *patch_abspath, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) -{ - apr_file_t *file; - svn_stream_t *stream; - svn_boolean_t eof; - svn_stringbuf_t *line; - - SVN_ERR(svn_io_file_open(&file, patch_abspath, - APR_FOPEN_READ, APR_FPROT_OS_DEFAULT, scratch_pool)); - stream = svn_stream_from_aprfile2(file, FALSE /*disown*/, scratch_pool); - SVN_ERR(svn_stream_readline(stream, &line, "\n", &eof, result_pool)); - SVN_ERR(svn_stream_close(stream)); - *logmsg = line->data; - return SVN_NO_ERROR; -} - -svn_error_t * -svn_client_shelves_list(apr_hash_t **shelved_patch_infos, - const char *local_abspath, - svn_client_ctx_t *ctx, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) -{ - char *shelves_dir; - apr_hash_t *dirents; - apr_hash_index_t *hi; - - SVN_ERR(svn_wc__get_shelves_dir(&shelves_dir, ctx->wc_ctx, local_abspath, - scratch_pool, scratch_pool)); - SVN_ERR(svn_io_get_dirents3(&dirents, shelves_dir, FALSE /*only_check_type*/, - result_pool, scratch_pool)); - - *shelved_patch_infos = apr_hash_make(result_pool); - - /* Remove non-shelves */ - for (hi = apr_hash_first(scratch_pool, dirents); hi; hi = apr_hash_next(hi)) - { - const char *filename = apr_hash_this_key(hi); - svn_io_dirent2_t *dirent = apr_hash_this_val(hi); - char *name = NULL; - - svn_error_clear(shelf_name_from_filename(&name, filename, result_pool)); - if (name && dirent->kind == svn_node_file) - { - svn_client_shelved_patch_info_t *info - = apr_palloc(result_pool, sizeof(*info)); - - info->dirent = dirent; - info->mtime = info->dirent->mtime; - info->patch_path - = svn_dirent_join(shelves_dir, filename, result_pool); - SVN_ERR(read_logmsg_from_patch(&info->message, info->patch_path, - result_pool, scratch_pool)); - - svn_hash_sets(*shelved_patch_infos, name, info); - } - } - - return SVN_NO_ERROR; -} - -svn_error_t * -svn_client_shelves_any(svn_boolean_t *any_shelved, - const char *local_abspath, - svn_client_ctx_t *ctx, - apr_pool_t *scratch_pool) -{ - apr_hash_t *shelved_patch_infos; - - SVN_ERR(svn_client_shelves_list(&shelved_patch_infos, local_abspath, - ctx, scratch_pool, scratch_pool)); - *any_shelved = apr_hash_count(shelved_patch_infos) != 0; - return SVN_NO_ERROR; -} diff --git a/subversion/libsvn_client/status.c b/subversion/libsvn_client/status.c index a701658..5ab5234 100644 --- a/subversion/libsvn_client/status.c +++ b/subversion/libsvn_client/status.c @@ -23,6 +23,9 @@ /* ==================================================================== */ +/* We define this here to remove any further warnings about the usage of + experimental functions in this file. */ +#define SVN_EXPERIMENTAL /*** Includes. ***/ @@ -329,6 +332,79 @@ do_external_status(svn_client_ctx_t *ctx, return SVN_NO_ERROR; } + +/* Run status on shelf SHELF_NAME, if it exists. + */ +static svn_error_t * +shelf_status(const char *shelf_name, + const char *target_abspath, + svn_wc_status_func4_t status_func, + void *status_baton, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + svn_error_t *err; + svn_client__shelf_t *shelf; + svn_client__shelf_version_t *shelf_version; + const char *wc_relpath; + + err = svn_client__shelf_open_existing(&shelf, + shelf_name, target_abspath, + ctx, scratch_pool); + if (err && err->apr_err == SVN_ERR_ILLEGAL_TARGET) + { + svn_error_clear(err); + return SVN_NO_ERROR; + } + else + SVN_ERR(err); + + SVN_ERR(svn_client__shelf_version_open(&shelf_version, + shelf, shelf->max_version, + scratch_pool, scratch_pool)); + wc_relpath = svn_dirent_skip_ancestor(shelf->wc_root_abspath, target_abspath); + SVN_ERR(svn_client__shelf_version_status_walk(shelf_version, wc_relpath, + status_func, status_baton, + scratch_pool)); + SVN_ERR(svn_client__shelf_close(shelf, scratch_pool)); + + return SVN_NO_ERROR; +} + +/* Run status on all shelves named in CHANGELISTS by a changelist name + * of the form "svn:shelf:SHELF_NAME", if they exist. + */ +static svn_error_t * +shelves_status(const apr_array_header_t *changelists, + const char *target_abspath, + svn_wc_status_func4_t status_func, + void *status_baton, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + static const char PREFIX[] = "svn:shelf:"; + static const int PREFIX_LEN = 10; + int i; + + if (! changelists) + return SVN_NO_ERROR; + for (i = 0; i < changelists->nelts; i++) + { + const char *cl = APR_ARRAY_IDX(changelists, i, const char *); + + if (strncmp(cl, PREFIX, PREFIX_LEN) == 0) + { + const char *shelf_name = cl + PREFIX_LEN; + + SVN_ERR(shelf_status(shelf_name, target_abspath, + status_func, status_baton, + ctx, scratch_pool)); + } + } + + return SVN_NO_ERROR; +} + /*** Public Interface. ***/ @@ -586,6 +662,9 @@ svn_client_status6(svn_revnum_t *result_rev, } else { + SVN_ERR(shelves_status(changelists, target_abspath, + tweak_status, &sb, + ctx, pool)); err = svn_wc_walk_status(ctx->wc_ctx, target_abspath, depth, get_all, no_ignore, FALSE, ignores, tweak_status, &sb, diff --git a/subversion/libsvn_client/update.c b/subversion/libsvn_client/update.c index 602f7e3..12469b7 100644 --- a/subversion/libsvn_client/update.c +++ b/subversion/libsvn_client/update.c @@ -615,7 +615,7 @@ svn_client__update_internal(svn_revnum_t *result_rev, { const char *anchor_abspath, *lockroot_abspath; svn_error_t *err; - svn_opt_revision_t peg_revision = *revision; + svn_opt_revision_t opt_rev = *revision; /* operative revision */ apr_hash_t *conflicted_paths = ctx->conflict_func2 ? apr_hash_make(pool) : NULL; @@ -668,7 +668,7 @@ svn_client__update_internal(svn_revnum_t *result_rev, err = update_internal(result_rev, timestamp_sleep, conflicted_paths, &ra_session, missing_parent, - anchor_abspath, &peg_revision, svn_depth_empty, + anchor_abspath, &opt_rev, svn_depth_empty, FALSE, ignore_externals, allow_unver_obstructions, adds_as_modification, FALSE, ctx, pool, iterpool); @@ -679,8 +679,8 @@ svn_client__update_internal(svn_revnum_t *result_rev, /* If we successfully updated a missing parent, let's re-use the returned revision number for future updates for the sake of consistency. */ - peg_revision.kind = svn_opt_revision_number; - peg_revision.value.number = *result_rev; + opt_rev.kind = svn_opt_revision_number; + opt_rev.value.number = *result_rev; } svn_pool_destroy(iterpool); @@ -696,7 +696,7 @@ svn_client__update_internal(svn_revnum_t *result_rev, err = update_internal(result_rev, timestamp_sleep, conflicted_paths, &ra_session, local_abspath, anchor_abspath, - &peg_revision, depth, depth_is_sticky, + &opt_rev, depth, depth_is_sticky, ignore_externals, allow_unver_obstructions, adds_as_modification, TRUE, ctx, pool, pool); diff --git a/subversion/libsvn_client/upgrade.c b/subversion/libsvn_client/upgrade.c index 741443a..edba493 100644 --- a/subversion/libsvn_client/upgrade.c +++ b/subversion/libsvn_client/upgrade.c @@ -303,7 +303,7 @@ upgrade_externals_from_properties(svn_client_ctx_t *ctx, { apr_hash_index_t *hi; apr_pool_t *iterpool; - apr_pool_t *iterpool2; + apr_pool_t *inner_iterpool; apr_hash_t *externals; svn_opt_revision_t rev = {svn_opt_revision_unspecified, {0}}; @@ -317,7 +317,7 @@ upgrade_externals_from_properties(svn_client_ctx_t *ctx, scratch_pool, scratch_pool)); iterpool = svn_pool_create(scratch_pool); - iterpool2 = svn_pool_create(scratch_pool); + inner_iterpool = svn_pool_create(scratch_pool); for (hi = apr_hash_first(scratch_pool, externals); hi; hi = apr_hash_next(hi)) @@ -351,14 +351,12 @@ upgrade_externals_from_properties(svn_client_ctx_t *ctx, iterpool, iterpool); if (!err) - externals_parent_url = svn_path_url_add_component2( - externals_parent_repos_root_url, - externals_parent_repos_relpath, - iterpool); - if (!err) - err = svn_wc_parse_externals_description3( - &externals_p, svn_dirent_dirname(local_abspath, iterpool), - external_desc->data, FALSE, iterpool); + { + err = svn_wc_parse_externals_description3( + &externals_p, svn_dirent_dirname(local_abspath, iterpool), + external_desc->data, FALSE, iterpool); + } + if (err) { svn_wc_notify_t *notify = @@ -376,24 +374,29 @@ upgrade_externals_from_properties(svn_client_ctx_t *ctx, continue; } + externals_parent_url = svn_path_url_add_component2( + externals_parent_repos_root_url, + externals_parent_repos_relpath, + iterpool); + for (i = 0; i < externals_p->nelts; i++) { svn_wc_external_item2_t *item; item = APR_ARRAY_IDX(externals_p, i, svn_wc_external_item2_t*); - svn_pool_clear(iterpool2); + svn_pool_clear(inner_iterpool); err = upgrade_external_item(ctx, externals_parent_abspath, externals_parent_url, externals_parent_repos_root_url, - item, info_baton, iterpool2); + item, info_baton, inner_iterpool); if (err) { svn_wc_notify_t *notify = svn_wc_create_notify(svn_dirent_join(externals_parent_abspath, item->target_dir, - iterpool2), + inner_iterpool), svn_wc_notify_failed_external, scratch_pool); notify->err = err; @@ -405,8 +408,8 @@ upgrade_externals_from_properties(svn_client_ctx_t *ctx, } } + svn_pool_destroy(inner_iterpool); svn_pool_destroy(iterpool); - svn_pool_destroy(iterpool2); return SVN_NO_ERROR; } diff --git a/subversion/libsvn_client/util.c b/subversion/libsvn_client/util.c index 248412b..f6612b9 100644 --- a/subversion/libsvn_client/util.c +++ b/subversion/libsvn_client/util.c @@ -93,6 +93,7 @@ svn_client__pathrev_create_with_session(svn_client__pathrev_t **pathrev_p, pathrev->rev = rev; pathrev->url = apr_pstrdup(result_pool, url); *pathrev_p = pathrev; + SVN_ERR_ASSERT(svn_uri__is_ancestor(pathrev->repos_root_url, url)); return SVN_NO_ERROR; } diff --git a/subversion/libsvn_client/wc_editor.c b/subversion/libsvn_client/wc_editor.c new file mode 100644 index 0000000..145fce0 --- /dev/null +++ b/subversion/libsvn_client/wc_editor.c @@ -0,0 +1,655 @@ +/* + * wc_editor.c: editing the local modifications in the WC. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ + +/* ==================================================================== */ + +/*** Includes. ***/ + +#include +#include "svn_hash.h" +#include "svn_client.h" +#include "svn_delta.h" +#include "svn_dirent_uri.h" +#include "svn_error.h" +#include "svn_error_codes.h" +#include "svn_pools.h" +#include "svn_props.h" +#include "svn_wc.h" + +#include + +#include "client.h" +#include "private/svn_subr_private.h" +#include "private/svn_wc_private.h" +#include "svn_private_config.h" + + +/* ------------------------------------------------------------------ */ + +/* WC Modifications Editor. + * + * This editor applies incoming modifications onto the current working state + * of the working copy, to produce a new working state. + * + * Currently, it assumes the working state matches what the edit driver + * expects to find, and may throw an error if not. + * + * For simplicity, we apply incoming edits as they arrive, rather than + * queueing them up to apply in a batch. + * + * TODO: + * - tests + * - use for all existing scenarios ('svn add', 'svn propset', etc.) + * - Instead of 'root_dir_add' option, probably the driver should anchor + * at the parent dir. + * - Instead of 'ignore_mergeinfo' option, implement that as a wrapper. + * - Option to quietly accept changes that seem to be already applied + * in the versioned state and/or on disk. + * Consider 'svn add' which assumes items to be added are found on disk. + * - Notification. + */ + +/* Everything we need to know about the edit session. + */ +struct edit_baton_t +{ + const char *anchor_abspath; + svn_boolean_t manage_wc_write_lock; + const char *lock_root_abspath; /* the path locked, when locked */ + + /* True => 'open_root' method will act as 'add_directory' */ + svn_boolean_t root_dir_add; + /* True => filter out any incoming svn:mergeinfo property changes */ + svn_boolean_t ignore_mergeinfo_changes; + + svn_ra_session_t *ra_session; + + svn_wc_context_t *wc_ctx; + svn_client_ctx_t *ctx; + svn_wc_notify_func2_t notify_func; + void *notify_baton; +}; + +/* Everything we need to know about a directory that's open for edits. + */ +struct dir_baton_t +{ + apr_pool_t *pool; + + struct edit_baton_t *eb; + + const char *local_abspath; +}; + +/* Join PATH onto ANCHOR_ABSPATH. + * Throw an error if the result is outside ANCHOR_ABSPATH. + */ +static svn_error_t * +get_path(const char **local_abspath_p, + const char *anchor_abspath, + const char *path, + apr_pool_t *result_pool) +{ + svn_boolean_t under_root; + + SVN_ERR(svn_dirent_is_under_root(&under_root, local_abspath_p, + anchor_abspath, path, result_pool)); + if (! under_root) + { + return svn_error_createf( + SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL, + _("Path '%s' is not in the working copy"), + svn_dirent_local_style(path, result_pool)); + } + return SVN_NO_ERROR; +} + +/* Create a directory on disk and add it to version control, + * with no properties. + */ +static svn_error_t * +mkdir(const char *abspath, + struct edit_baton_t *eb, + apr_pool_t *scratch_pool) +{ + SVN_ERR(svn_io_make_dir_recursively(abspath, scratch_pool)); + SVN_ERR(svn_wc_add_from_disk3(eb->wc_ctx, abspath, + NULL /*properties*/, + TRUE /* skip checks */, + eb->notify_func, eb->notify_baton, + scratch_pool)); + return SVN_NO_ERROR; +} + +/* Prepare to open or add a directory: initialize a new dir baton. + * + * If PATH is "" and PB is null, it represents the root directory of + * the edit; otherwise PATH is not "" and PB is not null. + */ +static svn_error_t * +dir_open_or_add(struct dir_baton_t **child_dir_baton, + const char *path, + struct dir_baton_t *pb, + struct edit_baton_t *eb, + apr_pool_t *dir_pool) +{ + struct dir_baton_t *db = apr_pcalloc(dir_pool, sizeof(*db)); + + db->pool = dir_pool; + db->eb = eb; + + SVN_ERR(get_path(&db->local_abspath, + eb->anchor_abspath, path, dir_pool)); + + *child_dir_baton = db; + return SVN_NO_ERROR; +} + +/* */ +static svn_error_t * +release_write_lock(struct edit_baton_t *eb, + apr_pool_t *scratch_pool) +{ + if (eb->lock_root_abspath) + { + SVN_ERR(svn_wc__release_write_lock( + eb->ctx->wc_ctx, eb->lock_root_abspath, scratch_pool)); + eb->lock_root_abspath = NULL; + } + return SVN_NO_ERROR; +} + +/* */ +static apr_status_t +pool_cleanup_handler(void *root_baton) +{ + struct dir_baton_t *db = root_baton; + struct edit_baton_t *eb = db->eb; + + svn_error_clear(release_write_lock(eb, db->pool)); + return APR_SUCCESS; +} + +/* svn_delta_editor_t function */ +static svn_error_t * +edit_open(void *edit_baton, + svn_revnum_t base_revision, + apr_pool_t *result_pool, + void **root_baton) +{ + struct edit_baton_t *eb = edit_baton; + struct dir_baton_t *db; + + SVN_ERR(dir_open_or_add(&db, "", NULL, eb, result_pool)); + + /* Acquire a WC write lock */ + if (eb->manage_wc_write_lock) + { + apr_pool_cleanup_register(db->pool, db, + pool_cleanup_handler, + apr_pool_cleanup_null); + SVN_ERR(svn_wc__acquire_write_lock(&eb->lock_root_abspath, + eb->ctx->wc_ctx, + eb->anchor_abspath, + FALSE /*lock_anchor*/, + db->pool, db->pool)); + } + + if (eb->root_dir_add) + { + SVN_ERR(mkdir(db->local_abspath, eb, result_pool)); + } + + *root_baton = db; + return SVN_NO_ERROR; +} + +/* svn_delta_editor_t function */ +static svn_error_t * +edit_close_or_abort(void *edit_baton, + apr_pool_t *scratch_pool) +{ + SVN_ERR(release_write_lock(edit_baton, scratch_pool)); + return SVN_NO_ERROR; +} + +/* */ +static svn_error_t * +delete_entry(const char *path, + svn_revnum_t revision, + void *parent_baton, + apr_pool_t *scratch_pool) +{ + struct dir_baton_t *pb = parent_baton; + struct edit_baton_t *eb = pb->eb; + const char *local_abspath; + + SVN_ERR(get_path(&local_abspath, + eb->anchor_abspath, path, scratch_pool)); + SVN_ERR(svn_wc_delete4(eb->wc_ctx, local_abspath, + FALSE /*keep_local*/, + TRUE /*delete_unversioned*/, + NULL, NULL, /*cancellation*/ + eb->notify_func, eb->notify_baton, scratch_pool)); + + return SVN_NO_ERROR; +} + +/* An svn_delta_editor_t function. */ +static svn_error_t * +dir_open(const char *path, + void *parent_baton, + svn_revnum_t base_revision, + apr_pool_t *result_pool, + void **child_baton) +{ + struct dir_baton_t *pb = parent_baton; + struct edit_baton_t *eb = pb->eb; + struct dir_baton_t *db; + + SVN_ERR(dir_open_or_add(&db, path, pb, eb, result_pool)); + + *child_baton = db; + return SVN_NO_ERROR; +} + +static svn_error_t * +dir_add(const char *path, + void *parent_baton, + const char *copyfrom_path, + svn_revnum_t copyfrom_revision, + apr_pool_t *result_pool, + void **child_baton) +{ + struct dir_baton_t *pb = parent_baton; + struct edit_baton_t *eb = pb->eb; + struct dir_baton_t *db; + /* ### Our caller should be providing a scratch pool */ + apr_pool_t *scratch_pool = svn_pool_create(result_pool); + + SVN_ERR(dir_open_or_add(&db, path, pb, eb, result_pool)); + + if (copyfrom_path && SVN_IS_VALID_REVNUM(copyfrom_revision)) + { + SVN_ERR(svn_client__repos_to_wc_copy_internal(NULL /*timestamp_sleep*/, + svn_node_dir, + copyfrom_path, + copyfrom_revision, + db->local_abspath, + db->eb->ra_session, + db->eb->ctx, + scratch_pool)); + } + else + { + SVN_ERR(mkdir(db->local_abspath, eb, result_pool)); + } + + *child_baton = db; + svn_pool_destroy(scratch_pool); + return SVN_NO_ERROR; +} + +static svn_error_t * +dir_change_prop(void *dir_baton, + const char *name, + const svn_string_t *value, + apr_pool_t *scratch_pool) +{ + struct dir_baton_t *db = dir_baton; + struct edit_baton_t *eb = db->eb; + + if (svn_property_kind2(name) != svn_prop_regular_kind + || (eb->ignore_mergeinfo_changes && ! strcmp(name, SVN_PROP_MERGEINFO))) + { + /* We can't handle DAV, ENTRY and merge specific props here */ + return SVN_NO_ERROR; + } + + SVN_ERR(svn_wc_prop_set4(eb->wc_ctx, db->local_abspath, name, value, + svn_depth_empty, FALSE, NULL, + NULL, NULL, /* Cancellation */ + NULL, NULL, /* Notification */ + scratch_pool)); + + return SVN_NO_ERROR; +} + +static svn_error_t * +dir_close(void *dir_baton, + apr_pool_t *scratch_pool) +{ + return SVN_NO_ERROR; +} + +/* Everything we need to know about a file that's open for edits. + */ +struct file_baton_t +{ + apr_pool_t *pool; + + struct edit_baton_t *eb; + + const char *local_abspath; + + /* fields for the transfer of text changes */ + const char *writing_file; + unsigned char digest[APR_MD5_DIGESTSIZE]; /* MD5 digest of new fulltext */ + svn_stream_t *wc_file_read_stream, *tmp_file_write_stream; + const char *tmp_path; +}; + +/* Create a new file on disk and add it to version control. + * + * The file is empty and has no properties. + */ +static svn_error_t * +mkfile(const char *abspath, + struct edit_baton_t *eb, + apr_pool_t *scratch_pool) +{ + SVN_ERR(svn_io_file_create_empty(abspath, scratch_pool)); + SVN_ERR(svn_wc_add_from_disk3(eb->wc_ctx, abspath, + NULL /*properties*/, + TRUE /* skip checks */, + eb->notify_func, eb->notify_baton, + scratch_pool)); + return SVN_NO_ERROR; +} + +/* */ +static svn_error_t * +file_open_or_add(const char *path, + void *parent_baton, + struct file_baton_t **file_baton, + apr_pool_t *file_pool) +{ + struct dir_baton_t *pb = parent_baton; + struct edit_baton_t *eb = pb->eb; + struct file_baton_t *fb = apr_pcalloc(file_pool, sizeof(*fb)); + + fb->pool = file_pool; + fb->eb = eb; + SVN_ERR(get_path(&fb->local_abspath, + eb->anchor_abspath, path, fb->pool)); + + *file_baton = fb; + return SVN_NO_ERROR; +} + +static svn_error_t * +file_open(const char *path, + void *parent_baton, + svn_revnum_t base_revision, + apr_pool_t *result_pool, + void **file_baton) +{ + struct file_baton_t *fb; + + SVN_ERR(file_open_or_add(path, parent_baton, &fb, result_pool)); + + *file_baton = fb; + return SVN_NO_ERROR; +} + +static svn_error_t * +file_add(const char *path, + void *parent_baton, + const char *copyfrom_path, + svn_revnum_t copyfrom_revision, + apr_pool_t *result_pool, + void **file_baton) +{ + struct file_baton_t *fb; + + SVN_ERR(file_open_or_add(path, parent_baton, &fb, result_pool)); + + if (copyfrom_path && SVN_IS_VALID_REVNUM(copyfrom_revision)) + { + SVN_ERR(svn_client__repos_to_wc_copy_internal(NULL /*timestamp_sleep*/, + svn_node_file, + copyfrom_path, + copyfrom_revision, + fb->local_abspath, + fb->eb->ra_session, + fb->eb->ctx, fb->pool)); + } + else + { + SVN_ERR(mkfile(fb->local_abspath, fb->eb, result_pool)); + } + + *file_baton = fb; + return SVN_NO_ERROR; +} + +static svn_error_t * +file_change_prop(void *file_baton, + const char *name, + const svn_string_t *value, + apr_pool_t *scratch_pool) +{ + struct file_baton_t *fb = file_baton; + struct edit_baton_t *eb = fb->eb; + + if (svn_property_kind2(name) != svn_prop_regular_kind + || (eb->ignore_mergeinfo_changes && ! strcmp(name, SVN_PROP_MERGEINFO))) + { + /* We can't handle DAV, ENTRY and merge specific props here */ + return SVN_NO_ERROR; + } + + SVN_ERR(svn_wc_prop_set4(eb->wc_ctx, fb->local_abspath, name, value, + svn_depth_empty, FALSE, NULL, + NULL, NULL, /* Cancellation */ + NULL, NULL, /* Notification */ + scratch_pool)); + + return SVN_NO_ERROR; +} + +static svn_error_t * +file_textdelta(void *file_baton, + const char *base_checksum, + apr_pool_t *result_pool, + svn_txdelta_window_handler_t *handler, + void **handler_baton) +{ + struct file_baton_t *fb = file_baton; + const char *target_dir = svn_dirent_dirname(fb->local_abspath, fb->pool); + svn_error_t *err; + + SVN_ERR_ASSERT(! fb->writing_file); + + err = svn_stream_open_readonly(&fb->wc_file_read_stream, fb->local_abspath, + fb->pool, fb->pool); + if (err && APR_STATUS_IS_ENOENT(err->apr_err)) + { + svn_error_clear(err); + fb->wc_file_read_stream = svn_stream_empty(fb->pool); + } + else + SVN_ERR(err); + + SVN_ERR(svn_stream_open_unique(&fb->tmp_file_write_stream, &fb->writing_file, + target_dir, svn_io_file_del_none, + fb->pool, fb->pool)); + + svn_txdelta_apply(fb->wc_file_read_stream, + fb->tmp_file_write_stream, + fb->digest, + fb->local_abspath, + fb->pool, + /* Provide the handler directly */ + handler, handler_baton); + + return SVN_NO_ERROR; +} + +static svn_error_t * +file_close(void *file_baton, + const char *text_checksum, + apr_pool_t *scratch_pool) +{ + struct file_baton_t *fb = file_baton; + + /* If we have text changes, write them to disk */ + if (fb->writing_file) + { + SVN_ERR(svn_stream_close(fb->wc_file_read_stream)); + SVN_ERR(svn_io_file_rename2(fb->writing_file, fb->local_abspath, + FALSE /*flush*/, scratch_pool)); + } + + if (text_checksum) + { + svn_checksum_t *expected_checksum; + svn_checksum_t *actual_checksum; + + SVN_ERR(svn_checksum_parse_hex(&expected_checksum, svn_checksum_md5, + text_checksum, fb->pool)); + actual_checksum = svn_checksum__from_digest_md5(fb->digest, fb->pool); + + if (! svn_checksum_match(expected_checksum, actual_checksum)) + return svn_error_trace( + svn_checksum_mismatch_err(expected_checksum, + actual_checksum, + fb->pool, + _("Checksum mismatch for '%s'"), + svn_dirent_local_style( + fb->local_abspath, + fb->pool))); + } + + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__wc_editor_internal(const svn_delta_editor_t **editor_p, + void **edit_baton_p, + const char *dst_abspath, + svn_boolean_t root_dir_add, + svn_boolean_t ignore_mergeinfo_changes, + svn_boolean_t manage_wc_write_lock, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + svn_ra_session_t *ra_session, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool) +{ + svn_delta_editor_t *editor = svn_delta_default_editor(result_pool); + struct edit_baton_t *eb = apr_pcalloc(result_pool, sizeof(*eb)); + + eb->anchor_abspath = apr_pstrdup(result_pool, dst_abspath); + eb->manage_wc_write_lock = manage_wc_write_lock; + eb->lock_root_abspath = NULL; + eb->root_dir_add = root_dir_add; + eb->ignore_mergeinfo_changes = ignore_mergeinfo_changes; + + eb->ra_session = ra_session; + eb->wc_ctx = ctx->wc_ctx; + eb->ctx = ctx; + eb->notify_func = notify_func; + eb->notify_baton = notify_baton; + + editor->open_root = edit_open; + editor->close_edit = edit_close_or_abort; + editor->abort_edit = edit_close_or_abort; + + editor->delete_entry = delete_entry; + + editor->open_directory = dir_open; + editor->add_directory = dir_add; + editor->change_dir_prop = dir_change_prop; + editor->close_directory = dir_close; + + editor->open_file = file_open; + editor->add_file = file_add; + editor->change_file_prop = file_change_prop; + editor->apply_textdelta = file_textdelta; + editor->close_file = file_close; + + *editor_p = editor; + *edit_baton_p = eb; + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__wc_editor(const svn_delta_editor_t **editor_p, + void **edit_baton_p, + const char *dst_abspath, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + svn_ra_session_t *ra_session, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool) +{ + SVN_ERR(svn_client__wc_editor_internal(editor_p, edit_baton_p, + dst_abspath, + FALSE /*root_dir_add*/, + FALSE /*ignore_mergeinfo_changes*/, + TRUE /*manage_wc_write_lock*/, + notify_func, notify_baton, + ra_session, + ctx, result_pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_client__wc_copy_mods(const char *src_wc_abspath, + const char *dst_wc_abspath, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + svn_client__pathrev_t *base; + const char *dst_wc_url; + svn_ra_session_t *ra_session; + const svn_delta_editor_t *editor; + void *edit_baton; + apr_array_header_t *src_targets = apr_array_make(scratch_pool, 1, + sizeof(char *)); + + /* We'll need an RA session to obtain the base of any copies */ + SVN_ERR(svn_client__wc_node_get_base(&base, + src_wc_abspath, ctx->wc_ctx, + scratch_pool, scratch_pool)); + dst_wc_url = base->url; + SVN_ERR(svn_client_open_ra_session2(&ra_session, + dst_wc_url, dst_wc_abspath, + ctx, scratch_pool, scratch_pool)); + SVN_ERR(svn_client__wc_editor(&editor, &edit_baton, + dst_wc_abspath, + NULL, NULL, /*notification*/ + ra_session, ctx, scratch_pool)); + + APR_ARRAY_PUSH(src_targets, const char *) = src_wc_abspath; + SVN_ERR(svn_client__wc_replay(src_wc_abspath, + src_targets, svn_depth_infinity, NULL, + editor, edit_baton, + notify_func, notify_baton, + ctx, scratch_pool)); + + return SVN_NO_ERROR; +} diff --git a/subversion/libsvn_delta/branch_compat.c b/subversion/libsvn_delta/branch_compat.c index dac0e19..635b31a 100644 --- a/subversion/libsvn_delta/branch_compat.c +++ b/subversion/libsvn_delta/branch_compat.c @@ -875,6 +875,8 @@ drive_ev1_props(const char *repos_relpath, */ static svn_error_t * apply_change(void **dir_baton, + const svn_delta_editor_t *editor, + void *edit_baton, void *parent_baton, void *callback_baton, const char *ev1_relpath, @@ -905,7 +907,7 @@ apply_change(void **dir_baton, /* Only property edits are allowed on the root. */ SVN_ERR_ASSERT(change->action == RESTRUCTURE_NONE); SVN_ERR(drive_ev1_props(ev1_relpath, change, base_props, - eb->deditor, *dir_baton, scratch_pool)); + editor, *dir_baton, scratch_pool)); /* No further action possible for the root. */ return SVN_NO_ERROR; @@ -913,8 +915,8 @@ apply_change(void **dir_baton, if (change->action == RESTRUCTURE_DELETE) { - SVN_ERR(eb->deditor->delete_entry(ev1_relpath, change->deleting_rev, - parent_baton, scratch_pool)); + SVN_ERR(editor->delete_entry(ev1_relpath, change->deleting_rev, + parent_baton, scratch_pool)); /* No futher action possible for this node. */ return SVN_NO_ERROR; @@ -927,11 +929,11 @@ apply_change(void **dir_baton, if (change->action == RESTRUCTURE_ADD_ABSENT) { if (change->kind == svn_node_dir) - SVN_ERR(eb->deditor->absent_directory(ev1_relpath, parent_baton, - scratch_pool)); - else if (change->kind == svn_node_file) - SVN_ERR(eb->deditor->absent_file(ev1_relpath, parent_baton, + SVN_ERR(editor->absent_directory(ev1_relpath, parent_baton, scratch_pool)); + else if (change->kind == svn_node_file) + SVN_ERR(editor->absent_file(ev1_relpath, parent_baton, + scratch_pool)); else SVN_ERR_MALFUNCTION(); @@ -948,8 +950,8 @@ apply_change(void **dir_baton, /* Do we have an old node to delete first? If so, delete it. */ if (change->deleting) - SVN_ERR(eb->deditor->delete_entry(ev1_relpath, change->deleting_rev, - parent_baton, scratch_pool)); + SVN_ERR(editor->delete_entry(ev1_relpath, change->deleting_rev, + parent_baton, scratch_pool)); /* If it's a copy, determine the copy source location. */ if (change->copyfrom_path) @@ -974,13 +976,13 @@ apply_change(void **dir_baton, } if (change->kind == svn_node_dir) - SVN_ERR(eb->deditor->add_directory(ev1_relpath, parent_baton, - copyfrom_url, copyfrom_rev, - result_pool, dir_baton)); - else if (change->kind == svn_node_file) - SVN_ERR(eb->deditor->add_file(ev1_relpath, parent_baton, + SVN_ERR(editor->add_directory(ev1_relpath, parent_baton, copyfrom_url, copyfrom_rev, - result_pool, &file_baton)); + result_pool, dir_baton)); + else if (change->kind == svn_node_file) + SVN_ERR(editor->add_file(ev1_relpath, parent_baton, + copyfrom_url, copyfrom_rev, + result_pool, &file_baton)); else SVN_ERR_MALFUNCTION(); } @@ -993,13 +995,13 @@ apply_change(void **dir_baton, when we fetch the base properties.) */ if (change->kind == svn_node_dir) - SVN_ERR(eb->deditor->open_directory(ev1_relpath, parent_baton, - change->changing_rev, - result_pool, dir_baton)); - else if (change->kind == svn_node_file) - SVN_ERR(eb->deditor->open_file(ev1_relpath, parent_baton, + SVN_ERR(editor->open_directory(ev1_relpath, parent_baton, change->changing_rev, - result_pool, &file_baton)); + result_pool, dir_baton)); + else if (change->kind == svn_node_file) + SVN_ERR(editor->open_file(ev1_relpath, parent_baton, + change->changing_rev, + result_pool, &file_baton)); else SVN_ERR_MALFUNCTION(); } @@ -1007,10 +1009,10 @@ apply_change(void **dir_baton, /* Apply any properties in CHANGE to the node. */ if (change->kind == svn_node_dir) SVN_ERR(drive_ev1_props(ev1_relpath, change, base_props, - eb->deditor, *dir_baton, scratch_pool)); + editor, *dir_baton, scratch_pool)); else SVN_ERR(drive_ev1_props(ev1_relpath, change, base_props, - eb->deditor, file_baton, scratch_pool)); + editor, file_baton, scratch_pool)); /* Send the text content delta, if new text content is provided. */ if (change->contents_text) @@ -1023,7 +1025,7 @@ apply_change(void **dir_baton, scratch_pool); /* ### would be nice to have a BASE_CHECKSUM, but hey: this is the ### shim code... */ - SVN_ERR(eb->deditor->apply_textdelta(file_baton, NULL, scratch_pool, + SVN_ERR(editor->apply_textdelta(file_baton, NULL, scratch_pool, &handler, &handler_baton)); /* ### it would be nice to send a true txdelta here, but whatever. */ SVN_ERR(svn_txdelta_send_stream(read_stream, handler, handler_baton, @@ -1033,7 +1035,7 @@ apply_change(void **dir_baton, if (file_baton) { - SVN_ERR(eb->deditor->close_file(file_baton, NULL, scratch_pool)); + SVN_ERR(editor->close_file(file_baton, NULL, scratch_pool)); } return SVN_NO_ERROR; @@ -1740,7 +1742,7 @@ drive_changes(svn_branch__txn_priv_t *eb, /* Apply the appropriate Ev1 change to each Ev1-relative path. */ paths = get_unsorted_paths(eb->changes, scratch_pool); - SVN_ERR(svn_delta_path_driver2(eb->deditor, eb->dedit_baton, + SVN_ERR(svn_delta_path_driver3(eb->deditor, eb->dedit_baton, paths, TRUE /*sort*/, apply_change, (void *)eb, scratch_pool)); diff --git a/subversion/libsvn_delta/compat.c b/subversion/libsvn_delta/compat.c index c89e936..817e23e 100644 --- a/subversion/libsvn_delta/compat.c +++ b/subversion/libsvn_delta/compat.c @@ -1577,6 +1577,8 @@ drive_ev1_props(const struct editor_baton *eb, /* Conforms to svn_delta_path_driver_cb_func_t */ static svn_error_t * apply_change(void **dir_baton, + const svn_delta_editor_t *deditor, + void *dedit_baton, void *parent_baton, void *callback_baton, const char *ev1_relpath, @@ -1614,8 +1616,8 @@ apply_change(void **dir_baton, if (change->action == RESTRUCTURE_DELETE) { - SVN_ERR(eb->deditor->delete_entry(ev1_relpath, change->deleting, - parent_baton, scratch_pool)); + SVN_ERR(deditor->delete_entry(ev1_relpath, change->deleting, + parent_baton, scratch_pool)); /* No futher action possible for this node. */ return SVN_NO_ERROR; @@ -1627,11 +1629,11 @@ apply_change(void **dir_baton, if (change->action == RESTRUCTURE_ADD_ABSENT) { if (change->kind == svn_node_dir) - SVN_ERR(eb->deditor->absent_directory(ev1_relpath, parent_baton, - scratch_pool)); + SVN_ERR(deditor->absent_directory(ev1_relpath, parent_baton, + scratch_pool)); else - SVN_ERR(eb->deditor->absent_file(ev1_relpath, parent_baton, - scratch_pool)); + SVN_ERR(deditor->absent_file(ev1_relpath, parent_baton, + scratch_pool)); /* No further action possible for this node. */ return SVN_NO_ERROR; @@ -1645,8 +1647,8 @@ apply_change(void **dir_baton, /* Do we have an old node to delete first? */ if (SVN_IS_VALID_REVNUM(change->deleting)) - SVN_ERR(eb->deditor->delete_entry(ev1_relpath, change->deleting, - parent_baton, scratch_pool)); + SVN_ERR(deditor->delete_entry(ev1_relpath, change->deleting, + parent_baton, scratch_pool)); /* Are we copying the node from somewhere? */ if (change->copyfrom_path) @@ -1669,24 +1671,24 @@ apply_change(void **dir_baton, } if (change->kind == svn_node_dir) - SVN_ERR(eb->deditor->add_directory(ev1_relpath, parent_baton, - copyfrom_url, copyfrom_rev, - result_pool, dir_baton)); + SVN_ERR(deditor->add_directory(ev1_relpath, parent_baton, + copyfrom_url, copyfrom_rev, + result_pool, dir_baton)); else - SVN_ERR(eb->deditor->add_file(ev1_relpath, parent_baton, - copyfrom_url, copyfrom_rev, - result_pool, &file_baton)); + SVN_ERR(deditor->add_file(ev1_relpath, parent_baton, + copyfrom_url, copyfrom_rev, + result_pool, &file_baton)); } else { if (change->kind == svn_node_dir) - SVN_ERR(eb->deditor->open_directory(ev1_relpath, parent_baton, - change->changing, - result_pool, dir_baton)); + SVN_ERR(deditor->open_directory(ev1_relpath, parent_baton, + change->changing, + result_pool, dir_baton)); else - SVN_ERR(eb->deditor->open_file(ev1_relpath, parent_baton, - change->changing, - result_pool, &file_baton)); + SVN_ERR(deditor->open_file(ev1_relpath, parent_baton, + change->changing, + result_pool, &file_baton)); } /* Apply any properties in CHANGE to the node. */ @@ -1703,8 +1705,8 @@ apply_change(void **dir_baton, /* ### would be nice to have a BASE_CHECKSUM, but hey: this is the ### shim code... */ - SVN_ERR(eb->deditor->apply_textdelta(file_baton, NULL, scratch_pool, - &handler, &handler_baton)); + SVN_ERR(deditor->apply_textdelta(file_baton, NULL, scratch_pool, + &handler, &handler_baton)); SVN_ERR(svn_stream_open_readonly(&contents, change->contents_abspath, scratch_pool, scratch_pool)); /* ### it would be nice to send a true txdelta here, but whatever. */ @@ -1718,7 +1720,7 @@ apply_change(void **dir_baton, const char *digest = svn_checksum_to_cstring(change->checksum, scratch_pool); - SVN_ERR(eb->deditor->close_file(file_baton, digest, scratch_pool)); + SVN_ERR(deditor->close_file(file_baton, digest, scratch_pool)); } return SVN_NO_ERROR; @@ -1747,7 +1749,7 @@ drive_changes(const struct editor_baton *eb, /* Get a sorted list of Ev1-relative paths. */ paths = get_sorted_paths(eb->changes, eb->base_relpath, scratch_pool); - SVN_ERR(svn_delta_path_driver2(eb->deditor, eb->dedit_baton, paths, + SVN_ERR(svn_delta_path_driver3(eb->deditor, eb->dedit_baton, paths, FALSE, apply_change, (void *)eb, scratch_pool)); diff --git a/subversion/libsvn_delta/debug_editor.c b/subversion/libsvn_delta/debug_editor.c index 5f26936..c5dbc9b 100644 --- a/subversion/libsvn_delta/debug_editor.c +++ b/subversion/libsvn_delta/debug_editor.c @@ -71,9 +71,11 @@ set_target_revision(void *edit_baton, SVN_ERR(svn_stream_printf(eb->out, pool, "set_target_revision : %ld\n", target_revision)); - return eb->wrapped_editor->set_target_revision(eb->wrapped_edit_baton, - target_revision, - pool); + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->set_target_revision(eb->wrapped_edit_baton, + target_revision, + pool)); + return SVN_NO_ERROR; } static svn_error_t * @@ -90,10 +92,11 @@ open_root(void *edit_baton, base_revision)); eb->indent_level++; - SVN_ERR(eb->wrapped_editor->open_root(eb->wrapped_edit_baton, - base_revision, - pool, - &dir_baton->wrapped_dir_baton)); + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->open_root(eb->wrapped_edit_baton, + base_revision, + pool, + &dir_baton->wrapped_dir_baton)); dir_baton->edit_baton = edit_baton; @@ -115,10 +118,12 @@ delete_entry(const char *path, SVN_ERR(svn_stream_printf(eb->out, pool, "delete_entry : %s:%ld\n", path, base_revision)); - return eb->wrapped_editor->delete_entry(path, - base_revision, - pb->wrapped_dir_baton, - pool); + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->delete_entry(path, + base_revision, + pb->wrapped_dir_baton, + pool)); + return SVN_NO_ERROR; } static svn_error_t * @@ -139,12 +144,13 @@ add_directory(const char *path, path, copyfrom_path, copyfrom_revision)); eb->indent_level++; - SVN_ERR(eb->wrapped_editor->add_directory(path, - pb->wrapped_dir_baton, - copyfrom_path, - copyfrom_revision, - pool, - &b->wrapped_dir_baton)); + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->add_directory(path, + pb->wrapped_dir_baton, + copyfrom_path, + copyfrom_revision, + pool, + &b->wrapped_dir_baton)); b->edit_baton = eb; *child_baton = b; @@ -168,11 +174,12 @@ open_directory(const char *path, path, base_revision)); eb->indent_level++; - SVN_ERR(eb->wrapped_editor->open_directory(path, - pb->wrapped_dir_baton, - base_revision, - pool, - &db->wrapped_dir_baton)); + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->open_directory(path, + pb->wrapped_dir_baton, + base_revision, + pool, + &db->wrapped_dir_baton)); db->edit_baton = eb; *child_baton = db; @@ -199,12 +206,13 @@ add_file(const char *path, eb->indent_level++; - SVN_ERR(eb->wrapped_editor->add_file(path, - pb->wrapped_dir_baton, - copyfrom_path, - copyfrom_revision, - pool, - &fb->wrapped_file_baton)); + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->add_file(path, + pb->wrapped_dir_baton, + copyfrom_path, + copyfrom_revision, + pool, + &fb->wrapped_file_baton)); fb->edit_baton = eb; *file_baton = fb; @@ -229,11 +237,12 @@ open_file(const char *path, eb->indent_level++; - SVN_ERR(eb->wrapped_editor->open_file(path, - pb->wrapped_dir_baton, - base_revision, - pool, - &fb->wrapped_file_baton)); + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->open_file(path, + pb->wrapped_dir_baton, + base_revision, + pool, + &fb->wrapped_file_baton)); fb->edit_baton = eb; *file_baton = fb; @@ -255,11 +264,38 @@ apply_textdelta(void *file_baton, SVN_ERR(svn_stream_printf(eb->out, pool, "apply_textdelta : %s\n", base_checksum)); - SVN_ERR(eb->wrapped_editor->apply_textdelta(fb->wrapped_file_baton, - base_checksum, - pool, - handler, - handler_baton)); + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->apply_textdelta(fb->wrapped_file_baton, + base_checksum, + pool, + handler, + handler_baton)); + + return SVN_NO_ERROR; +} + +static svn_error_t * +apply_textdelta_stream(const struct svn_delta_editor_t *editor, + void *file_baton, + const char *base_checksum, + svn_txdelta_stream_open_func_t open_func, + void *open_baton, + apr_pool_t *scratch_pool) +{ + struct file_baton *fb = file_baton; + struct edit_baton *eb = fb->edit_baton; + + SVN_ERR(write_indent(eb, scratch_pool)); + SVN_ERR(svn_stream_printf(eb->out, scratch_pool, + "apply_textdelta_stream : %s\n", + base_checksum)); + + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->apply_textdelta_stream(eb->wrapped_editor, + fb->wrapped_file_baton, + base_checksum, + open_func, open_baton, + scratch_pool)); return SVN_NO_ERROR; } @@ -278,8 +314,9 @@ close_file(void *file_baton, SVN_ERR(svn_stream_printf(eb->out, pool, "close_file : %s\n", text_checksum)); - SVN_ERR(eb->wrapped_editor->close_file(fb->wrapped_file_baton, - text_checksum, pool)); + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->close_file(fb->wrapped_file_baton, + text_checksum, pool)); return SVN_NO_ERROR; } @@ -295,8 +332,9 @@ absent_file(const char *path, SVN_ERR(write_indent(eb, pool)); SVN_ERR(svn_stream_printf(eb->out, pool, "absent_file : %s\n", path)); - SVN_ERR(eb->wrapped_editor->absent_file(path, fb->wrapped_file_baton, - pool)); + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->absent_file(path, fb->wrapped_file_baton, + pool)); return SVN_NO_ERROR; } @@ -312,8 +350,9 @@ close_directory(void *dir_baton, SVN_ERR(write_indent(eb, pool)); SVN_ERR(svn_stream_printf(eb->out, pool, "close_directory\n")); - SVN_ERR(eb->wrapped_editor->close_directory(db->wrapped_dir_baton, - pool)); + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->close_directory(db->wrapped_dir_baton, + pool)); return SVN_NO_ERROR; } @@ -330,8 +369,9 @@ absent_directory(const char *path, SVN_ERR(svn_stream_printf(eb->out, pool, "absent_directory : %s\n", path)); - SVN_ERR(eb->wrapped_editor->absent_directory(path, db->wrapped_dir_baton, - pool)); + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->absent_directory(path, db->wrapped_dir_baton, + pool)); return SVN_NO_ERROR; } @@ -349,10 +389,11 @@ change_file_prop(void *file_baton, SVN_ERR(svn_stream_printf(eb->out, pool, "change_file_prop : %s -> %s\n", name, value ? value->data : "")); - SVN_ERR(eb->wrapped_editor->change_file_prop(fb->wrapped_file_baton, - name, - value, - pool)); + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->change_file_prop(fb->wrapped_file_baton, + name, + value, + pool)); return SVN_NO_ERROR; } @@ -370,10 +411,11 @@ change_dir_prop(void *dir_baton, SVN_ERR(svn_stream_printf(eb->out, pool, "change_dir_prop : %s -> %s\n", name, value ? value->data : "")); - SVN_ERR(eb->wrapped_editor->change_dir_prop(db->wrapped_dir_baton, - name, - value, - pool)); + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->change_dir_prop(db->wrapped_dir_baton, + name, + value, + pool)); return SVN_NO_ERROR; } @@ -387,7 +429,8 @@ close_edit(void *edit_baton, SVN_ERR(write_indent(eb, pool)); SVN_ERR(svn_stream_printf(eb->out, pool, "close_edit\n")); - SVN_ERR(eb->wrapped_editor->close_edit(eb->wrapped_edit_baton, pool)); + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->close_edit(eb->wrapped_edit_baton, pool)); return SVN_NO_ERROR; } @@ -401,7 +444,8 @@ abort_edit(void *edit_baton, SVN_ERR(write_indent(eb, pool)); SVN_ERR(svn_stream_printf(eb->out, pool, "abort_edit\n")); - SVN_ERR(eb->wrapped_editor->abort_edit(eb->wrapped_edit_baton, pool)); + if (eb->wrapped_editor) + SVN_ERR(eb->wrapped_editor->abort_edit(eb->wrapped_edit_baton, pool)); return SVN_NO_ERROR; } @@ -414,7 +458,7 @@ svn_delta__get_debug_editor(const svn_delta_editor_t **editor, const char *prefix, apr_pool_t *pool) { - svn_delta_editor_t *tree_editor = apr_palloc(pool, sizeof(*tree_editor)); + svn_delta_editor_t *tree_editor = svn_delta_default_editor(pool); struct edit_baton *eb = apr_palloc(pool, sizeof(*eb)); apr_file_t *errfp; svn_stream_t *out; @@ -436,6 +480,7 @@ svn_delta__get_debug_editor(const svn_delta_editor_t **editor, tree_editor->add_file = add_file; tree_editor->open_file = open_file; tree_editor->apply_textdelta = apply_textdelta; + tree_editor->apply_textdelta_stream = apply_textdelta_stream; tree_editor->change_file_prop = change_file_prop; tree_editor->close_file = close_file; tree_editor->absent_file = absent_file; diff --git a/subversion/libsvn_delta/deprecated.c b/subversion/libsvn_delta/deprecated.c index 4171244..f00c410 100644 --- a/subversion/libsvn_delta/deprecated.c +++ b/subversion/libsvn_delta/deprecated.c @@ -30,6 +30,79 @@ #include "svn_sorts.h" +struct path_driver_2_to_3_baton_t +{ + svn_delta_path_driver_cb_func_t callback_func; + void *callback_baton; + svn_boolean_t slash_prefix; +}; + +/* Convert from a newer to older callback + */ +static svn_error_t * +path_driver_2_to_3_func(void **dir_baton, + const svn_delta_editor_t *editor, + void *edit_baton, + void *parent_baton, + void *callback_baton, + const char *path, + apr_pool_t *pool) +{ + struct path_driver_2_to_3_baton_t *b = callback_baton; + + if (b->slash_prefix) + path = apr_pstrcat(pool, "/", path, SVN_VA_NULL); + + /* Just drop the 'editor' parameters */ + SVN_ERR(b->callback_func(dir_baton, parent_baton, + b->callback_baton, + path, pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_delta_path_driver2(const svn_delta_editor_t *editor, + void *edit_baton, + const apr_array_header_t *paths, + svn_boolean_t sort_paths, + svn_delta_path_driver_cb_func_t callback_func, + void *callback_baton, + apr_pool_t *pool) +{ + struct path_driver_2_to_3_baton_t b; + int i; + + b.callback_func = callback_func; + b.callback_baton = callback_baton; + b.slash_prefix = FALSE; + + /* Remove any '/' prefix from incoming paths. Arrange to add a '/' + prefix to all paths for the callback, if any incoming path had one. */ + for (i = 0; i < paths->nelts; i++) + { + const char *path = APR_ARRAY_IDX(paths, i, const char *); + + if (path[0] == '/') + { + /* Re-allocate the array and note that we found a '/' prefix. */ + if (!b.slash_prefix) + { + paths = apr_array_copy(pool, paths); + b.slash_prefix = TRUE; + } + + /* Modify each array element that had a '/' prefix */ + APR_ARRAY_IDX(paths, i, const char *) = path + 1; + } + } + + SVN_ERR(svn_delta_path_driver3(editor, edit_baton, + paths, sort_paths, + path_driver_2_to_3_func, &b, + pool)); + return SVN_NO_ERROR; +} + svn_error_t * svn_delta_path_driver(const svn_delta_editor_t *editor, void *edit_baton, diff --git a/subversion/libsvn_delta/element.c b/subversion/libsvn_delta/element.c index be7b217..7982964 100644 --- a/subversion/libsvn_delta/element.c +++ b/subversion/libsvn_delta/element.c @@ -375,14 +375,12 @@ svn_element__tree_get(const svn_element__tree_t *tree, return svn_eid__hash_get(tree->e_map, eid); } -svn_error_t * +void svn_element__tree_set(svn_element__tree_t *tree, int eid, const svn_element__content_t *element) { svn_eid__hash_set(tree->e_map, eid, element); - - return SVN_NO_ERROR; } void diff --git a/subversion/libsvn_delta/libsvn_delta.pc.in b/subversion/libsvn_delta/libsvn_delta.pc.in index b96e6ab..9759e74 100644 --- a/subversion/libsvn_delta/libsvn_delta.pc.in +++ b/subversion/libsvn_delta/libsvn_delta.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_delta Description: Subversion Delta Library Version: @PACKAGE_VERSION@ -Requires: apr-util-@SVN_APR_MAJOR_VERSION@ apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_subr -Libs: -L${libdir} -lsvn_delta @SVN_ZLIB_LIBS@ -Cflags: -I${includedir} +Requires: apr-util-@SVN_APR_MAJOR_VERSION@, apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_subr +Libs: -L${libdir} -lsvn_delta-1 @SVN_ZLIB_LIBS@ +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_delta/path_driver.c b/subversion/libsvn_delta/path_driver.c index c1f3e07..5840cc7 100644 --- a/subversion/libsvn_delta/path_driver.c +++ b/subversion/libsvn_delta/path_driver.c @@ -31,7 +31,6 @@ #include "svn_dirent_uri.h" #include "svn_path.h" #include "svn_sorts.h" -#include "private/svn_fspath.h" #include "private/svn_sorts_private.h" @@ -45,6 +44,22 @@ typedef struct dir_stack_t } dir_stack_t; +/* Push onto dir_stack a new item allocated in POOL and containing + * DIR_BATON and POOL. + */ +static void +push_dir_stack_item(apr_array_header_t *db_stack, + void *dir_baton, + apr_pool_t *pool) +{ + dir_stack_t *item = apr_pcalloc(pool, sizeof(*item)); + + item->dir_baton = dir_baton; + item->pool = pool; + APR_ARRAY_PUSH(db_stack, dir_stack_t *) = item; +} + + /* Call EDITOR's open_directory() function with the PATH argument, then * add the resulting dir baton to the dir baton stack. */ @@ -72,10 +87,7 @@ open_dir(apr_array_header_t *db_stack, &db)); /* Now add the dir baton to the stack. */ - item = apr_pcalloc(subpool, sizeof(*item)); - item->dir_baton = db; - item->pool = subpool; - APR_ARRAY_PUSH(db_stack, dir_stack_t *) = item; + push_dir_stack_item(db_stack, db, subpool); return SVN_NO_ERROR; } @@ -131,168 +143,215 @@ count_components(const char *path) /*** Public interfaces ***/ svn_error_t * -svn_delta_path_driver2(const svn_delta_editor_t *editor, +svn_delta_path_driver3(const svn_delta_editor_t *editor, void *edit_baton, - const apr_array_header_t *paths, + const apr_array_header_t *relpaths, svn_boolean_t sort_paths, - svn_delta_path_driver_cb_func_t callback_func, + svn_delta_path_driver_cb_func2_t callback_func, void *callback_baton, apr_pool_t *pool) { - apr_array_header_t *db_stack = apr_array_make(pool, 4, sizeof(void *)); - const char *last_path = NULL; - int i = 0; - void *parent_db = NULL, *db = NULL; - const char *path; + svn_delta_path_driver_state_t *state; + int i; apr_pool_t *subpool, *iterpool; - dir_stack_t *item; /* Do nothing if there are no paths. */ - if (! paths->nelts) + if (! relpaths->nelts) return SVN_NO_ERROR; subpool = svn_pool_create(pool); iterpool = svn_pool_create(pool); /* sort paths if necessary */ - if (sort_paths && paths->nelts > 1) + if (sort_paths && relpaths->nelts > 1) { - apr_array_header_t *sorted = apr_array_copy(subpool, paths); + apr_array_header_t *sorted = apr_array_copy(subpool, relpaths); svn_sort__array(sorted, svn_sort_compare_paths); - paths = sorted; + relpaths = sorted; } - item = apr_pcalloc(subpool, sizeof(*item)); - - /* If the root of the edit is also a target path, we want to call - the callback function to let the user open the root directory and - do what needs to be done. Otherwise, we'll do the open_root() - ourselves. */ - path = APR_ARRAY_IDX(paths, 0, const char *); - if (svn_path_is_empty(path)) - { - SVN_ERR(callback_func(&db, NULL, callback_baton, path, subpool)); - last_path = path; - i++; - } - else - { - SVN_ERR(editor->open_root(edit_baton, SVN_INVALID_REVNUM, subpool, &db)); - } - item->pool = subpool; - item->dir_baton = db; - APR_ARRAY_PUSH(db_stack, void *) = item; + SVN_ERR(svn_delta_path_driver_start(&state, + editor, edit_baton, + callback_func, callback_baton, + pool)); /* Now, loop over the commit items, traversing the URL tree and driving the editor. */ - for (; i < paths->nelts; i++) + for (i = 0; i < relpaths->nelts; i++) { - const char *pdir; - const char *common = ""; - size_t common_len; + const char *relpath; /* Clear the iteration pool. */ svn_pool_clear(iterpool); /* Get the next path. */ - path = APR_ARRAY_IDX(paths, i, const char *); - - /*** Step A - Find the common ancestor of the last path and the - current one. For the first iteration, this is just the - empty string. ***/ - if (i > 0) - common = (last_path[0] == '/') - ? svn_fspath__get_longest_ancestor(last_path, path, iterpool) - : svn_relpath_get_longest_ancestor(last_path, path, iterpool); - common_len = strlen(common); - - /*** Step B - Close any directories between the last path and - the new common ancestor, if any need to be closed. - Sometimes there is nothing to do here (like, for the first - iteration, or when the last path was an ancestor of the - current one). ***/ - if ((i > 0) && (strlen(last_path) > common_len)) - { - const char *rel = last_path + (common_len ? (common_len + 1) : 0); - int count = count_components(rel); - while (count--) - { - SVN_ERR(pop_stack(db_stack, editor)); - } - } + relpath = APR_ARRAY_IDX(relpaths, i, const char *); - /*** Step C - Open any directories between the common ancestor - and the parent of the current path. ***/ - if (*path == '/') - pdir = svn_fspath__dirname(path, iterpool); - else - pdir = svn_relpath_dirname(path, iterpool); + SVN_ERR(svn_delta_path_driver_step(state, relpath, iterpool)); + } - if (strlen(pdir) > common_len) - { - const char *piece = pdir + common_len + 1; - - while (1) - { - const char *rel = pdir; - - /* Find the first separator. */ - piece = strchr(piece, '/'); - - /* Calculate REL as the portion of PDIR up to (but not - including) the location to which PIECE is pointing. */ - if (piece) - rel = apr_pstrmemdup(iterpool, pdir, piece - pdir); - - /* Open the subdirectory. */ - SVN_ERR(open_dir(db_stack, editor, rel, pool)); - - /* If we found a '/', advance our PIECE pointer to - character just after that '/'. Otherwise, we're - done. */ - if (piece) - piece++; - else - break; - } - } + /* Destroy the iteration subpool. */ + svn_pool_destroy(iterpool); - /*** Step D - Tell our caller to handle the current path. ***/ - item = APR_ARRAY_IDX(db_stack, db_stack->nelts - 1, void *); - parent_db = item->dir_baton; - subpool = svn_pool_create(pool); - SVN_ERR(callback_func(&db, parent_db, callback_baton, path, subpool)); - if (db) + SVN_ERR(svn_delta_path_driver_finish(state, pool)); + + return SVN_NO_ERROR; +} + +struct svn_delta_path_driver_state_t +{ + const svn_delta_editor_t *editor; + void *edit_baton; + svn_delta_path_driver_cb_func2_t callback_func; + void *callback_baton; + apr_array_header_t *db_stack; + const char *last_path; + apr_pool_t *pool; /* at least the lifetime of the entire drive */ +}; + +svn_error_t * +svn_delta_path_driver_start(svn_delta_path_driver_state_t **state_p, + const svn_delta_editor_t *editor, + void *edit_baton, + svn_delta_path_driver_cb_func2_t callback_func, + void *callback_baton, + apr_pool_t *pool) +{ + svn_delta_path_driver_state_t *state = apr_pcalloc(pool, sizeof(*state)); + + state->editor = editor; + state->edit_baton = edit_baton; + state->callback_func = callback_func; + state->callback_baton = callback_baton; + state->db_stack = apr_array_make(pool, 4, sizeof(void *)); + state->last_path = NULL; + state->pool = pool; + + *state_p = state; + return SVN_NO_ERROR; +} + +svn_error_t * +svn_delta_path_driver_step(svn_delta_path_driver_state_t *state, + const char *relpath, + apr_pool_t *scratch_pool) +{ + const char *pdir; + const char *common = ""; + size_t common_len; + apr_pool_t *subpool; + dir_stack_t *item; + void *parent_db, *db; + + SVN_ERR_ASSERT(svn_relpath_is_canonical(relpath)); + + /* If the first target path is not the root of the edit, we must first + call open_root() ourselves. (If the first target path is the root of + the edit, then we expect the user's callback to do so.) */ + if (!state->last_path && !svn_path_is_empty(relpath)) + { + subpool = svn_pool_create(state->pool); + SVN_ERR(state->editor->open_root(state->edit_baton, SVN_INVALID_REVNUM, + subpool, &db)); + push_dir_stack_item(state->db_stack, db, subpool); + } + + /*** Step A - Find the common ancestor of the last path and the + current one. For the first iteration, this is just the + empty string. ***/ + if (state->last_path) + common = svn_relpath_get_longest_ancestor(state->last_path, relpath, + scratch_pool); + common_len = strlen(common); + + /*** Step B - Close any directories between the last path and + the new common ancestor, if any need to be closed. + Sometimes there is nothing to do here (like, for the first + iteration, or when the last path was an ancestor of the + current one). ***/ + if ((state->last_path) && (strlen(state->last_path) > common_len)) + { + const char *rel = state->last_path + (common_len ? (common_len + 1) : 0); + int count = count_components(rel); + while (count--) { - item = apr_pcalloc(subpool, sizeof(*item)); - item->dir_baton = db; - item->pool = subpool; - APR_ARRAY_PUSH(db_stack, void *) = item; + SVN_ERR(pop_stack(state->db_stack, state->editor)); } - else + } + + /*** Step C - Open any directories between the common ancestor + and the parent of the current path. ***/ + pdir = svn_relpath_dirname(relpath, scratch_pool); + + if (strlen(pdir) > common_len) + { + const char *piece = pdir + common_len + 1; + + while (1) { - svn_pool_destroy(subpool); + const char *rel = pdir; + + /* Find the first separator. */ + piece = strchr(piece, '/'); + + /* Calculate REL as the portion of PDIR up to (but not + including) the location to which PIECE is pointing. */ + if (piece) + rel = apr_pstrmemdup(scratch_pool, pdir, piece - pdir); + + /* Open the subdirectory. */ + SVN_ERR(open_dir(state->db_stack, state->editor, rel, state->pool)); + + /* If we found a '/', advance our PIECE pointer to + character just after that '/'. Otherwise, we're + done. */ + if (piece) + piece++; + else + break; } + } - /*** Step E - Save our state for the next iteration. If our - caller opened or added PATH as a directory, that becomes - our LAST_PATH. Otherwise, we use PATH's parent - directory. ***/ - - /* NOTE: The variable LAST_PATH needs to outlive the loop. */ - if (db) - last_path = path; /* lives in a pool outside our control. */ - else - last_path = apr_pstrdup(pool, pdir); /* duping into POOL. */ + /*** Step D - Tell our caller to handle the current path. ***/ + if (state->db_stack->nelts) + { + item = APR_ARRAY_IDX(state->db_stack, state->db_stack->nelts - 1, void *); + parent_db = item->dir_baton; + } + else + parent_db = NULL; + db = NULL; /* predictable behaviour for callbacks that don't set it */ + subpool = svn_pool_create(state->pool); + SVN_ERR(state->callback_func(&db, + state->editor, state->edit_baton, parent_db, + state->callback_baton, + relpath, subpool)); + if (db) + { + push_dir_stack_item(state->db_stack, db, subpool); + } + else + { + svn_pool_destroy(subpool); } - /* Destroy the iteration subpool. */ - svn_pool_destroy(iterpool); + /*** Step E - Save our state for the next iteration. If our + caller opened or added PATH as a directory, that becomes + our LAST_PATH. Otherwise, we use PATH's parent + directory. ***/ + state->last_path = apr_pstrdup(state->pool, db ? relpath : pdir); + + return SVN_NO_ERROR; +} +svn_error_t * +svn_delta_path_driver_finish(svn_delta_path_driver_state_t *state, + apr_pool_t *scratch_pool) +{ /* Close down any remaining open directory batons. */ - while (db_stack->nelts) + while (state->db_stack->nelts) { - SVN_ERR(pop_stack(db_stack, editor)); + SVN_ERR(pop_stack(state->db_stack, state->editor)); } return SVN_NO_ERROR; diff --git a/subversion/libsvn_diff/diff_tree.c b/subversion/libsvn_diff/diff_tree.c index 8490179..d18b242 100644 --- a/subversion/libsvn_diff/diff_tree.c +++ b/subversion/libsvn_diff/diff_tree.c @@ -37,14 +37,6 @@ #include "private/svn_diff_tree.h" #include "svn_private_config.h" -typedef struct tree_processor_t -{ - svn_diff_tree_processor_t tp; - - /* void *future_extension */ -} tree_processor_t; - - static svn_error_t * default_dir_opened(void **new_dir_baton, svn_boolean_t *skip, @@ -215,33 +207,30 @@ svn_diff_tree_processor_t * svn_diff__tree_processor_create(void *baton, apr_pool_t *result_pool) { - tree_processor_t *wrapper; - wrapper = apr_pcalloc(result_pool, sizeof(*wrapper)); - - wrapper->tp.baton = baton; + svn_diff_tree_processor_t *tp = apr_pcalloc(result_pool, sizeof(*tp)); - wrapper->tp.dir_opened = default_dir_opened; - wrapper->tp.dir_added = default_dir_added; - wrapper->tp.dir_deleted = default_dir_deleted; - wrapper->tp.dir_changed = default_dir_changed; - wrapper->tp.dir_closed = default_dir_closed; + tp->baton = baton; - wrapper->tp.file_opened = default_file_opened; - wrapper->tp.file_added = default_file_added; - wrapper->tp.file_deleted = default_file_deleted; - wrapper->tp.file_changed = default_file_changed; - wrapper->tp.file_closed = default_file_closed; + tp->dir_opened = default_dir_opened; + tp->dir_added = default_dir_added; + tp->dir_deleted = default_dir_deleted; + tp->dir_changed = default_dir_changed; + tp->dir_closed = default_dir_closed; - wrapper->tp.node_absent = default_node_absent; + tp->file_opened = default_file_opened; + tp->file_added = default_file_added; + tp->file_deleted = default_file_deleted; + tp->file_changed = default_file_changed; + tp->file_closed = default_file_closed; + tp->node_absent = default_node_absent; - return &wrapper->tp; + return tp; } struct reverse_tree_baton_t { const svn_diff_tree_processor_t *processor; - const char *prefix_relpath; }; static svn_error_t * @@ -259,9 +248,6 @@ reverse_dir_opened(void **new_dir_baton, { struct reverse_tree_baton_t *rb = processor->baton; - if (rb->prefix_relpath) - relpath = svn_relpath_join(rb->prefix_relpath, relpath, scratch_pool); - SVN_ERR(rb->processor->dir_opened(new_dir_baton, skip, skip_children, relpath, right_source, left_source, @@ -284,9 +270,6 @@ reverse_dir_added(const char *relpath, { struct reverse_tree_baton_t *rb = processor->baton; - if (rb->prefix_relpath) - relpath = svn_relpath_join(rb->prefix_relpath, relpath, scratch_pool); - SVN_ERR(rb->processor->dir_deleted(relpath, right_source, right_props, @@ -307,9 +290,6 @@ reverse_dir_deleted(const char *relpath, { struct reverse_tree_baton_t *rb = processor->baton; - if (rb->prefix_relpath) - relpath = svn_relpath_join(rb->prefix_relpath, relpath, scratch_pool); - SVN_ERR(rb->processor->dir_added(relpath, NULL, left_source, @@ -335,9 +315,6 @@ reverse_dir_changed(const char *relpath, struct reverse_tree_baton_t *rb = processor->baton; apr_array_header_t *reversed_prop_changes = NULL; - if (rb->prefix_relpath) - relpath = svn_relpath_join(rb->prefix_relpath, relpath, scratch_pool); - if (prop_changes) { SVN_ERR_ASSERT(left_props != NULL && right_props != NULL); @@ -367,9 +344,6 @@ reverse_dir_closed(const char *relpath, { struct reverse_tree_baton_t *rb = processor->baton; - if (rb->prefix_relpath) - relpath = svn_relpath_join(rb->prefix_relpath, relpath, scratch_pool); - SVN_ERR(rb->processor->dir_closed(relpath, right_source, left_source, @@ -393,9 +367,6 @@ reverse_file_opened(void **new_file_baton, { struct reverse_tree_baton_t *rb = processor->baton; - if (rb->prefix_relpath) - relpath = svn_relpath_join(rb->prefix_relpath, relpath, scratch_pool); - SVN_ERR(rb->processor->file_opened(new_file_baton, skip, relpath, @@ -423,9 +394,6 @@ reverse_file_added(const char *relpath, { struct reverse_tree_baton_t *rb = processor->baton; - if (rb->prefix_relpath) - relpath = svn_relpath_join(rb->prefix_relpath, relpath, scratch_pool); - SVN_ERR(rb->processor->file_deleted(relpath, right_source, right_file, @@ -447,9 +415,6 @@ reverse_file_deleted(const char *relpath, { struct reverse_tree_baton_t *rb = processor->baton; - if (rb->prefix_relpath) - relpath = svn_relpath_join(rb->prefix_relpath, relpath, scratch_pool); - SVN_ERR(rb->processor->file_added(relpath, NULL /* copyfrom src */, left_source, @@ -480,9 +445,6 @@ reverse_file_changed(const char *relpath, struct reverse_tree_baton_t *rb = processor->baton; apr_array_header_t *reversed_prop_changes = NULL; - if (rb->prefix_relpath) - relpath = svn_relpath_join(rb->prefix_relpath, relpath, scratch_pool); - if (prop_changes) { SVN_ERR_ASSERT(left_props != NULL && right_props != NULL); @@ -515,9 +477,6 @@ reverse_file_closed(const char *relpath, { struct reverse_tree_baton_t *rb = processor->baton; - if (rb->prefix_relpath) - relpath = svn_relpath_join(rb->prefix_relpath, relpath, scratch_pool); - SVN_ERR(rb->processor->file_closed(relpath, right_source, left_source, @@ -536,9 +495,6 @@ reverse_node_absent(const char *relpath, { struct reverse_tree_baton_t *rb = processor->baton; - if (rb->prefix_relpath) - relpath = svn_relpath_join(rb->prefix_relpath, relpath, scratch_pool); - SVN_ERR(rb->processor->node_absent(relpath, dir_baton, rb->processor, @@ -549,7 +505,6 @@ reverse_node_absent(const char *relpath, const svn_diff_tree_processor_t * svn_diff__tree_processor_reverse_create(const svn_diff_tree_processor_t * processor, - const char *prefix_relpath, apr_pool_t *result_pool) { struct reverse_tree_baton_t *rb; @@ -557,8 +512,6 @@ svn_diff__tree_processor_reverse_create(const svn_diff_tree_processor_t * proces rb = apr_pcalloc(result_pool, sizeof(*rb)); rb->processor = processor; - if (prefix_relpath) - rb->prefix_relpath = apr_pstrdup(result_pool, prefix_relpath); reverse = svn_diff__tree_processor_create(rb, result_pool); diff --git a/subversion/libsvn_diff/libsvn_diff.pc.in b/subversion/libsvn_diff/libsvn_diff.pc.in index eed9d88..34ec384 100644 --- a/subversion/libsvn_diff/libsvn_diff.pc.in +++ b/subversion/libsvn_diff/libsvn_diff.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_diff Description: Subversion Diff Library Version: @PACKAGE_VERSION@ -Requires: apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_subr -Libs: -L${libdir} -lsvn_diff @SVN_ZLIB_LIBS@ -Cflags: -I${includedir} +Requires: apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_subr +Libs: -L${libdir} -lsvn_diff-1 @SVN_ZLIB_LIBS@ +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_diff/parse-diff.c b/subversion/libsvn_diff/parse-diff.c index f215969..a9c8e62 100644 --- a/subversion/libsvn_diff/parse-diff.c +++ b/subversion/libsvn_diff/parse-diff.c @@ -69,6 +69,11 @@ struct svn_diff_hunk_t { /* APR file handle to the patch file this hunk came from. */ apr_file_t *apr_file; + /* Whether the hunk was interpreted as pretty-print mergeinfo. If so, + the hunk content is in PATCH and the rest of this hunk object is + mostly uninitialized. */ + svn_boolean_t is_pretty_print_mergeinfo; + /* Ranges used to keep track of this hunk's texts positions within * the patch file. */ struct svn_diff__hunk_range diff_text_range; @@ -899,10 +904,6 @@ parse_prop_name(const char **prop_name, const char *header, * The hunk header has the following format: * ## -0,NUMBER_OF_REVERSE_MERGES +0,NUMBER_OF_FORWARD_MERGES ## * - * At this point, the number of reverse merges has already been - * parsed into HUNK->ORIGINAL_LENGTH, and the number of forward - * merges has been parsed into HUNK->MODIFIED_LENGTH. - * * The header is followed by a list of mergeinfo, one path per line. * This function parses such lines. Lines describing reverse merges * appear first, and then all lines describing forward merges appear. @@ -914,18 +915,27 @@ parse_prop_name(const char **prop_name, const char *header, * ":r", which in turn is followed by a mergeinfo revision range, * which is terminated by whitespace or end-of-string. * - * If the current line meets the above criteria and we're able - * to parse valid mergeinfo from it, the resulting mergeinfo - * is added to patch->mergeinfo or patch->reverse_mergeinfo, - * and we proceed to the next line. + * *NUMBER_OF_REVERSE_MERGES and *NUMBER_OF_FORWARD_MERGES are the + * numbers of reverse and forward merges remaining to be read. This + * function decrements *NUMBER_OF_REVERSE_MERGES for each LINE + * parsed until that is zero, then *NUMBER_OF_FORWARD_MERGES for + * each LINE parsed until that is zero. If both are zero, it parses + * and discards LINE. + * + * If LINE is successfully parsed, *FOUND_MERGEINFO is set to TRUE, + * otherwise to FALSE. + * + * If LINE is successfully parsed and counted, the resulting mergeinfo + * is added to PATCH->mergeinfo or PATCH->reverse_mergeinfo. */ static svn_error_t * -parse_mergeinfo(svn_boolean_t *found_mergeinfo, - svn_stringbuf_t *line, - svn_diff_hunk_t *hunk, - svn_patch_t *patch, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) +parse_pretty_mergeinfo_line(svn_boolean_t *found_mergeinfo, + svn_linenum_t *number_of_reverse_merges, + svn_linenum_t *number_of_forward_merges, + svn_stringbuf_t *line, + svn_patch_t *patch, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) { char *slash = strchr(line->data, '/'); char *colon = strrchr(line->data, ':'); @@ -972,7 +982,7 @@ parse_mergeinfo(svn_boolean_t *found_mergeinfo, if (mergeinfo) { - if (hunk->original_length > 0) /* reverse merges */ + if (*number_of_reverse_merges > 0) /* reverse merges */ { if (patch->reverse) { @@ -994,9 +1004,9 @@ parse_mergeinfo(svn_boolean_t *found_mergeinfo, result_pool, scratch_pool)); } - hunk->original_length--; + (*number_of_reverse_merges)--; } - else if (hunk->modified_length > 0) /* forward merges */ + else if (number_of_forward_merges > 0) /* forward merges */ { if (patch->reverse) { @@ -1018,7 +1028,7 @@ parse_mergeinfo(svn_boolean_t *found_mergeinfo, result_pool, scratch_pool)); } - hunk->modified_length--; + (*number_of_forward_merges)--; } *found_mergeinfo = TRUE; @@ -1165,18 +1175,48 @@ parse_next_hunk(svn_diff_hunk_t **hunk, if (in_hunk && *is_property && *prop_name && strcmp(*prop_name, SVN_PROP_MERGEINFO) == 0) { - svn_boolean_t found_mergeinfo; + svn_boolean_t found_pretty_mergeinfo_line; - SVN_ERR(parse_mergeinfo(&found_mergeinfo, line, *hunk, patch, - result_pool, iterpool)); - if (found_mergeinfo) - continue; /* Proceed to the next line in the svn:mergeinfo hunk. */ - else + if (! hunk_seen) { - /* Perhaps we can also use original_lines/modified_lines here */ + /* We're reading the first line of the hunk, so the start + * of the line just read is the hunk text's byte offset. */ + start = last_line; + } - in_hunk = FALSE; /* On to next property */ + SVN_ERR(parse_pretty_mergeinfo_line(&found_pretty_mergeinfo_line, + &original_lines, &modified_lines, + line, patch, + result_pool, iterpool)); + if (found_pretty_mergeinfo_line) + { + hunk_seen = TRUE; + (*hunk)->is_pretty_print_mergeinfo = TRUE; + continue; /* Proceed to the next line in the svn:mergeinfo hunk. */ } + + if ((*hunk)->is_pretty_print_mergeinfo) + { + /* We have reached the end of the pretty-print-mergeinfo hunk. + (This format uses only one hunk.) */ + if (eof) + { + /* The hunk ends at EOF. */ + end = pos; + } + else + { + /* The start of the current line marks the first byte + * after the hunk text. */ + end = last_line; + } + original_end = end; + modified_end = end; + break; + } + + /* Otherwise, this is a property diff in the + regular format so fall through to normal processing. */ } if (in_hunk) @@ -1971,10 +2011,10 @@ parse_hunks(svn_patch_t *patch, apr_file_t *apr_file, else last_prop_name = prop_name; - /* Skip svn:mergeinfo properties. - * Mergeinfo data cannot be represented as a hunk and + /* Skip pretty-printed svn:mergeinfo property hunks. + * Pretty-printed mergeinfo data cannot be represented as a hunk and * is therefore stored in PATCH itself. */ - if (strcmp(prop_name, SVN_PROP_MERGEINFO) == 0) + if (hunk->is_pretty_print_mergeinfo) continue; SVN_ERR(add_property_hunk(patch, prop_name, hunk, prop_operation, diff --git a/subversion/libsvn_fs/fs-loader.c b/subversion/libsvn_fs/fs-loader.c index f898d8a..3840f22 100644 --- a/subversion/libsvn_fs/fs-loader.c +++ b/subversion/libsvn_fs/fs-loader.c @@ -2221,3 +2221,42 @@ svn_fs_info_dup(const void *info_void, return apr_pmemdup(result_pool, info, sizeof(*info)); } +svn_error_t * +svn_fs_ioctl(svn_fs_t *fs, + svn_fs_ioctl_code_t ctlcode, + void *input, + void **output_p, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + void *output; + + if (fs) + { + if (!fs->vtable->ioctl) + return svn_error_create(SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE, NULL, NULL); + + SVN_ERR(fs->vtable->ioctl(fs, ctlcode, input, &output, + cancel_func, cancel_baton, + result_pool, scratch_pool)); + } + else + { + fs_library_vtable_t *vtable; + + SVN_ERR(get_library_vtable(&vtable, ctlcode.fs_type, scratch_pool)); + + if (!vtable->ioctl) + return svn_error_create(SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE, NULL, NULL); + + SVN_ERR(vtable->ioctl(ctlcode, input, &output, + cancel_func, cancel_baton, + result_pool, scratch_pool)); + } + + if (output_p) + *output_p = output; + return SVN_NO_ERROR; +} diff --git a/subversion/libsvn_fs/fs-loader.h b/subversion/libsvn_fs/fs-loader.h index 0712c23..f48a812 100644 --- a/subversion/libsvn_fs/fs-loader.h +++ b/subversion/libsvn_fs/fs-loader.h @@ -159,6 +159,13 @@ typedef struct fs_library_vtable_t /* For svn_fs_info_fsfs_dup(). */ void *(*info_fsap_dup)(const void *fsap_info, apr_pool_t *result_pool); + + svn_error_t *(*ioctl)(svn_fs_ioctl_code_t ctlcode, + void *input, void **output_p, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); } fs_library_vtable_t; /* This is the type of symbol an FS module defines to fetch the @@ -266,6 +273,12 @@ typedef struct fs_vtable_t svn_error_t *(*bdb_set_errcall)(svn_fs_t *fs, void (*handler)(const char *errpfx, char *msg)); + svn_error_t *(*ioctl)(svn_fs_t *fs, svn_fs_ioctl_code_t ctlcode, + void *input, void **output_p, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); } fs_vtable_t; diff --git a/subversion/libsvn_fs/libsvn_fs.pc.in b/subversion/libsvn_fs/libsvn_fs.pc.in index 67154f0..d9a8b0b 100644 --- a/subversion/libsvn_fs/libsvn_fs.pc.in +++ b/subversion/libsvn_fs/libsvn_fs.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_fs Description: Subversion Repository Filesystem Library Version: @PACKAGE_VERSION@ -Requires: apr-util-@SVN_APR_MAJOR_VERSION@ apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_fs_util libsvn_delta libsvn_subr -Libs: -L${libdir} -lsvn_fs -Cflags: -I${includedir} +Requires: apr-util-@SVN_APR_MAJOR_VERSION@, apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_fs_util, libsvn_delta, libsvn_subr +Libs: -L${libdir} -lsvn_fs-1 +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_fs_base/fs.c b/subversion/libsvn_fs_base/fs.c index 9032257..0239a6c 100644 --- a/subversion/libsvn_fs_base/fs.c +++ b/subversion/libsvn_fs_base/fs.c @@ -574,6 +574,7 @@ static fs_vtable_t fs_vtable = { base_bdb_verify_root, base_bdb_freeze, base_bdb_set_errcall, + NULL /* ioctl */ }; /* Where the format number is stored. */ @@ -1515,7 +1516,8 @@ static fs_library_vtable_t library_vtable = { base_bdb_logfiles, svn_fs_base__id_parse, base_set_svn_fs_open, - NULL /* info_fsap_dup */ + NULL /* info_fsap_dup */, + NULL /* ioctl */ }; svn_error_t * diff --git a/subversion/libsvn_fs_base/libsvn_fs_base.pc.in b/subversion/libsvn_fs_base/libsvn_fs_base.pc.in index ef44eaf..0e8a158 100644 --- a/subversion/libsvn_fs_base/libsvn_fs_base.pc.in +++ b/subversion/libsvn_fs_base/libsvn_fs_base.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_fs_base Description: Subversion Filesystem Base Library Version: @PACKAGE_VERSION@ -Requires: apr-util-@SVN_APR_MAJOR_VERSION@ apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_delta libsvn_subr libsvn_fs_util -Libs: -L${libdir} -lsvn_fs_base @SVN_DB_LIBS@ -Cflags: -I${includedir} +Requires: apr-util-@SVN_APR_MAJOR_VERSION@, apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_delta, libsvn_subr, libsvn_fs_util +Libs: -L${libdir} -lsvn_fs_base-1 @SVN_DB_LIBS@ +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_fs_fs/cached_data.h b/subversion/libsvn_fs_fs/cached_data.h index 7b25fcf..cdf3bfb 100644 --- a/subversion/libsvn_fs_fs/cached_data.h +++ b/subversion/libsvn_fs_fs/cached_data.h @@ -171,7 +171,7 @@ svn_fs_fs__get_proplist(apr_hash_t **proplist, apr_pool_t *pool); /* Create a changes retrieval context object in *RESULT_POOL and return it - * in *CONTEXT. It will allow svn_fs_x__get_changes to fetch consecutive + * in *CONTEXT. It will allow svn_fs_fs__get_changes to fetch consecutive * blocks (one per invocation) from REV's changed paths list in FS. */ svn_error_t * svn_fs_fs__create_changes_context(svn_fs_fs__changes_context_t **context, diff --git a/subversion/libsvn_fs_fs/dag.c b/subversion/libsvn_fs_fs/dag.c index 714235d..2630af5 100644 --- a/subversion/libsvn_fs_fs/dag.c +++ b/subversion/libsvn_fs_fs/dag.c @@ -1166,7 +1166,7 @@ svn_fs_fs__dag_serialize(void **data, (const void * const *)&node->node_pool); /* serialize other sub-structures */ - svn_fs_fs__id_serialize(context, (const svn_fs_id_t **)&node->id); + svn_fs_fs__id_serialize(context, (const svn_fs_id_t *const *)&node->id); svn_fs_fs__id_serialize(context, &node->fresh_root_predecessor_id); svn_temp_serializer__add_string(context, &node->created_path); diff --git a/subversion/libsvn_fs_fs/dump-index.c b/subversion/libsvn_fs_fs/dump-index.c index c97be10..c62622b 100644 --- a/subversion/libsvn_fs_fs/dump-index.c +++ b/subversion/libsvn_fs_fs/dump-index.c @@ -21,8 +21,8 @@ */ #include "svn_pools.h" -#include "private/svn_fs_fs_private.h" +#include "fs_fs.h" #include "index.h" #include "rev_file.h" #include "util.h" diff --git a/subversion/libsvn_fs_fs/fs.c b/subversion/libsvn_fs_fs/fs.c index 508ecdb..c1dd42a 100644 --- a/subversion/libsvn_fs_fs/fs.c +++ b/subversion/libsvn_fs_fs/fs.c @@ -47,6 +47,7 @@ #include "verify.h" #include "svn_private_config.h" #include "private/svn_fs_util.h" +#include "private/svn_fs_fs_private.h" #include "../libsvn_fs/fs-loader.h" @@ -254,6 +255,67 @@ fs_set_uuid(svn_fs_t *fs, } +static svn_error_t * +fs_ioctl(svn_fs_t *fs, svn_fs_ioctl_code_t ctlcode, + void *input_void, void **output_p, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + if (strcmp(ctlcode.fs_type, SVN_FS_TYPE_FSFS) == 0) + { + if (ctlcode.code == SVN_FS_FS__IOCTL_GET_STATS.code) + { + svn_fs_fs__ioctl_get_stats_input_t *input = input_void; + svn_fs_fs__ioctl_get_stats_output_t *output; + + output = apr_pcalloc(result_pool, sizeof(*output)); + SVN_ERR(svn_fs_fs__get_stats(&output->stats, fs, + input->progress_func, + input->progress_baton, + cancel_func, cancel_baton, + result_pool, scratch_pool)); + *output_p = output; + } + else if (ctlcode.code == SVN_FS_FS__IOCTL_DUMP_INDEX.code) + { + svn_fs_fs__ioctl_dump_index_input_t *input = input_void; + + SVN_ERR(svn_fs_fs__dump_index(fs, input->revision, + input->callback_func, + input->callback_baton, + cancel_func, cancel_baton, + scratch_pool)); + *output_p = NULL; + } + else if (ctlcode.code == SVN_FS_FS__IOCTL_LOAD_INDEX.code) + { + svn_fs_fs__ioctl_load_index_input_t *input = input_void; + + SVN_ERR(svn_fs_fs__load_index(fs, input->revision, input->entries, + scratch_pool)); + *output_p = NULL; + } + else if (ctlcode.code == SVN_FS_FS__IOCTL_REVISION_SIZE.code) + { + svn_fs_fs__ioctl_revision_size_input_t *input = input_void; + svn_fs_fs__ioctl_revision_size_output_t *output + = apr_pcalloc(result_pool, sizeof(*output)); + + SVN_ERR(svn_fs_fs__revision_size(&output->rev_size, + fs, input->revision, + scratch_pool)); + *output_p = output; + } + else + return svn_error_create(SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE, NULL, NULL); + } + else + return svn_error_create(SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE, NULL, NULL); + + return SVN_NO_ERROR; +} /* The vtable associated with a specific open filesystem. */ static fs_vtable_t fs_vtable = { @@ -279,7 +341,8 @@ static fs_vtable_t fs_vtable = { fs_info, svn_fs_fs__verify_root, fs_freeze, - fs_set_errcall + fs_set_errcall, + fs_ioctl }; @@ -602,7 +665,8 @@ static fs_library_vtable_t library_vtable = { fs_logfiles, NULL /* parse_id */, fs_set_svn_fs_open, - fs_info_dup + fs_info_dup, + NULL /* ioctl */ }; svn_error_t * diff --git a/subversion/libsvn_fs_fs/fs_fs.h b/subversion/libsvn_fs_fs/fs_fs.h index cef95fe..f3e356b 100644 --- a/subversion/libsvn_fs_fs/fs_fs.h +++ b/subversion/libsvn_fs_fs/fs_fs.h @@ -304,4 +304,56 @@ svn_fs_fs__initialize_txn_caches(svn_fs_t *fs, void svn_fs_fs__reset_txn_caches(svn_fs_t *fs); +/* Scan all contents of the repository FS and return statistics in *STATS, + * allocated in RESULT_POOL. Report progress through PROGRESS_FUNC with + * PROGRESS_BATON, if PROGRESS_FUNC is not NULL. + * Use SCRATCH_POOL for temporary allocations. + */ +svn_error_t * +svn_fs_fs__get_stats(svn_fs_fs__stats_t **stats, + svn_fs_t *fs, + svn_fs_progress_notify_func_t progress_func, + void *progress_baton, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + +/* Read the P2L index for the rev / pack file containing REVISION in FS. + * For each index entry, invoke CALLBACK_FUNC with CALLBACK_BATON. + * If not NULL, call CANCEL_FUNC with CANCEL_BATON from time to time. + * Use SCRATCH_POOL for temporary allocations. + */ +svn_error_t * +svn_fs_fs__dump_index(svn_fs_t *fs, + svn_revnum_t revision, + svn_fs_fs__dump_index_func_t callback_func, + void *callback_baton, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *scratch_pool); + + +/* Rewrite the respective index information of the rev / pack file in FS + * containing REVISION and use the svn_fs_fs__p2l_entry_t * array ENTRIES + * as the new index contents. Allocate temporaries from SCRATCH_POOL. + * + * Note that this becomes a no-op if ENTRIES is empty. You may use a zero- + * sized empty entry instead. + */ +svn_error_t * +svn_fs_fs__load_index(svn_fs_t *fs, + svn_revnum_t revision, + apr_array_header_t *entries, + apr_pool_t *scratch_pool); + +/* Set *REV_SIZE to the total size of objects belonging to revision REVISION + * in FS. The size includes revision properties and excludes indexes. + */ +svn_error_t * +svn_fs_fs__revision_size(apr_off_t *rev_size, + svn_fs_t *fs, + svn_revnum_t revision, + apr_pool_t *scratch_pool); + #endif diff --git a/subversion/libsvn_fs_fs/id.c b/subversion/libsvn_fs_fs/id.c index d22b8f7..5f27303 100644 --- a/subversion/libsvn_fs_fs/id.c +++ b/subversion/libsvn_fs_fs/id.c @@ -591,7 +591,8 @@ svn_fs_fs__id_parse(const svn_fs_id_t **id_p, svn_fs_id_t *id = id_parse(data, pool); if (id == NULL) return svn_error_createf(SVN_ERR_FS_MALFORMED_NODEREV_ID, NULL, - "Malformed node revision ID string"); + "Malformed node revision ID string '%s'", + data); *id_p = id; diff --git a/subversion/libsvn_fs_fs/index.c b/subversion/libsvn_fs_fs/index.c index 1cb8fba..b7ba79f 100644 --- a/subversion/libsvn_fs_fs/index.c +++ b/subversion/libsvn_fs_fs/index.c @@ -3191,9 +3191,9 @@ compare_p2l_entry_revision(const void *lhs, const void *rhs) { const svn_fs_fs__p2l_entry_t *lhs_entry - =*(const svn_fs_fs__p2l_entry_t **)lhs; + =*(const svn_fs_fs__p2l_entry_t *const *)lhs; const svn_fs_fs__p2l_entry_t *rhs_entry - =*(const svn_fs_fs__p2l_entry_t **)rhs; + =*(const svn_fs_fs__p2l_entry_t *const *)rhs; if (lhs_entry->item.revision < rhs_entry->item.revision) return -1; diff --git a/subversion/libsvn_fs_fs/libsvn_fs_fs.pc.in b/subversion/libsvn_fs_fs/libsvn_fs_fs.pc.in index 324a709..2a2d624 100644 --- a/subversion/libsvn_fs_fs/libsvn_fs_fs.pc.in +++ b/subversion/libsvn_fs_fs/libsvn_fs_fs.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_fs_fs Description: Subversion FSFS Repository Filesystem Library Version: @PACKAGE_VERSION@ -Requires: apr-util-@SVN_APR_MAJOR_VERSION@ apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_delta libsvn_subr libsvn_fs_util -Libs: -L${libdir} -lsvn_fs_fs -Cflags: -I${includedir} +Requires: apr-util-@SVN_APR_MAJOR_VERSION@, apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_delta, libsvn_subr, libsvn_fs_util +Libs: -L${libdir} -lsvn_fs_fs-1 +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_fs_fs/load-index.c b/subversion/libsvn_fs_fs/load-index.c index 0ba6672..8608cb2 100644 --- a/subversion/libsvn_fs_fs/load-index.c +++ b/subversion/libsvn_fs_fs/load-index.c @@ -22,9 +22,9 @@ #include "svn_pools.h" -#include "private/svn_fs_fs_private.h" #include "private/svn_sorts_private.h" +#include "fs_fs.h" #include "index.h" #include "util.h" #include "transaction.h" @@ -83,9 +83,9 @@ compare_p2l_entry_revision(const void *lhs, const void *rhs) { const svn_fs_fs__p2l_entry_t *lhs_entry - =*(const svn_fs_fs__p2l_entry_t **)lhs; + =*(const svn_fs_fs__p2l_entry_t *const *)lhs; const svn_fs_fs__p2l_entry_t *rhs_entry - =*(const svn_fs_fs__p2l_entry_t **)rhs; + =*(const svn_fs_fs__p2l_entry_t *const *)rhs; if (lhs_entry->offset < rhs_entry->offset) return -1; diff --git a/subversion/libsvn_fs_fs/low_level.c b/subversion/libsvn_fs_fs/low_level.c index 2854bc6..f57c745 100644 --- a/subversion/libsvn_fs_fs/low_level.c +++ b/subversion/libsvn_fs_fs/low_level.c @@ -254,10 +254,10 @@ svn_fs_fs__parse_footer(apr_off_t *l2p_offset, "P2L offset %s must be larger than L2P offset %s" " in r%ld footer", apr_psprintf(result_pool, - "%" APR_UINT64_T_HEX_FMT, + "0x%" APR_UINT64_T_HEX_FMT, (apr_uint64_t)*p2l_offset), apr_psprintf(result_pool, - "%" APR_UINT64_T_HEX_FMT, + "0x%" APR_UINT64_T_HEX_FMT, (apr_uint64_t)*l2p_offset), rev); @@ -670,7 +670,7 @@ svn_fs_fs__write_changes(svn_stream_t *stream, } if (terminate_list) - svn_stream_puts(stream, "\n"); + SVN_ERR(svn_stream_puts(stream, "\n")); svn_pool_destroy(iterpool); diff --git a/subversion/libsvn_fs_fs/pack.c b/subversion/libsvn_fs_fs/pack.c index 1119857..7f32f13 100644 --- a/subversion/libsvn_fs_fs/pack.c +++ b/subversion/libsvn_fs_fs/pack.c @@ -2067,9 +2067,9 @@ pack_body(void *baton, if (fully_packed) { if (pb->notify_func) - (*pb->notify_func)(pb->notify_baton, - ffd->min_unpacked_rev / ffd->max_files_per_dir, - svn_fs_pack_notify_noop, pool); + SVN_ERR(pb->notify_func(pb->notify_baton, + ffd->min_unpacked_rev / ffd->max_files_per_dir, + svn_fs_pack_notify_noop, pool)); return SVN_NO_ERROR; } @@ -2122,7 +2122,7 @@ svn_fs_fs__pack(svn_fs_t *fs, if (!ffd->max_files_per_dir) { if (notify_func) - (*notify_func)(notify_baton, -1, svn_fs_pack_notify_noop, pool); + SVN_ERR(notify_func(notify_baton, -1, svn_fs_pack_notify_noop, pool)); return SVN_NO_ERROR; } @@ -2132,9 +2132,9 @@ svn_fs_fs__pack(svn_fs_t *fs, if (fully_packed) { if (notify_func) - (*notify_func)(notify_baton, - ffd->min_unpacked_rev / ffd->max_files_per_dir, - svn_fs_pack_notify_noop, pool); + SVN_ERR(notify_func(notify_baton, + ffd->min_unpacked_rev / ffd->max_files_per_dir, + svn_fs_pack_notify_noop, pool)); return SVN_NO_ERROR; } diff --git a/subversion/libsvn_fs_fs/rep-cache-db.h b/subversion/libsvn_fs_fs/rep-cache-db.h index e662538..3229f96 100644 --- a/subversion/libsvn_fs_fs/rep-cache-db.h +++ b/subversion/libsvn_fs_fs/rep-cache-db.h @@ -1,4 +1,4 @@ -/* This file is automatically generated from rep-cache-db.sql and subversion/libsvn_fs_fs/token-map.h. +/* This file is automatically generated from rep-cache-db.sql and token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_CREATE_SCHEMA_V1 0 diff --git a/subversion/libsvn_fs_fs/revprops.c b/subversion/libsvn_fs_fs/revprops.c index 6d41fd8..da11727 100644 --- a/subversion/libsvn_fs_fs/revprops.c +++ b/subversion/libsvn_fs_fs/revprops.c @@ -672,6 +672,64 @@ read_pack_revprop(packed_revprops_t **revprops, return SVN_NO_ERROR; } +svn_error_t * +svn_fs_fs__get_revision_props_size(apr_off_t *props_size_p, + svn_fs_t *fs, + svn_revnum_t rev, + apr_pool_t *scratch_pool) +{ + fs_fs_data_t *ffd = fs->fsap_data; + + /* should they be available at all? */ + SVN_ERR(svn_fs_fs__ensure_revision_exists(rev, fs, scratch_pool)); + + /* if REV had not been packed when we began, try reading it from the + * non-packed shard. If that fails, we will fall through to packed + * shard reads. */ + if (!svn_fs_fs__is_packed_revprop(fs, rev)) + { + const char *path = svn_fs_fs__path_revprops(fs, rev, scratch_pool); + svn_error_t *err; + apr_file_t *file; + svn_filesize_t file_size; + + err = svn_io_file_open(&file, path, APR_FOPEN_READ, APR_OS_DEFAULT, + scratch_pool); + if (!err) + err = svn_io_file_size_get(&file_size, file, scratch_pool); + if (!err) + { + *props_size_p = (apr_off_t)file_size; + return SVN_NO_ERROR; + } + else if (!APR_STATUS_IS_ENOENT(err->apr_err) + || ffd->format < SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT) + { + return svn_error_trace(err); + } + + /* fall through: maybe the revision got packed while we were looking */ + svn_error_clear(err); + } + + /* Try reading packed revprops. If that fails, REV is most + * likely invalid (or its revprops highly contested). */ + { + packed_revprops_t *revprops; + + /* ### This is inefficient -- reading all the revprops in a pack. We + should just read the index. */ + SVN_ERR(read_pack_revprop(&revprops, fs, rev, + TRUE /*read_all*/, FALSE /*populate_cache*/, + scratch_pool)); + *props_size_p = (apr_off_t)APR_ARRAY_IDX(revprops->sizes, + rev - revprops->start_revision, + apr_size_t); + } + + return SVN_NO_ERROR; +} + /* Read the revprops for revision REV in FS and return them in *PROPERTIES_P. * * Allocations will be done in POOL. diff --git a/subversion/libsvn_fs_fs/revprops.h b/subversion/libsvn_fs_fs/revprops.h index 37063f9..32df183 100644 --- a/subversion/libsvn_fs_fs/revprops.h +++ b/subversion/libsvn_fs_fs/revprops.h @@ -62,6 +62,15 @@ svn_fs_fs__upgrade_cleanup_pack_revprops(svn_fs_t *fs, void svn_fs_fs__reset_revprop_cache(svn_fs_t *fs); +/* Set *PROPS_SIZE_P to the size in bytes on disk of the revprops for + * revision REV in FS. The size excludes indexes. + */ +svn_error_t * +svn_fs_fs__get_revision_props_size(apr_off_t *props_size_p, + svn_fs_t *fs, + svn_revnum_t rev, + apr_pool_t *scratch_pool); + /* Read the revprops for revision REV in FS and return them in *PROPERTIES_P. * If REFRESH is set, clear the revprop cache before accessing the data. * diff --git a/subversion/libsvn_fs_fs/stats.c b/subversion/libsvn_fs_fs/stats.c index 36992db..a26a79d 100644 --- a/subversion/libsvn_fs_fs/stats.c +++ b/subversion/libsvn_fs_fs/stats.c @@ -28,7 +28,6 @@ #include "private/svn_cache.h" #include "private/svn_sorts_private.h" #include "private/svn_string_private.h" -#include "private/svn_fs_fs_private.h" #include "index.h" #include "pack.h" @@ -37,6 +36,7 @@ #include "fs_fs.h" #include "cached_data.h" #include "low_level.h" +#include "revprops.h" #include "../libsvn_fs/fs-loader.h" @@ -1397,3 +1397,96 @@ svn_fs_fs__get_stats(svn_fs_fs__stats_t **stats, return SVN_NO_ERROR; } + +/* Baton for rev_size_index_entry_cb. */ +struct rev_size_baton_t { + svn_revnum_t revision; + apr_off_t rev_size; +}; + +/* Implements svn_fs_fs__dump_index_func_t, summing object sizes for + * revision BATON->revision into BATON->rev_size. + */ +static svn_error_t * +rev_size_index_entry_cb(const svn_fs_fs__p2l_entry_t *entry, + void *baton, + apr_pool_t *scratch_pool) +{ + struct rev_size_baton_t *b = baton; + + if (entry->item.revision == b->revision) + b->rev_size += entry->size; + return SVN_NO_ERROR; +} + +svn_error_t * +svn_fs_fs__revision_size(apr_off_t *rev_size, + svn_fs_t *fs, + svn_revnum_t revision, + apr_pool_t *scratch_pool) +{ + /* Get the size of the revision (excluding rev-props) */ + if (svn_fs_fs__use_log_addressing(fs)) + { + /* This works for a packed or a non-packed revision. + We could provide an optimized case for a non-packed revision + using svn_fs_fs__p2l_get_max_offset(). */ + struct rev_size_baton_t b = { 0, 0 }; + + b.revision = revision; + SVN_ERR(svn_fs_fs__dump_index(fs, revision, + rev_size_index_entry_cb, &b, + NULL, NULL, scratch_pool)); + *rev_size = b.rev_size; + } + else + { + svn_fs_fs__revision_file_t *rev_file; + svn_revnum_t min_unpacked_rev; + + SVN_ERR(svn_fs_fs__open_pack_or_rev_file(&rev_file, fs, revision, + scratch_pool, scratch_pool)); + SVN_ERR(svn_fs_fs__min_unpacked_rev(&min_unpacked_rev, fs, + scratch_pool)); + if (revision < min_unpacked_rev) + { + int shard_size = svn_fs_fs__shard_size(fs); + apr_off_t start_offset, end_offset; + + SVN_ERR(svn_fs_fs__get_packed_offset(&start_offset, fs, revision, + scratch_pool)); + if (((revision + 1) % shard_size) == 0) + { + svn_filesize_t file_size; + + SVN_ERR(svn_io_file_size_get(&file_size, rev_file->file, scratch_pool)); + end_offset = (apr_off_t)file_size; + } + else + { + SVN_ERR(svn_fs_fs__get_packed_offset(&end_offset, fs, + revision + 1, scratch_pool)); + } + *rev_size = (end_offset - start_offset); + } + else + { + svn_filesize_t file_size; + + SVN_ERR(svn_io_file_size_get(&file_size, rev_file->file, scratch_pool)); + *rev_size = (apr_off_t)file_size; + } + + SVN_ERR(svn_fs_fs__close_revision_file(rev_file)); + } + + /* Add the size of the rev-props */ + { + apr_off_t size; + + SVN_ERR(svn_fs_fs__get_revision_props_size(&size, fs, revision, scratch_pool)); + *rev_size += size; + } + + return SVN_NO_ERROR; +} diff --git a/subversion/libsvn_fs_fs/temp_serializer.h b/subversion/libsvn_fs_fs/temp_serializer.h index 187c8d0..32bb554 100644 --- a/subversion/libsvn_fs_fs/temp_serializer.h +++ b/subversion/libsvn_fs_fs/temp_serializer.h @@ -53,7 +53,7 @@ svn_fs_fs__noderev_deserialize(void *buffer, /** * Adds position information to the raw window data in WINDOW. */ -typedef struct +typedef struct svn_fs_fs__raw_cached_window_t { /* the (unprocessed) txdelta window byte sequence cached / to be cached */ svn_string_t window; @@ -89,7 +89,7 @@ svn_fs_fs__deserialize_raw_window(void **item, * #svn_txdelta_window_t is not sufficient for caching the data it * represents because data read process needs auxiliary information. */ -typedef struct +typedef struct svn_fs_fs__txdelta_cached_window_t { /* the txdelta window information cached / to be cached */ svn_txdelta_window_t *window; @@ -377,7 +377,7 @@ typedef struct svn_fs_fs__changes_list_t of elements in the list is a multiple of our block / range size. */ svn_boolean_t eol; - /* Array of #svn_fs_x__change_t * representing a consecutive sub-range of + /* Array of #svn_fs_fs__change_t * representing a consecutive sub-range of elements in a changed paths list. */ /* number of entries in the array */ diff --git a/subversion/libsvn_fs_fs/verify.c b/subversion/libsvn_fs_fs/verify.c index 7fe5ecb..9d70d6c 100644 --- a/subversion/libsvn_fs_fs/verify.c +++ b/subversion/libsvn_fs_fs/verify.c @@ -681,10 +681,10 @@ compare_p2l_to_rev(svn_fs_t *fs, NULL, _("p2l index entry for revision r%ld" " at offset %s contains invalid item" - " type %d"), + " type %u"), start, apr_off_t_toa(pool, offset), - entry->type); + (unsigned int)entry->type); /* There can be only one changes entry and that has a fixed type * and item number. Its presence and parse-ability will be checked @@ -694,11 +694,12 @@ compare_p2l_to_rev(svn_fs_t *fs, return svn_error_createf(SVN_ERR_FS_INDEX_CORRUPTION, NULL, _("p2l index entry for changes in" - " revision r%ld is item %ld of type" - " %d at offset %s"), + " revision r%ld is item" + " %"APR_UINT64_T_FMT + " of type %u at offset %s"), entry->item.revision, entry->item.number, - entry->type, + (unsigned int)entry->type, apr_off_t_toa(pool, offset)); /* Check contents. */ diff --git a/subversion/libsvn_fs_util/libsvn_fs_util.pc.in b/subversion/libsvn_fs_util/libsvn_fs_util.pc.in index 05a9b4f..258857f 100644 --- a/subversion/libsvn_fs_util/libsvn_fs_util.pc.in +++ b/subversion/libsvn_fs_util/libsvn_fs_util.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_fs_util Description: Subversion Filesystem Utility Library Version: @PACKAGE_VERSION@ -Requires: apr-util-@SVN_APR_MAJOR_VERSION@ apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_subr -Libs: -L${libdir} -lsvn_fs_util -Cflags: -I${includedir} +Requires: apr-util-@SVN_APR_MAJOR_VERSION@, apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_subr +Libs: -L${libdir} -lsvn_fs_util-1 +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_fs_x/changes.c b/subversion/libsvn_fs_x/changes.c index c385e59..419bc41 100644 --- a/subversion/libsvn_fs_x/changes.c +++ b/subversion/libsvn_fs_x/changes.c @@ -184,7 +184,7 @@ svn_fs_x__changes_append_list(apr_size_t *list_index, /* simply append the list and all changes */ for (i = 0; i < list->nelts; ++i) - append_change(changes, APR_ARRAY_IDX(list, i, svn_fs_x__change_t *)); + SVN_ERR(append_change(changes, APR_ARRAY_IDX(list, i, svn_fs_x__change_t *))); /* terminate the list by storing the next changes offset */ APR_ARRAY_PUSH(changes->offsets, int) = changes->changes->nelts; diff --git a/subversion/libsvn_fs_x/dag_cache.c b/subversion/libsvn_fs_x/dag_cache.c index 896c56f..a8a3e7a 100644 --- a/subversion/libsvn_fs_x/dag_cache.c +++ b/subversion/libsvn_fs_x/dag_cache.c @@ -833,7 +833,7 @@ get_copy_inheritance(svn_fs_x__copy_id_inherit_t *inherit_p, } /* Allocate a new svn_fs_x__dag_path_t node from RESULT_POOL, containing - NODE, ENTRY and PARENT, all copied into RESULT_POOL as well. */ + NODE, ENTRY and PARENT; NODE and ENTRY are copied into RESULT_POOL. */ static svn_fs_x__dag_path_t * make_parent_path(dag_node_t *node, const svn_stringbuf_t *entry, diff --git a/subversion/libsvn_fs_x/dag_cache.h b/subversion/libsvn_fs_x/dag_cache.h index fd78bb7..9d95361 100644 --- a/subversion/libsvn_fs_x/dag_cache.h +++ b/subversion/libsvn_fs_x/dag_cache.h @@ -103,7 +103,7 @@ typedef struct svn_fs_x__dag_path_t IS_TXN_PATH must be set. If IS_TXN_PATH is FALSE, no copy ID inheritance information will be calculated for the *PARENT_PATH_P chain. - If FLAGS & open_path_last_optional is zero, return the error + If FLAGS & svn_fs_x__dag_path_last_optional is zero, return the error SVN_ERR_FS_NOT_FOUND if the node PATH refers to does not exist. If non-zero, require all the parent directories to exist as normal, but if the final path component doesn't exist, simply return a path diff --git a/subversion/libsvn_fs_x/fs.c b/subversion/libsvn_fs_x/fs.c index 7eb0add..cf4613e 100644 --- a/subversion/libsvn_fs_x/fs.c +++ b/subversion/libsvn_fs_x/fs.c @@ -310,7 +310,8 @@ static fs_vtable_t fs_vtable = { x_info, svn_fs_x__verify_root, x_freeze, - x_set_errcall + x_set_errcall, + NULL /* ioctl */ }; @@ -641,7 +642,8 @@ static fs_library_vtable_t library_vtable = { x_logfiles, NULL /* parse_id */, x_set_svn_fs_open, - x_info_dup + x_info_dup, + NULL /* ioctl */ }; svn_error_t * diff --git a/subversion/libsvn_fs_x/libsvn_fs_x.pc.in b/subversion/libsvn_fs_x/libsvn_fs_x.pc.in index 46d93dc..5d7d58b 100644 --- a/subversion/libsvn_fs_x/libsvn_fs_x.pc.in +++ b/subversion/libsvn_fs_x/libsvn_fs_x.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_fs_x Description: Subversion FSX Repository Filesystem Library Version: @PACKAGE_VERSION@ -Requires: apr-util-@SVN_APR_MAJOR_VERSION@ apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_delta libsvn_subr libsvn_fs_util -Libs: -L${libdir} -lsvn_fs_x -Cflags: -I${includedir} +Requires: apr-util-@SVN_APR_MAJOR_VERSION@, apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_delta, libsvn_subr, libsvn_fs_util +Libs: -L${libdir} -lsvn_fs_x-1 +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_fs_x/low_level.c b/subversion/libsvn_fs_x/low_level.c index 5c7e3ad..491813a 100644 --- a/subversion/libsvn_fs_x/low_level.c +++ b/subversion/libsvn_fs_x/low_level.c @@ -167,10 +167,10 @@ svn_fs_x__parse_footer(apr_off_t *l2p_offset, "P2L offset %s must be larger than L2P offset %s" " in r%ld footer", apr_psprintf(result_pool, - "%" APR_UINT64_T_HEX_FMT, + "0x%" APR_UINT64_T_HEX_FMT, (apr_uint64_t)*p2l_offset), apr_psprintf(result_pool, - "%" APR_UINT64_T_HEX_FMT, + "0x%" APR_UINT64_T_HEX_FMT, (apr_uint64_t)*l2p_offset), rev); @@ -1131,7 +1131,7 @@ svn_fs_x__write_changes(svn_stream_t *stream, } if (terminate_list) - svn_stream_puts(stream, "\n"); + SVN_ERR(svn_stream_puts(stream, "\n")); svn_pool_destroy(iterpool); diff --git a/subversion/libsvn_fs_x/pack.c b/subversion/libsvn_fs_x/pack.c index 095b04e..ceb9e7f 100644 --- a/subversion/libsvn_fs_x/pack.c +++ b/subversion/libsvn_fs_x/pack.c @@ -2204,9 +2204,9 @@ pack_body(void *baton, if (fully_packed) { if (pb->notify_func) - (*pb->notify_func)(pb->notify_baton, - ffd->min_unpacked_rev / ffd->max_files_per_dir, - svn_fs_pack_notify_noop, scratch_pool); + SVN_ERR(pb->notify_func(pb->notify_baton, + ffd->min_unpacked_rev / ffd->max_files_per_dir, + svn_fs_pack_notify_noop, scratch_pool)); return SVN_NO_ERROR; } @@ -2258,9 +2258,9 @@ svn_fs_x__pack(svn_fs_t *fs, svn_fs_x__data_t *ffd = fs->fsap_data; if (notify_func) - (*notify_func)(notify_baton, - ffd->min_unpacked_rev / ffd->max_files_per_dir, - svn_fs_pack_notify_noop, scratch_pool); + SVN_ERR(notify_func(notify_baton, + ffd->min_unpacked_rev / ffd->max_files_per_dir, + svn_fs_pack_notify_noop, scratch_pool)); return SVN_NO_ERROR; } diff --git a/subversion/libsvn_fs_x/rep-cache-db.h b/subversion/libsvn_fs_x/rep-cache-db.h index c212760..67ab630 100644 --- a/subversion/libsvn_fs_x/rep-cache-db.h +++ b/subversion/libsvn_fs_x/rep-cache-db.h @@ -1,4 +1,4 @@ -/* This file is automatically generated from rep-cache-db.sql and subversion/libsvn_fs_x/token-map.h. +/* This file is automatically generated from rep-cache-db.sql and token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_CREATE_SCHEMA 0 diff --git a/subversion/libsvn_fs_x/transaction.c b/subversion/libsvn_fs_x/transaction.c index 52c958f..ff05d62 100644 --- a/subversion/libsvn_fs_x/transaction.c +++ b/subversion/libsvn_fs_x/transaction.c @@ -1259,7 +1259,7 @@ get_and_increment_txn_key_body(void *baton, SVN_ERR(svn_io_check_path(txn_dir, &kind, iterpool)); if (kind == svn_node_none) { - svn_io_dir_make(txn_dir, APR_OS_DEFAULT, iterpool); + SVN_ERR(svn_io_dir_make(txn_dir, APR_OS_DEFAULT, iterpool)); break; } diff --git a/subversion/libsvn_fs_x/tree.c b/subversion/libsvn_fs_x/tree.c index 36374af..6fe34f3 100644 --- a/subversion/libsvn_fs_x/tree.c +++ b/subversion/libsvn_fs_x/tree.c @@ -2060,7 +2060,7 @@ typedef struct text_baton_t * svn_fs_apply_text() ==> ... ==> txn_body_fulltext_finalize_edits() */ -/* Write function for the publically returned stream. */ +/* Write function for the publicly returned stream. */ static svn_error_t * text_stream_writer(void *baton, const char *data, diff --git a/subversion/libsvn_ra/libsvn_ra.pc.in b/subversion/libsvn_ra/libsvn_ra.pc.in index b7ef131..3b44fae 100644 --- a/subversion/libsvn_ra/libsvn_ra.pc.in +++ b/subversion/libsvn_ra/libsvn_ra.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_ra Description: Subversion General Repository Access Library Version: @PACKAGE_VERSION@ -Requires: apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_delta libsvn_subr -Libs: -L${libdir} -lsvn_ra -Cflags: -I${includedir} +Requires: apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_delta, libsvn_subr +Libs: -L${libdir} -lsvn_ra-1 +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_ra_local/libsvn_ra_local.pc.in b/subversion/libsvn_ra_local/libsvn_ra_local.pc.in index 1333df0..bef11b2 100644 --- a/subversion/libsvn_ra_local/libsvn_ra_local.pc.in +++ b/subversion/libsvn_ra_local/libsvn_ra_local.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_ra_local Description: Subversion Local Repository Access Library Version: @PACKAGE_VERSION@ -Requires: apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_repos libsvn_fs libsvn_delta libsvn_subr -Libs: -L${libdir} -lsvn_ra_local -Cflags: -I${includedir} +Requires: apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_repos, libsvn_fs, libsvn_delta, libsvn_subr +Libs: -L${libdir} -lsvn_ra_local-1 +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_ra_serf/commit.c b/subversion/libsvn_ra_serf/commit.c index 63a6f0b..1b25ab4 100644 --- a/subversion/libsvn_ra_serf/commit.c +++ b/subversion/libsvn_ra_serf/commit.c @@ -311,7 +311,7 @@ checkout_node(const char **working_url, fails due to an SVN_ERR_APMOD_BAD_BASELINE error return from the server. - See http://subversion.tigris.org/issues/show_bug.cgi?id=4127 for + See https://issues.apache.org/jira/browse/SVN-4127 for details. */ static svn_error_t * @@ -677,7 +677,7 @@ write_prop_xml(const proppatch_context_t *proppatch, explicitly deleted in this commit already, then mod_dav removed its lock token when it fielded the DELETE request, so we don't want to set the lock precondition again. (See - http://subversion.tigris.org/issues/show_bug.cgi?id=3674 for details.) + https://issues.apache.org/jira/browse/SVN-3674 for details.) */ static svn_error_t * maybe_set_lock_token_header(serf_bucket_t *headers, diff --git a/subversion/libsvn_ra_serf/libsvn_ra_serf.pc.in b/subversion/libsvn_ra_serf/libsvn_ra_serf.pc.in index 81285ed..eb46915 100644 --- a/subversion/libsvn_ra_serf/libsvn_ra_serf.pc.in +++ b/subversion/libsvn_ra_serf/libsvn_ra_serf.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_ra_serf Description: Subversion HTTP/WebDAV Protocol Repository Access Library Version: @PACKAGE_VERSION@ -Requires: apr-util-@SVN_APR_MAJOR_VERSION@ apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_delta libsvn_subr serf-1 -Libs: -L${libdir} -lsvn_ra_serf @SVN_ZLIB_LIBS@ -Cflags: -I${includedir} +Requires: apr-util-@SVN_APR_MAJOR_VERSION@, apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_delta, libsvn_subr, serf-1 +Libs: -L${libdir} -lsvn_ra_serf-1 @SVN_ZLIB_LIBS@ +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_ra_serf/list.c b/subversion/libsvn_ra_serf/list.c index 722a946..3b2ac9f 100644 --- a/subversion/libsvn_ra_serf/list.c +++ b/subversion/libsvn_ra_serf/list.c @@ -21,26 +21,13 @@ * ==================================================================== */ - - - -#include #include #include "svn_hash.h" -#include "svn_pools.h" -#include "svn_ra.h" -#include "svn_dav.h" #include "svn_base64.h" #include "svn_xml.h" -#include "svn_config.h" -#include "svn_path.h" -#include "svn_props.h" #include "svn_time.h" -#include "private/svn_dav_protocol.h" -#include "private/svn_string_private.h" -#include "private/svn_subr_private.h" #include "svn_private_config.h" #include "ra_serf.h" diff --git a/subversion/libsvn_ra_serf/options.c b/subversion/libsvn_ra_serf/options.c index 9cb507c..f368ceb 100644 --- a/subversion/libsvn_ra_serf/options.c +++ b/subversion/libsvn_ra_serf/options.c @@ -71,6 +71,9 @@ typedef struct options_context_t { svn_ra_serf__response_handler_t inner_handler; void *inner_baton; + /* Have we received any DAV headers at all? */ + svn_boolean_t received_dav_header; + const char *activity_collection; svn_revnum_t youngest_rev; @@ -165,6 +168,8 @@ capabilities_headers_iterator_callback(void *baton, apr_array_header_t *vals = svn_cstring_split(val, ",", TRUE, opt_ctx->pool); + opt_ctx->received_dav_header = TRUE; + /* Right now we only have a few capabilities to detect, so just seek for them directly. This could be written slightly more efficiently, but that wouldn't be worth it until we have many @@ -396,6 +401,19 @@ options_response_handler(serf_request_t *request, serf_bucket_headers_do(hdrs, capabilities_headers_iterator_callback, opt_ctx); + /* Bail out early if we're not talking to a DAV server. + Note that this check is only valid if we've received a success + response; redirects and errors don't count. */ + if (opt_ctx->handler->sline.code >= 200 + && opt_ctx->handler->sline.code < 300 + && !opt_ctx->received_dav_header) + { + return svn_error_createf + (SVN_ERR_RA_DAV_OPTIONS_REQ_FAILED, NULL, + _("The server at '%s' does not support the HTTP/DAV protocol"), + session->session_url_str); + } + /* Assume mergeinfo capability unsupported, if didn't receive information about server or repository mergeinfo capability. */ if (!svn_hash_gets(session->capabilities, SVN_RA_CAPABILITY_MERGEINFO)) @@ -557,8 +575,7 @@ svn_ra_serf__exchange_capabilities(svn_ra_serf__session_t *serf_sess, } else if (svn_path_is_url(opt_ctx->handler->location)) { - *corrected_url = svn_uri_canonicalize(opt_ctx->handler->location, - result_pool); + *corrected_url = apr_pstrdup(result_pool, opt_ctx->handler->location); } else { @@ -571,9 +588,7 @@ svn_ra_serf__exchange_capabilities(svn_ra_serf__session_t *serf_sess, apr_uri_t corrected_URI = serf_sess->session_url; corrected_URI.path = (char *)corrected_url; - *corrected_url = svn_uri_canonicalize( - apr_uri_unparse(scratch_pool, &corrected_URI, 0), - result_pool); + *corrected_url = apr_uri_unparse(result_pool, &corrected_URI, 0); } return SVN_NO_ERROR; diff --git a/subversion/libsvn_ra_serf/replay.c b/subversion/libsvn_ra_serf/replay.c index bb90ad4..a8cc398 100644 --- a/subversion/libsvn_ra_serf/replay.c +++ b/subversion/libsvn_ra_serf/replay.c @@ -701,7 +701,7 @@ svn_ra_serf__replay_range(svn_ra_session_t *ra_session, wish for the best. See issue #4287: - http://subversion.tigris.org/issues/show_bug.cgi?id=4287 + https://issues.apache.org/jira/browse/SVN-4287 */ if (session->supports_rev_rsrc_replay) { diff --git a/subversion/libsvn_ra_serf/update.c b/subversion/libsvn_ra_serf/update.c index 63091f2..fc68adf 100644 --- a/subversion/libsvn_ra_serf/update.c +++ b/subversion/libsvn_ra_serf/update.c @@ -603,7 +603,7 @@ get_best_connection(report_context_t *ctx) ### simply can't handle the way ra_serf violates the editor v1 ### drive ordering requirements. ### - ### See http://subversion.tigris.org/issues/show_bug.cgi?id=4116. + ### See https://issues.apache.org/jira/browse/SVN-4116. */ if (ctx->report_received && (ctx->sess->max_connections > 2)) first_conn = 0; diff --git a/subversion/libsvn_ra_serf/util.c b/subversion/libsvn_ra_serf/util.c index 66e06ff..e545d77 100644 --- a/subversion/libsvn_ra_serf/util.c +++ b/subversion/libsvn_ra_serf/util.c @@ -1116,19 +1116,17 @@ response_get_location(serf_bucket_t *response, return NULL; /* Replace the path path with what we got */ - uri.path = (char*)svn_urlpath__canonicalize(location, scratch_pool); + uri.path = apr_pstrdup(scratch_pool, location); /* And make APR produce a proper full url for us */ - location = apr_uri_unparse(scratch_pool, &uri, 0); - - /* Fall through to ensure our canonicalization rules */ + return apr_uri_unparse(result_pool, &uri, 0); } else if (!svn_path_is_url(location)) { return NULL; /* Any other formats we should support? */ } - return svn_uri_canonicalize(location, result_pool); + return apr_pstrdup(result_pool, location); } diff --git a/subversion/libsvn_ra_svn/libsvn_ra_svn.pc.in b/subversion/libsvn_ra_svn/libsvn_ra_svn.pc.in index 4d67689..39666c0 100644 --- a/subversion/libsvn_ra_svn/libsvn_ra_svn.pc.in +++ b/subversion/libsvn_ra_svn/libsvn_ra_svn.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_ra_svn Description: Subversion SVN Protocol Repository Access Library Version: @PACKAGE_VERSION@ -Requires: apr-util-@SVN_APR_MAJOR_VERSION@ apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_delta libsvn_subr -Libs: -L${libdir} -lsvn_ra_svn @SVN_SASL_LIBS@ -Cflags: -I${includedir} +Requires: apr-util-@SVN_APR_MAJOR_VERSION@, apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_delta, libsvn_subr +Libs: -L${libdir} -lsvn_ra_svn-1 @SVN_SASL_LIBS@ +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_ra_svn/protocol b/subversion/libsvn_ra_svn/protocol index dfa7bc4..b067d87 100644 --- a/subversion/libsvn_ra_svn/protocol +++ b/subversion/libsvn_ra_svn/protocol @@ -342,7 +342,7 @@ second place for auth-request point as noted below. stat params: ( path:string [ rev:number ] ) response: ( ? entry:dirent ) - dirent: ( name:string kind:node-kind size:number has-props:bool + dirent: ( kind:node-kind size:number has-props:bool created-rev:number [ created-date:string ] [ last-author:string ] ) New in svn 1.2. If path is non-existent, an empty response is returned. diff --git a/subversion/libsvn_repos/authz.c b/subversion/libsvn_repos/authz.c index 668d78d..68a87f3 100644 --- a/subversion/libsvn_repos/authz.c +++ b/subversion/libsvn_repos/authz.c @@ -1548,6 +1548,8 @@ authz_read(authz_full_t **authz_p, const char *groups_path, svn_boolean_t must_exist, svn_repos_t *repos_hint, + svn_repos_authz_warning_func_t warning_func, + void *warning_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) { @@ -1587,7 +1589,8 @@ authz_read(authz_full_t **authz_p, /* Parse the configuration(s) and construct the full authz model * from it. */ err = svn_authz__parse(authz_p, rules_stream, groups_stream, - item_pool, scratch_pool); + warning_func, warning_baton, + item_pool, scratch_pool); if (err != SVN_NO_ERROR) { /* That pool would otherwise never get destroyed. */ @@ -1611,11 +1614,11 @@ authz_read(authz_full_t **authz_p, { /* Parse the configuration(s) and construct the full authz model from * it. */ - err = svn_error_quick_wrapf(svn_authz__parse(authz_p, rules_stream, - groups_stream, - result_pool, scratch_pool), - "Error while parsing authz file: '%s':", - path); + err = svn_error_quick_wrapf( + svn_authz__parse(authz_p, rules_stream, groups_stream, + warning_func, warning_baton, + result_pool, scratch_pool), + "Error while parsing authz file: '%s':", path); } svn_repos__destroy_config_access(config_access); @@ -1628,11 +1631,13 @@ authz_read(authz_full_t **authz_p, /*** Public functions. ***/ svn_error_t * -svn_repos_authz_read3(svn_authz_t **authz_p, +svn_repos_authz_read4(svn_authz_t **authz_p, const char *path, const char *groups_path, svn_boolean_t must_exist, svn_repos_t *repos_hint, + svn_repos_authz_warning_func_t warning_func, + void *warning_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) { @@ -1640,7 +1645,8 @@ svn_repos_authz_read3(svn_authz_t **authz_p, authz->pool = result_pool; SVN_ERR(authz_read(&authz->full, &authz->authz_id, path, groups_path, - must_exist, repos_hint, result_pool, scratch_pool)); + must_exist, repos_hint, warning_func, warning_baton, + result_pool, scratch_pool)); *authz_p = authz; return SVN_NO_ERROR; @@ -1648,18 +1654,21 @@ svn_repos_authz_read3(svn_authz_t **authz_p, svn_error_t * -svn_repos_authz_parse(svn_authz_t **authz_p, svn_stream_t *stream, - svn_stream_t *groups_stream, apr_pool_t *pool) +svn_repos_authz_parse2(svn_authz_t **authz_p, + svn_stream_t *stream, + svn_stream_t *groups_stream, + svn_repos_authz_warning_func_t warning_func, + void *warning_baton, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) { - apr_pool_t *scratch_pool = svn_pool_create(pool); - svn_authz_t *authz = apr_pcalloc(pool, sizeof(*authz)); - authz->pool = pool; + svn_authz_t *authz = apr_pcalloc(result_pool, sizeof(*authz)); + authz->pool = result_pool; /* Parse the configuration and construct the full authz model from it. */ - SVN_ERR(svn_authz__parse(&authz->full, stream, groups_stream, pool, - scratch_pool)); - - svn_pool_destroy(scratch_pool); + SVN_ERR(svn_authz__parse(&authz->full, stream, groups_stream, + warning_func, warning_baton, + result_pool, scratch_pool)); *authz_p = authz; return SVN_NO_ERROR; diff --git a/subversion/libsvn_repos/authz.h b/subversion/libsvn_repos/authz.h index 9dfe249..4a62a76 100644 --- a/subversion/libsvn_repos/authz.h +++ b/subversion/libsvn_repos/authz.h @@ -312,6 +312,8 @@ svn_error_t * svn_authz__parse(authz_full_t **authz, svn_stream_t *rules, svn_stream_t *groups, + svn_repos_authz_warning_func_t warning_func, + void *warning_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool); diff --git a/subversion/libsvn_repos/authz_parse.c b/subversion/libsvn_repos/authz_parse.c index 00bc480..e2964de 100644 --- a/subversion/libsvn_repos/authz_parse.c +++ b/subversion/libsvn_repos/authz_parse.c @@ -127,6 +127,10 @@ typedef struct ctor_baton_t svn_membuf_t rule_path_buffer; svn_stringbuf_t *rule_string_buffer; + /* The warning callback and its baton. */ + svn_repos_authz_warning_func_t warning_func; + void *warning_baton; + /* The parser's scratch pool. This may not be the same pool as passed to the constructor callbacks, that is supposed to be an iteration pool maintained by the generic parser. @@ -203,7 +207,9 @@ insert_default_acl(ctor_baton_t *cb) /* Initialize a constuctor baton. */ static ctor_baton_t * -create_ctor_baton(apr_pool_t *result_pool, +create_ctor_baton(svn_repos_authz_warning_func_t warning_func, + void *warning_baton, + apr_pool_t *result_pool, apr_pool_t *scratch_pool) { apr_pool_t *const parser_pool = svn_pool_create(scratch_pool); @@ -234,6 +240,9 @@ create_ctor_baton(apr_pool_t *result_pool, svn_membuf__create(&cb->rule_path_buffer, 0, parser_pool); cb->rule_string_buffer = svn_stringbuf_create_empty(parser_pool); + cb->warning_func = warning_func; + cb->warning_baton = warning_baton; + cb->parser_pool = parser_pool; insert_default_acl(cb); @@ -242,6 +251,25 @@ create_ctor_baton(apr_pool_t *result_pool, } +/* Emit a warning. Clears ERROR */ +static void +emit_parser_warning(const ctor_baton_t *cb, + svn_error_t *error, + apr_pool_t *scratch_pool) +{ + if (cb->warning_func) + cb->warning_func(cb->warning_baton, error, scratch_pool); + svn_error_clear(error); +} + +/* Avoid creating an error struct if there is no warning function. */ +#define SVN_AUTHZ_PARSE_WARN(cb, err, pool) \ + do { \ + if ((cb) && (cb)->warning_func) \ + emit_parser_warning((cb), (err), (pool)); \ + } while(0) + + /* Create and store per-user global rights. The USER string must be interned or statically initialized. */ static void @@ -1186,8 +1214,14 @@ array_insert_ace(void *baton, } else if (0 == apr_hash_count(ace->members)) { - /* TODO: Somehow emit a warning about the use of an empty group. */ /* An ACE for an empty group has no effect, so ignore it. */ + SVN_AUTHZ_PARSE_WARN( + iab->cb, + svn_error_createf( + SVN_ERR_AUTHZ_INVALID_CONFIG, NULL, + _("Ignoring access entry for empty group '%s'"), + ace->name), + scratch_pool); return SVN_NO_ERROR; } } @@ -1335,10 +1369,13 @@ svn_error_t * svn_authz__parse(authz_full_t **authz, svn_stream_t *rules, svn_stream_t *groups, + svn_repos_authz_warning_func_t warning_func, + void *warning_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) { - ctor_baton_t *const cb = create_ctor_baton(result_pool, scratch_pool); + ctor_baton_t *const cb = create_ctor_baton(warning_func, warning_baton, + result_pool, scratch_pool); /* * Pass 1: Parse the authz file. diff --git a/subversion/libsvn_repos/commit.c b/subversion/libsvn_repos/commit.c index 6ce4cc6..42d0525 100644 --- a/subversion/libsvn_repos/commit.c +++ b/subversion/libsvn_repos/commit.c @@ -306,13 +306,14 @@ add_file_or_directory(const char *path, struct edit_baton *eb = pb->edit_baton; apr_pool_t *subpool = svn_pool_create(pool); svn_boolean_t was_copied = FALSE; - const char *full_path; + const char *full_path, *canonicalized_path; /* Reject paths which contain control characters (related to issue #4340). */ SVN_ERR(svn_path_check_valid(path, pool)); - full_path = svn_fspath__join(eb->base_path, - svn_relpath_canonicalize(path, pool), pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonicalized_path, NULL, path, + pool, pool)); + full_path = svn_fspath__join(eb->base_path, canonicalized_path, pool); /* Sanity check. */ if (copy_path && (! SVN_IS_VALID_REVNUM(copy_revision))) @@ -477,10 +478,11 @@ delete_entry(const char *path, struct edit_baton *eb = parent->edit_baton; svn_node_kind_t kind; svn_repos_authz_access_t required = svn_authz_write; - const char *full_path; + const char *full_path, *canonicalized_path; - full_path = svn_fspath__join(eb->base_path, - svn_relpath_canonicalize(path, pool), pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonicalized_path, NULL, path, + pool, pool)); + full_path = svn_fspath__join(eb->base_path, canonicalized_path, pool); /* Check PATH in our transaction. */ SVN_ERR(svn_fs_check_path(&kind, eb->txn_root, full_path, pool)); @@ -538,10 +540,11 @@ open_directory(const char *path, struct dir_baton *pb = parent_baton; struct edit_baton *eb = pb->edit_baton; svn_node_kind_t kind; - const char *full_path; + const char *full_path, *canonicalized_path; - full_path = svn_fspath__join(eb->base_path, - svn_relpath_canonicalize(path, pool), pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonicalized_path, NULL, path, + pool, pool)); + full_path = svn_fspath__join(eb->base_path, canonicalized_path, pool); /* Check PATH in our transaction. If it does not exist, return a 'Path not present' error. */ @@ -611,10 +614,11 @@ open_file(const char *path, struct edit_baton *eb = pb->edit_baton; svn_revnum_t cr_rev; apr_pool_t *subpool = svn_pool_create(pool); - const char *full_path; + const char *full_path, *canonicalized_path; - full_path = svn_fspath__join(eb->base_path, - svn_relpath_canonicalize(path, pool), pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonicalized_path, NULL, path, + pool, pool)); + full_path = svn_fspath__join(eb->base_path, canonicalized_path, pool); /* Check for read authorization. */ SVN_ERR(check_authz(eb, full_path, eb->txn_root, diff --git a/subversion/libsvn_repos/delta.c b/subversion/libsvn_repos/delta.c index 9b1448d..b7d4ffa 100644 --- a/subversion/libsvn_repos/delta.c +++ b/subversion/libsvn_repos/delta.c @@ -215,7 +215,7 @@ svn_repos_dir_delta2(svn_fs_root_t *src_root, { void *root_baton = NULL; struct context c; - const char *src_fullpath; + const char *src_fullpath, *canonicalized_path; svn_node_kind_t src_kind, tgt_kind; svn_revnum_t rootrev; svn_fs_node_relation_t relation; @@ -223,14 +223,22 @@ svn_repos_dir_delta2(svn_fs_root_t *src_root, /* SRC_PARENT_DIR must be valid. */ if (src_parent_dir) - src_parent_dir = svn_relpath_canonicalize(src_parent_dir, pool); + { + SVN_ERR(svn_relpath_canonicalize_safe(&canonicalized_path, NULL, + src_parent_dir, pool, pool)); + src_parent_dir = canonicalized_path; + } else return svn_error_create(SVN_ERR_FS_NOT_DIRECTORY, 0, "Invalid source parent directory '(null)'"); /* TGT_FULLPATH must be valid. */ if (tgt_fullpath) - tgt_fullpath = svn_relpath_canonicalize(tgt_fullpath, pool); + { + SVN_ERR(svn_relpath_canonicalize_safe(&canonicalized_path, NULL, + tgt_fullpath, pool, pool)); + tgt_fullpath = canonicalized_path; + } else return svn_error_create(SVN_ERR_FS_PATH_SYNTAX, 0, _("Invalid target path")); diff --git a/subversion/libsvn_repos/deprecated.c b/subversion/libsvn_repos/deprecated.c index f502623..7ca0e17 100644 --- a/subversion/libsvn_repos/deprecated.c +++ b/subversion/libsvn_repos/deprecated.c @@ -1272,6 +1272,21 @@ svn_repos_fs_begin_txn_for_update(svn_fs_txn_t **txn_p, /*** From authz.c ***/ +svn_error_t * +svn_repos_authz_read3(svn_authz_t **authz_p, + const char *path, + const char *groups_path, + svn_boolean_t must_exist, + svn_repos_t *repos_hint, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + return svn_error_trace(svn_repos_authz_read4(authz_p, path, groups_path, + must_exist, repos_hint, + NULL, NULL, result_pool, + scratch_pool)); +} + svn_error_t * svn_repos_authz_read2(svn_authz_t **authz_p, const char *path, @@ -1300,3 +1315,17 @@ svn_repos_authz_read(svn_authz_t **authz_p, const char *file, return svn_error_trace(svn_repos_authz_read2(authz_p, file, NULL, must_exist, pool)); } + +svn_error_t * +svn_repos_authz_parse(svn_authz_t **authz_p, + svn_stream_t *stream, + svn_stream_t *groups_stream, + apr_pool_t *pool) +{ + apr_pool_t *scratch_pool = svn_pool_create(pool); + svn_error_t *err = svn_repos_authz_parse2(authz_p, stream, groups_stream, + NULL, NULL, pool, scratch_pool); + svn_pool_destroy(scratch_pool); + + return svn_error_trace(err); +} diff --git a/subversion/libsvn_repos/dump.c b/subversion/libsvn_repos/dump.c index fcdf745..ab318c6 100644 --- a/subversion/libsvn_repos/dump.c +++ b/subversion/libsvn_repos/dump.c @@ -512,6 +512,30 @@ svn_repos__dump_headers(svn_stream_t *stream, return SVN_NO_ERROR; } +svn_error_t * +svn_repos__dump_magic_header_record(svn_stream_t *dump_stream, + int version, + apr_pool_t *pool) +{ + SVN_ERR(svn_stream_printf(dump_stream, pool, + SVN_REPOS_DUMPFILE_MAGIC_HEADER ": %d\n\n", + version)); + return SVN_NO_ERROR; +} + +svn_error_t * +svn_repos__dump_uuid_header_record(svn_stream_t *dump_stream, + const char *uuid, + apr_pool_t *pool) +{ + if (uuid) + { + SVN_ERR(svn_stream_printf(dump_stream, pool, SVN_REPOS_DUMPFILE_UUID + ": %s\n\n", uuid)); + } + return SVN_NO_ERROR; +} + svn_error_t * svn_repos__dump_revision_record(svn_stream_t *dump_stream, svn_revnum_t revision, @@ -714,8 +738,9 @@ struct dir_baton or NULL if this is the top-level directory of the edit. Perform all allocations in POOL. */ -static struct dir_baton * -make_dir_baton(const char *path, +static struct svn_error_t * +make_dir_baton(struct dir_baton **dbp, + const char *path, const char *cmp_path, svn_revnum_t cmp_rev, void *edit_baton, @@ -724,10 +749,10 @@ make_dir_baton(const char *path, { struct edit_baton *eb = edit_baton; struct dir_baton *new_db = apr_pcalloc(pool, sizeof(*new_db)); - const char *full_path; + const char *full_path, *canonicalized_path; /* A path relative to nothing? I don't think so. */ - SVN_ERR_ASSERT_NO_RETURN(!path || pb); + SVN_ERR_ASSERT(!path || pb); /* Construct the full path of this node. */ if (pb) @@ -737,7 +762,11 @@ make_dir_baton(const char *path, /* Remove leading slashes from copyfrom paths. */ if (cmp_path) - cmp_path = svn_relpath_canonicalize(cmp_path, pool); + { + SVN_ERR(svn_relpath_canonicalize_safe(&canonicalized_path, NULL, + cmp_path, pool, pool)); + cmp_path = canonicalized_path; + } new_db->edit_baton = eb; new_db->path = full_path; @@ -748,7 +777,8 @@ make_dir_baton(const char *path, new_db->check_name_collision = FALSE; new_db->pool = pool; - return new_db; + *dbp = new_db; + return SVN_NO_ERROR; } static svn_error_t * @@ -1144,7 +1174,12 @@ dump_node(struct edit_baton *eb, /* Remove leading slashes from copyfrom paths. */ if (cmp_path) - cmp_path = svn_relpath_canonicalize(cmp_path, pool); + { + const char *canonicalized_path; + SVN_ERR(svn_relpath_canonicalize_safe(&canonicalized_path, NULL, + cmp_path, pool, pool)); + cmp_path = canonicalized_path; + } /* Validate the comparison path/rev. */ if (ARE_VALID_COPY_ARGS(cmp_path, cmp_rev)) @@ -1514,9 +1549,9 @@ open_root(void *edit_baton, apr_pool_t *pool, void **root_baton) { - *root_baton = make_dir_baton(NULL, NULL, SVN_INVALID_REVNUM, - edit_baton, NULL, pool); - return SVN_NO_ERROR; + return svn_error_trace(make_dir_baton((struct dir_baton **)root_baton, + NULL, NULL, SVN_INVALID_REVNUM, + edit_baton, NULL, pool)); } @@ -1548,8 +1583,10 @@ add_directory(const char *path, struct edit_baton *eb = pb->edit_baton; void *was_deleted; svn_boolean_t is_copy = FALSE; - struct dir_baton *new_db - = make_dir_baton(path, copyfrom_path, copyfrom_rev, eb, pb, pool); + struct dir_baton *new_db; + + SVN_ERR(make_dir_baton(&new_db, path, copyfrom_path, copyfrom_rev, eb, + pb, pool)); /* This might be a replacement -- is the path already deleted? */ was_deleted = svn_hash_gets(pb->deleted_entries, path); @@ -1606,7 +1643,7 @@ open_directory(const char *path, cmp_rev = pb->cmp_rev; } - new_db = make_dir_baton(path, cmp_path, cmp_rev, eb, pb, pool); + SVN_ERR(make_dir_baton(&new_db, path, cmp_path, cmp_rev, eb, pb, pool)); *child_baton = new_db; return SVN_NO_ERROR; } @@ -1937,25 +1974,11 @@ write_revision_record(svn_stream_t *stream, apr_pool_t *pool) { apr_hash_t *props; - apr_time_t timetemp; - svn_string_t *datevalue; if (include_revprops) { SVN_ERR(svn_repos_fs_revision_proplist(&props, repos, rev, authz_func, authz_baton, pool)); - - /* Run revision date properties through the time conversion to - canonicalize them. */ - /* ### Remove this when it is no longer needed for sure. */ - datevalue = svn_hash_gets(props, SVN_PROP_REVISION_DATE); - if (datevalue) - { - SVN_ERR(svn_time_from_cstring(&timetemp, datevalue->data, pool)); - datevalue = svn_string_create(svn_time_to_cstring(timetemp, pool), - pool); - svn_hash_sets(props, SVN_PROP_REVISION_DATE, datevalue); - } } else { @@ -2082,11 +2105,8 @@ svn_repos_dump_fs4(svn_repos_t *repos, /* Write out "general" metadata for the dumpfile. In this case, a magic header followed by a dumpfile format version. */ - SVN_ERR(svn_stream_printf(stream, pool, - SVN_REPOS_DUMPFILE_MAGIC_HEADER ": %d\n\n", - version)); - SVN_ERR(svn_stream_printf(stream, pool, SVN_REPOS_DUMPFILE_UUID - ": %s\n\n", uuid)); + SVN_ERR(svn_repos__dump_magic_header_record(stream, version, pool)); + SVN_ERR(svn_repos__dump_uuid_header_record(stream, uuid, pool)); /* Create a notify object that we can reuse in the loop. */ if (notify_func) diff --git a/subversion/libsvn_repos/dump_editor.c b/subversion/libsvn_repos/dump_editor.c new file mode 100644 index 0000000..fbf0be2 --- /dev/null +++ b/subversion/libsvn_repos/dump_editor.c @@ -0,0 +1,1040 @@ +/* + * dump_editor.c: A svn_delta_editor_t editor used to dump revisions. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ + +#include "svn_repos.h" +#include "svn_hash.h" +#include "svn_pools.h" +#include "svn_path.h" +#include "svn_props.h" +#include "svn_subst.h" +#include "svn_dirent_uri.h" + +#include "private/svn_repos_private.h" + +#include + +#define ARE_VALID_COPY_ARGS(p,r) ((p) && SVN_IS_VALID_REVNUM(r)) + + +/* Normalize the line ending style of the values of properties in PROPS + * that "need translation" (according to svn_prop_needs_translation(), + * currently all svn:* props) so that they contain only LF (\n) line endings. + * + * Put the normalized props into NORMAL_PROPS, allocated in RESULT_POOL. + */ +static svn_error_t * +normalize_props(apr_hash_t **normal_props, + apr_hash_t *props, + apr_pool_t *result_pool) +{ + apr_hash_index_t *hi; + apr_pool_t *iterpool; + + *normal_props = apr_hash_make(result_pool); + + iterpool = svn_pool_create(result_pool); + for (hi = apr_hash_first(result_pool, props); hi; hi = apr_hash_next(hi)) + { + const char *key = apr_hash_this_key(hi); + const svn_string_t *value = apr_hash_this_val(hi); + + svn_pool_clear(iterpool); + + SVN_ERR(svn_repos__normalize_prop(&value, NULL, key, value, + result_pool, iterpool)); + svn_hash_sets(*normal_props, key, value); + } + svn_pool_destroy(iterpool); + + return SVN_NO_ERROR; +} + +/* A directory baton used by all directory-related callback functions + * in the dump editor. */ +struct dir_baton +{ + struct dump_edit_baton *eb; + + /* Pool for per-directory allocations */ + apr_pool_t *pool; + + /* the path to this directory */ + const char *repos_relpath; /* a relpath */ + + /* Copyfrom info for the node, if any. */ + const char *copyfrom_path; /* a relpath */ + svn_revnum_t copyfrom_rev; + + /* Headers accumulated so far for this directory */ + svn_repos__dumpfile_headers_t *headers; + + /* Properties which were modified during change_dir_prop. */ + apr_hash_t *props; + + /* Properties which were deleted during change_dir_prop. */ + apr_hash_t *deleted_props; + + /* Hash of paths that need to be deleted, though some -might- be + replaced. Maps const char * paths to this dir_baton. Note that + they're full paths, because that's what the editor driver gives + us, although they're all really within this directory. */ + apr_hash_t *deleted_entries; + + /* Flag to trigger dumping props. */ + svn_boolean_t dump_props; +}; + +/* A file baton used by all file-related callback functions in the dump + * editor */ +struct file_baton +{ + struct dump_edit_baton *eb; + + /* Pool for per-file allocations */ + apr_pool_t *pool; + + /* the path to this file */ + const char *repos_relpath; /* a relpath */ + + /* Properties which were modified during change_file_prop. */ + apr_hash_t *props; + + /* Properties which were deleted during change_file_prop. */ + apr_hash_t *deleted_props; + + /* The checksum of the file the delta is being applied to */ + const char *base_checksum; + + /* Copy state and source information (if any). */ + svn_boolean_t is_copy; + const char *copyfrom_path; + svn_revnum_t copyfrom_rev; + + /* The action associate with this node. */ + enum svn_node_action action; + + /* Flags to trigger dumping props and text. */ + svn_boolean_t dump_text; + svn_boolean_t dump_props; +}; + +/* The baton used by the dump editor. */ +struct dump_edit_baton { + /* The output stream we write the dumpfile to */ + svn_stream_t *stream; + + /* The repository relpath of the anchor of the editor when driven + via the RA update mechanism; NULL otherwise. (When the editor is + driven via the RA "replay" mechanism instead, the editor is + always anchored at the repository, we don't need to prepend an + anchor path to the dumped node paths, and open_root() doesn't + need to manufacture directory additions.) */ + const char *update_anchor_relpath; + + /* Pool for per-revision allocations */ + apr_pool_t *pool; + + /* Temporary file used for textdelta application along with its + absolute path; these two variables should be allocated in the + per-edit-session pool */ + const char *delta_abspath; + apr_file_t *delta_file; + + /* The baton of the directory node whose block of + dump stream data has not been fully completed; NULL if there's no + such item. */ + struct dir_baton *pending_db; +}; + +/* Make a directory baton to represent the directory at PATH (relative + * to the EDIT_BATON). + * + * COPYFROM_PATH/COPYFROM_REV are the path/revision against which this + * directory should be compared for changes. If the copyfrom + * information is valid, the directory will be compared against its + * copy source. + * + * PB is the directory baton of this directory's parent, or NULL if + * this is the top-level directory of the edit. + * + * Perform all allocations in POOL. */ +static struct svn_error_t * +make_dir_baton(struct dir_baton **dbp, + const char *path, + const char *copyfrom_path, + svn_revnum_t copyfrom_rev, + void *edit_baton, + struct dir_baton *pb, + apr_pool_t *pool) +{ + struct dump_edit_baton *eb = edit_baton; + struct dir_baton *new_db = apr_pcalloc(pool, sizeof(*new_db)); + const char *repos_relpath; + + /* Construct the full path of this node. */ + if (pb) + SVN_ERR(svn_relpath_canonicalize_safe(&repos_relpath, NULL, path, + pool, pool)); + else + repos_relpath = ""; + + /* Strip leading slash from copyfrom_path so that the path is + canonical and svn_relpath_join can be used */ + if (copyfrom_path) + copyfrom_path = svn_relpath_canonicalize(copyfrom_path, pool); + + new_db->eb = eb; + new_db->pool = pool; + new_db->repos_relpath = repos_relpath; + new_db->copyfrom_path = copyfrom_path + ? svn_relpath_canonicalize(copyfrom_path, pool) + : NULL; + new_db->copyfrom_rev = copyfrom_rev; + new_db->headers = NULL; + new_db->props = apr_hash_make(pool); + new_db->deleted_props = apr_hash_make(pool); + new_db->deleted_entries = apr_hash_make(pool); + + *dbp = new_db; + return SVN_NO_ERROR; +} + +/* Make a file baton to represent the directory at PATH (relative to + * PB->eb). PB is the directory baton of this directory's parent, or + * NULL if this is the top-level directory of the edit. Perform all + * allocations in POOL. */ +static struct file_baton * +make_file_baton(const char *path, + struct dir_baton *pb, + apr_pool_t *pool) +{ + struct file_baton *new_fb = apr_pcalloc(pool, sizeof(*new_fb)); + + new_fb->eb = pb->eb; + new_fb->pool = pool; + new_fb->repos_relpath = svn_relpath_canonicalize(path, pool); + new_fb->props = apr_hash_make(pool); + new_fb->deleted_props = apr_hash_make(pool); + new_fb->is_copy = FALSE; + new_fb->copyfrom_path = NULL; + new_fb->copyfrom_rev = SVN_INVALID_REVNUM; + new_fb->action = svn_node_action_change; + + return new_fb; +} + +/* Append to HEADERS the required headers, and set *CONTENT to the property + * content section, to represent the property delta of PROPS/DELETED_PROPS. + */ +static svn_error_t * +get_props_content(svn_repos__dumpfile_headers_t *headers, + svn_stringbuf_t **content, + apr_hash_t *props, + apr_hash_t *deleted_props, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + svn_stream_t *content_stream; + apr_hash_t *normal_props; + + *content = svn_stringbuf_create_empty(result_pool); + + content_stream = svn_stream_from_stringbuf(*content, scratch_pool); + + SVN_ERR(normalize_props(&normal_props, props, scratch_pool)); + SVN_ERR(svn_hash_write_incremental(normal_props, deleted_props, + content_stream, "PROPS-END", + scratch_pool)); + SVN_ERR(svn_stream_close(content_stream)); + + /* Prop-delta: true */ + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_PROP_DELTA, "true"); + + return SVN_NO_ERROR; +} + +/* A special case of dump_node(), for a delete record. + * + * The only thing special about this version is it only writes one blank + * line, not two, after the headers. Why? Historical precedent for the + * case where a delete record is used as part of a (delete + add-with-history) + * in implementing a replacement. + */ +static svn_error_t * +dump_node_delete(svn_stream_t *stream, + const char *node_relpath, + apr_pool_t *pool) +{ + svn_repos__dumpfile_headers_t *headers + = svn_repos__dumpfile_headers_create(pool); + + assert(svn_relpath_is_canonical(node_relpath)); + + /* Node-path: ... */ + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_NODE_PATH, node_relpath); + + /* Node-action: delete */ + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_NODE_ACTION, "delete"); + + SVN_ERR(svn_repos__dump_node_record(stream, headers, + NULL, FALSE, 0, /* props & text */ + FALSE /*content_length_always*/, pool)); + return SVN_NO_ERROR; +} + +/* Set *HEADERS_P to contain some headers for the node at PATH of type KIND. + * + * ACTION describes what is happening to the node (see enum + * svn_node_action). + * + * If the node was itself copied, IS_COPY is TRUE and the + * path/revision of the copy source are in COPYFROM_PATH/COPYFROM_REV. + * If IS_COPY is FALSE, yet COPYFROM_PATH/COPYFROM_REV are valid, this + * node is part of a copied subtree. + * + * Iff ACTION is svn_node_action_replace and IS_COPY, then first write a + * complete deletion record to the dump stream. + * + * If ACTION is svn_node_action_delete, then the node record will be + * complete. (The caller may want to write two blank lines after the + * header block.) + */ +static svn_error_t * +dump_node(svn_repos__dumpfile_headers_t **headers_p, + struct dump_edit_baton *eb, + const char *repos_relpath, + struct dir_baton *db, + struct file_baton *fb, + enum svn_node_action action, + svn_boolean_t is_copy, + const char *copyfrom_path, + svn_revnum_t copyfrom_rev, + apr_pool_t *pool) +{ + const char *node_relpath = repos_relpath; + svn_repos__dumpfile_headers_t *headers + = svn_repos__dumpfile_headers_create(pool); + + assert(svn_relpath_is_canonical(repos_relpath)); + assert(!copyfrom_path || svn_relpath_is_canonical(copyfrom_path)); + assert(! (db && fb)); + + /* Add the edit root relpath prefix if necessary. */ + if (eb->update_anchor_relpath) + node_relpath = svn_relpath_join(eb->update_anchor_relpath, + node_relpath, pool); + + /* Node-path: ... */ + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_NODE_PATH, node_relpath); + + /* Node-kind: "file" | "dir" */ + if (fb) + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_NODE_KIND, "file"); + else if (db) + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_NODE_KIND, "dir"); + + + /* Write the appropriate Node-action header */ + switch (action) + { + case svn_node_action_change: + /* We are here after a change_file_prop or change_dir_prop. They + set up whatever dump_props they needed to- nothing to + do here but print node action information. + + Node-action: change. */ + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_NODE_ACTION, "change"); + break; + + case svn_node_action_delete: + /* Node-action: delete */ + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_NODE_ACTION, "delete"); + break; + + case svn_node_action_replace: + if (! is_copy) + { + /* Node-action: replace */ + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_NODE_ACTION, "replace"); + + /* Wait for a change_*_prop to be called before dumping + anything */ + if (fb) + fb->dump_props = TRUE; + else if (db) + db->dump_props = TRUE; + break; + } + else + { + /* More complex case: is_copy is true, and copyfrom_path/ + copyfrom_rev are present: delete the original, and then re-add + it */ + /* ### Why not write a 'replace' record? Don't know. */ + + /* ### Unusually, we end this 'delete' node record with only a single + blank line after the header block -- no extra blank line. */ + SVN_ERR(dump_node_delete(eb->stream, repos_relpath, pool)); + + /* The remaining action is a non-replacing add-with-history */ + /* action = svn_node_action_add; */ + } + /* FALL THROUGH to 'add' */ + + case svn_node_action_add: + /* Node-action: add */ + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_NODE_ACTION, "add"); + + if (is_copy) + { + /* Node-copyfrom-rev / Node-copyfrom-path */ + svn_repos__dumpfile_header_pushf( + headers, SVN_REPOS_DUMPFILE_NODE_COPYFROM_REV, "%ld", copyfrom_rev); + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_NODE_COPYFROM_PATH, copyfrom_path); + } + else + { + /* fb->dump_props (for files) is handled in close_file() + which is called immediately. + + However, directories are not closed until all the work + inside them has been done; db->dump_props (for directories) + is handled (via dump_pending()) in all the functions that + can possibly be called after add_directory(): + + - add_directory() + - open_directory() + - delete_entry() + - close_directory() + - add_file() + - open_file() + + change_dir_prop() is a special case. */ + if (fb) + fb->dump_props = TRUE; + else if (db) + db->dump_props = TRUE; + } + + break; + } + + /* Return the headers so far. We don't necessarily have all the headers + yet -- there may be property-related and content length headers to + come, if this was not a 'delete' record. */ + *headers_p = headers; + return SVN_NO_ERROR; +} + +static svn_error_t * +dump_mkdir(struct dump_edit_baton *eb, + const char *repos_relpath, + apr_pool_t *pool) +{ + svn_stringbuf_t *prop_content; + svn_repos__dumpfile_headers_t *headers + = svn_repos__dumpfile_headers_create(pool); + + /* Node-path: ... */ + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_NODE_PATH, repos_relpath); + + /* Node-kind: dir */ + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_NODE_KIND, "dir"); + + /* Node-action: add */ + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_NODE_ACTION, "add"); + + /* Dump the (empty) property block. */ + SVN_ERR(get_props_content(headers, &prop_content, + apr_hash_make(pool), apr_hash_make(pool), + pool, pool)); + SVN_ERR(svn_repos__dump_node_record(eb->stream, headers, prop_content, + FALSE, 0, FALSE /*content_length_always*/, + pool)); + + /* Newlines to tie it all off. */ + SVN_ERR(svn_stream_puts(eb->stream, "\n\n")); + + return SVN_NO_ERROR; +} + +/* Dump pending headers and properties for the directory EB->pending_db (if + * not null), to allow starting the dump of a child node */ +static svn_error_t * +dump_pending_dir(struct dump_edit_baton *eb, + apr_pool_t *scratch_pool) +{ + struct dir_baton *db = eb->pending_db; + svn_stringbuf_t *prop_content = NULL; + + if (! db) + return SVN_NO_ERROR; + + /* Some pending properties to dump? */ + if (db->dump_props) + { + SVN_ERR(get_props_content(db->headers, &prop_content, + db->props, db->deleted_props, + scratch_pool, scratch_pool)); + } + SVN_ERR(svn_repos__dump_node_record(eb->stream, db->headers, prop_content, + FALSE, 0, FALSE /*content_length_always*/, + scratch_pool)); + + /* No text is going to be dumped. Write a couple of newlines and + wait for the next node/ revision. */ + SVN_ERR(svn_stream_puts(eb->stream, "\n\n")); + + if (db->dump_props) + { + /* Cleanup so that data is never dumped twice. */ + apr_hash_clear(db->props); + apr_hash_clear(db->deleted_props); + db->dump_props = FALSE; + } + + /* Anything that was pending is pending no longer. */ + eb->pending_db = NULL; + + return SVN_NO_ERROR; +} + + + +/*** Editor Function Implementations ***/ + +static svn_error_t * +open_root(void *edit_baton, + svn_revnum_t base_revision, + apr_pool_t *pool, + void **root_baton) +{ + struct dump_edit_baton *eb = edit_baton; + struct dir_baton *new_db = NULL; + + /* Clear the per-revision pool after each revision */ + svn_pool_clear(eb->pool); + + if (eb->update_anchor_relpath) + { + int i; + const char *parent_path = eb->update_anchor_relpath; + apr_array_header_t *dirs_to_add = + apr_array_make(pool, 4, sizeof(const char *)); + apr_pool_t *iterpool = svn_pool_create(pool); + + while (! svn_path_is_empty(parent_path)) + { + APR_ARRAY_PUSH(dirs_to_add, const char *) = parent_path; + parent_path = svn_relpath_dirname(parent_path, pool); + } + + for (i = dirs_to_add->nelts; i; --i) + { + const char *dir_to_add = + APR_ARRAY_IDX(dirs_to_add, i - 1, const char *); + + svn_pool_clear(iterpool); + + /* For parents of the source directory, we just manufacture + the adds ourselves. */ + if (i > 1) + { + SVN_ERR(dump_mkdir(eb, dir_to_add, iterpool)); + } + else + { + /* ... but for the source directory itself, we'll defer + to letting the typical plumbing handle this task. */ + SVN_ERR(make_dir_baton(&new_db, NULL, NULL, SVN_INVALID_REVNUM, + edit_baton, NULL, pool)); + SVN_ERR(dump_node(&new_db->headers, + eb, new_db->repos_relpath, new_db, + NULL, svn_node_action_add, FALSE, + NULL, SVN_INVALID_REVNUM, pool)); + + /* Remember that we've started but not yet finished + handling this directory. */ + eb->pending_db = new_db; + } + } + svn_pool_destroy(iterpool); + } + + if (! new_db) + { + SVN_ERR(make_dir_baton(&new_db, NULL, NULL, SVN_INVALID_REVNUM, + edit_baton, NULL, pool)); + } + + *root_baton = new_db; + return SVN_NO_ERROR; +} + +static svn_error_t * +delete_entry(const char *path, + svn_revnum_t revision, + void *parent_baton, + apr_pool_t *pool) +{ + struct dir_baton *pb = parent_baton; + + SVN_ERR(dump_pending_dir(pb->eb, pool)); + + /* We don't dump this deletion immediate. Rather, we add this path + to the deleted_entries of the parent directory baton. That way, + we can tell (later) an addition from a replacement. All the real + deletions get handled in close_directory(). */ + svn_hash_sets(pb->deleted_entries, apr_pstrdup(pb->pool, path), pb); + + return SVN_NO_ERROR; +} + +static svn_error_t * +add_directory(const char *path, + void *parent_baton, + const char *copyfrom_path, + svn_revnum_t copyfrom_rev, + apr_pool_t *pool, + void **child_baton) +{ + struct dir_baton *pb = parent_baton; + void *was_deleted; + struct dir_baton *new_db; + svn_boolean_t is_copy; + + SVN_ERR(dump_pending_dir(pb->eb, pool)); + + SVN_ERR(make_dir_baton(&new_db, path, copyfrom_path, copyfrom_rev, pb->eb, + pb, pb->pool)); + + /* This might be a replacement -- is the path already deleted? */ + was_deleted = svn_hash_gets(pb->deleted_entries, path); + + /* Detect an add-with-history */ + is_copy = ARE_VALID_COPY_ARGS(copyfrom_path, copyfrom_rev); + + /* Dump the node */ + SVN_ERR(dump_node(&new_db->headers, + pb->eb, new_db->repos_relpath, new_db, NULL, + was_deleted ? svn_node_action_replace : svn_node_action_add, + is_copy, + is_copy ? new_db->copyfrom_path : NULL, + is_copy ? copyfrom_rev : SVN_INVALID_REVNUM, + pool)); + + if (was_deleted) + /* Delete the path, it's now been dumped */ + svn_hash_sets(pb->deleted_entries, path, NULL); + + /* Remember that we've started, but not yet finished handling this + directory. */ + pb->eb->pending_db = new_db; + + *child_baton = new_db; + return SVN_NO_ERROR; +} + +static svn_error_t * +open_directory(const char *path, + void *parent_baton, + svn_revnum_t base_revision, + apr_pool_t *pool, + void **child_baton) +{ + struct dir_baton *pb = parent_baton; + struct dir_baton *new_db; + const char *copyfrom_path = NULL; + svn_revnum_t copyfrom_rev = SVN_INVALID_REVNUM; + + SVN_ERR(dump_pending_dir(pb->eb, pool)); + + /* If the parent directory has explicit comparison path and rev, + record the same for this one. */ + if (ARE_VALID_COPY_ARGS(pb->copyfrom_path, pb->copyfrom_rev)) + { + copyfrom_path = svn_relpath_join(pb->copyfrom_path, + svn_relpath_basename(path, NULL), + pb->pool); + copyfrom_rev = pb->copyfrom_rev; + } + + SVN_ERR(make_dir_baton(&new_db, path, copyfrom_path, copyfrom_rev, + pb->eb, pb, pb->pool)); + + *child_baton = new_db; + return SVN_NO_ERROR; +} + +static svn_error_t * +close_directory(void *dir_baton, + apr_pool_t *pool) +{ + struct dir_baton *db = dir_baton; + apr_hash_index_t *hi; + svn_boolean_t this_pending; + + /* Remember if this directory is the one currently pending. */ + this_pending = (db->eb->pending_db == db); + + SVN_ERR(dump_pending_dir(db->eb, pool)); + + /* If this directory was pending, then dump_pending() should have + taken care of all the props and such. Of course, the only way + that would be the case is if this directory was added/replaced. + + Otherwise, if stuff for this directory has already been written + out (at some point in the past, prior to our handling other + nodes), we might need to generate a second "change" record just + to carry the information we've since learned about the + directory. */ + if ((! this_pending) && (db->dump_props)) + { + SVN_ERR(dump_node(&db->headers, + db->eb, db->repos_relpath, db, NULL, + svn_node_action_change, FALSE, + NULL, SVN_INVALID_REVNUM, pool)); + db->eb->pending_db = db; + SVN_ERR(dump_pending_dir(db->eb, pool)); + } + + /* Dump the deleted directory entries */ + for (hi = apr_hash_first(pool, db->deleted_entries); hi; + hi = apr_hash_next(hi)) + { + const char *path = apr_hash_this_key(hi); + + SVN_ERR(dump_node_delete(db->eb->stream, path, pool)); + /* This deletion record is complete -- write an extra newline */ + SVN_ERR(svn_stream_puts(db->eb->stream, "\n")); + } + + /* ### should be unnecessary */ + apr_hash_clear(db->deleted_entries); + + return SVN_NO_ERROR; +} + +static svn_error_t * +add_file(const char *path, + void *parent_baton, + const char *copyfrom_path, + svn_revnum_t copyfrom_rev, + apr_pool_t *pool, + void **file_baton) +{ + struct dir_baton *pb = parent_baton; + struct file_baton *fb; + void *was_deleted; + + SVN_ERR(dump_pending_dir(pb->eb, pool)); + + /* Make the file baton. */ + fb = make_file_baton(path, pb, pool); + + /* This might be a replacement -- is the path already deleted? */ + was_deleted = svn_hash_gets(pb->deleted_entries, path); + + /* Detect add-with-history. */ + if (ARE_VALID_COPY_ARGS(copyfrom_path, copyfrom_rev)) + { + fb->copyfrom_path = svn_relpath_canonicalize(copyfrom_path, fb->pool); + fb->copyfrom_rev = copyfrom_rev; + fb->is_copy = TRUE; + } + fb->action = was_deleted ? svn_node_action_replace : svn_node_action_add; + + /* Delete the path, it's now been dumped. */ + if (was_deleted) + svn_hash_sets(pb->deleted_entries, path, NULL); + + *file_baton = fb; + return SVN_NO_ERROR; +} + +static svn_error_t * +open_file(const char *path, + void *parent_baton, + svn_revnum_t ancestor_revision, + apr_pool_t *pool, + void **file_baton) +{ + struct dir_baton *pb = parent_baton; + struct file_baton *fb; + + SVN_ERR(dump_pending_dir(pb->eb, pool)); + + /* Make the file baton. */ + fb = make_file_baton(path, pb, pool); + + /* If the parent directory has explicit copyfrom path and rev, + record the same for this one. */ + if (ARE_VALID_COPY_ARGS(pb->copyfrom_path, pb->copyfrom_rev)) + { + fb->copyfrom_path = svn_relpath_join(pb->copyfrom_path, + svn_relpath_basename(path, NULL), + pb->pool); + fb->copyfrom_rev = pb->copyfrom_rev; + } + + *file_baton = fb; + return SVN_NO_ERROR; +} + +static svn_error_t * +change_dir_prop(void *parent_baton, + const char *name, + const svn_string_t *value, + apr_pool_t *pool) +{ + struct dir_baton *db = parent_baton; + svn_boolean_t this_pending; + + /* This directory is not pending, but something else is, so handle + the "something else". */ + this_pending = (db->eb->pending_db == db); + if (! this_pending) + SVN_ERR(dump_pending_dir(db->eb, pool)); + + if (svn_property_kind2(name) != svn_prop_regular_kind) + return SVN_NO_ERROR; + + if (value) + svn_hash_sets(db->props, + apr_pstrdup(db->pool, name), + svn_string_dup(value, db->pool)); + else + svn_hash_sets(db->deleted_props, apr_pstrdup(db->pool, name), ""); + + /* Make sure we eventually output the props */ + db->dump_props = TRUE; + + return SVN_NO_ERROR; +} + +static svn_error_t * +change_file_prop(void *file_baton, + const char *name, + const svn_string_t *value, + apr_pool_t *pool) +{ + struct file_baton *fb = file_baton; + + if (svn_property_kind2(name) != svn_prop_regular_kind) + return SVN_NO_ERROR; + + if (value) + svn_hash_sets(fb->props, + apr_pstrdup(fb->pool, name), + svn_string_dup(value, fb->pool)); + else + svn_hash_sets(fb->deleted_props, apr_pstrdup(fb->pool, name), ""); + + /* Dump the property headers and wait; close_file might need + to write text headers too depending on whether + apply_textdelta is called */ + fb->dump_props = TRUE; + + return SVN_NO_ERROR; +} + +static svn_error_t * +apply_textdelta(void *file_baton, const char *base_checksum, + apr_pool_t *pool, + svn_txdelta_window_handler_t *handler, + void **handler_baton) +{ + struct file_baton *fb = file_baton; + struct dump_edit_baton *eb = fb->eb; + svn_stream_t *delta_filestream; + + /* Use a temporary file to measure the Text-content-length */ + delta_filestream = svn_stream_from_aprfile2(eb->delta_file, TRUE, pool); + + /* Prepare to write the delta to the delta_filestream */ + svn_txdelta_to_svndiff3(handler, handler_baton, + delta_filestream, 0, + SVN_DELTA_COMPRESSION_LEVEL_DEFAULT, pool); + + /* Record that there's text to be dumped, and its base checksum. */ + fb->dump_text = TRUE; + fb->base_checksum = apr_pstrdup(fb->pool, base_checksum); + + return SVN_NO_ERROR; +} + +static svn_error_t * +close_file(void *file_baton, + const char *text_checksum, + apr_pool_t *pool) +{ + struct file_baton *fb = file_baton; + struct dump_edit_baton *eb = fb->eb; + svn_filesize_t text_content_length = 0; + svn_stringbuf_t *propstring = NULL; + svn_repos__dumpfile_headers_t *headers; + + SVN_ERR(dump_pending_dir(eb, pool)); + + /* Start dumping this node, by collecting some basic headers for it. */ + SVN_ERR(dump_node(&headers, eb, fb->repos_relpath, NULL, fb, + fb->action, fb->is_copy, fb->copyfrom_path, + fb->copyfrom_rev, pool)); + + /* Some pending properties to dump? We'll dump just the headers for + now, then dump the actual propchange content only after dumping + the text headers too (if present). */ + if (fb->dump_props) + { + SVN_ERR(get_props_content(headers, &propstring, + fb->props, fb->deleted_props, + pool, pool)); + } + + /* Dump the text headers */ + if (fb->dump_text) + { + /* Text-delta: true */ + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_TEXT_DELTA, "true"); + + SVN_ERR(svn_io_file_size_get(&text_content_length, eb->delta_file, + pool)); + + if (fb->base_checksum) + /* Text-delta-base-md5: */ + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_MD5, fb->base_checksum); + + /* Text-content-md5: 82705804337e04dcd0e586bfa2389a7f */ + svn_repos__dumpfile_header_push( + headers, SVN_REPOS_DUMPFILE_TEXT_CONTENT_MD5, text_checksum); + } + + /* Dump the headers and props now */ + SVN_ERR(svn_repos__dump_node_record(eb->stream, headers, propstring, + fb->dump_text, text_content_length, + FALSE /*content_length_always*/, + pool)); + + if (fb->dump_props) + { + /* Cleanup */ + fb->dump_props = FALSE; + apr_hash_clear(fb->props); + apr_hash_clear(fb->deleted_props); + } + + /* Dump the text */ + if (fb->dump_text) + { + /* Seek to the beginning of the delta file, map it to a stream, + and copy the stream to eb->stream. Then close the stream and + truncate the file so we can reuse it for the next textdelta + application. Note that the file isn't created, opened or + closed here */ + svn_stream_t *delta_filestream; + apr_off_t offset = 0; + + SVN_ERR(svn_io_file_seek(eb->delta_file, APR_SET, &offset, pool)); + delta_filestream = svn_stream_from_aprfile2(eb->delta_file, TRUE, pool); + SVN_ERR(svn_stream_copy3(delta_filestream, + svn_stream_disown(eb->stream, pool), + NULL, NULL, pool)); + + /* Cleanup */ + SVN_ERR(svn_stream_close(delta_filestream)); + SVN_ERR(svn_io_file_trunc(eb->delta_file, 0, pool)); + } + + /* Write a couple of blank lines for matching output with `svnadmin + dump` */ + SVN_ERR(svn_stream_puts(eb->stream, "\n\n")); + + return SVN_NO_ERROR; +} + +static svn_error_t * +close_edit(void *edit_baton, apr_pool_t *pool) +{ + return SVN_NO_ERROR; +} + +svn_error_t * +svn_repos__get_dump_editor(const svn_delta_editor_t **editor, + void **edit_baton, + svn_stream_t *stream, + const char *update_anchor_relpath, + apr_pool_t *pool) +{ + struct dump_edit_baton *eb; + svn_delta_editor_t *de; + + eb = apr_pcalloc(pool, sizeof(struct dump_edit_baton)); + eb->stream = stream; + eb->update_anchor_relpath = update_anchor_relpath; + eb->pending_db = NULL; + + /* Create a special per-revision pool */ + eb->pool = svn_pool_create(pool); + + /* Open a unique temporary file for all textdelta applications in + this edit session. The file is automatically closed and cleaned + up when the edit session is done. */ + SVN_ERR(svn_io_open_unique_file3(&(eb->delta_file), &(eb->delta_abspath), + NULL, svn_io_file_del_on_close, pool, pool)); + + de = svn_delta_default_editor(pool); + de->open_root = open_root; + de->delete_entry = delete_entry; + de->add_directory = add_directory; + de->open_directory = open_directory; + de->close_directory = close_directory; + de->change_dir_prop = change_dir_prop; + de->change_file_prop = change_file_prop; + de->apply_textdelta = apply_textdelta; + de->add_file = add_file; + de->open_file = open_file; + de->close_file = close_file; + de->close_edit = close_edit; + + /* Set the edit_baton and editor. */ + *edit_baton = eb; + *editor = de; + + return SVN_NO_ERROR; +} diff --git a/subversion/libsvn_repos/libsvn_repos.pc.in b/subversion/libsvn_repos/libsvn_repos.pc.in index af70b94..b4fcf05 100644 --- a/subversion/libsvn_repos/libsvn_repos.pc.in +++ b/subversion/libsvn_repos/libsvn_repos.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_repos Description: Subversion Repository Library Version: @PACKAGE_VERSION@ -Requires: apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_fs libsvn_delta libsvn_subr -Libs: -L${libdir} -lsvn_repos -Cflags: -I${includedir} +Requires: apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_fs, libsvn_delta, libsvn_subr +Libs: -L${libdir} -lsvn_repos-1 +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_repos/list.c b/subversion/libsvn_repos/list.c index ef8ac32..f620b3f 100644 --- a/subversion/libsvn_repos/list.c +++ b/subversion/libsvn_repos/list.c @@ -324,7 +324,7 @@ svn_repos_list(svn_fs_root_t *root, svn_membuf__create(&scratch_buffer, 256, scratch_pool); /* Actually report PATH, if it passes the filters. */ - if (matches_any(svn_dirent_dirname(path, scratch_pool), patterns, + if (matches_any(svn_dirent_basename(path, scratch_pool), patterns, &scratch_buffer)) SVN_ERR(report_dirent(root, path, kind, path_info_only, receiver, receiver_baton, scratch_pool)); diff --git a/subversion/libsvn_repos/load-fs-vtable.c b/subversion/libsvn_repos/load-fs-vtable.c index f6c6bf6..6746065 100644 --- a/subversion/libsvn_repos/load-fs-vtable.c +++ b/subversion/libsvn_repos/load-fs-vtable.c @@ -75,7 +75,7 @@ struct parse_baton (svn_revnum_t *) in the dump stream to their corresponding revisions (svn_revnum_t *) in the loaded repository. The hash and its contents are allocated in POOL. */ - /* ### See http://subversion.tigris.org/issues/show_bug.cgi?id=3903 + /* ### See https://issues.apache.org/jira/browse/SVN-3903 ### for discussion about improving the memory costs of this mapping. */ apr_hash_t *rev_map; @@ -213,9 +213,11 @@ prefix_mergeinfo_paths(svn_string_t **mergeinfo_val, { const char *merge_source = apr_hash_this_key(hi); svn_rangelist_t *rangelist = apr_hash_this_val(hi); - const char *path; + const char *path, *canonicalized_path; - merge_source = svn_relpath_canonicalize(merge_source, pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonicalized_path, NULL, + merge_source, pool, pool)); + merge_source = canonicalized_path; /* The svn:mergeinfo property syntax demands a repos abspath */ path = svn_fspath__canonicalize(svn_relpath_join(parent_dir, @@ -253,7 +255,7 @@ renumber_mergeinfo_revs(svn_string_t **final_val, SVN_ERR(svn_mergeinfo_parse(&mergeinfo, initial_val->data, subpool)); /* Issue #3020 - http://subversion.tigris.org/issues/show_bug.cgi?id=3020#desc16 + https://issues.apache.org/jira/browse/SVN-3020#desc16 Remove mergeinfo older than the oldest revision in the dump stream and adjust its revisions by the difference between the head rev of the target repository and the current dump stream rev. */ @@ -323,7 +325,7 @@ renumber_mergeinfo_revs(svn_string_t **final_val, mergeinfo with a start rev > end rev. If that gets into the repository then a world of bustage breaks loose anytime that bogus mergeinfo is parsed. See - http://subversion.tigris.org/issues/show_bug.cgi?id=3020#desc16. + https://issues.apache.org/jira/browse/SVN-3020#desc16. */ continue; } @@ -377,7 +379,10 @@ make_node_baton(struct node_baton **node_baton_p, /* Then add info from the headers. */ if ((val = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_NODE_PATH))) { - val = svn_relpath_canonicalize(val, pool); + const char *canonicalized_path; + SVN_ERR(svn_relpath_canonicalize_safe(&canonicalized_path, NULL, + val, pool, pool)); + val = canonicalized_path; if (rb->pb->parent_dir) nb->path = svn_relpath_join(rb->pb->parent_dir, val, pool); else @@ -1202,7 +1207,12 @@ svn_repos_get_fs_build_parser6(const svn_repos_parse_fns3_t **callbacks, struct parse_baton *pb = apr_pcalloc(pool, sizeof(*pb)); if (parent_dir) - parent_dir = svn_relpath_canonicalize(parent_dir, pool); + { + const char *canonicalized_path; + SVN_ERR(svn_relpath_canonicalize_safe(&canonicalized_path, NULL, + parent_dir, pool, pool)); + parent_dir = canonicalized_path; + } SVN_ERR_ASSERT((SVN_IS_VALID_REVNUM(start_rev) && SVN_IS_VALID_REVNUM(end_rev)) diff --git a/subversion/libsvn_repos/load.c b/subversion/libsvn_repos/load.c index 27cf4a1..ec2699f 100644 --- a/subversion/libsvn_repos/load.c +++ b/subversion/libsvn_repos/load.c @@ -355,24 +355,62 @@ parse_text_block(svn_stream_t *stream, -/* Parse VERSIONSTRING and verify that we support the dumpfile format - version number, setting *VERSION appropriately. */ +/* Parse VERSIONSTRING from STREAM and verify that we support the dumpfile + format version number, setting *VERSION appropriately. */ static svn_error_t * parse_format_version(int *version, - const char *versionstring) + svn_stream_t *stream, + apr_pool_t *scratch_pool) { static const int magic_len = sizeof(SVN_REPOS_DUMPFILE_MAGIC_HEADER) - 1; - const char *p = strchr(versionstring, ':'); + svn_stringbuf_t *linebuf; + const char *p; int value; + /* No svn_stream_readline() here, because malformed streams may not have + the EOL at all, and currently svn_stream_readline() keeps loading the + whole thing into memory until it encounters an EOL or the stream ends. + This is particularly troublesome, because users may incorrectly attempt + to load arbitrary large files instread of proper dump files. + + As a workaround, parse the first line with a length limit. While this + is not a complete solution, doing so handles the common case described + above. For a complete solution, svn_stream_readline() may need to grow + a `limit` argument that would allow us to safely use it everywhere within + this parser. + */ + linebuf = svn_stringbuf_create_empty(scratch_pool); + while (1) + { + apr_size_t len; + char c; + + len = 1; + SVN_ERR(svn_stream_read_full(stream, &c, &len)); + if (len != 1) + return stream_ran_dry(); + + if (c == '\n') + break; + + if (linebuf->len + 1 > 80) + return svn_error_createf(SVN_ERR_STREAM_MALFORMED_DATA, NULL, + _("Malformed dumpfile header '%s'"), + linebuf->data); + + svn_stringbuf_appendbyte(linebuf, c); + } + + p = strchr(linebuf->data, ':'); + if (p == NULL - || p != (versionstring + magic_len) - || strncmp(versionstring, + || p != (linebuf->data + magic_len) + || strncmp(linebuf->data, SVN_REPOS_DUMPFILE_MAGIC_HEADER, magic_len)) return svn_error_createf(SVN_ERR_STREAM_MALFORMED_DATA, NULL, _("Malformed dumpfile header '%s'"), - versionstring); + linebuf->data); SVN_ERR(svn_cstring_atoi(&value, p + 1)); @@ -542,14 +580,10 @@ svn_repos_parse_dumpstream3(svn_stream_t *stream, parse_fns = complete_vtable(parse_fns, pool); /* Start parsing process. */ - SVN_ERR(svn_stream_readline(stream, &linebuf, "\n", &eof, linepool)); - if (eof) - return stream_ran_dry(); - /* The first two lines of the stream are the dumpfile-format version number, and a blank line. To preserve backward compatibility, don't assume the existence of newer parser-vtable functions. */ - SVN_ERR(parse_format_version(&version, linebuf->data)); + SVN_ERR(parse_format_version(&version, stream, linepool)); if (parse_fns->magic_header_record != NULL) SVN_ERR(parse_fns->magic_header_record(version, parse_baton, pool)); diff --git a/subversion/libsvn_repos/log.c b/subversion/libsvn_repos/log.c index 7dec5dd..5db5028 100644 --- a/subversion/libsvn_repos/log.c +++ b/subversion/libsvn_repos/log.c @@ -2447,7 +2447,7 @@ svn_repos_get_logs5(svn_repos_t *repos, represents all of PATHS' history between START and END. We will use this later to squelch duplicate log revisions that might exist in both natural history and merged-in history. See - http://subversion.tigris.org/issues/show_bug.cgi?id=3650#desc5 */ + https://issues.apache.org/jira/browse/SVN-3650#desc5 */ if (include_merged_revisions) { apr_pool_t *subpool = svn_pool_create(scratch_pool); diff --git a/subversion/libsvn_repos/replay.c b/subversion/libsvn_repos/replay.c index 9bcc667..d8fb70d 100644 --- a/subversion/libsvn_repos/replay.c +++ b/subversion/libsvn_repos/replay.c @@ -126,9 +126,6 @@ struct copy_info struct path_driver_cb_baton { - const svn_delta_editor_t *editor; - void *edit_baton; - /* The root of the revision we're replaying. */ svn_fs_root_t *root; @@ -454,14 +451,14 @@ fill_copyfrom(svn_fs_root_t **copyfrom_root, static svn_error_t * path_driver_cb_func(void **dir_baton, + const svn_delta_editor_t *editor, + void *edit_baton, void *parent_baton, void *callback_baton, const char *edit_path, apr_pool_t *pool) { struct path_driver_cb_baton *cb = callback_baton; - const svn_delta_editor_t *editor = cb->editor; - void *edit_baton = cb->edit_baton; svn_fs_root_t *root = cb->root; svn_fs_path_change3_t *change; svn_boolean_t do_add = FALSE, do_delete = FALSE; @@ -957,8 +954,6 @@ svn_repos_replay2(svn_fs_root_t *root, low_water_mark = 0; /* Initialize our callback baton. */ - cb_baton.editor = editor; - cb_baton.edit_baton = edit_baton; cb_baton.root = root; cb_baton.changed_paths = changed_paths; cb_baton.authz_read_func = authz_read_func; @@ -989,7 +984,7 @@ svn_repos_replay2(svn_fs_root_t *root, } /* Call the path-based editor driver. */ - return svn_delta_path_driver2(editor, edit_baton, + return svn_delta_path_driver3(editor, edit_baton, paths, TRUE, path_driver_cb_func, &cb_baton, pool); #else diff --git a/subversion/libsvn_repos/repos.c b/subversion/libsvn_repos/repos.c index 2333f56..f46b828 100644 --- a/subversion/libsvn_repos/repos.c +++ b/subversion/libsvn_repos/repos.c @@ -1721,7 +1721,7 @@ svn_repos_recover4(const char *path, } struct freeze_baton_t { - apr_array_header_t *paths; + const apr_array_header_t *paths; int counter; svn_repos_freeze_func_t freeze_func; void *freeze_baton; @@ -1788,7 +1788,7 @@ multi_freeze(void *baton, and an SQLite reserved lock which means the repository is readable while frozen. */ svn_error_t * -svn_repos_freeze(apr_array_header_t *paths, +svn_repos_freeze(const apr_array_header_t *paths, svn_repos_freeze_func_t freeze_func, void *freeze_baton, apr_pool_t *pool) diff --git a/subversion/libsvn_subr/compress_lz4.c b/subversion/libsvn_subr/compress_lz4.c index d700b32..7dd4526 100644 --- a/subversion/libsvn_subr/compress_lz4.c +++ b/subversion/libsvn_subr/compress_lz4.c @@ -27,7 +27,7 @@ #include "svn_private_config.h" -#if SVN_INTERNAL_LZ4 +#ifdef SVN_INTERNAL_LZ4 #include "lz4/lz4internal.h" #else #include diff --git a/subversion/libsvn_subr/config_file.c b/subversion/libsvn_subr/config_file.c index bd2ec82..9c0a83a 100644 --- a/subversion/libsvn_subr/config_file.c +++ b/subversion/libsvn_subr/config_file.c @@ -1045,7 +1045,7 @@ svn_config_ensure(const char *config_dir, apr_pool_t *pool) "The syntax of the configuration files is a subset of the one used by" NL "Python's ConfigParser module; see" NL "" NL - " http://www.python.org/doc/current/lib/module-ConfigParser.html" NL + " https://docs.python.org/3/library/configparser.html" NL "" NL "Configuration data in the Windows registry" NL "==========================================" NL @@ -1155,6 +1155,7 @@ svn_config_ensure(const char *config_dir, apr_pool_t *pool) "### HTTP operation." NL "### http-chunked-requests Whether to use chunked transfer" NL "### encoding for HTTP requests body." NL + "### http-auth-types List of HTTP authentication types."NL "### ssl-authority-files List of files, each of a trusted CA" NL "### ssl-trust-default-ca Trust the system 'default' CAs" NL @@ -1191,16 +1192,13 @@ svn_config_ensure(const char *config_dir, apr_pool_t *pool) "### may be cached to disk." NL "### username Specifies the default username." NL "###" NL - "### Set store-passwords to 'no' to avoid storing passwords on disk" NL - "### in any way, including in password stores. It defaults to" NL + "### Set store-passwords to 'no' to avoid storing new passwords on" NL + "### disk in any way, including in password stores. It defaults to" NL "### 'yes', but Subversion will never save your password to disk in" NL "### plaintext unless explicitly configured to do so." NL - "### Note that this option only prevents saving of *new* passwords;" NL - "### it doesn't invalidate existing passwords. (To do that, remove" NL - "### the cache files by hand as described in the Subversion book.)" NL "###" NL #ifndef SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE - "### Set store-plaintext-passwords to 'no' to avoid storing" NL + "### Set store-plaintext-passwords to 'no' to avoid storing new" NL "### passwords in unencrypted form in the auth/ area of your config" NL "### directory. Set it to 'yes' to allow Subversion to store" NL "### unencrypted passwords in the auth/ area. The default is" NL @@ -1210,22 +1208,15 @@ svn_config_ensure(const char *config_dir, apr_pool_t *pool) "### 'store-auth-creds' is set to 'no'." NL "###" NL #endif - "### Set store-ssl-client-cert-pp to 'no' to avoid storing ssl" NL + "### Set store-ssl-client-cert-pp to 'no' to avoid storing new ssl" NL "### client certificate passphrases in the auth/ area of your" NL "### config directory. It defaults to 'yes', but Subversion will" NL "### never save your passphrase to disk in plaintext unless" NL "### explicitly configured to do so." NL "###" NL - "### Note store-ssl-client-cert-pp only prevents the saving of *new*"NL - "### passphrases; it doesn't invalidate existing passphrases. To do"NL - "### that, remove the cache files by hand as described in the" NL - "### Subversion book at http://svnbook.red-bean.com/nightly/en/\\" NL - "### svn.serverconfig.netmodel.html\\" NL - "### #svn.serverconfig.netmodel.credcache" NL - "###" NL #ifndef SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE "### Set store-ssl-client-cert-pp-plaintext to 'no' to avoid storing"NL - "### passphrases in unencrypted form in the auth/ area of your" NL + "### new passphrases in unencrypted form in the auth/ area of your" NL "### config directory. Set it to 'yes' to allow Subversion to" NL "### store unencrypted passphrases in the auth/ area. The default" NL "### is 'ask', which means that Subversion will prompt before" NL @@ -1234,12 +1225,19 @@ svn_config_ensure(const char *config_dir, apr_pool_t *pool) "### 'store-ssl-client-cert-pp' is set to 'no'." NL "###" NL #endif - "### Set store-auth-creds to 'no' to avoid storing any Subversion" NL + "### Set store-auth-creds to 'no' to avoid storing any new Subversion" + NL "### credentials in the auth/ area of your config directory." NL "### Note that this includes SSL server certificates." NL - "### It defaults to 'yes'. Note that this option only prevents" NL - "### saving of *new* credentials; it doesn't invalidate existing" NL - "### caches. (To do that, remove the cache files by hand.)" NL + "### It defaults to 'yes'." NL + "###" NL + "### Note that setting a 'store-*' option to 'no' only prevents" NL + "### saving of *new* passwords, passphrases or other credentials." NL + "### It does not remove or invalidate existing stored credentials." NL + "### To do that, see the 'svn auth --remove' command, or remove the" NL + "### cache files by hand as described in the Subversion book at" NL + "### http://svnbook.red-bean.com/nightly/en/svn.serverconfig.netmodel.html#svn.tour.initial.authn-cache-purge" + NL "###" NL "### HTTP timeouts, if given, are specified in seconds. A timeout" NL "### of 0, i.e. zero, causes a builtin default to be used." NL diff --git a/subversion/libsvn_subr/config_win.c b/subversion/libsvn_subr/config_win.c index aeab0d6..468545b 100644 --- a/subversion/libsvn_subr/config_win.c +++ b/subversion/libsvn_subr/config_win.c @@ -137,7 +137,7 @@ parse_section(svn_config_t *cfg, HKEY hkey, const char *section, _("Can't enumerate registry values")); /* Ignore option names that start with '#', see - http://subversion.tigris.org/issues/show_bug.cgi?id=671 */ + https://issues.apache.org/jira/browse/SVN-671 */ if (type == REG_SZ && option->data[0] != '#') { DWORD value_len = (DWORD)value->blocksize; diff --git a/subversion/libsvn_subr/deprecated.c b/subversion/libsvn_subr/deprecated.c index 1110d99..ef19bdb 100644 --- a/subversion/libsvn_subr/deprecated.c +++ b/subversion/libsvn_subr/deprecated.c @@ -390,6 +390,30 @@ print_command_info(const svn_opt_subcommand_desc_t *cmd, return SVN_NO_ERROR; } +const svn_opt_subcommand_desc2_t * +svn_opt_get_canonical_subcommand2(const svn_opt_subcommand_desc2_t *table, + const char *cmd_name) +{ + int i = 0; + + if (cmd_name == NULL) + return NULL; + + while (table[i].name) { + int j; + if (strcmp(cmd_name, table[i].name) == 0) + return table + i; + for (j = 0; (j < SVN_OPT_MAX_ALIASES) && table[i].aliases[j]; j++) + if (strcmp(cmd_name, table[i].aliases[j]) == 0) + return table + i; + + i++; + } + + /* If we get here, there was no matching subcommand name or alias. */ + return NULL; +} + const svn_opt_subcommand_desc_t * svn_opt_get_canonical_subcommand(const svn_opt_subcommand_desc_t *table, const char *cmd_name) @@ -414,6 +438,344 @@ svn_opt_get_canonical_subcommand(const svn_opt_subcommand_desc_t *table, return NULL; } +const apr_getopt_option_t * +svn_opt_get_option_from_code2(int code, + const apr_getopt_option_t *option_table, + const svn_opt_subcommand_desc2_t *command, + apr_pool_t *pool) +{ + apr_size_t i; + + for (i = 0; option_table[i].optch; i++) + if (option_table[i].optch == code) + { + if (command) + { + int j; + + for (j = 0; ((j < SVN_OPT_MAX_OPTIONS) && + command->desc_overrides[j].optch); j++) + if (command->desc_overrides[j].optch == code) + { + apr_getopt_option_t *tmpopt = + apr_palloc(pool, sizeof(*tmpopt)); + *tmpopt = option_table[i]; + tmpopt->description = command->desc_overrides[j].desc; + return tmpopt; + } + } + return &(option_table[i]); + } + + return NULL; +} + +const apr_getopt_option_t * +svn_opt_get_option_from_code(int code, + const apr_getopt_option_t *option_table) +{ + apr_size_t i; + + for (i = 0; option_table[i].optch; i++) + if (option_table[i].optch == code) + return &(option_table[i]); + + return NULL; +} + +/* Like svn_opt_get_option_from_code2(), but also, if CODE appears a second + * time in OPTION_TABLE with a different name, then set *LONG_ALIAS to that + * second name, else set it to NULL. */ +static const apr_getopt_option_t * +get_option_from_code(const char **long_alias, + int code, + const apr_getopt_option_t *option_table, + const svn_opt_subcommand_desc2_t *command, + apr_pool_t *pool) +{ + const apr_getopt_option_t *i; + const apr_getopt_option_t *opt + = svn_opt_get_option_from_code2(code, option_table, command, pool); + + /* Find a long alias in the table, if there is one. */ + *long_alias = NULL; + for (i = option_table; i->optch; i++) + { + if (i->optch == code && i->name != opt->name) + { + *long_alias = i->name; + break; + } + } + + return opt; +} + +/* Print an option OPT nicely into a STRING allocated in POOL. + * If OPT has a single-character short form, then print OPT->name (if not + * NULL) as an alias, else print LONG_ALIAS (if not NULL) as an alias. + * If DOC is set, include the generic documentation string of OPT, + * localized to the current locale if a translation is available. + */ +static void +format_option(const char **string, + const apr_getopt_option_t *opt, + const char *long_alias, + svn_boolean_t doc, + apr_pool_t *pool) +{ + char *opts; + + if (opt == NULL) + { + *string = "?"; + return; + } + + /* We have a valid option which may or may not have a "short + name" (a single-character alias for the long option). */ + if (opt->optch <= 255) + opts = apr_psprintf(pool, "-%c [--%s]", opt->optch, opt->name); + else if (long_alias) + opts = apr_psprintf(pool, "--%s [--%s]", opt->name, long_alias); + else + opts = apr_psprintf(pool, "--%s", opt->name); + + if (opt->has_arg) + opts = apr_pstrcat(pool, opts, _(" ARG"), SVN_VA_NULL); + + if (doc) + opts = apr_psprintf(pool, "%-24s : %s", opts, _(opt->description)); + + *string = opts; +} + +/* Print the canonical command name for CMD, and all its aliases, to + STREAM. If HELP is set, print CMD's help string too, in which case + obtain option usage from OPTIONS_TABLE. */ +static svn_error_t * +print_command_info2(const svn_opt_subcommand_desc2_t *cmd, + const apr_getopt_option_t *options_table, + const int *global_options, + svn_boolean_t help, + apr_pool_t *pool, + FILE *stream) +{ + svn_boolean_t first_time; + apr_size_t i; + + /* Print the canonical command name. */ + SVN_ERR(svn_cmdline_fputs(cmd->name, stream, pool)); + + /* Print the list of aliases. */ + first_time = TRUE; + for (i = 0; i < SVN_OPT_MAX_ALIASES; i++) + { + if (cmd->aliases[i] == NULL) + break; + + if (first_time) { + SVN_ERR(svn_cmdline_fputs(" (", stream, pool)); + first_time = FALSE; + } + else + SVN_ERR(svn_cmdline_fputs(", ", stream, pool)); + + SVN_ERR(svn_cmdline_fputs(cmd->aliases[i], stream, pool)); + } + + if (! first_time) + SVN_ERR(svn_cmdline_fputs(")", stream, pool)); + + if (help) + { + const apr_getopt_option_t *option; + const char *long_alias; + svn_boolean_t have_options = FALSE; + + SVN_ERR(svn_cmdline_fprintf(stream, pool, ": %s", _(cmd->help))); + + /* Loop over all valid option codes attached to the subcommand */ + for (i = 0; i < SVN_OPT_MAX_OPTIONS; i++) + { + if (cmd->valid_options[i]) + { + if (!have_options) + { + SVN_ERR(svn_cmdline_fputs(_("\nValid options:\n"), + stream, pool)); + have_options = TRUE; + } + + /* convert each option code into an option */ + option = get_option_from_code(&long_alias, cmd->valid_options[i], + options_table, cmd, pool); + + /* print the option's docstring */ + if (option && option->description) + { + const char *optstr; + format_option(&optstr, option, long_alias, TRUE, pool); + SVN_ERR(svn_cmdline_fprintf(stream, pool, " %s\n", + optstr)); + } + } + } + /* And global options too */ + if (global_options && *global_options) + { + SVN_ERR(svn_cmdline_fputs(_("\nGlobal options:\n"), + stream, pool)); + have_options = TRUE; + + for (i = 0; global_options[i]; i++) + { + + /* convert each option code into an option */ + option = get_option_from_code(&long_alias, global_options[i], + options_table, cmd, pool); + + /* print the option's docstring */ + if (option && option->description) + { + const char *optstr; + format_option(&optstr, option, long_alias, TRUE, pool); + SVN_ERR(svn_cmdline_fprintf(stream, pool, " %s\n", + optstr)); + } + } + } + + if (have_options) + SVN_ERR(svn_cmdline_fprintf(stream, pool, "\n")); + } + + return SVN_NO_ERROR; +} + +/* The body for svn_opt_print_generic_help2() function with standard error + * handling semantic. Handling of errors implemented at caller side. */ +static svn_error_t * +print_generic_help_body(const char *header, + const svn_opt_subcommand_desc2_t *cmd_table, + const apr_getopt_option_t *opt_table, + const char *footer, + apr_pool_t *pool, FILE *stream) +{ + int i = 0; + + if (header) + SVN_ERR(svn_cmdline_fputs(header, stream, pool)); + + while (cmd_table[i].name) + { + SVN_ERR(svn_cmdline_fputs(" ", stream, pool)); + SVN_ERR(print_command_info2(cmd_table + i, opt_table, + NULL, FALSE, + pool, stream)); + SVN_ERR(svn_cmdline_fputs("\n", stream, pool)); + i++; + } + + SVN_ERR(svn_cmdline_fputs("\n", stream, pool)); + + if (footer) + SVN_ERR(svn_cmdline_fputs(footer, stream, pool)); + + return SVN_NO_ERROR; +} + +void +svn_opt_print_generic_help2(const char *header, + const svn_opt_subcommand_desc2_t *cmd_table, + const apr_getopt_option_t *opt_table, + const char *footer, + apr_pool_t *pool, FILE *stream) +{ + svn_error_t *err; + + err = print_generic_help_body(header, cmd_table, opt_table, footer, pool, + stream); + + /* Issue #3014: + * Don't print anything on broken pipes. The pipe was likely + * closed by the process at the other end. We expect that + * process to perform error reporting as necessary. + * + * ### This assumes that there is only one error in a chain for + * ### SVN_ERR_IO_PIPE_WRITE_ERROR. See svn_cmdline_fputs(). */ + if (err && err->apr_err != SVN_ERR_IO_PIPE_WRITE_ERROR) + svn_handle_error2(err, stderr, FALSE, "svn: "); + svn_error_clear(err); +} + +svn_boolean_t +svn_opt_subcommand_takes_option3(const svn_opt_subcommand_desc2_t *command, + int option_code, + const int *global_options) +{ + apr_size_t i; + + for (i = 0; i < SVN_OPT_MAX_OPTIONS; i++) + if (command->valid_options[i] == option_code) + return TRUE; + + if (global_options) + for (i = 0; global_options[i]; i++) + if (global_options[i] == option_code) + return TRUE; + + return FALSE; +} + +svn_boolean_t +svn_opt_subcommand_takes_option2(const svn_opt_subcommand_desc2_t *command, + int option_code) +{ + return svn_opt_subcommand_takes_option3(command, + option_code, + NULL); +} + +svn_boolean_t +svn_opt_subcommand_takes_option(const svn_opt_subcommand_desc_t *command, + int option_code) +{ + apr_size_t i; + + for (i = 0; i < SVN_OPT_MAX_OPTIONS; i++) + if (command->valid_options[i] == option_code) + return TRUE; + + return FALSE; +} + +void +svn_opt_subcommand_help3(const char *subcommand, + const svn_opt_subcommand_desc2_t *table, + const apr_getopt_option_t *options_table, + const int *global_options, + apr_pool_t *pool) +{ + const svn_opt_subcommand_desc2_t *cmd = + svn_opt_get_canonical_subcommand2(table, subcommand); + svn_error_t *err; + + if (cmd) + err = print_command_info2(cmd, options_table, global_options, + TRUE, pool, stdout); + else + err = svn_cmdline_fprintf(stderr, pool, + _("\"%s\": unknown command.\n\n"), subcommand); + + if (err) { + /* Issue #3014: Don't print anything on broken pipes. */ + if (err->apr_err != SVN_ERR_IO_PIPE_WRITE_ERROR) + svn_handle_error2(err, stderr, FALSE, "svn: "); + svn_error_clear(err); + } +} + void svn_opt_subcommand_help2(const char *subcommand, const svn_opt_subcommand_desc2_t *table, @@ -521,6 +883,56 @@ svn_opt_args_to_target_array(apr_array_header_t **targets_p, return SVN_NO_ERROR; } +svn_error_t * +svn_opt_print_help4(apr_getopt_t *os, + const char *pgm_name, + svn_boolean_t print_version, + svn_boolean_t quiet, + svn_boolean_t verbose, + const char *version_footer, + const char *header, + const svn_opt_subcommand_desc2_t *cmd_table, + const apr_getopt_option_t *option_table, + const int *global_options, + const char *footer, + apr_pool_t *pool) +{ + apr_array_header_t *targets = NULL; + + if (os) + SVN_ERR(svn_opt_parse_all_args(&targets, os, pool)); + + if (os && targets->nelts) /* help on subcommand(s) requested */ + { + int i; + + for (i = 0; i < targets->nelts; i++) + { + svn_opt_subcommand_help3(APR_ARRAY_IDX(targets, i, const char *), + cmd_table, option_table, + global_options, pool); + } + } + else if (print_version) /* just --version */ + { + SVN_ERR(svn_opt__print_version_info(pgm_name, version_footer, + svn_version_extended(verbose, pool), + quiet, verbose, pool)); + } + else if (os && !targets->nelts) /* `-h', `--help', or `help' */ + svn_opt_print_generic_help2(header, + cmd_table, + option_table, + footer, + pool, + stdout); + else /* unknown option or cmd */ + SVN_ERR(svn_cmdline_fprintf(stderr, pool, + _("Type '%s help' for usage.\n"), pgm_name)); + + return SVN_NO_ERROR; +} + svn_error_t * svn_opt_print_help3(apr_getopt_t *os, const char *pgm_name, diff --git a/subversion/libsvn_subr/dirent_uri.c b/subversion/libsvn_subr/dirent_uri.c index b53f350..059734c 100644 --- a/subversion/libsvn_subr/dirent_uri.c +++ b/subversion/libsvn_subr/dirent_uri.c @@ -37,6 +37,7 @@ #include "svn_ctype.h" #include "dirent_uri.h" +#include "private/svn_dirent_uri_private.h" #include "private/svn_fspath.h" #include "private/svn_cert.h" @@ -292,8 +293,9 @@ uri_previous_segment(const char *uri, /* Return the canonicalized version of PATH, of type TYPE, allocated in * POOL. */ -static const char * -canonicalize(path_type_t type, const char *path, apr_pool_t *pool) +static svn_error_t * +canonicalize(const char **canonical_path, + path_type_t type, const char *path, apr_pool_t *pool) { char *canon, *dst; const char *src; @@ -307,8 +309,12 @@ canonicalize(path_type_t type, const char *path, apr_pool_t *pool) depends on path not being zero-length. */ if (SVN_PATH_IS_EMPTY(path)) { - assert(type != type_uri); - return ""; + *canonical_path = ""; + if (type == type_uri) + return svn_error_create(SVN_ERR_CANONICALIZATION_FAILED, NULL, + _("An empty URI can not be canonicalized")); + else + return SVN_NO_ERROR; } dst = canon = apr_pcalloc(pool, strlen(path) + 1); @@ -319,7 +325,12 @@ canonicalize(path_type_t type, const char *path, apr_pool_t *pool) src = path; if (type == type_uri) { - assert(*src != '/'); + if (*src == '/') + { + *canonical_path = src; + return svn_error_create(SVN_ERR_CANONICALIZATION_FAILED, NULL, + _("A URI can not start with '/'")); + } while (*src && (*src != '/') && (*src != ':')) src++; @@ -546,7 +557,10 @@ canonicalize(path_type_t type, const char *path, apr_pool_t *pool) if ((type == type_dirent) && canon[0] == '/' && canon[1] == '/') { if (canon_segments < 2) - return canon + 1; + { + *canonical_path = canon + 1; + return SVN_NO_ERROR; + } else { /* Now we're sure this is a valid UNC path, convert the server name @@ -654,7 +668,8 @@ canonicalize(path_type_t type, const char *path, apr_pool_t *pool) *dst = '\0'; } - return canon; + *canonical_path = canon; + return SVN_NO_ERROR; } /* Return the string length of the longest common ancestor of PATH1 and PATH2. @@ -883,6 +898,20 @@ svn_dirent_internal_style(const char *dirent, apr_pool_t *pool) return svn_dirent_canonicalize(internal_style(dirent, pool), pool); } +svn_error_t * +svn_dirent_internal_style_safe(const char **internal_style_dirent, + const char **non_canonical_result, + const char *dirent, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + return svn_error_trace( + svn_dirent_canonicalize_safe(internal_style_dirent, + non_canonical_result, + internal_style(dirent, scratch_pool), + result_pool, scratch_pool)); +} + const char * svn_dirent_local_style(const char *dirent, apr_pool_t *pool) { @@ -906,14 +935,18 @@ svn_dirent_local_style(const char *dirent, apr_pool_t *pool) return dirent; } -const char * -svn_relpath__internal_style(const char *relpath, - apr_pool_t *pool) +svn_error_t * +svn_relpath__make_internal(const char **internal_style_relpath, + const char *relpath, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) { - return svn_relpath_canonicalize(internal_style(relpath, pool), pool); + return svn_error_trace( + svn_relpath_canonicalize_safe(internal_style_relpath, NULL, + internal_style(relpath, scratch_pool), + result_pool, scratch_pool)); } - /* We decided against using apr_filepath_root here because of the negative performance impact (creating a pool and converting strings ). */ svn_boolean_t @@ -1643,19 +1676,84 @@ svn_dirent_get_absolute(const char **pabsolute, const char * svn_uri_canonicalize(const char *uri, apr_pool_t *pool) { - return canonicalize(type_uri, uri, pool); + const char *result; + svn_error_t *const err = canonicalize(&result, type_uri, uri, pool); + if (err) + { + svn_error_clear(err); + SVN_ERR_ASSERT_NO_RETURN(!"URI canonicalization failed"); + } + return result; +} + +svn_error_t * +svn_uri_canonicalize_safe(const char **canonical_uri, + const char **non_canonical_result, + const char *uri, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + const char *result = NULL; + SVN_ERR(canonicalize(&result, type_uri, uri, result_pool)); + if (!svn_uri_is_canonical(result, scratch_pool)) + { + if (non_canonical_result) + *non_canonical_result = result; + + return svn_error_createf( + SVN_ERR_CANONICALIZATION_FAILED, NULL, + _("Could not canonicalize URI '%s'" + " (the result '%s' is not canonical)"), + uri, result); + } + *canonical_uri = result; + return SVN_NO_ERROR; } const char * svn_relpath_canonicalize(const char *relpath, apr_pool_t *pool) { - return canonicalize(type_relpath, relpath, pool); + const char *result; + svn_error_t *const err = canonicalize(&result, type_relpath, relpath, pool); + if (err) + { + svn_error_clear(err); + SVN_ERR_ASSERT_NO_RETURN(!"relpath canonicalization failed"); + } + return result; } -const char * -svn_dirent_canonicalize(const char *dirent, apr_pool_t *pool) +svn_error_t * +svn_relpath_canonicalize_safe(const char **canonical_relpath, + const char **non_canonical_result, + const char *relpath, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + const char *result = NULL; + SVN_ERR(canonicalize(&result, type_relpath, relpath, result_pool)); + if (!svn_relpath_is_canonical(result)) + { + if (non_canonical_result) + *non_canonical_result = result; + + return svn_error_createf( + SVN_ERR_CANONICALIZATION_FAILED, NULL, + _("Could not canonicalize relpath '%s'" + " (the result '%s' is not canonical)"), + relpath, result); + } + + SVN_UNUSED(scratch_pool); + *canonical_relpath = result; + return SVN_NO_ERROR; +} + +static svn_error_t * +canonicalize_dirent(const char **result, const char *dirent, apr_pool_t *pool) { - const char *dst = canonicalize(type_dirent, dirent, pool); + const char *dst; + SVN_ERR(canonicalize(&dst, type_dirent, dirent, pool)); #ifdef SVN_USE_DOS_PATHS /* Handle a specific case on Windows where path == "X:/". Here we have to @@ -1671,11 +1769,50 @@ svn_dirent_canonicalize(const char *dirent, apr_pool_t *pool) dst_slash[2] = '/'; dst_slash[3] = '\0'; - return dst_slash; + *result = dst_slash; + return SVN_NO_ERROR; } #endif /* SVN_USE_DOS_PATHS */ - return dst; + *result = dst; + return SVN_NO_ERROR; +} + +const char * +svn_dirent_canonicalize(const char *dirent, apr_pool_t *pool) +{ + const char *result; + svn_error_t *const err = canonicalize_dirent(&result, dirent, pool); + if (err) + { + svn_error_clear(err); + SVN_ERR_ASSERT_NO_RETURN(!"dirent canonicalization failed"); + } + return result; +} + +svn_error_t * +svn_dirent_canonicalize_safe(const char **canonical_dirent, + const char **non_canonical_result, + const char *dirent, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + const char *result = NULL; + SVN_ERR(canonicalize_dirent(&result, dirent, result_pool)); + if (!svn_dirent_is_canonical(result, scratch_pool)) + { + if (non_canonical_result) + *non_canonical_result = result; + + return svn_error_createf( + SVN_ERR_CANONICALIZATION_FAILED, NULL, + _("Could not canonicalize dirent '%s'" + " (the result '%s' is not canonical)"), + dirent, result); + } + *canonical_dirent = result; + return SVN_NO_ERROR; } svn_boolean_t diff --git a/subversion/libsvn_subr/internal_statements.h b/subversion/libsvn_subr/internal_statements.h index 5f8095f..f7ca6ca 100644 --- a/subversion/libsvn_subr/internal_statements.h +++ b/subversion/libsvn_subr/internal_statements.h @@ -1,4 +1,4 @@ -/* This file is automatically generated from internal_statements.sql and subversion/libsvn_subr/token-map.h. +/* This file is automatically generated from internal_statements.sql and token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_INTERNAL_SAVEPOINT_SVN 0 diff --git a/subversion/libsvn_subr/io.c b/subversion/libsvn_subr/io.c index 7d9d68b..9d6db8f 100644 --- a/subversion/libsvn_subr/io.c +++ b/subversion/libsvn_subr/io.c @@ -155,8 +155,14 @@ typedef struct _FILE_DISPOSITION_INFO { BOOL DeleteFile; } FILE_DISPOSITION_INFO, *PFILE_DISPOSITION_INFO; +typedef struct _FILE_ATTRIBUTE_TAG_INFO { + DWORD FileAttributes; + DWORD ReparseTag; +} FILE_ATTRIBUTE_TAG_INFO, *PFILE_ATTRIBUTE_TAG_INFO; + #define FileRenameInfo 3 #define FileDispositionInfo 4 +#define FileAttributeTagInfo 9 #endif /* WIN32 < Vista */ /* One-time initialization of the late bound Windows API functions. */ @@ -169,19 +175,30 @@ typedef DWORD (WINAPI *GETFINALPATHNAMEBYHANDLE)( DWORD cchFilePath, DWORD dwFlags); +typedef BOOL (WINAPI *GetFileInformationByHandleEx_t)(HANDLE hFile, + int FileInformationClass, + LPVOID lpFileInformation, + DWORD dwBufferSize); + typedef BOOL (WINAPI *SetFileInformationByHandle_t)(HANDLE hFile, int FileInformationClass, LPVOID lpFileInformation, DWORD dwBufferSize); static GETFINALPATHNAMEBYHANDLE get_final_path_name_by_handle_proc = NULL; +static GetFileInformationByHandleEx_t get_file_information_by_handle_ex_proc = NULL; static SetFileInformationByHandle_t set_file_information_by_handle_proc = NULL; -/* Forward declaration. */ +/* Forward declarations. */ static svn_error_t * io_win_read_link(svn_string_t **dest, const char *path, apr_pool_t *pool); +static svn_error_t * io_win_check_path(svn_node_kind_t *kind_p, + svn_boolean_t *is_symlink_p, + const char *path, + apr_pool_t *pool); + #endif /* Forward declaration */ @@ -342,13 +359,7 @@ io_check_path(const char *path, /* Not using svn_io_stat() here because we want to check the apr_err return explicitly. */ SVN_ERR(cstring_from_utf8(&path_apr, path, pool)); -#ifdef WIN32 - /* on Windows, svn does not handle reparse points or hard links. - So ignore the 'resolve_symlinks' flag. */ - flags = APR_FINFO_MIN; -#else flags = resolve_symlinks ? APR_FINFO_MIN : (APR_FINFO_MIN | APR_FINFO_LINK); -#endif apr_err = apr_stat(&finfo, path_apr, flags, pool); if (APR_STATUS_IS_ENOENT(apr_err)) @@ -410,8 +421,12 @@ svn_io_check_resolved_path(const char *path, svn_node_kind_t *kind, apr_pool_t *pool) { +#if WIN32 + return io_win_check_path(kind, NULL, path, pool); +#else svn_boolean_t ignored; return io_check_path(path, TRUE, &ignored, kind, pool); +#endif } svn_error_t * @@ -419,8 +434,19 @@ svn_io_check_path(const char *path, svn_node_kind_t *kind, apr_pool_t *pool) { +#if WIN32 + svn_boolean_t is_symlink; + + SVN_ERR(io_win_check_path(kind, &is_symlink, path, pool)); + + if (is_symlink) + *kind = svn_node_file; + + return SVN_NO_ERROR; +#else svn_boolean_t ignored; return io_check_path(path, FALSE, &ignored, kind, pool); +#endif } svn_error_t * @@ -429,7 +455,23 @@ svn_io_check_special_path(const char *path, svn_boolean_t *is_special, apr_pool_t *pool) { +#ifdef WIN32 + svn_boolean_t is_symlink; + + SVN_ERR(io_win_check_path(kind, &is_symlink, path, pool)); + + if (is_symlink) + { + *is_special = TRUE; + *kind = svn_node_file; + } + else + *is_special = FALSE; + + return SVN_NO_ERROR; +#else return io_check_path(path, FALSE, is_special, kind, pool); +#endif } struct temp_file_cleanup_s @@ -1950,6 +1992,9 @@ static svn_error_t *win_init_dynamic_imports(void *baton, apr_pool_t *pool) get_final_path_name_by_handle_proc = (GETFINALPATHNAMEBYHANDLE) GetProcAddress(kernel32, "GetFinalPathNameByHandleW"); + get_file_information_by_handle_ex_proc = (GetFileInformationByHandleEx_t) + GetProcAddress(kernel32, "GetFileInformationByHandleEx"); + set_file_information_by_handle_proc = (SetFileInformationByHandle_t) GetProcAddress(kernel32, "SetFileInformationByHandle"); } @@ -2026,6 +2071,33 @@ static svn_error_t * io_win_read_link(svn_string_t **dest, } } +/* Wrapper around Windows API function GetFileInformationByHandleEx() that + * returns APR status instead of boolean flag. */ +static apr_status_t +win32_get_file_information_by_handle(HANDLE hFile, + int FileInformationClass, + LPVOID lpFileInformation, + DWORD dwBufferSize) +{ + svn_error_clear(svn_atomic__init_once(&win_dynamic_imports_state, + win_init_dynamic_imports, + NULL, NULL)); + + if (!get_file_information_by_handle_ex_proc) + { + return SVN_ERR_UNSUPPORTED_FEATURE; + } + + if (!get_file_information_by_handle_ex_proc(hFile, FileInformationClass, + lpFileInformation, + dwBufferSize)) + { + return apr_get_os_error(); + } + + return APR_SUCCESS; +} + /* Wrapper around Windows API function SetFileInformationByHandle() that * returns APR status instead of boolean flag. */ static apr_status_t @@ -2053,6 +2125,105 @@ win32_set_file_information_by_handle(HANDLE hFile, return APR_SUCCESS; } +/* Fast Win32-specific helper for svn_io_check_path() and related functions + * that only requires a single GetFileAttributes() call in most cases. + */ +static svn_error_t * io_win_check_path(svn_node_kind_t *kind_p, + svn_boolean_t *is_symlink_p, + const char *path, + apr_pool_t *pool) +{ + DWORD attrs; + const WCHAR *wpath; + apr_status_t status; + + if (path[0] == '\0') + path = "."; + + SVN_ERR(svn_io__utf8_to_unicode_longpath(&wpath, path, pool)); + + attrs = GetFileAttributesW(wpath); + if (attrs == INVALID_FILE_ATTRIBUTES) + { + status = apr_get_os_error(); + if (APR_STATUS_IS_ENOENT(status) || SVN__APR_STATUS_IS_ENOTDIR(status)) + { + *kind_p = svn_node_none; + if (is_symlink_p) + *is_symlink_p = FALSE; + return SVN_NO_ERROR; + } + else + { + return svn_error_wrap_apr(status, _("Can't stat '%s'"), + svn_dirent_local_style(path, pool)); + } + } + + if (attrs & FILE_ATTRIBUTE_DIRECTORY) + *kind_p = svn_node_dir; + else + *kind_p = svn_node_file; + + /* If this is a reparse point, and if we've been asked to check whether + we are dealing with a symlink, then open the file and check that. + + Otherwise, it's either definitely not a symlink or the caller + doesn't care about this distinction. + */ + if (is_symlink_p && (attrs & FILE_ATTRIBUTE_REPARSE_POINT)) + { + const WCHAR *wfname; + HANDLE hFile; + FILE_ATTRIBUTE_TAG_INFO taginfo = { 0 }; + + SVN_ERR(svn_io__utf8_to_unicode_longpath(&wfname, path, pool)); + + hFile = CreateFileW(wfname, FILE_READ_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, + FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS, + NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + status = apr_get_os_error(); + if (APR_STATUS_IS_ENOENT(status) || SVN__APR_STATUS_IS_ENOTDIR(status)) + { + *kind_p = svn_node_none; + *is_symlink_p = FALSE; + return SVN_NO_ERROR; + } + else + { + return svn_error_wrap_apr(status, _("Can't stat '%s'"), + svn_dirent_local_style(path, pool)); + } + } + + status = win32_get_file_information_by_handle(hFile, FileAttributeTagInfo, + &taginfo, sizeof(taginfo)); + CloseHandle(hFile); + + if (status) + return svn_error_wrap_apr(status, _("Can't stat '%s'"), + svn_dirent_local_style(path, pool)); + + /* The surrogate bit in the reparse tag specifies if "the file or directory + represents another named entity in the system" which is used to determine + if this reparse point behaves like a symlink. + + https://docs.microsoft.com/en-us/windows/desktop/fileio/reparse-point-tags + */ + *is_symlink_p = IsReparseTagNameSurrogate(taginfo.ReparseTag); + } + else if (is_symlink_p) + { + *is_symlink_p = FALSE; + } + + return SVN_NO_ERROR; +} + svn_error_t * svn_io__win_delete_file_on_close(apr_file_t *file, const char *path, @@ -2619,27 +2790,36 @@ stringbuf_from_aprfile(svn_stringbuf_t **result, apr_finfo_t finfo = { 0 }; /* In some cases we get size 0 and no error for non files, so we - also check for the name. (= cached in apr_file_t) and for FIFOs */ - if (! apr_file_info_get(&finfo, APR_FINFO_SIZE | APR_FINFO_TYPE, file) - && finfo.fname && finfo.filetype != APR_PIPE) + also check for the name. (= cached in apr_file_t) */ + if (! apr_file_info_get(&finfo, APR_FINFO_SIZE, file) && finfo.fname) { - /* we've got the file length. Now, read it in one go. */ + /* In general, there is no guarantee that the given file size is + correct, for instance, because the underlying handle could be + pointing to a pipe. We don't know that in advance, so attempt + to read *one more* byte than necessary. If we get an EOF, then + we're done and we have succesfully avoided reading the file chunk- + by-chunk. If we don't, we fall through and do so to read the + remaining part of the file. */ svn_boolean_t eof; - res_initial_len = (apr_size_t)finfo.size; + res_initial_len = (apr_size_t)finfo.size + 1; res = svn_stringbuf_create_ensure(res_initial_len, pool); SVN_ERR(svn_io_file_read_full2(file, res->data, res_initial_len, &res->len, &eof, pool)); res->data[res->len] = 0; - *result = res; - return SVN_NO_ERROR; + if (eof) + { + *result = res; + return SVN_NO_ERROR; + } } } /* XXX: We should check the incoming data for being of type binary. */ buf = apr_palloc(pool, SVN__STREAM_CHUNK_SIZE); - res = svn_stringbuf_create_ensure(res_initial_len, pool); + if (!res) + res = svn_stringbuf_create_ensure(res_initial_len, pool); /* apr_file_read will not return data and eof in the same call. So this loop * is safe from missing read data. */ @@ -2785,8 +2965,8 @@ svn_io_remove_dir(const char *path, apr_pool_t *pool) directory scan. A previous workaround involving rewinddir is problematic on Win32 and some NFS clients, notably NetBSD. - See http://subversion.tigris.org/issues/show_bug.cgi?id=1896 and - http://subversion.tigris.org/issues/show_bug.cgi?id=3501. + See https://issues.apache.org/jira/browse/SVN-1896 and + https://issues.apache.org/jira/browse/SVN-3501. */ /* Neither windows nor unix allows us to delete a non-empty @@ -4311,7 +4491,45 @@ win32_file_rename(const WCHAR *from_path_w, } if (!MoveFileExW(from_path_w, to_path_w, flags)) - return apr_get_os_error(); + { + apr_status_t err = apr_get_os_error(); + /* If the target file is read only NTFS reports EACCESS and + FAT/FAT32 reports EEXIST */ + if (APR_STATUS_IS_EACCES(err) || APR_STATUS_IS_EEXIST(err)) + { + DWORD attrs = GetFileAttributesW(to_path_w); + if (attrs == INVALID_FILE_ATTRIBUTES) + { + apr_status_t stat_err = apr_get_os_error(); + if (!(APR_STATUS_IS_ENOENT(stat_err) || SVN__APR_STATUS_IS_ENOTDIR(stat_err))) + /* We failed to stat the file, propagate the original error */ + return err; + } + else if (attrs & FILE_ATTRIBUTE_READONLY) + { + /* Try to set the destination file writable because Windows will + not allow us to rename when to_path is read-only, but will + allow renaming when from_path is read only. */ + attrs &= ~FILE_ATTRIBUTE_READONLY; + if (!SetFileAttributesW(to_path_w, attrs)) + { + err = apr_get_os_error(); + if (!(APR_STATUS_IS_ENOENT(err) || SVN__APR_STATUS_IS_ENOTDIR(err))) + /* We failed to set file attributes, propagate this new error */ + return err; + } + } + + /* NOTE: If the file is not read-only, we don't know if the file did + not have the read-only attribute in the first place or if this + attribute disappeared due to a race, so try to rename it anyway. + */ + if (!MoveFileExW(from_path_w, to_path_w, flags)) + return apr_get_os_error(); + } + else + return err; + } return APR_SUCCESS; } @@ -4335,18 +4553,6 @@ svn_io_file_rename2(const char *from_path, const char *to_path, SVN_ERR(svn_io__utf8_to_unicode_longpath(&from_path_w, from_path_apr, pool)); SVN_ERR(svn_io__utf8_to_unicode_longpath(&to_path_w, to_path_apr, pool)); status = win32_file_rename(from_path_w, to_path_w, flush_to_disk); - - /* If the target file is read only NTFS reports EACCESS and - FAT/FAT32 reports EEXIST */ - if (APR_STATUS_IS_EACCES(status) || APR_STATUS_IS_EEXIST(status)) - { - /* Set the destination file writable because Windows will not - allow us to rename when to_path is read-only, but will - allow renaming when from_path is read only. */ - SVN_ERR(svn_io_set_file_read_write(to_path, TRUE, pool)); - - status = win32_file_rename(from_path_w, to_path_w, flush_to_disk); - } WIN32_RETRY_LOOP(status, win32_file_rename(from_path_w, to_path_w, flush_to_disk)); #elif defined(__OS2__) @@ -4724,7 +4930,7 @@ svn_io_dir_walk2(const char *dirname, } else if (finfo.filetype == APR_REG || finfo.filetype == APR_LNK) { - /* some other directory. pass it to the callback. */ + /* a regular file or a symlink. pass it to the callback. */ SVN_ERR(entry_name_to_utf8(&name_utf8, finfo.name, dirname, subpool)); full_path = svn_dirent_join(dirname, name_utf8, subpool); diff --git a/subversion/libsvn_subr/libsvn_subr.pc.in b/subversion/libsvn_subr/libsvn_subr.pc.in index 81ae97d..83856db 100644 --- a/subversion/libsvn_subr/libsvn_subr.pc.in +++ b/subversion/libsvn_subr/libsvn_subr.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_subr Description: Subversion General Utility Library Version: @PACKAGE_VERSION@ -Requires: apr-util-@SVN_APR_MAJOR_VERSION@ apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: sqlite3 -Libs: -L${libdir} -lsvn_subr @SVN_XML_LIBS@ @SVN_ZLIB_LIBS@ @SVN_APR_MEMCACHE_LIBS@ @SVN_MAGIC_LIBS@ @SVN_INTL_LIBS@ @SVN_LZ4_LIBS@ @SVN_UTF8PROC_LIBS@ -Cflags: -I${includedir} +Requires: apr-util-@SVN_APR_MAJOR_VERSION@, apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: sqlite3 +Libs: -L${libdir} -lsvn_subr-1 @SVN_XML_LIBS@ @SVN_ZLIB_LIBS@ @SVN_APR_MEMCACHE_LIBS@ @SVN_MAGIC_LIBS@ @SVN_INTL_LIBS@ @SVN_LZ4_LIBS@ @SVN_UTF8PROC_LIBS@ @SVN_MACOS_PLIST_LIBS@ @SVN_MACOS_KEYCHAIN_LIBS@ +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_subr/lz4/lz4.c b/subversion/libsvn_subr/lz4/lz4.c index d329064..405ba59 100644 --- a/subversion/libsvn_subr/lz4/lz4.c +++ b/subversion/libsvn_subr/lz4/lz4.c @@ -1,5 +1,5 @@ #include "svn_private_config.h" -#if SVN_INTERNAL_LZ4 +#ifdef SVN_INTERNAL_LZ4 /* LZ4 - Fast LZ compression algorithm Copyright (C) 2011-2016, Yann Collet. diff --git a/subversion/libsvn_subr/lz4/lz4internal.h b/subversion/libsvn_subr/lz4/lz4internal.h index 02ba09d..cdc25e4 100644 --- a/subversion/libsvn_subr/lz4/lz4internal.h +++ b/subversion/libsvn_subr/lz4/lz4internal.h @@ -1,5 +1,5 @@ #include "svn_private_config.h" -#if SVN_INTERNAL_LZ4 +#ifdef SVN_INTERNAL_LZ4 /* * LZ4 - Fast LZ compression algorithm * Header File diff --git a/subversion/libsvn_subr/opt.c b/subversion/libsvn_subr/opt.c index fd8c73a..1a9beb6 100644 --- a/subversion/libsvn_subr/opt.c +++ b/subversion/libsvn_subr/opt.c @@ -55,8 +55,8 @@ /*** Code. ***/ -const svn_opt_subcommand_desc2_t * -svn_opt_get_canonical_subcommand2(const svn_opt_subcommand_desc2_t *table, +const svn_opt_subcommand_desc3_t * +svn_opt_get_canonical_subcommand3(const svn_opt_subcommand_desc3_t *table, const char *cmd_name) { int i = 0; @@ -80,9 +80,9 @@ svn_opt_get_canonical_subcommand2(const svn_opt_subcommand_desc2_t *table, } const apr_getopt_option_t * -svn_opt_get_option_from_code2(int code, +svn_opt_get_option_from_code3(int code, const apr_getopt_option_t *option_table, - const svn_opt_subcommand_desc2_t *command, + const svn_opt_subcommand_desc3_t *command, apr_pool_t *pool) { apr_size_t i; @@ -111,34 +111,19 @@ svn_opt_get_option_from_code2(int code, return NULL; } - -const apr_getopt_option_t * -svn_opt_get_option_from_code(int code, - const apr_getopt_option_t *option_table) -{ - apr_size_t i; - - for (i = 0; option_table[i].optch; i++) - if (option_table[i].optch == code) - return &(option_table[i]); - - return NULL; -} - - -/* Like svn_opt_get_option_from_code2(), but also, if CODE appears a second +/* Like svn_opt_get_option_from_code3(), but also, if CODE appears a second * time in OPTION_TABLE with a different name, then set *LONG_ALIAS to that * second name, else set it to NULL. */ static const apr_getopt_option_t * -get_option_from_code(const char **long_alias, - int code, - const apr_getopt_option_t *option_table, - const svn_opt_subcommand_desc2_t *command, - apr_pool_t *pool) +get_option_from_code3(const char **long_alias, + int code, + const apr_getopt_option_t *option_table, + const svn_opt_subcommand_desc3_t *command, + apr_pool_t *pool) { const apr_getopt_option_t *i; const apr_getopt_option_t *opt - = svn_opt_get_option_from_code2(code, option_table, command, pool); + = svn_opt_get_option_from_code3(code, option_table, command, pool); /* Find a long alias in the table, if there is one. */ *long_alias = NULL; @@ -205,7 +190,7 @@ svn_opt_format_option(const char **string, svn_boolean_t -svn_opt_subcommand_takes_option3(const svn_opt_subcommand_desc2_t *command, +svn_opt_subcommand_takes_option4(const svn_opt_subcommand_desc3_t *command, int option_code, const int *global_options) { @@ -223,38 +208,19 @@ svn_opt_subcommand_takes_option3(const svn_opt_subcommand_desc2_t *command, return FALSE; } -svn_boolean_t -svn_opt_subcommand_takes_option2(const svn_opt_subcommand_desc2_t *command, - int option_code) -{ - return svn_opt_subcommand_takes_option3(command, - option_code, - NULL); -} - - -svn_boolean_t -svn_opt_subcommand_takes_option(const svn_opt_subcommand_desc_t *command, - int option_code) -{ - apr_size_t i; - - for (i = 0; i < SVN_OPT_MAX_OPTIONS; i++) - if (command->valid_options[i] == option_code) - return TRUE; - - return FALSE; -} - /* Print the canonical command name for CMD, and all its aliases, to STREAM. If HELP is set, print CMD's help string too, in which case - obtain option usage from OPTIONS_TABLE. */ + obtain option usage from OPTIONS_TABLE. + + Include global and experimental options iff VERBOSE is true. + */ static svn_error_t * -print_command_info2(const svn_opt_subcommand_desc2_t *cmd, +print_command_info3(const svn_opt_subcommand_desc3_t *cmd, const apr_getopt_option_t *options_table, const int *global_options, svn_boolean_t help, + svn_boolean_t verbose, apr_pool_t *pool, FILE *stream) { @@ -289,8 +255,14 @@ print_command_info2(const svn_opt_subcommand_desc2_t *cmd, const apr_getopt_option_t *option; const char *long_alias; svn_boolean_t have_options = FALSE; + svn_boolean_t have_experimental = FALSE; - SVN_ERR(svn_cmdline_fprintf(stream, pool, ": %s", _(cmd->help))); + SVN_ERR(svn_cmdline_fprintf(stream, pool, ": ")); + + for (i = 0; i < SVN_OPT_MAX_PARAGRAPHS && cmd->help[i]; i++) + { + SVN_ERR(svn_cmdline_fprintf(stream, pool, "%s", _(cmd->help[i]))); + } /* Loop over all valid option codes attached to the subcommand */ for (i = 0; i < SVN_OPT_MAX_OPTIONS; i++) @@ -305,13 +277,24 @@ print_command_info2(const svn_opt_subcommand_desc2_t *cmd, } /* convert each option code into an option */ - option = get_option_from_code(&long_alias, cmd->valid_options[i], - options_table, cmd, pool); + option = get_option_from_code3(&long_alias, cmd->valid_options[i], + options_table, cmd, pool); /* print the option's docstring */ if (option && option->description) { const char *optstr; + + if (option->name && strncmp(option->name, "x-", 2) == 0) + { + if (verbose && !have_experimental) + SVN_ERR(svn_cmdline_fputs(_("\nExperimental options:\n"), + stream, pool)); + have_experimental = TRUE; + if (!verbose) + continue; + } + format_option(&optstr, option, long_alias, TRUE, pool); SVN_ERR(svn_cmdline_fprintf(stream, pool, " %s\n", optstr)); @@ -319,7 +302,7 @@ print_command_info2(const svn_opt_subcommand_desc2_t *cmd, } } /* And global options too */ - if (global_options && *global_options) + if (verbose && global_options && *global_options) { SVN_ERR(svn_cmdline_fputs(_("\nGlobal options:\n"), stream, pool)); @@ -329,8 +312,8 @@ print_command_info2(const svn_opt_subcommand_desc2_t *cmd, { /* convert each option code into an option */ - option = get_option_from_code(&long_alias, global_options[i], - options_table, cmd, pool); + option = get_option_from_code3(&long_alias, global_options[i], + options_table, cmd, pool); /* print the option's docstring */ if (option && option->description) @@ -343,6 +326,9 @@ print_command_info2(const svn_opt_subcommand_desc2_t *cmd, } } + if (!verbose) + SVN_ERR(svn_cmdline_fputs(_("\n(Use '-v' to show global and experimental options.)\n"), + stream, pool)); if (have_options) SVN_ERR(svn_cmdline_fprintf(stream, pool, "\n")); } @@ -350,30 +336,44 @@ print_command_info2(const svn_opt_subcommand_desc2_t *cmd, return SVN_NO_ERROR; } -/* The body for svn_opt_print_generic_help2() function with standard error +/* The body for svn_opt_print_generic_help3() function with standard error * handling semantic. Handling of errors implemented at caller side. */ static svn_error_t * -print_generic_help_body(const char *header, - const svn_opt_subcommand_desc2_t *cmd_table, - const apr_getopt_option_t *opt_table, - const char *footer, - apr_pool_t *pool, FILE *stream) +print_generic_help_body3(const char *header, + const svn_opt_subcommand_desc3_t *cmd_table, + const apr_getopt_option_t *opt_table, + const char *footer, + svn_boolean_t with_experimental, + apr_pool_t *pool, FILE *stream) { - int i = 0; + svn_boolean_t have_experimental = FALSE; + int i; if (header) SVN_ERR(svn_cmdline_fputs(header, stream, pool)); - while (cmd_table[i].name) + for (i = 0; cmd_table[i].name; i++) { + if (strncmp(cmd_table[i].name, "x-", 2) == 0) + { + if (with_experimental && !have_experimental) + SVN_ERR(svn_cmdline_fputs(_("\nExperimental subcommands:\n"), + stream, pool)); + have_experimental = TRUE; + if (!with_experimental) + continue; + } SVN_ERR(svn_cmdline_fputs(" ", stream, pool)); - SVN_ERR(print_command_info2(cmd_table + i, opt_table, - NULL, FALSE, + SVN_ERR(print_command_info3(cmd_table + i, opt_table, + NULL, FALSE, FALSE, pool, stream)); SVN_ERR(svn_cmdline_fputs("\n", stream, pool)); - i++; } + if (have_experimental && !with_experimental) + SVN_ERR(svn_cmdline_fputs(_("\n(Use '-v' to show experimental subcommands.)\n"), + stream, pool)); + SVN_ERR(svn_cmdline_fputs("\n", stream, pool)); if (footer) @@ -382,17 +382,19 @@ print_generic_help_body(const char *header, return SVN_NO_ERROR; } -void -svn_opt_print_generic_help2(const char *header, - const svn_opt_subcommand_desc2_t *cmd_table, - const apr_getopt_option_t *opt_table, - const char *footer, - apr_pool_t *pool, FILE *stream) +static void +print_generic_help(const char *header, + const svn_opt_subcommand_desc3_t *cmd_table, + const apr_getopt_option_t *opt_table, + const char *footer, + svn_boolean_t with_experimental, + apr_pool_t *pool, FILE *stream) { svn_error_t *err; - err = print_generic_help_body(header, cmd_table, opt_table, footer, pool, - stream); + err = print_generic_help_body3(header, cmd_table, opt_table, footer, + with_experimental, + pool, stream); /* Issue #3014: * Don't print anything on broken pipes. The pipe was likely @@ -406,21 +408,37 @@ svn_opt_print_generic_help2(const char *header, svn_error_clear(err); } - void -svn_opt_subcommand_help3(const char *subcommand, - const svn_opt_subcommand_desc2_t *table, - const apr_getopt_option_t *options_table, - const int *global_options, - apr_pool_t *pool) +svn_opt_print_generic_help3(const char *header, + const svn_opt_subcommand_desc3_t *cmd_table, + const apr_getopt_option_t *opt_table, + const char *footer, + apr_pool_t *pool, FILE *stream) { - const svn_opt_subcommand_desc2_t *cmd = - svn_opt_get_canonical_subcommand2(table, subcommand); + print_generic_help(header, cmd_table, opt_table, footer, + TRUE, pool, stream); +} + + +/* The body of svn_opt_subcommand_help4(), which see. + * + * VERBOSE means show also the subcommand's global and experimental options. + */ +static void +subcommand_help(const char *subcommand, + const svn_opt_subcommand_desc3_t *table, + const apr_getopt_option_t *options_table, + const int *global_options, + svn_boolean_t verbose, + apr_pool_t *pool) +{ + const svn_opt_subcommand_desc3_t *cmd = + svn_opt_get_canonical_subcommand3(table, subcommand); svn_error_t *err; if (cmd) - err = print_command_info2(cmd, options_table, global_options, - TRUE, pool, stdout); + err = print_command_info3(cmd, options_table, global_options, + TRUE, verbose, pool, stdout); else err = svn_cmdline_fprintf(stderr, pool, _("\"%s\": unknown command.\n\n"), subcommand); @@ -433,6 +451,17 @@ svn_opt_subcommand_help3(const char *subcommand, } } +void +svn_opt_subcommand_help4(const char *subcommand, + const svn_opt_subcommand_desc3_t *table, + const apr_getopt_option_t *options_table, + const int *global_options, + apr_pool_t *pool) +{ + subcommand_help(subcommand, table, options_table, global_options, + TRUE, pool); +} + /*** Parsing revision and date options. ***/ @@ -1194,14 +1223,14 @@ svn_opt__print_version_info(const char *pgm_name, } svn_error_t * -svn_opt_print_help4(apr_getopt_t *os, +svn_opt_print_help5(apr_getopt_t *os, const char *pgm_name, svn_boolean_t print_version, svn_boolean_t quiet, svn_boolean_t verbose, const char *version_footer, const char *header, - const svn_opt_subcommand_desc2_t *cmd_table, + const svn_opt_subcommand_desc3_t *cmd_table, const apr_getopt_option_t *option_table, const int *global_options, const char *footer, @@ -1218,9 +1247,9 @@ svn_opt_print_help4(apr_getopt_t *os, for (i = 0; i < targets->nelts; i++) { - svn_opt_subcommand_help3(APR_ARRAY_IDX(targets, i, const char *), - cmd_table, option_table, - global_options, pool); + subcommand_help(APR_ARRAY_IDX(targets, i, const char *), + cmd_table, option_table, global_options, + verbose, pool); } } else if (print_version) /* just --version */ @@ -1230,12 +1259,9 @@ svn_opt_print_help4(apr_getopt_t *os, quiet, verbose, pool)); } else if (os && !targets->nelts) /* `-h', `--help', or `help' */ - svn_opt_print_generic_help2(header, - cmd_table, - option_table, - footer, - pool, - stdout); + print_generic_help(header, cmd_table, option_table, footer, + verbose, + pool, stdout); else /* unknown option or cmd */ SVN_ERR(svn_cmdline_fprintf(stderr, pool, _("Type '%s help' for usage.\n"), pgm_name)); diff --git a/subversion/libsvn_subr/pool.c b/subversion/libsvn_subr/pool.c index 5fd80a7..bbeafde 100644 --- a/subversion/libsvn_subr/pool.c +++ b/subversion/libsvn_subr/pool.c @@ -133,7 +133,7 @@ svn_pool_create_allocator(svn_boolean_t thread_safe) #endif /* By default, allocators are *not* thread-safe. We must provide a mutex - * if we want thread-safety for that mutex. */ + * if we want thread-safety for that pool. */ #if APR_HAS_THREADS if (thread_safe) diff --git a/subversion/libsvn_subr/sqlite3wrapper.c b/subversion/libsvn_subr/sqlite3wrapper.c index 9924772..ea090fe 100644 --- a/subversion/libsvn_subr/sqlite3wrapper.c +++ b/subversion/libsvn_subr/sqlite3wrapper.c @@ -25,6 +25,8 @@ /* Include sqlite3 inline, making all symbols private. */ #ifdef SVN_SQLITE_INLINE # define SQLITE_OMIT_DEPRECATED 1 +# define SQLITE_DEFAULT_MEMSTATUS 0 +# define SQLITE_OMIT_WAL 1 # define SQLITE_API static # if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) # pragma GCC diagnostic ignored "-Wunreachable-code" diff --git a/subversion/libsvn_subr/stream.c b/subversion/libsvn_subr/stream.c index 609d7af..be10fc7 100644 --- a/subversion/libsvn_subr/stream.c +++ b/subversion/libsvn_subr/stream.c @@ -922,7 +922,7 @@ readline_apr_lf(apr_file_t *file, } /* Otherwise, prepare to read the next chunk. */ - svn_stringbuf_ensure(buf, buf->blocksize + SVN__LINE_CHUNK_SIZE); + svn_stringbuf_ensure(buf, buf->len + SVN__LINE_CHUNK_SIZE); } } @@ -982,7 +982,7 @@ readline_apr_generic(apr_file_t *file, } /* Prepare to read the next chunk. */ - svn_stringbuf_ensure(buf, buf->blocksize + SVN__LINE_CHUNK_SIZE); + svn_stringbuf_ensure(buf, buf->len + SVN__LINE_CHUNK_SIZE); } } @@ -1468,10 +1468,10 @@ seek_handler_checksum(void *baton, const svn_stream_mark_t *mark) else { if (btn->read_ctx) - svn_checksum_ctx_reset(btn->read_ctx); + SVN_ERR(svn_checksum_ctx_reset(btn->read_ctx)); if (btn->write_ctx) - svn_checksum_ctx_reset(btn->write_ctx); + SVN_ERR(svn_checksum_ctx_reset(btn->write_ctx)); SVN_ERR(svn_stream_reset(btn->proxy)); } diff --git a/subversion/libsvn_subr/sysinfo.c b/subversion/libsvn_subr/sysinfo.c index a5c302d..1dda38c 100644 --- a/subversion/libsvn_subr/sysinfo.c +++ b/subversion/libsvn_subr/sysinfo.c @@ -51,10 +51,22 @@ #include "sysinfo.h" #include "svn_private_config.h" +#if HAVE_SYS_TYPES_H +#include +#endif + #if HAVE_SYS_UTSNAME_H #include #endif +#if HAVE_UNISTD_H +#include +#endif + +#if HAVE_ELF_H +#include +#endif + #ifdef SVN_HAVE_MACOS_PLIST #include #include @@ -92,6 +104,7 @@ static const apr_array_header_t *macos_shared_libs(apr_pool_t *pool); #if __linux__ static const char *linux_release_name(apr_pool_t *pool); +static const apr_array_header_t *linux_shared_libs(apr_pool_t *pool); #endif const char * @@ -187,6 +200,8 @@ svn_sysinfo__loaded_libs(apr_pool_t *pool) return win32_shared_libs(pool); #elif defined(SVN_HAVE_MACHO_ITERATE) return macos_shared_libs(pool); +#elif __linux__ + return linux_shared_libs(pool); #else return NULL; #endif @@ -300,6 +315,31 @@ release_name_from_uname(apr_pool_t *pool) #if __linux__ +/* Find the first whitespace character in a stringbuf. + Analogous to svn_stringbuf_first_non_whitespace. */ +static apr_size_t +stringbuf_first_whitespace(const svn_stringbuf_t *str) +{ + apr_size_t i; + for (i = 0; i < str->len; ++i) + { + if (svn_ctype_isspace(str->data[i])) + return i; + } + return str->len; +} + +/* Skip a whitespace-delimited field in a stringbuf. */ +static void +stringbuf_skip_whitespace_field(svn_stringbuf_t *str) +{ + apr_size_t i; + i = stringbuf_first_whitespace(str); + svn_stringbuf_leftchop(str, i); + i = svn_stringbuf_first_non_whitespace(str); + svn_stringbuf_leftchop(str, i); +} + /* Split a stringbuf into a key/value pair. Return the key, leaving the stripped value in the stringbuf. */ static const char * @@ -635,6 +675,168 @@ linux_release_name(apr_pool_t *pool) return apr_psprintf(pool, "%s [%s]", release_name, uname_release); } + +#if HAVE_ELF_H +/* Parse a hexadecimal number as a pointer value. */ +static const unsigned char * +parse_pointer_value(const char *start, const char *limit, char **end) +{ + const unsigned char *ptr; + const apr_uint64_t val = (apr_uint64_t)apr_strtoi64(start, end, 16); + + if (errno /* overflow */ + || *end == start /* no valid digits */ + || *end >= limit) /* representation too long */ + return NULL; + + ptr = (const unsigned char*)val; + if (val != (apr_uint64_t)ptr) /* truncated value */ + return NULL; + + return ptr; +} + +/* Read the ELF header at the mapping position to check if this is a shared + library. We only look at the ELF identification and the type. The format is + described here: + http://www.skyfree.org/linux/references/ELF_Format.pdf +*/ +static svn_boolean_t +check_elf_header(const unsigned char *map_start, + const unsigned char *map_end) +{ + /* A union of all known ELF header types, for size checks. */ + union max_elf_header_size_t + { + Elf32_Ehdr header_32; + Elf64_Ehdr header_64; + }; + + /* Check the size of the mapping and the ELF magic tag. */ + if (map_end < map_start + || map_end - map_start < sizeof(union max_elf_header_size_t) + || memcmp(map_start, ELFMAG, SELFMAG)) + { + return FALSE; + } + + /* Check that this is an ELF shared library or executable file. This also + implicitly checks that the data encoding of the current process is the + same as in the loaded library. */ + if (map_start[EI_CLASS] == ELFCLASS32) + { + const Elf32_Ehdr *hdr = (void*)map_start; + return (hdr->e_type == ET_DYN || hdr->e_type == ET_EXEC); + } + else if (map_start[EI_CLASS] == ELFCLASS64) + { + const Elf64_Ehdr *hdr = (void*)map_start; + return (hdr->e_type == ET_DYN || hdr->e_type == ET_EXEC); + } + + return FALSE; +} +#endif /* HAVE_ELF_H */ + +static const apr_array_header_t * +linux_shared_libs(apr_pool_t *pool) +{ + /* Read the list of loaded modules from /proc/[pid]/maps + The format is described here: + http://man7.org/linux/man-pages/man5/proc.5.html + */ + + const char *maps = apr_psprintf(pool, "/proc/%ld/maps", (long)getpid()); + apr_array_header_t *result = NULL; + svn_boolean_t eof = FALSE; + svn_stream_t *stream; + svn_error_t *err; + + err = svn_stream_open_readonly(&stream, maps, pool, pool); + if (err) + { + svn_error_clear(err); + return NULL; + } + + /* Each line in /proc/[pid]/maps consists of whitespace-delimited fields. */ + while (!eof) + { + svn_stringbuf_t *line; + +#if HAVE_ELF_H + const unsigned char *map_start; + const unsigned char *map_end; +#endif + + err = svn_stream_readline(stream, &line, "\n", &eof, pool); + if (err) + { + svn_error_clear(err); + return NULL; + } + +#if HAVE_ELF_H + /* Address: The mapped memory address range. */ + { + const char *const limit = line->data + line->len; + char *end; + + /* The start of the address range */ + map_start = parse_pointer_value(line->data, limit, &end); + if (!map_start || *end != '-') + continue; + + /* The end of the address range */ + map_end = parse_pointer_value(end + 1, limit, &end); + if (!map_end || !svn_ctype_isspace(*end)) + continue; + } +#endif + + stringbuf_skip_whitespace_field(line); /* skip address */ + + /* Permissions: The memory region must be readable and executable. */ + if (line->len < 4 || line->data[0] != 'r' || line->data[2] != 'x') + continue; + + stringbuf_skip_whitespace_field(line); /* skip perms */ + stringbuf_skip_whitespace_field(line); /* skip offset */ + stringbuf_skip_whitespace_field(line); /* skip device */ + + /* I-Node: If it is 0, there is no file associated with the region. */ + if (line->len < 2 + || (line->data[0] == '0' && svn_ctype_isspace(line->data[1]))) + continue; + + stringbuf_skip_whitespace_field(line); /* skip inode */ + + /* Consider only things that look like absolute paths. + Files that were removed since the process was created (due to an + upgrade, for example) are marked as '(deleted)'. */ + if (line->data[0] == '/') + { + svn_version_ext_loaded_lib_t *lib; + +#if HAVE_ELF_H + if (!check_elf_header(map_start, map_end)) + continue; +#endif + + /* We've done our best to find a mapped shared library. */ + if (!result) + { + result = apr_array_make(pool, 32, sizeof(*lib)); + } + lib = &APR_ARRAY_PUSH(result, svn_version_ext_loaded_lib_t); + lib->name = line->data; + lib->version = NULL; + } + } + + svn_error_clear(svn_stream_close(stream)); + return result; +} #endif /* __linux__ */ @@ -1122,42 +1324,70 @@ value_from_dict(CFDictionaryRef plist, CFStringRef key, apr_pool_t *pool) return value; } -/* Return the commercial name of the OS, given the version number in +/* Return the minor version the operating system, given the number in a format that matches the regular expression /^10\.\d+(\..*)?$/ */ -static const char * -release_name_from_version(const char *osver) +static int +macos_minor_version(const char *osver) { char *end = NULL; unsigned long num = strtoul(osver, &end, 10); if (!end || *end != '.' || num != 10) - return NULL; + return -1; osver = end + 1; end = NULL; num = strtoul(osver, &end, 10); if (!end || (*end && *end != '.')) - return NULL; + return -1; + + return (int)num; +} - /* See http://en.wikipedia.org/wiki/History_of_OS_X#Release_timeline */ - switch(num) +/* Return the product name of the operating system. */ +static const char * +product_name_from_minor_version(int minor, const char* product_name) +{ + /* We can only do this if we know the official product name. */ + if (0 != strcmp(product_name, "Mac OS X")) + return product_name; + + if (minor <= 7) + return product_name; + + if (minor <= 11) + return "OS X"; + + return "macOS"; +} + +/* Return the commercial name of the operating system. */ +static const char * +release_name_from_minor_version(int minor, const char* product_name) +{ + /* We can only do this if we know the official product name. */ + if (0 == strcmp(product_name, "Mac OS X")) { - case 0: return "Cheetah"; - case 1: return "Puma"; - case 2: return "Jaguar"; - case 3: return "Panther"; - case 4: return "Tiger"; - case 5: return "Leopard"; - case 6: return "Snow Leopard"; - case 7: return "Lion"; - case 8: return "Mountain Lion"; - case 9: return "Mavericks"; - case 10: return "Yosemite"; - case 11: return "El Capitan"; - case 12: return "Sierra"; - case 13: return "High Sierra"; + /* See https://en.wikipedia.org/wiki/MacOS_version_history#Releases */ + switch(minor) + { + case 0: return "Cheetah"; + case 1: return "Puma"; + case 2: return "Jaguar"; + case 3: return "Panther"; + case 4: return "Tiger"; + case 5: return "Leopard"; + case 6: return "Snow Leopard"; + case 7: return "Lion"; + case 8: return "Mountain Lion"; + case 9: return "Mavericks"; + case 10: return "Yosemite"; + case 11: return "El Capitan"; + case 12: return "Sierra"; + case 13: return "High Sierra"; + case 14: return "Mojave"; + } } - return NULL; } @@ -1180,20 +1410,23 @@ macos_release_name(apr_pool_t *pool) CFSTR("ProductBuildVersion"), pool); const char *release; + int minor_version; if (!osver) osver = value_from_dict(plist, CFSTR("ProductVersion"), pool); - release = release_name_from_version(osver); + minor_version = macos_minor_version(osver); + release = release_name_from_minor_version(minor_version, osname); + osname = product_name_from_minor_version(minor_version, osname); CFRelease(plist); return apr_psprintf(pool, "%s%s%s%s%s%s%s%s", (osname ? osname : ""), - (osver ? (osname ? " " : "") : ""), - (osver ? osver : ""), - (release ? (osname||osver ? " " : "") : ""), + (release ? (osname ? " " : "") : ""), (release ? release : ""), + (osver ? (osname||release ? " " : "") : ""), + (osver ? osver : ""), (build - ? (osname||osver||release ? ", " : "") + ? (osname||release||osver ? ", " : "") : ""), (build ? (server ? "server build " : "build ") diff --git a/subversion/libsvn_subr/utf.c b/subversion/libsvn_subr/utf.c index a0b0dc7..5164f64 100644 --- a/subversion/libsvn_subr/utf.c +++ b/subversion/libsvn_subr/utf.c @@ -960,7 +960,7 @@ svn_utf__cstring_from_utf8_fuzzy(const char *src, /* ### Check the client locale, maybe we can avoid that second * conversion! See Ulrich Drepper's patch at - * http://subversion.tigris.org/issues/show_bug.cgi?id=807. + * https://issues.apache.org/jira/browse/SVN-807. */ } diff --git a/subversion/libsvn_subr/win32_crashrpt.c b/subversion/libsvn_subr/win32_crashrpt.c index bed2d6e..1f8cdd0 100644 --- a/subversion/libsvn_subr/win32_crashrpt.c +++ b/subversion/libsvn_subr/win32_crashrpt.c @@ -45,9 +45,6 @@ typedef int win32_crashrpt__dummy; /*** Global variables ***/ static HANDLE dbghelp_dll = INVALID_HANDLE_VALUE; -/* Email address where the crash reports should be sent too. */ -#define CRASHREPORT_EMAIL "users@subversion.apache.org" - #define DBGHELP_DLL "dbghelp.dll" #define LOGFILE_PREFIX "svn-crash-log" @@ -774,7 +771,7 @@ svn__unhandled_exception_filter(PEXCEPTION_POINTERS ptrs) "usernames and passwords etc.)\n", log_filename, dmp_filename, - CRASHREPORT_EMAIL); + SVN_WIN32_CRASHREPORT_EMAIL); if (getenv("SVN_DBG_STACKTRACES_TO_STDERR") != NULL) { diff --git a/subversion/libsvn_subr/win32_crypto.c b/subversion/libsvn_subr/win32_crypto.c index 0986e5a..deead9f 100644 --- a/subversion/libsvn_subr/win32_crypto.c +++ b/subversion/libsvn_subr/win32_crypto.c @@ -395,16 +395,29 @@ windows_validate_certificate(svn_boolean_t *ok_p, memset(&chain_para, 0, sizeof(chain_para)); chain_para.cbSize = sizeof(chain_para); + /* Don't hit the wire for URL based objects and revocation checks, as + that may cause stalls, network timeouts or spurious errors in cases + such as with the remote OCSP and CRL endpoints being inaccessible or + unreliable. + + For this particular case of the SVN_AUTH_SSL_UNKNOWNCA cert failure + override we should be okay with just the data that we have immediately + available on the local machine. + */ if (CertGetCertificateChain(NULL, cert_context, NULL, NULL, &chain_para, CERT_CHAIN_CACHE_END_CERT | - CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, + CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL | + CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT | + CERT_CHAIN_REVOCATION_CHECK_CACHE_ONLY, NULL, &chain_context)) { CERT_CHAIN_POLICY_PARA policy_para; CERT_CHAIN_POLICY_STATUS policy_status; policy_para.cbSize = sizeof(policy_para); - policy_para.dwFlags = 0; + /* We only use the local data for revocation checks, so they may + fail with errors like CRYPT_E_REVOCATION_OFFLINE; ignore those. */ + policy_para.dwFlags = CERT_CHAIN_POLICY_IGNORE_ALL_REV_UNKNOWN_FLAGS; policy_para.pvExtraPolicyPara = NULL; policy_status.cbSize = sizeof(policy_status); diff --git a/subversion/libsvn_subr/x509info.c b/subversion/libsvn_subr/x509info.c index 9cd4372..a24611c 100644 --- a/subversion/libsvn_subr/x509info.c +++ b/subversion/libsvn_subr/x509info.c @@ -128,7 +128,7 @@ typedef struct asn1_oid { const char *long_label; } asn1_oid; -#define CONSTANT_PAIR(c) (unsigned char *)(c), sizeof((c)) - 1 +#define CONSTANT_PAIR(c) (const unsigned char *)(c), sizeof((c)) - 1 static const asn1_oid asn1_oids[] = { { CONSTANT_PAIR(SVN_X509_OID_COMMON_NAME), "CN", "commonName" }, diff --git a/subversion/libsvn_wc/README b/subversion/libsvn_wc/README index b5fc529..7475ec5 100644 --- a/subversion/libsvn_wc/README +++ b/subversion/libsvn_wc/README @@ -94,6 +94,10 @@ copies. .svn/wc.db /* SQLite database containing node metadata. */ pristine/ /* Sharded directory containing base files. */ tmp/ /* Local tmp area. */ + experimental/ /* Data for experimental features. */ + shelves/ /* Used by 1.10.x shelves implementation */ + entries /* Stub file. */ + format /* Stub file. */ `wc.db': A self-contained SQLite database containing all the metadata Subversion @@ -109,6 +113,17 @@ copies. Pristines are used for sending diffs back to the server, etc. +`experimental': + Experimental (unstable) features store their data here. + +`shelves': + Subversion 1.10's "svn shelve" command stores shelved changes here. + This directory is not used by any other minor release line. + +`entries', `format': + These stub files exist only to enable a pre-1.7 client to yield a clearer + error message. + How the client applies an update delta -------------------------------------- diff --git a/subversion/libsvn_wc/conflicts.c b/subversion/libsvn_wc/conflicts.c index 606710c..ab5db31 100644 --- a/subversion/libsvn_wc/conflicts.c +++ b/subversion/libsvn_wc/conflicts.c @@ -539,6 +539,7 @@ svn_wc__conflict_skel_add_tree_conflict(svn_skel_t *conflict_skel, svn_wc_conflict_reason_t reason, svn_wc_conflict_action_t action, const char *move_src_op_root_abspath, + const char *move_dst_op_root_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) { @@ -555,18 +556,33 @@ svn_wc__conflict_skel_add_tree_conflict(svn_skel_t *conflict_skel, tree_conflict = svn_skel__make_empty_list(result_pool); - if (reason == svn_wc_conflict_reason_moved_away - && move_src_op_root_abspath) + if (reason == svn_wc_conflict_reason_moved_away) { - const char *move_src_op_root_relpath; + if (move_dst_op_root_abspath) + { + const char *move_dst_op_root_relpath; - SVN_ERR(svn_wc__db_to_relpath(&move_src_op_root_relpath, - db, wri_abspath, - move_src_op_root_abspath, - result_pool, scratch_pool)); + SVN_ERR(svn_wc__db_to_relpath(&move_dst_op_root_relpath, + db, wri_abspath, + move_dst_op_root_abspath, + result_pool, scratch_pool)); - svn_skel__prepend_str(move_src_op_root_relpath, tree_conflict, - result_pool); + svn_skel__prepend_str(move_dst_op_root_relpath, tree_conflict, + result_pool); + } + + if (move_src_op_root_abspath) + { + const char *move_src_op_root_relpath; + + SVN_ERR(svn_wc__db_to_relpath(&move_src_op_root_relpath, + db, wri_abspath, + move_src_op_root_abspath, + result_pool, scratch_pool)); + + svn_skel__prepend_str(move_src_op_root_relpath, tree_conflict, + result_pool); + } } svn_skel__prepend_str(svn_token__to_word(action_map, action), @@ -932,6 +948,7 @@ svn_error_t * svn_wc__conflict_read_tree_conflict(svn_wc_conflict_reason_t *reason, svn_wc_conflict_action_t *action, const char **move_src_op_root_abspath, + const char **move_dst_op_root_abspath, svn_wc__db_t *db, const char *wri_abspath, const svn_skel_t *conflict_skel, @@ -981,10 +998,10 @@ svn_wc__conflict_read_tree_conflict(svn_wc_conflict_reason_t *reason, c = c->next; - if (move_src_op_root_abspath) + if (move_src_op_root_abspath || move_dst_op_root_abspath) { /* Only set for update and switch tree conflicts */ - if (c && is_moved_away) + if (c && is_moved_away && move_src_op_root_abspath) { const char *move_src_op_root_relpath = apr_pstrmemdup(scratch_pool, c->data, c->len); @@ -994,8 +1011,25 @@ svn_wc__conflict_read_tree_conflict(svn_wc_conflict_reason_t *reason, move_src_op_root_relpath, result_pool, scratch_pool)); } - else + else if (move_src_op_root_abspath) *move_src_op_root_abspath = NULL; + + if (c) + c = c->next; + + if (c && is_moved_away && move_dst_op_root_abspath) + { + const char *move_dst_op_root_relpath + = apr_pstrmemdup(scratch_pool, c->data, c->len); + + SVN_ERR(svn_wc__db_from_relpath(move_dst_op_root_abspath, + db, wri_abspath, + move_dst_op_root_relpath, + result_pool, scratch_pool)); + } + else if (move_dst_op_root_abspath) + *move_dst_op_root_abspath = NULL; + } return SVN_NO_ERROR; @@ -1801,7 +1835,7 @@ read_tree_conflict_desc(svn_wc_conflict_description2_t **desc, svn_wc_conflict_action_t action; SVN_ERR(svn_wc__conflict_read_tree_conflict( - &reason, &action, NULL, + &reason, &action, NULL, NULL, db, local_abspath, conflict_skel, scratch_pool, scratch_pool)); if (reason == svn_wc_conflict_reason_missing) @@ -2676,7 +2710,7 @@ resolve_tree_conflict_on_node(svn_boolean_t *did_resolve, SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action, &src_op_root_abspath, - db, local_abspath, + NULL, db, local_abspath, conflicts, scratch_pool, scratch_pool)); @@ -2748,6 +2782,7 @@ resolve_tree_conflict_on_node(svn_boolean_t *did_resolve, SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action, &src_op_root_abspath, + NULL, db, local_abspath, new_conflicts, scratch_pool, @@ -3483,7 +3518,7 @@ svn_wc__conflict_tree_update_break_moved_away(svn_wc_context_t *wc_ctx, return SVN_NO_ERROR; SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action, - &src_op_root_abspath, + &src_op_root_abspath, NULL, wc_ctx->db, local_abspath, conflict_skel, scratch_pool, scratch_pool)); @@ -3569,7 +3604,7 @@ svn_wc__conflict_tree_update_raise_moved_away(svn_wc_context_t *wc_ctx, if (!tree_conflicted) return SVN_NO_ERROR; - SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action, NULL, + SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action, NULL, NULL, wc_ctx->db, local_abspath, conflict_skel, scratch_pool, scratch_pool)); @@ -3648,7 +3683,7 @@ svn_wc__conflict_tree_update_moved_away_node(svn_wc_context_t *wc_ctx, return SVN_NO_ERROR; SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action, - &src_op_root_abspath, + &src_op_root_abspath, NULL, wc_ctx->db, local_abspath, conflict_skel, scratch_pool, scratch_pool)); @@ -3734,8 +3769,8 @@ svn_wc__conflict_tree_update_incoming_move(svn_wc_context_t *wc_ctx, return SVN_NO_ERROR; SVN_ERR(svn_wc__conflict_read_tree_conflict(&local_change, &incoming_change, - NULL, wc_ctx->db, local_abspath, - conflict_skel, + NULL, NULL, wc_ctx->db, + local_abspath, conflict_skel, scratch_pool, scratch_pool)); /* Make sure the expected conflict is recorded. */ @@ -3803,8 +3838,8 @@ svn_wc__conflict_tree_update_local_add(svn_wc_context_t *wc_ctx, return SVN_NO_ERROR; SVN_ERR(svn_wc__conflict_read_tree_conflict(&local_change, &incoming_change, - NULL, wc_ctx->db, local_abspath, - conflict_skel, + NULL, NULL, wc_ctx->db, + local_abspath, conflict_skel, scratch_pool, scratch_pool)); /* Make sure the expected conflict is recorded. */ @@ -3853,9 +3888,9 @@ svn_wc__guess_incoming_move_target_nodes(apr_array_header_t **possible_targets, apr_size_t longest_ancestor_len = 0; *possible_targets = apr_array_make(result_pool, 1, sizeof(const char *)); - SVN_ERR(svn_wc__find_repos_node_in_wc(&candidates, wc_ctx->db, victim_abspath, - moved_to_repos_relpath, - scratch_pool, scratch_pool)); + SVN_ERR(svn_wc__db_find_repos_node_in_wc(&candidates, wc_ctx->db, victim_abspath, + moved_to_repos_relpath, + scratch_pool, scratch_pool)); /* Find a "useful move target" node in our set of candidates. * Since there is no way to be certain, filter out nodes which seem @@ -3903,7 +3938,7 @@ svn_wc__guess_incoming_move_target_nodes(apr_array_header_t **possible_targets, status != svn_wc__db_status_added) continue; - if (node_kind != victim_node_kind) + if (victim_node_kind != svn_node_none && node_kind != victim_node_kind) continue; SVN_ERR(svn_wc__db_is_switched(&is_wcroot, &is_switched, NULL, diff --git a/subversion/libsvn_wc/conflicts.h b/subversion/libsvn_wc/conflicts.h index 0a9324b..d4a6742 100644 --- a/subversion/libsvn_wc/conflicts.h +++ b/subversion/libsvn_wc/conflicts.h @@ -219,6 +219,11 @@ svn_wc__conflict_skel_add_prop_conflict(svn_skel_t *conflict_skel, MOVE_SRC_OP_ROOT_ABSPATH should be A for a conflict associated with (1), MOVE_SRC_OP_ROOT_ABSPATH should be A/B for a conflict associated with (2). + MOVE_DST_OP_ROOT_ABSPATH is the op-root of the move target (i.e. the + op-root of the corresponding copy). This needs to be stored because + moves in the NODE table do not always persist after an update, while + the conflict resolver may need information about the pre-update state + of the move. It is an error to add another tree conflict to a conflict skel that already contains a tree conflict. (It is not an error, at this level, @@ -233,6 +238,7 @@ svn_wc__conflict_skel_add_tree_conflict(svn_skel_t *conflict_skel, svn_wc_conflict_reason_t local_change, svn_wc_conflict_action_t incoming_change, const char *move_src_op_root_abspath, + const char *move_dst_op_root_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool); @@ -364,6 +370,7 @@ svn_error_t * svn_wc__conflict_read_tree_conflict(svn_wc_conflict_reason_t *local_change, svn_wc_conflict_action_t *incoming_change, const char **move_src_op_root_abspath, + const char **move_dst_op_root_abspath, svn_wc__db_t *db, const char *wri_abspath, const svn_skel_t *conflict_skel, diff --git a/subversion/libsvn_wc/deprecated.c b/subversion/libsvn_wc/deprecated.c index e54a86d..379564b 100644 --- a/subversion/libsvn_wc/deprecated.c +++ b/subversion/libsvn_wc/deprecated.c @@ -1090,6 +1090,33 @@ svn_wc_add(const char *path, } /*** From revert.c ***/ +svn_error_t * +svn_wc_revert5(svn_wc_context_t *wc_ctx, + const char *local_abspath, + svn_depth_t depth, + svn_boolean_t use_commit_times, + const apr_array_header_t *changelist_filter, + svn_boolean_t clear_changelists, + svn_boolean_t metadata_only, + svn_cancel_func_t cancel_func, + void *cancel_baton, + svn_wc_notify_func2_t notify_func, + void *notify_baton, + apr_pool_t *scratch_pool) +{ + SVN_ERR(svn_wc_revert6(wc_ctx, local_abspath, + depth, + use_commit_times, + changelist_filter, + clear_changelists, + metadata_only, + TRUE /*added_keep_local*/, + cancel_func, cancel_baton, + notify_func, notify_baton, + scratch_pool)); + return SVN_NO_ERROR; +} + svn_error_t * svn_wc_revert4(svn_wc_context_t *wc_ctx, const char *local_abspath, @@ -2069,8 +2096,7 @@ svn_wc_get_diff_editor6(const svn_delta_editor_t **editor, result_pool, scratch_pool)); if (reverse_order) - diff_processor = svn_diff__tree_processor_reverse_create( - diff_processor, NULL, result_pool); + diff_processor = svn_diff__tree_processor_reverse_create(diff_processor, result_pool); if (! show_copies_as_adds) diff_processor = svn_diff__tree_processor_copy_as_changed_create( diff --git a/subversion/libsvn_wc/diff_local.c b/subversion/libsvn_wc/diff_local.c index 61ec067..26f9c68 100644 --- a/subversion/libsvn_wc/diff_local.c +++ b/subversion/libsvn_wc/diff_local.c @@ -433,8 +433,7 @@ diff_status_callback(void *baton, /* Public Interface */ svn_error_t * -svn_wc__diff7(const char **root_relpath, - svn_boolean_t *root_is_dir, +svn_wc__diff7(svn_boolean_t anchor_at_given_paths, svn_wc_context_t *wc_ctx, const char *local_abspath, svn_depth_t depth, @@ -459,26 +458,30 @@ svn_wc__diff7(const char **root_relpath, eb.anchor_abspath = local_abspath; - if (root_relpath) + if (anchor_at_given_paths) { + /* Anchor the underlying diff processor at the parent of + LOCAL_ABSPATH (if possible), and adjust so the outgoing + DIFF_PROCESSOR is always anchored at LOCAL_ABSPATH. */ + /* ### Why anchor the underlying diff processor at the parent? */ svn_boolean_t is_wcroot; SVN_ERR(svn_wc__db_is_wcroot(&is_wcroot, wc_ctx->db, local_abspath, scratch_pool)); if (!is_wcroot) - eb.anchor_abspath = svn_dirent_dirname(local_abspath, scratch_pool); + { + const char *relpath; + + eb.anchor_abspath = svn_dirent_dirname(local_abspath, scratch_pool); + relpath = svn_dirent_basename(local_abspath, NULL); + diff_processor = svn_diff__tree_processor_filter_create( + diff_processor, relpath, scratch_pool); + } } else if (kind != svn_node_dir) eb.anchor_abspath = svn_dirent_dirname(local_abspath, scratch_pool); - if (root_relpath) - *root_relpath = apr_pstrdup(result_pool, - svn_dirent_skip_ancestor(eb.anchor_abspath, - local_abspath)); - if (root_is_dir) - *root_is_dir = (kind == svn_node_dir); - /* Apply changelist filtering to the output */ if (changelist_filter && changelist_filter->nelts) { @@ -487,7 +490,7 @@ svn_wc__diff7(const char **root_relpath, SVN_ERR(svn_hash_from_cstring_keys(&changelist_hash, changelist_filter, result_pool)); diff_processor = svn_wc__changelist_filter_tree_processor_create( - diff_processor, wc_ctx, local_abspath, + diff_processor, wc_ctx, eb.anchor_abspath, changelist_hash, result_pool); } @@ -572,7 +575,7 @@ svn_wc_diff6(svn_wc_context_t *wc_ctx, processor = svn_diff__tree_processor_copy_as_changed_create(processor, scratch_pool); - return svn_error_trace(svn_wc__diff7(NULL, NULL, + return svn_error_trace(svn_wc__diff7(FALSE, wc_ctx, local_abspath, depth, ignore_ancestry, diff --git a/subversion/libsvn_wc/libsvn_wc.pc.in b/subversion/libsvn_wc/libsvn_wc.pc.in index f44387e..dc1c4d7 100644 --- a/subversion/libsvn_wc/libsvn_wc.pc.in +++ b/subversion/libsvn_wc/libsvn_wc.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_wc Description: Subversion Working Copy Library Version: @PACKAGE_VERSION@ -Requires: apr-util-@SVN_APR_MAJOR_VERSION@ apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_delta libsvn_diff libsvn_subr -Libs: -L${libdir} -lsvn_wc -Cflags: -I${includedir} +Requires: apr-util-@SVN_APR_MAJOR_VERSION@, apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_delta, libsvn_diff, libsvn_subr +Libs: -L${libdir} -lsvn_wc-1 +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_wc/node.c b/subversion/libsvn_wc/node.c index 5864776..71f0e48 100644 --- a/subversion/libsvn_wc/node.c +++ b/subversion/libsvn_wc/node.c @@ -1126,3 +1126,31 @@ svn_wc__node_was_moved_here(const char **moved_from_abspath, return SVN_NO_ERROR; } + +svn_error_t * +svn_wc__find_working_nodes_with_basename(apr_array_header_t **abspaths, + const char *wri_abspath, + const char *basename, + svn_node_kind_t kind, + svn_wc_context_t *wc_ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + return svn_error_trace(svn_wc__db_find_working_nodes_with_basename( + abspaths, wc_ctx->db, wri_abspath, basename, kind, + result_pool, scratch_pool)); +} + +svn_error_t * +svn_wc__find_copies_of_repos_path(apr_array_header_t **abspaths, + const char *wri_abspath, + const char *repos_relpath, + svn_node_kind_t kind, + svn_wc_context_t *wc_ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + return svn_error_trace(svn_wc__db_find_copies_of_repos_path( + abspaths, wc_ctx->db, wri_abspath, repos_relpath, + kind, result_pool, scratch_pool)); +} diff --git a/subversion/libsvn_wc/props.c b/subversion/libsvn_wc/props.c index f56899d..b314a34 100644 --- a/subversion/libsvn_wc/props.c +++ b/subversion/libsvn_wc/props.c @@ -2236,7 +2236,9 @@ svn_wc_canonicalize_svn_prop(const svn_string_t **propval_p, if (duplicate_targets->nelts > 1) { more_str = apr_psprintf(/*scratch_*/pool, - _(" (%d more duplicate targets found)"), + Q_(" (%d more duplicate target found)", + " (%d more duplicate targets found)", + duplicate_targets->nelts - 1), duplicate_targets->nelts - 1); } return svn_error_createf( diff --git a/subversion/libsvn_wc/questions.c b/subversion/libsvn_wc/questions.c index 0858363..c248f5d 100644 --- a/subversion/libsvn_wc/questions.c +++ b/subversion/libsvn_wc/questions.c @@ -475,7 +475,7 @@ internal_conflicted_p(svn_boolean_t *text_conflicted_p, svn_wc_conflict_action_t action; SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action, NULL, - db, local_abspath, + NULL, db, local_abspath, conflicts, scratch_pool, scratch_pool)); diff --git a/subversion/libsvn_wc/revert.c b/subversion/libsvn_wc/revert.c index bba1799..28a17f0 100644 --- a/subversion/libsvn_wc/revert.c +++ b/subversion/libsvn_wc/revert.c @@ -62,6 +62,18 @@ the addition of all the directory's children. Again, svn_wc_remove_from_revision_control() should do the trick. + - For a copy, we remove the item from disk as well. The thinking here + is that Subversion is responsible for the existence of the item: it + must have been created by something like 'svn copy' or 'svn merge'. + + - For a plain add, removing the file or directory from disk is optional. + The user's idea of Subversion's involvement could be either that + Subversion was just responsible for adding an existing item to version + control, as with 'svn add', and so should not be responsible for + deleting it from disk; or that Subversion is responsible for the + existence of the item, e.g. if created by 'svn patch' or svn mkdir'. + It depends on the use case. + Deletes - Restore properties to their unmodified state. @@ -285,6 +297,7 @@ revert_restore(svn_boolean_t *run_wq, svn_boolean_t metadata_only, svn_boolean_t use_commit_times, svn_boolean_t revert_root, + svn_boolean_t added_keep_local, const struct svn_wc__db_info_t *info, svn_cancel_func_t cancel_func, void *cancel_baton, @@ -344,8 +357,9 @@ revert_restore(svn_boolean_t *run_wq, } else { - if (!copied_here) + if (added_keep_local && !copied_here) { + /* It is a plain add, and we want to keep the local file/dir. */ if (notify_func && notify_required) notify_func(notify_baton, svn_wc_create_notify(local_abspath, @@ -359,8 +373,17 @@ revert_restore(svn_boolean_t *run_wq, scratch_pool)); return SVN_NO_ERROR; } + else if (!copied_here) + { + /* It is a plain add, and we don't want to keep the local file/dir. */ + status = svn_wc__db_status_not_present; + kind = svn_node_none; + recorded_size = SVN_INVALID_FILESIZE; + recorded_time = 0; + } else { + /* It is a copy, so we don't want to keep the local file/dir. */ /* ### Initialise to values which prevent the code below from * ### trying to restore anything to disk. * ### 'status' should be status_unknown but that doesn't exist. */ @@ -429,6 +452,7 @@ revert_restore(svn_boolean_t *run_wq, SVN_ERR(revert_restore(run_wq, db, child_abspath, depth, metadata_only, use_commit_times, FALSE /* revert root */, + added_keep_local, apr_hash_this_val(hi), cancel_func, cancel_baton, notify_func, notify_baton, @@ -536,11 +560,7 @@ revert_wc_data(svn_boolean_t *run_wq, /* If we expect a versioned item to be present then check that any item on disk matches the versioned item, if it doesn't match then fix it or delete it. */ - if (on_disk != svn_node_none - && status != svn_wc__db_status_server_excluded - && status != svn_wc__db_status_deleted - && status != svn_wc__db_status_excluded - && status != svn_wc__db_status_not_present) + if (on_disk != svn_node_none) { if (on_disk == svn_node_dir && kind != svn_node_dir) { @@ -560,7 +580,11 @@ revert_wc_data(svn_boolean_t *run_wq, on_disk = svn_node_none; } } - else if (on_disk == svn_node_file) + else if (on_disk == svn_node_file + && status != svn_wc__db_status_server_excluded + && status != svn_wc__db_status_deleted + && status != svn_wc__db_status_excluded + && status != svn_wc__db_status_not_present) { svn_boolean_t modified; apr_hash_t *props; @@ -712,6 +736,7 @@ revert(svn_wc__db_t *db, svn_boolean_t use_commit_times, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, + svn_boolean_t added_keep_local, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, @@ -762,6 +787,7 @@ revert(svn_wc__db_t *db, err = svn_error_trace( revert_restore(&run_queue, db, local_abspath, depth, metadata_only, use_commit_times, TRUE /* revert root */, + added_keep_local, info, cancel_func, cancel_baton, notify_func, notify_baton, scratch_pool)); @@ -791,6 +817,7 @@ revert_changelist(svn_wc__db_t *db, apr_hash_t *changelist_hash, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, + svn_boolean_t added_keep_local, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, @@ -809,7 +836,7 @@ revert_changelist(svn_wc__db_t *db, scratch_pool)) SVN_ERR(revert(db, local_abspath, svn_depth_empty, use_commit_times, clear_changelists, - metadata_only, + metadata_only, added_keep_local, cancel_func, cancel_baton, notify_func, notify_baton, scratch_pool)); @@ -845,6 +872,7 @@ revert_changelist(svn_wc__db_t *db, SVN_ERR(revert_changelist(db, child_abspath, depth, use_commit_times, changelist_hash, clear_changelists, metadata_only, + added_keep_local, cancel_func, cancel_baton, notify_func, notify_baton, iterpool)); @@ -871,6 +899,7 @@ revert_partial(svn_wc__db_t *db, svn_boolean_t use_commit_times, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, + svn_boolean_t added_keep_local, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, @@ -892,6 +921,7 @@ revert_partial(svn_wc__db_t *db, children. */ SVN_ERR(revert(db, local_abspath, svn_depth_empty, use_commit_times, clear_changelists, metadata_only, + added_keep_local, cancel_func, cancel_baton, notify_func, notify_baton, iterpool)); @@ -926,7 +956,7 @@ revert_partial(svn_wc__db_t *db, /* Revert just this node (depth=empty). */ SVN_ERR(revert(db, child_abspath, svn_depth_empty, use_commit_times, clear_changelists, - metadata_only, + metadata_only, added_keep_local, cancel_func, cancel_baton, notify_func, notify_baton, iterpool)); @@ -939,13 +969,14 @@ revert_partial(svn_wc__db_t *db, svn_error_t * -svn_wc_revert5(svn_wc_context_t *wc_ctx, +svn_wc_revert6(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_depth_t depth, svn_boolean_t use_commit_times, const apr_array_header_t *changelist_filter, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, + svn_boolean_t added_keep_local, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, @@ -963,6 +994,7 @@ svn_wc_revert5(svn_wc_context_t *wc_ctx, changelist_hash, clear_changelists, metadata_only, + added_keep_local, cancel_func, cancel_baton, notify_func, notify_baton, scratch_pool)); @@ -972,6 +1004,7 @@ svn_wc_revert5(svn_wc_context_t *wc_ctx, return svn_error_trace(revert(wc_ctx->db, local_abspath, depth, use_commit_times, clear_changelists, metadata_only, + added_keep_local, cancel_func, cancel_baton, notify_func, notify_baton, scratch_pool)); @@ -986,6 +1019,7 @@ svn_wc_revert5(svn_wc_context_t *wc_ctx, return svn_error_trace(revert_partial(wc_ctx->db, local_abspath, depth, use_commit_times, clear_changelists, metadata_only, + added_keep_local, cancel_func, cancel_baton, notify_func, notify_baton, scratch_pool)); diff --git a/subversion/libsvn_wc/tree_conflicts.c b/subversion/libsvn_wc/tree_conflicts.c index caf39ed..e846577 100644 --- a/subversion/libsvn_wc/tree_conflicts.c +++ b/subversion/libsvn_wc/tree_conflicts.c @@ -442,7 +442,7 @@ svn_wc__add_tree_conflict(svn_wc_context_t *wc_ctx, conflict->local_abspath, conflict->reason, conflict->action, - NULL, + NULL, NULL, scratch_pool, scratch_pool)); switch (conflict->operation) diff --git a/subversion/libsvn_wc/update_editor.c b/subversion/libsvn_wc/update_editor.c index f2b14dd..3073561 100644 --- a/subversion/libsvn_wc/update_editor.c +++ b/subversion/libsvn_wc/update_editor.c @@ -1235,9 +1235,11 @@ open_root(void *edit_baton, db->shadowed = TRUE; else if (have_work) { + const char *move_dst_op_root_abspath; const char *move_src_root_abspath; - SVN_ERR(svn_wc__db_base_moved_to(NULL, NULL, &move_src_root_abspath, + SVN_ERR(svn_wc__db_base_moved_to(NULL, &move_dst_op_root_abspath, + &move_src_root_abspath, NULL, eb->db, db->local_abspath, pool, pool)); @@ -1252,7 +1254,8 @@ open_root(void *edit_baton, tree_conflict, eb->db, move_src_root_abspath, svn_wc_conflict_reason_moved_away, svn_wc_conflict_action_edit, - move_src_root_abspath, pool, pool)); + move_src_root_abspath, + move_dst_op_root_abspath, pool, pool)); if (strcmp(db->local_abspath, move_src_root_abspath)) { @@ -1345,6 +1348,7 @@ check_tree_conflict(svn_skel_t **pconflict, svn_wc_conflict_reason_t reason = SVN_WC_CONFLICT_REASON_NONE; svn_boolean_t modified = FALSE; const char *move_src_op_root_abspath = NULL; + const char *move_dst_op_root_abspath = NULL; *pconflict = NULL; @@ -1397,8 +1401,8 @@ check_tree_conflict(svn_skel_t **pconflict, case svn_wc__db_status_deleted: { - SVN_ERR(svn_wc__db_base_moved_to(NULL, NULL, NULL, - &move_src_op_root_abspath, + SVN_ERR(svn_wc__db_base_moved_to(NULL, &move_dst_op_root_abspath, + NULL, &move_src_op_root_abspath, eb->db, local_abspath, scratch_pool, scratch_pool)); if (move_src_op_root_abspath) @@ -1530,6 +1534,7 @@ check_tree_conflict(svn_skel_t **pconflict, reason, action, move_src_op_root_abspath, + move_dst_op_root_abspath, result_pool, scratch_pool)); return SVN_NO_ERROR; @@ -2007,11 +2012,13 @@ add_directory(const char *path, { svn_wc_conflict_reason_t reason; const char *move_src_op_root_abspath; + const char *move_dst_op_root_abspath; /* So this deletion wasn't just a deletion, it is actually a replacement. Let's install a better tree conflict. */ SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, NULL, &move_src_op_root_abspath, + &move_dst_op_root_abspath, eb->db, db->local_abspath, tree_conflict, @@ -2024,6 +2031,7 @@ add_directory(const char *path, eb->db, db->local_abspath, reason, svn_wc_conflict_action_replace, move_src_op_root_abspath, + move_dst_op_root_abspath, db->pool, scratch_pool)); /* And now stop checking for conflicts here and just perform @@ -2148,8 +2156,8 @@ add_directory(const char *path, tree_conflict, eb->db, db->local_abspath, svn_wc_conflict_reason_unversioned, - svn_wc_conflict_action_add, NULL, - db->pool, scratch_pool)); + svn_wc_conflict_action_add, + NULL, NULL, db->pool, scratch_pool)); db->edit_conflict = tree_conflict; } } @@ -2336,7 +2344,7 @@ open_directory(const char *path, db->edit_conflict = tree_conflict; /* Other modifications wouldn't be a tree conflict */ - SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, NULL, NULL, + SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, NULL, NULL, NULL, eb->db, db->local_abspath, tree_conflict, db->pool, db->pool)); @@ -3220,11 +3228,13 @@ add_file(const char *path, { svn_wc_conflict_reason_t reason; const char *move_src_op_root_abspath; + const char *move_dst_op_root_abspath; /* So this deletion wasn't just a deletion, it is actually a replacement. Let's install a better tree conflict. */ SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, NULL, &move_src_op_root_abspath, + &move_dst_op_root_abspath, eb->db, fb->local_abspath, tree_conflict, @@ -3237,6 +3247,7 @@ add_file(const char *path, eb->db, fb->local_abspath, reason, svn_wc_conflict_action_replace, move_src_op_root_abspath, + move_dst_op_root_abspath, fb->pool, scratch_pool)); /* And now stop checking for conflicts here and just perform @@ -3363,7 +3374,7 @@ add_file(const char *path, eb->db, fb->local_abspath, svn_wc_conflict_reason_unversioned, svn_wc_conflict_action_add, - NULL, + NULL, NULL, fb->pool, scratch_pool)); } } @@ -3528,7 +3539,7 @@ open_file(const char *path, fb->edit_conflict = tree_conflict; /* Other modifications wouldn't be a tree conflict */ - SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, NULL, NULL, + SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, NULL, NULL, NULL, eb->db, fb->local_abspath, tree_conflict, scratch_pool, scratch_pool)); @@ -3797,7 +3808,7 @@ change_file_prop(void *file_baton, eb->db, fb->local_abspath, svn_wc_conflict_reason_edited, svn_wc_conflict_action_replace, - NULL, + NULL, NULL, fb->pool, scratch_pool)); SVN_ERR(complete_conflict(fb->edit_conflict, fb->edit_baton, diff --git a/subversion/libsvn_wc/upgrade.c b/subversion/libsvn_wc/upgrade.c index 3b9ab3a..0a218c7 100644 --- a/subversion/libsvn_wc/upgrade.c +++ b/subversion/libsvn_wc/upgrade.c @@ -1237,7 +1237,7 @@ svn_wc__upgrade_conflict_skel_from_raw(svn_skel_t **conflicts, db, wri_abspath, tc->reason, tc->action, - NULL, + NULL, NULL, scratch_pool, scratch_pool)); diff --git a/subversion/libsvn_wc/wc-checks.h b/subversion/libsvn_wc/wc-checks.h index 56f994c..162bca4 100644 --- a/subversion/libsvn_wc/wc-checks.h +++ b/subversion/libsvn_wc/wc-checks.h @@ -1,4 +1,4 @@ -/* This file is automatically generated from wc-checks.sql and /opt/svnrm-1.10/tempdir/subversion-1.10.6/subversion/libsvn_wc/token-map.h. +/* This file is automatically generated from wc-checks.sql and token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_VERIFICATION_TRIGGERS 0 diff --git a/subversion/libsvn_wc/wc-metadata.h b/subversion/libsvn_wc/wc-metadata.h index e7d7913..75e7503 100644 --- a/subversion/libsvn_wc/wc-metadata.h +++ b/subversion/libsvn_wc/wc-metadata.h @@ -1,4 +1,4 @@ -/* This file is automatically generated from wc-metadata.sql and /opt/svnrm-1.10/tempdir/subversion-1.10.6/subversion/libsvn_wc/token-map.h. +/* This file is automatically generated from wc-metadata.sql and token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_CREATE_SCHEMA 0 diff --git a/subversion/libsvn_wc/wc-queries.h b/subversion/libsvn_wc/wc-queries.h index b333e95..b6254e1 100644 --- a/subversion/libsvn_wc/wc-queries.h +++ b/subversion/libsvn_wc/wc-queries.h @@ -1,4 +1,4 @@ -/* This file is automatically generated from wc-queries.sql and subversion/libsvn_wc/token-map.h. +/* This file is automatically generated from wc-queries.sql and token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_SELECT_NODE_INFO 0 @@ -115,17 +115,31 @@ "LIMIT 1 " \ "" -#define STMT_SELECT_ACTUAL_NODE 10 -#define STMT_10_INFO {"STMT_SELECT_ACTUAL_NODE", NULL} +#define STMT_SELECT_PRESENT_HIGHEST_WORKING_NODES_BY_BASENAME_AND_KIND 10 +#define STMT_10_INFO {"STMT_SELECT_PRESENT_HIGHEST_WORKING_NODES_BY_BASENAME_AND_KIND", NULL} #define STMT_10 \ + "SELECT presence, local_relpath " \ + "FROM nodes n " \ + "WHERE wc_id = ?1 AND local_relpath = (CASE WHEN (parent_relpath) = '' THEN (?2) WHEN (?2) = '' THEN (parent_relpath) ELSE (parent_relpath) || '/' || (?2) END) " \ + " AND kind = ?3 " \ + " AND presence in ('normal', 'incomplete') " \ + " AND op_depth = (SELECT MAX(op_depth) " \ + " FROM NODES w " \ + " WHERE w.wc_id = ?1 " \ + " AND w.local_relpath = n.local_relpath) " \ + "" + +#define STMT_SELECT_ACTUAL_NODE 11 +#define STMT_11_INFO {"STMT_SELECT_ACTUAL_NODE", NULL} +#define STMT_11 \ "SELECT changelist, properties, conflict_data " \ "FROM actual_node " \ "WHERE wc_id = ?1 AND local_relpath = ?2 " \ "" -#define STMT_SELECT_NODE_CHILDREN_INFO 11 -#define STMT_11_INFO {"STMT_SELECT_NODE_CHILDREN_INFO", NULL} -#define STMT_11 \ +#define STMT_SELECT_NODE_CHILDREN_INFO 12 +#define STMT_12_INFO {"STMT_SELECT_NODE_CHILDREN_INFO", NULL} +#define STMT_12 \ "SELECT op_depth, nodes.repos_id, nodes.repos_path, presence, kind, revision, " \ " checksum, translated_size, changed_revision, changed_date, changed_author, " \ " depth, symlink_target, last_mod_time, properties, lock_token, lock_owner, " \ @@ -137,9 +151,9 @@ "ORDER BY local_relpath DESC, op_depth DESC " \ "" -#define STMT_SELECT_BASE_NODE_CHILDREN_INFO 12 -#define STMT_12_INFO {"STMT_SELECT_BASE_NODE_CHILDREN_INFO", NULL} -#define STMT_12 \ +#define STMT_SELECT_BASE_NODE_CHILDREN_INFO 13 +#define STMT_13_INFO {"STMT_SELECT_BASE_NODE_CHILDREN_INFO", NULL} +#define STMT_13 \ "SELECT op_depth, nodes.repos_id, nodes.repos_path, presence, kind, revision, " \ " checksum, translated_size, changed_revision, changed_date, changed_author, " \ " depth, symlink_target, last_mod_time, properties, lock_token, lock_owner, " \ @@ -151,50 +165,50 @@ "ORDER BY local_relpath DESC " \ "" -#define STMT_SELECT_NODE_CHILDREN_WALKER_INFO 13 -#define STMT_13_INFO {"STMT_SELECT_NODE_CHILDREN_WALKER_INFO", NULL} -#define STMT_13 \ +#define STMT_SELECT_NODE_CHILDREN_WALKER_INFO 14 +#define STMT_14_INFO {"STMT_SELECT_NODE_CHILDREN_WALKER_INFO", NULL} +#define STMT_14 \ "SELECT local_relpath, op_depth, presence, kind " \ "FROM nodes_current " \ "WHERE wc_id = ?1 AND parent_relpath = ?2 " \ "ORDER BY local_relpath " \ "" -#define STMT_SELECT_ACTUAL_CHILDREN_INFO 14 -#define STMT_14_INFO {"STMT_SELECT_ACTUAL_CHILDREN_INFO", NULL} -#define STMT_14 \ +#define STMT_SELECT_ACTUAL_CHILDREN_INFO 15 +#define STMT_15_INFO {"STMT_SELECT_ACTUAL_CHILDREN_INFO", NULL} +#define STMT_15 \ "SELECT local_relpath, changelist, properties, conflict_data " \ "FROM actual_node " \ "WHERE wc_id = ?1 AND parent_relpath = ?2 " \ "" -#define STMT_SELECT_REPOSITORY_BY_ID 15 -#define STMT_15_INFO {"STMT_SELECT_REPOSITORY_BY_ID", NULL} -#define STMT_15 \ +#define STMT_SELECT_REPOSITORY_BY_ID 16 +#define STMT_16_INFO {"STMT_SELECT_REPOSITORY_BY_ID", NULL} +#define STMT_16 \ "SELECT root, uuid FROM repository WHERE id = ?1 " \ "" -#define STMT_SELECT_WCROOT_NULL 16 -#define STMT_16_INFO {"STMT_SELECT_WCROOT_NULL", NULL} -#define STMT_16 \ +#define STMT_SELECT_WCROOT_NULL 17 +#define STMT_17_INFO {"STMT_SELECT_WCROOT_NULL", NULL} +#define STMT_17 \ "SELECT id FROM wcroot WHERE local_abspath IS NULL " \ "" -#define STMT_SELECT_REPOSITORY 17 -#define STMT_17_INFO {"STMT_SELECT_REPOSITORY", NULL} -#define STMT_17 \ +#define STMT_SELECT_REPOSITORY 18 +#define STMT_18_INFO {"STMT_SELECT_REPOSITORY", NULL} +#define STMT_18 \ "SELECT id FROM repository WHERE root = ?1 " \ "" -#define STMT_INSERT_REPOSITORY 18 -#define STMT_18_INFO {"STMT_INSERT_REPOSITORY", NULL} -#define STMT_18 \ +#define STMT_INSERT_REPOSITORY 19 +#define STMT_19_INFO {"STMT_INSERT_REPOSITORY", NULL} +#define STMT_19 \ "INSERT INTO repository (root, uuid) VALUES (?1, ?2) " \ "" -#define STMT_INSERT_NODE 19 -#define STMT_19_INFO {"STMT_INSERT_NODE", NULL} -#define STMT_19 \ +#define STMT_INSERT_NODE 20 +#define STMT_20_INFO {"STMT_INSERT_NODE", NULL} +#define STMT_20 \ "INSERT OR REPLACE INTO nodes ( " \ " wc_id, local_relpath, op_depth, parent_relpath, repos_id, repos_path, " \ " revision, presence, depth, kind, changed_revision, changed_date, " \ @@ -205,9 +219,9 @@ " ?15, ?16, ?17, ?18, ?19, ?20, ?21, ?22, ?23) " \ "" -#define STMT_SELECT_WORKING_PRESENT 20 -#define STMT_20_INFO {"STMT_SELECT_WORKING_PRESENT", NULL} -#define STMT_20 \ +#define STMT_SELECT_WORKING_PRESENT 21 +#define STMT_21_INFO {"STMT_SELECT_WORKING_PRESENT", NULL} +#define STMT_21 \ "SELECT local_relpath, kind, checksum, translated_size, last_mod_time " \ "FROM nodes n " \ "WHERE wc_id = ?1 " \ @@ -220,25 +234,25 @@ "ORDER BY local_relpath DESC " \ "" -#define STMT_DELETE_NODE_RECURSIVE 21 -#define STMT_21_INFO {"STMT_DELETE_NODE_RECURSIVE", NULL} -#define STMT_21 \ +#define STMT_DELETE_NODE_RECURSIVE 22 +#define STMT_22_INFO {"STMT_DELETE_NODE_RECURSIVE", NULL} +#define STMT_22 \ "DELETE FROM NODES " \ "WHERE wc_id = ?1 " \ " AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ "" -#define STMT_DELETE_NODE 22 -#define STMT_22_INFO {"STMT_DELETE_NODE", NULL} -#define STMT_22 \ +#define STMT_DELETE_NODE 23 +#define STMT_23_INFO {"STMT_DELETE_NODE", NULL} +#define STMT_23 \ "DELETE " \ "FROM NODES " \ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = ?3 " \ "" -#define STMT_DELETE_ACTUAL_FOR_BASE_RECURSIVE 23 -#define STMT_23_INFO {"STMT_DELETE_ACTUAL_FOR_BASE_RECURSIVE", NULL} -#define STMT_23 \ +#define STMT_DELETE_ACTUAL_FOR_BASE_RECURSIVE 24 +#define STMT_24_INFO {"STMT_DELETE_ACTUAL_FOR_BASE_RECURSIVE", NULL} +#define STMT_24 \ "DELETE FROM actual_node " \ "WHERE wc_id = ?1 AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ " AND EXISTS(SELECT 1 FROM NODES b " \ @@ -252,9 +266,9 @@ " AND presence in ('normal', 'incomplete', 'not-present')) " \ "" -#define STMT_DELETE_WORKING_BASE_DELETE 24 -#define STMT_24_INFO {"STMT_DELETE_WORKING_BASE_DELETE", NULL} -#define STMT_24 \ +#define STMT_DELETE_WORKING_BASE_DELETE 25 +#define STMT_25_INFO {"STMT_DELETE_WORKING_BASE_DELETE", NULL} +#define STMT_25 \ "DELETE FROM nodes " \ "WHERE wc_id = ?1 AND local_relpath = ?2 " \ " AND presence = 'base-deleted' " \ @@ -265,9 +279,9 @@ " AND op_depth > ?3) " \ "" -#define STMT_DELETE_WORKING_BASE_DELETE_RECURSIVE 25 -#define STMT_25_INFO {"STMT_DELETE_WORKING_BASE_DELETE_RECURSIVE", NULL} -#define STMT_25 \ +#define STMT_DELETE_WORKING_BASE_DELETE_RECURSIVE 26 +#define STMT_26_INFO {"STMT_DELETE_WORKING_BASE_DELETE_RECURSIVE", NULL} +#define STMT_26 \ "DELETE FROM nodes " \ "WHERE wc_id = ?1 AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ " AND presence = 'base-deleted' " \ @@ -278,35 +292,35 @@ " AND op_depth > ?3) " \ "" -#define STMT_DELETE_WORKING_RECURSIVE 26 -#define STMT_26_INFO {"STMT_DELETE_WORKING_RECURSIVE", NULL} -#define STMT_26 \ +#define STMT_DELETE_WORKING_RECURSIVE 27 +#define STMT_27_INFO {"STMT_DELETE_WORKING_RECURSIVE", NULL} +#define STMT_27 \ "DELETE FROM nodes " \ "WHERE wc_id = ?1 AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ " AND op_depth > 0 " \ "" -#define STMT_DELETE_BASE_RECURSIVE 27 -#define STMT_27_INFO {"STMT_DELETE_BASE_RECURSIVE", NULL} -#define STMT_27 \ +#define STMT_DELETE_BASE_RECURSIVE 28 +#define STMT_28_INFO {"STMT_DELETE_BASE_RECURSIVE", NULL} +#define STMT_28 \ "DELETE FROM nodes " \ "WHERE wc_id = ?1 AND (local_relpath = ?2 " \ " OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \ " AND op_depth = 0 " \ "" -#define STMT_DELETE_WORKING_OP_DEPTH 28 -#define STMT_28_INFO {"STMT_DELETE_WORKING_OP_DEPTH", NULL} -#define STMT_28 \ +#define STMT_DELETE_WORKING_OP_DEPTH 29 +#define STMT_29_INFO {"STMT_DELETE_WORKING_OP_DEPTH", NULL} +#define STMT_29 \ "DELETE FROM nodes " \ "WHERE wc_id = ?1 " \ " AND (local_relpath = ?2 OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \ " AND op_depth = ?3 " \ "" -#define STMT_SELECT_LAYER_FOR_REPLACE 29 -#define STMT_29_INFO {"STMT_SELECT_LAYER_FOR_REPLACE", NULL} -#define STMT_29 \ +#define STMT_SELECT_LAYER_FOR_REPLACE 30 +#define STMT_30_INFO {"STMT_SELECT_LAYER_FOR_REPLACE", NULL} +#define STMT_30 \ "SELECT s.local_relpath, s.kind, " \ " (CASE WHEN (?2) = '' THEN (CASE WHEN (?4) = '' THEN (s.local_relpath) WHEN (s.local_relpath) = '' THEN (?4) ELSE (?4) || '/' || (s.local_relpath) END) WHEN (?4) = '' THEN (CASE WHEN (?2) = '' THEN (s.local_relpath) WHEN SUBSTR((s.local_relpath), 1, LENGTH(?2)) = (?2) THEN CASE WHEN LENGTH(?2) = LENGTH(s.local_relpath) THEN '' WHEN SUBSTR((s.local_relpath), LENGTH(?2)+1, 1) = '/' THEN SUBSTR((s.local_relpath), LENGTH(?2)+2) END END) WHEN SUBSTR((s.local_relpath), 1, LENGTH(?2)) = (?2) THEN CASE WHEN LENGTH(?2) = LENGTH(s.local_relpath) THEN (?4) WHEN SUBSTR((s.local_relpath), LENGTH(?2)+1, 1) = '/' THEN (?4) || SUBSTR((s.local_relpath), LENGTH(?2)+1) END END) drp, 'normal' " \ "FROM nodes s " \ @@ -323,9 +337,9 @@ "ORDER BY s.local_relpath " \ "" -#define STMT_SELECT_DESCENDANTS_OP_DEPTH_RV 30 -#define STMT_30_INFO {"STMT_SELECT_DESCENDANTS_OP_DEPTH_RV", NULL} -#define STMT_30 \ +#define STMT_SELECT_DESCENDANTS_OP_DEPTH_RV 31 +#define STMT_31_INFO {"STMT_SELECT_DESCENDANTS_OP_DEPTH_RV", NULL} +#define STMT_31 \ "SELECT local_relpath, kind " \ "FROM nodes " \ "WHERE wc_id = ?1 " \ @@ -335,9 +349,9 @@ "ORDER BY local_relpath DESC " \ "" -#define STMT_COPY_NODE_MOVE 31 -#define STMT_31_INFO {"STMT_COPY_NODE_MOVE", NULL} -#define STMT_31 \ +#define STMT_COPY_NODE_MOVE 32 +#define STMT_32_INFO {"STMT_COPY_NODE_MOVE", NULL} +#define STMT_32 \ "INSERT OR REPLACE INTO nodes ( " \ " wc_id, local_relpath, op_depth, parent_relpath, repos_id, repos_path, " \ " revision, presence, depth, kind, changed_revision, changed_date, " \ @@ -356,9 +370,9 @@ "WHERE s.wc_id = ?1 AND s.local_relpath = ?2 AND s.op_depth = ?3 " \ "" -#define STMT_SELECT_NO_LONGER_MOVED_RV 32 -#define STMT_32_INFO {"STMT_SELECT_NO_LONGER_MOVED_RV", NULL} -#define STMT_32 \ +#define STMT_SELECT_NO_LONGER_MOVED_RV 33 +#define STMT_33_INFO {"STMT_SELECT_NO_LONGER_MOVED_RV", NULL} +#define STMT_33 \ "SELECT d.local_relpath, (CASE WHEN (?2) = '' THEN (CASE WHEN (?4) = '' THEN (d.local_relpath) WHEN (d.local_relpath) = '' THEN (?4) ELSE (?4) || '/' || (d.local_relpath) END) WHEN (?4) = '' THEN (CASE WHEN (?2) = '' THEN (d.local_relpath) WHEN SUBSTR((d.local_relpath), 1, LENGTH(?2)) = (?2) THEN CASE WHEN LENGTH(?2) = LENGTH(d.local_relpath) THEN '' WHEN SUBSTR((d.local_relpath), LENGTH(?2)+1, 1) = '/' THEN SUBSTR((d.local_relpath), LENGTH(?2)+2) END END) WHEN SUBSTR((d.local_relpath), 1, LENGTH(?2)) = (?2) THEN CASE WHEN LENGTH(?2) = LENGTH(d.local_relpath) THEN (?4) WHEN SUBSTR((d.local_relpath), LENGTH(?2)+1, 1) = '/' THEN (?4) || SUBSTR((d.local_relpath), LENGTH(?2)+1) END END) srp, " \ " b.presence, b.op_depth " \ "FROM nodes d " \ @@ -377,9 +391,9 @@ "ORDER BY d.local_relpath DESC " \ "" -#define STMT_SELECT_OP_DEPTH_CHILDREN 33 -#define STMT_33_INFO {"STMT_SELECT_OP_DEPTH_CHILDREN", NULL} -#define STMT_33 \ +#define STMT_SELECT_OP_DEPTH_CHILDREN 34 +#define STMT_34_INFO {"STMT_SELECT_OP_DEPTH_CHILDREN", NULL} +#define STMT_34 \ "SELECT local_relpath, kind FROM nodes " \ "WHERE wc_id = ?1 " \ " AND parent_relpath = ?2 " \ @@ -389,9 +403,9 @@ "ORDER BY local_relpath " \ "" -#define STMT_SELECT_OP_DEPTH_CHILDREN_EXISTS 34 -#define STMT_34_INFO {"STMT_SELECT_OP_DEPTH_CHILDREN_EXISTS", NULL} -#define STMT_34 \ +#define STMT_SELECT_OP_DEPTH_CHILDREN_EXISTS 35 +#define STMT_35_INFO {"STMT_SELECT_OP_DEPTH_CHILDREN_EXISTS", NULL} +#define STMT_35 \ "SELECT local_relpath, kind FROM nodes " \ "WHERE wc_id = ?1 " \ " AND parent_relpath = ?2 " \ @@ -400,9 +414,9 @@ "ORDER BY local_relpath " \ "" -#define STMT_SELECT_GE_OP_DEPTH_CHILDREN 35 -#define STMT_35_INFO {"STMT_SELECT_GE_OP_DEPTH_CHILDREN", NULL} -#define STMT_35 \ +#define STMT_SELECT_GE_OP_DEPTH_CHILDREN 36 +#define STMT_36_INFO {"STMT_SELECT_GE_OP_DEPTH_CHILDREN", NULL} +#define STMT_36 \ "SELECT 1 FROM nodes " \ "WHERE wc_id = ?1 AND parent_relpath = ?2 " \ " AND (op_depth > ?3 OR (op_depth = ?3 " \ @@ -414,9 +428,9 @@ " WHERE wc_id = ?1 AND n.local_relpath = a.local_relpath) " \ "" -#define STMT_DELETE_SHADOWED_RECURSIVE 36 -#define STMT_36_INFO {"STMT_DELETE_SHADOWED_RECURSIVE", NULL} -#define STMT_36 \ +#define STMT_DELETE_SHADOWED_RECURSIVE 37 +#define STMT_37_INFO {"STMT_DELETE_SHADOWED_RECURSIVE", NULL} +#define STMT_37 \ "DELETE FROM nodes " \ "WHERE wc_id = ?1 " \ " AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ @@ -424,26 +438,26 @@ " OR (op_depth = ?3 AND presence = 'base-deleted')) " \ "" -#define STMT_CLEAR_MOVED_TO_FROM_DEST 37 -#define STMT_37_INFO {"STMT_CLEAR_MOVED_TO_FROM_DEST", NULL} -#define STMT_37 \ +#define STMT_CLEAR_MOVED_TO_FROM_DEST 38 +#define STMT_38_INFO {"STMT_CLEAR_MOVED_TO_FROM_DEST", NULL} +#define STMT_38 \ "UPDATE NODES SET moved_to = NULL " \ "WHERE wc_id = ?1 " \ " AND moved_to = ?2 " \ "" -#define STMT_SELECT_NOT_PRESENT_DESCENDANTS 38 -#define STMT_38_INFO {"STMT_SELECT_NOT_PRESENT_DESCENDANTS", NULL} -#define STMT_38 \ +#define STMT_SELECT_NOT_PRESENT_DESCENDANTS 39 +#define STMT_39_INFO {"STMT_SELECT_NOT_PRESENT_DESCENDANTS", NULL} +#define STMT_39 \ "SELECT local_relpath FROM nodes " \ "WHERE wc_id = ?1 AND op_depth = ?3 " \ " AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ " AND presence = 'not-present' " \ "" -#define STMT_COMMIT_DESCENDANTS_TO_BASE 39 -#define STMT_39_INFO {"STMT_COMMIT_DESCENDANTS_TO_BASE", NULL} -#define STMT_39 \ +#define STMT_COMMIT_DESCENDANTS_TO_BASE 40 +#define STMT_40_INFO {"STMT_COMMIT_DESCENDANTS_TO_BASE", NULL} +#define STMT_40 \ "UPDATE NODES SET op_depth = 0, " \ " repos_id = ?4, " \ " repos_path = (CASE WHEN (?2) = '' THEN (CASE WHEN (?5) = '' THEN (local_relpath) WHEN (local_relpath) = '' THEN (?5) ELSE (?5) || '/' || (local_relpath) END) WHEN (?5) = '' THEN (CASE WHEN (?2) = '' THEN (local_relpath) WHEN SUBSTR((local_relpath), 1, LENGTH(?2)) = (?2) THEN CASE WHEN LENGTH(?2) = LENGTH(local_relpath) THEN '' WHEN SUBSTR((local_relpath), LENGTH(?2)+1, 1) = '/' THEN SUBSTR((local_relpath), LENGTH(?2)+2) END END) WHEN SUBSTR((local_relpath), 1, LENGTH(?2)) = (?2) THEN CASE WHEN LENGTH(?2) = LENGTH(local_relpath) THEN (?5) WHEN SUBSTR((local_relpath), LENGTH(?2)+1, 1) = '/' THEN (?5) || SUBSTR((local_relpath), LENGTH(?2)+1) END END), " \ @@ -461,17 +475,17 @@ " AND op_depth = ?3 " \ "" -#define STMT_SELECT_NODE_CHILDREN 40 -#define STMT_40_INFO {"STMT_SELECT_NODE_CHILDREN", NULL} -#define STMT_40 \ +#define STMT_SELECT_NODE_CHILDREN 41 +#define STMT_41_INFO {"STMT_SELECT_NODE_CHILDREN", NULL} +#define STMT_41 \ "SELECT DISTINCT local_relpath FROM nodes " \ "WHERE wc_id = ?1 AND parent_relpath = ?2 " \ "ORDER BY local_relpath " \ "" -#define STMT_SELECT_WORKING_CHILDREN 41 -#define STMT_41_INFO {"STMT_SELECT_WORKING_CHILDREN", NULL} -#define STMT_41 \ +#define STMT_SELECT_WORKING_CHILDREN 42 +#define STMT_42_INFO {"STMT_SELECT_WORKING_CHILDREN", NULL} +#define STMT_42 \ "SELECT DISTINCT local_relpath FROM nodes " \ "WHERE wc_id = ?1 AND parent_relpath = ?2 " \ " AND (op_depth > (SELECT MAX(op_depth) FROM nodes " \ @@ -483,56 +497,56 @@ "ORDER BY local_relpath " \ "" -#define STMT_SELECT_BASE_NOT_PRESENT_CHILDREN 42 -#define STMT_42_INFO {"STMT_SELECT_BASE_NOT_PRESENT_CHILDREN", NULL} -#define STMT_42 \ +#define STMT_SELECT_BASE_NOT_PRESENT_CHILDREN 43 +#define STMT_43_INFO {"STMT_SELECT_BASE_NOT_PRESENT_CHILDREN", NULL} +#define STMT_43 \ "SELECT local_relpath FROM nodes " \ "WHERE wc_id = ?1 AND parent_relpath = ?2 AND op_depth = 0 " \ " AND presence = 'not-present' " \ "ORDER BY local_relpath " \ "" -#define STMT_SELECT_NODE_PROPS 43 -#define STMT_43_INFO {"STMT_SELECT_NODE_PROPS", NULL} -#define STMT_43 \ +#define STMT_SELECT_NODE_PROPS 44 +#define STMT_44_INFO {"STMT_SELECT_NODE_PROPS", NULL} +#define STMT_44 \ "SELECT properties, presence FROM nodes " \ "WHERE wc_id = ?1 AND local_relpath = ?2 " \ "ORDER BY op_depth DESC " \ "" -#define STMT_SELECT_ACTUAL_PROPS 44 -#define STMT_44_INFO {"STMT_SELECT_ACTUAL_PROPS", NULL} -#define STMT_44 \ +#define STMT_SELECT_ACTUAL_PROPS 45 +#define STMT_45_INFO {"STMT_SELECT_ACTUAL_PROPS", NULL} +#define STMT_45 \ "SELECT properties FROM actual_node " \ "WHERE wc_id = ?1 AND local_relpath = ?2 " \ "" -#define STMT_UPDATE_ACTUAL_PROPS 45 -#define STMT_45_INFO {"STMT_UPDATE_ACTUAL_PROPS", NULL} -#define STMT_45 \ +#define STMT_UPDATE_ACTUAL_PROPS 46 +#define STMT_46_INFO {"STMT_UPDATE_ACTUAL_PROPS", NULL} +#define STMT_46 \ "UPDATE actual_node SET properties = ?3 " \ "WHERE wc_id = ?1 AND local_relpath = ?2 " \ "" -#define STMT_INSERT_ACTUAL_PROPS 46 -#define STMT_46_INFO {"STMT_INSERT_ACTUAL_PROPS", NULL} -#define STMT_46 \ +#define STMT_INSERT_ACTUAL_PROPS 47 +#define STMT_47_INFO {"STMT_INSERT_ACTUAL_PROPS", NULL} +#define STMT_47 \ "INSERT INTO actual_node (wc_id, local_relpath, parent_relpath, properties) " \ "VALUES (?1, ?2, ?3, ?4) " \ "" -#define STMT_INSERT_LOCK 47 -#define STMT_47_INFO {"STMT_INSERT_LOCK", NULL} -#define STMT_47 \ +#define STMT_INSERT_LOCK 48 +#define STMT_48_INFO {"STMT_INSERT_LOCK", NULL} +#define STMT_48 \ "INSERT OR REPLACE INTO lock " \ "(repos_id, repos_relpath, lock_token, lock_owner, lock_comment, " \ " lock_date) " \ "VALUES (?1, ?2, ?3, ?4, ?5, ?6) " \ "" -#define STMT_SELECT_BASE_NODE_LOCK_TOKENS_RECURSIVE 48 -#define STMT_48_INFO {"STMT_SELECT_BASE_NODE_LOCK_TOKENS_RECURSIVE", NULL} -#define STMT_48 \ +#define STMT_SELECT_BASE_NODE_LOCK_TOKENS_RECURSIVE 49 +#define STMT_49_INFO {"STMT_SELECT_BASE_NODE_LOCK_TOKENS_RECURSIVE", NULL} +#define STMT_49 \ "SELECT nodes.repos_id, nodes.repos_path, lock_token " \ "FROM nodes " \ "LEFT JOIN lock ON nodes.repos_id = lock.repos_id " \ @@ -541,30 +555,30 @@ " AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ "" -#define STMT_INSERT_WCROOT 49 -#define STMT_49_INFO {"STMT_INSERT_WCROOT", NULL} -#define STMT_49 \ +#define STMT_INSERT_WCROOT 50 +#define STMT_50_INFO {"STMT_INSERT_WCROOT", NULL} +#define STMT_50 \ "INSERT INTO wcroot (local_abspath) " \ "VALUES (?1) " \ "" -#define STMT_UPDATE_BASE_NODE_DAV_CACHE 50 -#define STMT_50_INFO {"STMT_UPDATE_BASE_NODE_DAV_CACHE", NULL} -#define STMT_50 \ +#define STMT_UPDATE_BASE_NODE_DAV_CACHE 51 +#define STMT_51_INFO {"STMT_UPDATE_BASE_NODE_DAV_CACHE", NULL} +#define STMT_51 \ "UPDATE nodes SET dav_cache = ?3 " \ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \ "" -#define STMT_SELECT_BASE_DAV_CACHE 51 -#define STMT_51_INFO {"STMT_SELECT_BASE_DAV_CACHE", NULL} -#define STMT_51 \ +#define STMT_SELECT_BASE_DAV_CACHE 52 +#define STMT_52_INFO {"STMT_SELECT_BASE_DAV_CACHE", NULL} +#define STMT_52 \ "SELECT dav_cache FROM nodes " \ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \ "" -#define STMT_SELECT_DELETION_INFO 52 -#define STMT_52_INFO {"STMT_SELECT_DELETION_INFO", NULL} -#define STMT_52 \ +#define STMT_SELECT_DELETION_INFO 53 +#define STMT_53_INFO {"STMT_SELECT_DELETION_INFO", NULL} +#define STMT_53 \ "SELECT b.presence, w.presence, w.op_depth, w.moved_to " \ "FROM nodes w " \ "LEFT JOIN nodes b ON b.wc_id = ?1 AND b.local_relpath = ?2 AND b.op_depth = 0 " \ @@ -575,18 +589,18 @@ "LIMIT 1 " \ "" -#define STMT_SELECT_MOVED_TO_NODE 53 -#define STMT_53_INFO {"STMT_SELECT_MOVED_TO_NODE", NULL} -#define STMT_53 \ +#define STMT_SELECT_MOVED_TO_NODE 54 +#define STMT_54_INFO {"STMT_SELECT_MOVED_TO_NODE", NULL} +#define STMT_54 \ "SELECT op_depth, moved_to " \ "FROM nodes " \ "WHERE wc_id = ?1 AND local_relpath = ?2 AND moved_to IS NOT NULL " \ "ORDER BY op_depth DESC " \ "" -#define STMT_SELECT_OP_DEPTH_MOVED_TO 54 -#define STMT_54_INFO {"STMT_SELECT_OP_DEPTH_MOVED_TO", NULL} -#define STMT_54 \ +#define STMT_SELECT_OP_DEPTH_MOVED_TO 55 +#define STMT_55_INFO {"STMT_SELECT_OP_DEPTH_MOVED_TO", NULL} +#define STMT_55 \ "SELECT op_depth, moved_to " \ "FROM nodes " \ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth > ?3 " \ @@ -597,17 +611,17 @@ "LIMIT 1 " \ "" -#define STMT_SELECT_MOVED_TO 55 -#define STMT_55_INFO {"STMT_SELECT_MOVED_TO", NULL} -#define STMT_55 \ +#define STMT_SELECT_MOVED_TO 56 +#define STMT_56_INFO {"STMT_SELECT_MOVED_TO", NULL} +#define STMT_56 \ "SELECT moved_to " \ "FROM nodes " \ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = ?3 " \ "" -#define STMT_SELECT_MOVED_BACK 56 -#define STMT_56_INFO {"STMT_SELECT_MOVED_BACK", NULL} -#define STMT_56 \ +#define STMT_SELECT_MOVED_BACK 57 +#define STMT_57_INFO {"STMT_SELECT_MOVED_BACK", NULL} +#define STMT_57 \ "SELECT u.local_relpath, " \ " u.presence, u.repos_id, u.repos_path, u.revision, " \ " l.presence, l.repos_id, l.repos_path, l.revision, " \ @@ -633,71 +647,71 @@ " AND u.op_depth = ?4 " \ "" -#define STMT_DELETE_LOCK 57 -#define STMT_57_INFO {"STMT_DELETE_LOCK", NULL} -#define STMT_57 \ +#define STMT_DELETE_LOCK 58 +#define STMT_58_INFO {"STMT_DELETE_LOCK", NULL} +#define STMT_58 \ "DELETE FROM lock " \ "WHERE repos_id = ?1 AND repos_relpath = ?2 " \ "" -#define STMT_DELETE_LOCK_RECURSIVELY 58 -#define STMT_58_INFO {"STMT_DELETE_LOCK_RECURSIVELY", NULL} -#define STMT_58 \ +#define STMT_DELETE_LOCK_RECURSIVELY 59 +#define STMT_59_INFO {"STMT_DELETE_LOCK_RECURSIVELY", NULL} +#define STMT_59 \ "DELETE FROM lock " \ "WHERE repos_id = ?1 AND (repos_relpath = ?2 OR (((repos_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((repos_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \ "" -#define STMT_CLEAR_BASE_NODE_RECURSIVE_DAV_CACHE 59 -#define STMT_59_INFO {"STMT_CLEAR_BASE_NODE_RECURSIVE_DAV_CACHE", NULL} -#define STMT_59 \ +#define STMT_CLEAR_BASE_NODE_RECURSIVE_DAV_CACHE 60 +#define STMT_60_INFO {"STMT_CLEAR_BASE_NODE_RECURSIVE_DAV_CACHE", NULL} +#define STMT_60 \ "UPDATE nodes SET dav_cache = NULL " \ "WHERE dav_cache IS NOT NULL AND wc_id = ?1 AND op_depth = 0 " \ " AND (local_relpath = ?2 " \ " OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \ "" -#define STMT_RECURSIVE_UPDATE_NODE_REPO 60 -#define STMT_60_INFO {"STMT_RECURSIVE_UPDATE_NODE_REPO", NULL} -#define STMT_60 \ +#define STMT_RECURSIVE_UPDATE_NODE_REPO 61 +#define STMT_61_INFO {"STMT_RECURSIVE_UPDATE_NODE_REPO", NULL} +#define STMT_61 \ "UPDATE nodes SET repos_id = ?4, dav_cache = NULL " \ "WHERE (wc_id = ?1 AND local_relpath = ?2 AND repos_id = ?3) " \ " OR (wc_id = ?1 AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ " AND repos_id = ?3) " \ "" -#define STMT_UPDATE_LOCK_REPOS_ID 61 -#define STMT_61_INFO {"STMT_UPDATE_LOCK_REPOS_ID", NULL} -#define STMT_61 \ +#define STMT_UPDATE_LOCK_REPOS_ID 62 +#define STMT_62_INFO {"STMT_UPDATE_LOCK_REPOS_ID", NULL} +#define STMT_62 \ "UPDATE lock SET repos_id = ?2 " \ "WHERE repos_id = ?1 " \ "" -#define STMT_UPDATE_NODE_FILEINFO 62 -#define STMT_62_INFO {"STMT_UPDATE_NODE_FILEINFO", NULL} -#define STMT_62 \ +#define STMT_UPDATE_NODE_FILEINFO 63 +#define STMT_63_INFO {"STMT_UPDATE_NODE_FILEINFO", NULL} +#define STMT_63 \ "UPDATE nodes SET translated_size = ?3, last_mod_time = ?4 " \ "WHERE wc_id = ?1 AND local_relpath = ?2 " \ " AND op_depth = (SELECT MAX(op_depth) FROM nodes " \ " WHERE wc_id = ?1 AND local_relpath = ?2) " \ "" -#define STMT_INSERT_ACTUAL_CONFLICT 63 -#define STMT_63_INFO {"STMT_INSERT_ACTUAL_CONFLICT", NULL} -#define STMT_63 \ +#define STMT_INSERT_ACTUAL_CONFLICT 64 +#define STMT_64_INFO {"STMT_INSERT_ACTUAL_CONFLICT", NULL} +#define STMT_64 \ "INSERT INTO actual_node (wc_id, local_relpath, conflict_data, parent_relpath) " \ "VALUES (?1, ?2, ?3, ?4) " \ "" -#define STMT_UPDATE_ACTUAL_CONFLICT 64 -#define STMT_64_INFO {"STMT_UPDATE_ACTUAL_CONFLICT", NULL} -#define STMT_64 \ +#define STMT_UPDATE_ACTUAL_CONFLICT 65 +#define STMT_65_INFO {"STMT_UPDATE_ACTUAL_CONFLICT", NULL} +#define STMT_65 \ "UPDATE actual_node SET conflict_data = ?3 " \ "WHERE wc_id = ?1 AND local_relpath = ?2 " \ "" -#define STMT_UPDATE_ACTUAL_CHANGELISTS 65 -#define STMT_65_INFO {"STMT_UPDATE_ACTUAL_CHANGELISTS", NULL} -#define STMT_65 \ +#define STMT_UPDATE_ACTUAL_CHANGELISTS 66 +#define STMT_66_INFO {"STMT_UPDATE_ACTUAL_CHANGELISTS", NULL} +#define STMT_66 \ "UPDATE actual_node SET changelist = ?3 " \ "WHERE wc_id = ?1 " \ " AND (local_relpath = ?2 OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \ @@ -707,16 +721,16 @@ " AND kind = 'file') " \ "" -#define STMT_UPDATE_ACTUAL_CLEAR_CHANGELIST 66 -#define STMT_66_INFO {"STMT_UPDATE_ACTUAL_CLEAR_CHANGELIST", NULL} -#define STMT_66 \ +#define STMT_UPDATE_ACTUAL_CLEAR_CHANGELIST 67 +#define STMT_67_INFO {"STMT_UPDATE_ACTUAL_CLEAR_CHANGELIST", NULL} +#define STMT_67 \ "UPDATE actual_node SET changelist = NULL " \ " WHERE wc_id = ?1 AND local_relpath = ?2 " \ "" -#define STMT_MARK_SKIPPED_CHANGELIST_DIRS 67 -#define STMT_67_INFO {"STMT_MARK_SKIPPED_CHANGELIST_DIRS", NULL} -#define STMT_67 \ +#define STMT_MARK_SKIPPED_CHANGELIST_DIRS 68 +#define STMT_68_INFO {"STMT_MARK_SKIPPED_CHANGELIST_DIRS", NULL} +#define STMT_68 \ "INSERT INTO changelist_list (wc_id, local_relpath, notify, changelist) " \ "SELECT wc_id, local_relpath, 7, ?3 " \ "FROM targets_list " \ @@ -725,17 +739,17 @@ " AND kind = 'dir' " \ "" -#define STMT_RESET_ACTUAL_WITH_CHANGELIST 68 -#define STMT_68_INFO {"STMT_RESET_ACTUAL_WITH_CHANGELIST", NULL} -#define STMT_68 \ +#define STMT_RESET_ACTUAL_WITH_CHANGELIST 69 +#define STMT_69_INFO {"STMT_RESET_ACTUAL_WITH_CHANGELIST", NULL} +#define STMT_69 \ "REPLACE INTO actual_node ( " \ " wc_id, local_relpath, parent_relpath, changelist) " \ "VALUES (?1, ?2, ?3, ?4) " \ "" -#define STMT_CREATE_CHANGELIST_LIST 69 -#define STMT_69_INFO {"STMT_CREATE_CHANGELIST_LIST", NULL} -#define STMT_69 \ +#define STMT_CREATE_CHANGELIST_LIST 70 +#define STMT_70_INFO {"STMT_CREATE_CHANGELIST_LIST", NULL} +#define STMT_70 \ "DROP TABLE IF EXISTS changelist_list; " \ "CREATE TEMPORARY TABLE changelist_list ( " \ " wc_id INTEGER NOT NULL, " \ @@ -746,9 +760,9 @@ ") " \ "" -#define STMT_CREATE_CHANGELIST_TRIGGER 70 -#define STMT_70_INFO {"STMT_CREATE_CHANGELIST_TRIGGER", NULL} -#define STMT_70 \ +#define STMT_CREATE_CHANGELIST_TRIGGER 71 +#define STMT_71_INFO {"STMT_CREATE_CHANGELIST_TRIGGER", NULL} +#define STMT_71 \ "DROP TRIGGER IF EXISTS trigger_changelist_list_change; " \ "CREATE TEMPORARY TRIGGER trigger_changelist_list_change " \ "BEFORE UPDATE ON actual_node " \ @@ -763,25 +777,25 @@ "END " \ "" -#define STMT_FINALIZE_CHANGELIST 71 -#define STMT_71_INFO {"STMT_FINALIZE_CHANGELIST", NULL} -#define STMT_71 \ +#define STMT_FINALIZE_CHANGELIST 72 +#define STMT_72_INFO {"STMT_FINALIZE_CHANGELIST", NULL} +#define STMT_72 \ "DROP TRIGGER trigger_changelist_list_change; " \ "DROP TABLE changelist_list; " \ "DROP TABLE targets_list " \ "" -#define STMT_SELECT_CHANGELIST_LIST 72 -#define STMT_72_INFO {"STMT_SELECT_CHANGELIST_LIST", NULL} -#define STMT_72 \ +#define STMT_SELECT_CHANGELIST_LIST 73 +#define STMT_73_INFO {"STMT_SELECT_CHANGELIST_LIST", NULL} +#define STMT_73 \ "SELECT wc_id, local_relpath, notify, changelist " \ "FROM changelist_list " \ "ORDER BY wc_id, local_relpath ASC, notify DESC " \ "" -#define STMT_CREATE_TARGETS_LIST 73 -#define STMT_73_INFO {"STMT_CREATE_TARGETS_LIST", NULL} -#define STMT_73 \ +#define STMT_CREATE_TARGETS_LIST 74 +#define STMT_74_INFO {"STMT_CREATE_TARGETS_LIST", NULL} +#define STMT_74 \ "DROP TABLE IF EXISTS targets_list; " \ "CREATE TEMPORARY TABLE targets_list ( " \ " wc_id INTEGER NOT NULL, " \ @@ -792,15 +806,15 @@ " ); " \ "" -#define STMT_DROP_TARGETS_LIST 74 -#define STMT_74_INFO {"STMT_DROP_TARGETS_LIST", NULL} -#define STMT_74 \ +#define STMT_DROP_TARGETS_LIST 75 +#define STMT_75_INFO {"STMT_DROP_TARGETS_LIST", NULL} +#define STMT_75 \ "DROP TABLE targets_list " \ "" -#define STMT_INSERT_TARGET 75 -#define STMT_75_INFO {"STMT_INSERT_TARGET", NULL} -#define STMT_75 \ +#define STMT_INSERT_TARGET 76 +#define STMT_76_INFO {"STMT_INSERT_TARGET", NULL} +#define STMT_76 \ "INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind) " \ "SELECT wc_id, local_relpath, parent_relpath, kind " \ "FROM nodes_current " \ @@ -808,9 +822,9 @@ " AND local_relpath = ?2 " \ "" -#define STMT_INSERT_TARGET_DEPTH_FILES 76 -#define STMT_76_INFO {"STMT_INSERT_TARGET_DEPTH_FILES", NULL} -#define STMT_76 \ +#define STMT_INSERT_TARGET_DEPTH_FILES 77 +#define STMT_77_INFO {"STMT_INSERT_TARGET_DEPTH_FILES", NULL} +#define STMT_77 \ "INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind) " \ "SELECT wc_id, local_relpath, parent_relpath, kind " \ "FROM nodes_current " \ @@ -819,9 +833,9 @@ " AND kind = 'file' " \ "" -#define STMT_INSERT_TARGET_DEPTH_IMMEDIATES 77 -#define STMT_77_INFO {"STMT_INSERT_TARGET_DEPTH_IMMEDIATES", NULL} -#define STMT_77 \ +#define STMT_INSERT_TARGET_DEPTH_IMMEDIATES 78 +#define STMT_78_INFO {"STMT_INSERT_TARGET_DEPTH_IMMEDIATES", NULL} +#define STMT_78 \ "INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind) " \ "SELECT wc_id, local_relpath, parent_relpath, kind " \ "FROM nodes_current " \ @@ -829,9 +843,9 @@ " AND parent_relpath = ?2 " \ "" -#define STMT_INSERT_TARGET_DEPTH_INFINITY 78 -#define STMT_78_INFO {"STMT_INSERT_TARGET_DEPTH_INFINITY", NULL} -#define STMT_78 \ +#define STMT_INSERT_TARGET_DEPTH_INFINITY 79 +#define STMT_79_INFO {"STMT_INSERT_TARGET_DEPTH_INFINITY", NULL} +#define STMT_79 \ "INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind) " \ "SELECT wc_id, local_relpath, parent_relpath, kind " \ "FROM nodes_current " \ @@ -839,9 +853,9 @@ " AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ "" -#define STMT_INSERT_TARGET_WITH_CHANGELIST 79 -#define STMT_79_INFO {"STMT_INSERT_TARGET_WITH_CHANGELIST", NULL} -#define STMT_79 \ +#define STMT_INSERT_TARGET_WITH_CHANGELIST 80 +#define STMT_80_INFO {"STMT_INSERT_TARGET_WITH_CHANGELIST", NULL} +#define STMT_80 \ "INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind) " \ "SELECT N.wc_id, N.local_relpath, N.parent_relpath, N.kind " \ " FROM actual_node AS A JOIN nodes_current AS N " \ @@ -851,9 +865,9 @@ " AND A.changelist = ?3 " \ "" -#define STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_FILES 80 -#define STMT_80_INFO {"STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_FILES", NULL} -#define STMT_80 \ +#define STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_FILES 81 +#define STMT_81_INFO {"STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_FILES", NULL} +#define STMT_81 \ "INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind) " \ "SELECT N.wc_id, N.local_relpath, N.parent_relpath, N.kind " \ " FROM actual_node AS A JOIN nodes_current AS N " \ @@ -864,9 +878,9 @@ " AND A.changelist = ?3 " \ "" -#define STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_IMMEDIATES 81 -#define STMT_81_INFO {"STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_IMMEDIATES", NULL} -#define STMT_81 \ +#define STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_IMMEDIATES 82 +#define STMT_82_INFO {"STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_IMMEDIATES", NULL} +#define STMT_82 \ "INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind) " \ "SELECT N.wc_id, N.local_relpath, N.parent_relpath, N.kind " \ " FROM actual_node AS A JOIN nodes_current AS N " \ @@ -876,9 +890,9 @@ " AND A.changelist = ?3 " \ "" -#define STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_INFINITY 82 -#define STMT_82_INFO {"STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_INFINITY", NULL} -#define STMT_82 \ +#define STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_INFINITY 83 +#define STMT_83_INFO {"STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_INFINITY", NULL} +#define STMT_83 \ "INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind) " \ "SELECT N.wc_id, N.local_relpath, N.parent_relpath, N.kind " \ " FROM actual_node AS A JOIN nodes_current AS N " \ @@ -888,18 +902,18 @@ " AND A.changelist = ?3 " \ "" -#define STMT_INSERT_ACTUAL_EMPTIES 83 -#define STMT_83_INFO {"STMT_INSERT_ACTUAL_EMPTIES", NULL} -#define STMT_83 \ +#define STMT_INSERT_ACTUAL_EMPTIES 84 +#define STMT_84_INFO {"STMT_INSERT_ACTUAL_EMPTIES", NULL} +#define STMT_84 \ "INSERT OR IGNORE INTO actual_node ( " \ " wc_id, local_relpath, parent_relpath) " \ "SELECT wc_id, local_relpath, parent_relpath " \ "FROM targets_list " \ "" -#define STMT_INSERT_ACTUAL_EMPTIES_FILES 84 -#define STMT_84_INFO {"STMT_INSERT_ACTUAL_EMPTIES_FILES", NULL} -#define STMT_84 \ +#define STMT_INSERT_ACTUAL_EMPTIES_FILES 85 +#define STMT_85_INFO {"STMT_INSERT_ACTUAL_EMPTIES_FILES", NULL} +#define STMT_85 \ "INSERT OR IGNORE INTO actual_node ( " \ " wc_id, local_relpath, parent_relpath) " \ "SELECT wc_id, local_relpath, parent_relpath " \ @@ -907,9 +921,9 @@ "WHERE kind='file' " \ "" -#define STMT_DELETE_ACTUAL_EMPTY 85 -#define STMT_85_INFO {"STMT_DELETE_ACTUAL_EMPTY", NULL} -#define STMT_85 \ +#define STMT_DELETE_ACTUAL_EMPTY 86 +#define STMT_86_INFO {"STMT_DELETE_ACTUAL_EMPTY", NULL} +#define STMT_86 \ "DELETE FROM actual_node " \ "WHERE wc_id = ?1 AND local_relpath = ?2 " \ " AND properties IS NULL " \ @@ -921,9 +935,9 @@ " AND left_checksum IS NULL " \ "" -#define STMT_DELETE_ACTUAL_EMPTIES 86 -#define STMT_86_INFO {"STMT_DELETE_ACTUAL_EMPTIES", NULL} -#define STMT_86 \ +#define STMT_DELETE_ACTUAL_EMPTIES 87 +#define STMT_87_INFO {"STMT_DELETE_ACTUAL_EMPTIES", NULL} +#define STMT_87 \ "DELETE FROM actual_node " \ "WHERE wc_id = ?1 " \ " AND (local_relpath = ?2 OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \ @@ -936,25 +950,25 @@ " AND left_checksum IS NULL " \ "" -#define STMT_DELETE_BASE_NODE 87 -#define STMT_87_INFO {"STMT_DELETE_BASE_NODE", NULL} -#define STMT_87 \ +#define STMT_DELETE_BASE_NODE 88 +#define STMT_88_INFO {"STMT_DELETE_BASE_NODE", NULL} +#define STMT_88 \ "DELETE FROM nodes " \ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \ "" -#define STMT_DELETE_WORKING_NODE 88 -#define STMT_88_INFO {"STMT_DELETE_WORKING_NODE", NULL} -#define STMT_88 \ +#define STMT_DELETE_WORKING_NODE 89 +#define STMT_89_INFO {"STMT_DELETE_WORKING_NODE", NULL} +#define STMT_89 \ "DELETE FROM nodes " \ "WHERE wc_id = ?1 AND local_relpath = ?2 " \ " AND op_depth = (SELECT MAX(op_depth) FROM nodes " \ " WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth > 0) " \ "" -#define STMT_DELETE_LOWEST_WORKING_NODE 89 -#define STMT_89_INFO {"STMT_DELETE_LOWEST_WORKING_NODE", NULL} -#define STMT_89 \ +#define STMT_DELETE_LOWEST_WORKING_NODE 90 +#define STMT_90_INFO {"STMT_DELETE_LOWEST_WORKING_NODE", NULL} +#define STMT_90 \ "DELETE FROM nodes " \ "WHERE wc_id = ?1 AND local_relpath = ?2 " \ " AND op_depth = (SELECT MIN(op_depth) FROM nodes " \ @@ -962,16 +976,16 @@ " AND presence = 'base-deleted' " \ "" -#define STMT_DELETE_NODE_ALL_LAYERS 90 -#define STMT_90_INFO {"STMT_DELETE_NODE_ALL_LAYERS", NULL} -#define STMT_90 \ +#define STMT_DELETE_NODE_ALL_LAYERS 91 +#define STMT_91_INFO {"STMT_DELETE_NODE_ALL_LAYERS", NULL} +#define STMT_91 \ "DELETE FROM nodes " \ "WHERE wc_id = ?1 AND local_relpath = ?2 " \ "" -#define STMT_DELETE_NODES_ABOVE_DEPTH_RECURSIVE 91 -#define STMT_91_INFO {"STMT_DELETE_NODES_ABOVE_DEPTH_RECURSIVE", NULL} -#define STMT_91 \ +#define STMT_DELETE_NODES_ABOVE_DEPTH_RECURSIVE 92 +#define STMT_92_INFO {"STMT_DELETE_NODES_ABOVE_DEPTH_RECURSIVE", NULL} +#define STMT_92 \ "DELETE FROM nodes " \ "WHERE wc_id = ?1 " \ " AND (local_relpath = ?2 " \ @@ -979,25 +993,25 @@ " AND op_depth >= ?3 " \ "" -#define STMT_DELETE_ACTUAL_NODE 92 -#define STMT_92_INFO {"STMT_DELETE_ACTUAL_NODE", NULL} -#define STMT_92 \ +#define STMT_DELETE_ACTUAL_NODE 93 +#define STMT_93_INFO {"STMT_DELETE_ACTUAL_NODE", NULL} +#define STMT_93 \ "DELETE FROM actual_node " \ "WHERE wc_id = ?1 AND local_relpath = ?2 " \ "" -#define STMT_DELETE_ACTUAL_NODE_RECURSIVE 93 -#define STMT_93_INFO {"STMT_DELETE_ACTUAL_NODE_RECURSIVE", NULL} -#define STMT_93 \ +#define STMT_DELETE_ACTUAL_NODE_RECURSIVE 94 +#define STMT_94_INFO {"STMT_DELETE_ACTUAL_NODE_RECURSIVE", NULL} +#define STMT_94 \ "DELETE FROM actual_node " \ "WHERE wc_id = ?1 " \ " AND (local_relpath = ?2 " \ " OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \ "" -#define STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST 94 -#define STMT_94_INFO {"STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST", NULL} -#define STMT_94 \ +#define STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST 95 +#define STMT_95_INFO {"STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST", NULL} +#define STMT_95 \ "DELETE FROM actual_node " \ "WHERE wc_id = ?1 " \ " AND local_relpath = ?2 " \ @@ -1007,9 +1021,9 @@ " AND c.kind = 'file')) " \ "" -#define STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE 95 -#define STMT_95_INFO {"STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE", NULL} -#define STMT_95 \ +#define STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE 96 +#define STMT_96_INFO {"STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE", NULL} +#define STMT_96 \ "DELETE FROM actual_node " \ "WHERE wc_id = ?1 " \ " AND (local_relpath = ?2 " \ @@ -1021,9 +1035,9 @@ " AND c.kind = 'file')) " \ "" -#define STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST 96 -#define STMT_96_INFO {"STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST", NULL} -#define STMT_96 \ +#define STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST 97 +#define STMT_97_INFO {"STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST", NULL} +#define STMT_97 \ "UPDATE actual_node " \ "SET properties = NULL, " \ " text_mod = NULL, " \ @@ -1035,9 +1049,9 @@ "WHERE wc_id = ?1 AND local_relpath = ?2 " \ "" -#define STMT_CLEAR_ACTUAL_NODE_LEAVING_CONFLICT 97 -#define STMT_97_INFO {"STMT_CLEAR_ACTUAL_NODE_LEAVING_CONFLICT", NULL} -#define STMT_97 \ +#define STMT_CLEAR_ACTUAL_NODE_LEAVING_CONFLICT 98 +#define STMT_98_INFO {"STMT_CLEAR_ACTUAL_NODE_LEAVING_CONFLICT", NULL} +#define STMT_98 \ "UPDATE actual_node " \ "SET properties = NULL, " \ " text_mod = NULL, " \ @@ -1049,9 +1063,9 @@ "WHERE wc_id = ?1 AND local_relpath = ?2 " \ "" -#define STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE 98 -#define STMT_98_INFO {"STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE", NULL} -#define STMT_98 \ +#define STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE 99 +#define STMT_99_INFO {"STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE", NULL} +#define STMT_99 \ "UPDATE actual_node " \ "SET properties = NULL, " \ " text_mod = NULL, " \ @@ -1065,109 +1079,109 @@ " OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \ "" -#define STMT_UPDATE_NODE_BASE_DEPTH 99 -#define STMT_99_INFO {"STMT_UPDATE_NODE_BASE_DEPTH", NULL} -#define STMT_99 \ +#define STMT_UPDATE_NODE_BASE_DEPTH 100 +#define STMT_100_INFO {"STMT_UPDATE_NODE_BASE_DEPTH", NULL} +#define STMT_100 \ "UPDATE nodes SET depth = ?3 " \ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \ " AND kind='dir' " \ " AND presence IN ('normal', 'incomplete') " \ "" -#define STMT_UPDATE_NODE_BASE_PRESENCE 100 -#define STMT_100_INFO {"STMT_UPDATE_NODE_BASE_PRESENCE", NULL} -#define STMT_100 \ +#define STMT_UPDATE_NODE_BASE_PRESENCE 101 +#define STMT_101_INFO {"STMT_UPDATE_NODE_BASE_PRESENCE", NULL} +#define STMT_101 \ "UPDATE nodes SET presence = ?3 " \ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \ "" -#define STMT_UPDATE_BASE_NODE_PRESENCE_REVNUM_AND_REPOS_PATH 101 -#define STMT_101_INFO {"STMT_UPDATE_BASE_NODE_PRESENCE_REVNUM_AND_REPOS_PATH", NULL} -#define STMT_101 \ +#define STMT_UPDATE_BASE_NODE_PRESENCE_REVNUM_AND_REPOS_PATH 102 +#define STMT_102_INFO {"STMT_UPDATE_BASE_NODE_PRESENCE_REVNUM_AND_REPOS_PATH", NULL} +#define STMT_102 \ "UPDATE nodes SET presence = ?3, revision = ?4, repos_path = ?5 " \ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \ "" -#define STMT_LOOK_FOR_WORK 102 -#define STMT_102_INFO {"STMT_LOOK_FOR_WORK", NULL} -#define STMT_102 \ +#define STMT_LOOK_FOR_WORK 103 +#define STMT_103_INFO {"STMT_LOOK_FOR_WORK", NULL} +#define STMT_103 \ "SELECT id FROM work_queue LIMIT 1 " \ "" -#define STMT_INSERT_WORK_ITEM 103 -#define STMT_103_INFO {"STMT_INSERT_WORK_ITEM", NULL} -#define STMT_103 \ +#define STMT_INSERT_WORK_ITEM 104 +#define STMT_104_INFO {"STMT_INSERT_WORK_ITEM", NULL} +#define STMT_104 \ "INSERT INTO work_queue (work) VALUES (?1) " \ "" -#define STMT_SELECT_WORK_ITEM 104 -#define STMT_104_INFO {"STMT_SELECT_WORK_ITEM", NULL} -#define STMT_104 \ +#define STMT_SELECT_WORK_ITEM 105 +#define STMT_105_INFO {"STMT_SELECT_WORK_ITEM", NULL} +#define STMT_105 \ "SELECT id, work FROM work_queue ORDER BY id LIMIT 1 " \ "" -#define STMT_DELETE_WORK_ITEM 105 -#define STMT_105_INFO {"STMT_DELETE_WORK_ITEM", NULL} -#define STMT_105 \ +#define STMT_DELETE_WORK_ITEM 106 +#define STMT_106_INFO {"STMT_DELETE_WORK_ITEM", NULL} +#define STMT_106 \ "DELETE FROM work_queue WHERE id = ?1 " \ "" -#define STMT_INSERT_OR_IGNORE_PRISTINE 106 -#define STMT_106_INFO {"STMT_INSERT_OR_IGNORE_PRISTINE", NULL} -#define STMT_106 \ +#define STMT_INSERT_OR_IGNORE_PRISTINE 107 +#define STMT_107_INFO {"STMT_INSERT_OR_IGNORE_PRISTINE", NULL} +#define STMT_107 \ "INSERT OR IGNORE INTO pristine (checksum, md5_checksum, size, refcount) " \ "VALUES (?1, ?2, ?3, 0) " \ "" -#define STMT_INSERT_PRISTINE 107 -#define STMT_107_INFO {"STMT_INSERT_PRISTINE", NULL} -#define STMT_107 \ +#define STMT_INSERT_PRISTINE 108 +#define STMT_108_INFO {"STMT_INSERT_PRISTINE", NULL} +#define STMT_108 \ "INSERT INTO pristine (checksum, md5_checksum, size, refcount) " \ "VALUES (?1, ?2, ?3, 0) " \ "" -#define STMT_SELECT_PRISTINE 108 -#define STMT_108_INFO {"STMT_SELECT_PRISTINE", NULL} -#define STMT_108 \ +#define STMT_SELECT_PRISTINE 109 +#define STMT_109_INFO {"STMT_SELECT_PRISTINE", NULL} +#define STMT_109 \ "SELECT md5_checksum " \ "FROM pristine " \ "WHERE checksum = ?1 " \ "" -#define STMT_SELECT_PRISTINE_SIZE 109 -#define STMT_109_INFO {"STMT_SELECT_PRISTINE_SIZE", NULL} -#define STMT_109 \ +#define STMT_SELECT_PRISTINE_SIZE 110 +#define STMT_110_INFO {"STMT_SELECT_PRISTINE_SIZE", NULL} +#define STMT_110 \ "SELECT size " \ "FROM pristine " \ "WHERE checksum = ?1 LIMIT 1 " \ "" -#define STMT_SELECT_PRISTINE_BY_MD5 110 -#define STMT_110_INFO {"STMT_SELECT_PRISTINE_BY_MD5", NULL} -#define STMT_110 \ +#define STMT_SELECT_PRISTINE_BY_MD5 111 +#define STMT_111_INFO {"STMT_SELECT_PRISTINE_BY_MD5", NULL} +#define STMT_111 \ "SELECT checksum " \ "FROM pristine " \ "WHERE md5_checksum = ?1 " \ "" -#define STMT_SELECT_UNREFERENCED_PRISTINES 111 -#define STMT_111_INFO {"STMT_SELECT_UNREFERENCED_PRISTINES", NULL} -#define STMT_111 \ +#define STMT_SELECT_UNREFERENCED_PRISTINES 112 +#define STMT_112_INFO {"STMT_SELECT_UNREFERENCED_PRISTINES", NULL} +#define STMT_112 \ "SELECT checksum " \ "FROM pristine " \ "WHERE refcount = 0 " \ "" -#define STMT_DELETE_PRISTINE_IF_UNREFERENCED 112 -#define STMT_112_INFO {"STMT_DELETE_PRISTINE_IF_UNREFERENCED", NULL} -#define STMT_112 \ +#define STMT_DELETE_PRISTINE_IF_UNREFERENCED 113 +#define STMT_113_INFO {"STMT_DELETE_PRISTINE_IF_UNREFERENCED", NULL} +#define STMT_113 \ "DELETE FROM pristine " \ "WHERE checksum = ?1 AND refcount = 0 " \ "" -#define STMT_SELECT_COPY_PRISTINES 113 -#define STMT_113_INFO {"STMT_SELECT_COPY_PRISTINES", NULL} -#define STMT_113 \ +#define STMT_SELECT_COPY_PRISTINES 114 +#define STMT_114_INFO {"STMT_SELECT_COPY_PRISTINES", NULL} +#define STMT_114 \ "SELECT n.checksum, md5_checksum, size " \ "FROM nodes_current n " \ "LEFT JOIN pristine p ON n.checksum = p.checksum " \ @@ -1185,62 +1199,62 @@ " AND n.checksum IS NOT NULL " \ "" -#define STMT_VACUUM 114 -#define STMT_114_INFO {"STMT_VACUUM", NULL} -#define STMT_114 \ +#define STMT_VACUUM 115 +#define STMT_115_INFO {"STMT_VACUUM", NULL} +#define STMT_115 \ "VACUUM " \ "" -#define STMT_SELECT_CONFLICT_VICTIMS 115 -#define STMT_115_INFO {"STMT_SELECT_CONFLICT_VICTIMS", NULL} -#define STMT_115 \ +#define STMT_SELECT_CONFLICT_VICTIMS 116 +#define STMT_116_INFO {"STMT_SELECT_CONFLICT_VICTIMS", NULL} +#define STMT_116 \ "SELECT local_relpath, conflict_data " \ "FROM actual_node " \ "WHERE wc_id = ?1 AND parent_relpath = ?2 AND " \ " NOT (conflict_data IS NULL) " \ "" -#define STMT_INSERT_WC_LOCK 116 -#define STMT_116_INFO {"STMT_INSERT_WC_LOCK", NULL} -#define STMT_116 \ +#define STMT_INSERT_WC_LOCK 117 +#define STMT_117_INFO {"STMT_INSERT_WC_LOCK", NULL} +#define STMT_117 \ "INSERT INTO wc_lock (wc_id, local_dir_relpath, locked_levels) " \ "VALUES (?1, ?2, ?3) " \ "" -#define STMT_SELECT_WC_LOCK 117 -#define STMT_117_INFO {"STMT_SELECT_WC_LOCK", NULL} -#define STMT_117 \ +#define STMT_SELECT_WC_LOCK 118 +#define STMT_118_INFO {"STMT_SELECT_WC_LOCK", NULL} +#define STMT_118 \ "SELECT locked_levels FROM wc_lock " \ "WHERE wc_id = ?1 AND local_dir_relpath = ?2 " \ "" -#define STMT_SELECT_ANCESTOR_WCLOCKS 118 -#define STMT_118_INFO {"STMT_SELECT_ANCESTOR_WCLOCKS", NULL} -#define STMT_118 \ +#define STMT_SELECT_ANCESTOR_WCLOCKS 119 +#define STMT_119_INFO {"STMT_SELECT_ANCESTOR_WCLOCKS", NULL} +#define STMT_119 \ "SELECT local_dir_relpath, locked_levels FROM wc_lock " \ "WHERE wc_id = ?1 " \ " AND ((local_dir_relpath >= ?3 AND local_dir_relpath <= ?2) " \ " OR local_dir_relpath = '') " \ "" -#define STMT_DELETE_WC_LOCK 119 -#define STMT_119_INFO {"STMT_DELETE_WC_LOCK", NULL} -#define STMT_119 \ +#define STMT_DELETE_WC_LOCK 120 +#define STMT_120_INFO {"STMT_DELETE_WC_LOCK", NULL} +#define STMT_120 \ "DELETE FROM wc_lock " \ "WHERE wc_id = ?1 AND local_dir_relpath = ?2 " \ "" -#define STMT_FIND_WC_LOCK 120 -#define STMT_120_INFO {"STMT_FIND_WC_LOCK", NULL} -#define STMT_120 \ +#define STMT_FIND_WC_LOCK 121 +#define STMT_121_INFO {"STMT_FIND_WC_LOCK", NULL} +#define STMT_121 \ "SELECT local_dir_relpath FROM wc_lock " \ "WHERE wc_id = ?1 " \ " AND (((local_dir_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_dir_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ "" -#define STMT_FIND_CONFLICT_DESCENDANT 121 -#define STMT_121_INFO {"STMT_FIND_CONFLICT_DESCENDANT", NULL} -#define STMT_121 \ +#define STMT_FIND_CONFLICT_DESCENDANT 122 +#define STMT_122_INFO {"STMT_FIND_CONFLICT_DESCENDANT", NULL} +#define STMT_122 \ "SELECT 1 FROM actual_node " \ "WHERE wc_id = ?1 " \ " AND local_relpath > (?2 || '/') " \ @@ -1249,9 +1263,9 @@ "LIMIT 1 " \ "" -#define STMT_DELETE_WC_LOCK_ORPHAN 122 -#define STMT_122_INFO {"STMT_DELETE_WC_LOCK_ORPHAN", NULL} -#define STMT_122 \ +#define STMT_DELETE_WC_LOCK_ORPHAN 123 +#define STMT_123_INFO {"STMT_DELETE_WC_LOCK_ORPHAN", NULL} +#define STMT_123 \ "DELETE FROM wc_lock " \ "WHERE wc_id = ?1 AND local_dir_relpath = ?2 " \ "AND NOT EXISTS (SELECT 1 FROM nodes " \ @@ -1259,9 +1273,9 @@ " AND nodes.local_relpath = wc_lock.local_dir_relpath) " \ "" -#define STMT_DELETE_WC_LOCK_ORPHAN_RECURSIVE 123 -#define STMT_123_INFO {"STMT_DELETE_WC_LOCK_ORPHAN_RECURSIVE", NULL} -#define STMT_123 \ +#define STMT_DELETE_WC_LOCK_ORPHAN_RECURSIVE 124 +#define STMT_124_INFO {"STMT_DELETE_WC_LOCK_ORPHAN_RECURSIVE", NULL} +#define STMT_124 \ "DELETE FROM wc_lock " \ "WHERE wc_id = ?1 " \ " AND (local_dir_relpath = ?2 " \ @@ -1271,9 +1285,9 @@ " AND nodes.local_relpath = wc_lock.local_dir_relpath) " \ "" -#define STMT_APPLY_CHANGES_TO_BASE_NODE 124 -#define STMT_124_INFO {"STMT_APPLY_CHANGES_TO_BASE_NODE", NULL} -#define STMT_124 \ +#define STMT_APPLY_CHANGES_TO_BASE_NODE 125 +#define STMT_125_INFO {"STMT_APPLY_CHANGES_TO_BASE_NODE", NULL} +#define STMT_125 \ "INSERT OR REPLACE INTO nodes ( " \ " wc_id, local_relpath, op_depth, parent_relpath, repos_id, repos_path, " \ " revision, presence, depth, kind, changed_revision, changed_date, " \ @@ -1287,18 +1301,18 @@ " AND op_depth = 0)) " \ "" -#define STMT_INSTALL_WORKING_NODE_FOR_DELETE 125 -#define STMT_125_INFO {"STMT_INSTALL_WORKING_NODE_FOR_DELETE", NULL} -#define STMT_125 \ +#define STMT_INSTALL_WORKING_NODE_FOR_DELETE 126 +#define STMT_126_INFO {"STMT_INSTALL_WORKING_NODE_FOR_DELETE", NULL} +#define STMT_126 \ "INSERT INTO nodes ( " \ " wc_id, local_relpath, op_depth, " \ " parent_relpath, presence, kind) " \ "VALUES(?1, ?2, ?3, ?4, 'base-deleted', ?5) " \ "" -#define STMT_REPLACE_WITH_BASE_DELETED 126 -#define STMT_126_INFO {"STMT_REPLACE_WITH_BASE_DELETED", NULL} -#define STMT_126 \ +#define STMT_REPLACE_WITH_BASE_DELETED 127 +#define STMT_127_INFO {"STMT_REPLACE_WITH_BASE_DELETED", NULL} +#define STMT_127 \ "INSERT OR REPLACE INTO nodes (wc_id, local_relpath, op_depth, parent_relpath, " \ " kind, moved_to, presence) " \ "SELECT wc_id, local_relpath, op_depth, parent_relpath, " \ @@ -1309,9 +1323,9 @@ " AND op_depth = ?3 " \ "" -#define STMT_INSERT_DELETE_FROM_NODE_RECURSIVE 127 -#define STMT_127_INFO {"STMT_INSERT_DELETE_FROM_NODE_RECURSIVE", NULL} -#define STMT_127 \ +#define STMT_INSERT_DELETE_FROM_NODE_RECURSIVE 128 +#define STMT_128_INFO {"STMT_INSERT_DELETE_FROM_NODE_RECURSIVE", NULL} +#define STMT_128 \ "INSERT INTO nodes ( " \ " wc_id, local_relpath, op_depth, parent_relpath, presence, kind) " \ "SELECT wc_id, local_relpath, ?4 , parent_relpath, 'base-deleted', " \ @@ -1330,9 +1344,9 @@ "ORDER BY local_relpath " \ "" -#define STMT_INSERT_WORKING_NODE_FROM_BASE_COPY 128 -#define STMT_128_INFO {"STMT_INSERT_WORKING_NODE_FROM_BASE_COPY", NULL} -#define STMT_128 \ +#define STMT_INSERT_WORKING_NODE_FROM_BASE_COPY 129 +#define STMT_129_INFO {"STMT_INSERT_WORKING_NODE_FROM_BASE_COPY", NULL} +#define STMT_129 \ "INSERT OR REPLACE INTO nodes ( " \ " wc_id, local_relpath, op_depth, parent_relpath, repos_id, repos_path, " \ " revision, presence, depth, kind, changed_revision, changed_date, " \ @@ -1348,9 +1362,9 @@ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \ "" -#define STMT_INSERT_DELETE_FROM_BASE 129 -#define STMT_129_INFO {"STMT_INSERT_DELETE_FROM_BASE", NULL} -#define STMT_129 \ +#define STMT_INSERT_DELETE_FROM_BASE 130 +#define STMT_130_INFO {"STMT_INSERT_DELETE_FROM_BASE", NULL} +#define STMT_130 \ "INSERT INTO nodes ( " \ " wc_id, local_relpath, op_depth, parent_relpath, presence, kind) " \ "SELECT wc_id, local_relpath, ?3 , parent_relpath, " \ @@ -1359,18 +1373,18 @@ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \ "" -#define STMT_UPDATE_OP_DEPTH_INCREASE_RECURSIVE 130 -#define STMT_130_INFO {"STMT_UPDATE_OP_DEPTH_INCREASE_RECURSIVE", NULL} -#define STMT_130 \ +#define STMT_UPDATE_OP_DEPTH_INCREASE_RECURSIVE 131 +#define STMT_131_INFO {"STMT_UPDATE_OP_DEPTH_INCREASE_RECURSIVE", NULL} +#define STMT_131 \ "UPDATE nodes SET op_depth = ?3 + 1 " \ "WHERE wc_id = ?1 " \ " AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ " AND op_depth = ?3 " \ "" -#define STMT_COPY_OP_DEPTH_RECURSIVE 131 -#define STMT_131_INFO {"STMT_COPY_OP_DEPTH_RECURSIVE", NULL} -#define STMT_131 \ +#define STMT_COPY_OP_DEPTH_RECURSIVE 132 +#define STMT_132_INFO {"STMT_COPY_OP_DEPTH_RECURSIVE", NULL} +#define STMT_132 \ "INSERT INTO nodes ( " \ " wc_id, local_relpath, op_depth, parent_relpath, repos_id, repos_path, " \ " revision, presence, depth, kind, changed_revision, changed_date, " \ @@ -1395,16 +1409,16 @@ "ORDER BY local_relpath " \ "" -#define STMT_DOES_NODE_EXIST 132 -#define STMT_132_INFO {"STMT_DOES_NODE_EXIST", NULL} -#define STMT_132 \ +#define STMT_DOES_NODE_EXIST 133 +#define STMT_133_INFO {"STMT_DOES_NODE_EXIST", NULL} +#define STMT_133 \ "SELECT 1 FROM nodes WHERE wc_id = ?1 AND local_relpath = ?2 " \ "LIMIT 1 " \ "" -#define STMT_HAS_SERVER_EXCLUDED_DESCENDANTS 133 -#define STMT_133_INFO {"STMT_HAS_SERVER_EXCLUDED_DESCENDANTS", NULL} -#define STMT_133 \ +#define STMT_HAS_SERVER_EXCLUDED_DESCENDANTS 134 +#define STMT_134_INFO {"STMT_HAS_SERVER_EXCLUDED_DESCENDANTS", NULL} +#define STMT_134 \ "SELECT local_relpath FROM nodes " \ "WHERE wc_id = ?1 " \ " AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ @@ -1412,9 +1426,9 @@ "LIMIT 1 " \ "" -#define STMT_SELECT_ALL_EXCLUDED_DESCENDANTS 134 -#define STMT_134_INFO {"STMT_SELECT_ALL_EXCLUDED_DESCENDANTS", NULL} -#define STMT_134 \ +#define STMT_SELECT_ALL_EXCLUDED_DESCENDANTS 135 +#define STMT_135_INFO {"STMT_SELECT_ALL_EXCLUDED_DESCENDANTS", NULL} +#define STMT_135 \ "SELECT local_relpath FROM nodes " \ "WHERE wc_id = ?1 " \ " AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ @@ -1422,9 +1436,9 @@ " AND (presence = 'server-excluded' OR presence = 'excluded') " \ "" -#define STMT_INSERT_WORKING_NODE_COPY_FROM 135 -#define STMT_135_INFO {"STMT_INSERT_WORKING_NODE_COPY_FROM", NULL} -#define STMT_135 \ +#define STMT_INSERT_WORKING_NODE_COPY_FROM 136 +#define STMT_136_INFO {"STMT_INSERT_WORKING_NODE_COPY_FROM", NULL} +#define STMT_136 \ "INSERT OR REPLACE INTO nodes ( " \ " wc_id, local_relpath, op_depth, parent_relpath, repos_id, " \ " repos_path, revision, presence, depth, moved_here, kind, changed_revision, " \ @@ -1443,9 +1457,9 @@ "WHERE wc_id = ?1 AND local_relpath = ?2 " \ "" -#define STMT_INSERT_WORKING_NODE_COPY_FROM_DEPTH 136 -#define STMT_136_INFO {"STMT_INSERT_WORKING_NODE_COPY_FROM_DEPTH", NULL} -#define STMT_136 \ +#define STMT_INSERT_WORKING_NODE_COPY_FROM_DEPTH 137 +#define STMT_137_INFO {"STMT_INSERT_WORKING_NODE_COPY_FROM_DEPTH", NULL} +#define STMT_137 \ "INSERT OR REPLACE INTO nodes ( " \ " wc_id, local_relpath, op_depth, parent_relpath, repos_id, " \ " repos_path, revision, presence, depth, moved_here, kind, changed_revision, " \ @@ -1464,49 +1478,49 @@ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = ?7 " \ "" -#define STMT_UPDATE_BASE_REVISION 137 -#define STMT_137_INFO {"STMT_UPDATE_BASE_REVISION", NULL} -#define STMT_137 \ +#define STMT_UPDATE_BASE_REVISION 138 +#define STMT_138_INFO {"STMT_UPDATE_BASE_REVISION", NULL} +#define STMT_138 \ "UPDATE nodes SET revision = ?3 " \ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \ "" -#define STMT_UPDATE_BASE_REPOS 138 -#define STMT_138_INFO {"STMT_UPDATE_BASE_REPOS", NULL} -#define STMT_138 \ +#define STMT_UPDATE_BASE_REPOS 139 +#define STMT_139_INFO {"STMT_UPDATE_BASE_REPOS", NULL} +#define STMT_139 \ "UPDATE nodes SET repos_id = ?3, repos_path = ?4 " \ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \ "" -#define STMT_ACTUAL_HAS_CHILDREN 139 -#define STMT_139_INFO {"STMT_ACTUAL_HAS_CHILDREN", NULL} -#define STMT_139 \ +#define STMT_ACTUAL_HAS_CHILDREN 140 +#define STMT_140_INFO {"STMT_ACTUAL_HAS_CHILDREN", NULL} +#define STMT_140 \ "SELECT 1 FROM actual_node " \ "WHERE wc_id = ?1 AND parent_relpath = ?2 " \ "LIMIT 1 " \ "" -#define STMT_INSERT_EXTERNAL 140 -#define STMT_140_INFO {"STMT_INSERT_EXTERNAL", NULL} -#define STMT_140 \ +#define STMT_INSERT_EXTERNAL 141 +#define STMT_141_INFO {"STMT_INSERT_EXTERNAL", NULL} +#define STMT_141 \ "INSERT OR REPLACE INTO externals ( " \ " wc_id, local_relpath, parent_relpath, presence, kind, def_local_relpath, " \ " repos_id, def_repos_relpath, def_operational_revision, def_revision) " \ "VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10) " \ "" -#define STMT_SELECT_EXTERNAL_INFO 141 -#define STMT_141_INFO {"STMT_SELECT_EXTERNAL_INFO", NULL} -#define STMT_141 \ +#define STMT_SELECT_EXTERNAL_INFO 142 +#define STMT_142_INFO {"STMT_SELECT_EXTERNAL_INFO", NULL} +#define STMT_142 \ "SELECT presence, kind, def_local_relpath, repos_id, " \ " def_repos_relpath, def_operational_revision, def_revision " \ "FROM externals WHERE wc_id = ?1 AND local_relpath = ?2 " \ "LIMIT 1 " \ "" -#define STMT_DELETE_FILE_EXTERNALS 142 -#define STMT_142_INFO {"STMT_DELETE_FILE_EXTERNALS", NULL} -#define STMT_142 \ +#define STMT_DELETE_FILE_EXTERNALS 143 +#define STMT_143_INFO {"STMT_DELETE_FILE_EXTERNALS", NULL} +#define STMT_143 \ "DELETE FROM nodes " \ "WHERE wc_id = ?1 " \ " AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ @@ -1514,26 +1528,26 @@ " AND file_external IS NOT NULL " \ "" -#define STMT_DELETE_FILE_EXTERNAL_REGISTATIONS 143 -#define STMT_143_INFO {"STMT_DELETE_FILE_EXTERNAL_REGISTATIONS", NULL} -#define STMT_143 \ +#define STMT_DELETE_FILE_EXTERNAL_REGISTATIONS 144 +#define STMT_144_INFO {"STMT_DELETE_FILE_EXTERNAL_REGISTATIONS", NULL} +#define STMT_144 \ "DELETE FROM externals " \ "WHERE wc_id = ?1 " \ " AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ " AND kind != 'dir' " \ "" -#define STMT_DELETE_EXTERNAL_REGISTATIONS 144 -#define STMT_144_INFO {"STMT_DELETE_EXTERNAL_REGISTATIONS", NULL} -#define STMT_144 \ +#define STMT_DELETE_EXTERNAL_REGISTATIONS 145 +#define STMT_145_INFO {"STMT_DELETE_EXTERNAL_REGISTATIONS", NULL} +#define STMT_145 \ "DELETE FROM externals " \ "WHERE wc_id = ?1 " \ " AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ "" -#define STMT_SELECT_COMMITTABLE_EXTERNALS_BELOW 145 -#define STMT_145_INFO {"STMT_SELECT_COMMITTABLE_EXTERNALS_BELOW", NULL} -#define STMT_145 \ +#define STMT_SELECT_COMMITTABLE_EXTERNALS_BELOW 146 +#define STMT_146_INFO {"STMT_SELECT_COMMITTABLE_EXTERNALS_BELOW", NULL} +#define STMT_146 \ "SELECT local_relpath, kind, def_repos_relpath, " \ " (SELECT root FROM repository AS r WHERE r.id = e.repos_id) " \ "FROM externals e " \ @@ -1551,9 +1565,9 @@ " AND nodes.local_relpath = e.parent_relpath)) " \ "" -#define STMT_SELECT_COMMITTABLE_EXTERNALS_IMMEDIATELY_BELOW 146 -#define STMT_146_INFO {"STMT_SELECT_COMMITTABLE_EXTERNALS_IMMEDIATELY_BELOW", NULL} -#define STMT_146 \ +#define STMT_SELECT_COMMITTABLE_EXTERNALS_IMMEDIATELY_BELOW 147 +#define STMT_147_INFO {"STMT_SELECT_COMMITTABLE_EXTERNALS_IMMEDIATELY_BELOW", NULL} +#define STMT_147 \ "SELECT local_relpath, kind, def_repos_relpath, " \ " (SELECT root FROM repository AS r WHERE r.id = e.repos_id) " \ "FROM externals e " \ @@ -1572,25 +1586,25 @@ " AND nodes.local_relpath = e.parent_relpath)) " \ "" -#define STMT_SELECT_EXTERNALS_DEFINED 147 -#define STMT_147_INFO {"STMT_SELECT_EXTERNALS_DEFINED", NULL} -#define STMT_147 \ +#define STMT_SELECT_EXTERNALS_DEFINED 148 +#define STMT_148_INFO {"STMT_SELECT_EXTERNALS_DEFINED", NULL} +#define STMT_148 \ "SELECT local_relpath, def_local_relpath " \ "FROM externals " \ "WHERE (wc_id = ?1 AND def_local_relpath = ?2) " \ " OR (wc_id = ?1 AND (((def_local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((def_local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \ "" -#define STMT_DELETE_EXTERNAL 148 -#define STMT_148_INFO {"STMT_DELETE_EXTERNAL", NULL} -#define STMT_148 \ +#define STMT_DELETE_EXTERNAL 149 +#define STMT_149_INFO {"STMT_DELETE_EXTERNAL", NULL} +#define STMT_149 \ "DELETE FROM externals " \ "WHERE wc_id = ?1 AND local_relpath = ?2 " \ "" -#define STMT_SELECT_EXTERNAL_PROPERTIES 149 -#define STMT_149_INFO {"STMT_SELECT_EXTERNAL_PROPERTIES", NULL} -#define STMT_149 \ +#define STMT_SELECT_EXTERNAL_PROPERTIES 150 +#define STMT_150_INFO {"STMT_SELECT_EXTERNAL_PROPERTIES", NULL} +#define STMT_150 \ "SELECT IFNULL((SELECT properties FROM actual_node a " \ " WHERE a.wc_id = ?1 AND A.local_relpath = n.local_relpath), " \ " properties), " \ @@ -1608,9 +1622,9 @@ " AND kind = 'dir' AND presence IN ('normal', 'incomplete') " \ "" -#define STMT_SELECT_CURRENT_PROPS_RECURSIVE 150 -#define STMT_150_INFO {"STMT_SELECT_CURRENT_PROPS_RECURSIVE", NULL} -#define STMT_150 \ +#define STMT_SELECT_CURRENT_PROPS_RECURSIVE 151 +#define STMT_151_INFO {"STMT_SELECT_CURRENT_PROPS_RECURSIVE", NULL} +#define STMT_151 \ "SELECT IFNULL((SELECT properties FROM actual_node a " \ " WHERE a.wc_id = ?1 AND A.local_relpath = n.local_relpath), " \ " properties), " \ @@ -1620,51 +1634,51 @@ " OR (wc_id = ?1 AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \ "" -#define STMT_PRAGMA_LOCKING_MODE 151 -#define STMT_151_INFO {"STMT_PRAGMA_LOCKING_MODE", NULL} -#define STMT_151 \ +#define STMT_PRAGMA_LOCKING_MODE 152 +#define STMT_152_INFO {"STMT_PRAGMA_LOCKING_MODE", NULL} +#define STMT_152 \ "PRAGMA locking_mode = exclusive; " \ "PRAGMA journal_mode = DELETE " \ "" -#define STMT_FIND_REPOS_PATH_IN_WC 152 -#define STMT_152_INFO {"STMT_FIND_REPOS_PATH_IN_WC", NULL} -#define STMT_152 \ +#define STMT_FIND_REPOS_PATH_IN_WC 153 +#define STMT_153_INFO {"STMT_FIND_REPOS_PATH_IN_WC", NULL} +#define STMT_153 \ "SELECT local_relpath FROM nodes_current " \ " WHERE wc_id = ?1 AND repos_path = ?2 " \ "" -#define STMT_INSERT_ACTUAL_NODE 153 -#define STMT_153_INFO {"STMT_INSERT_ACTUAL_NODE", NULL} -#define STMT_153 \ +#define STMT_INSERT_ACTUAL_NODE 154 +#define STMT_154_INFO {"STMT_INSERT_ACTUAL_NODE", NULL} +#define STMT_154 \ "INSERT OR REPLACE INTO actual_node ( " \ " wc_id, local_relpath, parent_relpath, properties, changelist, conflict_data) " \ "VALUES (?1, ?2, ?3, ?4, ?5, ?6) " \ "" -#define STMT_SELECT_ALL_FILES 154 -#define STMT_154_INFO {"STMT_SELECT_ALL_FILES", NULL} -#define STMT_154 \ +#define STMT_SELECT_ALL_FILES 155 +#define STMT_155_INFO {"STMT_SELECT_ALL_FILES", NULL} +#define STMT_155 \ "SELECT local_relpath FROM nodes_current " \ "WHERE wc_id = ?1 AND parent_relpath = ?2 AND kind = 'file' " \ "" -#define STMT_UPDATE_NODE_PROPS 155 -#define STMT_155_INFO {"STMT_UPDATE_NODE_PROPS", NULL} -#define STMT_155 \ +#define STMT_UPDATE_NODE_PROPS 156 +#define STMT_156_INFO {"STMT_UPDATE_NODE_PROPS", NULL} +#define STMT_156 \ "UPDATE nodes SET properties = ?4 " \ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = ?3 " \ "" -#define STMT_PRAGMA_TABLE_INFO_NODES 156 -#define STMT_156_INFO {"STMT_PRAGMA_TABLE_INFO_NODES", NULL} -#define STMT_156 \ +#define STMT_PRAGMA_TABLE_INFO_NODES 157 +#define STMT_157_INFO {"STMT_PRAGMA_TABLE_INFO_NODES", NULL} +#define STMT_157 \ "PRAGMA table_info(\"NODES\") " \ "" -#define STMT_CREATE_TARGET_PROP_CACHE 157 -#define STMT_157_INFO {"STMT_CREATE_TARGET_PROP_CACHE", NULL} -#define STMT_157 \ +#define STMT_CREATE_TARGET_PROP_CACHE 158 +#define STMT_158_INFO {"STMT_CREATE_TARGET_PROP_CACHE", NULL} +#define STMT_158 \ "DROP TABLE IF EXISTS target_prop_cache; " \ "CREATE TEMPORARY TABLE target_prop_cache ( " \ " local_relpath TEXT NOT NULL PRIMARY KEY, " \ @@ -1673,9 +1687,9 @@ "); " \ "" -#define STMT_CACHE_TARGET_PROPS 158 -#define STMT_158_INFO {"STMT_CACHE_TARGET_PROPS", NULL} -#define STMT_158 \ +#define STMT_CACHE_TARGET_PROPS 159 +#define STMT_159_INFO {"STMT_CACHE_TARGET_PROPS", NULL} +#define STMT_159 \ "INSERT INTO target_prop_cache(local_relpath, kind, properties) " \ " SELECT n.local_relpath, n.kind, " \ " IFNULL((SELECT properties FROM actual_node AS a " \ @@ -1694,9 +1708,9 @@ " ORDER BY t.local_relpath " \ "" -#define STMT_CACHE_TARGET_PRISTINE_PROPS 159 -#define STMT_159_INFO {"STMT_CACHE_TARGET_PRISTINE_PROPS", NULL} -#define STMT_159 \ +#define STMT_CACHE_TARGET_PRISTINE_PROPS 160 +#define STMT_160_INFO {"STMT_CACHE_TARGET_PRISTINE_PROPS", NULL} +#define STMT_160 \ "INSERT INTO target_prop_cache(local_relpath, kind, properties) " \ " SELECT n.local_relpath, n.kind, " \ " CASE n.presence " \ @@ -1721,22 +1735,22 @@ " ORDER BY t.local_relpath " \ "" -#define STMT_SELECT_ALL_TARGET_PROP_CACHE 160 -#define STMT_160_INFO {"STMT_SELECT_ALL_TARGET_PROP_CACHE", NULL} -#define STMT_160 \ +#define STMT_SELECT_ALL_TARGET_PROP_CACHE 161 +#define STMT_161_INFO {"STMT_SELECT_ALL_TARGET_PROP_CACHE", NULL} +#define STMT_161 \ "SELECT local_relpath, properties FROM target_prop_cache " \ "ORDER BY local_relpath " \ "" -#define STMT_DROP_TARGET_PROP_CACHE 161 -#define STMT_161_INFO {"STMT_DROP_TARGET_PROP_CACHE", NULL} -#define STMT_161 \ +#define STMT_DROP_TARGET_PROP_CACHE 162 +#define STMT_162_INFO {"STMT_DROP_TARGET_PROP_CACHE", NULL} +#define STMT_162 \ "DROP TABLE target_prop_cache; " \ "" -#define STMT_CREATE_REVERT_LIST 162 -#define STMT_162_INFO {"STMT_CREATE_REVERT_LIST", NULL} -#define STMT_162 \ +#define STMT_CREATE_REVERT_LIST 163 +#define STMT_163_INFO {"STMT_CREATE_REVERT_LIST", NULL} +#define STMT_163 \ "DROP TABLE IF EXISTS revert_list; " \ "CREATE TEMPORARY TABLE revert_list ( " \ " local_relpath TEXT NOT NULL, " \ @@ -1794,26 +1808,26 @@ "END " \ "" -#define STMT_DROP_REVERT_LIST_TRIGGERS 163 -#define STMT_163_INFO {"STMT_DROP_REVERT_LIST_TRIGGERS", NULL} -#define STMT_163 \ +#define STMT_DROP_REVERT_LIST_TRIGGERS 164 +#define STMT_164_INFO {"STMT_DROP_REVERT_LIST_TRIGGERS", NULL} +#define STMT_164 \ "DROP TRIGGER trigger_revert_list_nodes; " \ "DROP TRIGGER trigger_revert_list_actual_delete; " \ "DROP TRIGGER trigger_revert_list_actual_update " \ "" -#define STMT_SELECT_REVERT_LIST 164 -#define STMT_164_INFO {"STMT_SELECT_REVERT_LIST", NULL} -#define STMT_164 \ +#define STMT_SELECT_REVERT_LIST 165 +#define STMT_165_INFO {"STMT_SELECT_REVERT_LIST", NULL} +#define STMT_165 \ "SELECT actual, notify, kind, op_depth, repos_id, conflict_data " \ "FROM revert_list " \ "WHERE local_relpath = ?1 " \ "ORDER BY actual DESC " \ "" -#define STMT_SELECT_REVERT_LIST_COPIED_CHILDREN 165 -#define STMT_165_INFO {"STMT_SELECT_REVERT_LIST_COPIED_CHILDREN", NULL} -#define STMT_165 \ +#define STMT_SELECT_REVERT_LIST_COPIED_CHILDREN 166 +#define STMT_166_INFO {"STMT_SELECT_REVERT_LIST_COPIED_CHILDREN", NULL} +#define STMT_166 \ "SELECT local_relpath, kind " \ "FROM revert_list " \ "WHERE (((local_relpath) > (CASE (?1) WHEN '' THEN '' ELSE (?1) || '/' END)) AND ((local_relpath) < CASE (?1) WHEN '' THEN X'FFFF' ELSE (?1) || '0' END)) " \ @@ -1822,15 +1836,15 @@ "ORDER BY local_relpath " \ "" -#define STMT_DELETE_REVERT_LIST 166 -#define STMT_166_INFO {"STMT_DELETE_REVERT_LIST", NULL} -#define STMT_166 \ +#define STMT_DELETE_REVERT_LIST 167 +#define STMT_167_INFO {"STMT_DELETE_REVERT_LIST", NULL} +#define STMT_167 \ "DELETE FROM revert_list WHERE local_relpath = ?1 " \ "" -#define STMT_SELECT_REVERT_LIST_RECURSIVE 167 -#define STMT_167_INFO {"STMT_SELECT_REVERT_LIST_RECURSIVE", NULL} -#define STMT_167 \ +#define STMT_SELECT_REVERT_LIST_RECURSIVE 168 +#define STMT_168_INFO {"STMT_SELECT_REVERT_LIST_RECURSIVE", NULL} +#define STMT_168 \ "SELECT p.local_relpath, n.kind, a.notify, a.kind " \ "FROM (SELECT DISTINCT local_relpath " \ " FROM revert_list " \ @@ -1841,32 +1855,32 @@ "ORDER BY p.local_relpath " \ "" -#define STMT_DELETE_REVERT_LIST_RECURSIVE 168 -#define STMT_168_INFO {"STMT_DELETE_REVERT_LIST_RECURSIVE", NULL} -#define STMT_168 \ +#define STMT_DELETE_REVERT_LIST_RECURSIVE 169 +#define STMT_169_INFO {"STMT_DELETE_REVERT_LIST_RECURSIVE", NULL} +#define STMT_169 \ "DELETE FROM revert_list " \ "WHERE (local_relpath = ?1 " \ " OR (((local_relpath) > (CASE (?1) WHEN '' THEN '' ELSE (?1) || '/' END)) AND ((local_relpath) < CASE (?1) WHEN '' THEN X'FFFF' ELSE (?1) || '0' END))) " \ "" -#define STMT_DROP_REVERT_LIST 169 -#define STMT_169_INFO {"STMT_DROP_REVERT_LIST", NULL} -#define STMT_169 \ +#define STMT_DROP_REVERT_LIST 170 +#define STMT_170_INFO {"STMT_DROP_REVERT_LIST", NULL} +#define STMT_170 \ "DROP TABLE IF EXISTS revert_list " \ "" -#define STMT_CREATE_DELETE_LIST 170 -#define STMT_170_INFO {"STMT_CREATE_DELETE_LIST", NULL} -#define STMT_170 \ +#define STMT_CREATE_DELETE_LIST 171 +#define STMT_171_INFO {"STMT_CREATE_DELETE_LIST", NULL} +#define STMT_171 \ "DROP TABLE IF EXISTS delete_list; " \ "CREATE TEMPORARY TABLE delete_list ( " \ " local_relpath TEXT PRIMARY KEY NOT NULL UNIQUE " \ " ) " \ "" -#define STMT_INSERT_DELETE_LIST 171 -#define STMT_171_INFO {"STMT_INSERT_DELETE_LIST", NULL} -#define STMT_171 \ +#define STMT_INSERT_DELETE_LIST 172 +#define STMT_172_INFO {"STMT_INSERT_DELETE_LIST", NULL} +#define STMT_172 \ "INSERT INTO delete_list(local_relpath) " \ "SELECT ?2 " \ "UNION ALL " \ @@ -1882,22 +1896,22 @@ "ORDER by local_relpath " \ "" -#define STMT_SELECT_DELETE_LIST 172 -#define STMT_172_INFO {"STMT_SELECT_DELETE_LIST", NULL} -#define STMT_172 \ +#define STMT_SELECT_DELETE_LIST 173 +#define STMT_173_INFO {"STMT_SELECT_DELETE_LIST", NULL} +#define STMT_173 \ "SELECT local_relpath FROM delete_list " \ "ORDER BY local_relpath " \ "" -#define STMT_FINALIZE_DELETE 173 -#define STMT_173_INFO {"STMT_FINALIZE_DELETE", NULL} -#define STMT_173 \ +#define STMT_FINALIZE_DELETE 174 +#define STMT_174_INFO {"STMT_FINALIZE_DELETE", NULL} +#define STMT_174 \ "DROP TABLE IF EXISTS delete_list " \ "" -#define STMT_CREATE_UPDATE_MOVE_LIST 174 -#define STMT_174_INFO {"STMT_CREATE_UPDATE_MOVE_LIST", NULL} -#define STMT_174 \ +#define STMT_CREATE_UPDATE_MOVE_LIST 175 +#define STMT_175_INFO {"STMT_CREATE_UPDATE_MOVE_LIST", NULL} +#define STMT_175 \ "DROP TABLE IF EXISTS update_move_list; " \ "CREATE TEMPORARY TABLE update_move_list ( " \ " local_relpath TEXT PRIMARY KEY NOT NULL UNIQUE, " \ @@ -1908,39 +1922,39 @@ " ) " \ "" -#define STMT_INSERT_UPDATE_MOVE_LIST 175 -#define STMT_175_INFO {"STMT_INSERT_UPDATE_MOVE_LIST", NULL} -#define STMT_175 \ +#define STMT_INSERT_UPDATE_MOVE_LIST 176 +#define STMT_176_INFO {"STMT_INSERT_UPDATE_MOVE_LIST", NULL} +#define STMT_176 \ "INSERT INTO update_move_list(local_relpath, action, kind, content_state, " \ " prop_state) " \ "VALUES (?1, ?2, ?3, ?4, ?5) " \ "" -#define STMT_SELECT_UPDATE_MOVE_LIST 176 -#define STMT_176_INFO {"STMT_SELECT_UPDATE_MOVE_LIST", NULL} -#define STMT_176 \ +#define STMT_SELECT_UPDATE_MOVE_LIST 177 +#define STMT_177_INFO {"STMT_SELECT_UPDATE_MOVE_LIST", NULL} +#define STMT_177 \ "SELECT local_relpath, action, kind, content_state, prop_state " \ "FROM update_move_list " \ "ORDER BY local_relpath " \ "" -#define STMT_FINALIZE_UPDATE_MOVE 177 -#define STMT_177_INFO {"STMT_FINALIZE_UPDATE_MOVE", NULL} -#define STMT_177 \ +#define STMT_FINALIZE_UPDATE_MOVE 178 +#define STMT_178_INFO {"STMT_FINALIZE_UPDATE_MOVE", NULL} +#define STMT_178 \ "DROP TABLE IF EXISTS update_move_list " \ "" -#define STMT_MOVE_NOTIFY_TO_REVERT 178 -#define STMT_178_INFO {"STMT_MOVE_NOTIFY_TO_REVERT", NULL} -#define STMT_178 \ +#define STMT_MOVE_NOTIFY_TO_REVERT 179 +#define STMT_179_INFO {"STMT_MOVE_NOTIFY_TO_REVERT", NULL} +#define STMT_179 \ "INSERT INTO revert_list (local_relpath, notify, kind, actual) " \ " SELECT local_relpath, 2, kind, 1 FROM update_move_list; " \ "DROP TABLE update_move_list " \ "" -#define STMT_SELECT_MIN_MAX_REVISIONS 179 -#define STMT_179_INFO {"STMT_SELECT_MIN_MAX_REVISIONS", NULL} -#define STMT_179 \ +#define STMT_SELECT_MIN_MAX_REVISIONS 180 +#define STMT_180_INFO {"STMT_SELECT_MIN_MAX_REVISIONS", NULL} +#define STMT_180 \ "SELECT MIN(revision), MAX(revision), " \ " MIN(changed_revision), MAX(changed_revision) FROM nodes " \ " WHERE wc_id = ?1 " \ @@ -1951,9 +1965,9 @@ " AND op_depth = 0 " \ "" -#define STMT_HAS_SPARSE_NODES 180 -#define STMT_180_INFO {"STMT_HAS_SPARSE_NODES", NULL} -#define STMT_180 \ +#define STMT_HAS_SPARSE_NODES 181 +#define STMT_181_INFO {"STMT_HAS_SPARSE_NODES", NULL} +#define STMT_181 \ "SELECT 1 FROM nodes " \ "WHERE wc_id = ?1 " \ " AND (local_relpath = ?2 " \ @@ -1965,9 +1979,9 @@ "LIMIT 1 " \ "" -#define STMT_SUBTREE_HAS_TREE_MODIFICATIONS 181 -#define STMT_181_INFO {"STMT_SUBTREE_HAS_TREE_MODIFICATIONS", NULL} -#define STMT_181 \ +#define STMT_SUBTREE_HAS_TREE_MODIFICATIONS 182 +#define STMT_182_INFO {"STMT_SUBTREE_HAS_TREE_MODIFICATIONS", NULL} +#define STMT_182 \ "SELECT 1 FROM nodes " \ "WHERE wc_id = ?1 " \ " AND (local_relpath = ?2 " \ @@ -1976,9 +1990,9 @@ "LIMIT 1 " \ "" -#define STMT_SUBTREE_HAS_PROP_MODIFICATIONS 182 -#define STMT_182_INFO {"STMT_SUBTREE_HAS_PROP_MODIFICATIONS", NULL} -#define STMT_182 \ +#define STMT_SUBTREE_HAS_PROP_MODIFICATIONS 183 +#define STMT_183_INFO {"STMT_SUBTREE_HAS_PROP_MODIFICATIONS", NULL} +#define STMT_183 \ "SELECT 1 FROM actual_node " \ "WHERE wc_id = ?1 " \ " AND (local_relpath = ?2 " \ @@ -1987,9 +2001,9 @@ "LIMIT 1 " \ "" -#define STMT_HAS_SWITCHED 183 -#define STMT_183_INFO {"STMT_HAS_SWITCHED", NULL} -#define STMT_183 \ +#define STMT_HAS_SWITCHED 184 +#define STMT_184_INFO {"STMT_HAS_SWITCHED", NULL} +#define STMT_184 \ "SELECT 1 " \ "FROM nodes " \ "WHERE wc_id = ?1 " \ @@ -2001,47 +2015,47 @@ "LIMIT 1 " \ "" -#define STMT_SELECT_MOVED_FROM_RELPATH 184 -#define STMT_184_INFO {"STMT_SELECT_MOVED_FROM_RELPATH", NULL} -#define STMT_184 \ +#define STMT_SELECT_MOVED_FROM_RELPATH 185 +#define STMT_185_INFO {"STMT_SELECT_MOVED_FROM_RELPATH", NULL} +#define STMT_185 \ "SELECT local_relpath, op_depth FROM nodes " \ "WHERE wc_id = ?1 AND moved_to = ?2 AND op_depth > 0 " \ "" -#define STMT_UPDATE_MOVED_TO_RELPATH 185 -#define STMT_185_INFO {"STMT_UPDATE_MOVED_TO_RELPATH", NULL} -#define STMT_185 \ +#define STMT_UPDATE_MOVED_TO_RELPATH 186 +#define STMT_186_INFO {"STMT_UPDATE_MOVED_TO_RELPATH", NULL} +#define STMT_186 \ "UPDATE nodes SET moved_to = ?4 " \ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = ?3 " \ "" -#define STMT_CLEAR_MOVED_TO_RELPATH 186 -#define STMT_186_INFO {"STMT_CLEAR_MOVED_TO_RELPATH", NULL} -#define STMT_186 \ +#define STMT_CLEAR_MOVED_TO_RELPATH 187 +#define STMT_187_INFO {"STMT_CLEAR_MOVED_TO_RELPATH", NULL} +#define STMT_187 \ "UPDATE nodes SET moved_to = NULL " \ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = ?3 " \ "" -#define STMT_CLEAR_MOVED_HERE_RECURSIVE 187 -#define STMT_187_INFO {"STMT_CLEAR_MOVED_HERE_RECURSIVE", NULL} -#define STMT_187 \ +#define STMT_CLEAR_MOVED_HERE_RECURSIVE 188 +#define STMT_188_INFO {"STMT_CLEAR_MOVED_HERE_RECURSIVE", NULL} +#define STMT_188 \ "UPDATE nodes SET moved_here = NULL " \ "WHERE wc_id = ?1 " \ " AND (local_relpath = ?2 OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \ " AND op_depth = ?3 " \ "" -#define STMT_SELECT_MOVED_HERE_CHILDREN 188 -#define STMT_188_INFO {"STMT_SELECT_MOVED_HERE_CHILDREN", NULL} -#define STMT_188 \ +#define STMT_SELECT_MOVED_HERE_CHILDREN 189 +#define STMT_189_INFO {"STMT_SELECT_MOVED_HERE_CHILDREN", NULL} +#define STMT_189 \ "SELECT moved_to, local_relpath FROM nodes " \ "WHERE wc_id = ?1 AND op_depth > 0 " \ " AND (((moved_to) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((moved_to) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ "" -#define STMT_SELECT_MOVED_FOR_DELETE 189 -#define STMT_189_INFO {"STMT_SELECT_MOVED_FOR_DELETE", NULL} -#define STMT_189 \ +#define STMT_SELECT_MOVED_FOR_DELETE 190 +#define STMT_190_INFO {"STMT_SELECT_MOVED_FOR_DELETE", NULL} +#define STMT_190 \ "SELECT local_relpath, moved_to, op_depth, " \ " (SELECT CASE WHEN r.moved_here THEN r.op_depth END FROM nodes r " \ " WHERE r.wc_id = ?1 " \ @@ -2055,9 +2069,9 @@ " AND op_depth >= ?3 " \ "" -#define STMT_SELECT_MOVED_FROM_FOR_DELETE 190 -#define STMT_190_INFO {"STMT_SELECT_MOVED_FROM_FOR_DELETE", NULL} -#define STMT_190 \ +#define STMT_SELECT_MOVED_FROM_FOR_DELETE 191 +#define STMT_191_INFO {"STMT_SELECT_MOVED_FROM_FOR_DELETE", NULL} +#define STMT_191 \ "SELECT local_relpath, op_depth, " \ " (SELECT CASE WHEN r.moved_here THEN r.op_depth END FROM nodes r " \ " WHERE r.wc_id = ?1 " \ @@ -2068,25 +2082,25 @@ "WHERE wc_id = ?1 AND moved_to = ?2 AND op_depth > 0 " \ "" -#define STMT_UPDATE_MOVED_TO_DESCENDANTS 191 -#define STMT_191_INFO {"STMT_UPDATE_MOVED_TO_DESCENDANTS", NULL} -#define STMT_191 \ +#define STMT_UPDATE_MOVED_TO_DESCENDANTS 192 +#define STMT_192_INFO {"STMT_UPDATE_MOVED_TO_DESCENDANTS", NULL} +#define STMT_192 \ "UPDATE nodes SET moved_to = (CASE WHEN (?2) = '' THEN (CASE WHEN (?3) = '' THEN (moved_to) WHEN (moved_to) = '' THEN (?3) ELSE (?3) || '/' || (moved_to) END) WHEN (?3) = '' THEN (CASE WHEN (?2) = '' THEN (moved_to) WHEN SUBSTR((moved_to), 1, LENGTH(?2)) = (?2) THEN CASE WHEN LENGTH(?2) = LENGTH(moved_to) THEN '' WHEN SUBSTR((moved_to), LENGTH(?2)+1, 1) = '/' THEN SUBSTR((moved_to), LENGTH(?2)+2) END END) WHEN SUBSTR((moved_to), 1, LENGTH(?2)) = (?2) THEN CASE WHEN LENGTH(?2) = LENGTH(moved_to) THEN (?3) WHEN SUBSTR((moved_to), LENGTH(?2)+1, 1) = '/' THEN (?3) || SUBSTR((moved_to), LENGTH(?2)+1) END END) " \ " WHERE wc_id = ?1 " \ " AND (((moved_to) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((moved_to) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ "" -#define STMT_CLEAR_MOVED_TO_DESCENDANTS 192 -#define STMT_192_INFO {"STMT_CLEAR_MOVED_TO_DESCENDANTS", NULL} -#define STMT_192 \ +#define STMT_CLEAR_MOVED_TO_DESCENDANTS 193 +#define STMT_193_INFO {"STMT_CLEAR_MOVED_TO_DESCENDANTS", NULL} +#define STMT_193 \ "UPDATE nodes SET moved_to = NULL " \ " WHERE wc_id = ?1 " \ " AND (((moved_to) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((moved_to) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ "" -#define STMT_SELECT_MOVED_PAIR3 193 -#define STMT_193_INFO {"STMT_SELECT_MOVED_PAIR3", NULL} -#define STMT_193 \ +#define STMT_SELECT_MOVED_PAIR3 194 +#define STMT_194_INFO {"STMT_SELECT_MOVED_PAIR3", NULL} +#define STMT_194 \ "SELECT n.local_relpath, d.moved_to, d.op_depth, n.kind " \ "FROM nodes n " \ "JOIN nodes d ON d.wc_id = ?1 AND d.local_relpath = n.local_relpath " \ @@ -2112,9 +2126,9 @@ "ORDER BY n.local_relpath " \ "" -#define STMT_SELECT_MOVED_OUTSIDE 194 -#define STMT_194_INFO {"STMT_SELECT_MOVED_OUTSIDE", NULL} -#define STMT_194 \ +#define STMT_SELECT_MOVED_OUTSIDE 195 +#define STMT_195_INFO {"STMT_SELECT_MOVED_OUTSIDE", NULL} +#define STMT_195 \ "SELECT local_relpath, moved_to, op_depth FROM nodes " \ "WHERE wc_id = ?1 " \ " AND (local_relpath = ?2 OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \ @@ -2123,9 +2137,9 @@ " AND NOT (((moved_to) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((moved_to) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ "" -#define STMT_SELECT_MOVED_DESCENDANTS_SRC 195 -#define STMT_195_INFO {"STMT_SELECT_MOVED_DESCENDANTS_SRC", NULL} -#define STMT_195 \ +#define STMT_SELECT_MOVED_DESCENDANTS_SRC 196 +#define STMT_196_INFO {"STMT_SELECT_MOVED_DESCENDANTS_SRC", NULL} +#define STMT_196 \ "SELECT s.op_depth, n.local_relpath, n.kind, n.repos_path, s.moved_to " \ "FROM nodes n " \ "JOIN nodes s ON s.wc_id = n.wc_id AND s.local_relpath = n.local_relpath " \ @@ -2139,9 +2153,9 @@ " AND s.moved_to IS NOT NULL " \ "" -#define STMT_COMMIT_UPDATE_ORIGIN 196 -#define STMT_196_INFO {"STMT_COMMIT_UPDATE_ORIGIN", NULL} -#define STMT_196 \ +#define STMT_COMMIT_UPDATE_ORIGIN 197 +#define STMT_197_INFO {"STMT_COMMIT_UPDATE_ORIGIN", NULL} +#define STMT_197 \ "UPDATE nodes SET repos_id = ?4, " \ " repos_path = (CASE WHEN (?2) = '' THEN (CASE WHEN (?5) = '' THEN (local_relpath) WHEN (local_relpath) = '' THEN (?5) ELSE (?5) || '/' || (local_relpath) END) WHEN (?5) = '' THEN (CASE WHEN (?2) = '' THEN (local_relpath) WHEN SUBSTR((local_relpath), 1, LENGTH(?2)) = (?2) THEN CASE WHEN LENGTH(?2) = LENGTH(local_relpath) THEN '' WHEN SUBSTR((local_relpath), LENGTH(?2)+1, 1) = '/' THEN SUBSTR((local_relpath), LENGTH(?2)+2) END END) WHEN SUBSTR((local_relpath), 1, LENGTH(?2)) = (?2) THEN CASE WHEN LENGTH(?2) = LENGTH(local_relpath) THEN (?5) WHEN SUBSTR((local_relpath), LENGTH(?2)+1, 1) = '/' THEN (?5) || SUBSTR((local_relpath), LENGTH(?2)+1) END END), " \ " revision = ?6 " \ @@ -2151,16 +2165,16 @@ " AND op_depth = ?3 " \ "" -#define STMT_HAS_LAYER_BETWEEN 197 -#define STMT_197_INFO {"STMT_HAS_LAYER_BETWEEN", NULL} -#define STMT_197 \ +#define STMT_HAS_LAYER_BETWEEN 198 +#define STMT_198_INFO {"STMT_HAS_LAYER_BETWEEN", NULL} +#define STMT_198 \ "SELECT 1 FROM NODES " \ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth > ?3 AND op_depth < ?4 " \ "" -#define STMT_SELECT_REPOS_PATH_REVISION 198 -#define STMT_198_INFO {"STMT_SELECT_REPOS_PATH_REVISION", NULL} -#define STMT_198 \ +#define STMT_SELECT_REPOS_PATH_REVISION 199 +#define STMT_199_INFO {"STMT_SELECT_REPOS_PATH_REVISION", NULL} +#define STMT_199 \ "SELECT local_relpath, repos_path, revision FROM nodes " \ "WHERE wc_id = ?1 " \ " AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ @@ -2168,17 +2182,17 @@ "ORDER BY local_relpath " \ "" -#define STMT_SELECT_HAS_NON_FILE_CHILDREN 199 -#define STMT_199_INFO {"STMT_SELECT_HAS_NON_FILE_CHILDREN", NULL} -#define STMT_199 \ +#define STMT_SELECT_HAS_NON_FILE_CHILDREN 200 +#define STMT_200_INFO {"STMT_SELECT_HAS_NON_FILE_CHILDREN", NULL} +#define STMT_200 \ "SELECT 1 FROM nodes " \ "WHERE wc_id = ?1 AND parent_relpath = ?2 AND op_depth = ?3 AND kind != 'file' " \ "LIMIT 1 " \ "" -#define STMT_SELECT_HAS_GRANDCHILDREN 200 -#define STMT_200_INFO {"STMT_SELECT_HAS_GRANDCHILDREN", NULL} -#define STMT_200 \ +#define STMT_SELECT_HAS_GRANDCHILDREN 201 +#define STMT_201_INFO {"STMT_SELECT_HAS_GRANDCHILDREN", NULL} +#define STMT_201 \ "SELECT 1 FROM nodes " \ "WHERE wc_id = ?1 " \ " AND (((parent_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((parent_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ @@ -2187,24 +2201,24 @@ "LIMIT 1 " \ "" -#define STMT_SELECT_ALL_NODES 201 -#define STMT_201_INFO {"STMT_SELECT_ALL_NODES", NULL} -#define STMT_201 \ +#define STMT_SELECT_ALL_NODES 202 +#define STMT_202_INFO {"STMT_SELECT_ALL_NODES", NULL} +#define STMT_202 \ "SELECT op_depth, local_relpath, parent_relpath, file_external FROM nodes " \ "WHERE wc_id = ?1 " \ "" -#define STMT_UPDATE_IPROP 202 -#define STMT_202_INFO {"STMT_UPDATE_IPROP", NULL} -#define STMT_202 \ +#define STMT_UPDATE_IPROP 203 +#define STMT_203_INFO {"STMT_UPDATE_IPROP", NULL} +#define STMT_203 \ "UPDATE nodes " \ "SET inherited_props = ?3 " \ "WHERE (wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0) " \ "" -#define STMT_SELECT_IPROPS_NODE 203 -#define STMT_203_INFO {"STMT_SELECT_IPROPS_NODE", NULL} -#define STMT_203 \ +#define STMT_SELECT_IPROPS_NODE 204 +#define STMT_204_INFO {"STMT_SELECT_IPROPS_NODE", NULL} +#define STMT_204 \ "SELECT local_relpath, repos_path FROM nodes " \ "WHERE wc_id = ?1 " \ " AND local_relpath = ?2 " \ @@ -2212,9 +2226,9 @@ " AND (inherited_props not null) " \ "" -#define STMT_SELECT_IPROPS_RECURSIVE 204 -#define STMT_204_INFO {"STMT_SELECT_IPROPS_RECURSIVE", NULL} -#define STMT_204 \ +#define STMT_SELECT_IPROPS_RECURSIVE 205 +#define STMT_205_INFO {"STMT_SELECT_IPROPS_RECURSIVE", NULL} +#define STMT_205 \ "SELECT local_relpath, repos_path FROM nodes " \ "WHERE wc_id = ?1 " \ " AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \ @@ -2222,9 +2236,9 @@ " AND (inherited_props not null) " \ "" -#define STMT_SELECT_IPROPS_CHILDREN 205 -#define STMT_205_INFO {"STMT_SELECT_IPROPS_CHILDREN", NULL} -#define STMT_205 \ +#define STMT_SELECT_IPROPS_CHILDREN 206 +#define STMT_206_INFO {"STMT_SELECT_IPROPS_CHILDREN", NULL} +#define STMT_206 \ "SELECT local_relpath, repos_path FROM nodes " \ "WHERE wc_id = ?1 " \ " AND parent_relpath = ?2 " \ @@ -2232,16 +2246,30 @@ " AND (inherited_props not null) " \ "" -#define STMT_HAVE_STAT1_TABLE 206 -#define STMT_206_INFO {"STMT_HAVE_STAT1_TABLE", NULL} -#define STMT_206 \ +#define STMT_HAVE_STAT1_TABLE 207 +#define STMT_207_INFO {"STMT_HAVE_STAT1_TABLE", NULL} +#define STMT_207 \ "SELECT 1 FROM sqlite_master WHERE name='sqlite_stat1' AND type='table' " \ "LIMIT 1 " \ "" -#define STMT_CREATE_SCHEMA 207 -#define STMT_207_INFO {"STMT_CREATE_SCHEMA", NULL} -#define STMT_207 \ +#define STMT_SELECT_COPIES_OF_REPOS_RELPATH 208 +#define STMT_208_INFO {"STMT_SELECT_COPIES_OF_REPOS_RELPATH", NULL} +#define STMT_208 \ + "SELECT local_relpath " \ + "FROM nodes n " \ + "WHERE wc_id = ?1 AND repos_path = ?2 AND kind = ?3 " \ + " AND presence = 'normal' " \ + " AND op_depth = (SELECT MAX(op_depth) " \ + " FROM NODES w " \ + " WHERE w.wc_id = ?1 " \ + " AND w.local_relpath = n.local_relpath) " \ + "ORDER BY local_relpath ASC " \ + "" + +#define STMT_CREATE_SCHEMA 209 +#define STMT_209_INFO {"STMT_CREATE_SCHEMA", NULL} +#define STMT_209 \ "CREATE TABLE REPOSITORY ( " \ " id INTEGER PRIMARY KEY AUTOINCREMENT, " \ " root TEXT UNIQUE NOT NULL, " \ @@ -2382,9 +2410,9 @@ "; " \ "" -#define STMT_INSTALL_SCHEMA_STATISTICS 208 -#define STMT_208_INFO {"STMT_INSTALL_SCHEMA_STATISTICS", NULL} -#define STMT_208 \ +#define STMT_INSTALL_SCHEMA_STATISTICS 210 +#define STMT_210_INFO {"STMT_INSTALL_SCHEMA_STATISTICS", NULL} +#define STMT_210 \ "ANALYZE sqlite_master; " \ "DELETE FROM sqlite_stat1 " \ "WHERE tbl in ('NODES', 'ACTUAL_NODE', 'LOCK', 'WC_LOCK', 'EXTERNALS'); " \ @@ -2409,9 +2437,9 @@ "ANALYZE sqlite_master; " \ "" -#define STMT_UPGRADE_TO_30 209 -#define STMT_209_INFO {"STMT_UPGRADE_TO_30", NULL} -#define STMT_209 \ +#define STMT_UPGRADE_TO_30 211 +#define STMT_211_INFO {"STMT_UPGRADE_TO_30", NULL} +#define STMT_211 \ "CREATE UNIQUE INDEX IF NOT EXISTS I_NODES_MOVED " \ "ON NODES (wc_id, moved_to, op_depth); " \ "CREATE INDEX IF NOT EXISTS I_PRISTINE_MD5 ON PRISTINE (md5_checksum); " \ @@ -2419,9 +2447,9 @@ "UPDATE nodes SET file_external=1 WHERE file_external IS NOT NULL; " \ "" -#define STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE 210 -#define STMT_210_INFO {"STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE", NULL} -#define STMT_210 \ +#define STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE 212 +#define STMT_212_INFO {"STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE", NULL} +#define STMT_212 \ "SELECT wc_id, local_relpath, " \ " conflict_old, conflict_working, conflict_new, prop_reject, tree_conflict_data " \ "FROM actual_node " \ @@ -2433,18 +2461,18 @@ "ORDER by wc_id, local_relpath " \ "" -#define STMT_UPGRADE_30_SET_CONFLICT 211 -#define STMT_211_INFO {"STMT_UPGRADE_30_SET_CONFLICT", NULL} -#define STMT_211 \ +#define STMT_UPGRADE_30_SET_CONFLICT 213 +#define STMT_213_INFO {"STMT_UPGRADE_30_SET_CONFLICT", NULL} +#define STMT_213 \ "UPDATE actual_node SET conflict_data = ?3, conflict_old = NULL, " \ " conflict_working = NULL, conflict_new = NULL, prop_reject = NULL, " \ " tree_conflict_data = NULL " \ "WHERE wc_id = ?1 and local_relpath = ?2 " \ "" -#define STMT_UPGRADE_TO_31 212 -#define STMT_212_INFO {"STMT_UPGRADE_TO_31", NULL} -#define STMT_212 \ +#define STMT_UPGRADE_TO_31 214 +#define STMT_214_INFO {"STMT_UPGRADE_TO_31", NULL} +#define STMT_214 \ "ALTER TABLE NODES ADD COLUMN inherited_props BLOB; " \ "DROP INDEX IF EXISTS I_ACTUAL_CHANGELIST; " \ "DROP INDEX IF EXISTS I_EXTERNALS_PARENT; " \ @@ -2457,9 +2485,9 @@ "PRAGMA user_version = 31; " \ "" -#define STMT_UPGRADE_31_SELECT_WCROOT_NODES 213 -#define STMT_213_INFO {"STMT_UPGRADE_31_SELECT_WCROOT_NODES", NULL} -#define STMT_213 \ +#define STMT_UPGRADE_31_SELECT_WCROOT_NODES 215 +#define STMT_215_INFO {"STMT_UPGRADE_31_SELECT_WCROOT_NODES", NULL} +#define STMT_215 \ "SELECT l.wc_id, l.local_relpath FROM nodes as l " \ "LEFT OUTER JOIN nodes as r " \ "ON l.wc_id = r.wc_id " \ @@ -2511,9 +2539,9 @@ "DROP TABLE ACTUAL_NODE_BACKUP; " \ "" -#define STMT_VERIFICATION_TRIGGERS 214 -#define STMT_214_INFO {"STMT_VERIFICATION_TRIGGERS", NULL} -#define STMT_214 \ +#define STMT_VERIFICATION_TRIGGERS 216 +#define STMT_216_INFO {"STMT_VERIFICATION_TRIGGERS", NULL} +#define STMT_216 \ "CREATE TEMPORARY TRIGGER no_repository_updates BEFORE UPDATE ON repository " \ "BEGIN " \ " SELECT RAISE(FAIL, 'Updates to REPOSITORY are not allowed.'); " \ @@ -2552,9 +2580,9 @@ "END; " \ "" -#define STMT_STATIC_VERIFY 215 -#define STMT_215_INFO {"STMT_STATIC_VERIFY", NULL} -#define STMT_215 \ +#define STMT_STATIC_VERIFY 217 +#define STMT_217_INFO {"STMT_STATIC_VERIFY", NULL} +#define STMT_217 \ "SELECT local_relpath, op_depth, 1, 'Invalid parent relpath set in NODES' " \ "FROM nodes n WHERE local_relpath != '' " \ " AND (parent_relpath IS NULL " \ @@ -2943,6 +2971,8 @@ STMT_213, \ STMT_214, \ STMT_215, \ + STMT_216, \ + STMT_217, \ NULL \ } @@ -3164,5 +3194,7 @@ STMT_213_INFO, \ STMT_214_INFO, \ STMT_215_INFO, \ + STMT_216_INFO, \ + STMT_217_INFO, \ {NULL, NULL} \ } diff --git a/subversion/libsvn_wc/wc-queries.sql b/subversion/libsvn_wc/wc-queries.sql index 86cf921..7ac4317 100644 --- a/subversion/libsvn_wc/wc-queries.sql +++ b/subversion/libsvn_wc/wc-queries.sql @@ -117,6 +117,17 @@ WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth < ?3 ORDER BY op_depth DESC LIMIT 1 +-- STMT_SELECT_PRESENT_HIGHEST_WORKING_NODES_BY_BASENAME_AND_KIND +SELECT presence, local_relpath +FROM nodes n +WHERE wc_id = ?1 AND local_relpath = RELPATH_JOIN(parent_relpath, ?2) + AND kind = ?3 + AND presence in (MAP_NORMAL, MAP_INCOMPLETE) + AND op_depth = (SELECT MAX(op_depth) + FROM NODES w + WHERE w.wc_id = ?1 + AND w.local_relpath = n.local_relpath) + -- STMT_SELECT_ACTUAL_NODE SELECT changelist, properties, conflict_data FROM actual_node @@ -1785,6 +1796,17 @@ WHERE wc_id = ?1 SELECT 1 FROM sqlite_master WHERE name='sqlite_stat1' AND type='table' LIMIT 1 +-- STMT_SELECT_COPIES_OF_REPOS_RELPATH +SELECT local_relpath +FROM nodes n +WHERE wc_id = ?1 AND repos_path = ?2 AND kind = ?3 + AND presence = MAP_NORMAL + AND op_depth = (SELECT MAX(op_depth) + FROM NODES w + WHERE w.wc_id = ?1 + AND w.local_relpath = n.local_relpath) +ORDER BY local_relpath ASC + /* ------------------------------------------------------------------------- */ /* Grab all the statements related to the schema. */ diff --git a/subversion/libsvn_wc/wc.h b/subversion/libsvn_wc/wc.h index f8bbebd..c8da7a9 100644 --- a/subversion/libsvn_wc/wc.h +++ b/subversion/libsvn_wc/wc.h @@ -289,6 +289,7 @@ struct svn_wc_traversal_info_t #define SVN_WC__ADM_TMP "tmp" #define SVN_WC__ADM_PRISTINE "pristine" #define SVN_WC__ADM_NONEXISTENT_PATH "nonexistent-path" +#define SVN_WC__ADM_EXPERIMENTAL "experimental" /* The basename of the ".prej" file, if a directory ever has property conflicts. This .prej file will appear *within* the conflicted diff --git a/subversion/libsvn_wc/wc_db.c b/subversion/libsvn_wc/wc_db.c index bc87b2f..fe09974 100644 --- a/subversion/libsvn_wc/wc_db.c +++ b/subversion/libsvn_wc/wc_db.c @@ -6839,7 +6839,7 @@ revert_maybe_raise_moved_away(svn_wc__db_wcroot_t * wcroot, } SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action, - NULL, + NULL, NULL, db, wcroot->abspath, conflict, scratch_pool, @@ -16525,8 +16525,8 @@ db_process_commit_queue(svn_wc__db_t *db, iterpool), iterpool, iterpool)); - lock_remove_txn(queue->wcroot, cqi->local_relpath, work_item, - iterpool); + SVN_ERR(lock_remove_txn(queue->wcroot, cqi->local_relpath, + work_item, iterpool)); } if (cqi->remove_changelist) SVN_ERR(svn_wc__db_op_set_changelist(db, @@ -16578,12 +16578,12 @@ svn_wc__db_process_commit_queue(svn_wc__db_t *db, } svn_error_t * -svn_wc__find_repos_node_in_wc(apr_array_header_t **local_abspath_list, - svn_wc__db_t *db, - const char *wri_abspath, - const char *repos_relpath, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) +svn_wc__db_find_repos_node_in_wc(apr_array_header_t **local_abspath_list, + svn_wc__db_t *db, + const char *wri_abspath, + const char *repos_relpath, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) { svn_wc__db_wcroot_t *wcroot; const char *wri_relpath; @@ -16620,3 +16620,90 @@ svn_wc__find_repos_node_in_wc(apr_array_header_t **local_abspath_list, return svn_error_trace(svn_sqlite__reset(stmt)); } +svn_error_t * +svn_wc__db_find_working_nodes_with_basename(apr_array_header_t **local_abspaths, + svn_wc__db_t *db, + const char *wri_abspath, + const char *basename, + svn_node_kind_t kind, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + svn_wc__db_wcroot_t *wcroot; + const char *wri_relpath; + svn_sqlite__stmt_t *stmt; + svn_boolean_t have_row; + + SVN_ERR_ASSERT(svn_dirent_is_absolute(wri_abspath)); + + SVN_ERR(svn_wc__db_wcroot_parse_local_abspath(&wcroot, &wri_relpath, db, + wri_abspath, scratch_pool, + scratch_pool)); + VERIFY_USABLE_WCROOT(wcroot); + + SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb, + STMT_SELECT_PRESENT_HIGHEST_WORKING_NODES_BY_BASENAME_AND_KIND)); + SVN_ERR(svn_sqlite__bindf(stmt, "ist", wcroot->wc_id, basename, + kind_map, kind)); + SVN_ERR(svn_sqlite__step(&have_row, stmt)); + + *local_abspaths = apr_array_make(result_pool, 1, sizeof(const char *)); + + while (have_row) + { + const char *local_relpath; + const char *local_abspath; + + local_relpath = svn_sqlite__column_text(stmt, 1, NULL); + local_abspath = svn_dirent_join(wcroot->abspath, local_relpath, + result_pool); + APR_ARRAY_PUSH(*local_abspaths, const char *) = local_abspath; + SVN_ERR(svn_sqlite__step(&have_row, stmt)); + } + + return svn_error_trace(svn_sqlite__reset(stmt)); +} + +svn_error_t * +svn_wc__db_find_copies_of_repos_path(apr_array_header_t **local_abspaths, + svn_wc__db_t *db, + const char *wri_abspath, + const char *repos_relpath, + svn_node_kind_t kind, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + svn_wc__db_wcroot_t *wcroot; + const char *wri_relpath; + svn_sqlite__stmt_t *stmt; + svn_boolean_t have_row; + + SVN_ERR_ASSERT(svn_dirent_is_absolute(wri_abspath)); + + SVN_ERR(svn_wc__db_wcroot_parse_local_abspath(&wcroot, &wri_relpath, db, + wri_abspath, scratch_pool, + scratch_pool)); + VERIFY_USABLE_WCROOT(wcroot); + + SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb, + STMT_SELECT_COPIES_OF_REPOS_RELPATH)); + SVN_ERR(svn_sqlite__bindf(stmt, "ist", wcroot->wc_id, repos_relpath, + kind_map, kind)); + SVN_ERR(svn_sqlite__step(&have_row, stmt)); + + *local_abspaths = apr_array_make(result_pool, 1, sizeof(const char *)); + + while (have_row) + { + const char *local_relpath; + const char *local_abspath; + + local_relpath = svn_sqlite__column_text(stmt, 0, NULL); + local_abspath = svn_dirent_join(wcroot->abspath, local_relpath, + result_pool); + APR_ARRAY_PUSH(*local_abspaths, const char *) = local_abspath; + SVN_ERR(svn_sqlite__step(&have_row, stmt)); + } + + return svn_error_trace(svn_sqlite__reset(stmt)); +} diff --git a/subversion/libsvn_wc/wc_db.h b/subversion/libsvn_wc/wc_db.h index 0bf6432..a7cc168 100644 --- a/subversion/libsvn_wc/wc_db.h +++ b/subversion/libsvn_wc/wc_db.h @@ -3496,12 +3496,48 @@ svn_wc__required_lock_for_resolve(const char **required_abspath, * which has been replaced. */ svn_error_t * -svn_wc__find_repos_node_in_wc(apr_array_header_t **local_abspath_list, - svn_wc__db_t *db, - const char *wri_abspath, - const char *repos_relpath, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool); +svn_wc__db_find_repos_node_in_wc(apr_array_header_t **local_abspath_list, + svn_wc__db_t *db, + const char *wri_abspath, + const char *repos_relpath, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + +/* Return an array of const char * elements, which represent local absolute + * paths for nodes, within the working copy indicated by WRI_ABSPATH, which + * have a basename matching BASENAME and have node kind KIND. + * If no such nodes exist, return an empty array. + * + * This function returns only paths to nodes which are present in the highest + * layer of the WC. In other words, paths to deleted and/or excluded nodes are + * never returned. + */ +svn_error_t * +svn_wc__db_find_working_nodes_with_basename(apr_array_header_t **local_abspaths, + svn_wc__db_t *db, + const char *wri_abspath, + const char *basename, + svn_node_kind_t kind, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + +/* Return an array of const char * elements, which represent local absolute + * paths for nodes, within the working copy indicated by WRI_ABSPATH, which + * are copies of REPOS_RELPATH and have node kind KIND. + * If no such nodes exist, return an empty array. + * + * This function returns only paths to nodes which are present in the highest + * layer of the WC. In other words, paths to deleted and/or excluded nodes are + * never returned. + */ +svn_error_t * +svn_wc__db_find_copies_of_repos_path(apr_array_header_t **local_abspaths, + svn_wc__db_t *db, + const char *wri_abspath, + const char *repos_relpath, + svn_node_kind_t kind, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); /* @} */ typedef svn_error_t * (*svn_wc__db_verify_cb_t)(void *baton, diff --git a/subversion/libsvn_wc/wc_db_update_move.c b/subversion/libsvn_wc/wc_db_update_move.c index 80fd509..f502126 100644 --- a/subversion/libsvn_wc/wc_db_update_move.c +++ b/subversion/libsvn_wc/wc_db_update_move.c @@ -411,6 +411,11 @@ create_tree_conflict(svn_skel_t **conflict_p, ? svn_dirent_join(wcroot->abspath, move_src_op_root_relpath, scratch_pool) : NULL; + const char *move_dst_op_root_abspath + = dst_op_root_relpath + ? svn_dirent_join(wcroot->abspath, + dst_op_root_relpath, scratch_pool) + : NULL; const char *old_repos_relpath_part = old_repos_relpath && old_version ? svn_relpath_skip_ancestor(old_version->path_in_repos, @@ -468,7 +473,7 @@ create_tree_conflict(svn_skel_t **conflict_p, SVN_ERR(svn_wc__conflict_read_tree_conflict(&existing_reason, &existing_action, - &existing_abspath, + &existing_abspath, NULL, db, wcroot->abspath, conflict, scratch_pool, @@ -500,6 +505,7 @@ create_tree_conflict(svn_skel_t **conflict_p, reason, action, move_src_op_root_abspath, + move_dst_op_root_abspath, result_pool, scratch_pool)); @@ -4100,7 +4106,7 @@ fetch_conflict_details(int *src_op_depth, SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, action, - &move_src_op_root_abspath, + &move_src_op_root_abspath, NULL, db, local_abspath, conflict_skel, result_pool, scratch_pool)); diff --git a/subversion/libsvn_wc/wc_db_wcroot.c b/subversion/libsvn_wc/wc_db_wcroot.c index 1cfca3d..c4f8c3b 100644 --- a/subversion/libsvn_wc/wc_db_wcroot.c +++ b/subversion/libsvn_wc/wc_db_wcroot.c @@ -528,6 +528,7 @@ svn_wc__db_wcroot_parse_local_abspath(svn_wc__db_wcroot_t **wcroot, const char *adm_relpath; /* Non-NULL if WCROOT is found through a symlink: */ const char *symlink_wcroot_abspath = NULL; + apr_pool_t *iterpool; /* ### we need more logic for finding the database (if it is located ### outside of the wcroot) and then managing all of that within DB. @@ -613,16 +614,20 @@ svn_wc__db_wcroot_parse_local_abspath(svn_wc__db_wcroot_t **wcroot, database in the right place. If we find it... great! If not, then peel off some components, and try again. */ + iterpool = svn_pool_create(scratch_pool); adm_relpath = svn_wc_get_adm_dir(scratch_pool); while (TRUE) { svn_error_t *err; svn_node_kind_t adm_subdir_kind; - const char *adm_subdir = svn_dirent_join(local_abspath, adm_relpath, - scratch_pool); + const char *adm_subdir; - SVN_ERR(svn_io_check_path(adm_subdir, &adm_subdir_kind, scratch_pool)); + svn_pool_clear(iterpool); + + adm_subdir = svn_dirent_join(local_abspath, adm_relpath, iterpool); + + SVN_ERR(svn_io_check_path(adm_subdir, &adm_subdir_kind, iterpool)); if (adm_subdir_kind == svn_node_dir) { @@ -673,7 +678,7 @@ svn_wc__db_wcroot_parse_local_abspath(svn_wc__db_wcroot_t **wcroot, if (!moved_upwards || always_check) { SVN_ERR(get_old_version(&wc_format, local_abspath, - scratch_pool)); + iterpool)); if (wc_format != 0) break; } @@ -697,7 +702,7 @@ svn_wc__db_wcroot_parse_local_abspath(svn_wc__db_wcroot_t **wcroot, SVN_ERR(svn_io_check_resolved_path(local_abspath, &resolved_kind, - scratch_pool)); + iterpool)); if (resolved_kind == svn_node_dir) { /* Is this directory recorded in our hash? */ @@ -973,6 +978,7 @@ try_symlink_as_dir: } while (strcmp(scan_abspath, local_abspath) != 0); + svn_pool_destroy(iterpool); return SVN_NO_ERROR; } diff --git a/subversion/libsvn_wc/wcroot_anchor.c b/subversion/libsvn_wc/wcroot_anchor.c index 7400aa5..2e675b6 100644 --- a/subversion/libsvn_wc/wcroot_anchor.c +++ b/subversion/libsvn_wc/wcroot_anchor.c @@ -183,18 +183,20 @@ svn_wc__get_wcroot(const char **wcroot_abspath, svn_error_t * -svn_wc__get_shelves_dir(char **dir, - svn_wc_context_t *wc_ctx, - const char *local_abspath, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) +svn_wc__get_experimental_dir(char **dir, + svn_wc_context_t *wc_ctx, + const char *local_abspath, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) { const char *wcroot_abspath; SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, wc_ctx, local_abspath, scratch_pool, scratch_pool)); - *dir = svn_dirent_join(wcroot_abspath, ".svn/shelves", result_pool); - + *dir = svn_dirent_join(wcroot_abspath, + SVN_WC_ADM_DIR_NAME "/" SVN_WC__ADM_EXPERIMENTAL, + result_pool); + /* Ensure the directory exists. (Other versions of svn don't create it.) */ SVN_ERR(svn_io_make_dir_recursively(*dir, scratch_pool)); diff --git a/subversion/mod_authz_svn/mod_authz_svn.c b/subversion/mod_authz_svn/mod_authz_svn.c index 979c89d..6ebd9d6 100644 --- a/subversion/mod_authz_svn/mod_authz_svn.c +++ b/subversion/mod_authz_svn/mod_authz_svn.c @@ -327,16 +327,17 @@ log_access_verdict(LOG_ARGS_SIGNATURE, } } -/* Log a message indiciating the ERR encountered during the request R. +/* Log a message at LOG_LEVEL indiciating the ERR encountered during + * the request R. * LOG_ARGS_SIGNATURE expands as in log_access_verdict() above. * PREFIX is inserted at the start of the message. The rest of the * message is generated by combining the message for each error in the * chain of ERR, excluding for trace errors. ERR will be cleared * when finished. */ static void -log_svn_error(LOG_ARGS_SIGNATURE, - request_rec *r, const char *prefix, - svn_error_t *err, apr_pool_t *scratch_pool) +log_svn_message(LOG_ARGS_SIGNATURE, int log_level, + request_rec *r, const char *prefix, + svn_error_t *err, apr_pool_t *scratch_pool) { svn_error_t *err_pos = svn_error_purge_tracing(err); svn_stringbuf_t *buff = svn_stringbuf_create(prefix, scratch_pool); @@ -360,7 +361,7 @@ log_svn_error(LOG_ARGS_SIGNATURE, err_pos = err_pos->child; } - ap_log_rerror(LOG_ARGS_CASCADE, APLOG_ERR, + ap_log_rerror(LOG_ARGS_CASCADE, log_level, /* If it is an error code that APR can make sense of, then show it, otherwise, pass zero to avoid putting "APR does not understand this error code" in the error log. */ @@ -372,6 +373,40 @@ log_svn_error(LOG_ARGS_SIGNATURE, svn_error_clear(err); } +/* Log the error error ERR encountered during the request R. + * LOG_ARGS_SIGNATURE expands as in log_access_verdict() above. + * PREFIX is inserted at the start of the message. The rest of the + * message is generated by combining the message for each error in the + * chain of ERR, excluding for trace errors. ERR will be cleared + * when finished. */ +static APR_INLINE void +log_svn_error(LOG_ARGS_SIGNATURE, + request_rec *r, const char *prefix, + svn_error_t *err, apr_pool_t *scratch_pool) +{ + log_svn_message(LOG_ARGS_CASCADE, APLOG_ERR, + r, prefix, err, scratch_pool); +} + +/* Baton for log_authz_warning. */ +typedef struct authz_warning_baton_t +{ + request_rec *r; + const char *prefix; +} authz_warning_baton_t; + +/* Handle an authz parser warning. ERR will *not* be cleared.*/ +static APR_INLINE void +log_authz_warning(void *baton, + const svn_error_t *err, + apr_pool_t *scratch_pool) +{ + const authz_warning_baton_t *const warning_baton = baton; + log_svn_message(APLOG_MARK, APLOG_WARNING, + warning_baton->r, warning_baton->prefix, + svn_error_dup(err), scratch_pool); +} + /* Resolve *PATH into an absolute canonical URL iff *PATH is a repos-relative * URL. If *REPOS_URL is NULL convert REPOS_PATH into a file URL stored * in *REPOS_URL, if *REPOS_URL is not null REPOS_PATH is ignored. The @@ -472,8 +507,13 @@ get_access_conf(request_rec *r, authz_svn_config_rec *conf, access_conf = user_data; if (access_conf == NULL) { - svn_err = svn_repos_authz_read3(&access_conf, access_file, + authz_warning_baton_t warning_baton; + warning_baton.r = r; + warning_baton.prefix = "mod_authz_svn: warning:"; + + svn_err = svn_repos_authz_read4(&access_conf, access_file, groups_file, TRUE, NULL, + log_authz_warning, &warning_baton, r->connection->pool, scratch_pool); diff --git a/subversion/mod_dav_svn/mod_dav_svn.c b/subversion/mod_dav_svn/mod_dav_svn.c index d949fea..2731f10 100644 --- a/subversion/mod_dav_svn/mod_dav_svn.c +++ b/subversion/mod_dav_svn/mod_dav_svn.c @@ -292,10 +292,14 @@ merge_dir_config(apr_pool_t *p, void *base, void *overrides) if (parent->fs_path) ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "mod_dav_svn: Location '%s' hinders access to '%s' " - "in parent SVNPath Location '%s'", + "in parent SVNPath Location '%s'%s", child->root_dir, svn_urlpath__skip_ancestor(parent->root_dir, child->root_dir), - parent->root_dir); + parent->root_dir, + (strcmp(child->root_dir, parent->root_dir) == 0) + ? " (or the subversion-specific configuration" + " is included twice into httpd.conf)" + : ""); return newconf; } diff --git a/subversion/mod_dav_svn/reports/file-revs.c b/subversion/mod_dav_svn/reports/file-revs.c index fcea052..0feace9 100644 --- a/subversion/mod_dav_svn/reports/file-revs.c +++ b/subversion/mod_dav_svn/reports/file-revs.c @@ -214,7 +214,7 @@ file_rev_handler(void *baton, frb->compression_level, pool); *window_handler = delta_window_handler; *window_baton = frb; - /* Start the txdelta element wich will be terminated by the window + /* Start the txdelta element which will be terminated by the window handler together with the file-rev element. */ SVN_ERR(dav_svn__brigade_puts(frb->bb, frb->output, "")); } diff --git a/subversion/mod_dav_svn/reports/replay.c b/subversion/mod_dav_svn/reports/replay.c index 3c17670..a1b5b8b 100644 --- a/subversion/mod_dav_svn/reports/replay.c +++ b/subversion/mod_dav_svn/reports/replay.c @@ -437,7 +437,7 @@ dav_svn__replay_report(const dav_resource *resource, URL, and BASE_DIR is embedded in the request body. The old-school (and incorrect, see issue #4287 -- - http://subversion.tigris.org/issues/show_bug.cgi?id=4287) way was + https://issues.apache.org/jira/browse/SVN-4287) way was to REPORT on the public URL of the BASE_DIR and embed the REV in the report body. */ diff --git a/subversion/mod_dav_svn/repos.c b/subversion/mod_dav_svn/repos.c index 09245f8..824f835 100644 --- a/subversion/mod_dav_svn/repos.c +++ b/subversion/mod_dav_svn/repos.c @@ -2514,6 +2514,14 @@ get_resource(request_rec *r, /* capture warnings during cleanup of the FS */ svn_fs_set_warning_func(repos->fs, log_warning_req, r); + /* We must degrade the logging context when the request is freed. */ + cleanup_req_logging_baton = + apr_pcalloc(r->pool, sizeof(*cleanup_req_logging_baton)); + cleanup_req_logging_baton->fs = repos->fs; + cleanup_req_logging_baton->connection = r->connection; + apr_pool_pre_cleanup_register(r->pool, cleanup_req_logging_baton, + cleanup_req_logging); + /* if an authenticated username is present, attach it to the FS */ if (r->user) { @@ -2529,14 +2537,6 @@ get_resource(request_rec *r, apr_pool_cleanup_register(r->pool, cleanup_baton, cleanup_fs_access, apr_pool_cleanup_null); - /* We must degrade the logging context when the request is freed. */ - cleanup_req_logging_baton = - apr_pcalloc(r->pool, sizeof(*cleanup_req_logging_baton)); - cleanup_req_logging_baton->fs = repos->fs; - cleanup_req_logging_baton->connection = r->connection; - apr_pool_pre_cleanup_register(r->pool, cleanup_req_logging_baton, - cleanup_req_logging); - /* Create an access context based on the authenticated username. */ serr = svn_fs_create_access(&access_ctx, r->user, r->pool); if (serr) @@ -3139,6 +3139,50 @@ seek_stream(dav_stream *stream, apr_off_t abs_position) && resource->baselined)) +/* Return the last modification time of RESOURCE, or -1 if the DAV + resource type is not handled, or if an error occurs. Temporary + allocations are made from RESOURCE->POOL. */ +static apr_time_t +get_last_modified(const dav_resource *resource) +{ + apr_time_t last_modified; + svn_error_t *serr; + svn_revnum_t created_rev; + svn_string_t *date_time; + + if (RESOURCE_LACKS_ETAG_POTENTIAL(resource)) + return -1; + + if ((serr = svn_fs_node_created_rev(&created_rev, resource->info->root.root, + resource->info->repos_path, + resource->pool))) + { + svn_error_clear(serr); + return -1; + } + + if ((serr = svn_fs_revision_prop2(&date_time, resource->info->repos->fs, + created_rev, SVN_PROP_REVISION_DATE, + TRUE, resource->pool, resource->pool))) + { + svn_error_clear(serr); + return -1; + } + + if (date_time == NULL || date_time->data == NULL) + return -1; + + if ((serr = svn_time_from_cstring(&last_modified, date_time->data, + resource->pool))) + { + svn_error_clear(serr); + return -1; + } + + return last_modified; +} + + const char * dav_svn__getetag(const dav_resource *resource, apr_pool_t *pool) { @@ -3219,6 +3263,23 @@ set_headers(request_rec *r, const dav_resource *resource) if (!resource->exists) return NULL; + if ((resource->type == DAV_RESOURCE_TYPE_REGULAR) + && (resource->info->repos_path == resource->info->uri_path->data)) + { + /* Include Last-Modified header for 'external' GET or HEAD requests + (i.e. requests to URI's not under /!svn), to support usage of an + SVN server as a file server, where the client needs timestamps + for instance to use as "last modification time" of files on disk. */ + const apr_time_t last_modified = get_last_modified(resource); + if (last_modified != -1) + { + /* Note the modification time for the requested resource, and + include the Last-Modified header in the response. */ + ap_update_mtime(r, last_modified); + ap_set_last_modified(r); + } + } + /* generate our etag and place it into the output */ apr_table_setn(r->headers_out, "ETag", dav_svn__getetag(resource, resource->pool)); diff --git a/subversion/po/de.po b/subversion/po/de.po index f394531..71655b5 100644 --- a/subversion/po/de.po +++ b/subversion/po/de.po @@ -96,7 +96,7 @@ msgid "" msgstr "" "Project-Id-Version: subversion 1.9\n" "Report-Msgid-Bugs-To: dev@subversion.apache.org\n" -"POT-Creation-Date: 2015-04-10 18:54+0200\n" +"POT-Creation-Date: 2018-03-11 16:08+0100\n" "PO-Revision-Date: 2015-04-10 18:52+0100\n" "Last-Translator: Subversion Developers \n" "Language-Team: German \n" @@ -225,7 +225,7 @@ msgstr "Pfad ist kein direktes Kind des spezifizierten Verzeichnisses" msgid "Bogus UUID" msgstr "Ungültige UUID" -#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1026 +#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1041 msgid "Invalid configuration value" msgstr "Ungültiger Konfigurationswert" @@ -257,1253 +257,1314 @@ msgstr "Ungültiges »atomic«" msgid "Invalid compression method" msgstr "Ungültige Komprimierungsmethode" -#: ../include/svn_error_codes.h:247 +#: ../include/svn_error_codes.h:246 +#, fuzzy +msgid "Unexpected line ending in the property value" +msgstr "Unerwartete oder unbekannte Eigenschaftsart" + +#: ../include/svn_error_codes.h:252 msgid "No such XML tag attribute" msgstr "Ein solches Attribut des XML-Tags existiert nicht" -#: ../include/svn_error_codes.h:251 +#: ../include/svn_error_codes.h:256 msgid " is missing ancestry" msgstr " fehlt die Herkunft" -#: ../include/svn_error_codes.h:255 +#: ../include/svn_error_codes.h:260 msgid "Unrecognized binary data encoding; can't decode" msgstr "Unbekannte binäre Datenkodierung, kann nicht entschlüsseln" -#: ../include/svn_error_codes.h:259 +#: ../include/svn_error_codes.h:264 msgid "XML data was not well-formed" msgstr "XML Daten nicht wohlgeformt" -#: ../include/svn_error_codes.h:263 +#: ../include/svn_error_codes.h:268 msgid "Data cannot be safely XML-escaped" msgstr "Daten können nicht sicher in XML eingebettet werden" -#: ../include/svn_error_codes.h:268 +#: ../include/svn_error_codes.h:273 msgid "Unexpected XML element found" msgstr "Unerwartetes XML-Element gefunden" -#: ../include/svn_error_codes.h:274 +#: ../include/svn_error_codes.h:279 msgid "Inconsistent line ending style" msgstr "Stil für Zeilenende ist inkonsistent" -#: ../include/svn_error_codes.h:278 +#: ../include/svn_error_codes.h:283 msgid "Unrecognized line ending style" msgstr "Stil für Zeilenende nicht erkannt" -#: ../include/svn_error_codes.h:283 +#: ../include/svn_error_codes.h:288 msgid "Line endings other than expected" msgstr "Zeilenende anders als erwartet" -#: ../include/svn_error_codes.h:287 +#: ../include/svn_error_codes.h:292 msgid "Ran out of unique names" msgstr "Eindeutige Namen ausgegangen" -#: ../include/svn_error_codes.h:292 +#: ../include/svn_error_codes.h:297 msgid "Framing error in pipe protocol" msgstr "Rahmenfehler im »Pipe«-Protokoll" -#: ../include/svn_error_codes.h:297 +#: ../include/svn_error_codes.h:302 msgid "Read error in pipe" msgstr "Lesefehler in »Pipe«" #. is errno on POSIX -#: ../include/svn_error_codes.h:301 ../libsvn_subr/cmdline.c:417 -#: ../libsvn_subr/cmdline.c:448 ../libsvn_subr/cmdline.c:471 ../svn/util.c:571 -#: ../svnlook/svnlook.c:2025 +#: ../include/svn_error_codes.h:306 ../libsvn_subr/cmdline.c:435 +#: ../libsvn_subr/cmdline.c:466 ../libsvn_subr/cmdline.c:489 ../svn/util.c:571 +#: ../svnlook/svnlook.c:2034 #, c-format msgid "Write error" msgstr "Schreibfehler" -#: ../include/svn_error_codes.h:306 +#: ../include/svn_error_codes.h:311 msgid "Write error in pipe" msgstr "Schreibfehler in »Pipe«" -#: ../include/svn_error_codes.h:312 +#: ../include/svn_error_codes.h:317 msgid "Unexpected EOF on stream" msgstr "Unerwartetes EOF im Datenstrom" -#: ../include/svn_error_codes.h:316 +#: ../include/svn_error_codes.h:321 msgid "Malformed stream data" msgstr "Fehlerhafter Datenstrom" -#: ../include/svn_error_codes.h:320 +#: ../include/svn_error_codes.h:325 msgid "Unrecognized stream data" msgstr "Unbekannter Datenstrom" -#: ../include/svn_error_codes.h:325 +#: ../include/svn_error_codes.h:330 msgid "Stream doesn't support seeking" msgstr "Datenstrom unterstützt das Setzen der Position nicht" -#: ../include/svn_error_codes.h:330 +#: ../include/svn_error_codes.h:335 msgid "Stream doesn't support this capability" msgstr "Datenstrom unterstützt diese Funktion nicht" -#: ../include/svn_error_codes.h:336 +#: ../include/svn_error_codes.h:341 msgid "Unknown svn_node_kind" msgstr "Unbekannter svn_node_kind" -#: ../include/svn_error_codes.h:340 +#: ../include/svn_error_codes.h:345 msgid "Unexpected node kind found" msgstr "Unerwarteter Knotentyp gefunden" -#: ../include/svn_error_codes.h:346 +#: ../include/svn_error_codes.h:351 msgid "Can't find an entry" msgstr "Kann keinen Eintrag finden" -#: ../include/svn_error_codes.h:352 +#: ../include/svn_error_codes.h:357 msgid "Entry already exists" msgstr "Eintrag existiert bereits" -#: ../include/svn_error_codes.h:356 +#: ../include/svn_error_codes.h:361 msgid "Entry has no revision" msgstr "Eintrag hat keine Revision" -#: ../include/svn_error_codes.h:360 +#: ../include/svn_error_codes.h:365 msgid "Entry has no URL" msgstr "Eintrag hat keine URL" -#: ../include/svn_error_codes.h:364 +#: ../include/svn_error_codes.h:369 msgid "Entry has an invalid attribute" msgstr "Eintrag hat ein ungültiges Attribut" -#: ../include/svn_error_codes.h:368 +#: ../include/svn_error_codes.h:373 msgid "Can't create an entry for a forbidden name" msgstr "Kann keinen Eintrag für einen verbotenen Namen erzeugen" -#: ../include/svn_error_codes.h:374 +#: ../include/svn_error_codes.h:379 msgid "Obstructed update" msgstr "Aktualisierung behindert" -#: ../include/svn_error_codes.h:379 +#: ../include/svn_error_codes.h:384 msgid "Mismatch popping the WC unwind stack" msgstr "Fehler beim Abrufen des Abwicklungsstapels der Arbeitskopie" -#: ../include/svn_error_codes.h:384 +#: ../include/svn_error_codes.h:389 msgid "Attempt to pop empty WC unwind stack" msgstr "Versuch, leeren Abwicklungsstapel abzurufen" -#: ../include/svn_error_codes.h:389 +#: ../include/svn_error_codes.h:394 msgid "Attempt to unlock with non-empty unwind stack" msgstr "Versuch, mit nicht leerem Abwicklungsstapel zu entsperren" -#: ../include/svn_error_codes.h:393 +#: ../include/svn_error_codes.h:398 msgid "Attempted to lock an already-locked dir" msgstr "Versuch, ein bereits gesperrtes Verzeichnis erneut zu sperren" -#: ../include/svn_error_codes.h:397 +#: ../include/svn_error_codes.h:402 msgid "Working copy not locked; this is probably a bug, please report" msgstr "Arbeitskopie nicht gesperrt. Dies ist wahrscheinlich ein Fehler. Bitte melden." -#: ../include/svn_error_codes.h:402 +#: ../include/svn_error_codes.h:407 msgid "Invalid lock" msgstr "Ungültige Sperre" -#: ../include/svn_error_codes.h:408 ../include/svn_error_codes.h:414 +#: ../include/svn_error_codes.h:413 ../include/svn_error_codes.h:419 msgid "Path is not a working copy directory" msgstr "Pfad ist kein Verzeichnis in einer Arbeitskopie" -#: ../include/svn_error_codes.h:418 +#: ../include/svn_error_codes.h:423 msgid "Path is not a working copy file" msgstr "Pfad ist keine Datei in einer Arbeitskopie" -#: ../include/svn_error_codes.h:422 +#: ../include/svn_error_codes.h:427 msgid "Problem running log" msgstr "Problem während der Ausführung des Logs" -#: ../include/svn_error_codes.h:426 +#: ../include/svn_error_codes.h:431 msgid "Can't find a working copy path" msgstr "Kann keinen Arbeitskopiepfad finden" -#: ../include/svn_error_codes.h:430 +#: ../include/svn_error_codes.h:435 msgid "Working copy is not up-to-date" msgstr "Arbeitskopie ist nicht aktuell" -#: ../include/svn_error_codes.h:434 +#: ../include/svn_error_codes.h:439 msgid "Left locally modified or unversioned files" msgstr "Lokal veränderte oder nicht versionierte Dateien zurück gelassen" -#: ../include/svn_error_codes.h:438 +#: ../include/svn_error_codes.h:443 msgid "Unmergeable scheduling requested on an entry" msgstr "Nicht zusammenführbare Planungsanforderung für einen Eintrag" -#: ../include/svn_error_codes.h:442 +#: ../include/svn_error_codes.h:447 msgid "Found a working copy path" msgstr "Arbeitskopiepfad gefunden" -#: ../include/svn_error_codes.h:446 +#: ../include/svn_error_codes.h:451 msgid "A conflict in the working copy obstructs the current operation" msgstr "Ein Konflikt in der Arbeitskopie behindert die aktuelle Operation" -#: ../include/svn_error_codes.h:450 +#: ../include/svn_error_codes.h:455 msgid "Working copy is corrupt" msgstr "Arbeitskopie ist beschädigt" -#: ../include/svn_error_codes.h:454 +#: ../include/svn_error_codes.h:459 msgid "Working copy text base is corrupt" msgstr "Textbasis der Arbeitskopie ist beschädigt" -#: ../include/svn_error_codes.h:458 +#: ../include/svn_error_codes.h:463 msgid "Cannot change node kind" msgstr "Kann Knotentyp nicht ändern" -#: ../include/svn_error_codes.h:462 +#: ../include/svn_error_codes.h:467 msgid "Invalid operation on the current working directory" msgstr "Ungültige Operation auf dem aktuellen Arbeitsverzeichnis" -#: ../include/svn_error_codes.h:466 +#: ../include/svn_error_codes.h:471 msgid "Problem on first log entry in a working copy" msgstr "Problem mit dem ersten Log-Eintrag in einer Arbeitskopie" -#: ../include/svn_error_codes.h:470 +#: ../include/svn_error_codes.h:475 msgid "Unsupported working copy format" msgstr "Nicht unterstütztes Format der Arbeitskopie" -#: ../include/svn_error_codes.h:474 +#: ../include/svn_error_codes.h:479 msgid "Path syntax not supported in this context" msgstr "Pfadsyntax wird in diesem Zusammenhang nicht unterstützt" -#: ../include/svn_error_codes.h:479 +#: ../include/svn_error_codes.h:484 msgid "Invalid schedule" msgstr "Ungültiger Plan" -#: ../include/svn_error_codes.h:484 +#: ../include/svn_error_codes.h:489 msgid "Invalid relocation" msgstr "Ungültiges Umplatzieren" -#: ../include/svn_error_codes.h:489 +#: ../include/svn_error_codes.h:494 msgid "Invalid switch" msgstr "Ungültiges Wechseln" -#: ../include/svn_error_codes.h:494 +#: ../include/svn_error_codes.h:499 msgid "Changelist doesn't match" msgstr "Änderungsliste passt nicht" -#: ../include/svn_error_codes.h:499 +#: ../include/svn_error_codes.h:504 msgid "Conflict resolution failed" msgstr "Konfliktauflösung schlug fehl" -#: ../include/svn_error_codes.h:503 +#: ../include/svn_error_codes.h:508 msgid "Failed to locate 'copyfrom' path in working copy" msgstr "Pfad von »copyfrom« konnte in der Arbeitskopie nicht gefunden werden" -#: ../include/svn_error_codes.h:511 +#: ../include/svn_error_codes.h:516 msgid "Moving a path from one changelist to another" msgstr "Verschieben eines Pfades von einer Änderungsliste in eine andere" -#: ../include/svn_error_codes.h:516 +#: ../include/svn_error_codes.h:521 msgid "Cannot delete a file external" msgstr "Kann externen Dateiverweis nicht löschen" -#: ../include/svn_error_codes.h:521 +#: ../include/svn_error_codes.h:526 msgid "Cannot move a file external" msgstr "Kann externen Dateiverweis nicht verschieben" -#: ../include/svn_error_codes.h:526 +#: ../include/svn_error_codes.h:531 msgid "Something's amiss with the wc sqlite database" msgstr "Irgendetwas ist mit der sqlite-Datenbank der Arbeitskopie falsch" -#: ../include/svn_error_codes.h:531 +#: ../include/svn_error_codes.h:536 msgid "The working copy is missing" msgstr "Die Arbeitskopie fehlt" -#: ../include/svn_error_codes.h:536 +#: ../include/svn_error_codes.h:541 msgid "The specified node is not a symlink" msgstr "Der spezifizierte Knoten ist kein symbolischer Link" -#: ../include/svn_error_codes.h:541 +#: ../include/svn_error_codes.h:546 msgid "The specified path has an unexpected status" msgstr "Der angegebene Pfad hat einen unerwarteten Status" -#: ../include/svn_error_codes.h:546 +#: ../include/svn_error_codes.h:551 msgid "The working copy needs to be upgraded" msgstr "Die Arbeitskopie muss in ein neueres Format gebracht werden" -#: ../include/svn_error_codes.h:551 +#: ../include/svn_error_codes.h:556 msgid "Previous operation has not finished; run 'cleanup' if it was interrupted" msgstr "Die vorhergehende Operation wurde nicht abgeschlossen; Starten Sie »svn cleanup« falls sie unterbrochen wurde" -#: ../include/svn_error_codes.h:557 +#: ../include/svn_error_codes.h:562 msgid "The operation cannot be performed with the specified depth" msgstr "Diese Operation kann nicht mit der angegebenen Tiefe durch geführt werden." -#: ../include/svn_error_codes.h:562 +#: ../include/svn_error_codes.h:567 msgid "Couldn't open a working copy file because access was denied" msgstr "Konnte eine Datei der Arbeitskopie nicht öffnen, da der Zugriff verweigert wurde" -#: ../include/svn_error_codes.h:567 +#: ../include/svn_error_codes.h:572 msgid "Mixed-revision working copy was found but not expected" msgstr "Arbeitskopie mit verschiedenen Revisionen gefunden aber nicht erwartet" -#: ../include/svn_error_codes.h:572 +#: ../include/svn_error_codes.h:577 msgid "Duplicate targets in svn:externals property" msgstr "Doppelte Zielangaben in svn:externals Eigenschaft" -#: ../include/svn_error_codes.h:578 +#: ../include/svn_error_codes.h:583 msgid "General filesystem error" msgstr "Allgemeiner Dateisystemfehler" -#: ../include/svn_error_codes.h:582 +#: ../include/svn_error_codes.h:587 msgid "Error closing filesystem" msgstr "Fehler beim Schließen des Dateisystems" -#: ../include/svn_error_codes.h:586 +#: ../include/svn_error_codes.h:591 msgid "Filesystem is already open" msgstr "Dateisystem ist bereits geöffnet" -#: ../include/svn_error_codes.h:590 +#: ../include/svn_error_codes.h:595 msgid "Filesystem is not open" msgstr "Dateisystem ist nicht geöffnet" -#: ../include/svn_error_codes.h:594 +#: ../include/svn_error_codes.h:599 msgid "Filesystem is corrupt" msgstr "Dateisystem ist beschädigt" -#: ../include/svn_error_codes.h:598 +#: ../include/svn_error_codes.h:603 msgid "Invalid filesystem path syntax" msgstr "Ungültige Pfadsyntax des Dateisystems" -#: ../include/svn_error_codes.h:602 +#: ../include/svn_error_codes.h:607 msgid "Invalid filesystem revision number" msgstr "Ungültige Revisionsnummer des Dateisystems" -#: ../include/svn_error_codes.h:606 +#: ../include/svn_error_codes.h:611 msgid "Invalid filesystem transaction name" msgstr "Ungültiger Transaktionsname des Dateisystems" -#: ../include/svn_error_codes.h:610 +#: ../include/svn_error_codes.h:615 msgid "Filesystem directory has no such entry" msgstr "Verzeichnis des Dateisystems hat keinen solchen Eintrag" -#: ../include/svn_error_codes.h:614 +#: ../include/svn_error_codes.h:619 msgid "Filesystem has no such representation" msgstr "Dateisystem hat keine solche Darstellung" -#: ../include/svn_error_codes.h:618 +#: ../include/svn_error_codes.h:623 msgid "Filesystem has no such string" msgstr "Dateisystem hat keinen solchen String" -#: ../include/svn_error_codes.h:622 +#: ../include/svn_error_codes.h:627 msgid "Filesystem has no such copy" msgstr "Dateisystem hat keine solche Kopie" -#: ../include/svn_error_codes.h:626 +#: ../include/svn_error_codes.h:631 msgid "The specified transaction is not mutable" msgstr "Die spezifizierte Transaktion ist nicht veränderlich" -#: ../include/svn_error_codes.h:630 +#: ../include/svn_error_codes.h:635 msgid "Filesystem has no item" msgstr "Dateisystem hat keinen Eintrag" -#: ../include/svn_error_codes.h:634 +#: ../include/svn_error_codes.h:639 msgid "Filesystem has no such node-rev-id" msgstr "Dateisystem hat keine solche Knotenrevisions-Id" -#: ../include/svn_error_codes.h:638 +#: ../include/svn_error_codes.h:643 msgid "String does not represent a node or node-rev-id" msgstr "Zeichenkette stellt keinen Knoten oder keine Knotenrevisions-Id dar" -#: ../include/svn_error_codes.h:642 +#: ../include/svn_error_codes.h:647 msgid "Name does not refer to a filesystem directory" msgstr "Name bezeichnet kein Verzeichnis des Dateisystems" -#: ../include/svn_error_codes.h:646 +#: ../include/svn_error_codes.h:651 msgid "Name does not refer to a filesystem file" msgstr "Name bezeichnet keine Datei des Dateisystems" -#: ../include/svn_error_codes.h:650 +#: ../include/svn_error_codes.h:655 msgid "Name is not a single path component" msgstr "Name ist keine einzelne Pfadkomponente" -#: ../include/svn_error_codes.h:654 +#: ../include/svn_error_codes.h:659 msgid "Attempt to change immutable filesystem node" msgstr "Versuch, einen nicht-veränderlichen Knoten des Dateisystems zu ändern" -#: ../include/svn_error_codes.h:658 +#: ../include/svn_error_codes.h:663 msgid "Item already exists in filesystem" msgstr "Objekt existiert bereits im Dateisystem" -#: ../include/svn_error_codes.h:662 +#: ../include/svn_error_codes.h:667 msgid "Attempt to remove or recreate fs root dir" msgstr "Versuch, Basisverzeichnis des Dateisystems zu entfernen oder neu zu erstellen" -#: ../include/svn_error_codes.h:666 +#: ../include/svn_error_codes.h:671 msgid "Object is not a transaction root" msgstr "Objekt ist keine Transaktionsbasis" -#: ../include/svn_error_codes.h:670 +#: ../include/svn_error_codes.h:675 msgid "Object is not a revision root" msgstr "Objekt ist keine Revisionsbasis" -#: ../include/svn_error_codes.h:674 +#: ../include/svn_error_codes.h:679 msgid "Merge conflict during commit" msgstr "Konflikt beim Zusammenführen während der Ãœbertragung" -#: ../include/svn_error_codes.h:678 +#: ../include/svn_error_codes.h:683 msgid "A representation vanished or changed between reads" msgstr "Eine Darstellung ist zwischen Lesezugriffen verschwunden oder hat sich verändert" -#: ../include/svn_error_codes.h:682 +#: ../include/svn_error_codes.h:687 msgid "Tried to change an immutable representation" msgstr "Versuchte, eine nicht-veränderliche Darstellung zu ändern" -#: ../include/svn_error_codes.h:686 +#: ../include/svn_error_codes.h:691 msgid "Malformed skeleton data" msgstr "Fehlerhafte Skeletondaten" -#: ../include/svn_error_codes.h:690 +#: ../include/svn_error_codes.h:695 msgid "Transaction is out of date" msgstr "Transaktion ist veraltet" -#: ../include/svn_error_codes.h:694 +#: ../include/svn_error_codes.h:699 msgid "Berkeley DB error" msgstr "Berkeley-DB-Fehler" -#: ../include/svn_error_codes.h:698 +#: ../include/svn_error_codes.h:703 msgid "Berkeley DB deadlock error" msgstr "Deadlock-Fehler der Berkeley Datenbank" -#: ../include/svn_error_codes.h:702 +#: ../include/svn_error_codes.h:707 msgid "Transaction is dead" msgstr "Transaktion ist tot" -#: ../include/svn_error_codes.h:706 +#: ../include/svn_error_codes.h:711 msgid "Transaction is not dead" msgstr "Transaktion ist nicht tot" -#: ../include/svn_error_codes.h:711 +#: ../include/svn_error_codes.h:716 msgid "Unknown FS type" msgstr "Unbekannter Dateisystemtyp" -#: ../include/svn_error_codes.h:716 +#: ../include/svn_error_codes.h:721 msgid "No user associated with filesystem" msgstr "Kein Benutzer mit dem Dateisystem verbunden" -#: ../include/svn_error_codes.h:721 +#: ../include/svn_error_codes.h:726 msgid "Path is already locked" msgstr "Pfad ist bereits gesperrt" -#: ../include/svn_error_codes.h:726 ../include/svn_error_codes.h:963 +#: ../include/svn_error_codes.h:731 ../include/svn_error_codes.h:978 msgid "Path is not locked" msgstr "Pfad ist nicht gesperrt" -#: ../include/svn_error_codes.h:731 +#: ../include/svn_error_codes.h:736 msgid "Lock token is incorrect" msgstr "Sperrmarke ist fehlerhaft" -#: ../include/svn_error_codes.h:736 +#: ../include/svn_error_codes.h:741 msgid "No lock token provided" msgstr "Keine Sperrmarke angegeben" -#: ../include/svn_error_codes.h:741 +#: ../include/svn_error_codes.h:746 msgid "Username does not match lock owner" msgstr "Benutzername und Sperreigner stimmen nicht überein" -#: ../include/svn_error_codes.h:746 +#: ../include/svn_error_codes.h:751 msgid "Filesystem has no such lock" msgstr "Dateisystem hat keine solche Sperre" -#: ../include/svn_error_codes.h:751 +#: ../include/svn_error_codes.h:756 msgid "Lock has expired" msgstr "Sperre ist abgelaufen" -#: ../include/svn_error_codes.h:756 ../include/svn_error_codes.h:950 +#: ../include/svn_error_codes.h:761 ../include/svn_error_codes.h:965 msgid "Item is out of date" msgstr "Eintrag ist veraltet" -#: ../include/svn_error_codes.h:768 +#: ../include/svn_error_codes.h:773 msgid "Unsupported FS format" msgstr "Nicht unterstütztes Dateisystemformat" -#: ../include/svn_error_codes.h:773 +#: ../include/svn_error_codes.h:778 msgid "Representation is being written" msgstr "Darstellung wird geschrieben" -#: ../include/svn_error_codes.h:778 +#: ../include/svn_error_codes.h:783 msgid "The generated transaction name is too long" msgstr "Der erzeugte Transaktionsname ist zu lang" -#: ../include/svn_error_codes.h:783 +#: ../include/svn_error_codes.h:788 msgid "Filesystem has no such node origin record" msgstr "Dateisystem hat keinen solchen Knotenursprungsdatensatz" -#: ../include/svn_error_codes.h:788 +#: ../include/svn_error_codes.h:793 msgid "Filesystem upgrade is not supported" msgstr "Dateisystemaktualisierung wird nicht unterstützt" -#: ../include/svn_error_codes.h:793 +#: ../include/svn_error_codes.h:798 msgid "Filesystem has no such checksum-representation index record" msgstr "Dateisystem hat keinen solchen Indexdatensatz zur Prüfsummen-Repräsentation" -#: ../include/svn_error_codes.h:798 +#: ../include/svn_error_codes.h:803 msgid "Property value in filesystem differs from the provided base value" msgstr "Eigenschaftswert im Dateisystem weicht von dem angegebenen Basiswert ab" -#: ../include/svn_error_codes.h:804 +#: ../include/svn_error_codes.h:809 msgid "The filesystem editor completion process was not followed" msgstr "Der Prozess für den Abschluss von Bearbeitungen des Dateisystems wurde nicht befolgt" -#: ../include/svn_error_codes.h:809 +#: ../include/svn_error_codes.h:814 msgid "A packed revprop could not be read" msgstr "Eine gepackte Revisionseigenschaft konnte nicht gelesen werden" -#: ../include/svn_error_codes.h:814 +#: ../include/svn_error_codes.h:819 msgid "Could not initialize the revprop caching infrastructure." msgstr "Konnte Zwischenspeicher für Revisionseigenschaften nicht initialisieren" -#: ../include/svn_error_codes.h:819 +#: ../include/svn_error_codes.h:824 msgid "Malformed transaction ID string." msgstr "Fehlerhafte Zeichenkette für Transaktions-ID." -#: ../include/svn_error_codes.h:824 +#: ../include/svn_error_codes.h:829 msgid "Corrupt index file." msgstr "Beschädigte Indexdatei." -#: ../include/svn_error_codes.h:829 +#: ../include/svn_error_codes.h:834 msgid "Revision not covered by index." msgstr "Revision ist nicht im Index enthalten." -#: ../include/svn_error_codes.h:834 +#: ../include/svn_error_codes.h:839 msgid "Item index too large for this revision." msgstr "Elementindex zu groß für diese Revision." -#: ../include/svn_error_codes.h:839 +#: ../include/svn_error_codes.h:844 msgid "Container index out of range." msgstr "Containerindex außerhalb des zulässigen Bereichs." -#: ../include/svn_error_codes.h:844 +#: ../include/svn_error_codes.h:849 msgid "Index files are inconsistent." msgstr "Indexdateien sind inkonsistent." -#: ../include/svn_error_codes.h:849 +#: ../include/svn_error_codes.h:854 msgid "Lock operation failed" msgstr "Sperrvorgang schlug fehl" -#: ../include/svn_error_codes.h:854 +#: ../include/svn_error_codes.h:859 msgid "Unsupported FS type" msgstr "Nicht unterstützter Dateisystemtyp" -#: ../include/svn_error_codes.h:859 +#: ../include/svn_error_codes.h:864 msgid "Container capacity exceeded." msgstr "Kapazität des Containerindex überschritten." -#: ../include/svn_error_codes.h:864 +#: ../include/svn_error_codes.h:869 msgid "Malformed node revision ID string." msgstr "Fehlerhafte Zeichenkette für Knotenrevisions-ID." -#: ../include/svn_error_codes.h:869 ../libsvn_fs_x/revprops.c:291 +#: ../include/svn_error_codes.h:874 msgid "Invalid generation number data." msgstr "Ungültige Daten für Generationsnummer." -#: ../include/svn_error_codes.h:875 +#: ../include/svn_error_codes.h:879 +#, fuzzy +msgid "Revprop manifest corrupt." +msgstr "Projektarchiv ist beschädigt" + +#: ../include/svn_error_codes.h:884 +#, fuzzy +msgid "Property list is corrupt." +msgstr "Dateisystem ist beschädigt" + +#: ../include/svn_error_codes.h:889 +msgid "Content checksums supposedly match but content does not." +msgstr "" + +#: ../include/svn_error_codes.h:895 msgid "The repository is locked, perhaps for db recovery" msgstr "Das Projektarchiv ist gesperrt, möglicherweise zum Retten der Datenbank" -#: ../include/svn_error_codes.h:879 +#: ../include/svn_error_codes.h:899 msgid "A repository hook failed" msgstr "Eine Aktion im Projektarchiv schlug fehl" -#: ../include/svn_error_codes.h:883 +#: ../include/svn_error_codes.h:903 msgid "Incorrect arguments supplied" msgstr "Inkorrekte Parameter übergeben" -#: ../include/svn_error_codes.h:887 +#: ../include/svn_error_codes.h:907 msgid "A report cannot be generated because no data was supplied" msgstr "Es kann kein Report erzeugt werden, da keine Daten geliefert wurden" -#: ../include/svn_error_codes.h:891 +#: ../include/svn_error_codes.h:911 msgid "Bogus revision report" msgstr "Ungültiger Revisionsreport" -#: ../include/svn_error_codes.h:900 +#: ../include/svn_error_codes.h:920 msgid "Unsupported repository version" msgstr "Nicht unterstützte Version des Projektarchivs" -#: ../include/svn_error_codes.h:904 +#: ../include/svn_error_codes.h:924 msgid "Disabled repository feature" msgstr "Deaktiviertes Merkmal des Projektarchivs" -#: ../include/svn_error_codes.h:908 +#: ../include/svn_error_codes.h:928 msgid "Error running post-commit hook" msgstr "Fehler beim Ausführen der Aktion »post-commit«" -#: ../include/svn_error_codes.h:913 +#: ../include/svn_error_codes.h:933 msgid "Error running post-lock hook" msgstr "Fehler beim Ausführen der Aktion »post-lock«" -#: ../include/svn_error_codes.h:918 +#: ../include/svn_error_codes.h:938 msgid "Error running post-unlock hook" msgstr "Fehler beim Ausführen der Aktion »post-unlock«" -#: ../include/svn_error_codes.h:923 +#: ../include/svn_error_codes.h:943 msgid "Repository upgrade is not supported" msgstr "Projektarchivaktualisierung wird nicht unterstützt" -#: ../include/svn_error_codes.h:928 -msgid "Repository is corrupt" -msgstr "Projektarchiv ist beschädigt" - -#: ../include/svn_error_codes.h:934 +#: ../include/svn_error_codes.h:949 msgid "Bad URL passed to RA layer" msgstr "Ungültige URL an die ZM-Schicht übergeben" -#: ../include/svn_error_codes.h:938 +#: ../include/svn_error_codes.h:953 msgid "Authorization failed" msgstr "Autorisierung schlug fehl" -#: ../include/svn_error_codes.h:942 +#: ../include/svn_error_codes.h:957 msgid "Unknown authorization method" msgstr "Unbekannte Autorisierungsmethode" -#: ../include/svn_error_codes.h:946 +#: ../include/svn_error_codes.h:961 msgid "Repository access method not implemented" msgstr "Zugriffsmethode zum Projektarchiv nicht implementiert" -#: ../include/svn_error_codes.h:954 +#: ../include/svn_error_codes.h:969 msgid "Repository has no UUID" msgstr "Projektarchiv hat keine UUID" -#: ../include/svn_error_codes.h:958 +#: ../include/svn_error_codes.h:973 msgid "Unsupported RA plugin ABI version" msgstr "Nicht unterstützte ABI-Version des ZM-Plugins" -#: ../include/svn_error_codes.h:968 +#: ../include/svn_error_codes.h:983 msgid "Server can only replay from the root of a repository" msgstr "Der Server kann nur von der Basis des Projektarchivs fortfahren" -#: ../include/svn_error_codes.h:973 +#: ../include/svn_error_codes.h:988 msgid "Repository UUID does not match expected UUID" msgstr "Die UUID des Projektarchivs entspricht nicht der erwarteten UUID" -#: ../include/svn_error_codes.h:978 +#: ../include/svn_error_codes.h:993 msgid "Repository root URL does not match expected root URL" msgstr "Die URL der Projektarchivwurzel entspricht nicht der erwarteten Wurzel-URL" -#: ../include/svn_error_codes.h:983 +#: ../include/svn_error_codes.h:998 msgid "Session URL does not match expected session URL" msgstr "Die Sitzungs-URL entspricht nicht der erwarteten Sitzungs-URL" -#: ../include/svn_error_codes.h:988 ../libsvn_ra_svn/client.c:503 +#: ../include/svn_error_codes.h:1003 ../libsvn_ra_svn/client.c:506 #, c-format msgid "Can't create tunnel" msgstr "Kann Tunnel nicht erzeugen" -#: ../include/svn_error_codes.h:993 +#: ../include/svn_error_codes.h:1008 msgid "Can't create session" msgstr "Kann Sitzung nicht erzeugen" -#: ../include/svn_error_codes.h:999 +#: ../include/svn_error_codes.h:1014 msgid "RA layer failed to init socket layer" msgstr "ZM-Schicht konnte die Verbindungsschicht nicht initialisieren" -#: ../include/svn_error_codes.h:1003 +#: ../include/svn_error_codes.h:1018 msgid "RA layer failed to create HTTP request" msgstr "ZM-Schicht konnte keine HTTP-Anforderung erzeugen" -#: ../include/svn_error_codes.h:1007 +#: ../include/svn_error_codes.h:1022 msgid "RA layer request failed" msgstr "ZM-Schicht Anforderung gescheitert" -#: ../include/svn_error_codes.h:1011 +#: ../include/svn_error_codes.h:1026 msgid "RA layer didn't receive requested OPTIONS info" msgstr "ZM-Schicht hat die angeforderte OPTIONS-Information nicht erhalten" -#: ../include/svn_error_codes.h:1015 +#: ../include/svn_error_codes.h:1030 msgid "RA layer failed to fetch properties" msgstr "ZM-Schicht konnte keine Eigenschaften bestimmen" -#: ../include/svn_error_codes.h:1019 +#: ../include/svn_error_codes.h:1034 msgid "RA layer file already exists" msgstr "ZM-Schichtdatei existiert bereits" -#: ../include/svn_error_codes.h:1033 +#: ../include/svn_error_codes.h:1048 msgid "HTTP Path Not Found" msgstr "HTTP Pfad nicht gefunden" -#: ../include/svn_error_codes.h:1037 +#: ../include/svn_error_codes.h:1052 msgid "Failed to execute WebDAV PROPPATCH" msgstr "Konnte WebDAV PROPPATCH nicht ausführen" #. If condition COND is not met, return a "malformed network data" error. #. -#: ../include/svn_error_codes.h:1042 ../include/svn_error_codes.h:1520 -#: ../libsvn_ra_svn/marshal.c:1129 ../libsvn_ra_svn/marshal.c:1381 -#: ../libsvn_ra_svn/marshal.c:1411 ../libsvn_ra_svn/marshal.c:2495 +#: ../include/svn_error_codes.h:1057 ../include/svn_error_codes.h:1560 +#: ../libsvn_ra_svn/marshal.c:1459 ../libsvn_ra_svn/marshal.c:1716 +#: ../libsvn_ra_svn/marshal.c:1745 ../libsvn_ra_svn/marshal.c:3000 msgid "Malformed network data" msgstr "Fehlerhafte Netzwerkdaten" -#: ../include/svn_error_codes.h:1047 +#: ../include/svn_error_codes.h:1062 msgid "Unable to extract data from response header" msgstr "Kann keine Daten aus dem Antwortkopf extrahieren" -#: ../include/svn_error_codes.h:1052 +#: ../include/svn_error_codes.h:1067 msgid "Repository has been moved" msgstr "Projektarchiv wurde verschoben" -#: ../include/svn_error_codes.h:1057 ../libsvn_ra_serf/util.c:893 +#: ../include/svn_error_codes.h:1072 ../libsvn_ra_serf/util.c:937 msgid "Connection timed out" msgstr "Die Wartezeit für die Verbindung ist abgelaufen" -#: ../include/svn_error_codes.h:1062 +#: ../include/svn_error_codes.h:1077 msgid "URL access forbidden for unknown reason" msgstr "URL-Zugriff wegen unbekannter Ursache verboten" -#: ../include/svn_error_codes.h:1067 +#: ../include/svn_error_codes.h:1082 msgid "The server state conflicts with the requested preconditions" msgstr "Der Serverzustand steht im Konflikt mit den angeforderten Vorbedingungen" -#: ../include/svn_error_codes.h:1072 +#: ../include/svn_error_codes.h:1087 msgid "The URL doesn't allow the requested method" msgstr "Die URL erlaubt die angeforderte Methode nicht" -#: ../include/svn_error_codes.h:1078 ../include/svn_error_codes.h:1524 +#: ../include/svn_error_codes.h:1093 ../include/svn_error_codes.h:1564 msgid "Couldn't find a repository" msgstr "Konnte Projektarchiv nicht finden" -#: ../include/svn_error_codes.h:1082 +#: ../include/svn_error_codes.h:1097 msgid "Couldn't open a repository" msgstr "Konnte Projektarchiv nicht öffnen" -#: ../include/svn_error_codes.h:1088 +#: ../include/svn_error_codes.h:1103 msgid "Svndiff data has invalid header" msgstr "Svndiff-Daten enthalten ungültigen Kopf" -#: ../include/svn_error_codes.h:1092 +#: ../include/svn_error_codes.h:1107 msgid "Svndiff data contains corrupt window" msgstr "Svndiff-Daten enthalten defektes Fenster" -#: ../include/svn_error_codes.h:1096 +#: ../include/svn_error_codes.h:1111 msgid "Svndiff data contains backward-sliding source view" msgstr "Svndiff-Daten enthalten rückwärts gleitenden Blick auf Quellen" -#: ../include/svn_error_codes.h:1100 +#: ../include/svn_error_codes.h:1115 msgid "Svndiff data contains invalid instruction" msgstr "Svndiff-Daten enthalten ungültige Anweisung" -#: ../include/svn_error_codes.h:1104 +#: ../include/svn_error_codes.h:1119 msgid "Svndiff data ends unexpectedly" msgstr "Svndiff-Daten enden unerwartet" -#: ../include/svn_error_codes.h:1108 +#: ../include/svn_error_codes.h:1123 msgid "Svndiff compressed data is invalid" msgstr "Komprimierte svndiff-Daten sind ungültig" -#: ../include/svn_error_codes.h:1114 +#: ../include/svn_error_codes.h:1129 msgid "Apache has no path to an SVN filesystem" msgstr "Apache besitzt keinen Pfad zu einem SVN Dateisystem" -#: ../include/svn_error_codes.h:1118 +#: ../include/svn_error_codes.h:1133 msgid "Apache got a malformed URI" msgstr "Apache hat eine fehlerhafte URI erhalten" -#: ../include/svn_error_codes.h:1122 +#: ../include/svn_error_codes.h:1137 msgid "Activity not found" msgstr "Aktivität nicht gefunden" -#: ../include/svn_error_codes.h:1126 +#: ../include/svn_error_codes.h:1141 msgid "Baseline incorrect" msgstr "»Baseline« nicht korrekt" -#: ../include/svn_error_codes.h:1130 +#: ../include/svn_error_codes.h:1145 msgid "Input/output error" msgstr "Eingabe/Ausgabe Fehler" -#: ../include/svn_error_codes.h:1136 +#: ../include/svn_error_codes.h:1151 msgid "A path under version control is needed for this operation" msgstr "Für diese Operation wird ein Pfad unter Versionskontrolle benötigt" -#: ../include/svn_error_codes.h:1140 +#: ../include/svn_error_codes.h:1155 msgid "Repository access is needed for this operation" msgstr "Für diese Operation wird Zugang zum Projektarchiv benötigt" -#: ../include/svn_error_codes.h:1144 +#: ../include/svn_error_codes.h:1159 msgid "Bogus revision information given" msgstr "Falsche Revisionsinformation angegeben" -#: ../include/svn_error_codes.h:1148 +#: ../include/svn_error_codes.h:1163 msgid "Attempting to commit to a URL more than once" msgstr "Versuch, mehrfach zu einer URL zu übertragen" -#: ../include/svn_error_codes.h:1152 +#: ../include/svn_error_codes.h:1167 msgid "Operation does not apply to binary file" msgstr "Operation ist nicht auf einer Binärdatei ausführbar" -#: ../include/svn_error_codes.h:1158 +#: ../include/svn_error_codes.h:1173 msgid "Format of an svn:externals property was invalid" msgstr "Format einer svn:externals Eigenschaft war ungültig" -#: ../include/svn_error_codes.h:1162 +#: ../include/svn_error_codes.h:1177 msgid "Attempting restricted operation for modified resource" msgstr "Versuch, eine beschränkte Operation für veränderte Ressource auszuführen" -#: ../include/svn_error_codes.h:1166 +#: ../include/svn_error_codes.h:1181 msgid "Operation does not apply to directory" msgstr "Operation ist nicht auf einem Verzeichnis ausführbar" -#: ../include/svn_error_codes.h:1170 +#: ../include/svn_error_codes.h:1185 ../svnadmin/svnadmin.c:1810 +#, c-format msgid "Revision range is not allowed" msgstr "Revisionsbereich nicht erlaubt" -#: ../include/svn_error_codes.h:1174 +#: ../include/svn_error_codes.h:1189 msgid "Inter-repository relocation not allowed" msgstr "Umplatzieren innerhalb des Projektarchivs nicht erlaubt" -#: ../include/svn_error_codes.h:1178 +#: ../include/svn_error_codes.h:1193 msgid "Author name cannot contain a newline" msgstr "Autorenname darf keinen Zeilenumbruch enthalten" -#: ../include/svn_error_codes.h:1182 +#: ../include/svn_error_codes.h:1197 msgid "Bad property name" msgstr "Fehlerhafter Eigenschaftsname" -#: ../include/svn_error_codes.h:1187 +#: ../include/svn_error_codes.h:1202 msgid "Two versioned resources are unrelated" msgstr "Zwei versionierte Ressourcen sind nicht verwandt" -#: ../include/svn_error_codes.h:1192 +#: ../include/svn_error_codes.h:1207 msgid "Path has no lock token" msgstr "Pfad hat keine Sperrmarke" -#: ../include/svn_error_codes.h:1197 +#: ../include/svn_error_codes.h:1212 msgid "Operation does not support multiple sources" msgstr "Die Operation unterstützt nicht mehrere Quellen" -#: ../include/svn_error_codes.h:1202 +#: ../include/svn_error_codes.h:1217 msgid "No versioned parent directories" msgstr "Keine versionierten Elternverzeichnisse" -#: ../include/svn_error_codes.h:1207 ../include/svn_error_codes.h:1227 +#: ../include/svn_error_codes.h:1222 ../include/svn_error_codes.h:1242 msgid "Working copy and merge source not ready for reintegration" msgstr "Arbeitskopie und Zusammnführungsquelle sind für eine Reintegration nicht bereit" -#: ../include/svn_error_codes.h:1212 +#: ../include/svn_error_codes.h:1227 msgid "A file external cannot overwrite an existing versioned item" msgstr "Ein externer Dateiverweis kann kein existierendes versioniertes Objekt überschreiben" -#: ../include/svn_error_codes.h:1217 +#: ../include/svn_error_codes.h:1232 msgid "Invalid path component strip count specified" msgstr "Ungültige Anzahl der vom Pfad zu entfernenden Komponenten angegeben" -#: ../include/svn_error_codes.h:1222 +#: ../include/svn_error_codes.h:1237 msgid "Detected a cycle while processing the operation" msgstr "Endlosschleife während der Verarbeitung der Operation entdeckt" -#: ../include/svn_error_codes.h:1232 +#: ../include/svn_error_codes.h:1247 msgid "Invalid mergeinfo detected in merge target" msgstr "Ungültige Zusammenführungsinformationen in Zusammenführungsziel entdeckt" -#: ../include/svn_error_codes.h:1237 +#: ../include/svn_error_codes.h:1252 msgid "Can't perform this operation without a valid lock token" msgstr "Kann diese Operation nicht ohne eine gültige Sperrmarke ausführen" -#: ../include/svn_error_codes.h:1242 +#: ../include/svn_error_codes.h:1257 msgid "The operation is forbidden by the server" msgstr "Die Operation wurde durch den Server nicht zugelassen" -#: ../include/svn_error_codes.h:1248 +#: ../include/svn_error_codes.h:1262 +#, fuzzy +msgid "The conflict resolution option is not applicable" +msgstr "Konfliktauflösung schlug fehl" + +#: ../include/svn_error_codes.h:1268 msgid "A problem occurred; see other errors for details" msgstr "Ein Problem ist aufgetreten, für Details siehe andere Fehlermeldungen" -#: ../include/svn_error_codes.h:1252 +#: ../include/svn_error_codes.h:1272 msgid "Failure loading plugin" msgstr "Fehler beim Laden eines Plugins" -#: ../include/svn_error_codes.h:1256 +#: ../include/svn_error_codes.h:1276 msgid "Malformed file" msgstr "Fehlerhafte Datei" -#: ../include/svn_error_codes.h:1260 +#: ../include/svn_error_codes.h:1280 msgid "Incomplete data" msgstr "Unvollständige Daten" -#: ../include/svn_error_codes.h:1264 +#: ../include/svn_error_codes.h:1284 msgid "Incorrect parameters given" msgstr "Inkorrekte Parameter übergeben" -#: ../include/svn_error_codes.h:1268 +#: ../include/svn_error_codes.h:1288 msgid "Tried a versioning operation on an unversioned resource" msgstr "Versuchte, eine Versionsoperation auf nicht versionierter Ressource auszuführen" -#: ../include/svn_error_codes.h:1272 +#: ../include/svn_error_codes.h:1292 msgid "Test failed" msgstr "Test schlug fehl" -#: ../include/svn_error_codes.h:1276 +#: ../include/svn_error_codes.h:1296 msgid "Trying to use an unsupported feature" msgstr "Versuch, ein nicht unterstütztes Merkmal zu benutzen" -#: ../include/svn_error_codes.h:1280 +#: ../include/svn_error_codes.h:1300 msgid "Unexpected or unknown property kind" msgstr "Unerwartete oder unbekannte Eigenschaftsart" -#: ../include/svn_error_codes.h:1284 +#: ../include/svn_error_codes.h:1304 msgid "Illegal target for the requested operation" msgstr "Ungültiges Ziel für die angeforderte Operation" -#: ../include/svn_error_codes.h:1288 +#: ../include/svn_error_codes.h:1308 msgid "MD5 checksum is missing" msgstr "MD5 Prüfsumme fehlt" -#: ../include/svn_error_codes.h:1292 +#: ../include/svn_error_codes.h:1312 msgid "Directory needs to be empty but is not" msgstr "Das Verzeichnis muss leer sein, ist es aber nicht" -#: ../include/svn_error_codes.h:1296 +#: ../include/svn_error_codes.h:1316 msgid "Error calling external program" msgstr "Fehler beim Aufrufen eines externen Programmes" -#: ../include/svn_error_codes.h:1300 +#: ../include/svn_error_codes.h:1320 msgid "Python exception has been set with the error" msgstr "Eine Python-Ausnahme wurde mit dem Fehler gesetzt" -#: ../include/svn_error_codes.h:1304 +#: ../include/svn_error_codes.h:1324 msgid "A checksum mismatch occurred" msgstr "Ein Prüfsummenfehler ist aufgetreten" -#: ../include/svn_error_codes.h:1308 +#: ../include/svn_error_codes.h:1328 msgid "The operation was interrupted" msgstr "Die Operation wurde unterbrochen" -#: ../include/svn_error_codes.h:1312 +#: ../include/svn_error_codes.h:1332 msgid "The specified diff option is not supported" msgstr "Die angegebene Vergleichsoption wird nicht unterstützt" -#: ../include/svn_error_codes.h:1316 +#: ../include/svn_error_codes.h:1336 msgid "Property not found" msgstr "Eigenschaft nicht gefunden" -#: ../include/svn_error_codes.h:1320 +#: ../include/svn_error_codes.h:1340 msgid "No auth file path available" msgstr "Kein Pfad für die Anmeldedatei verfügbar" -#: ../include/svn_error_codes.h:1325 +#: ../include/svn_error_codes.h:1345 msgid "Incompatible library version" msgstr "Inkompatible Bibliotheksversion" -#: ../include/svn_error_codes.h:1330 +#: ../include/svn_error_codes.h:1350 msgid "Mergeinfo parse error" msgstr "Einlesefehler für Zusammenführungsinformationen" -#: ../include/svn_error_codes.h:1335 +#: ../include/svn_error_codes.h:1355 msgid "Cease invocation of this API" msgstr "Einstellen der Benutzung dieser API" -#: ../include/svn_error_codes.h:1340 +#: ../include/svn_error_codes.h:1360 msgid "Error parsing revision number" msgstr "Fehler beim Einlesen der Revisionsnummer" -#: ../include/svn_error_codes.h:1345 +#: ../include/svn_error_codes.h:1365 msgid "Iteration terminated before completion" msgstr "Iteration brach vor der Fertigstellung ab" -#: ../include/svn_error_codes.h:1350 +#: ../include/svn_error_codes.h:1370 msgid "Unknown changelist" msgstr "Unbekannte Änderungsliste" -#: ../include/svn_error_codes.h:1355 +#: ../include/svn_error_codes.h:1375 msgid "Reserved directory name in command line arguments" msgstr "Kommandozeilenparameter enthalten reservierten Verzeichnisnamen" -#: ../include/svn_error_codes.h:1360 +#: ../include/svn_error_codes.h:1380 msgid "Inquiry about unknown capability" msgstr "Nachfrage nach unbekannter Eigenschaft" -#: ../include/svn_error_codes.h:1365 +#: ../include/svn_error_codes.h:1385 msgid "Test skipped" msgstr "Test übersprungen" -#: ../include/svn_error_codes.h:1370 +#: ../include/svn_error_codes.h:1390 msgid "APR memcache library not available" msgstr "Die APR-memcache-Bibliothek ist nicht verfügbar" -#: ../include/svn_error_codes.h:1375 +#: ../include/svn_error_codes.h:1395 msgid "Couldn't perform atomic initialization" msgstr "Eine atomare Initialisierung konnte nicht durchgeführt werden" -#: ../include/svn_error_codes.h:1380 +#: ../include/svn_error_codes.h:1400 msgid "SQLite error" msgstr "SQLite-Fehler" -#: ../include/svn_error_codes.h:1385 +#: ../include/svn_error_codes.h:1405 msgid "Attempted to write to readonly SQLite db" msgstr "Versuch, in eine nur lesbare SQLite-Datenbank zu schreiben" -#: ../include/svn_error_codes.h:1392 +#: ../include/svn_error_codes.h:1412 msgid "Unsupported schema found in SQLite db" msgstr "Nicht unterstütztes Schema in SQLite-Datenbank gefunden" -#: ../include/svn_error_codes.h:1397 +#: ../include/svn_error_codes.h:1417 msgid "The SQLite db is busy" msgstr "Die SQLite-Datenbank ist beschäftigt" -#: ../include/svn_error_codes.h:1402 +#: ../include/svn_error_codes.h:1422 msgid "SQLite busy at transaction rollback; resetting all busy SQLite statements to allow rollback" msgstr "SQLite ist mit dem Rollback einer Transaktion beschäftigt; Alle SQLite-Anweisungen werden für Rollback zurückgesetzt" -#: ../include/svn_error_codes.h:1408 +#: ../include/svn_error_codes.h:1428 msgid "Constraint error in SQLite db" msgstr "Constraint-Fehler in SQLite-Datenbank" -#: ../include/svn_error_codes.h:1413 +#: ../include/svn_error_codes.h:1433 msgid "Too many memcached servers configured" msgstr "Zu viele memcached-Server konfiguriert" -#: ../include/svn_error_codes.h:1418 +#: ../include/svn_error_codes.h:1438 msgid "Failed to parse version number string" msgstr "Konnte Zeichenkette mit Versionsnummer nicht verarbeiten" -#: ../include/svn_error_codes.h:1423 +#: ../include/svn_error_codes.h:1443 msgid "Atomic data storage is corrupt" msgstr "Speicherbereich für »atomic« ist beschädigt" -#: ../include/svn_error_codes.h:1428 +#: ../include/svn_error_codes.h:1448 msgid "utf8proc library error" msgstr "Fehler in utf8proc-Bibliothek" -#: ../include/svn_error_codes.h:1433 +#: ../include/svn_error_codes.h:1453 msgid "Bad arguments to SQL operators GLOB or LIKE" msgstr "Fehlerhafte Parameter für SQL-Operatoren GLOB oder LIKE" -#: ../include/svn_error_codes.h:1438 +#: ../include/svn_error_codes.h:1458 msgid "Packed data stream is corrupt" msgstr "Komprimierter Datenstrom ist beschädigt" -#: ../include/svn_error_codes.h:1443 +#: ../include/svn_error_codes.h:1463 msgid "Additional errors:" msgstr "Zusätzliche Fehler:" -#: ../include/svn_error_codes.h:1448 +#: ../include/svn_error_codes.h:1468 msgid "Parser error: invalid input" msgstr "Formatfehler: ungültige Eingabe" -#: ../include/svn_error_codes.h:1454 +#: ../include/svn_error_codes.h:1473 +#, fuzzy +msgid "SQLite transaction rollback failed" +msgstr "Aufräumen der Transaktion »%s« schlug fehl" + +#: ../include/svn_error_codes.h:1478 +#, fuzzy +msgid "LZ4 compression failed" +msgstr "XML-Parser schlug fehl" + +#: ../include/svn_error_codes.h:1483 +#, fuzzy +msgid "LZ4 decompression failed" +msgstr "Sperrvorgang schlug fehl" + +#: ../include/svn_error_codes.h:1489 msgid "Error parsing arguments" msgstr "Fehler beim Einlesen der Parameter" -#: ../include/svn_error_codes.h:1458 +#: ../include/svn_error_codes.h:1493 msgid "Not enough arguments provided" msgstr "Nicht genügend Parameter angegeben" -#: ../include/svn_error_codes.h:1462 +#: ../include/svn_error_codes.h:1497 msgid "Mutually exclusive arguments specified" msgstr "Die Parameter schließen sich gegenseitig aus" -#: ../include/svn_error_codes.h:1466 +#: ../include/svn_error_codes.h:1501 msgid "Attempted command in administrative dir" msgstr "Ausführen einer Operation in einem Verwaltungsverzeichnis versucht" -#: ../include/svn_error_codes.h:1470 +#: ../include/svn_error_codes.h:1505 msgid "The log message file is under version control" msgstr "Die Datei für die Logmeldung ist unter Versionskontrolle" -#: ../include/svn_error_codes.h:1474 +#: ../include/svn_error_codes.h:1509 msgid "The log message is a pathname" msgstr "Die Logmeldung ist ein Pfadname" -#: ../include/svn_error_codes.h:1478 +#: ../include/svn_error_codes.h:1513 msgid "Committing in directory scheduled for addition" msgstr "Ãœbertragung in einem Verzeichnis, das zum Hinzufügen vorgesehen ist" -#: ../include/svn_error_codes.h:1482 +#: ../include/svn_error_codes.h:1517 msgid "No external editor available" msgstr "Kein externer Editor verfügbar" -#: ../include/svn_error_codes.h:1486 +#: ../include/svn_error_codes.h:1521 msgid "Something is wrong with the log message's contents" msgstr "Mit dem Inhalt der Logmeldung stimmt etwas nicht" -#: ../include/svn_error_codes.h:1490 +#: ../include/svn_error_codes.h:1525 msgid "A log message was given where none was necessary" msgstr "Eine Logmeldung wurde angegeben wo keine nötig ist" -#: ../include/svn_error_codes.h:1494 +#: ../include/svn_error_codes.h:1529 msgid "No external merge tool available" msgstr "Kein externes Werkzeug zum Zusammenführen verfügbar" -#: ../include/svn_error_codes.h:1498 +#: ../include/svn_error_codes.h:1533 msgid "Failed processing one or more externals definitions" msgstr "Verarbeitung einer oder mehrerer »svn:externals«-Definitionen fehlgeschlagen" -#: ../include/svn_error_codes.h:1504 +#: ../include/svn_error_codes.h:1538 +#, fuzzy +msgid "Repository verification failed" +msgstr "Anlegen des Projektarchivs schlug fehl" + +#: ../include/svn_error_codes.h:1544 msgid "Special code for wrapping server errors to report to client" msgstr "Spezieller Fehlerkode, um Serverfehler an den Client zu melden" -#: ../include/svn_error_codes.h:1508 +#: ../include/svn_error_codes.h:1548 msgid "Unknown svn protocol command" msgstr "Unbekanntes svn-Protokollkommando" -#: ../include/svn_error_codes.h:1512 +#: ../include/svn_error_codes.h:1552 msgid "Network connection closed unexpectedly" msgstr "Netzwerkverbindung wurde unerwartet geschlossen" -#: ../include/svn_error_codes.h:1516 +#: ../include/svn_error_codes.h:1556 msgid "Network read/write error" msgstr "Netzwerk-Lese-/-Schreibfehler" -#: ../include/svn_error_codes.h:1528 +#: ../include/svn_error_codes.h:1568 msgid "Client/server version mismatch" msgstr "Client- und Serverversion stimmen nicht überein" -#: ../include/svn_error_codes.h:1533 +#: ../include/svn_error_codes.h:1573 msgid "Cannot negotiate authentication mechanism" msgstr "Kann Anmeldungsmechanismus nicht aushandeln" -#: ../include/svn_error_codes.h:1538 +#: ../include/svn_error_codes.h:1578 msgid "Editor drive was aborted" msgstr "Editor-Steuerung wurde unterbrochen" -#: ../include/svn_error_codes.h:1546 +#: ../include/svn_error_codes.h:1583 +#, fuzzy +msgid "Client request too long" +msgstr "Ganzzahldarstellung zu lang" + +#: ../include/svn_error_codes.h:1588 +#, fuzzy +msgid "Server response too long" +msgstr "Antwort auf Protokollschritt zu lang" + +#: ../include/svn_error_codes.h:1596 msgid "Credential data unavailable" msgstr "Beglaubigungsdaten nicht verfügbar" -#: ../include/svn_error_codes.h:1550 +#: ../include/svn_error_codes.h:1600 msgid "No authentication provider available" msgstr "Kein Anbieter für Anmeldung verfügbar" -#: ../include/svn_error_codes.h:1554 +#: ../include/svn_error_codes.h:1604 msgid "All authentication providers exhausted" msgstr "Alle Anmeldemöglichkeiten erschöpft" -#: ../include/svn_error_codes.h:1558 +#: ../include/svn_error_codes.h:1608 msgid "Credentials not saved" msgstr "Beglaubigungsdaten nicht gespeichert" -#: ../include/svn_error_codes.h:1563 ../libsvn_subr/gpg_agent.c:416 +#: ../include/svn_error_codes.h:1613 ../libsvn_subr/gpg_agent.c:512 msgid "Authentication failed" msgstr "Authentifizierung schlug fehl" -#: ../include/svn_error_codes.h:1569 +#: ../include/svn_error_codes.h:1619 msgid "Read access denied for root of edit" msgstr "Lesezugriff verweigert für Basis dieser Änderung" -#: ../include/svn_error_codes.h:1574 +#: ../include/svn_error_codes.h:1624 msgid "Item is not readable" msgstr "Eintrag ist nicht lesbar" -#: ../include/svn_error_codes.h:1579 +#: ../include/svn_error_codes.h:1629 msgid "Item is partially readable" msgstr "Eintrag ist nur teilweise lesbar" -#: ../include/svn_error_codes.h:1583 +#: ../include/svn_error_codes.h:1633 msgid "Invalid authz configuration" msgstr "Ungültige authz Konfiguration" -#: ../include/svn_error_codes.h:1588 +#: ../include/svn_error_codes.h:1638 msgid "Item is not writable" msgstr "Eintrag ist nicht schreibbar" -#: ../include/svn_error_codes.h:1595 +#: ../include/svn_error_codes.h:1645 msgid "Diff data source modified unexpectedly" msgstr "Diff-Datenquellen wurden unerwarteterweise verändert" -#: ../include/svn_error_codes.h:1602 +#: ../include/svn_error_codes.h:1650 +#, fuzzy +msgid "Diff data unexpected" +msgstr "Svndiff-Daten enden unerwartet" + +#: ../include/svn_error_codes.h:1657 msgid "Initialization of SSPI library failed" msgstr "Initialisierung der SSPI-Bibliothek schlug fehl" -#: ../include/svn_error_codes.h:1608 +#: ../include/svn_error_codes.h:1663 msgid "Server SSL certificate untrusted" msgstr "Server-SSL-Zertifikat ist nicht vertrauenswürdig" -#: ../include/svn_error_codes.h:1613 +#: ../include/svn_error_codes.h:1668 msgid "Initialization of the GSSAPI context failed" msgstr "Initialisierung des GSSAPI-Kontextes schlug fehl" -#: ../include/svn_error_codes.h:1618 +#: ../include/svn_error_codes.h:1673 msgid "While handling serf response:" msgstr "Während der Abwicklung einer serf Antwort:" -#: ../include/svn_error_codes.h:1624 +#: ../include/svn_error_codes.h:1678 +#, fuzzy +msgid "Can't read from stream" +msgstr "Kann nicht aus Datenstrom lesen" + +#: ../include/svn_error_codes.h:1684 msgid "Assertion failure" msgstr "Assert-Anweisung schlug fehl" -#: ../include/svn_error_codes.h:1628 +#: ../include/svn_error_codes.h:1688 msgid "No non-tracing links found in the error chain" msgstr "Nur Nicht-Tracing-Einträge in Fehlerkette gefunden" -#: ../include/svn_error_codes.h:1636 +#: ../include/svn_error_codes.h:1696 msgid "Unexpected end of ASN1 data" msgstr "Unerwartetes Ende der ASN1-Daten" -#: ../include/svn_error_codes.h:1640 +#: ../include/svn_error_codes.h:1700 msgid "Unexpected ASN1 tag" msgstr "Unerwartetes ASN1-Tag" -#: ../include/svn_error_codes.h:1644 +#: ../include/svn_error_codes.h:1704 msgid "Invalid ASN1 length" msgstr "Ungültige ASN1-Länge" -#: ../include/svn_error_codes.h:1648 +#: ../include/svn_error_codes.h:1708 msgid "ASN1 length mismatch" msgstr "ASN1-Länge stimmt nicht überein" -#: ../include/svn_error_codes.h:1652 +#: ../include/svn_error_codes.h:1712 msgid "Invalid ASN1 data" msgstr "Ungültige ASN1-Daten" -#: ../include/svn_error_codes.h:1656 +#: ../include/svn_error_codes.h:1716 msgid "Unavailable X509 feature" msgstr "Nicht verfügbare X509-Funktion" -#: ../include/svn_error_codes.h:1660 +#: ../include/svn_error_codes.h:1720 msgid "Invalid PEM certificate" msgstr "Ungültiges PEM-Zertifikat" -#: ../include/svn_error_codes.h:1664 +#: ../include/svn_error_codes.h:1724 msgid "Invalid certificate format" msgstr "Ungültiges Format des Zertifikats" -#: ../include/svn_error_codes.h:1668 +#: ../include/svn_error_codes.h:1728 msgid "Invalid certificate version" msgstr "Ungültige Version des Zertifikats" -#: ../include/svn_error_codes.h:1672 +#: ../include/svn_error_codes.h:1732 msgid "Invalid certificate serial number" msgstr "Ungültige Seriennummer des Zertifikats" -#: ../include/svn_error_codes.h:1676 +#: ../include/svn_error_codes.h:1736 msgid "Found invalid algorithm in certificate" msgstr "Ungültiger Algorithmus im Zertifikat gefunden" -#: ../include/svn_error_codes.h:1680 +#: ../include/svn_error_codes.h:1740 msgid "Found invalid name in certificate" msgstr "Ungültiger Name im Zertifikat gefunden" -#: ../include/svn_error_codes.h:1684 +#: ../include/svn_error_codes.h:1744 msgid "Found invalid date in certificate" msgstr "Ungültiges Datum im Zertifikat gefunden" -#: ../include/svn_error_codes.h:1688 +#: ../include/svn_error_codes.h:1748 msgid "Found invalid public key in certificate" msgstr "Ungültiger öffentlicher Schlüssel im Zertifikat gefunden" -#: ../include/svn_error_codes.h:1692 +#: ../include/svn_error_codes.h:1752 msgid "Found invalid signature in certificate" msgstr "Ungültige Signatur im Zertifikat gefunden" -#: ../include/svn_error_codes.h:1696 +#: ../include/svn_error_codes.h:1756 msgid "Found invalid extensions in certificate" msgstr "Ungültige Erweiterungen im Zertifikat gefunden" -#: ../include/svn_error_codes.h:1700 +#: ../include/svn_error_codes.h:1760 msgid "Unknown certificate version" msgstr "Unbekannte Version im Zertifikat" -#: ../include/svn_error_codes.h:1704 +#: ../include/svn_error_codes.h:1764 msgid "Certificate uses unknown public key algorithm" msgstr "Zertifikat verwendet unbekannten asymmetrischen Algorithmus" -#: ../include/svn_error_codes.h:1708 +#: ../include/svn_error_codes.h:1768 msgid "Certificate signature mismatch" msgstr "Signatur des Zertifikats stimmt nicht überein" -#: ../include/svn_error_codes.h:1712 +#: ../include/svn_error_codes.h:1772 msgid "Certficate verification failed" msgstr "Ãœberprüfung des Zertifikats fehlgeschlagen" -#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:152 +#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:290 msgid "GNOME Keyring is locked and we are non-interactive" msgstr "GNOME-Schlüsselring ist gesperrt und wir sind nicht-interaktiv" #: ../libsvn_client/add.c:609 ../libsvn_client/cmdline.c:365 -#: ../libsvn_subr/opt.c:932 +#: ../libsvn_subr/opt.c:1234 #, c-format msgid "'%s' ends in a reserved name" msgstr "»%s« endet mit einem reservierten Namen" @@ -1519,7 +1580,7 @@ msgid "'%s' is an existing item in conflict; please mark the conflict as resolve msgstr "»%s« ist ein vorhandenes Element mit Konflikt; Markieren Sie den Konflikt als aufgelöst bevor Sie hier ein neues Element hinzufügen" #: ../libsvn_client/add.c:869 ../libsvn_wc/adm_ops.c:400 -#: ../libsvn_wc/workqueue.c:873 ../libsvn_wc/workqueue.c:967 +#: ../libsvn_wc/workqueue.c:874 ../libsvn_wc/workqueue.c:968 #, c-format msgid "'%s' not found" msgstr "»%s« nicht gefunden" @@ -1531,13 +1592,14 @@ msgid "Unsupported node kind for path '%s'" msgstr "Nicht unterstützter Knotentyp für Pfad »%s«" #: ../libsvn_client/add.c:908 ../libsvn_client/changelist.c:65 -#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3078 -#: ../libsvn_client/export.c:1394 ../libsvn_client/import.c:831 -#: ../libsvn_client/patch.c:3242 ../libsvn_client/relocate.c:153 -#: ../libsvn_client/resolved.c:119 ../libsvn_client/revert.c:149 -#: ../libsvn_client/status.c:368 ../libsvn_client/switch.c:471 -#: ../libsvn_client/update.c:701 ../libsvn_client/upgrade.c:109 -#: ../svn/util.c:986 ../svnbench/util.c:76 +#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3197 +#: ../libsvn_client/export.c:1389 ../libsvn_client/import.c:861 +#: ../libsvn_client/patch.c:3745 ../libsvn_client/relocate.c:155 +#: ../libsvn_client/resolved.c:120 ../libsvn_client/revert.c:152 +#: ../libsvn_client/shelf.c:378 ../libsvn_client/status.c:368 +#: ../libsvn_client/switch.c:471 ../libsvn_client/update.c:701 +#: ../libsvn_client/upgrade.c:111 ../svn/shelf-cmd.c:1053 ../svn/util.c:990 +#: ../svnbench/util.c:76 #, c-format msgid "'%s' is not a local path" msgstr "»%s« ist kein lokaler Pfad" @@ -1560,11 +1622,11 @@ msgstr "Kann Binärdatei »%s« nicht annotieren" #: ../libsvn_client/cat.c:77 ../libsvn_client/commit_util.c:612 #: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:817 -#: ../libsvn_client/prop_commands.c:1398 ../libsvn_client/revisions.c:105 +#: ../libsvn_client/prop_commands.c:1398 ../libsvn_client/revisions.c:107 #: ../libsvn_wc/adm_ops.c:913 ../libsvn_wc/adm_ops.c:967 #: ../libsvn_wc/copy.c:628 ../libsvn_wc/copy.c:689 ../libsvn_wc/entries.c:1407 #: ../libsvn_wc/entries.c:2803 ../libsvn_wc/entries.c:2834 -#: ../svn/notify.c:1026 ../svnbench/notify.c:968 +#: ../svn/notify.c:1157 ../svnbench/notify.c:968 #, c-format msgid "'%s' is not under version control" msgstr "»%s« ist nicht unter Versionskontrolle" @@ -1592,23 +1654,23 @@ msgstr "URL »%s« verweist auf auf ein Verzeichnis" msgid "Target changelist name must not be empty" msgstr "Name der Ziel-Änderungsliste darf nicht leer sein" -#: ../libsvn_client/checkout.c:131 ../libsvn_client/export.c:1447 -#: ../svnbench/null-export-cmd.c:275 +#: ../libsvn_client/checkout.c:133 ../libsvn_client/export.c:1446 +#: ../svnbench/null-export-cmd.c:293 #, c-format msgid "URL '%s' doesn't exist" msgstr "Die URL »%s« existiert nicht" -#: ../libsvn_client/checkout.c:135 +#: ../libsvn_client/checkout.c:137 #, c-format msgid "URL '%s' refers to a file, not a directory" msgstr "Die URL »%s« verweist auf eine Datei, nicht auf ein Verzeichnis" -#: ../libsvn_client/checkout.c:173 +#: ../libsvn_client/checkout.c:175 #, c-format msgid "'%s' is already a working copy for a different URL" msgstr "»%s« ist bereits eine Arbeitskopie für eine andere URL" -#: ../libsvn_client/checkout.c:181 +#: ../libsvn_client/checkout.c:183 #, c-format msgid "'%s' already exists and is not a directory" msgstr "»%s« existiert bereits und ist kein Verzeichnis" @@ -1627,7 +1689,7 @@ msgstr "»%s« ist nur eine Fix-Revision. Meinten Sie stattdessen »%s@«?" msgid "Resolving '^/': no repository root found in the target arguments or in the current directory" msgstr "Auflösen von »^/«: Keine Wurzel eines Projektarchivs in den Zielparametern oder im Arbeitsverzeichnis gefunden" -#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:2260 +#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:2303 msgid "Commit failed (details follow):" msgstr "Ãœbertragen schlug fehl (Details folgen):" @@ -1740,10941 +1802,13343 @@ msgstr "Ãœbertragenes Objekt »%s« ist als Kopie markiert, hat aber eine ungül msgid "Standard properties can't be set explicitly as revision properties" msgstr "Standardeigenschaften können nicht explizit als Revisionseigenschaften gesetzt werden" -#: ../libsvn_client/copy.c:295 -#, c-format -msgid "%s property defined at '%s' is using an unsupported syntax" -msgstr "Eigenschaft %s definiert auf »%s« verwendet einen nicht unterstützen Syntax" +# FIXME: Grammar depends on usage!!!!!!! (prepanded by "bei") +#: ../libsvn_client/conflicts.c:734 ../libsvn_client/conflicts.c:1095 +#: ../libsvn_client/conflicts.c:1688 ../libsvn_client/conflicts.c:4625 +#: ../libsvn_client/conflicts.c:5124 ../libsvn_client/conflicts.c:5146 +#: ../libsvn_client/conflicts.c:5197 ../libsvn_client/conflicts.c:5674 +#, fuzzy +msgid "unknown author" +msgstr "Unbekannter Fehler" -#: ../libsvn_client/copy.c:443 -#, c-format -msgid "Cannot pin external '%s' defined in %s at '%s' because it is not checked out in the working copy at '%s'" -msgstr "Kann externen Verweis »%s« definiert durch Eigenschaft »%s« von »%s« nicht auf eine Revision festlegen, da er in der Arbeitskopie »%s« nicht ausgecheckt ist" +#: ../libsvn_client/conflicts.c:1126 +msgid "A file containing uncommitted changes was found in the working copy." +msgstr "" -#: ../libsvn_client/copy.c:468 -#, c-format -msgid "Cannot pin external '%s' defined in %s at '%s' because '%s' has switched subtrees (switches cannot be represented in %s)" -msgstr "Kann externen Verweis »%s« definiert durch Eigenschaft »%s« von »%s« nicht auf eine Revision festlegen, da »%s« umgestellte Unterbäume enthält (Umstellungen können in »%s« nicht abgebildet werden)" +#: ../libsvn_client/conflicts.c:1129 +msgid "A file which differs from the corresponding file on the merge source branch was found in the working copy." +msgstr "" -#: ../libsvn_client/copy.c:487 -#, c-format -msgid "Cannot pin external '%s' defined in %s at '%s' because '%s' has local modifications (local modifications cannot be represented in %s)" -msgstr "Kann externen Verweis »%s« definiert durch Eigenschaft »%s« von »%s« nicht auf eine Revision festlegen, da »%s« lokale Änderungen enthält (lokale Änderungen können in »%s« nicht abgebildet werden)" +#: ../libsvn_client/conflicts.c:1134 +msgid "A file which already occupies this path was found in the working copy." +msgstr "" -#: ../libsvn_client/copy.c:505 -#, c-format -msgid "Cannot pin external '%s' defined in %s at '%s' because '%s' is a mixed-revision working copy (mixed-revisions cannot be represented in %s)" -msgstr "Kann externen Verweis »%s« definiert durch Eigenschaft »%s« von »%s« nicht auf eine Revision festlegen, da »%s« eine Arbeitskopie mit verschiedenen Revisionen ist (verschiedene Revisionen können in »%s« nicht abgebildet werden)" +#: ../libsvn_client/conflicts.c:1138 +#, fuzzy +msgid "An unversioned file was found in the working copy." +msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten" -#: ../libsvn_client/copy.c:959 -#, c-format -msgid "Path '%s' exists, but is excluded" -msgstr "Pfad »%s« existiert, ist aber ausgeschlossen" +#: ../libsvn_client/conflicts.c:1142 +#, fuzzy +msgid "A deleted file was found in the working copy." +msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten" -#: ../libsvn_client/copy.c:965 ../libsvn_client/copy.c:1672 -#: ../libsvn_client/copy.c:2047 ../libsvn_client/copy.c:2703 -#: ../libsvn_client/import.c:881 ../libsvn_client/mtcc.c:456 -#: ../libsvn_client/mtcc.c:473 ../libsvn_ra_serf/util.c:1852 -#, c-format -msgid "Path '%s' already exists" -msgstr "Pfad »%s« existiert bereits" +#: ../libsvn_client/conflicts.c:1147 +#, fuzzy +msgid "No such file was found in the working copy." +msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten" -#: ../libsvn_client/copy.c:1020 -#, c-format -msgid "Path '%s' already exists as unversioned node" -msgstr "Pfad »%s« existiert als nicht versionierter Knoten" +#. ### display deleted revision +#: ../libsvn_client/conflicts.c:1151 +msgid "" +"No such file was found in the merge target working copy.\n" +"Perhaps the file has been deleted or moved away in the repository's history?" +msgstr "" -#: ../libsvn_client/copy.c:1042 ../libsvn_client/copy.c:1052 -#: ../libsvn_client/copy.c:2719 -#, c-format -msgid "Path '%s' is not a directory" -msgstr "Pfad »%s« ist kein Verzeichnis" +#. ### show more details about copies or replacements? +#: ../libsvn_client/conflicts.c:1161 +msgid "A file scheduled to be added to the repository in the next commit was found in the working copy." +msgstr "" -#: ../libsvn_client/copy.c:1091 ../libsvn_client/merge.c:10227 -#: ../svnlook/svnlook.c:1435 -#, c-format -msgid "Path '%s' does not exist" -msgstr "Pfad »%s« existiert nicht" +#. The move no longer exists. +#. The move probably happened in branch history. +#. * This case cannot happen until we detect incoming +#. * moves, which we currently don't do. +#. ### find deleted/moved revision? +#: ../libsvn_client/conflicts.c:1192 ../libsvn_client/conflicts.c:1224 +msgid "The file in the working copy had been moved away at the time this conflict was recorded." +msgstr "" -#: ../libsvn_client/copy.c:1275 ../libsvn_client/copy.c:1316 -#, c-format -msgid "Path '%s' already exists, but is not a directory" -msgstr "Pfad »%s« existiert bereits, ist aber kein Verzeichnis" +#: ../libsvn_client/conflicts.c:1207 ../libsvn_client/conflicts.c:1240 +#, fuzzy, c-format +msgid "" +"The file in the working copy was moved away to\n" +"'%s'." +msgstr "Der Pfad »%s« ist nicht in der Arbeitskopie »%s« " -#: ../libsvn_client/copy.c:1453 -msgid "Source and destination URLs appear not to point to the same repository." -msgstr "Quellen- und Ziel-URL scheinen nicht auf das selbe Projektarchiv zu zeigen." +#. The move no longer exists. +#. The move probably happened in branch history. +#. * This case cannot happen until we detect incoming +#. * moves, which we currently don't do. +#. ### find deleted/moved revision? +#: ../libsvn_client/conflicts.c:1266 ../libsvn_client/conflicts.c:1298 +msgid "A file had been moved here in the working copy at the time this conflict was recorded." +msgstr "" -#: ../libsvn_client/copy.c:1662 ../libsvn_client/prop_commands.c:167 -#, c-format -msgid "Path '%s' does not exist in revision %ld" -msgstr "Pfad »%s« existiert nicht in Revision %ld" +#: ../libsvn_client/conflicts.c:1281 ../libsvn_client/conflicts.c:1314 +#, fuzzy, c-format +msgid "" +"A file was moved here in the working copy from\n" +"'%s'." +msgstr "»%s« ist nicht die Basis des Projektarchivs »%s«" -#: ../libsvn_client/copy.c:2687 ../libsvn_client/mtcc.c:550 -#, c-format -msgid "Path '%s' not found in revision %ld" -msgstr "Pfad »%s« wurde in Revision %ld nicht gefunden" +#: ../libsvn_client/conflicts.c:1350 +msgid "A directory containing uncommitted changes was found in the working copy." +msgstr "" -#: ../libsvn_client/copy.c:2692 -#, c-format -msgid "Path '%s' not found in head revision" -msgstr "Pfad »%s« wurde in der HEAD-Revision nicht gefunden" +#: ../libsvn_client/conflicts.c:1353 +msgid "A directory which differs from the corresponding directory on the merge source branch was found in the working copy." +msgstr "" -#: ../libsvn_client/copy.c:2827 -msgid "Cannot mix repository and working copy sources" -msgstr "Quellen aus dem Projektarchiv und einer Arbeitskopie können nicht gemischt werden" +#: ../libsvn_client/conflicts.c:1358 +msgid "A directory which already occupies this path was found in the working copy." +msgstr "" -#: ../libsvn_client/copy.c:2880 -#, c-format -msgid "Cannot copy path '%s' into its own child '%s'" -msgstr "Kann Pfad »%s« nicht in sein eigenes Kind »%s« kopieren" +#: ../libsvn_client/conflicts.c:1362 +#, fuzzy +msgid "An unversioned directory was found in the working copy." +msgstr "Verzeichnis »%s« ist in einer Arbeitskopie gesperrt" -#: ../libsvn_client/copy.c:2916 -#, c-format -msgid "Cannot move the external at '%s'; please edit the svn:externals property on '%s'." -msgstr "Externer Verweis »%s« kann nicht verschoben werden; bitte bearbeiten Sie die Eigenschaft »svn:externals« von »%s«" +#: ../libsvn_client/conflicts.c:1366 +#, fuzzy +msgid "A deleted directory was found in the working copy." +msgstr "Verzeichnis »%s« ist in einer Arbeitskopie gesperrt" -#: ../libsvn_client/copy.c:2931 -msgid "Moves between the working copy and the repository are not supported" -msgstr "Verschiebungen zwischen der Arbeitskopie und dem Projektarchiv sind nicht unterstützt" +#: ../libsvn_client/conflicts.c:1372 +#, fuzzy +msgid "No such directory was found in the working copy." +msgstr "Verzeichnis »%s« ist in einer Arbeitskopie gesperrt" -#: ../libsvn_client/copy.c:2946 -#, c-format -msgid "Cannot move URL '%s' into itself" -msgstr "Kann URL »%s« nicht auf sich selbst verschieben" +#. ### display deleted revision +#: ../libsvn_client/conflicts.c:1376 +msgid "" +"No such directory was found in the merge target working copy.\n" +"Perhaps the directory has been deleted or moved away in the repository's history?" +msgstr "" -#: ../libsvn_client/copy.c:2947 -#, c-format -msgid "Cannot move path '%s' into itself" -msgstr "Kann »%s« nicht auf sich selbst verschieben" +#. ### show more details about copies or replacements? +#: ../libsvn_client/conflicts.c:1386 +msgid "A directory scheduled to be added to the repository in the next commit was found in the working copy." +msgstr "" -#: ../libsvn_client/copy.c:3014 -#, c-format -msgid "'%s' does not have a URL associated with it" -msgstr "»%s« hat keine zugehörige URL" +#. The move no longer exists. +#: ../libsvn_client/conflicts.c:1418 +msgid "The directory in the working copy had been moved away at the time this conflict was recorded." +msgstr "" -#: ../libsvn_client/copy_foreign.c:131 ../libsvn_client/copy_foreign.c:283 -#: ../libsvn_client/externals.c:985 ../libsvn_client/externals.c:1196 -#: ../libsvn_wc/update_editor.c:1119 -#, c-format -msgid "Path '%s' is not in the working copy" -msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten" +#: ../libsvn_client/conflicts.c:1433 +#, fuzzy, c-format +msgid "" +"The directory in the working copy was moved away to\n" +"'%s'." +msgstr "Der Pfad »%s« ist nicht in der Arbeitskopie »%s« " -#: ../libsvn_client/copy_foreign.c:373 ../libsvn_client/export.c:814 -#: ../libsvn_client/repos_diff.c:1002 ../libsvn_fs_fs/dag.c:1074 -#: ../libsvn_fs_x/dag.c:1074 ../libsvn_ra_svn/client.c:1324 -#: ../libsvn_wc/diff_editor.c:1987 ../libsvn_wc/diff_editor.c:2073 -#: ../libsvn_wc/externals.c:707 ../libsvn_wc/update_editor.c:4196 -#, c-format -msgid "Checksum mismatch for '%s'" -msgstr "Prüfsummenfehler für »%s«" +#. The move probably happened in branch history. +#. * This case cannot happen until we detect incoming +#. * moves, which we currently don't do. +#. ### find deleted/moved revision? +#: ../libsvn_client/conflicts.c:1450 +msgid "The directory had been moved away at the time this conflict was recorded." +msgstr "" -#: ../libsvn_client/copy_foreign.c:481 -#, c-format -msgid "'%s' is not a valid location inside a repository" -msgstr "»%s« ist kein gültiger Pfad in einem Projektarchiv" +#: ../libsvn_client/conflicts.c:1466 +#, fuzzy, c-format +msgid "" +"The directory was moved away to\n" +"'%s'." +msgstr "Das Projektarchiv wurde permanent nach »%s« verschoben" -#: ../libsvn_client/copy_foreign.c:512 -#, c-format -msgid "Can't add '%s', because no parent directory is found" -msgstr "Kann »%s« nicht hinzufügen, da kein Elternverzeichnis gefunden wurde" +#. The move no longer exists. +#. The move probably happened in branch history. +#. * This case cannot happen until we detect incoming +#. * moves, which we currently don't do. +#. ### find deleted/moved revision? +#: ../libsvn_client/conflicts.c:1492 ../libsvn_client/conflicts.c:1524 +msgid "A directory had been moved here at the time this conflict was recorded." +msgstr "" -#: ../libsvn_client/delete.c:76 +#: ../libsvn_client/conflicts.c:1507 #, c-format -msgid "'%s' is in the way of the resource actually under version control" -msgstr "»%s« ist der Ressource, die sich unter Versionskontrolle befindet, im Weg" +msgid "" +"A directory was moved here from\n" +"'%s'." +msgstr "" -#: ../libsvn_client/delete.c:95 -#, c-format -msgid "'%s' has local modifications -- commit or revert them first" -msgstr "»%s« hat lokale Änderungen -- zuerst übertragen oder zurücksetzen" +#: ../libsvn_client/conflicts.c:1540 +#, fuzzy, c-format +msgid "" +"A directory was moved here in the working copy from\n" +"'%s'." +msgstr "Verzeichnis »%s« ist in einer Arbeitskopie gesperrt" -#: ../libsvn_client/delete.c:127 -#, c-format -msgid "Cannot remove the external at '%s'; please edit or delete the svn:externals property on '%s'" -msgstr "Externer Verweis »%s« kann nicht entfernt werden; bitte bearbeiten oder löschen Sie die Eigenschaft »svn:externals« von »%s«" +#: ../libsvn_client/conflicts.c:2759 +msgid "An item containing uncommitted changes was found in the working copy." +msgstr "" -#: ../libsvn_client/delete.c:358 -#, c-format -msgid "URL '%s' not within a repository" -msgstr "URL »%s« ist nicht in einem Projektarchiv" +#: ../libsvn_client/conflicts.c:2763 +msgid "An item which already occupies this path was found in the working copy." +msgstr "" -#: ../libsvn_client/delete.c:365 -#, c-format -msgid "URL '%s' does not exist" -msgstr "URL »%s« existiert nicht" +#: ../libsvn_client/conflicts.c:2767 +#, fuzzy +msgid "A deleted item was found in the working copy." +msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten" -#: ../libsvn_client/deprecated.c:884 ../svn/move-cmd.c:65 -msgid "Cannot specify revisions (except HEAD) with move operations" -msgstr "Andere Revisionen (als HEAD) sind bei Verschiebeoperationen nicht zugelassen" +#: ../libsvn_client/conflicts.c:2772 +#, fuzzy +msgid "No such file or directory was found in the working copy." +msgstr "Verzeichnis »%s« ist in einer Arbeitskopie gesperrt" -#: ../libsvn_client/deprecated.c:1647 -msgid "No commits in repository" -msgstr "Keine Ãœbertragungen im Projektarchiv" +#. ### display deleted revision +#: ../libsvn_client/conflicts.c:2777 +msgid "" +"No such file or directory was found in the merge target working copy.\n" +"The item may have been deleted or moved away in the repository's history." +msgstr "" -#: ../libsvn_client/deprecated.c:3032 ../libsvn_wc/deprecated.c:4172 -msgid "Non-recursive relocation not supported" -msgstr "Nicht-rekursives Umplatzieren nicht unterstützt" +#: ../libsvn_client/conflicts.c:2784 +#, fuzzy +msgid "An unversioned item was found in the working copy." +msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten" -#: ../libsvn_client/diff.c:66 -#, c-format -msgid "Path '%s' must be an immediate child of the directory '%s'" -msgstr "Pfad »%s« muss ein unmittelbares Kind von Verzeichnis »%s« sein" +#: ../libsvn_client/conflicts.c:2789 +msgid "An item scheduled to be added to the repository in the next commit was found in the working copy." +msgstr "" -#: ../libsvn_client/diff.c:241 -#, c-format -msgid "%s\t(revision %ld)" -msgstr "%s\t(Revision %ld)" +#: ../libsvn_client/conflicts.c:2794 +msgid "The item in the working copy had been moved away at the time this conflict was recorded." +msgstr "" -#: ../libsvn_client/diff.c:243 -#, c-format -msgid "%s\t(nonexistent)" -msgstr "%s\t(nicht existent)" +#: ../libsvn_client/conflicts.c:2798 +msgid "An item had been moved here in the working copy at the time this conflict was recorded." +msgstr "" -#. SVN_INVALID_REVNUM -#: ../libsvn_client/diff.c:245 +#: ../libsvn_client/conflicts.c:2826 #, c-format -msgid "%s\t(working copy)" -msgstr "%s\t(Arbeitskopie)" +msgid "" +"%s\n" +"And then moved away to '^/%s' by %s in r%ld." +msgstr "" -#: ../libsvn_client/diff.c:499 ../svnlook/svnlook.c:802 -#, c-format -msgid "%sProperty changes on: %s%s" -msgstr "%sEigenschaftsänderungen: %s%s" +#: ../libsvn_client/conflicts.c:2891 +msgid "No such file or directory was found in the merge target working copy.\n" +msgstr "" -#: ../libsvn_client/diff.c:754 +#: ../libsvn_client/conflicts.c:2900 #, c-format -msgid "Cannot display: file marked as a binary type.%s" -msgstr "Kann nicht anzeigen: Dateityp ist als binär angegeben.%s" +msgid "%sThe file was moved to '^/%s' in r%ld by %s." +msgstr "" -#: ../libsvn_client/diff.c:1285 ../libsvn_client/merge.c:7277 -#: ../libsvn_client/merge.c:10629 -msgid "Not all required revisions are specified" -msgstr "Es sind nicht alle erforderlichen Revisionen angegeben" +#: ../libsvn_client/conflicts.c:2906 +#, c-format +msgid "%sThe directory was moved to '^/%s' in r%ld by %s." +msgstr "" -#: ../libsvn_client/diff.c:1299 -msgid "At least one revision must be something other than BASE or WORKING when diffing a URL" -msgstr "Beim Vergleichen einer URL muss mindestens eine Revision etwas anderes sein als »BASE« oder »WORKING«" +#: ../libsvn_client/conflicts.c:2913 +#, c-format +msgid "%sThe item was moved to '^/%s' in r%ld by %s." +msgstr "" -#: ../libsvn_client/diff.c:1336 +#: ../libsvn_client/conflicts.c:2929 #, c-format -msgid "Diff target '%s' was not found in the repository at revision '%ld'" -msgstr "Ziel für Vergleich »%s« wurde im Projektarchiv in Revision »%ld« nicht gefunden" +msgid "%sThe file '^/%s' was moved to '^/%s' in r%ld by %s." +msgstr "" -#: ../libsvn_client/diff.c:1341 +#: ../libsvn_client/conflicts.c:2937 #, c-format -msgid "Diff target '%s' was not found in the repository at revision '%ld' or '%ld'" -msgstr "Ziel für Vergleich »%s« wurde im Projektarchiv in Revision »%ld« oder »%ld« nicht gefunden" +msgid "%sThe directory '^/%s' was moved to '^/%s' in r%ld by %s." +msgstr "" -#: ../libsvn_client/diff.c:1517 +#: ../libsvn_client/conflicts.c:2945 #, c-format -msgid "Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'" -msgstr "Ziel für Vergleich »%s« wurde im Projektarchiv in Revisionen »%ld« und »%ld« nicht gefunden" +msgid "%sThe item '^/%s' was moved to '^/%s' in r%ld by %s." +msgstr "" -#: ../libsvn_client/diff.c:1522 +#: ../libsvn_client/conflicts.c:2959 #, c-format -msgid "Diff targets '%s' and '%s' were not found in the repository at revisions '%ld' and '%ld'" -msgstr "Ziele für Vergleich »%s« und »%s« wurden im Projektarchiv in Revisionen »%ld« und »%ld« nicht gefunden" +msgid "" +"No such file or directory was found in the merge target working copy.\n" +"'^/%s' was deleted in r%ld by %s." +msgstr "" -#: ../libsvn_client/diff.c:1621 -msgid "Sorry, svn_client_diff6 was called in a way that is not yet supported" -msgstr "Leider wurde svn_client_diff6 in einer Art aufgerufen, die noch nicht unterstützt wird" +#: ../libsvn_client/conflicts.c:2983 +msgid "An update operation tried to edit a file." +msgstr "" -#: ../libsvn_client/diff.c:1661 -msgid "Only diffs between a path's text-base and its working files are supported at this time" -msgstr "Derzeit werden nur Vergleiche zwischen der Textbasis und den Arbeitsdateien eines Pfades unterstützt" +#: ../libsvn_client/conflicts.c:2985 +msgid "An update operation tried to add a file." +msgstr "" -#: ../libsvn_client/diff.c:2367 ../libsvn_client/diff.c:2453 -msgid "Cannot ignore properties and show only properties at the same time" -msgstr "Kann nicht gleichzeitig Eigenschaften ignorieren und nur Eigenschaften anzeigen" +#: ../libsvn_client/conflicts.c:2987 +msgid "An update operation tried to delete or move a file." +msgstr "" -#: ../libsvn_client/diff_local.c:792 ../libsvn_wc/props.c:1675 -#, c-format -msgid "'%s' is not a file or directory" -msgstr "»%s« ist weder eine Datei noch ein Verzeichnis" +#: ../libsvn_client/conflicts.c:2990 +msgid "An update operation tried to replace a file." +msgstr "" -#: ../libsvn_client/export.c:102 -#, c-format -msgid "'%s' is not a valid EOL value" -msgstr "»%s« ist kein gültiger EOL Wert" +#: ../libsvn_client/conflicts.c:2998 +msgid "A switch operation tried to edit a file." +msgstr "" -#: ../libsvn_client/export.c:240 -msgid "Destination directory exists, and will not be overwritten unless forced" -msgstr "Zielverzeichnis existiert und kann nur mittels »--force« überschrieben werden" +#: ../libsvn_client/conflicts.c:3000 +msgid "A switch operation tried to add a file." +msgstr "" -#: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1527 -#: ../libsvn_wc/adm_crawler.c:1219 ../libsvn_wc/copy.c:651 -#: ../libsvn_wc/crop.c:234 ../libsvn_wc/crop.c:337 ../libsvn_wc/info.c:377 -#: ../libsvn_wc/node.c:529 ../libsvn_wc/props.c:202 ../libsvn_wc/status.c:2728 -#: ../libsvn_wc/wc_db.c:2066 ../libsvn_wc/wc_db.c:2607 -#: ../libsvn_wc/wc_db.c:2846 ../libsvn_wc/wc_db.c:2879 -#: ../libsvn_wc/wc_db.c:3037 ../libsvn_wc/wc_db.c:4050 -#: ../libsvn_wc/wc_db.c:6373 ../libsvn_wc/wc_db.c:6693 -#: ../libsvn_wc/wc_db.c:6866 ../libsvn_wc/wc_db.c:7053 -#: ../libsvn_wc/wc_db.c:8092 ../libsvn_wc/wc_db.c:9056 -#: ../libsvn_wc/wc_db.c:9788 ../libsvn_wc/wc_db.c:10433 -#: ../libsvn_wc/wc_db.c:10580 ../libsvn_wc/wc_db.c:10720 -#: ../libsvn_wc/wc_db.c:11096 ../libsvn_wc/wc_db.c:11429 -#: ../libsvn_wc/wc_db.c:12669 ../libsvn_wc/wc_db.c:12737 -#: ../libsvn_wc/wc_db.c:14066 ../libsvn_wc/wc_db.c:14115 -#: ../libsvn_wc/wc_db.c:14236 ../libsvn_wc/wc_db.c:14395 -#: ../libsvn_wc/wc_db.c:14836 ../libsvn_wc/wc_db.c:15700 -#, c-format -msgid "The node '%s' was not found." -msgstr "Der Knoten »%s« wurde nicht gefunden." +#: ../libsvn_client/conflicts.c:3002 +msgid "A switch operation tried to delete or move a file." +msgstr "" -#: ../libsvn_client/export.c:285 ../libsvn_client/export.c:1184 -#: ../libsvn_client/export.c:1241 -#, c-format -msgid "Destination file '%s' exists, and will not be overwritten unless forced" -msgstr "Zieldatei »%s« existiert und kann nur mittels »--force« überschrieben werden" +#: ../libsvn_client/conflicts.c:3005 +msgid "A switch operation tried to replace a file." +msgstr "" -#: ../libsvn_client/export.c:291 ../libsvn_client/export.c:1189 -#: ../libsvn_client/export.c:1246 -#, c-format -msgid "Destination '%s' exists. Cannot overwrite directory with non-directory" -msgstr "Ziel »%s« existiert. Kann Verzeichnis nicht mit etwas überschreiben, was kein Verzeichnis ist" +#: ../libsvn_client/conflicts.c:3013 +msgid "A merge operation tried to edit a file." +msgstr "" -#: ../libsvn_client/export.c:473 ../libsvn_client/export.c:622 -#: ../libsvn_client/export.c:1078 -#, c-format -msgid "'%s' exists and is not a directory" -msgstr "»%s« existiert und ist kein Verzeichnis" +#: ../libsvn_client/conflicts.c:3015 +msgid "A merge operation tried to add a file." +msgstr "" -#: ../libsvn_client/export.c:477 ../libsvn_client/export.c:626 -#: ../libsvn_client/export.c:1082 -#, c-format -msgid "'%s' already exists" -msgstr "»%s« existiert bereits" +#: ../libsvn_client/conflicts.c:3017 +msgid "A merge operation tried to delete or move a file." +msgstr "" -#: ../libsvn_client/externals.c:202 -#, c-format -msgid "The external '%s' defined in %s at '%s' cannot be checked out because '%s' is already a versioned path." -msgstr "Der externe Verweis »%s« definiert durch Eigenschaft »%s« von »%s« kann nicht ausgecheckt werden, da »%s« schon ein versionierter Pfad ist." +#: ../libsvn_client/conflicts.c:3020 +msgid "A merge operation tried to replace a file." +msgstr "" -#: ../libsvn_client/externals.c:464 -#, c-format -msgid "Cannot insert a file external defined on '%s' into the working copy '%s'." -msgstr "Kann externen Dateiverweis von »%s« nicht in die Arbeitskopie »%s« einfügen." +#: ../libsvn_client/conflicts.c:3030 +#, fuzzy +msgid "An update operation tried to change a directory." +msgstr "Ungültige Operation auf dem aktuellen Arbeitsverzeichnis" -#: ../libsvn_client/externals.c:489 -#, c-format -msgid "The file external from '%s' cannot overwrite the existing versioned item at '%s'" -msgstr "Der externe Dateiverweis von »%s« kann nicht das existierende versionierte Objekt bei »%s« überschreiben" +#: ../libsvn_client/conflicts.c:3032 +#, fuzzy +msgid "An update operation tried to add a directory." +msgstr "Operation ist nicht auf einem Verzeichnis ausführbar" -#: ../libsvn_client/externals.c:503 -#, c-format -msgid "The file external '%s' can not be created because the node exists." -msgstr "Der externe Dateiverweis auf »%s« kann nicht erstellt werden, da schon ein Knoten existiert" +#: ../libsvn_client/conflicts.c:3034 +msgid "An update operation tried to delete or move a directory." +msgstr "" -#: ../libsvn_client/externals.c:781 -#, c-format -msgid "URL '%s' at revision %ld doesn't exist" -msgstr "URL »%s« existiert nicht in Revision %ld" +#: ../libsvn_client/conflicts.c:3037 +#, fuzzy +msgid "An update operation tried to replace a directory." +msgstr "Operation ist nicht auf einem Verzeichnis ausführbar" -#: ../libsvn_client/externals.c:786 -#, c-format -msgid "URL '%s' at revision %ld is not a file or a directory" -msgstr "URL »%s« in Revision %ld ist weder eine Datei noch ein Verzeichnis" +#: ../libsvn_client/conflicts.c:3045 +#, fuzzy +msgid "A switch operation tried to edit a directory." +msgstr "Operation ist nicht auf einem Verzeichnis ausführbar" -#: ../libsvn_client/externals.c:865 -#, c-format -msgid "Unsupported external: URL of file external '%s' is not in repository '%s'" -msgstr "Nicht unterstützter externer Verweis: URL von Dateiverweis »%s« gehört nicht zum Projektarchiv »%s«" +#: ../libsvn_client/conflicts.c:3047 +#, fuzzy +msgid "A switch operation tried to add a directory." +msgstr "Operation ist nicht auf einem Verzeichnis ausführbar" -#: ../libsvn_client/externals.c:1061 -#, c-format -msgid "Traversal of '%s' found no ambient depth" -msgstr "Durchlauf von »%s« fand keine äußere Tiefe" +#: ../libsvn_client/conflicts.c:3049 +msgid "A switch operation tried to delete or move a directory." +msgstr "" -#: ../libsvn_client/import.c:149 -#, c-format -msgid "%s property on '%s' contains unrecognized EOL-style '%s'" -msgstr "Eigenschaft »%s« von »%s« enthält nicht erkannten Zeilenendstil »%s«" +#: ../libsvn_client/conflicts.c:3052 +#, fuzzy +msgid "A switch operation tried to replace a directory." +msgstr "Operation ist nicht auf einem Verzeichnis ausführbar" -#: ../libsvn_client/import.c:479 -#, c-format -msgid "Unknown or unversionable type for '%s'" -msgstr "Unbekannter oder unerwarteter Typ für »%s«" +#: ../libsvn_client/conflicts.c:3060 +#, fuzzy +msgid "A merge operation tried to edit a directory." +msgstr "Operation ist nicht auf einem Verzeichnis ausführbar" -#: ../libsvn_client/import.c:706 -msgid "New entry name required when importing a file" -msgstr "Neuer Eintragsname erforderlich, wenn eine Datei importiert wird" +#: ../libsvn_client/conflicts.c:3062 +#, fuzzy +msgid "A merge operation tried to add a directory." +msgstr "Operation ist nicht auf einem Verzeichnis ausführbar" -#: ../libsvn_client/import.c:757 ../libsvn_client/patch.c:3249 -#: ../libsvn_client/patch.c:3261 ../libsvn_wc/delete.c:93 -#: ../libsvn_wc/lock.c:121 ../libsvn_wc/wc_db_wcroot.c:78 -#, c-format -msgid "'%s' does not exist" -msgstr "»%s« ist nicht vorhanden" +#: ../libsvn_client/conflicts.c:3064 +msgid "A merge operation tried to delete or move a directory." +msgstr "" -#: ../libsvn_client/import.c:909 -#, c-format -msgid "'%s' is a reserved name and cannot be imported" -msgstr "»%s« ist ein reservierter Name und kann nicht importiert werden " +#: ../libsvn_client/conflicts.c:3067 +#, fuzzy +msgid "A merge operation tried to replace a directory." +msgstr "Operation ist nicht auf einem Verzeichnis ausführbar" -#: ../libsvn_client/info.c:398 ../libsvn_client/list.c:272 -#: ../svnbench/null-info-cmd.c:148 -#, c-format -msgid "URL '%s' non-existent in revision %ld" -msgstr "URL »%s« existiert nicht in Revision %ld" +#: ../libsvn_client/conflicts.c:3078 +msgid "An update operation tried to edit an item." +msgstr "" -#: ../libsvn_client/locking_commands.c:273 -msgid "No common parent found, unable to operate on disjoint arguments" -msgstr "Kein gemeinsamer Vorgänger gefunden. Kann nicht mit disjunkten Pfaden arbeiten" +#: ../libsvn_client/conflicts.c:3080 +msgid "An update operation tried to add an item." +msgstr "" -#: ../libsvn_client/locking_commands.c:382 -#, c-format -msgid "The node '%s' is not a file" -msgstr "Der Knoten »%s« ist keine Datei" +#: ../libsvn_client/conflicts.c:3082 +msgid "An update operation tried to delete or move an item." +msgstr "" -#: ../libsvn_client/locking_commands.c:402 -msgid "Unable to lock/unlock across multiple repositories" -msgstr "Unmöglich über mehrere Projektarchive zu (ent)sperren" +#: ../libsvn_client/conflicts.c:3085 +msgid "An update operation tried to replace an item." +msgstr "" -#: ../libsvn_client/locking_commands.c:442 -#, c-format -msgid "'%s' is not locked in this working copy" -msgstr "»%s« ist in dieser Arbeitskopie nicht gesperrt" +#: ../libsvn_client/conflicts.c:3093 +msgid "A switch operation tried to edit an item." +msgstr "" -#: ../libsvn_client/locking_commands.c:495 -#, c-format -msgid "'%s' is not locked" -msgstr "»%s« ist nicht gesperrt" +#: ../libsvn_client/conflicts.c:3095 +msgid "A switch operation tried to add an item." +msgstr "" -#: ../libsvn_client/locking_commands.c:529 ../libsvn_fs/fs-loader.c:1630 -#: ../libsvn_ra/ra_loader.c:1059 -msgid "Lock comment contains illegal characters" -msgstr "Sperrkommentar enthält illegale Zeichen" +#: ../libsvn_client/conflicts.c:3097 +msgid "A switch operation tried to delete or move an item." +msgstr "" -#: ../libsvn_client/log.c:134 ../libsvn_client/ra.c:532 -#: ../libsvn_client/ra.c:867 -#, c-format -msgid "'%s' has no URL" -msgstr "»%s« hat keine URL" +#: ../libsvn_client/conflicts.c:3100 +msgid "A switch operation tried to replace an item." +msgstr "" -#: ../libsvn_client/log.c:347 -msgid "No valid target found" -msgstr "Kein gültiges Ziel gefunden" +#: ../libsvn_client/conflicts.c:3108 +msgid "A merge operation tried to edit an item." +msgstr "" -#: ../libsvn_client/log.c:378 +#: ../libsvn_client/conflicts.c:3110 +msgid "A merge operation tried to add an item." +msgstr "" + +#: ../libsvn_client/conflicts.c:3112 +msgid "A merge operation tried to delete or move an item." +msgstr "" + +#: ../libsvn_client/conflicts.c:3115 +msgid "A merge operation tried to replace an item." +msgstr "" + +#: ../libsvn_client/conflicts.c:3131 ../svn/cl-conflicts.c:212 +msgid "upon update" +msgstr "bei Aktualisierung" + +#: ../libsvn_client/conflicts.c:3132 ../svn/cl-conflicts.c:213 +msgid "upon switch" +msgstr "bei Umstellung" + +#: ../libsvn_client/conflicts.c:3133 ../svn/cl-conflicts.c:214 +msgid "upon merge" +msgstr "bei Zusammenführung" + +#: ../libsvn_client/conflicts.c:3134 ../svn/cl-conflicts.c:215 +msgid "upon none" +msgstr "ohne Operation" + +#: ../libsvn_client/conflicts.c:3153 ../svn/cl-conflicts.c:127 +#: ../svn/cl-conflicts.c:234 +msgid "local edit" +msgstr "lokale geändert" + +#: ../libsvn_client/conflicts.c:3156 ../svn/cl-conflicts.c:140 +#: ../svn/cl-conflicts.c:237 +msgid "local add" +msgstr "lokal hinzugefügt" + +#: ../libsvn_client/conflicts.c:3159 ../svn/cl-conflicts.c:131 +#: ../svn/cl-conflicts.c:240 +msgid "local delete" +msgstr "lokal gelöscht" + +#: ../libsvn_client/conflicts.c:3162 ../svn/cl-conflicts.c:129 +#: ../svn/cl-conflicts.c:243 +msgid "local obstruction" +msgstr "lokal blockiert" + +#: ../libsvn_client/conflicts.c:3166 ../svn/cl-conflicts.c:247 #, c-format -msgid "'%s' is not a relative path" -msgstr "»%s« ist kein relativer Pfad" +msgid "local %s" +msgstr "lokal %s" -#: ../libsvn_client/log.c:404 -msgid "When specifying working copy paths, only one target may be given" -msgstr "Bei der Angabe von Arbeitskopiepfaden darf nur ein Ziel angegeben werden" +#: ../libsvn_client/conflicts.c:3175 ../svn/cl-conflicts.c:192 +#: ../svn/cl-conflicts.c:256 +msgid "incoming edit" +msgstr "eingehende Änderung" -#: ../libsvn_client/log.c:428 ../libsvn_client/revisions.c:190 -msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL" -msgstr "PREV, BASE oder COMMITTED Revisions-Schlüsselwörter sind für die URL ungültig" +#: ../libsvn_client/conflicts.c:3178 ../svn/cl-conflicts.c:194 +#: ../svn/cl-conflicts.c:259 +msgid "incoming add" +msgstr "eingehendes Hinzufügen" -#: ../libsvn_client/log.c:561 ../libsvn_client/log.c:870 -msgid "Missing required revision specification" -msgstr "Es wurde keine Revision angegeben" +#: ../libsvn_client/conflicts.c:3181 ../svn/cl-conflicts.c:262 +msgid "incoming delete" +msgstr "eingehendes Löschen" -#: ../libsvn_client/merge.c:442 +#: ../libsvn_client/conflicts.c:3185 ../svn/cl-conflicts.c:266 #, c-format -msgid "URL '%s' of '%s' is not in repository '%s'" -msgstr "URL »%s« von »%s« ist nicht im Projektarchiv »%s«" +msgid "incoming %s" +msgstr "eingehendes %s" -#: ../libsvn_client/merge.c:479 +#: ../libsvn_client/conflicts.c:3193 ../svn/cl-conflicts.c:273 +#: ../svn/cl-conflicts.c:326 #, c-format -msgid "'%s' must be from the same repository as '%s'" -msgstr "»%s« muss aus dem selben Projektarchiv wie »%s« stammen" +msgid "%s, %s %s" +msgstr "%s, %s %s" -# File names not translated -#. xgettext: the '.working', '.merge-left.r%ld' and -#. '.merge-right.r%ld' strings are used to tag onto a file -#. name in case of a merge conflict -#: ../libsvn_client/merge.c:2094 +#: ../libsvn_client/conflicts.c:3252 +#, fuzzy, c-format +msgid "incoming %s %s" +msgstr "eingehendes %s" + +#: ../libsvn_client/conflicts.c:3355 #, c-format -msgid ".working%s%s" -msgstr ".working%s%s" +msgid "Directory updated from r%ld to r%ld was replaced with a file by %s in r%ld." +msgstr "" -# File names not translated -#: ../libsvn_client/merge.c:2097 +#: ../libsvn_client/conflicts.c:3366 ../libsvn_client/conflicts.c:3446 +#: ../libsvn_client/conflicts.c:3700 ../libsvn_client/conflicts.c:3787 +#: ../libsvn_client/conflicts.c:4087 ../libsvn_client/conflicts.c:4155 +#, fuzzy, c-format +msgid "" +"%s\n" +"The replaced directory was moved to '^/%s'." +msgstr "Löschen schlug fehl: Verzeichnis hat keinen Eintrag »%s«" + +#: ../libsvn_client/conflicts.c:3381 #, c-format -msgid ".merge-left.r%ld%s%s" -msgstr ".merge-left.r%ld%s%s" +msgid "File updated from r%ld to r%ld was replaced with a file from another line of history by %s in r%ld." +msgstr "" -# File names not translated -#: ../libsvn_client/merge.c:2101 +#: ../libsvn_client/conflicts.c:3393 ../libsvn_client/conflicts.c:3472 +#: ../libsvn_client/conflicts.c:3729 ../libsvn_client/conflicts.c:3815 +#: ../libsvn_client/conflicts.c:4116 ../libsvn_client/conflicts.c:4183 #, c-format -msgid ".merge-right.r%ld%s%s" -msgstr ".merge-right.r%ld%s%s" +msgid "" +"%s\n" +"The replaced file was moved to '^/%s'." +msgstr "" -#: ../libsvn_client/merge.c:4779 -msgid "Cannot reverse-merge a range from a path's own future history; try updating first" -msgstr "Kann keinen Bereich aus der zukünftigen Geschichte des Pfades rückwärts zusammenführen; versuchen Sie zuerst zu aktualisieren" +#: ../libsvn_client/conflicts.c:3407 +#, c-format +msgid "Item updated from r%ld to r%ld was replaced with a file by %s in r%ld." +msgstr "" -#: ../libsvn_client/merge.c:5514 +#: ../libsvn_client/conflicts.c:3417 ../libsvn_client/conflicts.c:3496 +#: ../libsvn_client/conflicts.c:3756 ../libsvn_client/conflicts.c:3842 +#: ../libsvn_client/conflicts.c:4210 #, c-format msgid "" -"One or more conflicts were produced while merging r%ld:%ld into\n" -"'%s' --\n" -"resolve all conflicts and rerun the merge to apply the remaining\n" -"unmerged revisions" +"%s\n" +"The replaced item was moved to '^/%s'." msgstr "" -"Ein oder mehrere Konflikte wurden beim Zusammenführen von r%ld:%ld in\n" -"»%s« erzeugt.\n" -"Lösen Sie alle Konflikte auf und starten Sie die Zusammenführung\n" -"erneut, um die fehlenden Revisionen zusammenzuführen" -#: ../libsvn_client/merge.c:6330 +#: ../libsvn_client/conflicts.c:3434 #, c-format -msgid "Invalid mergeinfo detected on '%s', merge tracking not possible" -msgstr "Ungültige Zusammenführungsinformationen in »%s« entdeckt, Zusammenführungsverfolgung nicht möglich" - -#: ../libsvn_client/merge.c:6479 -msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n" -msgstr "Zusammenführungsverfolgung nicht erlaubt bei fehlenden Unterbäumen; versuchen Sie diese Elemente erst wiederherzustellen:\n" +msgid "Directory updated from r%ld to r%ld was replaced with a directory from another line of history by %s in r%ld." +msgstr "" -#: ../libsvn_client/merge.c:7481 +#: ../libsvn_client/conflicts.c:3461 #, c-format -msgid "Invalid mergeinfo detected on merge target '%s', merge tracking not possible" -msgstr "Ungültige Zusammenführungsinformationen im Zusammenführungsziel »%s« entdeckt, Zusammenführungsverfolgung nicht möglich" +msgid "File updated from r%ld to r%ld was replaced with a directory by %s in r%ld." +msgstr "" -#: ../libsvn_client/merge.c:9799 -msgid "Use of two URLs is not compatible with mergeinfo modification" -msgstr "Die Verwendung zweier URLs ist nicht kompatibel mit Änderungen der Zusammenführungsinformationen" +#: ../libsvn_client/conflicts.c:3486 +#, c-format +msgid "Item updated from r%ld to r%ld was replaced by %s in r%ld." +msgstr "" -#: ../libsvn_client/merge.c:9806 ../libsvn_client/merge.c:10141 -msgid "Merge from foreign repository is not compatible with mergeinfo modification" -msgstr "Die Zusammenführung aus fremdem Projektarchiv ist nicht kompatibel mit Änderungen der Zusammenführungsinformationen" +#: ../libsvn_client/conflicts.c:3519 +#, c-format +msgid "Directory updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld." +msgstr "" -#: ../libsvn_client/merge.c:10234 ../libsvn_client/merge.c:10377 +#: ../libsvn_client/conflicts.c:3531 #, c-format -msgid "Merge target '%s' does not exist in the working copy" -msgstr "Zusammenführungsziel »%s« ist nicht in der Arbeitskopie enthalten" +msgid "Directory updated from r%ld to r%ld was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/merge.c:10257 -msgid "Cannot determine revision of working copy" -msgstr "Die Revision der Arbeitskopie kann nicht bestimmt werden" +#: ../libsvn_client/conflicts.c:3547 +#, c-format +msgid "File updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld." +msgstr "" -#: ../libsvn_client/merge.c:10263 +#: ../libsvn_client/conflicts.c:3558 #, c-format -msgid "Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first" -msgstr "Kann nicht in eine Arbeitskopie mit verschiedenen Revisionen zusammenführen [%ld:%ld], versuchen Sie erst zu aktualisieren" +msgid "File updated from r%ld to r%ld was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/merge.c:10278 -msgid "Cannot merge into a working copy with a switched subtree" -msgstr "Kann nicht in eine Arbeitskopie mit umgestelltem Unterbaum zusammenführen" +#: ../libsvn_client/conflicts.c:3572 +#, c-format +msgid "Item updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld." +msgstr "" -#: ../libsvn_client/merge.c:10294 -msgid "Cannot merge into a working copy that has local modifications" -msgstr "Kann nicht in eine Arbeitskopie mit lokalen Änderungen zusammenführen" +#: ../libsvn_client/conflicts.c:3583 +#, c-format +msgid "Item updated from r%ld to r%ld was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/merge.c:10314 ../svn/merge-cmd.c:56 +#: ../libsvn_client/conflicts.c:3603 #, c-format -msgid "Invalid merge source '%s'; a working copy path can only be used with a repository revision (a number, a date, or head)" -msgstr "Ungültige Quelle für Zusammenführung »%s«; ein Arbeitskopiepfad kann nur mit einer Revision im Projektarchiv verwendet werden (eine Zahl, ein Datum oder »HEAD«)" +msgid "Directory updated backwards from r%ld to r%ld was a file before the replacement made by %s in r%ld." +msgstr "" -#: ../libsvn_client/merge.c:10632 ../svn/merge-cmd.c:123 -msgid "Merge sources must both be either paths or URLs" -msgstr "Zusammenführungsquellen müssen beide Pfade oder URLs sein" +#: ../libsvn_client/conflicts.c:3610 +#, c-format +msgid "File updated backwards from r%ld to r%ld was a file from another line of history before the replacement made by %s in r%ld." +msgstr "" -#: ../libsvn_client/merge.c:11393 ../libsvn_client/merge.c:11555 -#: ../libsvn_client/merge.c:12451 +#: ../libsvn_client/conflicts.c:3617 #, c-format -msgid "'%s@%ld' must be ancestrally related to '%s@%ld'" -msgstr "»%s@%ld« muss eine Vorgängerbeziehung zu »%s@%ld« haben" +msgid "Item updated backwards from r%ld to r%ld was replaced with a file by %s in r%ld." +msgstr "" -#: ../libsvn_client/merge.c:11505 +#: ../libsvn_client/conflicts.c:3626 #, c-format -msgid "Neither the reintegrate source nor target can be the root of the repository" -msgstr "Weder die Quelle noch das Ziel der Reintegration darf Wurzel des Projektarchivs sein" +msgid "Directory updated backwards from r%ld to r%ld was a directory from another line of history before the replacement made by %s in r%ld." +msgstr "" -#: ../libsvn_client/merge.c:11515 -msgid "Reintegrate merge not possible" -msgstr "Zusammenführung zur Reintegration nicht möglich" +#: ../libsvn_client/conflicts.c:3634 +#, c-format +msgid "File updated backwards from r%ld to r%ld was a directory before the replacement made by %s in r%ld." +msgstr "" -#: ../libsvn_client/merge.c:11585 -msgid " Missing ranges: " -msgstr " Fehlende Bereiche: " - -#: ../libsvn_client/merge.c:11588 +#: ../libsvn_client/conflicts.c:3640 #, c-format -msgid "" -"Reintegrate can only be used if revisions %ld through %ld were previously merged from %s to the reintegrate source, but this is not the case:\n" -"%s" +msgid "Item updated backwards from r%ld to r%ld was replaced with a directory by %s in r%ld." msgstr "" -"Reintegration kann nur genutzt werden, falls die Revisionen %ld bis %ld vorher von %s in die zu reintegrierende Quelle zusammengeführt wurden, aber dies ist nicht der Fall:\n" -"%s" -#: ../libsvn_client/merge.c:11650 +#: ../libsvn_client/conflicts.c:3649 #, c-format -msgid "Can't reintegrate into '%s' because it is locally added and therefore not related to the merge source" -msgstr "Kann nicht nach »%s« reintegrieren, da es lokal hinzugefügt wurde und daher keine Herkunftsbeziehung zur Quelle der Zusammenführung hat" - -#: ../libsvn_client/merge.c:11918 -msgid "Cannot merge automatically while ignoring mergeinfo" -msgstr "Kann nicht automatisch zusammenführen und dabei Zusammenführungsinformationen ignorieren" - -#: ../libsvn_client/merge.c:12673 -msgid "The required merge is reintegrate-like, and the record-only option cannot be used with this kind of merge" -msgstr "Die benötigte Zusammenführung ist eine Reintegration, die Option »record-only« kann aber mit dieser Art der Zusammenführung nicht verwendet werden" - -#: ../libsvn_client/merge.c:12679 -msgid "The required merge is reintegrate-like, and the depth option cannot be used with this kind of merge" -msgstr "Die benötigte Zusammenführung ist eine Reintegration, die Option zur Angabe der Tiefe kann aber mit dieser Art der Zusammenführung nicht verwendet werden" - -#: ../libsvn_client/merge.c:12685 -msgid "The required merge is reintegrate-like, and the force_delete option cannot be used with this kind of merge" -msgstr "Die benötigte Zusammenführung ist eine Reintegration, die Option »force_delete« kann aber mit dieser Art der Zusammenführung nicht verwendet werden" - -#: ../libsvn_client/mergeinfo.c:1715 -msgid "Only depths 'infinity' and 'empty' are currently supported" -msgstr "Nur Tiefenangaben von »infinity« und »empty« werden momentan unterstützt" +msgid "Directory updated backwards from r%ld to r%ld did not exist before it was added by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:166 +#: ../libsvn_client/conflicts.c:3656 #, c-format -msgid "Can't operate on '%s' because '%s' is not a directory" -msgstr "Kann »%s« nicht bearbeiten da »%s« kein Verzeichnis ist" +msgid "File updated backwards from r%ld to r%ld did not exist before it was added by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:319 +#: ../libsvn_client/conflicts.c:3662 #, c-format -msgid "No origin found for node at '%s'" -msgstr "Kein Herkunftsknoten gefunden für Knoten in »%s«" +msgid "Item updated backwards from r%ld to r%ld did not exist before it was added by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:359 ../libsvn_repos/commit.c:432 +#: ../libsvn_client/conflicts.c:3687 #, c-format -msgid "No such revision %ld (HEAD is %ld)" -msgstr "Keine Revision %ld (HEAD ist %ld)" +msgid "" +"Directory switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a file by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:407 +#: ../libsvn_client/conflicts.c:3715 #, c-format -msgid "'%s' is not an ancestor of '%s'" -msgstr "»%s« ist kein Vorgänger von »%s«" +msgid "" +"File switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a file from another line of history by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:506 +#: ../libsvn_client/conflicts.c:3743 ../libsvn_client/conflicts.c:3986 #, c-format -msgid "Can't add file at '%s'" -msgstr "Kann Datei »%s« nicht hinzufügen" +msgid "" +"Item switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a file by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:538 ../libsvn_client/ra.c:708 -#: ../libsvn_fs_base/lock.c:274 ../libsvn_fs_fs/fs_fs.c:1366 -#: ../libsvn_fs_fs/lock.c:759 ../libsvn_fs_fs/rev_file.c:177 -#: ../libsvn_fs_fs/rev_file.c:189 ../libsvn_fs_x/fs_x.c:690 -#: ../libsvn_fs_x/lock.c:799 ../libsvn_fs_x/rev_file.c:190 -#: ../libsvn_repos/commit.c:193 ../libsvn_repos/log.c:2357 -#: ../libsvn_repos/log.c:2361 ../libsvn_repos/rev_hunt.c:851 -#: ../libsvn_repos/rev_hunt.c:858 ../libsvn_repos/rev_hunt.c:865 +#: ../libsvn_client/conflicts.c:3773 #, c-format -msgid "No such revision %ld" -msgstr "Keine Revision %ld" +msgid "" +"Directory switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a directory from another line of history by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:560 +#: ../libsvn_client/conflicts.c:3802 #, c-format -msgid "Can't add node at '%s'" -msgstr "Kann Knoten »%s« nicht hinzufügen" +msgid "" +"File switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a directory by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:587 +#: ../libsvn_client/conflicts.c:3829 ../libsvn_client/conflicts.c:4016 #, c-format -msgid "Can't delete node at '%s' as it does not exist" -msgstr "Kann Knoten »%s« nicht löschen da er nicht existiert" +msgid "" +"Item switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a directory by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:604 +#: ../libsvn_client/conflicts.c:3865 #, c-format -msgid "Can't delete node at '%s'" -msgstr "Kann Knoten »%s« nicht löschen" +msgid "" +"Directory switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was moved to '^/%s' by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:641 +#: ../libsvn_client/conflicts.c:3879 #, c-format -msgid "Can't create directory at '%s'" -msgstr "Kann Verzeichnis »%s« nicht erstellen" +msgid "" +"Directory switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:779 ../libsvn_client/prop_commands.c:282 -#: ../libsvn_client/prop_commands.c:477 +#: ../libsvn_client/conflicts.c:3897 #, c-format -msgid "Bad property name: '%s'" -msgstr "Ungültiger Name für Eigenschaft: »%s«" +msgid "" +"File switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was moved to '^/%s' by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:783 ../libsvn_client/prop_commands.c:275 +#: ../libsvn_client/conflicts.c:3911 #, c-format -msgid "Revision property '%s' not allowed in this context" -msgstr "Revisionseigenschaft »%s« ist in diesem Kontext nicht erlaubt" +msgid "" +"File switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:788 ../libsvn_client/prop_commands.c:60 +#: ../libsvn_client/conflicts.c:3928 #, c-format -msgid "'%s' is a wcprop, thus not accessible to clients" -msgstr "»%s« ist eine AK-Eigenschaft und damit den Clients nicht zugänglich" - -#: ../libsvn_client/mtcc.c:798 -msgid "Error normalizing property value" -msgstr "Fehler beim Normalisieren des Eigenschaftswertes" +msgid "" +"Item switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was moved to '^/%s' by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:833 ../libsvn_client/mtcc.c:856 +#: ../libsvn_client/conflicts.c:3942 #, c-format -msgid "Can't set properties at not existing '%s'" -msgstr "Kann Eigenschaften nicht für nicht vorhandenes »%s« setzen" +msgid "" +"Item switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:904 +#: ../libsvn_client/conflicts.c:3967 ../libsvn_client/conflicts.c:4007 #, c-format -msgid "Can't update '%s' because it is not a file" -msgstr "Kann »%s« nicht aktualisieren, da es keine Datei ist" +msgid "" +"Directory switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was a file before the replacement made by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:915 +#: ../libsvn_client/conflicts.c:3977 #, c-format -msgid "Can't update file at '%s'" -msgstr "Kann Datei in »%s« nicht aktualisieren" +msgid "" +"File switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was a file from another line of history before the replacement made by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:980 +#: ../libsvn_client/conflicts.c:3997 #, c-format -msgid "Can't perform directory operation on '%s' as it is not a directory" -msgstr "Kann Verzeichnisoperation auf »%s« nicht ausführen, das es kein Verzeichnis ist" +msgid "" +"Directory switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was a directory from another line of history before the replacement made by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:990 +#: ../libsvn_client/conflicts.c:4027 #, c-format -msgid "Can't perform file operation on '%s' as it is not a file" -msgstr "Kann Dateioperation auf »%s« nicht ausführen, das es keine Datei ist" +msgid "" +"Directory switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"did not exist before it was added by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:997 +#: ../libsvn_client/conflicts.c:4037 #, c-format -msgid "Can't open '%s' as it does not exist" -msgstr "Kann »%s« nicht öffnen, da es nicht existiert" +msgid "" +"File switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"did not exist before it was added by %s in r%ld." +msgstr "" -#: ../libsvn_client/mtcc.c:1389 +#: ../libsvn_client/conflicts.c:4046 #, c-format -msgid "Can't commit to '%s' because it is not a directory" -msgstr "Kann nicht nach »%s« übertragen, da es kein Verzeichnis ist" +msgid "" +"Item switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"did not exist before it was added by %s in r%ld." +msgstr "" -#: ../libsvn_client/patch.c:284 +#: ../libsvn_client/conflicts.c:4074 #, c-format -msgid "Cannot strip %u components from '%s'" -msgstr "Kann nicht %u Komponenten von »%s« entfernen" +msgid "" +"Directory merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a file by %s in r%ld." +msgstr "" -#: ../libsvn_client/patch.c:918 -msgid "Invalid link representation" -msgstr "Ungültige Darstellung für symbolischen Link" +#: ../libsvn_client/conflicts.c:4102 +#, c-format +msgid "" +"File merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a file from another line of history by %s in r%ld." +msgstr "" -#: ../libsvn_client/patch.c:3238 -msgid "strip count must be positive" -msgstr "Anzahl der zu entfernenden Komponenten muss positiv sein" +#: ../libsvn_client/conflicts.c:4128 +#, c-format +msgid "" +"Item merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a file by %s in r%ld." +msgstr "" -#: ../libsvn_client/patch.c:3254 ../libsvn_fs_base/tree.c:4084 -#: ../libsvn_fs_base/tree.c:4089 ../libsvn_fs_fs/tree.c:3185 -#: ../libsvn_fs_fs/tree.c:3190 ../libsvn_fs_x/tree.c:3219 -#: ../libsvn_fs_x/tree.c:3224 ../libsvn_ra/compat.c:677 -#: ../libsvn_ra_local/ra_plugin.c:1260 +#: ../libsvn_client/conflicts.c:4141 #, c-format -msgid "'%s' is not a file" -msgstr "»%s« ist keine Datei" +msgid "" +"Directory merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a directory from another line of history by %s in r%ld." +msgstr "" -#: ../libsvn_client/patch.c:3266 ../libsvn_wc/util.c:59 +#: ../libsvn_client/conflicts.c:4170 #, c-format -msgid "'%s' is not a directory" -msgstr "»%s« ist kein Verzeichnis" +msgid "" +"File merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a directory by %s in r%ld." +msgstr "" -#: ../libsvn_client/prop_commands.c:155 +#: ../libsvn_client/conflicts.c:4197 #, c-format -msgid "Property '%s' is not a regular property" -msgstr "Eigenschaft »%s« ist keine reguläre Eigenschaft" +msgid "" +"Item merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a directory by %s in r%ld." +msgstr "" -#: ../libsvn_client/prop_commands.c:310 -msgid "Targets must be working copy paths" -msgstr "Ziele müssen Arbeitskopiepfade sein" +#: ../libsvn_client/conflicts.c:4233 +#, c-format +msgid "" +"Directory merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was moved to '^/%s' by %s in r%ld." +msgstr "" -#: ../libsvn_client/prop_commands.c:371 -msgid "Targets must be URLs" -msgstr "Ziele müssen URLs sein" +#: ../libsvn_client/conflicts.c:4247 +#, c-format +msgid "" +"Directory merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/prop_commands.c:381 -msgid "Setting property on non-local targets needs a base revision" -msgstr "Das Setzen einer Eigenschaft für ein nicht lokales Ziel benötigt eine Basisrevision" +#: ../libsvn_client/conflicts.c:4265 +#, c-format +msgid "" +"File merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was moved to '^/%s' by %s in r%ld." +msgstr "" -#: ../libsvn_client/prop_commands.c:396 +#: ../libsvn_client/conflicts.c:4279 #, c-format -msgid "Setting property '%s' on non-local targets is not supported" -msgstr "Das Setzen der Eigenschaft »%s« für ein nicht lokales Ziel wird nicht unterstützt" +msgid "" +"File merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/prop_commands.c:424 +#: ../libsvn_client/conflicts.c:4296 #, c-format -msgid "revprop '%s' in r%ld is unexpectedly absent in repository (maybe someone else deleted it?)" -msgstr "Revisionseigenschaft »%s« in r%ld fehlt unerwarteterweise im Projektarchiv (eventuell hat jemand anderer sie gelöscht?)" +msgid "" +"Item merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was moved to '^/%s' by %s in r%ld." +msgstr "" -#: ../libsvn_client/prop_commands.c:433 +#: ../libsvn_client/conflicts.c:4310 #, c-format -msgid "revprop '%s' in r%ld has unexpected value in repository (maybe someone else changed it?)" -msgstr "Revisionseigenschaft »%s« in r%ld hat einen unerwarteten Wert im Projektarchiv (eventuell hat jemand anderer sie geändert?)" +msgid "" +"Item merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/prop_commands.c:441 +#: ../libsvn_client/conflicts.c:4335 ../libsvn_client/conflicts.c:4374 #, c-format -msgid "revprop '%s' in r%ld is unexpectedly present in repository (maybe someone else set it?)" -msgstr "Revisionseigenschaft »%s« in r%ld ist unerwarteterweise im Projektarchiv vorhanden (eventuell hat jemand anderer sie gesetzt?)" +msgid "" +"Directory reverse-merged from\n" +"'^/%s@%ld'\n" +"to ^/%s@%ld was a file before the replacement made by %s in r%ld." +msgstr "" -#: ../libsvn_client/prop_commands.c:472 -msgid "Author name should not contain a newline; value will not be set unless forced" -msgstr "Der Autorenname sollte keinen Zeilenvorschub enthalten; Wert kann nur mittels »force« gesetzt werden" +#: ../libsvn_client/conflicts.c:4344 +#, c-format +msgid "" +"File reverse-merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was a file from another line of history before the replacement made by %s in r%ld." +msgstr "" -#: ../libsvn_client/prop_commands.c:565 +#: ../libsvn_client/conflicts.c:4353 #, c-format -msgid "'%s' does not exist in revision %ld" -msgstr "»%s« existiert nicht in Revision %ld" +msgid "" +"Item reverse-merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a file by %s in r%ld." +msgstr "" -#: ../libsvn_client/prop_commands.c:571 ../libsvn_client/prop_commands.c:1081 +#: ../libsvn_client/conflicts.c:4364 #, c-format -msgid "Unknown node kind for '%s'" -msgstr "»%s« hat einen unbekannten Knotentyp" +msgid "" +"Directory reverse-merged from\n" +"'^/%s@%ld'\n" +"to ^/%s@%ld was a directory from another line of history before the replacement made by %s in r%ld." +msgstr "" -#: ../libsvn_client/ra.c:164 +#: ../libsvn_client/conflicts.c:4382 #, c-format -msgid "Attempt to set wcprop '%s' on '%s' in a non-commit operation" -msgstr "Versuch, wcprop »%s« auf »%s« in einer Nicht-Ãœbertragungs-Operation zu setzen" +msgid "" +"Item reverse-merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a directory by %s in r%ld." +msgstr "" -#: ../libsvn_client/ra.c:446 +#: ../libsvn_client/conflicts.c:4393 #, c-format -msgid "Redirect cycle detected for URL '%s'" -msgstr "Endlosschleife bei der Umleitung der URL »%s« entdeckt" +msgid "" +"Directory reverse-merged from\n" +"'^/%s@%ld'\n" +"to ^/%s@%ld did not exist before it was added by %s in r%ld." +msgstr "" -#: ../libsvn_client/ra.c:734 ../libsvn_ra/compat.c:397 +#: ../libsvn_client/conflicts.c:4402 #, c-format -msgid "Unable to find repository location for '%s' in revision %ld" -msgstr "Kann »%s« in Revision %ld nicht im Projektarchiv finden" +msgid "" +"File reverse-merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"did not exist before it was added by %s in r%ld." +msgstr "" -#: ../libsvn_client/ra.c:746 +#: ../libsvn_client/conflicts.c:4411 #, c-format -msgid "The location for '%s' for revision %ld does not exist in the repository or refers to an unrelated object" -msgstr "»%s« für Revision %ld existiert nicht im Projektarchiv oder verweist auf ein nicht verwandtes Objekt" +msgid "" +"Item reverse-merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"did not exist before it was added by %s in r%ld." +msgstr "" -#: ../libsvn_client/relocate.c:117 +#: ../libsvn_client/conflicts.c:5263 #, c-format -msgid "'%s' is not the root of the repository" -msgstr "»%s« ist nicht die Basis des Projektarchivs" +msgid "A new directory appeared during update to r%ld; it was added by %s in r%ld and later deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/relocate.c:124 +#: ../libsvn_client/conflicts.c:5270 #, c-format -msgid "The repository at '%s' has uuid '%s', but the WC has '%s'" -msgstr "Das Projektarchiv in »%s« hat die UUID »%s«, aber die Arbeitskopie hat »%s«" +msgid "A new directory appeared during update to r%ld; it was added by %s in r%ld." +msgstr "" -#: ../libsvn_client/repos_diff.c:935 ../libsvn_wc/externals.c:625 +#: ../libsvn_client/conflicts.c:5275 #, c-format -msgid "Base checksum mismatch for '%s'" -msgstr "Basis-Prüfsummenfehler bei »%s«" +msgid "A new directory appeared during update to r%ld; it was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/revisions.c:114 ../libsvn_client/revisions.c:139 +#: ../libsvn_client/conflicts.c:5285 #, c-format -msgid "Path '%s' has no committed revision" -msgstr "Pfad »%s« hat keine übertragene Revision" +msgid "A new file appeared during update to r%ld; it was added by %s in r%ld and later deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/revisions.c:167 +#: ../libsvn_client/conflicts.c:5292 #, c-format -msgid "Unrecognized revision type requested for '%s'" -msgstr "Unbekannter Revisionstyp für »%s« angefragt" +msgid "A new file appeared during update to r%ld; it was added by %s in r%ld." +msgstr "" -#: ../libsvn_client/status.c:422 ../libsvn_client/status.c:601 -#: ../libsvn_wc/lock.c:564 ../libsvn_wc/lock.c:856 ../libsvn_wc/lock.c:1542 -#: ../libsvn_wc/wc_db.c:13624 ../libsvn_wc/wc_db_wcroot.c:722 +#: ../libsvn_client/conflicts.c:5297 #, c-format -msgid "'%s' is not a working copy" -msgstr "»%s« ist keine Arbeitskopie" +msgid "A new file appeared during update to r%ld; it was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/status.c:469 +#: ../libsvn_client/conflicts.c:5306 #, c-format -msgid "Entry '%s' has no URL" -msgstr "Eintrag »%s« hat keine URL" +msgid "A new item appeared during update to r%ld; it was added by %s in r%ld and later deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/switch.c:129 +#: ../libsvn_client/conflicts.c:5313 #, c-format -msgid "Cannot both exclude and switch a path" -msgstr "Kann einen Pfad nicht sowohl ausschließen als auch umstellen" +msgid "A new item appeared during update to r%ld; it was added by %s in r%ld." +msgstr "" -#: ../libsvn_client/switch.c:150 +#: ../libsvn_client/conflicts.c:5318 #, c-format -msgid "Cannot switch '%s' because it is not in the repository yet" -msgstr "Kann »%s« nicht umplatzieren da es noch nicht im Projektarchiv ist" +msgid "A new item appeared during update to r%ld; it was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/switch.c:175 +#: ../libsvn_client/conflicts.c:5337 #, c-format -msgid "Directory '%s' has no URL" -msgstr "Verzeichnis »%s« hat keine URL" +msgid "" +"A new directory appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was added by %s in r%ld and later deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:235 -#: ../libsvn_ra_local/ra_plugin.c:325 ../libsvn_wc/update_editor.c:4889 +#: ../libsvn_client/conflicts.c:5345 #, c-format msgid "" -"'%s'\n" -"is not the same repository as\n" -"'%s'" +"A new directory appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was added by %s in r%ld." msgstr "" -"»%s«\n" -"ist nicht das selbe Projektarchiv wie\n" -"»%s«" -#: ../libsvn_client/switch.c:240 +#: ../libsvn_client/conflicts.c:5351 #, c-format -msgid "'%s' shares no common ancestry with '%s'" -msgstr "»%s« hat keinen Vorgänger gemeinsam mit »%s«" +msgid "" +"A new directory appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/update.c:762 -msgid "None of the targets are working copies" -msgstr "Keines der Ziele ist eine Arbeitskopie" +#: ../libsvn_client/conflicts.c:5362 +#, c-format +msgid "" +"A new file appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was added by %s in r%ld and later deleted by %s in r%ld." +msgstr "" -#: ../libsvn_client/util.c:342 +#: ../libsvn_client/conflicts.c:5370 #, c-format -msgid "Cannot mix repository and working copy targets" -msgstr "Ziele aus dem Projektarchiv und einer Arbeitskopie können nicht gemischt werden" +msgid "" +"A new file appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was added by %s in r%ld." +msgstr "" -#: ../libsvn_delta/svndiff.c:436 +#: ../libsvn_client/conflicts.c:5377 #, c-format -msgid "Invalid diff stream: insn %d cannot be decoded" -msgstr "Ungültiger Diff-Strom: insn %d kann nicht dekodiert werden" +msgid "" +"A new file appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_delta/svndiff.c:440 +#: ../libsvn_client/conflicts.c:5388 #, c-format -msgid "Invalid diff stream: insn %d has length zero" -msgstr "Ungültiger Diff-Strom: insn %d hat Länge Null" +msgid "" +"A new item appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was added by %s in r%ld and later deleted by %s in r%ld." +msgstr "" -#: ../libsvn_delta/svndiff.c:444 +#: ../libsvn_client/conflicts.c:5396 #, c-format -msgid "Invalid diff stream: insn %d overflows the target view" -msgstr "Ungültiger Diff-Strom: insn %d läuft in die Zielansicht über" +msgid "" +"A new item appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was added by %s in r%ld." +msgstr "" -#: ../libsvn_delta/svndiff.c:453 +#: ../libsvn_client/conflicts.c:5403 #, c-format -msgid "Invalid diff stream: [src] insn %d overflows the source view" -msgstr "Ungültiger Diff-Strom: [Quelle] insn %d läuft in die Quellansicht über" +msgid "" +"A new item appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_delta/svndiff.c:460 +#: ../libsvn_client/conflicts.c:5424 #, c-format -msgid "Invalid diff stream: [tgt] insn %d starts beyond the target view position" -msgstr "Ungültiger Diff-Strom: [Ziel] insn %d startet hinter der Zielposition" +msgid "" +"A new directory appeared during merge of\n" +"'^/%s:%ld'.\n" +"It was added by %s in r%ld." +msgstr "" -#: ../libsvn_delta/svndiff.c:467 +#: ../libsvn_client/conflicts.c:5430 #, c-format -msgid "Invalid diff stream: [new] insn %d overflows the new data section" -msgstr "Ungültiger Diff-Strom: [Neu] insn %d läuft in die neue Datensektion über" +msgid "" +"A new directory appeared during merge of\n" +"'^/%s:%ld-%ld'.\n" +"It was added by %s in r%ld." +msgstr "" -#: ../libsvn_delta/svndiff.c:477 -msgid "Delta does not fill the target window" -msgstr "Delta füllt das Zielfenster nicht" +#: ../libsvn_client/conflicts.c:5440 +#, c-format +msgid "" +"A new file appeared during merge of\n" +"'^/%s:%ld'.\n" +"It was added by %s in r%ld." +msgstr "" -#: ../libsvn_delta/svndiff.c:480 -msgid "Delta does not contain enough new data" -msgstr "Delta enthält nicht genügend neue Daten" +#: ../libsvn_client/conflicts.c:5446 +#, c-format +msgid "" +"A new file appeared during merge of\n" +"'^/%s:%ld-%ld'.\n" +"It was added by %s in r%ld." +msgstr "" -#: ../libsvn_delta/svndiff.c:608 -msgid "Svndiff has invalid header" -msgstr "Svndiff-Daten enthalten ungültigen Kopf" +#: ../libsvn_client/conflicts.c:5455 +#, c-format +msgid "" +"A new item appeared during merge of\n" +"'^/%s:%ld'.\n" +"It was added by %s in r%ld." +msgstr "" -#: ../libsvn_delta/svndiff.c:664 ../libsvn_delta/svndiff.c:853 -msgid "Svndiff contains a too-large window" -msgstr "Svndiff-Daten enthalten ein zu großes Fenster" +#: ../libsvn_client/conflicts.c:5461 +#, c-format +msgid "" +"A new item appeared during merge of\n" +"'^/%s:%ld-%ld'.\n" +"It was added by %s in r%ld." +msgstr "" -#: ../libsvn_delta/svndiff.c:671 ../libsvn_delta/svndiff.c:860 -msgid "Svndiff contains corrupt window header" -msgstr "Svndiff-Daten enthalten defekte Fenster-Kopfdaten" +#: ../libsvn_client/conflicts.c:5481 +#, c-format +msgid "" +"A new directory appeared during reverse-merge of\n" +"'^/%s:%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_delta/svndiff.c:680 -msgid "Svndiff has backwards-sliding source views" -msgstr "Svndiff-Daten enthalten rückwärts gleitenden Blick auf Quellen" +#: ../libsvn_client/conflicts.c:5488 +#, c-format +msgid "" +"A new directory appeared during reverse-merge of\n" +"'^/%s:%ld-%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_delta/svndiff.c:737 ../libsvn_delta/svndiff.c:794 -#: ../libsvn_delta/svndiff.c:882 -msgid "Unexpected end of svndiff input" -msgstr "Unerwartetes Ende der Svndiff-Eingangsdaten" +#: ../libsvn_client/conflicts.c:5500 +#, c-format +msgid "" +"A new file appeared during reverse-merge of\n" +"'^/%s:%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_diff/diff_file.c:186 +#: ../libsvn_client/conflicts.c:5507 #, c-format -msgid "File '%s' is too large to be read in to memory" -msgstr "Datei »%s« ist zu groß um in den Speicher gelesen zu werden" +msgid "" +"A new file appeared during reverse-merge of\n" +"'^/%s:%ld-%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_diff/diff_file.c:1104 +#: ../libsvn_client/conflicts.c:5517 #, c-format -msgid "The file '%s' changed unexpectedly during diff" -msgstr "Die Datei »%s« veränderte sich unerwartet während des Vergleichs" +msgid "" +"A new item appeared during reverse-merge of\n" +"'^/%s:%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_diff/diff_file.c:1278 -msgid "Error in options to internal diff" -msgstr "Fehler in Optionen für internes Vergleichsprogramm" +#: ../libsvn_client/conflicts.c:5524 +#, c-format +msgid "" +"A new item appeared during reverse-merge of\n" +"'^/%s:%ld-%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" -#: ../libsvn_diff/diff_file.c:1307 +#: ../libsvn_client/conflicts.c:5835 #, c-format -msgid "Invalid argument '%s' in diff options" -msgstr "Ungültiges Argument »%s« in Vergleichsoptionen" +msgid "Changes destined for a directory arrived via the following revisions during update from r%ld to r%ld." +msgstr "" -#. Order of date components can be different in different languages -#: ../libsvn_diff/diff_file.c:1806 -msgid "%a %b %e %H:%M:%S %Y" -msgstr "%a %e. %b %H:%M:%S %Y" +#: ../libsvn_client/conflicts.c:5841 +#, c-format +msgid "Changes destined for a file arrived via the following revisions during update from r%ld to r%ld" +msgstr "" -#: ../libsvn_diff/diff_file.c:1887 ../libsvn_diff/diff_file.c:1903 +#: ../libsvn_client/conflicts.c:5846 #, c-format -msgid "Path '%s' must be inside the directory '%s'" -msgstr "Pfad »%s« muss innerhalb des Verzeichnisses »%s« sein" +msgid "Changes from the following revisions arrived during update from r%ld to r%ld" +msgstr "" -#: ../libsvn_diff/diff_file.c:2449 +#: ../libsvn_client/conflicts.c:5854 #, c-format -msgid "Failed to delete mmap '%s'" -msgstr "Konnte mmap »%s« nicht löschen" +msgid "Changes destined for a directory arrived via the following revisions during backwards update from r%ld to r%ld" +msgstr "" -#: ../libsvn_diff/util.c:477 +#: ../libsvn_client/conflicts.c:5861 #, c-format -msgid " Reverse-merged %s:r%s%s" -msgstr " Rückgängiges Zusammenführen: %s:r%s%s" +msgid "Changes destined for a file arrived via the following revisions during backwards update from r%ld to r%ld" +msgstr "" -#: ../libsvn_diff/util.c:494 +#: ../libsvn_client/conflicts.c:5867 #, c-format -msgid " Merged %s:r%s%s" -msgstr " Zusammengeführt %s:r%s%s" +msgid "Changes from the following revisions arrived during backwards update from r%ld to r%ld" +msgstr "" -#: ../libsvn_fs/editor.c:217 +#: ../libsvn_client/conflicts.c:5881 ../libsvn_client/conflicts.c:5888 #, c-format -msgid "Revision for modifying '%s' is required" -msgstr "Revision für Bearbeitung von »%s« erforderlich" +msgid "" +"Changes destined for a directory arrived via the following revisions during switch to\n" +"'^/%s@r%ld'" +msgstr "" -#: ../libsvn_fs/editor.c:226 +#: ../libsvn_client/conflicts.c:5894 #, c-format -msgid "'%s' is out of date; try updating" -msgstr "»%s« ist veraltet; versuchen Sie zu aktualisieren" +msgid "" +"Changes from the following revisions arrived during switch to\n" +"'^/%s@r%ld'" +msgstr "" -#: ../libsvn_fs/editor.c:258 +#: ../libsvn_client/conflicts.c:5937 ../libsvn_client/conflicts.c:5951 +#: ../libsvn_client/conflicts.c:5957 +#, fuzzy, c-format +msgid "%s r%ld by %s%s" +msgstr "%12s r%-8ld %s\n" + +#: ../libsvn_client/conflicts.c:5947 #, c-format -msgid "'%s' has been modified since the commit began (restart the commit)" -msgstr "»%s« wurde seit dem Beginn der Ãœbertragung verändert (Ãœbertragung neu starten)" +msgid "" +"%s\n" +" [%d revisions omitted for brevity],\n" +msgstr "" -#: ../libsvn_fs/editor.c:316 +#: ../libsvn_client/conflicts.c:6016 #, c-format -msgid "'%s' already exists, so may be out of date; try updating" -msgstr "»%s« existiert schon, kann also veraltet sein; versuchen Sie zu aktualisieren" +msgid "" +"Changes destined for a directory arrived during merge of\n" +"'^/%s:%ld'." +msgstr "" -#: ../libsvn_fs/editor.c:449 -msgid "The filesystem does not support 'absent' nodes" -msgstr "Das Dateisystem unterstützt keine »absent« Knoten" +#: ../libsvn_client/conflicts.c:6023 +#, c-format +msgid "" +"Changes destined for a file arrived during merge of\n" +"'^/%s:%ld'." +msgstr "" -#: ../libsvn_fs/fs-loader.c:139 +#: ../libsvn_client/conflicts.c:6029 #, c-format -msgid "Invalid name for FS type '%s'" -msgstr "Ungültiger Name für Dateisystemtyp »%s«" +msgid "" +"Changes arrived during merge of\n" +"'^/%s:%ld'." +msgstr "" -#: ../libsvn_fs/fs-loader.c:156 ../libsvn_ra/ra_loader.c:163 -#: ../libsvn_ra/ra_loader.c:176 +#: ../libsvn_client/conflicts.c:6041 #, c-format -msgid "'%s' does not define '%s()'" -msgstr "»%s« definiert »%s()« nicht" +msgid "" +"Changes destined for a directory arrived via the following revisions during merge of\n" +"'^/%s:%ld-%ld'" +msgstr "" -#: ../libsvn_fs/fs-loader.c:189 +#: ../libsvn_client/conflicts.c:6048 #, c-format -msgid "Failed to load module for FS type '%s'" -msgstr "Konnte Modul für Dateisystemtyp »%s« nicht laden" +msgid "" +"Changes destined for a file arrived via the following revisions during merge of\n" +"'^/%s:%ld-%ld'" +msgstr "" -#: ../libsvn_fs/fs-loader.c:210 +#: ../libsvn_client/conflicts.c:6054 #, c-format -msgid "Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" -msgstr "Versionen in Dateisystemmodul »%s« stimmen nicht überein: gefunden %d.%d.%d%s, erwartet %d.%d.%d%s" +msgid "" +"Changes from the following revisions arrived during merge of\n" +"'^/%s:%ld-%ld'" +msgstr "" -#: ../libsvn_fs/fs-loader.c:300 +#: ../libsvn_client/conflicts.c:6066 #, c-format -msgid "Unknown FS type '%s'" -msgstr "Unbekannter Dateisystemtyp »%s«" +msgid "" +"Changes destined for a directory arrived during reverse-merge of\n" +"'^/%s:%ld'." +msgstr "" -#: ../libsvn_fs/fs-loader.c:449 +#: ../libsvn_client/conflicts.c:6073 #, c-format -msgid "Path '%s' is not in UTF-8" -msgstr "Pfad »%s« ist kein UTF-8" +msgid "" +"Changes destined for a file arrived during reverse-merge of\n" +"'^/%s:%ld'." +msgstr "" -#: ../libsvn_fs/fs-loader.c:457 +#: ../libsvn_client/conflicts.c:6079 #, c-format -msgid "Path '%s' contains '.' or '..' element" -msgstr "Pfad »%s« enthält ein Element ».« oder »..«" +msgid "" +"Changes arrived during reverse-merge of\n" +"'^/%s:%ld'." +msgstr "" -#: ../libsvn_fs/fs-loader.c:469 ../libsvn_fs_fs/tree.c:2413 -#: ../libsvn_subr/path.c:1229 +#: ../libsvn_client/conflicts.c:6091 #, c-format -msgid "Invalid control character '0x%02x' in path '%s'" -msgstr "Ungültiges Steuerzeichen »0x%02x« in Pfad »%s«" +msgid "" +"Changes destined for a directory arrived via the following revisions during reverse-merge of\n" +"'^/%s:%ld-%ld'" +msgstr "" -#: ../libsvn_fs/fs-loader.c:654 ../libsvn_repos/repos.c:1976 -msgid "Hotcopy source and destination are equal" -msgstr "Quelle und Ziel für Kopie im laufenden Betrieb sind gleich" +#: ../libsvn_client/conflicts.c:6099 +#, c-format +msgid "" +"Changes destined for a file arrived via the following revisions during reverse-merge of\n" +"'^/%s:%ld-%ld'" +msgstr "" -#: ../libsvn_fs/fs-loader.c:664 +#: ../libsvn_client/conflicts.c:6107 #, c-format -msgid "'%s' already exists and is a file" -msgstr "»%s« existiert bereits und ist eine Datei" +msgid "" +"Changes from the following revisions arrived during reverse-merge of\n" +"'^/%s:%ld-%ld'" +msgstr "" + +#: ../libsvn_client/conflicts.c:6296 +#, fuzzy, c-format +msgid "Tree conflict on '%s' can only be resolved to the current working copy state" +msgstr "Baumkonflikt kann nur zum Zustand »working« aufgelöst werden; Konflikt in »%s« nicht aufgelöst" + +#: ../libsvn_client/conflicts.c:6480 ../libsvn_client/conflicts.c:6486 +#, fuzzy, c-format +msgid "Cannot resolve tree conflict on '%s' (expected a base node but found none)" +msgstr "Kann Baumkonflikt in »%s« nicht automatisch auflösen" -#: ../libsvn_fs/fs-loader.c:669 +#: ../libsvn_client/conflicts.c:6491 ../libsvn_client/conflicts.c:6517 +#: ../libsvn_client/conflicts.c:6544 ../libsvn_client/conflicts.c:6567 +#, fuzzy, c-format +msgid "Unexpected option id '%d'" +msgstr "Unerwartete Knotenart %d für »%s«" + +#: ../libsvn_client/conflicts.c:6500 ../libsvn_client/conflicts.c:6509 #, c-format -msgid "'%s' already exists and has an unknown node kind" -msgstr "»%s« existiert bereits und hat einen unbekannten Knotentyp" +msgid "Cannot resolve tree conflict on '%s' (expected base node kind '%s', but found '%s')" +msgstr "" -#: ../libsvn_fs/fs-loader.c:687 +#: ../libsvn_client/conflicts.c:6525 ../libsvn_client/conflicts.c:6535 #, c-format -msgid "The filesystem type of the hotcopy source ('%s') does not match the filesystem type of the hotcopy destination ('%s')" -msgstr "Der Dateisystemtyp der Quelle für die Kopie im laufenden Betrieb (»%s«) stimmt nicht mit dem Dateisystemtyp des Ziels der Kopie im laufenden Betrieb (»%s«) überein" +msgid "Cannot resolve tree conflict on '%s' (expected base node from '^/%s@%ld', but found '^/%s@%ld')" +msgstr "" -#: ../libsvn_fs/fs-loader.c:958 ../libsvn_fs/fs-loader.c:976 +#: ../libsvn_client/conflicts.c:6553 ../libsvn_client/conflicts.c:6561 #, c-format -msgid "Attempt to modify internal transaction property '%s'" -msgstr "Versuch, eine interne Transaktionseigenschaft »%s« zu schreiben" +msgid "Cannot resolve tree conflict on '%s' (expected an added item, but the item is not added)" +msgstr "" -#: ../libsvn_fs/fs-loader.c:1605 +#: ../libsvn_client/conflicts.c:6732 ../libsvn_client/conflicts.c:8547 #, c-format -msgid "Malformed UUID '%s'" -msgstr "Fehlerhafte UUID »%s«" +msgid "If needed, a backup copy of '%s' can be found at '%s'" +msgstr "" -#: ../libsvn_fs/fs-loader.c:1634 -msgid "Negative expiration date passed to svn_fs_lock" -msgstr "Negatives Ablaufdatum an svn_fs_lock übergeben" +#: ../libsvn_client/conflicts.c:7595 +#, c-format +msgid "Conflict resolution option '%d' requires details for tree conflict at '%s' to be fetched from the repository" +msgstr "" -#: ../libsvn_fs/fs-loader.c:1649 +#: ../libsvn_client/conflicts.c:7619 #, c-format -msgid "Lock token URI '%s' has bad scheme; expected '%s'" -msgstr "URI der Sperrmarke »%s« hat fehlerhaften Schema, erwartete »%s«" +msgid "Could not determine when '%s' was added the repository" +msgstr "" -#: ../libsvn_fs/fs-loader.c:1659 +#: ../libsvn_client/conflicts.c:7634 #, c-format -msgid "Lock token '%s' is not ASCII or is a control character at byte %u" -msgstr "Sperrmarke »%s« besteht nicht aus ASCII oder hat ein Steuerzeichen bei Byte %u" +msgid "Could not determine when '%s' was deleted from the repository" +msgstr "" -#: ../libsvn_fs/fs-loader.c:1669 +#: ../libsvn_client/conflicts.c:7923 #, c-format -msgid "Lock token URI '%s' is not XML-safe" -msgstr "URI der Sperrmarke »%s« ist nicht sicher für XML" +msgid "Could not determine the revision in which '^/%s' was added to the repository.\n" +msgstr "" -#: ../libsvn_fs_base/bdb/bdb-err.c:104 +#: ../libsvn_client/conflicts.c:8027 #, c-format -msgid "Berkeley DB error for filesystem '%s' while %s:\n" -msgstr "Berkeley-DB-Fehler für Dateisystem »%s« während %s:\n" +msgid "Conflict resolution option '%d' requires details for tree conflict at '%s' to be fetched from the repository." +msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:94 -msgid "creating change" -msgstr "Erzeuge Änderungen" +#: ../libsvn_client/conflicts.c:8044 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected a copied item, but the item is not a copy)" +msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:118 -msgid "deleting changes" -msgstr "Lösche Änderungen" +#: ../libsvn_client/conflicts.c:8055 +#, c-format +msgid "Could not find the revision in which '%s' was deleted from the repository" +msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:170 ../libsvn_fs_fs/transaction.c:665 -#: ../libsvn_fs_x/transaction.c:941 -msgid "Missing required node revision ID" -msgstr "Für den Knoten fehlt eine erforderliche Revisions ID" +#: ../libsvn_client/conflicts.c:8065 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected an item copied from a revision smaller than r%ld, but the item was copied from r%ld)" +msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:181 ../libsvn_fs_fs/transaction.c:675 -#: ../libsvn_fs_x/transaction.c:951 -msgid "Invalid change ordering: new node revision ID without delete" -msgstr "Ungültige Reihenfolge bei Änderung: Neue Knoten Revisions ID ohne Löschen" +#: ../libsvn_client/conflicts.c:8078 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected an item copied from a revision larger than r%ld, but the item was copied from r%ld)" +msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:191 ../libsvn_fs_fs/transaction.c:686 -#: ../libsvn_fs_x/transaction.c:962 -msgid "Invalid change ordering: non-add change on deleted path" -msgstr "Ungültige Reihenfolge bei Änderung: Nicht-hinzufügende Änderung auf gelöschtem Pfad" +#: ../libsvn_client/conflicts.c:8097 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected an item copied from '^/%s' or from '^/%s' but the item was copied from '^/%s@%ld')" +msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:200 ../libsvn_fs_fs/transaction.c:695 -#: ../libsvn_fs_x/transaction.c:971 -msgid "Invalid change ordering: add change on preexisting path" -msgstr "Ungültige Reihenfolge bei Änderung: Hinzufügende Änderung auf schon vorhandenem Pfad" +#: ../libsvn_client/conflicts.c:8119 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected an item copied from '^/%s', but the item was copied from '^/%s@%ld')" +msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:296 -#: ../libsvn_fs_base/bdb/changes-table.c:420 -msgid "creating cursor for reading changes" -msgstr "Erzeuge Cursor zum Lesen der Änderungen" +#: ../libsvn_client/conflicts.c:8144 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected node kind '%s' but found '%s')" +msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:321 -#: ../libsvn_fs_base/bdb/changes-table.c:441 +#: ../libsvn_client/conflicts.c:8311 ../libsvn_client/conflicts.c:8594 #, c-format -msgid "Error reading changes for key '%s'" -msgstr "Fehler beim Lesen der Änderungen für Schlüssel »%s«" +msgid "The specified conflict resolution option requires details for tree conflict at '%s' to be fetched from the repository first." +msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:381 -#: ../libsvn_fs_base/bdb/changes-table.c:464 -msgid "fetching changes" -msgstr "Hole Änderungen" +#: ../libsvn_client/conflicts.c:8318 +#, fuzzy, c-format +msgid "Invalid operation code '%d' recorded for conflict at '%s'" +msgstr "Ungültiges Feld »operation« in Baumkonfliktbeschreibung" -#: ../libsvn_fs_base/bdb/changes-table.c:394 -#: ../libsvn_fs_base/bdb/changes-table.c:477 -msgid "closing changes cursor" -msgstr "Schließe Änderungscursor" +#: ../libsvn_client/conflicts.c:8655 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected a copied item at '%s', but the item is not a copy)" +msgstr "" -#: ../libsvn_fs_base/bdb/checksum-reps-table.c:87 -#: ../libsvn_fs_base/bdb/checksum-reps-table.c:116 -#: ../libsvn_fs_base/bdb/checksum-reps-table.c:159 -msgid "Only SHA1 checksums can be used as keys in the checksum-reps table.\n" -msgstr "Nur SHA1-Prüfsummen können als Schlüssel in der Tabelle checksum-reps verwendet werden.\n" +#: ../libsvn_client/conflicts.c:8668 +#, fuzzy, c-format +msgid "Cannot resolve tree conflict on '%s' (could not determine origin of '%s')" +msgstr "Kann Baumkonflikt in »%s« nicht automatisch auflösen" -#: ../libsvn_fs_base/bdb/checksum-reps-table.c:135 +#: ../libsvn_client/conflicts.c:8688 #, c-format -msgid "Representation key for checksum '%s' exists in filesystem '%s'." -msgstr "Repräsentationsschlüssel für Prüfsumme »%s« existiert im Dateisystem »%s«." +msgid "Cannot resolve tree conflict on '%s' (could not find common ancestor of '^/%s@%ld' and '^/%s@%ld')" +msgstr "" -#: ../libsvn_fs_base/bdb/checksum-reps-table.c:142 -msgid "storing checksum-reps record" -msgstr "Speichere »checksum-reps«-Datensatz" +#: ../libsvn_client/conflicts.c:9044 ../libsvn_client/conflicts.c:9127 +#: ../libsvn_client/conflicts.c:10293 +#, fuzzy +msgid "Postpone" +msgstr "später auflösen" -#: ../libsvn_fs_base/bdb/checksum-reps-table.c:164 -msgid "deleting entry from 'checksum-reps' table" -msgstr "Lösche Eintrag aus »checksum-reps« Tabelle" +#: ../libsvn_client/conflicts.c:9045 ../libsvn_client/conflicts.c:9128 +#: ../libsvn_client/conflicts.c:10294 +msgid "skip this conflict and leave it unresolved" +msgstr "" -#: ../libsvn_fs_base/bdb/checksum-reps-table.c:186 -msgid "allocating new representation reuse ID (getting 'next-key')" -msgstr "Allokiere neuen Wiederverwendungsschlüssel für Darstellung (hole »next-key«)" +#: ../libsvn_client/conflicts.c:9054 ../libsvn_client/conflicts.c:9075 +#: ../libsvn_client/conflicts.c:9133 +msgid "Accept base" +msgstr "" -#: ../libsvn_fs_base/bdb/checksum-reps-table.c:207 -msgid "bumping next representation reuse ID" -msgstr "Erzeuge nächsten Wiederverwendungsschlüssel für Darstellung" +#: ../libsvn_client/conflicts.c:9055 +msgid "discard local and incoming changes for this binary file" +msgstr "" -#: ../libsvn_fs_base/bdb/copies-table.c:92 -msgid "storing copy record" -msgstr "Speichere Kopiedatensatz" +#: ../libsvn_client/conflicts.c:9060 ../libsvn_client/conflicts.c:9081 +#: ../libsvn_client/conflicts.c:9139 +#, fuzzy +msgid "Accept incoming" +msgstr "eingehendes %s" -#: ../libsvn_fs_base/bdb/copies-table.c:115 -msgid "allocating new copy ID (getting 'next-key')" -msgstr "Allokiere neuen Kopieschlüssel (hole »next-key«)" +#: ../libsvn_client/conflicts.c:9061 +#, fuzzy +msgid "accept incoming version of binary file" +msgstr "Akzeptiert fremde Version der Datei [theirs-full]" -#: ../libsvn_fs_base/bdb/copies-table.c:133 -msgid "bumping next copy key" -msgstr "Erzeuge nächsten Kopieschlüssel" +#: ../libsvn_client/conflicts.c:9066 ../libsvn_client/conflicts.c:9105 +#: ../libsvn_client/conflicts.c:9145 ../libsvn_client/conflicts.c:9202 +#, fuzzy +msgid "Mark as resolved" +msgstr "als aufgelöst markieren" -#: ../libsvn_fs_base/bdb/copies-table.c:171 -msgid "deleting entry from 'copies' table" -msgstr "Lösche Eintrag aus »copies« Tabelle" +#: ../libsvn_client/conflicts.c:9067 +#, fuzzy +msgid "accept binary file as it appears in the working copy" +msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten" -#: ../libsvn_fs_base/bdb/copies-table.c:199 -msgid "reading copy" -msgstr "lese Kopie" +#: ../libsvn_client/conflicts.c:9076 +msgid "discard local and incoming changes for this file" +msgstr "" -#: ../libsvn_fs_base/bdb/lock-tokens-table.c:87 -msgid "storing lock token record" -msgstr "Speichere Datensatz für Sperrmarke" +#: ../libsvn_client/conflicts.c:9082 +#, fuzzy +msgid "accept incoming version of entire file" +msgstr "Akzeptiert fremde Version der Datei [theirs-full]" -#: ../libsvn_fs_base/bdb/lock-tokens-table.c:108 -msgid "deleting entry from 'lock-tokens' table" -msgstr "Lösche Eintrag aus »lock-tokens« Tabelle" +#: ../libsvn_client/conflicts.c:9087 +#, fuzzy +msgid "Reject incoming" +msgstr "eingehendes %s" -#: ../libsvn_fs_base/bdb/lock-tokens-table.c:135 -msgid "reading lock token" -msgstr "Lese Sperrmarke" +#: ../libsvn_client/conflicts.c:9088 +#, fuzzy +msgid "reject all incoming changes for this file" +msgstr "Bevorzugt empfangene Änderungen " -#: ../libsvn_fs_base/bdb/locks-table.c:93 -msgid "storing lock record" -msgstr "Speichere Datensatz für Sperre" +#: ../libsvn_client/conflicts.c:9093 ../libsvn_client/conflicts.c:9151 +msgid "Accept incoming for conflicts" +msgstr "" -#: ../libsvn_fs_base/bdb/locks-table.c:116 -msgid "deleting lock from 'locks' table" -msgstr "Lösche Sperre aus »locks« Tabelle" +#: ../libsvn_client/conflicts.c:9094 +msgid "accept changes only where they conflict" +msgstr "" -#: ../libsvn_fs_base/bdb/locks-table.c:143 -msgid "reading lock" -msgstr "Lese Sperre" +#: ../libsvn_client/conflicts.c:9099 ../libsvn_client/conflicts.c:9157 +#, fuzzy +msgid "Reject conflicts" +msgstr "Baumkonflikt" -#: ../libsvn_fs_base/bdb/locks-table.c:246 -msgid "creating cursor for reading lock tokens" -msgstr "Erzeuge Cursor zum Lesen der Sperrmarken" +#: ../libsvn_client/conflicts.c:9100 ../libsvn_client/conflicts.c:9158 +msgid "reject changes which conflict and accept the rest" +msgstr "" -#: ../libsvn_fs_base/bdb/locks-table.c:321 -msgid "fetching lock tokens" -msgstr "Lese Sperrmarken" +#: ../libsvn_client/conflicts.c:9106 +#, fuzzy +msgid "accept the file as it appears in the working copy" +msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten" -#: ../libsvn_fs_base/bdb/locks-table.c:323 -msgid "fetching lock tokens (closing cursor)" -msgstr "Lese Sperrmarken (schließe Cursor)" +#: ../libsvn_client/conflicts.c:9134 +msgid "discard local and incoming changes for this property" +msgstr "" -#: ../libsvn_fs_base/bdb/miscellaneous-table.c:95 -msgid "deleting record from 'miscellaneous' table" -msgstr "Lösche Eintrag aus »miscellaneous« Tabelle" +#: ../libsvn_client/conflicts.c:9140 +#, fuzzy +msgid "accept incoming version of entire property value" +msgstr "Akzeptiert fremde Version für ganze Eigenschaft (ebenso) [theirs-full]" -#: ../libsvn_fs_base/bdb/miscellaneous-table.c:103 -msgid "storing miscellaneous record" -msgstr "Speichere »miscellaneous« Datensatz" +#: ../libsvn_client/conflicts.c:9146 +#, fuzzy +msgid "accept working copy version of entire property value" +msgstr "Akzeptiert die Arbeitskopieversion der Datei [working]" -#: ../libsvn_fs_base/bdb/miscellaneous-table.c:131 -msgid "fetching miscellaneous record" -msgstr "Lese »miscellaneous« Datensatz" +#: ../libsvn_client/conflicts.c:9152 +msgid "accept incoming changes only where they conflict" +msgstr "" -#: ../libsvn_fs_base/bdb/node-origins-table.c:117 -#, c-format -msgid "Node origin for '%s' exists in filesystem '%s' with a different value (%s) than what we were about to store (%s)" -msgstr "Knotenursprung für »%s« existiert im Dateisystem »%s« mit einem anderen Wert (%s) als der, der gespeichert werden soll (%s)" +#: ../libsvn_client/conflicts.c:9163 +#, fuzzy +msgid "Accept merged" +msgstr "Zusammenführungsinformationen sind leer\n" -#: ../libsvn_fs_base/bdb/node-origins-table.c:127 -msgid "storing node-origins record" -msgstr "Speichere Knotenherkunftdatensatz" +#: ../libsvn_client/conflicts.c:9164 +#, fuzzy +msgid "accept merged version of property value" +msgstr "Akzeptiert die bearbeitete Version der Eigenschaft" -#: ../libsvn_fs_base/bdb/node-origins-table.c:142 -msgid "deleting entry from 'node-origins' table" -msgstr "Lösche Eintrag aus »node-origins« Tabelle" +#: ../libsvn_client/conflicts.c:9203 +msgid "accept current working copy state" +msgstr "Akzeptiert aktuellen Zustand in der Arbeitskopie" -#: ../libsvn_fs_base/bdb/nodes-table.c:102 -msgid "allocating new node ID (getting 'next-key')" -msgstr "Allokiere neue Knoten-ID (hole »next-key«)" +#: ../libsvn_client/conflicts.c:9230 +#, fuzzy +msgid "Update move destination" +msgstr "Wendet die Aktualisierung auf das verschobene Ziel an (empfohlen)" -#: ../libsvn_fs_base/bdb/nodes-table.c:120 -msgid "bumping next node ID key" -msgstr "Erzeuge nächste Knoten-ID" +#: ../libsvn_client/conflicts.c:9231 +#, fuzzy +msgid "apply incoming changes to move destination" +msgstr "Wendet empfangene Aktualisierung auf das verschobene Ziel an [mine-conflict]" -#: ../libsvn_fs_base/bdb/nodes-table.c:156 -#, c-format -msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'" -msgstr "Nachfolger ID »%s« (für »%s«) existiert bereits in Dateisystem »%s«" +#: ../libsvn_client/conflicts.c:9265 +msgid "Update any moved-away children" +msgstr "" -#: ../libsvn_fs_base/bdb/nodes-table.c:182 -msgid "deleting entry from 'nodes' table" -msgstr "Lösche Eintrag aus »nodes« Tabelle" +#: ../libsvn_client/conflicts.c:9266 +#, fuzzy +msgid "prepare for updating moved-away children, if any" +msgstr "Bereitet die Aktualisierung von ggf. verschobenen Kindelementen vor (empfohlen)" -#. Handle any other error conditions. -#: ../libsvn_fs_base/bdb/nodes-table.c:220 -msgid "reading node revision" -msgstr "Lese Knotenrevision" +#: ../libsvn_client/conflicts.c:9311 +#, c-format +msgid "ignore and do not add '^/%s@%ld' here" +msgstr "" -#: ../libsvn_fs_base/bdb/nodes-table.c:253 -msgid "storing node revision" -msgstr "Speichere Knotenrevision" +#: ../libsvn_client/conflicts.c:9319 +#, c-format +msgid "replace '^/%s@%ld' with the locally added file" +msgstr "" -#: ../libsvn_fs_base/bdb/reps-table.c:98 -#: ../libsvn_fs_base/bdb/reps-table.c:200 +#: ../libsvn_client/conflicts.c:9324 #, c-format -msgid "No such representation '%s'" -msgstr "Eine solche Darstellung »%s« existiert nicht" +msgid "replace '^/%s@%ld' with the locally added directory" +msgstr "" -#. Handle any other error conditions. -#: ../libsvn_fs_base/bdb/reps-table.c:101 -msgid "reading representation" -msgstr "Lese Darstellung" +#: ../libsvn_client/conflicts.c:9330 +#, c-format +msgid "replace '^/%s@%ld' with the locally added item" +msgstr "" -#: ../libsvn_fs_base/bdb/reps-table.c:128 -msgid "storing representation" -msgstr "Speichere Darstellung" +#: ../libsvn_client/conflicts.c:9335 +#, fuzzy, c-format +msgid "unexpected operation code '%d'" +msgstr "Unerwartete Knotenart %d für »%s«" -#: ../libsvn_fs_base/bdb/reps-table.c:156 -msgid "allocating new representation (getting next-key)" -msgstr "Allokiere neuen Darstellungsschlüssel (hole »next-key«)" +#: ../libsvn_client/conflicts.c:9339 +#, fuzzy +msgid "Ignore incoming addition" +msgstr "eingehendes Hinzufügen" -#: ../libsvn_fs_base/bdb/reps-table.c:177 -msgid "bumping next representation key" -msgstr "Erzeuge nächsten Darstellungsschlüssel" +#: ../libsvn_client/conflicts.c:9385 ../libsvn_client/conflicts.c:9510 +#, fuzzy, c-format +msgid "merge '^/%s@%ld' into '%s'" +msgstr "-- Zusammenführen von r%ld in »%s«:\n" -#. Handle any other error conditions. -#: ../libsvn_fs_base/bdb/reps-table.c:203 -msgid "deleting representation" -msgstr "Lösche Darstellung" +#: ../libsvn_client/conflicts.c:9393 ../libsvn_client/conflicts.c:9518 +#, fuzzy, c-format +msgid "merge local '%s' and '^/%s@%ld'" +msgstr "Fehler beim Vergleichen von »%s« und »%s«" -#. Handle any other error conditions. -#: ../libsvn_fs_base/bdb/rev-table.c:98 -msgid "reading filesystem revision" -msgstr "Lese Dateisystemrevision" +#: ../libsvn_client/conflicts.c:9403 +#, fuzzy +msgid "Merge the files" +msgstr "Tiefe: »files«\n" -#: ../libsvn_fs_base/bdb/rev-table.c:144 -msgid "updating filesystem revision" -msgstr "Aktualisiere Dateisystemrevision" +#: ../libsvn_client/conflicts.c:9452 +#, c-format +msgid "delete '%s', copy '^/%s@%ld' here, and merge the files" +msgstr "" -#: ../libsvn_fs_base/bdb/rev-table.c:152 -msgid "storing filesystem revision" -msgstr "Speichere Dateisystemrevision" +#: ../libsvn_client/conflicts.c:9462 ../libsvn_client/conflicts.c:9640 +msgid "Replace and merge" +msgstr "" -#: ../libsvn_fs_base/bdb/rev-table.c:182 -msgid "getting youngest revision (creating cursor)" -msgstr "Hole neueste Revision (erzeuge Cursor)" +#: ../libsvn_client/conflicts.c:9527 +#, fuzzy +msgid "Merge the directories" +msgstr "Zwischenverzeichnisse erzeugen" -#: ../libsvn_fs_base/bdb/rev-table.c:206 -msgid "getting youngest revision (finding last entry)" -msgstr "Hole neueste Revision (finde letzten Eintrag)" +#: ../libsvn_client/conflicts.c:9574 +#, c-format +msgid "delete '%s' and copy '^/%s@%ld' here" +msgstr "" -#. You can't commit a transaction with open cursors, because: -#. 1) key/value pairs don't get deleted until the cursors referring -#. to them are closed, so closing a cursor can fail for various -#. reasons, and txn_commit shouldn't fail that way, and -#. 2) using a cursor after committing its transaction can cause -#. undetectable database corruption. -#: ../libsvn_fs_base/bdb/rev-table.c:216 -msgid "getting youngest revision (closing cursor)" -msgstr "Hole neueste Revision (schließe Cursor)" +# FIXME: inkonsistent zu obigen Meldungen: open_directory statt opening a directory +# (Wird Bezug zu Elementen in Dump hergestellt oder nicht?) +#: ../libsvn_client/conflicts.c:9583 +#, fuzzy +msgid "Delete my directory and replace it with incoming directory" +msgstr "Fand Element »close-directory« ohne vorhergehendes Öffnen eines Verzeichnisses" -#: ../libsvn_fs_base/bdb/strings-table.c:94 -#: ../libsvn_fs_base/bdb/strings-table.c:300 -#: ../libsvn_fs_base/bdb/strings-table.c:491 -msgid "creating cursor for reading a string" -msgstr "Erzeuge Cursor zum Lesen von Zeichenketten" +#: ../libsvn_client/conflicts.c:9630 +#, c-format +msgid "delete '%s', copy '^/%s@%ld' here, and merge the directories" +msgstr "" -#: ../libsvn_fs_base/bdb/strings-table.c:124 -msgid "moving cursor" -msgstr "Verschiebe Cursor" +#: ../libsvn_client/conflicts.c:9710 +#, c-format +msgid "ignore the deletion of '^/%s@%ld'" +msgstr "" -#: ../libsvn_fs_base/bdb/strings-table.c:136 -msgid "rerunning cursor move" -msgstr "Führe Verschiebung des Cursors erneut aus" +#: ../libsvn_client/conflicts.c:9715 +#, fuzzy +msgid "Ignore incoming deletion" +msgstr "eingehendes Löschen" -#: ../libsvn_fs_base/bdb/strings-table.c:228 -#: ../libsvn_fs_base/bdb/strings-table.c:247 -#: ../libsvn_fs_base/bdb/strings-table.c:265 -msgid "reading string" -msgstr "Lese Zeichenkette" +#: ../libsvn_client/conflicts.c:9768 +#, fuzzy, c-format +msgid "accept the deletion of '%s'" +msgstr "Konnte mmap »%s« nicht löschen" -#. Done with the cursor. -#: ../libsvn_fs_base/bdb/strings-table.c:254 -#: ../libsvn_fs_base/bdb/strings-table.c:334 -#: ../libsvn_fs_base/bdb/strings-table.c:539 -msgid "closing string-reading cursor" -msgstr "Schließe Cursor zum Lesen von Zeichenketten" +#: ../libsvn_client/conflicts.c:9775 +#, fuzzy +msgid "Accept incoming deletion" +msgstr "eingehendes Löschen" -#: ../libsvn_fs_base/bdb/strings-table.c:313 -#: ../libsvn_fs_base/bdb/strings-table.c:505 -msgid "getting next-key value" -msgstr "Hole Wert »next-key«" - -#. ignore the error, the original is -#. more important. -#: ../libsvn_fs_base/bdb/strings-table.c:331 -msgid "bumping next string key" -msgstr "Erzeuge nächsten Zeichenkettenschlüssel" - -#: ../libsvn_fs_base/bdb/strings-table.c:358 -msgid "appending string" -msgstr "Füge an Zeichenkette an" - -#. Handle any other error conditions. -#: ../libsvn_fs_base/bdb/strings-table.c:390 -msgid "clearing string" -msgstr "Lösche Zeichenkette" - -#: ../libsvn_fs_base/bdb/strings-table.c:399 -msgid "storing empty contents" -msgstr "Speichere leere Inhalte" - -#: ../libsvn_fs_base/bdb/strings-table.c:436 -msgid "fetching string length" -msgstr "Ermittle Länge der Zeichenkette" - -#. Handle any other error conditions. -#: ../libsvn_fs_base/bdb/strings-table.c:466 -msgid "deleting string" -msgstr "Lösche Zeichenkette" - -#: ../libsvn_fs_base/bdb/strings-table.c:524 -msgid "writing copied data" -msgstr "Schreibe kopiete Daten" - -#: ../libsvn_fs_base/bdb/strings-table.c:535 -msgid "fetching string data for a copy" -msgstr "Hole Zeichenkettendaten für eine Kopie" +#: ../libsvn_client/conflicts.c:9814 +#, fuzzy, c-format +msgid "move '%s' to '%s' and merge" +msgstr "Kann »%s« nicht nach »%s« verschieben" -#: ../libsvn_fs_base/bdb/txn-table.c:99 -msgid "storing transaction record" -msgstr "Speichere Transaktionsdatensatz" +#: ../libsvn_client/conflicts.c:9824 +#, fuzzy, c-format +msgid "move and merge local changes from '%s' into '%s'" +msgstr "Kann keinen Zeichenkonverter von »%s« nach »%s« erzeugen" -#: ../libsvn_fs_base/bdb/txn-table.c:123 -msgid "allocating new transaction ID (getting 'next-key')" -msgstr "Allokiere neue Transaktions-ID (hole »next-key«)" +#: ../libsvn_client/conflicts.c:9885 ../libsvn_client/conflicts.c:9945 +#, fuzzy +msgid "Move and merge" +msgstr "bei Zusammenführung" -#: ../libsvn_fs_base/bdb/txn-table.c:142 -msgid "bumping next transaction key" -msgstr "Erzeuge nächsten Transaktionsschlüssel" +#: ../libsvn_client/conflicts.c:10029 +#, fuzzy, c-format +msgid "apply changes to move destination '%s'" +msgstr "Wendet die Aktualisierung auf das verschobene Ziel an (empfohlen)" -#: ../libsvn_fs_base/bdb/txn-table.c:188 -msgid "deleting entry from 'transactions' table" -msgstr "Lösche Eintrag aus Tabelle »transactions«" +#: ../libsvn_client/conflicts.c:10038 +#, fuzzy +msgid "Apply to move destination" +msgstr "Wendet die Aktualisierung auf das verschobene Ziel an (empfohlen)" -#: ../libsvn_fs_base/bdb/txn-table.c:218 -msgid "reading transaction" -msgstr "Lese Transaktion" +#: ../libsvn_client/conflicts.c:10071 ../libsvn_client/conflicts.c:10199 +#, c-format +msgid "Getting a list of possible move targets requires details for tree conflict at '%s' to be fetched from the repository first" +msgstr "" -#: ../libsvn_fs_base/bdb/txn-table.c:251 -msgid "reading transaction list (opening cursor)" -msgstr "Lese Transaktionsliste (öffne Cursor)" +#: ../libsvn_client/conflicts.c:10124 ../libsvn_client/conflicts.c:10247 +#, c-format +msgid "Setting a move target requires details for tree conflict at '%s' to be fetched from the repository first" +msgstr "" -#: ../libsvn_fs_base/bdb/txn-table.c:314 -msgid "reading transaction list (listing keys)" -msgstr "Lese Transaktionsliste (Schlüssel auflisten)" +#: ../libsvn_client/conflicts.c:10133 ../libsvn_client/conflicts.c:10260 +#, c-format +msgid "Index '%d' is out of bounds of the possible move target list for '%s'" +msgstr "" -#: ../libsvn_fs_base/bdb/txn-table.c:317 -msgid "reading transaction list (closing cursor)" -msgstr "Lese Transaktionsliste (schließe Cursor)" +#: ../libsvn_client/conflicts.c:10170 +#, fuzzy, c-format +msgid "Repository path '%s' not found in list of possible move targets for '%s'" +msgstr "Projektverzeichnis »%s« nicht in der Datenbank gefunden" -#: ../libsvn_fs_base/bdb/uuids-table.c:119 -msgid "get repository uuid" -msgstr "Hole UUID des Projektarchivs" +#: ../libsvn_client/conflicts.c:10477 ../libsvn_client/conflicts.c:10526 +#: ../libsvn_client/conflicts.c:10579 +#, c-format +msgid "Inapplicable conflict resolution option given for conflicted path '%s'" +msgstr "" -#: ../libsvn_fs_base/bdb/uuids-table.c:147 -msgid "set repository uuid" -msgstr "Setze UUID des Projektarchivs" +#: ../libsvn_client/conflicts.c:10799 +#, fuzzy, c-format +msgid "Property '%s' is not in conflict." +msgstr "»%s« ist nicht von einem Konflikt betroffen" -#: ../libsvn_fs_base/dag.c:228 +#: ../libsvn_client/conflicts.c:11189 ../libsvn_wc/conflicts.c:3327 #, c-format -msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'" -msgstr "DB beschädigt: Erste Transaktion ist nicht »0« in Dateisystem »%s«" +msgid "Unable to resolve pending conflict on '%s'" +msgstr "Kann ausstehenden Konflikt in »%s« nicht auflösen" -#: ../libsvn_fs_base/dag.c:236 +#: ../libsvn_client/copy.c:295 #, c-format -msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'" -msgstr "DB beschädigt: Erste Kopie ist nicht »0« in Dateisystem »%s«" +msgid "%s property defined at '%s' is using an unsupported syntax" +msgstr "Eigenschaft %s definiert auf »%s« verwendet einen nicht unterstützen Syntax" -#: ../libsvn_fs_base/dag.c:245 +#: ../libsvn_client/copy.c:460 #, c-format -msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'" -msgstr "DB beschädigt: Erste Revision ist nicht »0« in Dateisystem »%s«" +msgid "Cannot pin external '%s' defined in %s at '%s' because it is not checked out in the working copy at '%s'" +msgstr "Kann externen Verweis »%s« definiert durch Eigenschaft »%s« von »%s« nicht auf eine Revision festlegen, da er in der Arbeitskopie »%s« nicht ausgecheckt ist" -#: ../libsvn_fs_base/dag.c:294 -msgid "Attempted to get entries of a non-directory node" -msgstr "Versuchte, Einträge eines *nicht* Verzeichnisknotens zu holen" +#: ../libsvn_client/copy.c:485 +#, c-format +msgid "Cannot pin external '%s' defined in %s at '%s' because '%s' has switched subtrees (switches cannot be represented in %s)" +msgstr "Kann externen Verweis »%s« definiert durch Eigenschaft »%s« von »%s« nicht auf eine Revision festlegen, da »%s« umgestellte Unterbäume enthält (Umstellungen können in »%s« nicht abgebildet werden)" -#: ../libsvn_fs_base/dag.c:461 ../libsvn_fs_fs/dag.c:377 -#: ../libsvn_fs_x/dag.c:448 +#: ../libsvn_client/copy.c:504 #, c-format -msgid "Attempted to create a node with an illegal name '%s'" -msgstr "Versuchte, Knoten mit illegalem Namen »%s« anzulegen" +msgid "Cannot pin external '%s' defined in %s at '%s' because '%s' has local modifications (local modifications cannot be represented in %s)" +msgstr "Kann externen Verweis »%s« definiert durch Eigenschaft »%s« von »%s« nicht auf eine Revision festlegen, da »%s« lokale Änderungen enthält (lokale Änderungen können in »%s« nicht abgebildet werden)" -#: ../libsvn_fs_base/dag.c:467 ../libsvn_fs_fs/dag.c:383 -#: ../libsvn_fs_x/dag.c:454 -msgid "Attempted to create entry in non-directory parent" -msgstr "Versuchte, Eintrag in einem *nicht* Verzeichnisknoten anzulegen" +#: ../libsvn_client/copy.c:522 +#, c-format +msgid "Cannot pin external '%s' defined in %s at '%s' because '%s' is a mixed-revision working copy (mixed-revisions cannot be represented in %s)" +msgstr "Kann externen Verweis »%s« definiert durch Eigenschaft »%s« von »%s« nicht auf eine Revision festlegen, da »%s« eine Arbeitskopie mit verschiedenen Revisionen ist (verschiedene Revisionen können in »%s« nicht abgebildet werden)" -#: ../libsvn_fs_base/dag.c:473 ../libsvn_fs_base/dag.c:737 -#: ../libsvn_fs_fs/dag.c:389 ../libsvn_fs_x/dag.c:460 +#: ../libsvn_client/copy.c:985 #, c-format -msgid "Attempted to clone child of non-mutable node" -msgstr "Versuchte, Unterknoten eines nicht-veränderlichen Knotens zu klonen" +msgid "Path '%s' exists, but is excluded" +msgstr "Pfad »%s« existiert, ist aber ausgeschlossen" -#: ../libsvn_fs_base/dag.c:480 +#: ../libsvn_client/copy.c:991 ../libsvn_client/copy.c:1715 +#: ../libsvn_client/copy.c:2090 ../libsvn_client/copy.c:2732 +#: ../libsvn_client/import.c:911 ../libsvn_client/mtcc.c:456 +#: ../libsvn_client/mtcc.c:473 ../libsvn_ra_serf/util.c:1900 #, c-format -msgid "Attempted to create entry that already exists" -msgstr "Versuchte, Eintrag anzulegen, der bereits existiert" +msgid "Path '%s' already exists" +msgstr "Pfad »%s« existiert bereits" -#: ../libsvn_fs_base/dag.c:529 ../libsvn_fs_fs/dag.c:468 -#: ../libsvn_fs_x/dag.c:523 -msgid "Attempted to set entry in non-directory node" -msgstr "Versuchte, Eintrag in einem *nicht* Verzeichnisknoten zu setzen" +#: ../libsvn_client/copy.c:1046 +#, c-format +msgid "Path '%s' already exists as unversioned node" +msgstr "Pfad »%s« existiert als nicht versionierter Knoten" -#: ../libsvn_fs_base/dag.c:535 ../libsvn_fs_fs/dag.c:474 -#: ../libsvn_fs_x/dag.c:529 -msgid "Attempted to set entry in immutable node" -msgstr "Versuchte, Eintrag in einem nicht-veränderlichen Knoten zu setzen" +#: ../libsvn_client/copy.c:1071 +#, fuzzy, c-format +msgid "Directory '%s' is not under version control" +msgstr "»%s« ist nicht unter Versionskontrolle" -# FIXME: node-revision or node-rev (wie überall)? -#: ../libsvn_fs_base/dag.c:602 +#: ../libsvn_client/copy.c:1073 ../libsvn_client/copy.c:1082 +#: ../libsvn_client/copy.c:1092 ../libsvn_client/copy.c:2748 #, c-format -msgid "Can't set proplist on *immutable* node-revision %s" -msgstr "Kann keine Eigenschaften für *nicht-veränderliche* Knotenrevision %s setzen." +msgid "Path '%s' is not a directory" +msgstr "Pfad »%s« ist kein Verzeichnis" -#: ../libsvn_fs_base/dag.c:743 +#: ../libsvn_client/copy.c:1131 ../libsvn_client/merge.c:10252 +#: ../svnlook/svnlook.c:1445 #, c-format -msgid "Attempted to make a child clone with an illegal name '%s'" -msgstr "Versuchte, Unterknoten mit illegalem Namen »%s« zu klonen" +msgid "Path '%s' does not exist" +msgstr "Pfad »%s« existiert nicht" -#: ../libsvn_fs_base/dag.c:860 +#: ../libsvn_client/copy.c:1315 ../libsvn_client/copy.c:1356 #, c-format -msgid "Attempted to delete entry '%s' from *non*-directory node" -msgstr "Versuchte, Eintrag »%s« aus einem *nicht* Verzeichnisknoten zu löschen" +msgid "Path '%s' already exists, but is not a directory" +msgstr "Pfad »%s« existiert bereits, ist aber kein Verzeichnis" -#: ../libsvn_fs_base/dag.c:866 -#, c-format -msgid "Attempted to delete entry '%s' from immutable directory node" -msgstr "Versuchte, Eintrag »%s« aus einem nicht-veränderlichen Verzeichnisknoten zu löschen" +#: ../libsvn_client/copy.c:1493 +msgid "Source and destination URLs appear not to point to the same repository." +msgstr "Quellen- und Ziel-URL scheinen nicht auf das selbe Projektarchiv zu zeigen." -#: ../libsvn_fs_base/dag.c:873 +#: ../libsvn_client/copy.c:1705 ../libsvn_client/prop_commands.c:167 #, c-format -msgid "Attempted to delete a node with an illegal name '%s'" -msgstr "Versuchte, einen Knoten mit illegalem Namen »%s« zu löschen" +msgid "Path '%s' does not exist in revision %ld" +msgstr "Pfad »%s« existiert nicht in Revision %ld" -#: ../libsvn_fs_base/dag.c:888 ../libsvn_fs_base/dag.c:921 +#: ../libsvn_client/copy.c:2716 ../libsvn_client/mtcc.c:550 #, c-format -msgid "Delete failed: directory has no entry '%s'" -msgstr "Löschen schlug fehl: Verzeichnis hat keinen Eintrag »%s«" +msgid "Path '%s' not found in revision %ld" +msgstr "Pfad »%s« wurde in Revision %ld nicht gefunden" -#: ../libsvn_fs_base/dag.c:970 +#: ../libsvn_client/copy.c:2721 #, c-format -msgid "Attempted removal of immutable node" -msgstr "Versuchte, einen nicht-veränderlichen Knoten zu entfernen" +msgid "Path '%s' not found in head revision" +msgstr "Pfad »%s« wurde in der HEAD-Revision nicht gefunden" -#: ../libsvn_fs_base/dag.c:1090 -#, c-format -msgid "Attempted to get textual contents of a *non*-file node" -msgstr "Versuchte, den Textinhalt eines *nicht* Dateiknotens zu holen" +#: ../libsvn_client/copy.c:2856 +msgid "Cannot mix repository and working copy sources" +msgstr "Quellen aus dem Projektarchiv und einer Arbeitskopie können nicht gemischt werden" -#: ../libsvn_fs_base/dag.c:1123 +#: ../libsvn_client/copy.c:2909 #, c-format -msgid "Attempted to get length of a *non*-file node" -msgstr "Versuchte, die Länge eines *nicht* Dateiknotens zu holen" +msgid "Cannot copy path '%s' into its own child '%s'" +msgstr "Kann Pfad »%s« nicht in sein eigenes Kind »%s« kopieren" -#: ../libsvn_fs_base/dag.c:1150 +#: ../libsvn_client/copy.c:2945 #, c-format -msgid "Attempted to get checksum of a *non*-file node" -msgstr "Versuchte, die Prüfsumme eines *nicht* Dateiknotens zu holen" +msgid "Cannot move the external at '%s'; please edit the svn:externals property on '%s'." +msgstr "Externer Verweis »%s« kann nicht verschoben werden; bitte bearbeiten Sie die Eigenschaft »svn:externals« von »%s«" -#: ../libsvn_fs_base/dag.c:1189 ../libsvn_fs_base/dag.c:1246 -#, c-format -msgid "Attempted to set textual contents of a *non*-file node" -msgstr "Versuchte, den Textinhalt eines *nicht* Dateiknotens zu setzen" +#: ../libsvn_client/copy.c:2960 +msgid "Moves between the working copy and the repository are not supported" +msgstr "Verschiebungen zwischen der Arbeitskopie und dem Projektarchiv sind nicht unterstützt" -#: ../libsvn_fs_base/dag.c:1195 ../libsvn_fs_base/dag.c:1252 +#: ../libsvn_client/copy.c:2975 #, c-format -msgid "Attempted to set textual contents of an immutable node" -msgstr "Versuchte, den Textinhalt eines nicht-veränderlichen Knotens zu setzen" +msgid "Cannot move URL '%s' into itself" +msgstr "Kann URL »%s« nicht auf sich selbst verschieben" -#: ../libsvn_fs_base/dag.c:1281 ../libsvn_fs_base/reps-strings.c:829 +#: ../libsvn_client/copy.c:2976 #, c-format -msgid "Checksum mismatch on representation '%s'" -msgstr "Prüfsummenfehler in Darstellung »%s«" +msgid "Cannot move path '%s' into itself" +msgstr "Kann »%s« nicht auf sich selbst verschieben" -#: ../libsvn_fs_base/dag.c:1375 +#: ../libsvn_client/copy.c:3043 #, c-format -msgid "Attempted to open non-existent child node '%s'" -msgstr "Versuchte, nicht existierenden Unterknoten »%s« zu öffnen" +msgid "'%s' does not have a URL associated with it" +msgstr "»%s« hat keine zugehörige URL" -#: ../libsvn_fs_base/dag.c:1381 +#: ../libsvn_client/copy_foreign.c:131 ../libsvn_client/copy_foreign.c:283 +#: ../libsvn_client/externals.c:1023 ../libsvn_client/externals.c:1234 +#: ../libsvn_wc/update_editor.c:1119 #, c-format -msgid "Attempted to open node with an illegal name '%s'" -msgstr "Versuchte, einen Knoten mit illegalem Namen »%s« zu öffnen" +msgid "Path '%s' is not in the working copy" +msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten" -#: ../libsvn_fs_base/dag.c:1707 +#: ../libsvn_client/copy_foreign.c:373 ../libsvn_client/export.c:814 +#: ../libsvn_client/repos_diff.c:1002 ../libsvn_fs_fs/dag.c:1107 +#: ../libsvn_fs_x/dag.c:904 ../libsvn_ra_serf/commit.c:2229 +#: ../libsvn_ra_svn/client.c:1506 ../libsvn_wc/diff_editor.c:2109 +#: ../libsvn_wc/diff_editor.c:2195 ../libsvn_wc/externals.c:711 +#: ../libsvn_wc/update_editor.c:4239 #, c-format -msgid "Attempted merge tracking info change on immutable node" -msgstr "Versuchte, die Informationen zur Zusammenführungsverfolgung eines nicht-veränderlichen Knotens zu ändern" +msgid "Checksum mismatch for '%s'" +msgstr "Prüfsummenfehler für »%s«" -#: ../libsvn_fs_base/dag.c:1747 +#: ../libsvn_client/copy_foreign.c:481 #, c-format -msgid "Attempted mergeinfo count change on immutable node" -msgstr "Versuchte, die Anzahl der Zusammenführungsinformationen eines nicht-veränderlichen Knoten zu ändern" +msgid "'%s' is not a valid location inside a repository" +msgstr "»%s« ist kein gültiger Pfad in einem Projektarchiv" -#: ../libsvn_fs_base/dag.c:1759 +#: ../libsvn_client/copy_foreign.c:512 #, c-format -msgid "Invalid value (%%%s) for node revision mergeinfo count" -msgstr "Ungültiger Wert (%%%s) für Knotenrevisions-Zusammenführungszähler" +msgid "Can't add '%s', because no parent directory is found" +msgstr "Kann »%s« nicht hinzufügen, da kein Elternverzeichnis gefunden wurde" -#: ../libsvn_fs_base/err.c:46 +#: ../libsvn_client/delete.c:76 #, c-format -msgid "Corrupt filesystem revision %ld in filesystem '%s'" -msgstr "Beschädigte Dateisystemrevision %ld in Dateisystem »%s«" +msgid "'%s' is in the way of the resource actually under version control" +msgstr "»%s« ist der Ressource, die sich unter Versionskontrolle befindet, im Weg" -#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/cached_data.c:276 -#: ../libsvn_fs_x/cached_data.c:275 +#: ../libsvn_client/delete.c:95 #, c-format -msgid "Reference to non-existent node '%s' in filesystem '%s'" -msgstr "Verweis auf einen nicht existierenden Knoten »%s« in Dateisystem »%s«" +msgid "'%s' has local modifications -- commit or revert them first" +msgstr "»%s« hat lokale Änderungen -- zuerst übertragen oder zurücksetzen" -#: ../libsvn_fs_base/err.c:68 +#: ../libsvn_client/delete.c:127 #, c-format -msgid "No such revision %ld in filesystem '%s'" -msgstr "Keine solche Revision %ld im Dateisystem »%s«" +msgid "Cannot remove the external at '%s'; please edit or delete the svn:externals property on '%s'" +msgstr "Externer Verweis »%s« kann nicht entfernt werden; bitte bearbeiten oder löschen Sie die Eigenschaft »svn:externals« von »%s«" -#: ../libsvn_fs_base/err.c:80 +#: ../libsvn_client/delete.c:358 #, c-format -msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'" -msgstr "Beschädigter Eintrag in »transactions« Tabelle für »%s« in Dateisystem »%s«" +msgid "URL '%s' not within a repository" +msgstr "URL »%s« ist nicht in einem Projektarchiv" -#: ../libsvn_fs_base/err.c:91 +#: ../libsvn_client/delete.c:365 #, c-format -msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'" -msgstr "Beschädigter Eintrag in »copies« Tabelle für »%s« in Dateisystem »%s«" +msgid "URL '%s' does not exist" +msgstr "URL »%s« existiert nicht" -#: ../libsvn_fs_base/err.c:102 -#, c-format -msgid "No transaction named '%s' in filesystem '%s'" -msgstr "Keine Transaktion namens »%s« in Dateisystem »%s«" +#: ../libsvn_client/deprecated.c:884 ../svn/move-cmd.c:65 +msgid "Cannot specify revisions (except HEAD) with move operations" +msgstr "Andere Revisionen (als HEAD) sind bei Verschiebeoperationen nicht zugelassen" -#: ../libsvn_fs_base/err.c:113 -#, c-format -msgid "Cannot modify transaction named '%s' in filesystem '%s'" -msgstr "Kann die Transaktion namens »%s« in Dateisystem »%s« nicht modifizieren" +#: ../libsvn_client/deprecated.c:1750 +msgid "No commits in repository" +msgstr "Keine Übertragungen im Projektarchiv" -#: ../libsvn_fs_base/err.c:124 -#, c-format -msgid "No copy with id '%s' in filesystem '%s'" -msgstr "Keine Kopie mit ID »%s« in Dateisystem »%s«" +#: ../libsvn_client/deprecated.c:3151 ../libsvn_wc/deprecated.c:4229 +msgid "Non-recursive relocation not supported" +msgstr "Nicht-rekursives Umplatzieren nicht unterstützt" -#: ../libsvn_fs_base/err.c:134 +#: ../libsvn_client/diff.c:66 #, c-format -msgid "Token '%s' does not point to any existing lock in filesystem '%s'" -msgstr "Marke »%s« zeigt auf keine existierende Sperre im Dateisystem »%s«" +msgid "Path '%s' must be an immediate child of the directory '%s'" +msgstr "Pfad »%s« muss ein unmittelbares Kind von Verzeichnis »%s« sein" -#: ../libsvn_fs_base/err.c:144 +#: ../libsvn_client/diff.c:241 #, c-format -msgid "No token given for path '%s' in filesystem '%s'" -msgstr "Keine Marke für Pfad »%s« in Dateisystem »%s« angegeben" +msgid "%s\t(revision %ld)" +msgstr "%s\t(Revision %ld)" -#: ../libsvn_fs_base/err.c:153 +#: ../libsvn_client/diff.c:243 #, c-format -msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'" -msgstr "Beschädigte Sperre in »locks« Tabelle für »%s« in Dateisystem »%s«" +msgid "%s\t(nonexistent)" +msgstr "%s\t(nicht existent)" -#: ../libsvn_fs_base/err.c:163 +#. SVN_INVALID_REVNUM +#: ../libsvn_client/diff.c:245 #, c-format -msgid "No record in 'node-origins' table for node id '%s' in filesystem '%s'" -msgstr "Kein Datensatz in der »node-origins«-Tabelle für Knoten-ID »%s« im Dateisystem »%s«" +msgid "%s\t(working copy)" +msgstr "%s\t(Arbeitskopie)" -#: ../libsvn_fs_base/err.c:173 +#: ../libsvn_client/diff.c:944 #, c-format -msgid "No record in 'checksum-reps' table for checksum '%s' in filesystem '%s'" -msgstr "Kein Datensatz in der »checksum-reps«-Tabelle für Prüfsumme »%s« im Dateisystem »%s«" +msgid "Cannot display: file marked as a binary type.%s" +msgstr "Kann nicht anzeigen: Dateityp ist als binär angegeben.%s" -#: ../libsvn_fs_base/fs.c:87 -#, c-format -msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d" -msgstr "Falsche Datenbankversion: %d.%d.%d, sollte mindestens %d.%d.%d sein" +#: ../libsvn_client/diff.c:1481 ../libsvn_client/merge.c:7301 +#: ../libsvn_client/merge.c:10654 +msgid "Not all required revisions are specified" +msgstr "Es sind nicht alle erforderlichen Revisionen angegeben" -#: ../libsvn_fs_base/fs.c:98 +#: ../libsvn_client/diff.c:1495 +msgid "At least one revision must be something other than BASE or WORKING when diffing a URL" +msgstr "Beim Vergleichen einer URL muss mindestens eine Revision etwas anderes sein als »BASE« oder »WORKING«" + +#: ../libsvn_client/diff.c:1532 #, c-format -msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d" -msgstr "Falsche Datenbankversion: Übersetzt mit %d.%d.%d, läuft mit %d.%d.%d" +msgid "Diff target '%s' was not found in the repository at revision '%ld'" +msgstr "Ziel für Vergleich »%s« wurde im Projektarchiv in Revision »%ld« nicht gefunden" -#: ../libsvn_fs_base/fs.c:188 +#: ../libsvn_client/diff.c:1537 #, c-format -msgid "Berkeley DB error for filesystem '%s' while closing environment:\n" -msgstr "Berkeley-DB-Fehler für Dateisystem »%s« beim Schließen der Umgebung:\n" +msgid "Diff target '%s' was not found in the repository at revision '%ld' or '%ld'" +msgstr "Ziel für Vergleich »%s« wurde im Projektarchiv in Revision »%ld« oder »%ld« nicht gefunden" -#: ../libsvn_fs_base/fs.c:607 +#: ../libsvn_client/diff.c:1713 #, c-format -msgid "Berkeley DB error for filesystem '%s' while creating environment:\n" -msgstr "Berkeley-DB-Fehler für Dateisystem »%s« beim Erzeugen der Umgebung:\n" +msgid "Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'" +msgstr "Ziel für Vergleich »%s« wurde im Projektarchiv in Revisionen »%ld« und »%ld« nicht gefunden" -#: ../libsvn_fs_base/fs.c:613 +#: ../libsvn_client/diff.c:1718 #, c-format -msgid "Berkeley DB error for filesystem '%s' while opening environment:\n" -msgstr "Berkeley-DB-Fehler für Dateisystem »%s« beim Öffnen der Umgebung:\n" +msgid "Diff targets '%s' and '%s' were not found in the repository at revisions '%ld' and '%ld'" +msgstr "Ziele für Vergleich »%s« und »%s« wurden im Projektarchiv in Revisionen »%ld« und »%ld« nicht gefunden" -#: ../libsvn_fs_base/fs.c:628 -msgid "creating 'nodes' table" -msgstr "Erzeuge Tabelle »nodes« " +#: ../libsvn_client/diff.c:1817 +#, fuzzy +msgid "Sorry, svn_client_diff7 was called in a way that is not yet supported" +msgstr "Leider wurde svn_client_diff6 in einer Art aufgerufen, die noch nicht unterstützt wird" -#: ../libsvn_fs_base/fs.c:629 -msgid "opening 'nodes' table" -msgstr "Öffne Tabelle »nodes«" +#: ../libsvn_client/diff.c:1857 +msgid "A non-URL diff at this time must be either from a path's base to the same path's working version or between the working versions of two paths" +msgstr "" -#: ../libsvn_fs_base/fs.c:634 -msgid "creating 'revisions' table" -msgstr "Erzeuge Tabelle »revisions«" +#: ../libsvn_client/diff.c:2632 ../libsvn_client/diff.c:2696 +msgid "Cannot ignore properties and show only properties at the same time" +msgstr "Kann nicht gleichzeitig Eigenschaften ignorieren und nur Eigenschaften anzeigen" -#: ../libsvn_fs_base/fs.c:635 -msgid "opening 'revisions' table" -msgstr "Öffne Tabelle »revisions«" +#: ../libsvn_client/diff_local.c:789 ../libsvn_wc/props.c:1675 +#, c-format +msgid "'%s' is not a file or directory" +msgstr "»%s« ist weder eine Datei noch ein Verzeichnis" -#: ../libsvn_fs_base/fs.c:640 -msgid "creating 'transactions' table" -msgstr "Erzeuge Tabelle »transactions«" +#: ../libsvn_client/export.c:102 +#, c-format +msgid "'%s' is not a valid EOL value" +msgstr "»%s« ist kein gültiger EOL Wert" -#: ../libsvn_fs_base/fs.c:641 -msgid "opening 'transactions' table" -msgstr "Öffne Tabelle »transactions«" +#: ../libsvn_client/export.c:240 +msgid "Destination directory exists, and will not be overwritten unless forced" +msgstr "Zielverzeichnis existiert und kann nur mittels »--force« überschrieben werden" -#: ../libsvn_fs_base/fs.c:646 -msgid "creating 'copies' table" -msgstr "Erzeuge Tabelle »copies«" +#: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1526 +#: ../libsvn_wc/adm_crawler.c:1270 ../libsvn_wc/copy.c:651 +#: ../libsvn_wc/crop.c:239 ../libsvn_wc/crop.c:342 ../libsvn_wc/info.c:377 +#: ../libsvn_wc/node.c:529 ../libsvn_wc/props.c:202 ../libsvn_wc/status.c:2728 +#: ../libsvn_wc/wc_db.c:2063 ../libsvn_wc/wc_db.c:2604 +#: ../libsvn_wc/wc_db.c:2843 ../libsvn_wc/wc_db.c:2876 +#: ../libsvn_wc/wc_db.c:3034 ../libsvn_wc/wc_db.c:4047 +#: ../libsvn_wc/wc_db.c:6370 ../libsvn_wc/wc_db.c:6690 +#: ../libsvn_wc/wc_db.c:6934 ../libsvn_wc/wc_db.c:7074 +#: ../libsvn_wc/wc_db.c:8113 ../libsvn_wc/wc_db.c:9113 +#: ../libsvn_wc/wc_db.c:9845 ../libsvn_wc/wc_db.c:10492 +#: ../libsvn_wc/wc_db.c:10717 ../libsvn_wc/wc_db.c:11093 +#: ../libsvn_wc/wc_db.c:11433 ../libsvn_wc/wc_db.c:12673 +#: ../libsvn_wc/wc_db.c:12742 ../libsvn_wc/wc_db.c:14071 +#: ../libsvn_wc/wc_db.c:14120 ../libsvn_wc/wc_db.c:14241 +#: ../libsvn_wc/wc_db.c:14400 ../libsvn_wc/wc_db.c:14841 +#: ../libsvn_wc/wc_db.c:15705 +#, c-format +msgid "The node '%s' was not found." +msgstr "Der Knoten »%s« wurde nicht gefunden." -#: ../libsvn_fs_base/fs.c:647 -msgid "opening 'copies' table" -msgstr "Öffne Tabelle »copies«" +#: ../libsvn_client/export.c:285 ../libsvn_client/export.c:1181 +#: ../libsvn_client/export.c:1235 +#, c-format +msgid "Destination file '%s' exists, and will not be overwritten unless forced" +msgstr "Zieldatei »%s« existiert und kann nur mittels »--force« überschrieben werden" -#: ../libsvn_fs_base/fs.c:652 -msgid "creating 'changes' table" -msgstr "Erzeuge Tabelle »changes«" +#: ../libsvn_client/export.c:291 ../libsvn_client/export.c:1186 +#: ../libsvn_client/export.c:1240 +#, c-format +msgid "Destination '%s' exists. Cannot overwrite directory with non-directory" +msgstr "Ziel »%s« existiert. Kann Verzeichnis nicht mit etwas überschreiben, was kein Verzeichnis ist" -#: ../libsvn_fs_base/fs.c:653 -msgid "opening 'changes' table" -msgstr "Öffne Tabelle »changes«" +#: ../libsvn_client/export.c:473 ../libsvn_client/export.c:622 +#: ../libsvn_client/export.c:1078 +#, c-format +msgid "'%s' exists and is not a directory" +msgstr "»%s« existiert und ist kein Verzeichnis" -#: ../libsvn_fs_base/fs.c:658 -msgid "creating 'representations' table" -msgstr "Erzeuge Tabelle »representations«" +#: ../libsvn_client/export.c:477 ../libsvn_client/export.c:626 +#: ../libsvn_client/export.c:1082 +#, c-format +msgid "'%s' already exists" +msgstr "»%s« existiert bereits" -#: ../libsvn_fs_base/fs.c:659 -msgid "opening 'representations' table" -msgstr "Öffne Tabelle »representations«" +#: ../libsvn_client/externals.c:202 ../libsvn_client/externals.c:259 +#, c-format +msgid "The external '%s' defined in %s at '%s' cannot be checked out because '%s' is already a versioned path." +msgstr "Der externe Verweis »%s« definiert durch Eigenschaft »%s« von »%s« kann nicht ausgecheckt werden, da »%s« schon ein versionierter Pfad ist." -#: ../libsvn_fs_base/fs.c:664 -msgid "creating 'strings' table" -msgstr "Erzeuge Tabelle »strings«" +#: ../libsvn_client/externals.c:500 +#, c-format +msgid "Cannot insert a file external defined on '%s' into the working copy '%s'." +msgstr "Kann externen Dateiverweis von »%s« nicht in die Arbeitskopie »%s« einfügen." -#: ../libsvn_fs_base/fs.c:665 -msgid "opening 'strings' table" -msgstr "Öffne Tabelle »strings«" +#: ../libsvn_client/externals.c:525 +#, c-format +msgid "The file external from '%s' cannot overwrite the existing versioned item at '%s'" +msgstr "Der externe Dateiverweis von »%s« kann nicht das existierende versionierte Objekt bei »%s« überschreiben" -#: ../libsvn_fs_base/fs.c:670 -msgid "creating 'uuids' table" -msgstr "Erzeuge Tabelle »uuids«" +#: ../libsvn_client/externals.c:539 +#, c-format +msgid "The file external '%s' can not be created because the node exists." +msgstr "Der externe Dateiverweis auf »%s« kann nicht erstellt werden, da schon ein Knoten existiert" -#: ../libsvn_fs_base/fs.c:671 -msgid "opening 'uuids' table" -msgstr "Öffne Tabelle »uuids«" +#: ../libsvn_client/externals.c:819 +#, c-format +msgid "URL '%s' at revision %ld doesn't exist" +msgstr "URL »%s« existiert nicht in Revision %ld" -#: ../libsvn_fs_base/fs.c:676 -msgid "creating 'locks' table" -msgstr "Erzeuge Tabelle »locks«" +#: ../libsvn_client/externals.c:824 +#, c-format +msgid "URL '%s' at revision %ld is not a file or a directory" +msgstr "URL »%s« in Revision %ld ist weder eine Datei noch ein Verzeichnis" -#: ../libsvn_fs_base/fs.c:677 -msgid "opening 'locks' table" -msgstr "Öffne Tabelle »locks«" +#: ../libsvn_client/externals.c:903 +#, c-format +msgid "Unsupported external: URL of file external '%s' is not in repository '%s'" +msgstr "Nicht unterstützter externer Verweis: URL von Dateiverweis »%s« gehört nicht zum Projektarchiv »%s«" -#: ../libsvn_fs_base/fs.c:682 -msgid "creating 'lock-tokens' table" -msgstr "Erzeuge Tabelle »lock-tokens«" +#: ../libsvn_client/externals.c:1099 +#, c-format +msgid "Traversal of '%s' found no ambient depth" +msgstr "Durchlauf von »%s« fand keine äußere Tiefe" -#: ../libsvn_fs_base/fs.c:683 -msgid "opening 'lock-tokens' table" -msgstr "Öffne Tabelle »lock-tokens«" +#: ../libsvn_client/import.c:172 +#, c-format +msgid "%s property on '%s' contains unrecognized EOL-style '%s'" +msgstr "Eigenschaft »%s« von »%s« enthält nicht erkannten Zeilenendstil »%s«" -#: ../libsvn_fs_base/fs.c:691 -msgid "creating 'node-origins' table" -msgstr "Erzeuge Tabelle »node-origins«" +#: ../libsvn_client/import.c:507 +#, c-format +msgid "Unknown or unversionable type for '%s'" +msgstr "Unbekannter oder unerwarteter Typ für »%s«" -#: ../libsvn_fs_base/fs.c:692 -msgid "opening 'node-origins' table" -msgstr "Öffne Tabelle »node-origin«" +#: ../libsvn_client/import.c:736 +msgid "New entry name required when importing a file" +msgstr "Neuer Eintragsname erforderlich, wenn eine Datei importiert wird" -#: ../libsvn_fs_base/fs.c:701 -msgid "creating 'miscellaneous' table" -msgstr "Erzeuge Tabelle »miscellaneous«" +#: ../libsvn_client/import.c:787 ../libsvn_client/patch.c:3752 +#: ../libsvn_client/patch.c:3764 ../libsvn_wc/delete.c:93 +#: ../libsvn_wc/lock.c:121 ../libsvn_wc/wc_db_wcroot.c:78 +#, c-format +msgid "'%s' does not exist" +msgstr "»%s« ist nicht vorhanden" -#: ../libsvn_fs_base/fs.c:702 -msgid "opening 'miscellaneous' table" -msgstr "Öffne Tabelle »miscellaneous«" +#: ../libsvn_client/import.c:939 +#, c-format +msgid "'%s' is a reserved name and cannot be imported" +msgstr "»%s« ist ein reservierter Name und kann nicht importiert werden " -#: ../libsvn_fs_base/fs.c:711 -msgid "creating 'checksum-reps' table" -msgstr "Erzeuge Tabelle »checksum-reps«" +#: ../libsvn_client/info.c:398 ../libsvn_client/list.c:389 +#: ../svnbench/null-info-cmd.c:148 +#, c-format +msgid "URL '%s' non-existent in revision %ld" +msgstr "URL »%s« existiert nicht in Revision %ld" -#: ../libsvn_fs_base/fs.c:712 -msgid "opening 'checksum-reps' table" -msgstr "Öffne Tabelle »checksum-reps«" +#: ../libsvn_client/locking_commands.c:273 +msgid "No common parent found, unable to operate on disjoint arguments" +msgstr "Kein gemeinsamer Vorgänger gefunden. Kann nicht mit disjunkten Pfaden arbeiten" -#: ../libsvn_fs_base/fs.c:802 +#: ../libsvn_client/locking_commands.c:382 #, c-format -msgid "The '%s' feature requires version %d of the filesystem schema; filesystem '%s' uses only version %d" -msgstr "Das Merkmal »%s« erfordert Version %d des Dateisystemschemas; Dateisystem »%s« verwendet nur Version %d" +msgid "The node '%s' is not a file" +msgstr "Der Knoten »%s« ist keine Datei" + +#: ../libsvn_client/locking_commands.c:402 +msgid "Unable to lock/unlock across multiple repositories" +msgstr "Unmöglich über mehrere Projektarchive zu (ent)sperren" -#: ../libsvn_fs_base/fs.c:821 +#: ../libsvn_client/locking_commands.c:442 #, c-format -msgid "Expected FS format '%d'; found format '%d'" -msgstr "Erwartetes Dateisystemformat »%d«; gefunden »%d«" +msgid "'%s' is not locked in this working copy" +msgstr "»%s« ist in dieser Arbeitskopie nicht gesperrt" -#: ../libsvn_fs_base/fs.c:1309 +#: ../libsvn_client/locking_commands.c:495 #, c-format -msgid "BDB repositories do not support incremental hotcopy" -msgstr "BDB-Projektarchive unterstützen inkrementelle Kopien im laufenden Betrieb nicht" +msgid "'%s' is not locked" +msgstr "»%s« ist nicht gesperrt" -#: ../libsvn_fs_base/fs.c:1413 -msgid "" -"Error copying logfile; the DB_LOG_AUTOREMOVE feature\n" -"may be interfering with the hotcopy algorithm. If\n" -"the problem persists, try deactivating this feature\n" -"in DB_CONFIG" -msgstr "" -"Fehler beim Kopieren der Logdatei; die Funktion DB_LOG_AUTOREMOVE\n" -"könnte den Hotcopy-Algorithmus stören. Falls das Problem weiterhin\n" -"besteht, versuchen Sie diese Funktion in DB_CONFIG abzuschalten" +#: ../libsvn_client/locking_commands.c:529 ../libsvn_fs/fs-loader.c:1835 +#: ../libsvn_ra/ra_loader.c:1088 +msgid "Lock comment contains illegal characters" +msgstr "Sperrkommentar enthält illegale Zeichen" -#: ../libsvn_fs_base/fs.c:1432 -msgid "" -"Error running catastrophic recovery on hotcopy; the\n" -"DB_LOG_AUTOREMOVE feature may be interfering with the\n" -"hotcopy algorithm. If the problem persists, try deactivating\n" -"this feature in DB_CONFIG" -msgstr "" -"Fehler beim Ausführen der Katastrophen-Wiederherstellung im\n" -"laufenden Betrieb (hotcopy); die Funktion DB_LOG_AUTOREMOVE\n" -"könnte den Hotcopy-Algorithmus stören. Wenn das Problem weiterhin\n" -"besteht, versuchen Sie diese Funktion in DB_CONFIG abzuschalten" +#: ../libsvn_client/log.c:134 ../libsvn_client/ra.c:532 +#: ../libsvn_client/ra.c:867 +#, c-format +msgid "'%s' has no URL" +msgstr "»%s« hat keine URL" -#: ../libsvn_fs_base/fs.c:1477 -msgid "Module for working with a Berkeley DB repository." -msgstr "Modul zum Zugriff auf ein Berkeley-DB-Projektarchiv." +#: ../libsvn_client/log.c:347 +msgid "No valid target found" +msgstr "Kein gültiges Ziel gefunden" -#: ../libsvn_fs_base/fs.c:1527 +#: ../libsvn_client/log.c:378 #, c-format -msgid "Unsupported FS loader version (%d) for bdb" -msgstr "Nicht unterstützte Dateisystem-Laderversion (%d) für bdb" +msgid "'%s' is not a relative path" +msgstr "»%s« ist kein relativer Pfad" -#: ../libsvn_fs_base/lock.c:122 ../libsvn_fs_base/lock.c:127 -#: ../libsvn_fs_fs/lock.c:740 ../libsvn_fs_fs/lock.c:745 -#: ../libsvn_fs_fs/lock.c:775 ../libsvn_fs_x/lock.c:780 -#: ../libsvn_fs_x/lock.c:785 ../libsvn_fs_x/lock.c:815 -#, c-format -msgid "Path '%s' doesn't exist in HEAD revision" -msgstr "Pfad »%s« existiert nicht in HEAD-Revision" +#: ../libsvn_client/log.c:404 +msgid "When specifying working copy paths, only one target may be given" +msgstr "Bei der Angabe von Arbeitskopiepfaden darf nur ein Ziel angegeben werden" -#: ../libsvn_fs_base/lock.c:616 ../libsvn_fs_fs/lock.c:613 -#: ../libsvn_fs_x/lock.c:680 +#: ../libsvn_client/log.c:428 ../libsvn_client/revisions.c:93 +#: ../libsvn_client/revisions.c:135 +msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL" +msgstr "PREV, BASE oder COMMITTED Revisions-Schlüsselwörter sind für die URL ungültig" + +#: ../libsvn_client/log.c:561 ../libsvn_client/log.c:870 +msgid "Missing required revision specification" +msgstr "Es wurde keine Revision angegeben" + +#: ../libsvn_client/merge.c:416 #, c-format -msgid "Cannot verify lock on path '%s'; no username available" -msgstr "Kann Sperre für Pfad »%s« nicht prüfen; keine Benutzername verfügbar" +msgid "URL '%s' of '%s' is not in repository '%s'" +msgstr "URL »%s« von »%s« ist nicht im Projektarchiv »%s«" -#: ../libsvn_fs_base/lock.c:622 ../libsvn_fs_fs/lock.c:619 -#: ../libsvn_fs_x/lock.c:686 +#: ../libsvn_client/merge.c:453 #, c-format -msgid "User '%s' does not own lock on path '%s' (currently locked by '%s')" -msgstr "Benutzer »%s« besitzt die Sperre für Pfad »%s« nicht (derzeit gesperrt durch »%s«)" +msgid "'%s' must be from the same repository as '%s'" +msgstr "»%s« muss aus dem selben Projektarchiv wie »%s« stammen" -#: ../libsvn_fs_base/lock.c:628 ../libsvn_fs_fs/lock.c:625 -#: ../libsvn_fs_x/lock.c:692 +# File names not translated +#. xgettext: the '.working', '.merge-left.r%ld' and +#. '.merge-right.r%ld' strings are used to tag onto a file +#. name in case of a merge conflict +#: ../libsvn_client/merge.c:2111 #, c-format -msgid "Cannot verify lock on path '%s'; no matching lock-token available" -msgstr "Kann Sperre für Pfad »%s« nicht prüfen; keine entsprechende Sperrmarke verfügbar" +msgid ".working%s%s" +msgstr ".working%s%s" -#. Helper macro that evaluates to an error message indicating that -#. the representation referred to by X has an unknown node kind. -#: ../libsvn_fs_base/reps-strings.c:58 +# File names not translated +#: ../libsvn_client/merge.c:2114 #, c-format -msgid "Unknown node kind for representation '%s'" -msgstr "Unbekannter Knotentyp für Darstellung »%s«" +msgid ".merge-left.r%ld%s%s" +msgstr ".merge-left.r%ld%s%s" -#: ../libsvn_fs_base/reps-strings.c:110 -msgid "Representation is not of type 'delta'" -msgstr "Darstellung ist nicht vom Typ »delta«" +# File names not translated +#: ../libsvn_client/merge.c:2118 +#, c-format +msgid ".merge-right.r%ld%s%s" +msgstr ".merge-right.r%ld%s%s" -#: ../libsvn_fs_base/reps-strings.c:380 -msgid "Svndiff source length inconsistency" -msgstr "Svndiff Quelllänge ist inkonsistent" +#: ../libsvn_client/merge.c:4816 +msgid "Cannot reverse-merge a range from a path's own future history; try updating first" +msgstr "Kann keinen Bereich aus der zukünftigen Geschichte des Pfades rückwärts zusammenführen; versuchen Sie zuerst zu aktualisieren" -#: ../libsvn_fs_base/reps-strings.c:506 +#: ../libsvn_client/merge.c:5537 #, c-format -msgid "Diff version inconsistencies in representation '%s'" -msgstr "Inkonsistenzen in Diffversion in Darstellung »%s«" +msgid "" +"One or more conflicts were produced while merging r%ld:%ld into\n" +"'%s' --\n" +"resolve all conflicts and rerun the merge to apply the remaining\n" +"unmerged revisions" +msgstr "" +"Ein oder mehrere Konflikte wurden beim Zusammenführen von r%ld:%ld in\n" +"»%s« erzeugt.\n" +"Lösen Sie alle Konflikte auf und starten Sie die Zusammenführung\n" +"erneut, um die fehlenden Revisionen zusammenzuführen" -#: ../libsvn_fs_base/reps-strings.c:532 +#: ../libsvn_client/merge.c:6353 #, c-format -msgid "Corruption detected whilst reading delta chain from representation '%s' to '%s'" -msgstr "Beim Lesen der Delta-Kette aus der Darstellung »%s« nach »%s« wurde eine Beschädigung entdeckt" +msgid "Invalid mergeinfo detected on '%s', merge tracking not possible" +msgstr "Ungültige Zusammenführungsinformationen in »%s« entdeckt, Zusammenführungsverfolgung nicht möglich" -#: ../libsvn_fs_base/reps-strings.c:798 -#, c-format -msgid "Rep contents are too large: got %s, limit is %s" -msgstr "Inhalt der Darstellung zu groß: »%s« erhalten, Grenze ist »%s«" +#: ../libsvn_client/merge.c:6504 +msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n" +msgstr "Zusammenführungsverfolgung nicht erlaubt bei fehlenden Unterbäumen; versuchen Sie diese Elemente erst wiederherzustellen:\n" -#: ../libsvn_fs_base/reps-strings.c:814 +#: ../libsvn_client/merge.c:7505 #, c-format -msgid "Failure reading representation '%s'" -msgstr "Fehler beim Lesen der Darstellung »%s«" +msgid "Invalid mergeinfo detected on merge target '%s', merge tracking not possible" +msgstr "Ungültige Zusammenführungsinformationen im Zusammenführungsziel »%s« entdeckt, Zusammenführungsverfolgung nicht möglich" -#: ../libsvn_fs_base/reps-strings.c:924 -#, c-format -msgid "MD5 checksum mismatch on representation '%s'" -msgstr "MD5-Prüfsummenfehler auf Darstellung »%s«" +#: ../libsvn_client/merge.c:9823 +msgid "Use of two URLs is not compatible with mergeinfo modification" +msgstr "Die Verwendung zweier URLs ist nicht kompatibel mit Änderungen der Zusammenführungsinformationen" -#: ../libsvn_fs_base/reps-strings.c:934 +#: ../libsvn_client/merge.c:9830 ../libsvn_client/merge.c:10166 +msgid "Merge from foreign repository is not compatible with mergeinfo modification" +msgstr "Die Zusammenführung aus fremdem Projektarchiv ist nicht kompatibel mit Änderungen der Zusammenführungsinformationen" + +#: ../libsvn_client/merge.c:10259 ../libsvn_client/merge.c:10402 #, c-format -msgid "SHA1 checksum mismatch on representation '%s'" -msgstr "SHA1-Prüfsummenfehler auf Darstellung »%s«" +msgid "Merge target '%s' does not exist in the working copy" +msgstr "Zusammenführungsziel »%s« ist nicht in der Arbeitskopie enthalten" -#: ../libsvn_fs_base/reps-strings.c:945 -msgid "Null rep, but offset past zero already" -msgstr "Leere Darstellung, aber der Offset ist bereits größer als Null" +#: ../libsvn_client/merge.c:10282 +msgid "Cannot determine revision of working copy" +msgstr "Die Revision der Arbeitskopie kann nicht bestimmt werden" -#: ../libsvn_fs_base/reps-strings.c:1062 ../libsvn_fs_base/reps-strings.c:1254 +#: ../libsvn_client/merge.c:10288 #, c-format -msgid "Rep '%s' is not mutable" -msgstr "Darstellung »%s« ist nicht veränderlich" +msgid "Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first" +msgstr "Kann nicht in eine Arbeitskopie mit verschiedenen Revisionen zusammenführen [%ld:%ld], versuchen Sie erst zu aktualisieren" -#: ../libsvn_fs_base/reps-strings.c:1077 -#, c-format -msgid "Rep '%s' both mutable and non-fulltext" -msgstr "Darstellung »%s« ist beides: veränderlich und kein Volltext" +#: ../libsvn_client/merge.c:10303 +msgid "Cannot merge into a working copy with a switched subtree" +msgstr "Kann nicht in eine Arbeitskopie mit umgestelltem Unterbaum zusammenführen" -#: ../libsvn_fs_base/reps-strings.c:1373 -msgid "Failed to get new string key" -msgstr "Konnte keinen neuen Schlüssel erzeugen" +#: ../libsvn_client/merge.c:10319 +msgid "Cannot merge into a working copy that has local modifications" +msgstr "Kann nicht in eine Arbeitskopie mit lokalen Änderungen zusammenführen" -#: ../libsvn_fs_base/reps-strings.c:1450 +#: ../libsvn_client/merge.c:10339 ../svn/merge-cmd.c:56 #, c-format -msgid "Attempt to deltify '%s' against itself" -msgstr "Versuch, Deltas von »%s« gegen sich selber zu erstellen" +msgid "Invalid merge source '%s'; a working copy path can only be used with a repository revision (a number, a date, or head)" +msgstr "Ungültige Quelle für Zusammenführung »%s«; ein Arbeitskopiepfad kann nur mit einer Revision im Projektarchiv verwendet werden (eine Zahl, ein Datum oder »HEAD«)" -#: ../libsvn_fs_base/reps-strings.c:1523 +#: ../libsvn_client/merge.c:10657 ../svn/merge-cmd.c:123 +msgid "Merge sources must both be either paths or URLs" +msgstr "Zusammenführungsquellen müssen beide Pfade oder URLs sein" + +#: ../libsvn_client/merge.c:11427 ../libsvn_client/merge.c:11589 +#: ../libsvn_client/merge.c:12507 #, c-format -msgid "Failed to calculate MD5 digest for '%s'" -msgstr "Berechnung der MD5-Summe für »%s« schlug fehl" +msgid "'%s@%ld' must be ancestrally related to '%s@%ld'" +msgstr "»%s@%ld« muss eine Vorgängerbeziehung zu »%s@%ld« haben" -#: ../libsvn_fs_base/revs-txns.c:72 +#: ../libsvn_client/merge.c:11539 #, c-format -msgid "Transaction is not dead: '%s'" -msgstr "Transaktion ist nicht tot: »%s«" +msgid "Neither the reintegrate source nor target can be the root of the repository" +msgstr "Weder die Quelle noch das Ziel der Reintegration darf Wurzel des Projektarchivs sein" -#: ../libsvn_fs_base/revs-txns.c:75 +#: ../libsvn_client/merge.c:11549 +msgid "Reintegrate merge not possible" +msgstr "Zusammenführung zur Reintegration nicht möglich" + +#: ../libsvn_client/merge.c:11619 +msgid " Missing ranges: " +msgstr " Fehlende Bereiche: " + +#: ../libsvn_client/merge.c:11622 #, c-format -msgid "Transaction is dead: '%s'" -msgstr "Transaktion ist tot: »%s«" +msgid "" +"Reintegrate can only be used if revisions %ld through %ld were previously merged from %s to the reintegrate source, but this is not the case:\n" +"%s" +msgstr "" +"Reintegration kann nur genutzt werden, falls die Revisionen %ld bis %ld vorher von %s in die zu reintegrierende Quelle zusammengeführt wurden, aber dies ist nicht der Fall:\n" +"%s" -#: ../libsvn_fs_base/revs-txns.c:272 ../libsvn_fs_fs/fs_fs.c:2115 -#: ../libsvn_fs_x/fs_x.c:1153 +#: ../libsvn_client/merge.c:11681 #, c-format -msgid "revprop '%s' has unexpected value in filesystem" -msgstr "Revisionseigenschaft »%s« hat einen unerwarteten Wert im Dateisystem" +msgid "Can't reintegrate into '%s' because it is locally added and therefore not related to the merge source" +msgstr "Kann nicht nach »%s« reintegrieren, da es lokal hinzugefügt wurde und daher keine Herkunftsbeziehung zur Quelle der Zusammenführung hat" -#: ../libsvn_fs_base/revs-txns.c:1053 -msgid "Transaction aborted, but cleanup failed" -msgstr "Transaktion abgebrochen, aber Aufräumen schlug fehl" +#: ../libsvn_client/merge.c:11969 +msgid "Cannot merge automatically while ignoring mergeinfo" +msgstr "Kann nicht automatisch zusammenführen und dabei Zusammenführungsinformationen ignorieren" -#: ../libsvn_fs_base/trail.c:99 -msgid "beginning Berkeley DB transaction" -msgstr "Beginne Berkeley DB Transaktion" +#: ../libsvn_client/merge.c:12637 +#, fuzzy, c-format +msgid "Can't perform automatic merge into '%s' because it is locally added and therefore not related to the merge source" +msgstr "Kann nicht nach »%s« reintegrieren, da es lokal hinzugefügt wurde und daher keine Herkunftsbeziehung zur Quelle der Zusammenführung hat" -#: ../libsvn_fs_base/trail.c:134 -msgid "aborting Berkeley DB transaction" -msgstr "Breche Berkeley DB Transaktion ab" +#: ../libsvn_client/merge.c:12736 +msgid "The required merge is reintegrate-like, and the record-only option cannot be used with this kind of merge" +msgstr "Die benötigte Zusammenführung ist eine Reintegration, die Option »record-only« kann aber mit dieser Art der Zusammenführung nicht verwendet werden" -#: ../libsvn_fs_base/trail.c:158 -msgid "committing Berkeley DB transaction" -msgstr "Schließe Berkeley DB Transaktion ab" +#: ../libsvn_client/merge.c:12742 +msgid "The required merge is reintegrate-like, and the depth option cannot be used with this kind of merge" +msgstr "Die benötigte Zusammenführung ist eine Reintegration, die Option zur Angabe der Tiefe kann aber mit dieser Art der Zusammenführung nicht verwendet werden" -#: ../libsvn_fs_base/tree.c:773 ../libsvn_fs_fs/tree.c:1104 -#: ../libsvn_fs_x/tree.c:1090 -#, c-format -msgid "Failure opening '%s'" -msgstr "Fehler beim Öffnen von »%s«" +#: ../libsvn_client/merge.c:12748 +msgid "The required merge is reintegrate-like, and the force_delete option cannot be used with this kind of merge" +msgstr "Die benötigte Zusammenführung ist eine Reintegration, die Option »force_delete« kann aber mit dieser Art der Zusammenführung nicht verwendet werden" -#: ../libsvn_fs_base/tree.c:1445 ../libsvn_fs_fs/tree.c:1630 -#: ../libsvn_fs_x/tree.c:1626 -msgid "Cannot compare property value between two different filesystems" -msgstr "Kann Eigenschaftswert nicht zwischen verschiedenen Dateisystemen vergleichen" +#: ../libsvn_client/merge_elements.c:193 +#, fuzzy +msgid "Merge had conflicts; this is not yet supported" +msgstr "Das Verringern der Arbeitskopietiefen wird nicht unterstützt" -#: ../libsvn_fs_base/tree.c:1911 ../libsvn_fs_base/tree.c:1981 -msgid "Corrupt DB: faulty predecessor count" -msgstr "DB beschädigt: Fehlerhafte Vorgängeranzahl" +#: ../libsvn_client/mergeinfo.c:1715 +msgid "Only depths 'infinity' and 'empty' are currently supported" +msgstr "Nur Tiefenangaben von »infinity« und »empty« werden momentan unterstützt" -#: ../libsvn_fs_base/tree.c:2038 +#: ../libsvn_client/mtcc.c:166 #, c-format -msgid "Unexpected immutable node at '%s'" -msgstr "Unerwarteter unveränderlicher Knoten bei »%s«" +msgid "Can't operate on '%s' because '%s' is not a directory" +msgstr "Kann »%s« nicht bearbeiten da »%s« kein Verzeichnis ist" -#: ../libsvn_fs_base/tree.c:2059 ../libsvn_fs_fs/tree.c:1660 -#: ../libsvn_fs_x/tree.c:1659 ../libsvn_repos/commit.c:1305 +#: ../libsvn_client/mtcc.c:319 #, c-format -msgid "Conflict at '%s'" -msgstr "Konflikt bei »%s«" +msgid "No origin found for node at '%s'" +msgstr "Kein Herkunftsknoten gefunden für Knoten in »%s«" -#: ../libsvn_fs_base/tree.c:2112 ../libsvn_fs_base/tree.c:2864 -#: ../libsvn_fs_fs/tree.c:1758 ../libsvn_fs_fs/tree.c:2312 -#: ../libsvn_fs_x/tree.c:1772 ../libsvn_fs_x/tree.c:2315 -msgid "Bad merge; ancestor, source, and target not all in same fs" -msgstr "Fehlerhaftes Zusammenführen: Vorgänger, Quelle und Ziel nicht im gleichen Dateisystem" +#: ../libsvn_client/mtcc.c:359 ../libsvn_repos/commit.c:430 +#, c-format +msgid "No such revision %ld (HEAD is %ld)" +msgstr "Keine Revision %ld (HEAD ist %ld)" -#: ../libsvn_fs_base/tree.c:2128 ../libsvn_fs_fs/tree.c:1774 -#: ../libsvn_fs_x/tree.c:1788 +#: ../libsvn_client/mtcc.c:407 #, c-format -msgid "Bad merge; target '%s' has id '%s', same as ancestor" -msgstr "Fehlerhaftes Zusammenführen: Ziel »%s« hat die gleiche ID »%s« wie der Vorgänger." +msgid "'%s' is not an ancestor of '%s'" +msgstr "»%s« ist kein Vorgänger von »%s«" -#: ../libsvn_fs_base/tree.c:2672 +#: ../libsvn_client/mtcc.c:506 #, c-format -msgid "Transaction '%s' out-of-date with respect to revision '%s'" -msgstr "Transaktion »%s« ist in Bezug auf Revision »%s« veraltet" +msgid "Can't add file at '%s'" +msgstr "Kann Datei »%s« nicht hinzufügen" -#: ../libsvn_fs_base/tree.c:2948 +#: ../libsvn_client/mtcc.c:538 ../libsvn_client/ra.c:708 +#: ../libsvn_delta/branch_repos.c:91 ../libsvn_fs_base/lock.c:274 +#: ../libsvn_fs_fs/fs_fs.c:1506 ../libsvn_fs_fs/lock.c:759 +#: ../libsvn_fs_fs/rev_file.c:177 ../libsvn_fs_fs/rev_file.c:189 +#: ../libsvn_fs_x/fs_x.c:724 ../libsvn_fs_x/lock.c:779 +#: ../libsvn_fs_x/rev_file.c:245 ../libsvn_repos/commit.c:193 +#: ../libsvn_repos/log.c:2368 ../libsvn_repos/log.c:2372 +#: ../libsvn_repos/rev_hunt.c:850 ../libsvn_repos/rev_hunt.c:857 +#: ../libsvn_repos/rev_hunt.c:864 #, c-format -msgid "Cannot deltify revisions prior to r%ld" -msgstr "Die Erstellung von Deltas für Revisionen vor r%ld ist nicht möglich" +msgid "No such revision %ld" +msgstr "Keine Revision %ld" -#: ../libsvn_fs_base/tree.c:3066 ../libsvn_fs_fs/tree.c:2494 -#: ../libsvn_fs_x/tree.c:2502 -msgid "The root directory cannot be deleted" -msgstr "Das Basisverzeichnis kann nicht gelöscht werden" +#: ../libsvn_client/mtcc.c:560 +#, c-format +msgid "Can't add node at '%s'" +msgstr "Kann Knoten »%s« nicht hinzufügen" -#: ../libsvn_fs_base/tree.c:3280 ../libsvn_fs_fs/tree.c:2564 -#: ../libsvn_fs_x/tree.c:2576 +#: ../libsvn_client/mtcc.c:621 #, c-format -msgid "Cannot copy between two different filesystems ('%s' and '%s')" -msgstr "Kann nicht zwischen zwei verschiedenen Dateisystemen (»%s« und »%s«) kopieren" +msgid "Can't delete node at '%s' as it does not exist" +msgstr "Kann Knoten »%s« nicht löschen da er nicht existiert" -#: ../libsvn_fs_base/tree.c:3289 ../libsvn_fs_fs/tree.c:2571 -#: ../libsvn_fs_x/tree.c:2583 -msgid "Copy from mutable tree not currently supported" -msgstr "Kopieren eines veränderlichen Baumes wird derzeit nicht unterstützt" +#: ../libsvn_client/mtcc.c:652 +#, c-format +msgid "Can't delete node at '%s'" +msgstr "Kann Knoten »%s« nicht löschen" -#: ../libsvn_fs_base/tree.c:3799 ../libsvn_fs_fs/tree.c:2966 -#: ../libsvn_fs_x/tree.c:2991 +#: ../libsvn_client/mtcc.c:697 #, c-format -msgid "Base checksum mismatch on '%s'" -msgstr "Basis-Prüfsummenfehler bei »%s«" +msgid "Can't create directory at '%s'" +msgstr "Kann Verzeichnis »%s« nicht erstellen" -#: ../libsvn_fs_base/tree.c:4075 ../libsvn_fs_fs/tree.c:3176 -#: ../libsvn_fs_x/tree.c:3210 -msgid "Cannot compare file contents between two different filesystems" -msgstr "Kann Dateiinhalte nicht zwischen verschiedenen Dateisystemen vergleichen" +#: ../libsvn_client/mtcc.c:836 ../libsvn_client/prop_commands.c:282 +#: ../libsvn_client/prop_commands.c:477 +#, c-format +msgid "Bad property name: '%s'" +msgstr "Ungültiger Name für Eigenschaft: »%s«" -#: ../libsvn_fs_base/tree.c:5124 ../libsvn_fs_base/tree.c:5299 +#: ../libsvn_client/mtcc.c:840 ../libsvn_client/prop_commands.c:275 #, c-format -msgid "Node-revision '%s' claims to have mergeinfo but doesn't" -msgstr "Knotenrevision »%s« behauptet, Zusammenführungsinformationen zu haben, hat aber keine" +msgid "Revision property '%s' not allowed in this context" +msgstr "Revisionseigenschaft »%s« ist in diesem Kontext nicht erlaubt" -#: ../libsvn_fs_base/tree.c:5160 +#: ../libsvn_client/mtcc.c:845 ../libsvn_client/prop_commands.c:60 #, c-format -msgid "Node-revision '%s' claims to sit atop a tree containing mergeinfo but is not a directory" -msgstr "Knotenrevision »%s« behauptet, über einem Baum, der Zusammenführungsinformationen enthält, zu sitzen, ist aber kein Verzeichnis" +msgid "'%s' is a wcprop, thus not accessible to clients" +msgstr "»%s« ist eine AK-Eigenschaft und damit den Clients nicht zugänglich" -#: ../libsvn_fs_fs/cached_data.c:709 ../libsvn_fs_x/cached_data.c:582 -msgid "Malformed svndiff data in representation" -msgstr "Fehlerhafte svndiff-Daten in Darstellung" +#: ../libsvn_client/mtcc.c:855 +msgid "Error normalizing property value" +msgstr "Fehler beim Normalisieren des Eigenschaftswertes" -#: ../libsvn_fs_fs/cached_data.c:956 ../libsvn_fs_x/cached_data.c:842 +#: ../libsvn_client/mtcc.c:890 ../libsvn_client/mtcc.c:913 #, c-format -msgid "No representation found at offset %s for item %s in revision %ld" -msgstr "Keine Darstellung gefunden bei Offset %s für Element %s in Revision %ld" +msgid "Can't set properties at not existing '%s'" +msgstr "Kann Eigenschaften nicht für nicht vorhandenes »%s« setzen" -#: ../libsvn_fs_fs/cached_data.c:1522 ../libsvn_fs_fs/cached_data.c:1535 -#: ../libsvn_fs_fs/cached_data.c:2930 ../libsvn_fs_x/cached_data.c:1424 -#: ../libsvn_fs_x/cached_data.c:1437 ../libsvn_fs_x/cached_data.c:1713 -msgid "Reading one svndiff window read beyond the end of the representation" -msgstr "Lesen eines svndiff-Fensters las über Ende der Darstellung hinaus" +#: ../libsvn_client/mtcc.c:961 +#, c-format +msgid "Can't update '%s' because it is not a file" +msgstr "Kann »%s« nicht aktualisieren, da es keine Datei ist" -#: ../libsvn_fs_fs/cached_data.c:1642 ../libsvn_fs_x/cached_data.c:1565 -msgid "svndiff window length is corrupt" -msgstr "Svndiff Fensterlänge ist beschädigt" +#: ../libsvn_client/mtcc.c:972 +#, c-format +msgid "Can't update file at '%s'" +msgstr "Kann Datei in »%s« nicht aktualisieren" -#: ../libsvn_fs_fs/cached_data.c:2038 ../libsvn_fs_x/cached_data.c:2143 -msgid "Checksum mismatch while reading representation" -msgstr "Prüfsummenfehler beim Lesen der Darstellung" +#: ../libsvn_client/mtcc.c:1037 +#, c-format +msgid "Can't perform file operation on '%s' as it is not a file" +msgstr "Kann Dateioperation auf »%s« nicht ausführen, das es keine Datei ist" -#: ../libsvn_fs_fs/cached_data.c:2389 ../libsvn_fs_fs/cached_data.c:2403 -#: ../libsvn_fs_fs/cached_data.c:2410 ../libsvn_fs_x/cached_data.c:2508 -#: ../libsvn_fs_x/cached_data.c:2522 ../libsvn_fs_x/cached_data.c:2529 +#: ../libsvn_client/mtcc.c:1047 #, c-format -msgid "Directory entry corrupt in '%s'" -msgstr "Verzeichniseintrag beschädigt in »%s«" +msgid "Can't perform directory operation on '%s' as it is not a directory" +msgstr "Kann Verzeichnisoperation auf »%s« nicht ausführen, das es kein Verzeichnis ist" -#: ../libsvn_fs_fs/cached_data.c:3111 +#: ../libsvn_client/mtcc.c:1054 #, c-format -msgid "" -"Low-level checksum mismatch while reading\n" -"%s bytes of meta data at offset %s for item %s in revision %ld" -msgstr "" -"Interner Prüfsummenfehler beim Lesen von\n" -"%s Byte von Metadaten bei Offset %s für Element »%s« in Revision »%ld«" +msgid "Can't open '%s' as it does not exist" +msgstr "Kann »%s« nicht öffnen, da es nicht existiert" -#: ../libsvn_fs_fs/dag.c:431 ../libsvn_fs_fs/dag.c:448 -#: ../libsvn_fs_x/dag.c:377 ../libsvn_fs_x/dag.c:504 -#: ../libsvn_ra_serf/stat.c:606 -msgid "Can't get entries of non-directory" -msgstr "Kann keine Einträge aus einem nicht-Verzeichnis lesen" +#: ../libsvn_client/mtcc.c:1446 +#, c-format +msgid "Can't commit to '%s' because it is not a directory" +msgstr "Kann nicht nach »%s« übertragen, da es kein Verzeichnis ist" -#: ../libsvn_fs_fs/dag.c:557 ../libsvn_fs_x/dag.c:613 +#: ../libsvn_client/patch.c:346 #, c-format -msgid "Can't increment mergeinfo count on node-revision %%s to negative value %%%s" -msgstr "Kann Zusammenführungsinformationszähler für Knotenrevision %%s nicht auf negativen Wert %%%s erhöhen" +msgid "Cannot strip %u components from '%s'" +msgstr "Kann nicht %u Komponenten von »%s« entfernen" -# FIXME: node-revision or node-rev (wie überall)? -#: ../libsvn_fs_fs/dag.c:568 ../libsvn_fs_x/dag.c:624 +#: ../libsvn_client/patch.c:1296 ../libsvn_client/patch.c:1342 #, c-format -msgid "Can't increment mergeinfo count on *file* node-revision %%s to %%%s (> 1)" -msgstr "Kann Zusammenführungsinformationszähler für Datei-Knotenrevision %%s nicht auf %%%s (> 1) erhöhen" +msgid "Invalid patch: specifies contradicting mode changes and %s changes (for '%s')" +msgstr "" -#: ../libsvn_fs_fs/dag.c:1157 ../libsvn_fs_x/dag.c:1165 -msgid "Empty noderev in cache" -msgstr "Leere Knotenrevision im Zwischenspeicher" +#: ../libsvn_client/patch.c:3741 +msgid "strip count must be positive" +msgstr "Anzahl der zu entfernenden Komponenten muss positiv sein" -#: ../libsvn_fs_fs/dag.c:1361 ../libsvn_fs_x/dag.c:1357 +#: ../libsvn_client/patch.c:3757 ../libsvn_fs_base/tree.c:4112 +#: ../libsvn_fs_base/tree.c:4117 ../libsvn_fs_fs/tree.c:3245 +#: ../libsvn_fs_fs/tree.c:3251 ../libsvn_fs_x/tree.c:2188 +#: ../libsvn_fs_x/tree.c:2194 ../libsvn_ra/compat.c:677 +#: ../libsvn_ra_local/ra_plugin.c:1290 #, c-format -msgid "Attempted to update ancestry of non-mutable node" -msgstr "Versuchte, die Herkunft eines unveränderlichen Knotens zu ändern" +msgid "'%s' is not a file" +msgstr "»%s« ist keine Datei" -#: ../libsvn_fs_fs/fs.c:100 +#: ../libsvn_client/patch.c:3769 ../libsvn_wc/util.c:59 #, c-format -msgid "Can't fetch FSFS shared data" -msgstr "Kann gemeinsame FSFS-Daten nicht holen" +msgid "'%s' is not a directory" +msgstr "»%s« ist kein Verzeichnis" -#: ../libsvn_fs_fs/fs.c:129 +#: ../libsvn_client/prop_commands.c:155 #, c-format -msgid "Can't store FSFS shared data" -msgstr "Kann gemeinsame FSFS-Daten nicht speichern" +msgid "Property '%s' is not a regular property" +msgstr "Eigenschaft »%s« ist keine reguläre Eigenschaft" -#: ../libsvn_fs_fs/fs.c:545 -msgid "Module for working with a plain file (FSFS) repository." -msgstr "Modul zum Zugriff auf ein dateibasiertes (FSFS) Projektarchiv." +#: ../libsvn_client/prop_commands.c:310 +msgid "Targets must be working copy paths" +msgstr "Ziele müssen Arbeitskopiepfade sein" -#: ../libsvn_fs_fs/fs.c:607 -#, c-format -msgid "Unsupported FS loader version (%d) for fsfs" -msgstr "Nicht unterstützte Dateisystem-Laderversion (%d) für fsfs" +#: ../libsvn_client/prop_commands.c:371 +msgid "Targets must be URLs" +msgstr "Ziele müssen URLs sein" -#: ../libsvn_fs_fs/fs_fs.c:444 -#, c-format -msgid "Found format '%d', only created by unreleased dev builds; see http://subversion.apache.org/docs/release-notes/1.7#revprop-packing" -msgstr "Format »%d« gefunden, das nur durch nicht veröffentlichte Entwicklungsversionen erstellt wurde; siehe http://subversion.apache.org/docs/release-notes/1.7#revprop-packing" +#: ../libsvn_client/prop_commands.c:381 +msgid "Setting property on non-local targets needs a base revision" +msgstr "Das Setzen einer Eigenschaft für ein nicht lokales Ziel benötigt eine Basisrevision" -#: ../libsvn_fs_fs/fs_fs.c:455 ../libsvn_fs_x/fs_x.c:103 +#: ../libsvn_client/prop_commands.c:396 #, c-format -msgid "Expected FS format between '1' and '%d'; found format '%d'" -msgstr "Erwartete Dateisystemformat zwischen 1 und %d; fand %d" +msgid "Setting property '%s' on non-local targets is not supported" +msgstr "Das Setzen der Eigenschaft »%s« für ein nicht lokales Ziel wird nicht unterstützt" -#: ../libsvn_fs_fs/fs_fs.c:506 ../libsvn_fs_x/fs_x.c:128 +#: ../libsvn_client/prop_commands.c:424 #, c-format -msgid "Can't read first line of format file '%s'" -msgstr "Die erste Zeile der Formatdatei »%s« kann nicht gelesen werden" +msgid "revprop '%s' in r%ld is unexpectedly absent in repository (maybe someone else deleted it?)" +msgstr "Revisionseigenschaft »%s« in r%ld fehlt unerwarteterweise im Projektarchiv (eventuell hat jemand anderer sie gelöscht?)" -#: ../libsvn_fs_fs/fs_fs.c:563 ../libsvn_fs_x/fs_x.c:150 +#: ../libsvn_client/prop_commands.c:433 #, c-format -msgid "'%s' contains invalid filesystem format option '%s'" -msgstr "»%s« enthält eine ungültige Dateisystemformat-Option »%s«" +msgid "revprop '%s' in r%ld has unexpected value in repository (maybe someone else changed it?)" +msgstr "Revisionseigenschaft »%s« in r%ld hat einen unerwarteten Wert im Projektarchiv (eventuell hat jemand anderer sie geändert?)" -#: ../libsvn_fs_fs/fs_fs.c:573 +#: ../libsvn_client/prop_commands.c:441 #, c-format -msgid "'%s' specifies logical addressing for a non-sharded repository" -msgstr "»%s« bestimmt logische Adressierung für ein nicht fragmentiertes Projektarchiv" +msgid "revprop '%s' in r%ld is unexpectedly present in repository (maybe someone else set it?)" +msgstr "Revisionseigenschaft »%s« in r%ld ist unerwarteterweise im Projektarchiv vorhanden (eventuell hat jemand anderer sie gesetzt?)" -#: ../libsvn_fs_fs/fs_fs.c:655 ../libsvn_fs_x/fs_x.c:209 -#, c-format -msgid "%s is too small for fsfs.conf setting '%s'." -msgstr "»%s« ist zu klein für die Einstellung »%s« in fsfs.conf." +#: ../libsvn_client/prop_commands.c:472 +msgid "Author name should not contain a newline; value will not be set unless forced" +msgstr "Der Autorenname sollte keinen Zeilenvorschub enthalten; Wert kann nur mittels »force« gesetzt werden" -#: ../libsvn_fs_fs/fs_fs.c:663 ../libsvn_fs_x/fs_x.c:217 +#: ../libsvn_client/prop_commands.c:565 #, c-format -msgid "%s is too large for fsfs.conf setting '%s'." -msgstr "»%s« ist zu groß für die Einstellung »%s« in fsfs.conf." +msgid "'%s' does not exist in revision %ld" +msgstr "»%s« existiert nicht in Revision %ld" -#: ../libsvn_fs_fs/fs_fs.c:674 ../libsvn_fs_x/fs_x.c:228 +#: ../libsvn_client/prop_commands.c:571 ../libsvn_client/prop_commands.c:1081 #, c-format -msgid "%s is invalid for fsfs.conf setting '%s' because it is not a power of 2." -msgstr "»%s« ist ungültig für die Einstellung »%s« in fsfs.conf, da es keine Zweierpotenz ist." +msgid "Unknown node kind for '%s'" +msgstr "»%s« hat einen unbekannten Knotentyp" -#: ../libsvn_fs_fs/fs_fs.c:1186 +#: ../libsvn_client/ra.c:164 #, c-format -msgid "'%s' is not a regular file. Please move it out of the way and try again" -msgstr "»%s« ist keine reguläre Datei. Bitte aus dem Weg bewegen und noch einmal versuchen." +msgid "Attempt to set wcprop '%s' on '%s' in a non-commit operation" +msgstr "Versuch, wcprop »%s« auf »%s« in einer Nicht-Übertragungs-Operation zu setzen" -#: ../libsvn_fs_fs/fs_fs.c:1351 ../libsvn_fs_x/fs_x.c:675 +#: ../libsvn_client/ra.c:446 #, c-format -msgid "Invalid revision number '%ld'" -msgstr "Ungültige Revisionsnummer »%ld«" - -#: ../libsvn_fs_fs/fs_fs.c:1812 -msgid "FSFS is not compatible with Subversion prior to 1.1" -msgstr "FSFS ist nicht kompatibel mit Subversion älter als 1.1" +msgid "Redirect cycle detected for URL '%s'" +msgstr "Endlosschleife bei der Umleitung der URL »%s« entdeckt" -#: ../libsvn_fs_fs/fs_fs.c:2014 +#: ../libsvn_client/ra.c:734 ../libsvn_ra/compat.c:397 #, c-format -msgid "Node origin for '%s' exists with a different value (%s) than what we were about to store (%s)" -msgstr "Knotenursprung für »%s« existiert mit einem anderen Wert (%s) als der, der gespeichert werden soll (%s)" +msgid "Unable to find repository location for '%s' in revision %ld" +msgstr "Kann »%s« in Revision %ld nicht im Projektarchiv finden" -#: ../libsvn_fs_fs/hotcopy.c:107 ../libsvn_fs_x/hotcopy.c:108 -#: ../libsvn_subr/io.c:270 +#: ../libsvn_client/ra.c:746 #, c-format -msgid "Error converting entry in directory '%s' to UTF-8" -msgstr "Fehler beim Konvertieren eines Eintrags im Verzeichnis »%s« nach UTF-8" +msgid "The location for '%s' for revision %ld does not exist in the repository or refers to an unrelated object" +msgstr "»%s« für Revision %ld existiert nicht im Projektarchiv oder verweist auf ein nicht verwandtes Objekt" -#: ../libsvn_fs_fs/hotcopy.c:147 ../libsvn_fs_x/hotcopy.c:148 -#: ../libsvn_subr/io.c:1063 +#: ../libsvn_client/relocate.c:117 #, c-format -msgid "Source '%s' is not a directory" -msgstr "Quelle »%s« ist kein Verzeichnis" +msgid "'%s' is not the root of the repository" +msgstr "»%s« ist nicht die Basis des Projektarchivs" -#: ../libsvn_fs_fs/hotcopy.c:153 ../libsvn_fs_x/hotcopy.c:154 -#: ../libsvn_subr/io.c:1069 +#: ../libsvn_client/relocate.c:124 #, c-format -msgid "Destination '%s' is not a directory" -msgstr "Ziel »%s« ist kein Verzeichnis" +msgid "The repository at '%s' has uuid '%s', but the WC has '%s'" +msgstr "Das Projektarchiv in »%s« hat die UUID »%s«, aber die Arbeitskopie hat »%s«" -#: ../libsvn_fs_fs/hotcopy.c:226 ../libsvn_fs_x/hotcopy.c:228 -#: ../libsvn_subr/io.c:1146 ../libsvn_subr/io.c:2701 +#: ../libsvn_client/repos_diff.c:935 ../libsvn_wc/externals.c:629 #, c-format -msgid "Can't read directory '%s'" -msgstr "Kann Verzeichnis »%s« nicht lesen" +msgid "Base checksum mismatch for '%s'" +msgstr "Basis-Prüfsummenfehler bei »%s«" -#: ../libsvn_fs_fs/hotcopy.c:231 ../libsvn_fs_x/hotcopy.c:233 -#: ../libsvn_subr/io.c:1151 ../libsvn_subr/io.c:2706 ../libsvn_subr/io.c:4402 +#: ../libsvn_client/revisions.c:116 ../libsvn_client/revisions.c:143 #, c-format -msgid "Error closing directory '%s'" -msgstr "Fehler beim Schließen des Verzeichnisses »%s«" +msgid "Path '%s' has no committed revision" +msgstr "Pfad »%s« hat keine übertragene Revision" -#: ../libsvn_fs_fs/hotcopy.c:490 +#: ../libsvn_client/revisions.c:171 #, c-format -msgid "The FSFS format (%d) of the hotcopy source does not match the FSFS format (%d) of the hotcopy destination; please upgrade both repositories to the same format" -msgstr "Das FSFS-Format (%d) der Quelle für die Kopie im laufenden Betrieb entspricht nicht dem FSFS-Format (%d) des Ziels; Verwenden Sie auf beiden Seiten das gleiche Format" +msgid "Unrecognized revision type requested for '%s'" +msgstr "Unbekannter Revisionstyp für »%s« angefragt" -#: ../libsvn_fs_fs/hotcopy.c:499 ../libsvn_fs_x/hotcopy.c:495 -msgid "The UUID of the hotcopy source does not match the UUID of the hotcopy destination" -msgstr "Die UUID der Quelle für die Kopie im laufenden Betrieb entspricht nicht der UUID des Ziels" +#: ../libsvn_client/shelf.c:58 +msgid "Shelf name cannot be the empty string" +msgstr "" -#: ../libsvn_fs_fs/hotcopy.c:506 ../libsvn_fs_x/hotcopy.c:502 -msgid "The sharding layout configuration of the hotcopy source does not match the sharding layout configuration of the hotcopy destination" -msgstr "Die Einstellungen zur Fragmentierung der Quelle der Kopie im laufenden Betrieb entspricht nicht den Einstellungen zur Fragmentierung des Ziels" +#: ../libsvn_client/shelf.c:86 +#, fuzzy, c-format +msgid "Shelve: Bad encoded name '%s'" +msgstr "Ungültiger Name für Eigenschaft: »%s«" + +#: ../libsvn_client/shelf.c:148 +#, fuzzy, c-format +msgid "shelf '%s': no versions available" +msgstr "»%s«: Keine Sperrmarke verfügbar" -#: ../libsvn_fs_fs/hotcopy.c:581 ../libsvn_fs_x/hotcopy.c:575 +#: ../libsvn_client/shelf.c:152 #, c-format -msgid "The hotcopy destination already contains more packed revisions (%lu) than the hotcopy source contains (%lu)" -msgstr "Das Ziel der Kopie im laufenden Betrieb enthält bereits mehr gepackte Revisionen (%lu) als die Quelle (%lu)" +msgid "shelf '%s' has no version %d: max version is %d" +msgstr "" -#: ../libsvn_fs_fs/hotcopy.c:877 +#: ../libsvn_client/shelf.c:455 +#, fuzzy, c-format +msgid "Shelf '%s' not found" +msgstr "»%s« nicht gefunden" + +#: ../libsvn_client/status.c:422 ../libsvn_client/status.c:601 +#: ../libsvn_wc/lock.c:564 ../libsvn_wc/lock.c:856 ../libsvn_wc/lock.c:1542 +#: ../libsvn_wc/wc_db.c:13629 ../libsvn_wc/wc_db_wcroot.c:722 #, c-format -msgid "Failed to create hotcopy at '%s'. The file '%s' is missing from the source repository. Please create this file, for instance by running 'svnadmin upgrade %s'" -msgstr "Erstellen der hotcopy auf »%s« fehlgeschlagen. Die Datei »%s« fehlt im Quellprojektarchiv. Bitte diese Datei erstellen, z.B. durch die Ausführung von »svnadmin upgrade %s«" +msgid "'%s' is not a working copy" +msgstr "»%s« ist keine Arbeitskopie" -#: ../libsvn_fs_fs/hotcopy.c:903 ../libsvn_fs_x/hotcopy.c:786 +#: ../libsvn_client/status.c:469 #, c-format -msgid "The hotcopy destination already contains more revisions (%lu) than the hotcopy source contains (%lu); are source and destination swapped?" -msgstr "Das Ziel der Kopie im laufenden Betrieb enthält bereits mehr Revisionen (%lu) als die Quelle (%lu); Wurden Quelle und Ziel vertauscht?" +msgid "Entry '%s' has no URL" +msgstr "Eintrag »%s« hat keine URL" -#: ../libsvn_fs_fs/index.c:288 +#: ../libsvn_client/switch.c:129 #, c-format -msgid "Can't read index file '%s' at offset 0x%s" -msgstr "Kann Indexdatei »%s« bei Offset 0x%s nicht lesen" +msgid "Cannot both exclude and switch a path" +msgstr "Kann einen Pfad nicht sowohl ausschließen als auch umstellen" -#: ../libsvn_fs_fs/index.c:298 +#: ../libsvn_client/switch.c:150 #, c-format -msgid "Unexpected end of index file %s at offset 0x%s" -msgstr "Unerwartetes Ende der Indexdatei %s bei Offset 0x%s" +msgid "Cannot switch '%s' because it is not in the repository yet" +msgstr "Kann »%s« nicht umplatzieren da es noch nicht im Projektarchiv ist" -#: ../libsvn_fs_fs/index.c:333 ../libsvn_fs_x/index.c:339 +#: ../libsvn_client/switch.c:175 #, c-format -msgid "Corrupt index: number too large" -msgstr "Index beschädigt: Zahl ist zu groß" +msgid "Directory '%s' has no URL" +msgstr "Verzeichnis »%s« hat keine URL" -#: ../libsvn_fs_fs/index.c:376 ../libsvn_fs_x/index.c:382 +#: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:236 +#: ../libsvn_ra_local/ra_plugin.c:326 ../libsvn_wc/update_editor.c:4932 #, c-format msgid "" -"Index stream header prefix mismatch.\n" -" expected: %s found: %s" +"'%s'\n" +"is not the same repository as\n" +"'%s'" msgstr "" -"Fehler im Präfix der Kopfdaten des Indexstroms.\n" -" erwartet: %s tatsächlich: %s" +"»%s«\n" +"ist nicht das selbe Projektarchiv wie\n" +"»%s«" -#: ../libsvn_fs_fs/index.c:603 ../libsvn_fs_x/index.c:561 +#: ../libsvn_client/switch.c:240 #, c-format -msgid "UINT32 0x%s too large, max = 0x%s" -msgstr "UINT32 0x%s ist zu groß, max. 0x%s" +msgid "'%s' shares no common ancestry with '%s'" +msgstr "»%s« hat keinen Vorgänger gemeinsam mit »%s«" + +#: ../libsvn_client/update.c:762 +msgid "None of the targets are working copies" +msgstr "Keines der Ziele ist eine Arbeitskopie" -#: ../libsvn_fs_fs/index.c:635 ../libsvn_fs_x/index.c:593 +#: ../libsvn_client/util.c:342 #, c-format -msgid "File offset 0x%s too large, max = 0x%s" -msgstr "Dateioffset 0x%s ist zu groß, max. 0x%s" +msgid "Cannot mix repository and working copy targets" +msgstr "Ziele aus dem Projektarchiv und einer Arbeitskopie können nicht gemischt werden" -#: ../libsvn_fs_fs/index.c:809 ../libsvn_fs_x/index.c:942 +#: ../libsvn_delta/branch.c:230 #, c-format -msgid "L2P index page size %s exceeds current limit of 2G entries" -msgstr "Seitengröße %s des L2P-Index überschreitet die gegenwärtige Grenze von 2G Einträgen" +msgid "Cannot branch from r%ld %s e%d: branch does not exist" +msgstr "" -#: ../libsvn_fs_fs/index.c:870 ../libsvn_fs_x/index.c:1005 -#, c-format -msgid "Item index %s too large in l2p proto index for revision %ld" -msgstr "Elementindex %s zu groß in l2p-Proto-Index für Revision %ld" +#: ../libsvn_delta/branch.c:245 +#, fuzzy, c-format +msgid "Cannot branch from r%ld %s e%d: element does not exist" +msgstr "Kann »%s« nicht öffnen, da es nicht existiert" -#: ../libsvn_fs_fs/index.c:891 ../libsvn_fs_x/index.c:1029 +#: ../libsvn_delta/branch.c:1003 #, c-format -msgid "L2P index page count %d exceeds current limit of 2G pages" -msgstr "Seitenanzahl %d des L2P-Index überschreitet die gegenwärtige Grenze von 2G Seiten" - -#: ../libsvn_fs_fs/index.c:994 ../libsvn_fs_fs/index.c:2197 -#: ../libsvn_fs_x/index.c:1296 ../libsvn_fs_x/index.c:2542 -msgid "Index rev / pack file revision numbers do not match" -msgstr "Revisionsnummern in der REV/PACK Dateien des Index stimmen nicht überein" - -#: ../libsvn_fs_fs/index.c:1000 ../libsvn_fs_x/index.c:1309 -msgid "L2P index page size is not a power of two" -msgstr "Seitengröße des L2P-Index ist keine Zweierpotenz" - -#: ../libsvn_fs_fs/index.c:1007 ../libsvn_fs_x/index.c:1303 -msgid "Invalid number of revisions in L2P index" -msgstr "Ungültige Anzahl von Revisionen im L2P-Index" +msgid "Cannot set e%d to (parent=e%d, name='%s'): branch root is e%d" +msgstr "" -#: ../libsvn_fs_fs/index.c:1013 ../libsvn_fs_x/index.c:1315 -msgid "Fewer L2P index pages than revisions" -msgstr "Weniger Seiten im L2P-Index als Revisionen" +#: ../libsvn_delta/branch_nested.c:439 +#, fuzzy, c-format +msgid "Branch %s not found" +msgstr "Pfad »%s« nicht gefunden" -#: ../libsvn_fs_fs/index.c:1016 ../libsvn_fs_x/index.c:1318 -msgid "L2P index page count implausibly large" -msgstr "Anzahl der Seiten im L2P-Index ist unplausibel groß" +#: ../libsvn_delta/branch_repos.c:98 +#, fuzzy, c-format +msgid "Branch %s not found in r%ld" +msgstr "Pfad »%s« wurde in r%ld nicht gefunden." -#: ../libsvn_fs_fs/index.c:1021 ../libsvn_fs_x/index.c:1323 +#: ../libsvn_delta/svndiff.c:495 #, c-format -msgid "Corrupt L2P index for r%ld only covers r%ld:%ld" -msgstr "Beschädigter L2P-Index für r%ld deckt nur r%ld:%ld ab" - -#: ../libsvn_fs_fs/index.c:1040 ../libsvn_fs_x/index.c:1343 -msgid "Revision with no L2P index pages" -msgstr "Revision ohne Seiten im L2P-Index" - -#: ../libsvn_fs_fs/index.c:1045 ../libsvn_fs_x/index.c:1348 -msgid "L2P page table exceeded" -msgstr "Größenüberschreitung der Seitentablelle des L2P-Index" - -#: ../libsvn_fs_fs/index.c:1052 ../libsvn_fs_x/index.c:1355 -msgid "Revisions do not cover the full L2P index page table" -msgstr "Revisionen decken nicht die gesamte Seitentabelle im L2P-Indexab" - -#: ../libsvn_fs_fs/index.c:1060 ../libsvn_fs_x/index.c:1363 -msgid "Empty L2P index page" -msgstr "Leere Seite im L2P-Index" - -#: ../libsvn_fs_fs/index.c:1066 ../libsvn_fs_x/index.c:1369 -msgid "Page exceeds L2P index page size" -msgstr "Seite überschreitet Seitengröße im L2P-Index" +msgid "Invalid diff stream: insn %d cannot be decoded" +msgstr "Ungültiger Diff-Strom: insn %d kann nicht dekodiert werden" -#: ../libsvn_fs_fs/index.c:1125 ../libsvn_fs_x/index.c:1124 +#: ../libsvn_delta/svndiff.c:499 #, c-format -msgid "Revision %ld not covered by item index" -msgstr "Revision %ld nicht vom Elementindex abgedeckt" +msgid "Invalid diff stream: insn %d has length zero" +msgstr "Ungültiger Diff-Strom: insn %d hat Länge Null" -#: ../libsvn_fs_fs/index.c:1151 ../libsvn_fs_x/index.c:1150 +#: ../libsvn_delta/svndiff.c:503 #, c-format -msgid "Item index %s exceeds l2p limit of %s for revision %ld" -msgstr "Elementindex %s überschreitet l2p-Grenze von %s für Revision %ld" +msgid "Invalid diff stream: insn %d overflows the target view" +msgstr "Ungültiger Diff-Strom: insn %d läuft in die Zielansicht über" -#: ../libsvn_fs_fs/index.c:1358 ../libsvn_fs_x/index.c:1527 -msgid "L2P actual page size does not match page table value." -msgstr "Tatsächliche Seitengröße im L2P-Index stimmt nicht mit dem Wert in der Seitentabelle überein." +#: ../libsvn_delta/svndiff.c:512 +#, c-format +msgid "Invalid diff stream: [src] insn %d overflows the source view" +msgstr "Ungültiger Diff-Strom: [Quelle] insn %d läuft in die Quellansicht über" -#: ../libsvn_fs_fs/index.c:1491 ../libsvn_fs_x/index.c:1571 +#: ../libsvn_delta/svndiff.c:519 #, c-format -msgid "Item index %s too large in revision %ld" -msgstr "Elementindex %s ist zu groß in Revision %ld" +msgid "Invalid diff stream: [tgt] insn %d starts beyond the target view position" +msgstr "Ungültiger Diff-Strom: [Ziel] insn %d startet hinter der Zielposition" -#: ../libsvn_fs_fs/index.c:1910 ../libsvn_fs_x/index.c:2148 +#: ../libsvn_delta/svndiff.c:526 #, c-format -msgid "Revision 0x%s too large, max = 0x%s" -msgstr "Revision 0x%s ist zu groß, max. 0x%s" +msgid "Invalid diff stream: [new] insn %d overflows the new data section" +msgstr "Ungültiger Diff-Strom: [Neu] insn %d läuft in die neue Datensektion über" -#: ../libsvn_fs_fs/index.c:2203 ../libsvn_fs_x/index.c:2548 -msgid "Index offset and rev / pack file size do not match" -msgstr "Index-Offset und Größe der REV/PACK-Datei stimmen nicht überein" +#: ../libsvn_delta/svndiff.c:536 +msgid "Delta does not fill the target window" +msgstr "Delta füllt das Zielfenster nicht" -#: ../libsvn_fs_fs/index.c:2209 ../libsvn_fs_x/index.c:2554 -msgid "P2L index page size is not a power of two" -msgstr "Seitengröße des P2L-Index ist keine Zweierpotenz" +#: ../libsvn_delta/svndiff.c:539 +msgid "Delta does not contain enough new data" +msgstr "Delta enthält nicht genügend neue Daten" -#: ../libsvn_fs_fs/index.c:2215 ../libsvn_fs_x/index.c:2560 -msgid "P2L page count does not match rev / pack file size" -msgstr "Seitenanzahl im P2L-Index stimmt nicht mit der Größe der REV/PACK Datei überein" +#: ../libsvn_delta/svndiff.c:658 +msgid "Svndiff has invalid header" +msgstr "Svndiff-Daten enthalten ungültigen Kopf" -#: ../libsvn_fs_fs/index.c:2395 ../libsvn_fs_x/index.c:2649 -msgid "Invalid item type in P2L index" -msgstr "Ungültiger Elementtyp im P2L-Index" +#: ../libsvn_delta/svndiff.c:720 ../libsvn_delta/svndiff.c:930 +msgid "Svndiff contains a too-large window" +msgstr "Svndiff-Daten enthalten ein zu großes Fenster" -#: ../libsvn_fs_fs/index.c:2399 ../libsvn_fs_x/index.c:2702 -msgid "Changed path list must have item number 1" -msgstr "Liste der geänderten Pfade muss Elementnummer 1 tragen" +#: ../libsvn_delta/svndiff.c:728 ../libsvn_delta/svndiff.c:937 +msgid "Svndiff contains corrupt window header" +msgstr "Svndiff-Daten enthalten defekte Fenster-Kopfdaten" -#: ../libsvn_fs_fs/index.c:2413 ../libsvn_fs_x/index.c:2659 -msgid "Invalid FNV1 checksum in P2L index" -msgstr "Ungültige FNV1-Prüfsumme im P2L-Index" +#: ../libsvn_delta/svndiff.c:737 +msgid "Svndiff has backwards-sliding source views" +msgstr "Svndiff-Daten enthalten rückwärts gleitenden Blick auf Quellen" -#: ../libsvn_fs_fs/index.c:2422 -msgid "Empty regions must have item number 0 and checksum 0" -msgstr "Leere Bereiche müssen eine Elementnummer 0 und Prüfsumme 0 aufweisen" +#: ../libsvn_delta/svndiff.c:786 +#, fuzzy +msgid "Svndiff contains a too-large window header" +msgstr "Svndiff-Daten enthalten ein zu großes Fenster" -#: ../libsvn_fs_fs/index.c:2492 ../libsvn_fs_x/index.c:2768 -msgid "P2L page description overlaps with next page description" -msgstr "P2L-Seitenbeschreibung überlappt mit der Beschreibung der nächsten Seite" +#: ../libsvn_delta/svndiff.c:811 ../libsvn_delta/svndiff.c:871 +#: ../libsvn_delta/svndiff.c:959 +msgid "Unexpected end of svndiff input" +msgstr "Unerwartetes Ende der Svndiff-Eingangsdaten" -#: ../libsvn_fs_fs/index.c:2608 ../libsvn_fs_x/index.c:2883 -#, c-format -msgid "Offset %s too large in revision %ld" -msgstr "Offset %s ist zu groß in Revision %ld" +#: ../libsvn_diff/binary_diff.c:104 +#, fuzzy +msgid "Invalid base85 value" +msgstr "Ungültiger Wert für svn:mergeinfo" + +#: ../libsvn_diff/binary_diff.c:124 +#, fuzzy +msgid "Unexpected base85 line length" +msgstr "Unerwartetes Ende des Eintrags" -#: ../libsvn_fs_fs/index.c:2798 ../libsvn_fs_x/index.c:3086 +#: ../libsvn_diff/diff_file.c:186 #, c-format -msgid "Last P2L index entry extends beyond the last page in revision %ld." -msgstr "Letzter Eintrag im P2L-Index geht über die letzte Seite in der Revision %ld hinaus." +msgid "File '%s' is too large to be read in to memory" +msgstr "Datei »%s« ist zu groß um in den Speicher gelesen zu werden" -#: ../libsvn_fs_fs/lock.c:120 ../libsvn_fs_x/lock.c:121 +#: ../libsvn_diff/diff_file.c:1103 #, c-format -msgid "Corrupt lockfile for path '%s' in filesystem '%s'" -msgstr "Beschädigte Sperrdatei für Pfad »%s« in Dateisystem »%s«" +msgid "The file '%s' changed unexpectedly during diff" +msgstr "Die Datei »%s« veränderte sich unerwartet während des Vergleichs" + +#: ../libsvn_diff/diff_file.c:1280 +msgid "Error in options to internal diff" +msgstr "Fehler in Optionen für internes Vergleichsprogramm" -#: ../libsvn_fs_fs/lock.c:228 ../libsvn_fs_x/lock.c:240 +#: ../libsvn_diff/diff_file.c:1309 #, c-format -msgid "Cannot write lock/entries hashfile '%s'" -msgstr "Kann »lock/entries« Hashdatei »%s« nicht schreiben" +msgid "Invalid argument '%s' in diff options" +msgstr "Ungültiges Argument »%s« in Vergleichsoptionen" -#: ../libsvn_fs_fs/lock.c:279 ../libsvn_fs_x/lock.c:292 +#. Order of date components can be different in different languages +#: ../libsvn_diff/diff_file.c:1830 +msgid "%a %b %e %H:%M:%S %Y" +msgstr "%a %e. %b %H:%M:%S %Y" + +#: ../libsvn_diff/diff_file.c:1913 ../libsvn_diff/diff_file.c:1929 #, c-format -msgid "Can't parse lock/entries hashfile '%s'" -msgstr "Kann »lock/entries« Hashdatei »%s« nicht zerlegen" +msgid "Path '%s' must be inside the directory '%s'" +msgstr "Pfad »%s« muss innerhalb des Verzeichnisses »%s« sein" -#: ../libsvn_fs_fs/lock.c:784 ../libsvn_fs_x/lock.c:824 +#: ../libsvn_diff/diff_file.c:2475 #, c-format -msgid "Lock failed: newer version of '%s' exists" -msgstr "Sperren schlug fehl: eine neuere Version von »%s« existiert" +msgid "Failed to delete mmap '%s'" +msgstr "Konnte mmap »%s« nicht löschen" + +#: ../libsvn_diff/parse-diff.c:373 +#, fuzzy +msgid "Unexpected data in base85 section" +msgstr "Unerwarteter Knotentyp gefunden" + +#: ../libsvn_diff/parse-diff.c:442 +msgid "Base85 data expands to longer than declared filesize" +msgstr "" + +#: ../libsvn_diff/parse-diff.c:446 +msgid "Base85 data expands to smaller than declared filesize" +msgstr "" -#: ../libsvn_fs_fs/lock.c:1164 ../libsvn_fs_x/lock.c:1292 +#: ../libsvn_diff/util.c:477 #, c-format -msgid "Failed to lock '%s'" -msgstr "Konnte »%s« nicht sperren" +msgid " Reverse-merged %s:r%s%s" +msgstr " Rückgängiges Zusammenführen: %s:r%s%s" -#: ../libsvn_fs_fs/lock.c:1258 ../libsvn_fs_x/lock.c:1383 +#: ../libsvn_diff/util.c:494 #, c-format -msgid "Failed to unlock '%s'" -msgstr "Konnte »%s« nicht entsperren" +msgid " Merged %s:r%s%s" +msgstr " Zusammengeführt %s:r%s%s" -#: ../libsvn_fs_fs/low_level.c:97 ../libsvn_fs_x/low_level.c:100 -msgid "Invalid character in revision number" -msgstr "Ungültiges Zeichen in Revisionsnummer" +#: ../libsvn_fs/editor.c:217 +#, c-format +msgid "Revision for modifying '%s' is required" +msgstr "Revision für Bearbeitung von »%s« erforderlich" -#: ../libsvn_fs_fs/low_level.c:120 +#: ../libsvn_fs/editor.c:226 #, c-format -msgid "Revision file (r%ld) lacks trailing newline" -msgstr "Revisionsdatei (r%ld) hat keinen abschließenden Zeilenumbruch" +msgid "'%s' is out of date; try updating" +msgstr "»%s« ist veraltet; versuchen Sie zu aktualisieren" -#: ../libsvn_fs_fs/low_level.c:134 +#: ../libsvn_fs/editor.c:258 #, c-format -msgid "Final line in revision file (r%ld) longer than 64 characters" -msgstr "Letzte Zeile in der Revisionsdatei (r%ld) ist länger als 64 Zeichen" +msgid "'%s' has been modified since the commit began (restart the commit)" +msgstr "»%s« wurde seit dem Beginn der Übertragung verändert (Übertragung neu starten)" -#: ../libsvn_fs_fs/low_level.c:149 +#: ../libsvn_fs/editor.c:316 #, c-format -msgid "Final line in revision file r%ld missing space" -msgstr "Letzte Zeile in der Revisionsdatei r%ld hat nicht genug Leerzeichen" +msgid "'%s' already exists, so may be out of date; try updating" +msgstr "»%s« existiert schon, kann also veraltet sein; versuchen Sie zu aktualisieren" -#: ../libsvn_fs_fs/low_level.c:208 ../libsvn_fs_fs/low_level.c:217 -#: ../libsvn_fs_fs/low_level.c:226 ../libsvn_fs_fs/low_level.c:235 -#: ../libsvn_fs_x/low_level.c:122 ../libsvn_fs_x/low_level.c:131 -#: ../libsvn_fs_x/low_level.c:140 ../libsvn_fs_x/low_level.c:149 -msgid "Invalid revision footer" -msgstr "Ungültige Fußdaten für Revision" - -#: ../libsvn_fs_fs/low_level.c:293 ../libsvn_fs_fs/low_level.c:298 -#: ../libsvn_fs_fs/low_level.c:304 ../libsvn_fs_fs/low_level.c:321 -#: ../libsvn_fs_fs/low_level.c:354 ../libsvn_fs_fs/low_level.c:374 -#: ../libsvn_fs_fs/low_level.c:399 ../libsvn_fs_x/low_level.c:804 -#: ../libsvn_fs_x/low_level.c:812 ../libsvn_fs_x/low_level.c:829 -#: ../libsvn_fs_x/low_level.c:862 ../libsvn_fs_x/low_level.c:882 -#: ../libsvn_fs_x/low_level.c:902 -msgid "Invalid changes line in rev-file" -msgstr "Ungültige »changes« Zeile in Rev Datei" +#: ../libsvn_fs/editor.c:449 +msgid "The filesystem does not support 'absent' nodes" +msgstr "Das Dateisystem unterstützt keine »absent« Knoten" -#: ../libsvn_fs_fs/low_level.c:347 ../libsvn_fs_x/low_level.c:855 -msgid "Invalid change kind in rev file" -msgstr "Ungültiger Änderungstyp in Rev Datei" +#: ../libsvn_fs/fs-loader.c:155 +#, c-format +msgid "Invalid name for FS type '%s'" +msgstr "Ungültiger Name für Dateisystemtyp »%s«" -#: ../libsvn_fs_fs/low_level.c:367 ../libsvn_fs_x/low_level.c:875 -msgid "Invalid text-mod flag in rev-file" -msgstr "Ungültiges »text-mod« Flag in Rev Datei" +#: ../libsvn_fs/fs-loader.c:172 ../libsvn_ra/ra_loader.c:163 +#: ../libsvn_ra/ra_loader.c:176 +#, c-format +msgid "'%s' does not define '%s()'" +msgstr "»%s« definiert »%s()« nicht" -#: ../libsvn_fs_fs/low_level.c:387 ../libsvn_fs_x/low_level.c:895 -msgid "Invalid prop-mod flag in rev-file" -msgstr "Ungültiges »prop-mod« Flag in Rev Datei" +#: ../libsvn_fs/fs-loader.c:205 +#, c-format +msgid "Failed to load module for FS type '%s'" +msgstr "Konnte Modul für Dateisystemtyp »%s« nicht laden" -#: ../libsvn_fs_fs/low_level.c:412 ../libsvn_fs_x/low_level.c:915 -msgid "Invalid mergeinfo-mod flag in rev-file" -msgstr "Ungültiges »mergeinfo-mod« Flag in Rev Datei" +#: ../libsvn_fs/fs-loader.c:226 +#, c-format +msgid "Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" +msgstr "Versionen in Dateisystemmodul »%s« stimmen nicht überein: gefunden %d.%d.%d%s, erwartet %d.%d.%d%s" -#: ../libsvn_fs_fs/low_level.c:419 ../libsvn_fs_x/low_level.c:921 -msgid "Invalid path in changes line" -msgstr "Ungültiger Pfad in Zeile »changes«" +#: ../libsvn_fs/fs-loader.c:316 +#, c-format +msgid "Unknown FS type '%s'" +msgstr "Unbekannter Dateisystemtyp »%s«" -#: ../libsvn_fs_fs/low_level.c:439 ../libsvn_fs_x/low_level.c:944 -msgid "Invalid copy-from path in changes line" -msgstr "Ungültiger Pfad »copy-from« in Zeile »changes«" +#: ../libsvn_fs/fs-loader.c:465 +#, c-format +msgid "Path '%s' is not in UTF-8" +msgstr "Pfad »%s« ist kein UTF-8" -#: ../libsvn_fs_fs/low_level.c:545 ../libsvn_fs_x/low_level.c:1044 +#: ../libsvn_fs/fs-loader.c:473 #, c-format -msgid "Invalid change type %d" -msgstr "Ungültiger Änderungstyp %d" +msgid "Path '%s' contains '.' or '..' element" +msgstr "Pfad »%s« enthält ein Element ».« oder »..«" -#: ../libsvn_fs_fs/low_level.c:673 ../libsvn_fs_fs/low_level.c:690 -#: ../libsvn_fs_x/low_level.c:204 ../libsvn_fs_x/low_level.c:221 +#: ../libsvn_fs/fs-loader.c:485 ../libsvn_fs_fs/tree.c:2476 +#: ../libsvn_subr/path.c:1240 #, c-format -msgid "Found malformed header '%s' in revision file" -msgstr "Fehlerhafte Kopfdaten »%s« in Revisionsdatei gefunden" +msgid "Invalid control character '0x%02x' in path '%s'" +msgstr "Ungültiges Steuerzeichen »0x%02x« in Pfad »%s«" -#: ../libsvn_fs_fs/low_level.c:737 ../libsvn_fs_fs/low_level.c:746 -#: ../libsvn_fs_fs/low_level.c:754 ../libsvn_fs_fs/low_level.c:763 -#: ../libsvn_fs_fs/low_level.c:777 ../libsvn_fs_fs/low_level.c:788 -#: ../libsvn_fs_fs/low_level.c:795 ../libsvn_fs_fs/low_level.c:802 -#: ../libsvn_fs_x/low_level.c:257 ../libsvn_fs_x/low_level.c:272 -#: ../libsvn_fs_x/low_level.c:281 ../libsvn_fs_x/low_level.c:289 -#: ../libsvn_fs_x/low_level.c:298 ../libsvn_fs_x/low_level.c:313 -msgid "Malformed text representation offset line in node-rev" -msgstr "Fehlerhafte »text representation offset«-Zeile in Knotenrevision" +#: ../libsvn_fs/fs-loader.c:665 ../libsvn_repos/repos.c:1990 +msgid "Hotcopy source and destination are equal" +msgstr "Quelle und Ziel für Kopie im laufenden Betrieb sind gleich" -#: ../libsvn_fs_fs/low_level.c:829 ../libsvn_fs_x/low_level.c:346 +#: ../libsvn_fs/fs-loader.c:675 #, c-format -msgid "While reading representation offsets for node-revision '%s':" -msgstr "Beim Lesen der Darstellungsoffsets für Knotenrevision »%s«" - -#: ../libsvn_fs_fs/low_level.c:863 -msgid "Missing id field in node-rev" -msgstr "Fehlendes ID-Feld in Knotenrevision" +msgid "'%s' already exists and is a file" +msgstr "»%s« existiert bereits und ist eine Datei" -#: ../libsvn_fs_fs/low_level.c:878 ../libsvn_fs_x/low_level.c:462 +#: ../libsvn_fs/fs-loader.c:680 #, c-format -msgid "Missing kind field in node-rev '%s'" -msgstr "Fehlendes Feld »kind« in Knotenrevision »%s«" +msgid "'%s' already exists and has an unknown node kind" +msgstr "»%s« existiert bereits und hat einen unbekannten Knotentyp" -#: ../libsvn_fs_fs/low_level.c:913 ../libsvn_fs_x/low_level.c:499 +#: ../libsvn_fs/fs-loader.c:698 #, c-format -msgid "Missing cpath field in node-rev '%s'" -msgstr "Fehlendes Feld »cpath« in Knotenrevision »%s«" +msgid "The filesystem type of the hotcopy source ('%s') does not match the filesystem type of the hotcopy destination ('%s')" +msgstr "Der Dateisystemtyp der Quelle für die Kopie im laufenden Betrieb (»%s«) stimmt nicht mit dem Dateisystemtyp des Ziels der Kopie im laufenden Betrieb (»%s«) überein" -#: ../libsvn_fs_fs/low_level.c:920 ../libsvn_fs_x/low_level.c:506 +#: ../libsvn_fs/fs-loader.c:969 ../libsvn_fs/fs-loader.c:987 #, c-format -msgid "Non-canonical cpath field in node-rev '%s'" -msgstr "Nicht-kanonischer »cpath« in Knotenrevision »%s«" +msgid "Attempt to modify internal transaction property '%s'" +msgstr "Versuch, eine interne Transaktionseigenschaft »%s« zu schreiben" -#: ../libsvn_fs_fs/low_level.c:945 ../libsvn_fs_x/low_level.c:535 +#: ../libsvn_fs/fs-loader.c:1810 #, c-format -msgid "Malformed copyroot line in node-rev '%s'" -msgstr "Fehlerhafte »copyroot«-Zeile in Knotenrevision »%s«" +msgid "Malformed UUID '%s'" +msgstr "Fehlerhafte UUID »%s«" -#: ../libsvn_fs_fs/low_level.c:963 ../libsvn_fs_x/low_level.c:555 +#: ../libsvn_fs/fs-loader.c:1839 +msgid "Negative expiration date passed to svn_fs_lock" +msgstr "Negatives Ablaufdatum an svn_fs_lock übergeben" + +#: ../libsvn_fs/fs-loader.c:1854 #, c-format -msgid "Malformed copyfrom line in node-rev '%s'" -msgstr "Fehlerhafte »copyfrom«-Zeile in Knotenrevision »%s«" +msgid "Lock token URI '%s' has bad scheme; expected '%s'" +msgstr "URI der Sperrmarke »%s« hat fehlerhaften Schema, erwartete »%s«" -#: ../libsvn_fs_fs/low_level.c:1168 ../libsvn_fs_x/low_level.c:748 +#: ../libsvn_fs/fs-loader.c:1864 #, c-format -msgid "Malformed representation header" -msgstr "Fehlerhafter Darstellungskopf" +msgid "Lock token '%s' is not ASCII or is a control character at byte %u" +msgstr "Sperrmarke »%s« besteht nicht aus ASCII oder hat ein Steuerzeichen bei Byte %u" -#: ../libsvn_fs_fs/pack.c:1947 +#: ../libsvn_fs/fs-loader.c:1874 #, c-format -msgid "FSFS format (%d) too old to pack; please upgrade the filesystem." -msgstr "Das FSFS-Format (%d) ist zum Packen zu alt, bitte verwenden Sie ein neueres Format" - -#: ../libsvn_fs_fs/recovery.c:171 -msgid "Recovery encountered a non-directory node" -msgstr "Wiederherstellung fand einen Nicht-Verzeichnisknoten" +msgid "Lock token URI '%s' is not XML-safe" +msgstr "URI der Sperrmarke »%s« ist nicht sicher für XML" -#: ../libsvn_fs_fs/recovery.c:192 -msgid "Recovery encountered a deltified directory representation" -msgstr "Wiederherstellung fand eine deltifizierte Verzeichnisrepräsentation" +#: ../libsvn_fs_base/bdb/bdb-err.c:104 +#, c-format +msgid "Berkeley DB error for filesystem '%s' while %s:\n" +msgstr "Berkeley-DB-Fehler für Dateisystem »%s« während %s:\n" -#: ../libsvn_fs_fs/recovery.c:232 ../libsvn_fs_fs/recovery.c:241 -#: ../libsvn_fs_fs/recovery.c:247 -msgid "Directory entry corrupt" -msgstr "Verzeichniseintrag beschädigt" +#: ../libsvn_fs_base/bdb/changes-table.c:94 +msgid "creating change" +msgstr "Erzeuge Änderungen" -# FIXME: rev ==> revision -#: ../libsvn_fs_fs/recovery.c:393 ../libsvn_fs_x/recovery.c:178 -#, c-format -msgid "Expected current rev to be <= %ld but found %ld" -msgstr "Erwartete, dass aktuelle Revision <= %ld gilt, fand aber %ld" +#: ../libsvn_fs_base/bdb/changes-table.c:118 +msgid "deleting changes" +msgstr "Lösche Änderungen" -#: ../libsvn_fs_fs/recovery.c:444 ../libsvn_fs_x/recovery.c:215 -#, c-format -msgid "Revision %ld has a revs file but no revprops file" -msgstr "Revision %ld hat eine Revisions-Datei aber keine Revisionseigenschafts-Datei" +#: ../libsvn_fs_base/bdb/changes-table.c:170 ../libsvn_fs_fs/transaction.c:703 +msgid "Missing required node revision ID" +msgstr "Für den Knoten fehlt eine erforderliche Revisions ID" -#: ../libsvn_fs_fs/recovery.c:451 ../libsvn_fs_x/recovery.c:222 -#, c-format -msgid "Revision %ld has a revs file but the revprops file is inaccessible" -msgstr "Revision %ld hat eine Revisions-Datei aber die Revisionseigenschafts-Datei ist nicht verfügbar" +#: ../libsvn_fs_base/bdb/changes-table.c:181 ../libsvn_fs_fs/transaction.c:713 +msgid "Invalid change ordering: new node revision ID without delete" +msgstr "Ungültige Reihenfolge bei Änderung: Neue Knoten Revisions ID ohne Löschen" -#: ../libsvn_fs_fs/recovery.c:460 ../libsvn_fs_x/recovery.c:204 -#, c-format -msgid "Revision %ld has a non-file where its revprops file should be" -msgstr "Revision %ld hat eine Nicht-Datei, wo seine Revisionseigenschafts-Datei sein sollte" +#: ../libsvn_fs_base/bdb/changes-table.c:191 ../libsvn_fs_fs/transaction.c:724 +#: ../libsvn_fs_x/transaction.c:985 +msgid "Invalid change ordering: non-add change on deleted path" +msgstr "Ungültige Reihenfolge bei Änderung: Nicht-hinzufügende Änderung auf gelöschtem Pfad" -#: ../libsvn_fs_fs/rep-cache.c:124 ../libsvn_fs_x/rep-cache.c:125 -msgid "Couldn't open rep-cache database" -msgstr "Konnte »rep-cache«-Datenbank des Projektarchivs nicht öffnen" +#: ../libsvn_fs_base/bdb/changes-table.c:200 ../libsvn_fs_fs/transaction.c:733 +#: ../libsvn_fs_x/transaction.c:993 +msgid "Invalid change ordering: add change on preexisting path" +msgstr "Ungültige Reihenfolge bei Änderung: Hinzufügende Änderung auf schon vorhandenem Pfad" -# TODO: Same strings can be shared with another table! -#: ../libsvn_fs_fs/rep-cache.c:257 ../libsvn_fs_fs/rep-cache.c:316 -#: ../libsvn_fs_x/rep-cache.c:256 ../libsvn_fs_x/rep-cache.c:314 -msgid "Only SHA1 checksums can be used as keys in the rep_cache table.\n" -msgstr "Nur SHA1-Prüfsummen können als Schlüssel in der Tabelle rep_cache verwendet werden.\n" +#: ../libsvn_fs_base/bdb/changes-table.c:296 +#: ../libsvn_fs_base/bdb/changes-table.c:420 +msgid "creating cursor for reading changes" +msgstr "Erzeuge Cursor zum Lesen der Änderungen" -#: ../libsvn_fs_fs/revprops.c:321 ../libsvn_fs_x/revprops.c:800 +#: ../libsvn_fs_base/bdb/changes-table.c:321 +#: ../libsvn_fs_base/bdb/changes-table.c:441 #, c-format -msgid "Packed revprop manifest for r%ld not properly terminated" -msgstr "Verzeichnis für gepackte Revisionseigenschaften für r%ld ist nicht korrekt abgeschlossen" +msgid "Error reading changes for key '%s'" +msgstr "Fehler beim Lesen der Änderungen für Schlüssel »%s«" -#: ../libsvn_fs_fs/revprops.c:363 ../libsvn_fs_x/revprops.c:842 -#, c-format -msgid "Packed revprop manifest for r%ld has too many entries" -msgstr "Verzeichnis für gepackte Revisionseigenschaften für r%ld hat zu viele Einträge" +#: ../libsvn_fs_base/bdb/changes-table.c:381 +#: ../libsvn_fs_base/bdb/changes-table.c:464 +msgid "fetching changes" +msgstr "Hole Änderungen" -#: ../libsvn_fs_fs/revprops.c:368 ../libsvn_fs_x/revprops.c:847 -#, c-format -msgid "Packed revprop manifest for r%ld has too few entries" -msgstr "Verzeichnis für gepackte Revisionseigenschaften für r%ld hat zu wenig Einträge" +#: ../libsvn_fs_base/bdb/changes-table.c:394 +#: ../libsvn_fs_base/bdb/changes-table.c:477 +msgid "closing changes cursor" +msgstr "Schließe Änderungscursor" -#: ../libsvn_fs_fs/revprops.c:432 ../libsvn_fs_x/revprops.c:911 -#, c-format -msgid "Revprop pack for revision r%ld contains revprops for r%ld .. r%ld" -msgstr "Datei mit gepackten Revisionseigenschaften für Revision r%ld enthält Revisionseigenschaften für r%ld .. %ld" +#: ../libsvn_fs_base/bdb/checksum-reps-table.c:87 +#: ../libsvn_fs_base/bdb/checksum-reps-table.c:116 +#: ../libsvn_fs_base/bdb/checksum-reps-table.c:159 +msgid "Only SHA1 checksums can be used as keys in the checksum-reps table.\n" +msgstr "Nur SHA1-Prüfsummen können als Schlüssel in der Tabelle checksum-reps verwendet werden.\n" -#: ../libsvn_fs_fs/revprops.c:443 ../libsvn_fs_x/revprops.c:922 +#: ../libsvn_fs_base/bdb/checksum-reps-table.c:135 #, c-format -msgid "Revprop pack for revision r%ld starts at non-packed revisions r%ld" -msgstr "Datei mit gepackten Revisionseigenschaften für Revision r%ld beginnt mit nicht gepackter Revision r%ld" +msgid "Representation key for checksum '%s' exists in filesystem '%s'." +msgstr "Repräsentationsschlüssel für Prüfsumme »%s« existiert im Dateisystem »%s«." -#: ../libsvn_fs_fs/revprops.c:452 ../libsvn_fs_x/revprops.c:931 -msgid "Header end not found" -msgstr "Ende der Kopfdaten nicht gefunden" +#: ../libsvn_fs_base/bdb/checksum-reps-table.c:142 +msgid "storing checksum-reps record" +msgstr "Speichere »checksum-reps«-Datensatz" -#: ../libsvn_fs_fs/revprops.c:484 ../libsvn_fs_x/revprops.c:965 -msgid "Packed revprop size exceeds pack file size" -msgstr "Größe der gepackten Revisionseigenschaften überschreitet die größe der gepackten Datei" +#: ../libsvn_fs_base/bdb/checksum-reps-table.c:164 +msgid "deleting entry from 'checksum-reps' table" +msgstr "Lösche Eintrag aus »checksum-reps« Tabelle" -#: ../libsvn_fs_fs/revprops.c:542 ../libsvn_fs_x/revprops.c:1034 -#, c-format -msgid "No such packed revision %ld" -msgstr "Keine gepackte Revision %ld" +#: ../libsvn_fs_base/bdb/checksum-reps-table.c:186 +msgid "allocating new representation reuse ID (getting 'next-key')" +msgstr "Allokiere neuen Wiederverwendungsschlüssel für Darstellung (hole »next-key«)" -#: ../libsvn_fs_fs/revprops.c:575 ../libsvn_fs_x/revprops.c:1075 -#, c-format -msgid "Failed to read revprop pack file for r%ld" -msgstr "Konnte gepackte Revisionseigenschaften-Datei für r%ld nicht lesen" +#: ../libsvn_fs_base/bdb/checksum-reps-table.c:207 +msgid "bumping next representation reuse ID" +msgstr "Erzeuge nächsten Wiederverwendungsschlüssel für Darstellung" -#: ../libsvn_fs_fs/revprops.c:582 ../libsvn_fs_x/revprops.c:1082 -#, c-format -msgid "Revprop pack file for r%ld is corrupt" -msgstr "Daten mit gepackten Revisionseigenschaften für r%ld ist beschädigt" +#: ../libsvn_fs_base/bdb/copies-table.c:92 +msgid "storing copy record" +msgstr "Speichere Kopiedatensatz" -#: ../libsvn_fs_fs/revprops.c:639 ../libsvn_fs_x/revprops.c:1158 -#, c-format -msgid "Could not read revprops for revision %ld" -msgstr "Konnte Revisionseigenschaften für Revision %ld nicht lesen" +#: ../libsvn_fs_base/bdb/copies-table.c:115 +msgid "allocating new copy ID (getting 'next-key')" +msgstr "Allokiere neuen Kopieschlüssel (hole »next-key«)" -#: ../libsvn_fs_fs/revprops.c:864 ../libsvn_fs_x/revprops.c:1407 -#, c-format -msgid "Packed file '%s' misses a tag" -msgstr "Der gepackten Datei »%s« fehlt ein Tag" +#: ../libsvn_fs_base/bdb/copies-table.c:133 +msgid "bumping next copy key" +msgstr "Erzeuge nächsten Kopieschlüssel" -#: ../libsvn_fs_fs/transaction.c:258 ../libsvn_fs_x/transaction.c:510 -#, c-format -msgid "Can't unlock unknown transaction '%s'" -msgstr "Kann unbekannte Transaktion »%s« nicht freigeben" +#: ../libsvn_fs_base/bdb/copies-table.c:171 +msgid "deleting entry from 'copies' table" +msgstr "Lösche Eintrag aus »copies« Tabelle" -#: ../libsvn_fs_fs/transaction.c:262 ../libsvn_fs_x/transaction.c:514 -#, c-format -msgid "Can't unlock nonlocked transaction '%s'" -msgstr "Nicht gesperrte Transaktion »%s« kann nicht freigeben werden" +#: ../libsvn_fs_base/bdb/copies-table.c:199 +msgid "reading copy" +msgstr "lese Kopie" -# FIXME: Dies ist aber nicht infinitisch übersetzt (siehe umliegenden Meldungen) -#: ../libsvn_fs_fs/transaction.c:269 ../libsvn_fs_x/transaction.c:521 -#, c-format -msgid "Can't unlock prototype revision lockfile for transaction '%s'" -msgstr "Kann Prototyp-Revisionssperrdatei für Transaktion »%s« nicht entsperren" +#: ../libsvn_fs_base/bdb/lock-tokens-table.c:87 +msgid "storing lock token record" +msgstr "Speichere Datensatz für Sperrmarke" -#: ../libsvn_fs_fs/transaction.c:275 ../libsvn_fs_x/transaction.c:527 -#, c-format -msgid "Can't close prototype revision lockfile for transaction '%s'" -msgstr "Kann Prototyp-Revisionssperrdatei für Transaktion »%s« nicht schließen" +#: ../libsvn_fs_base/bdb/lock-tokens-table.c:108 +msgid "deleting entry from 'lock-tokens' table" +msgstr "Lösche Eintrag aus »lock-tokens« Tabelle" -#: ../libsvn_fs_fs/transaction.c:321 ../libsvn_fs_x/transaction.c:575 -#, c-format -msgid "Cannot write to the prototype revision file of transaction '%s' because a previous representation is currently being written by this process" -msgstr "Kann nicht in die Prototyp-Revisionsdatei der Transaktion »%s« schreiben, da eine frühere Darstellung zurzeit von diesem Prozess geschrieben wird" +#: ../libsvn_fs_base/bdb/lock-tokens-table.c:135 +msgid "reading lock token" +msgstr "Lese Sperrmarke" -#: ../libsvn_fs_fs/transaction.c:358 ../libsvn_fs_x/transaction.c:613 -#, c-format -msgid "Cannot write to the prototype revision file of transaction '%s' because a previous representation is currently being written by another process" -msgstr "Kann nicht in die Prototyp-Revisionsdatei der Transaktion »%s« schreiben, da eine frühere Darstellung zurzeit von einem anderen Prozess geschrieben wird" +#: ../libsvn_fs_base/bdb/locks-table.c:93 +msgid "storing lock record" +msgstr "Speichere Datensatz für Sperre" -#: ../libsvn_fs_fs/transaction.c:366 ../libsvn_fs_x/transaction.c:621 -#: ../libsvn_subr/io.c:2189 -#, c-format -msgid "Can't get exclusive lock on file '%s'" -msgstr "Kann keinen exklusiven Zugriff auf Datei »%s« erlangen" +#: ../libsvn_fs_base/bdb/locks-table.c:116 +msgid "deleting lock from 'locks' table" +msgstr "Lösche Sperre aus »locks« Tabelle" -#: ../libsvn_fs_fs/transaction.c:414 ../libsvn_fs_x/transaction.c:667 -#, c-format -msgid "p2l proto index offset %s beyond protorev file size %s for TXN %s" -msgstr "Offset %s im p2l-Proto-Index überschreitet die Größe %s der protorev-Datei in Transaktion %s" +#: ../libsvn_fs_base/bdb/locks-table.c:143 +msgid "reading lock" +msgstr "Lese Sperre" -#: ../libsvn_fs_fs/transaction.c:523 ../libsvn_fs_fs/transaction.c:2360 -#: ../libsvn_fs_x/transaction.c:796 ../libsvn_fs_x/transaction.c:2455 -#, c-format -msgid "Attempted to write to non-transaction '%s'" -msgstr "Versuch, in eine Nicht-Transaktion zu schreiben »%s«" +#: ../libsvn_fs_base/bdb/locks-table.c:246 +msgid "creating cursor for reading lock tokens" +msgstr "Erzeuge Cursor zum Lesen der Sperrmarken" -#: ../libsvn_fs_fs/transaction.c:932 ../libsvn_fs_x/transaction.c:1182 -msgid "Copying from transactions not allowed" -msgstr "Kopieren aus Transaktionen ist nicht erlaubt." +#: ../libsvn_fs_base/bdb/locks-table.c:321 +msgid "fetching lock tokens" +msgstr "Lese Sperrmarken" -#: ../libsvn_fs_fs/transaction.c:1065 -#, c-format -msgid "Unable to create transaction directory in '%s' for revision %ld" -msgstr "Kann Transaktionsverzeichnis in »%s« in Revision %ld nicht anlegen" +#: ../libsvn_fs_base/bdb/locks-table.c:323 +msgid "fetching lock tokens (closing cursor)" +msgstr "Lese Sperrmarken (schließe Cursor)" -#: ../libsvn_fs_fs/transaction.c:1135 ../libsvn_fs_x/transaction.c:1338 -msgid "Internal error: a null transaction id was passed to get_txn_proplist()" -msgstr "Interner Fehler: eine Transaktionskennung von Null wurde übergeben um get_txn_proplist() zu erhalten" +#: ../libsvn_fs_base/bdb/miscellaneous-table.c:95 +msgid "deleting record from 'miscellaneous' table" +msgstr "Lösche Eintrag aus »miscellaneous« Tabelle" -#: ../libsvn_fs_fs/transaction.c:1312 ../libsvn_fs_fs/transaction.c:1318 -#: ../libsvn_fs_x/transaction.c:1603 ../libsvn_fs_x/transaction.c:1609 -msgid "next-id file corrupt" -msgstr "»next-id« Datei beschädigt" +#: ../libsvn_fs_base/bdb/miscellaneous-table.c:103 +msgid "storing miscellaneous record" +msgstr "Speichere »miscellaneous« Datensatz" + +#: ../libsvn_fs_base/bdb/miscellaneous-table.c:131 +msgid "fetching miscellaneous record" +msgstr "Lese »miscellaneous« Datensatz" -#: ../libsvn_fs_fs/transaction.c:1431 ../libsvn_fs_x/transaction.c:1717 +#: ../libsvn_fs_base/bdb/node-origins-table.c:117 #, c-format -msgid "Transaction '%s' cleanup failed" -msgstr "Aufräumen der Transaktion »%s« schlug fehl" +msgid "Node origin for '%s' exists in filesystem '%s' with a different value (%s) than what we were about to store (%s)" +msgstr "Knotenursprung für »%s« existiert im Dateisystem »%s« mit einem anderen Wert (%s) als der, der gespeichert werden soll (%s)" -#: ../libsvn_fs_fs/transaction.c:2380 ../libsvn_fs_x/transaction.c:2476 -msgid "Can't set text contents of a directory" -msgstr "Kann Textinhalt im Verzeichnis nicht erzeugen" +#: ../libsvn_fs_base/bdb/node-origins-table.c:127 +msgid "storing node-origins record" +msgstr "Speichere Knotenherkunftdatensatz" -#: ../libsvn_fs_fs/transaction.c:2786 ../libsvn_fs_x/transaction.c:2802 -#, c-format -msgid "predecessor count for the root node-revision is wrong: found (%d+%ld != %d), committing r%ld" -msgstr "Anzahl der Vorgänger für die Revision des Wurzelknotens ist falsch: Gefunden (%d+%ld != %d) bei Übertragung von r%ld" +#: ../libsvn_fs_base/bdb/node-origins-table.c:142 +msgid "deleting entry from 'node-origins' table" +msgstr "Lösche Eintrag aus »node-origins« Tabelle" -#: ../libsvn_fs_fs/transaction.c:2943 -msgid "Truncated protorev file detected" -msgstr "Abgeschnittene Datei »protorev« entdeckt" +#: ../libsvn_fs_base/bdb/nodes-table.c:102 +msgid "allocating new node ID (getting 'next-key')" +msgstr "Allokiere neue Knoten-ID (hole »next-key«)" -#: ../libsvn_fs_fs/transaction.c:3427 ../libsvn_fs_x/transaction.c:3357 -msgid "Transaction out of date" -msgstr "Transaktion ist veraltet" +#: ../libsvn_fs_base/bdb/nodes-table.c:120 +msgid "bumping next node ID key" +msgstr "Erzeuge nächste Knoten-ID" -#: ../libsvn_fs_fs/transaction.c:3702 ../libsvn_fs_x/transaction.c:3626 +#: ../libsvn_fs_base/bdb/nodes-table.c:156 #, c-format -msgid "No such transaction '%s'" -msgstr "Keine solche Transaktion »%s«" +msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'" +msgstr "Nachfolger ID »%s« (für »%s«) existiert bereits in Dateisystem »%s«" -#: ../libsvn_fs_fs/tree.c:2576 ../libsvn_fs_x/tree.c:2588 -msgid "Copy immutable tree not supported" -msgstr "Kopieren eines unveränderlichen Baumes nicht unterstützt" +#: ../libsvn_fs_base/bdb/nodes-table.c:182 +msgid "deleting entry from 'nodes' table" +msgstr "Lösche Eintrag aus »nodes« Tabelle" -#: ../libsvn_fs_fs/tree.c:3895 ../libsvn_fs_x/tree.c:3881 -#, c-format -msgid "Node-revision #'%s' claims to have mergeinfo but doesn't" -msgstr "Knotenrevision #»%s« behauptet, Zusammenführungsinformationen zu haben, hat aber keine" +#. Handle any other error conditions. +#: ../libsvn_fs_base/bdb/nodes-table.c:220 +msgid "reading node revision" +msgstr "Lese Knotenrevision" -#: ../libsvn_fs_fs/tree.c:4011 ../libsvn_fs_x/tree.c:3997 -#, c-format -msgid "Node-revision '%s@%ld' claims to have mergeinfo but doesn't" -msgstr "Knotenrevision »%s@%ld« behauptet, Zusammenführungsinformationen zu haben, hat aber keine" +#: ../libsvn_fs_base/bdb/nodes-table.c:253 +msgid "storing node revision" +msgstr "Speichere Knotenrevision" -#: ../libsvn_fs_fs/tree.c:4211 +#: ../libsvn_fs_base/bdb/reps-table.c:98 +#: ../libsvn_fs_base/bdb/reps-table.c:200 #, c-format -msgid "Querying mergeinfo requires version %d of the FSFS filesystem schema; filesystem '%s' uses only version %d" -msgstr "Abfrage der Zusammenführungsinformationen erfordert Version %d des FSFS-Dateisystem-Schemas; Dateisystem »%s« verwendet nur Version %d" - -#: ../libsvn_fs_fs/util.c:387 ../libsvn_fs_x/util.c:499 -#, c-format -msgid "%s file '%s' contains unexpected non-digit '%c' within '%s'" -msgstr "Die Datei %s (»%s«) enthält eine unerwartete Nicht-Ziffer »%c« innerhalb »%s«" - -#: ../libsvn_fs_fs/util.c:477 ../libsvn_fs_fs/util.c:482 -#: ../libsvn_fs_fs/util.c:487 ../libsvn_fs_x/util.c:572 -msgid "Corrupt 'current' file" -msgstr "Beschädigte Datei »current«" - -#: ../libsvn_fs_fs/util.c:598 ../libsvn_fs_x/util.c:673 -#, c-format -msgid "Can't read '%s'" -msgstr "Kann »%s« nicht lesen" +msgid "No such representation '%s'" +msgstr "Eine solche Darstellung »%s« existiert nicht" -#: ../libsvn_fs_fs/util.c:619 ../libsvn_fs_x/util.c:700 -msgid "Unexpected EOF" -msgstr "Unerwartetes Dateiende (EOF)" +#. Handle any other error conditions. +#: ../libsvn_fs_base/bdb/reps-table.c:101 +msgid "reading representation" +msgstr "Lese Darstellung" -#: ../libsvn_fs_fs/util.c:626 ../libsvn_fs_x/util.c:707 -#, c-format -msgid "Number '%s' invalid or too large" -msgstr "Zahl »%s« ist ungültig oder zu groß" +#: ../libsvn_fs_base/bdb/reps-table.c:128 +msgid "storing representation" +msgstr "Speichere Darstellung" -#: ../libsvn_fs_fs/verify.c:208 ../libsvn_fs_x/verify.c:184 -#, c-format -msgid "%s checksum mismatch in file %s" -msgstr "%s Prüfsummenfehler in Datei %s" +#: ../libsvn_fs_base/bdb/reps-table.c:156 +msgid "allocating new representation (getting next-key)" +msgstr "Allokiere neuen Darstellungsschlüssel (hole »next-key«)" -#: ../libsvn_fs_fs/verify.c:303 -#, c-format -msgid "p2l index entry not found for PHYS %s returned by l2p index for LOG r%ld:i%ld" -msgstr "P2L-Indexeintrag nicht gefunden für PHYS %s zurückgegeben von L2P-Index für LOG r%ld:i%ld" +#: ../libsvn_fs_base/bdb/reps-table.c:177 +msgid "bumping next representation key" +msgstr "Erzeuge nächsten Darstellungsschlüssel" -#: ../libsvn_fs_fs/verify.c:313 ../libsvn_fs_x/verify.c:292 -#, c-format -msgid "p2l index info LOG r%ld:i%ld does not match l2p index for LOG r%ld:i%ld" -msgstr "P2L-Indexinformation LOG r%ld:i%ld stimmt nicht mit dem L2P-Index für LOG r%ld:i%ld überein" +#. Handle any other error conditions. +#: ../libsvn_fs_base/bdb/reps-table.c:203 +msgid "deleting representation" +msgstr "Lösche Darstellung" -#: ../libsvn_fs_fs/verify.c:379 ../libsvn_fs_x/verify.c:361 -#, c-format -msgid "p2l does not cover offset %s for revision %ld" -msgstr "P2L-Index deckt Offset %s für Revision %ld nicht ab" +#. Handle any other error conditions. +#: ../libsvn_fs_base/bdb/rev-table.c:98 +msgid "reading filesystem revision" +msgstr "Lese Dateisystemrevision" -#: ../libsvn_fs_fs/verify.c:404 -#, c-format -msgid "Empty P2L entry for PHYS %s refers to revision %ld outside the rev / pack file (%ld-%ld)" -msgstr "Leerer P2L-Eintrag für PHYS %s bezieht sich auf Revision %ld außerhalb der REV/PACK-Datei (%ld-%ld)" +#: ../libsvn_fs_base/bdb/rev-table.c:144 +msgid "updating filesystem revision" +msgstr "Aktualisiere Dateisystemrevision" -#: ../libsvn_fs_fs/verify.c:421 -#, c-format -msgid "l2p index entry PHYS %sdoes not match p2l index value LOG r%ld:i%ld for PHYS %s" -msgstr "L2P-Indexeintrag PHYS %sstimmt nicht mit dem P2L-Indexwert LOG r%ld:i%ld für PHYS %s überein" +#: ../libsvn_fs_base/bdb/rev-table.c:152 +msgid "storing filesystem revision" +msgstr "Speichere Dateisystemrevision" -#: ../libsvn_fs_fs/verify.c:486 ../libsvn_fs_x/verify.c:462 -#, c-format -msgid "Empty section in file %s contains non-NUL data at offset %s" -msgstr "Leerer Abschnitt in Datei %s enthält Daten verschieden von NUL bei Offset %s" +#: ../libsvn_fs_base/bdb/rev-table.c:182 +msgid "getting youngest revision (creating cursor)" +msgstr "Hole neueste Revision (erzeuge Cursor)" -#: ../libsvn_fs_fs/verify.c:527 ../libsvn_fs_x/verify.c:505 -#, c-format -msgid "Checksum mismatch in item at offset %s of length %s bytes in file %s" -msgstr "Prüfsummenfehler in Element bei Offset %s der Länge %s Byte in Datei %s" +#: ../libsvn_fs_base/bdb/rev-table.c:206 +msgid "getting youngest revision (finding last entry)" +msgstr "Hole neueste Revision (finde letzten Eintrag)" -#: ../libsvn_fs_fs/verify.c:623 ../libsvn_fs_x/verify.c:603 -#, c-format -msgid "File size of %s for revision r%ld does not match p2l index size of %s" -msgstr "Dateigröße von %s für Revision r%ld stimmt nicht mit der Größe des P2L-Index %s überein" +#. You can't commit a transaction with open cursors, because: +#. 1) key/value pairs don't get deleted until the cursors referring +#. to them are closed, so closing a cursor can fail for various +#. reasons, and txn_commit shouldn't fail that way, and +#. 2) using a cursor after committing its transaction can cause +#. undetectable database corruption. +#: ../libsvn_fs_base/bdb/rev-table.c:216 +msgid "getting youngest revision (closing cursor)" +msgstr "Hole neueste Revision (schließe Cursor)" -#: ../libsvn_fs_fs/verify.c:668 ../libsvn_fs_x/verify.c:651 -#, c-format -msgid "p2l index entry for revision r%ld is non-contiguous between offsets %s and %s" -msgstr "P2L-Indexeintrag für Revision r%ld ist nicht zusammenhängend zwischen Offsets %s und %s" +#: ../libsvn_fs_base/bdb/strings-table.c:94 +#: ../libsvn_fs_base/bdb/strings-table.c:300 +#: ../libsvn_fs_base/bdb/strings-table.c:491 +msgid "creating cursor for reading a string" +msgstr "Erzeuge Cursor zum Lesen von Zeichenketten" -#: ../libsvn_fs_util/fs-util.c:164 -msgid "Filesystem object has not been opened yet" -msgstr "Dateisystemobjekt ist noch nicht geöffnet" +#: ../libsvn_fs_base/bdb/strings-table.c:124 +msgid "moving cursor" +msgstr "Verschiebe Cursor" -#: ../libsvn_fs_util/fs-util.c:167 -msgid "Filesystem object already open" -msgstr "Dateisystemobjekt ist bereits geöffnet" +#: ../libsvn_fs_base/bdb/strings-table.c:136 +msgid "rerunning cursor move" +msgstr "Führe Verschiebung des Cursors erneut aus" -#: ../libsvn_fs_x/cached_data.c:2955 -#, c-format -msgid "" -"Low-level checksum mismatch while reading\n" -"%s bytes of meta data at offset %s " -msgstr "" -"Interner Prüfsummenfehler beim Lesen von\n" -"%s Byte von Metadaten bei Offset %s" +#: ../libsvn_fs_base/bdb/strings-table.c:228 +#: ../libsvn_fs_base/bdb/strings-table.c:247 +#: ../libsvn_fs_base/bdb/strings-table.c:265 +msgid "reading string" +msgstr "Lese Zeichenkette" -#: ../libsvn_fs_x/changes.c:239 -#, c-format -msgid "Changes list index %%%s exceeds container size %%d" -msgstr "Index für Änderungslisten %%%s überschreitet Größe des Containers %%d" +#. Done with the cursor. +#: ../libsvn_fs_base/bdb/strings-table.c:254 +#: ../libsvn_fs_base/bdb/strings-table.c:334 +#: ../libsvn_fs_base/bdb/strings-table.c:539 +msgid "closing string-reading cursor" +msgstr "Schließe Cursor zum Lesen von Zeichenketten" -#: ../libsvn_fs_x/changes.c:490 -#, c-format -msgid "Changes list index %u exceeds container size %d" -msgstr "Index für Änderungslisten %u überschreitet Größe des Containers %d" +#: ../libsvn_fs_base/bdb/strings-table.c:313 +#: ../libsvn_fs_base/bdb/strings-table.c:505 +msgid "getting next-key value" +msgstr "Hole Wert »next-key«" -#: ../libsvn_fs_x/fs.c:102 -#, c-format -msgid "Can't fetch FSX shared data" -msgstr "Kann gemeinsame FSX-Daten nicht holen" +#. ignore the error, the original is +#. more important. +#: ../libsvn_fs_base/bdb/strings-table.c:331 +msgid "bumping next string key" +msgstr "Erzeuge nächsten Zeichenkettenschlüssel" -#: ../libsvn_fs_x/fs.c:131 -#, c-format -msgid "Can't store FSX shared data" -msgstr "Kann gemeinsame FSX-Daten nicht speichern" +#: ../libsvn_fs_base/bdb/strings-table.c:358 +msgid "appending string" +msgstr "Füge an Zeichenkette an" -#: ../libsvn_fs_x/fs.c:597 -msgid "Module for working with an experimental (FSX) repository." -msgstr "Modul zum Zugriff auf ein experimentelles (FSX) Projektarchiv." +#. Handle any other error conditions. +#: ../libsvn_fs_base/bdb/strings-table.c:390 +msgid "clearing string" +msgstr "Lösche Zeichenkette" -#: ../libsvn_fs_x/fs.c:660 -#, c-format -msgid "Unsupported FS loader version (%d) for fsx" -msgstr "Nicht unterstützte Dateisystem-Laderversion (%d) für fsx" +#: ../libsvn_fs_base/bdb/strings-table.c:399 +msgid "storing empty contents" +msgstr "Speichere leere Inhalte" -#: ../libsvn_fs_x/fs_x.c:1021 -msgid "FSX is not compatible with Subversion prior to 1.9" -msgstr "FSX ist inkompatibel mit Subversion älter als 1.9" +#: ../libsvn_fs_base/bdb/strings-table.c:436 +msgid "fetching string length" +msgstr "Ermittle Länge der Zeichenkette" -#: ../libsvn_fs_x/hotcopy.c:486 -#, c-format -msgid "The FSX format (%d) of the hotcopy source does not match the FSX format (%d) of the hotcopy destination; please upgrade both repositories to the same format" -msgstr "Das FSX-Format (%d) der Quelle für die Kopie im laufenden Betrieb entspricht nicht dem FSX-Format (%d) des Ziels; Verwenden Sie auf beiden Seiten das gleiche Format" +#. Handle any other error conditions. +#: ../libsvn_fs_base/bdb/strings-table.c:466 +msgid "deleting string" +msgstr "Lösche Zeichenkette" -#: ../libsvn_fs_x/index.c:294 -msgid "Can't read index file '%s' at offset 0x%" -msgstr "Kann Indexdatei »%s« nicht lesen bei Offset 0x%" +#: ../libsvn_fs_base/bdb/strings-table.c:524 +msgid "writing copied data" +msgstr "Schreibe kopiete Daten" -#: ../libsvn_fs_x/index.c:304 -msgid "Unexpected end of index file %s at offset 0x%" -msgstr "Unerwartetes Ende der Indexdatei %s bei Offset 0x%" +#: ../libsvn_fs_base/bdb/strings-table.c:535 +msgid "fetching string data for a copy" +msgstr "Hole Zeichenkettendaten für eine Kopie" -#: ../libsvn_fs_x/index.c:2668 -msgid "Unused regions must be empty and have checksum 0" -msgstr "Nicht verwendete Regionen müssen leer sein und eine Prüfsumme von 0 haben" +#: ../libsvn_fs_base/bdb/txn-table.c:99 +msgid "storing transaction record" +msgstr "Speichere Transaktionsdatensatz" -#: ../libsvn_fs_x/index.c:2682 -msgid "Only containers may have more than one sub-item" -msgstr "Nur Container dürfen mehr als ein Unterelement haben" +#: ../libsvn_fs_base/bdb/txn-table.c:123 +msgid "allocating new transaction ID (getting 'next-key')" +msgstr "Allokiere neue Transaktions-ID (hole »next-key«)" -#: ../libsvn_fs_x/low_level.c:423 -#, c-format -msgid "Missing %s field in node-rev" -msgstr "Fehlendes Feld %s in Knotenrevision" +#: ../libsvn_fs_base/bdb/txn-table.c:142 +msgid "bumping next transaction key" +msgstr "Erzeuge nächsten Transaktionsschlüssel" -#: ../libsvn_fs_x/noderevs.c:320 -#, c-format -msgid "ID part index %d exceeds container size %d" -msgstr "ID-Teilindex %d überschreitet Größe des Containers %d" +#: ../libsvn_fs_base/bdb/txn-table.c:188 +msgid "deleting entry from 'transactions' table" +msgstr "Lösche Eintrag aus Tabelle »transactions«" -#: ../libsvn_fs_x/noderevs.c:348 -#, c-format -msgid "Node revision ID index %d exceeds container size %d" -msgstr "Index für Knotenrevisions-IDs %d überschreitet Größe des Containers %d" +#: ../libsvn_fs_base/bdb/txn-table.c:218 +msgid "reading transaction" +msgstr "Lese Transaktion" -#: ../libsvn_fs_x/noderevs.c:377 -#, c-format -msgid "Node revision index %%%s exceeds container size %%d" -msgstr "Index für Knotenrevisions-IDs %%%s überschreitet Größe des Containers %%d" +#: ../libsvn_fs_base/bdb/txn-table.c:251 +msgid "reading transaction list (opening cursor)" +msgstr "Lese Transaktionsliste (öffne Cursor)" -#: ../libsvn_fs_x/noderevs.c:617 -#, c-format -msgid "Unexpected MD5 digest size %%%s" -msgstr "Unerwartete Länge für MD5-Prüfsumme %%%s" +#: ../libsvn_fs_base/bdb/txn-table.c:314 +msgid "reading transaction list (listing keys)" +msgstr "Lese Transaktionsliste (Schlüssel auflisten)" -#: ../libsvn_fs_x/noderevs.c:629 -#, c-format -msgid "Unexpected SHA1 digest size %%%s" -msgstr "Unerwartete Länge für SHA1-Prüfsumme %%%s" +#: ../libsvn_fs_base/bdb/txn-table.c:317 +msgid "reading transaction list (closing cursor)" +msgstr "Lese Transaktionsliste (schließe Cursor)" -#: ../libsvn_fs_x/reps.c:496 -msgid "Text body exceeds star delta container capacity" -msgstr "Textkörper überschreitet Kapazität des Star Delta Containers" +#: ../libsvn_fs_base/bdb/uuids-table.c:119 +msgid "get repository uuid" +msgstr "Hole UUID des Projektarchivs" -#: ../libsvn_fs_x/reps.c:501 -msgid "Instruction count exceeds star delta container capacity" -msgstr "Anzahl der Instruktionen überschreitet Kapazität des Star Delta Containers" +#: ../libsvn_fs_base/bdb/uuids-table.c:147 +msgid "set repository uuid" +msgstr "Setze UUID des Projektarchivs" -#: ../libsvn_fs_x/verify.c:283 +#: ../libsvn_fs_base/dag.c:228 #, c-format -msgid "p2l index entry not found for PHYS o%s:s%ld returned by l2p index for LOG r%ld:i%ld" -msgstr "P2L-Indexeintrag nicht gefunden für PHYS o%s:s%ld zurückgegeben von L2P-Index für LOG r%ld:i%ld" +msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'" +msgstr "DB beschädigt: Erste Transaktion ist nicht »0« in Dateisystem »%s«" -#: ../libsvn_fs_x/verify.c:392 +#: ../libsvn_fs_base/dag.c:236 #, c-format -msgid "l2p index entry PHYS o%s:s%ld does not match p2l index value LOG r%ld:i%ld for PHYS o%s:s%ld" -msgstr "L2P-Indexeintrag PHYS o%s:s%ld stimmt nicht mit dem P2L-Indexwert LOG r%ld:i%ld für PHYS o%s:s%ld überein" +msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'" +msgstr "DB beschädigt: Erste Kopie ist nicht »0« in Dateisystem »%s«" -#: ../libsvn_ra/compat.c:183 +#: ../libsvn_fs_base/dag.c:245 #, c-format -msgid "Missing changed-path information for '%s' in revision %ld" -msgstr "»%s« fehlt in der Liste der geänderten Pfade von Revision %ld" +msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'" +msgstr "DB beschädigt: Erste Revision ist nicht »0« in Dateisystem »%s«" -#: ../libsvn_ra/compat.c:328 ../libsvn_ra/compat.c:572 -#, c-format -msgid "Path '%s' doesn't exist in revision %ld" -msgstr "Pfad »%s« existiert nicht in Revision %ld" +#: ../libsvn_fs_base/dag.c:294 +msgid "Attempted to get entries of a non-directory node" +msgstr "Versuchte, Einträge eines *nicht* Verzeichnisknotens zu holen" -#: ../libsvn_ra/compat.c:405 +#: ../libsvn_fs_base/dag.c:461 ../libsvn_fs_fs/dag.c:377 +#: ../libsvn_fs_x/dag.c:331 #, c-format -msgid "'%s' in revision %ld is an unrelated object" -msgstr "»%s« in Revision %ld hat keinen Bezug zur Arbeitskopie" +msgid "Attempted to create a node with an illegal name '%s'" +msgstr "Versuchte, Knoten mit illegalem Namen »%s« anzulegen" -#: ../libsvn_ra/compat.c:845 ../libsvn_ra/ra_loader.c:1285 +#: ../libsvn_fs_base/dag.c:467 ../libsvn_fs_fs/dag.c:383 +#: ../libsvn_fs_x/dag.c:337 +msgid "Attempted to create entry in non-directory parent" +msgstr "Versuchte, Eintrag in einem *nicht* Verzeichnisknoten anzulegen" + +#: ../libsvn_fs_base/dag.c:473 ../libsvn_fs_base/dag.c:737 +#: ../libsvn_fs_fs/dag.c:389 ../libsvn_fs_x/dag.c:343 #, c-format -msgid "Invalid peg revision %ld" -msgstr "Ungültige Fix-Revision %ld" +msgid "Attempted to clone child of non-mutable node" +msgstr "Versuchte, Unterknoten eines nicht-veränderlichen Knotens zu klonen" -#: ../libsvn_ra/compat.c:848 ../libsvn_ra/ra_loader.c:1288 -#: ../libsvn_repos/rev_hunt.c:212 ../libsvn_repos/rev_hunt.c:327 +#: ../libsvn_fs_base/dag.c:480 #, c-format -msgid "Invalid end revision %ld" -msgstr "Ungültige Endrevision %ld" +msgid "Attempted to create entry that already exists" +msgstr "Versuchte, Eintrag anzulegen, der bereits existiert" -#: ../libsvn_ra/compat.c:851 ../libsvn_ra/ra_loader.c:1291 -msgid "Peg revision must precede end revision" -msgstr "Fix-Revision muss vor der Endrevision liegen" +#: ../libsvn_fs_base/dag.c:529 ../libsvn_fs_fs/dag.c:468 +#: ../libsvn_fs_x/dag.c:403 +msgid "Attempted to set entry in non-directory node" +msgstr "Versuchte, Eintrag in einem *nicht* Verzeichnisknoten zu setzen" -#: ../libsvn_ra/ra_loader.c:217 -#, c-format -msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" -msgstr "Version des ZM »%s« stimmt nicht überein: gefunden %d.%d.%d%s, erwartet %d.%d.%d%s" +#: ../libsvn_fs_base/dag.c:535 ../libsvn_fs_fs/dag.c:474 +#: ../libsvn_fs_x/dag.c:409 +msgid "Attempted to set entry in immutable node" +msgstr "Versuchte, Eintrag in einem nicht-veränderlichen Knoten zu setzen" -#: ../libsvn_ra/ra_loader.c:291 ../libsvn_ra_serf/serf.c:830 +# FIXME: node-revision or node-rev (wie überall)? +#: ../libsvn_fs_base/dag.c:602 #, c-format -msgid "Illegal repository URL '%s'" -msgstr "Illegale Projektarchiv-URL »%s«" +msgid "Can't set proplist on *immutable* node-revision %s" +msgstr "Kann keine Eigenschaften für *nicht-veränderliche* Knotenrevision %s setzen." -#: ../libsvn_ra/ra_loader.c:329 +#: ../libsvn_fs_base/dag.c:743 #, c-format -msgid "Invalid config: unknown HTTP library '%s'" -msgstr "Ungültige Konfiguration: Unbekannte HTTP-Bibliothek »%s«" +msgid "Attempted to make a child clone with an illegal name '%s'" +msgstr "Versuchte, Unterknoten mit illegalem Namen »%s« zu klonen" -#: ../libsvn_ra/ra_loader.c:373 +#: ../libsvn_fs_base/dag.c:860 #, c-format -msgid "Unrecognized URL scheme for '%s'" -msgstr "Unbekanntes URL-Schema für »%s«" +msgid "Attempted to delete entry '%s' from *non*-directory node" +msgstr "Versuchte, Eintrag »%s« aus einem *nicht* Verzeichnisknoten zu löschen" -#: ../libsvn_ra/ra_loader.c:397 +#: ../libsvn_fs_base/dag.c:866 #, c-format -msgid "Unable to connect to a repository at URL '%s'" -msgstr "Konnte nicht mit Projektarchiv bei URL »%s« verbinden" +msgid "Attempted to delete entry '%s' from immutable directory node" +msgstr "Versuchte, Eintrag »%s« aus einem nicht-veränderlichen Verzeichnisknoten zu löschen" -#: ../libsvn_ra/ra_loader.c:425 +#: ../libsvn_fs_base/dag.c:873 #, c-format -msgid "Repository UUID '%s' doesn't match expected UUID '%s'" -msgstr "UUID des Projektarchivs »%s« entspricht nicht der erwarteten UUID »%s«" +msgid "Attempted to delete a node with an illegal name '%s'" +msgstr "Versuchte, einen Knoten mit illegalem Namen »%s« zu löschen" -#: ../libsvn_ra/ra_loader.c:486 +#: ../libsvn_fs_base/dag.c:888 ../libsvn_fs_base/dag.c:921 #, c-format -msgid "'%s' isn't in the same repository as '%s'" -msgstr "»%s« ist nicht im selben Projektarchiv wie »%s«" +msgid "Delete failed: directory has no entry '%s'" +msgstr "Löschen schlug fehl: Verzeichnis hat keinen Eintrag »%s«" -#: ../libsvn_ra/ra_loader.c:510 +#: ../libsvn_fs_base/dag.c:970 #, c-format -msgid "'%s' isn't a child of session URL '%s'" -msgstr "»%s« ist kein Kind der Sitzungs-URL »%s«" +msgid "Attempted removal of immutable node" +msgstr "Versuchte, einen nicht-veränderlichen Knoten zu entfernen" -#: ../libsvn_ra/ra_loader.c:526 ../libsvn_ra_svn/client.c:2623 +#: ../libsvn_fs_base/dag.c:1090 #, c-format -msgid "'%s' isn't a child of repository root URL '%s'" -msgstr "»%s« ist kein Kind der Projektarchivwurzel-URL »%s«" +msgid "Attempted to get textual contents of a *non*-file node" +msgstr "Versuchte, den Textinhalt eines *nicht* Dateiknotens zu holen" -#: ../libsvn_ra/ra_loader.c:570 +#: ../libsvn_fs_base/dag.c:1123 #, c-format -msgid "Specifying 'old_value_p' is not allowed when the '%s' capability is not advertised, and could indicate a bug in your client" -msgstr "Die Angabe von »old_value_p« is nicht erlaubt, wenn die Fähigkeit »%s« nicht bekanntgemacht wurde, und könnte auf einen Bug in Ihrem Client hindeuten" +msgid "Attempted to get length of a *non*-file node" +msgstr "Versuchte, die Länge eines *nicht* Dateiknotens zu holen" -#: ../libsvn_ra/ra_loader.c:1431 +#: ../libsvn_fs_base/dag.c:1150 #, c-format -msgid " - handles '%s' scheme\n" -msgstr " - behandelt Schema »%s«\n" +msgid "Attempted to get checksum of a *non*-file node" +msgstr "Versuchte, die Prüfsumme eines *nicht* Dateiknotens zu holen" -#: ../libsvn_ra/ra_loader.c:1524 +#: ../libsvn_fs_base/dag.c:1189 ../libsvn_fs_base/dag.c:1246 #, c-format -msgid "Unrecognized URL scheme '%s'" -msgstr "Unbekanntes URL-Schema »%s«" - -#: ../libsvn_ra/util.c:55 -msgid "" -msgstr "" +msgid "Attempted to set textual contents of a *non*-file node" +msgstr "Versuchte, den Textinhalt eines *nicht* Dateiknotens zu setzen" -#: ../libsvn_ra/util.c:73 +#: ../libsvn_fs_base/dag.c:1195 ../libsvn_fs_base/dag.c:1252 #, c-format -msgid "Retrieval of mergeinfo unsupported by '%s'" -msgstr "Abfrage der Zusammenführungsinformationen wird von »%s« nicht unterstützt" +msgid "Attempted to set textual contents of an immutable node" +msgstr "Versuchte, den Textinhalt eines nicht-veränderlichen Knotens zu setzen" -#: ../libsvn_ra/util.c:99 +#: ../libsvn_fs_base/dag.c:1281 ../libsvn_fs_base/reps-strings.c:829 #, c-format -msgid "The '%s' feature is not supported by '%s'" -msgstr "Die Funktion »%s« wird von »%s« nicht unterstützt" +msgid "Checksum mismatch on representation '%s'" +msgstr "Prüfsummenfehler in Darstellung »%s«" -#: ../libsvn_ra/util.c:142 +#: ../libsvn_fs_base/dag.c:1375 #, c-format -msgid "Lock was stolen by '%s'; unable to remove it" -msgstr "Sperre durch »%s« gestohlen; Kann nicht entfernt werden" +msgid "Attempted to open non-existent child node '%s'" +msgstr "Versuchte, nicht existierenden Unterknoten »%s« zu öffnen" -#: ../libsvn_ra/util.c:183 +#: ../libsvn_fs_base/dag.c:1381 #, c-format -msgid "Unable to determine local hostname" -msgstr "Kann den lokalen Hostnamen nicht ermitteln" +msgid "Attempted to open node with an illegal name '%s'" +msgstr "Versuchte, einen Knoten mit illegalem Namen »%s« zu öffnen" -#: ../libsvn_ra/util.c:278 +#: ../libsvn_fs_base/dag.c:1713 #, c-format -msgid "Couldn't get lock on destination repos after %d attempts" -msgstr "Konnte Sperre für Zielprojektarchiv nach %d Versuchen nicht erhalten" - -#: ../libsvn_ra_local/ra_plugin.c:161 -msgid "memory-cache-size invalid" -msgstr "Ungültige »memory-cache-size«" - -#. ---------------------------------------------------------------- -#. ** The RA vtable routines ** -#: ../libsvn_ra_local/ra_plugin.c:503 -msgid "Module for accessing a repository on local disk." -msgstr "Modul zum Zugriff auf ein Projektarchiv auf der lokalen Festplatte" +msgid "Attempted merge tracking info change on immutable node" +msgstr "Versuchte, die Informationen zur Zusammenführungsverfolgung eines nicht-veränderlichen Knotens zu ändern" -#: ../libsvn_ra_local/ra_plugin.c:679 ../libsvn_ra_serf/serf.c:822 +#: ../libsvn_fs_base/dag.c:1753 #, c-format -msgid "URL '%s' is not a child of the session's repository root URL '%s'" -msgstr "URL »%s« ist kein Kind der Projektarchivwurzel-URL »%s« der Sitzung" +msgid "Attempted mergeinfo count change on immutable node" +msgstr "Versuchte, die Anzahl der Zusammenführungsinformationen eines nicht-veränderlichen Knoten zu ändern" -#: ../libsvn_ra_local/ra_plugin.c:1255 ../libsvn_ra_local/ra_plugin.c:1711 -#: ../libsvn_ra_serf/util.c:1796 ../svnserve/serve.c:3348 +#: ../libsvn_fs_base/dag.c:1765 #, c-format -msgid "'%s' path not found" -msgstr "»%s« Pfad nicht gefunden" +msgid "Invalid value (%%%s) for node revision mergeinfo count" +msgstr "Ungültiger Wert (%%%s) für Knotenrevisions-Zusammenführungszähler" -#: ../libsvn_ra_local/ra_plugin.c:1663 ../libsvn_ra_serf/options.c:732 -#: ../libsvn_ra_svn/client.c:2830 +#: ../libsvn_fs_base/err.c:46 #, c-format -msgid "Don't know anything about capability '%s'" -msgstr "Es ist nichts über die Eigenschaft »%s« bekannt" +msgid "Corrupt filesystem revision %ld in filesystem '%s'" +msgstr "Beschädigte Dateisystemrevision %ld in Dateisystem »%s«" -#: ../libsvn_ra_local/ra_plugin.c:1866 +#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/cached_data.c:281 +#: ../libsvn_fs_x/cached_data.c:261 #, c-format -msgid "Unsupported RA loader version (%d) for ra_local" -msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_local" +msgid "Reference to non-existent node '%s' in filesystem '%s'" +msgstr "Verweis auf einen nicht existierenden Knoten »%s« in Dateisystem »%s«" -#: ../libsvn_ra_local/split_url.c:50 ../libsvn_ra_local/split_url.c:56 +#: ../libsvn_fs_base/err.c:68 #, c-format -msgid "Unable to open repository '%s'" -msgstr "Projektarchiv »%s« kann nicht geöffnet werden" - -#: ../libsvn_ra_serf/commit.c:285 -msgid "No Location header received" -msgstr "Kein »Location« Kopf empfangen" - -#: ../libsvn_ra_serf/commit.c:295 -msgid "Error parsing Location header value" -msgstr "Fehler beim Auslesen des Wertes aus dem »Location« Kopf" +msgid "No such revision %ld in filesystem '%s'" +msgstr "Keine solche Revision %ld im Dateisystem »%s«" -#: ../libsvn_ra_serf/commit.c:481 ../libsvn_repos/commit.c:553 +#: ../libsvn_fs_base/err.c:80 #, c-format -msgid "Path '%s' not present" -msgstr "Pfad »%s« existiert nicht" +msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'" +msgstr "Beschädigter Eintrag in »transactions« Tabelle für »%s« in Dateisystem »%s«" -#: ../libsvn_ra_serf/commit.c:1297 +#: ../libsvn_fs_base/err.c:91 #, c-format -msgid "POST request did not return transaction information" -msgstr "POST-Anfrage lieferte keine Transaktionsinformationen zurück" +msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'" +msgstr "Beschädigter Eintrag in »copies« Tabelle für »%s« in Dateisystem »%s«" -#: ../libsvn_ra_serf/commit.c:1577 ../libsvn_ra_serf/update.c:2263 +#: ../libsvn_fs_base/err.c:102 #, c-format -msgid "Unable to parse URL '%s'" -msgstr "Konnte die URL »%s« nicht zerlegen" +msgid "No transaction named '%s' in filesystem '%s'" +msgstr "Keine Transaktion namens »%s« in Dateisystem »%s«" -#: ../libsvn_ra_serf/commit.c:1829 +#: ../libsvn_fs_base/err.c:113 #, c-format -msgid "File '%s' already exists" -msgstr "Datei »%s« existiert bereits" - -#: ../libsvn_ra_serf/commit.c:2041 ../libsvn_ra_svn/editorp.c:852 -msgid "Closing editor with directories or files open" -msgstr "Schließen des Editors mit geöffneten Verzeichnissen oder Dateien" +msgid "Cannot modify transaction named '%s' in filesystem '%s'" +msgstr "Kann die Transaktion namens »%s« in Dateisystem »%s« nicht modifizieren" -#: ../libsvn_ra_serf/get_deleted_rev.c:173 +#: ../libsvn_fs_base/err.c:124 #, c-format -msgid "'%s' REPORT not implemented" -msgstr "»%s« REPORT nicht implementiert" - -#: ../libsvn_ra_serf/get_file.c:378 -msgid "Can't get text contents of a directory" -msgstr "Kann Textinhalt eines Verzeichnisses nicht lesen" +msgid "No copy with id '%s' in filesystem '%s'" +msgstr "Keine Kopie mit ID »%s« in Dateisystem »%s«" -#: ../libsvn_ra_serf/get_lock.c:170 ../libsvn_ra_serf/lock.c:165 +#: ../libsvn_fs_base/err.c:134 #, c-format -msgid "Invalid LOCK timeout value '%s'" -msgstr "Ungültiger Timeout-Wert für Sperre »%s«" - -#: ../libsvn_ra_serf/get_lock.c:323 -msgid "Server does not support locking features" -msgstr "Server unterstützt keine Sperroperationen" - -#: ../libsvn_ra_serf/getdate.c:167 -msgid "The REPORT response did not include the requested properties" -msgstr "Die REPORT-Antwort enthielt nicht den angeforderten Eigenschaften" +msgid "Token '%s' does not point to any existing lock in filesystem '%s'" +msgstr "Marke »%s« zeigt auf keine existierende Sperre im Dateisystem »%s«" -#: ../libsvn_ra_serf/inherited_props.c:173 ../libsvn_ra_serf/property.c:264 -#: ../libsvn_ra_serf/update.c:1886 +#: ../libsvn_fs_base/err.c:144 #, c-format -msgid "Got unrecognized encoding '%s'" -msgstr "Unbekannte Codierung »%s«" +msgid "No token given for path '%s' in filesystem '%s'" +msgstr "Keine Marke für Pfad »%s« in Dateisystem »%s« angegeben" -#: ../libsvn_ra_serf/lock.c:261 +#: ../libsvn_fs_base/err.c:153 #, c-format -msgid "No lock on path '%s' (%d %s)" -msgstr "Keine Sperre für Pfad »%s« (%d %s)" +msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'" +msgstr "Beschädigte Sperre in »locks« Tabelle für »%s« in Dateisystem »%s«" -#: ../libsvn_ra_serf/lock.c:270 +#: ../libsvn_fs_base/err.c:163 #, c-format -msgid "Unlock of '%s' failed (%d %s)" -msgstr "Freigabe der Sperre von »%s« gescheitert (%d %s)" +msgid "No record in 'node-origins' table for node id '%s' in filesystem '%s'" +msgstr "Kein Datensatz in der »node-origins«-Tabelle für Knoten-ID »%s« im Dateisystem »%s«" -#: ../libsvn_ra_serf/lock.c:278 +#: ../libsvn_fs_base/err.c:173 #, c-format -msgid "Path '%s' doesn't exist in HEAD revision (%d %s)" -msgstr "Pfad »%s« existiert nicht in HEAD-Revision (%d %s)" +msgid "No record in 'checksum-reps' table for checksum '%s' in filesystem '%s'" +msgstr "Kein Datensatz in der »checksum-reps«-Tabelle für Prüfsumme »%s« im Dateisystem »%s«" -#: ../libsvn_ra_serf/lock.c:287 +#: ../libsvn_fs_base/fs.c:87 #, c-format -msgid "Path '%s' already locked (%d %s)" -msgstr "Pfad »%s« bereits gesperrt (%d %s)" +msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d" +msgstr "Falsche Datenbankversion: %d.%d.%d, sollte mindestens %d.%d.%d sein" -#: ../libsvn_ra_serf/lock.c:603 +#: ../libsvn_fs_base/fs.c:98 #, c-format -msgid "'%s' is not locked in the repository" -msgstr "»%s« ist im Projektarchiv nicht gesperrt" +msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d" +msgstr "Falsche Datenbankversion: Übersetzt mit %d.%d.%d, läuft mit %d.%d.%d" -#: ../libsvn_ra_serf/log.c:172 +#: ../libsvn_fs_base/fs.c:188 #, c-format -msgid "Unsupported encoding '%s'" -msgstr "Nicht unterstützte Kodierung »%s«" - -#: ../libsvn_ra_serf/log.c:574 ../libsvn_ra_svn/client.c:1714 -msgid "Server does not support custom revprops via log" -msgstr "Server unterstützt benutzerdefinierte Revisionseigenschaften mittels log nicht" +msgid "Berkeley DB error for filesystem '%s' while closing environment:\n" +msgstr "Berkeley-DB-Fehler für Dateisystem »%s« beim Schließen der Umgebung:\n" -#: ../libsvn_ra_serf/merge.c:205 +#: ../libsvn_fs_base/fs.c:614 #, c-format -msgid "A MERGE response for '%s' is not a child of the destination ('%s')" -msgstr "Eine MERGE-Antwort für »%s« ist kein Kind des Ziels (»%s«)" - -#: ../libsvn_ra_serf/merge.c:447 -msgid "The MERGE response did not include a new revision" -msgstr "Die MERGE-Antwort enthielt keine neue Revision" +msgid "Berkeley DB error for filesystem '%s' while creating environment:\n" +msgstr "Berkeley-DB-Fehler für Dateisystem »%s« beim Erzeugen der Umgebung:\n" -#: ../libsvn_ra_serf/multistatus.c:226 ../libsvn_ra_serf/multistatus.c:231 +#: ../libsvn_fs_base/fs.c:620 #, c-format -msgid "Malformed DAV:status '%s'" -msgstr "Fehlerhaftes Format in »DAV:status«: »%s«" +msgid "Berkeley DB error for filesystem '%s' while opening environment:\n" +msgstr "Berkeley-DB-Fehler für Dateisystem »%s« beim Öffnen der Umgebung:\n" -#: ../libsvn_ra_serf/multistatus.c:536 -#, c-format -msgid "Property operation on '%s' failed" -msgstr "Operation auf Eigenschaft von »%s« fehlgeschlagen" +#: ../libsvn_fs_base/fs.c:635 +msgid "creating 'nodes' table" +msgstr "Erzeuge Tabelle »nodes« " -#: ../libsvn_ra_serf/multistatus.c:555 -msgid "" -msgstr "" +#: ../libsvn_fs_base/fs.c:636 +msgid "opening 'nodes' table" +msgstr "Öffne Tabelle »nodes«" -#: ../libsvn_ra_serf/multistatus.c:564 -#, c-format -msgid "While handling the '%s' property on '%s':" -msgstr "Während der Abwicklung der Eigenschaft »%s« von »%s«:" +#: ../libsvn_fs_base/fs.c:641 +msgid "creating 'revisions' table" +msgstr "Erzeuge Tabelle »revisions«" -#: ../libsvn_ra_serf/multistatus.c:568 -#, c-format -msgid "While handling the '%s' path:" -msgstr "Während der Abwicklung des Pfades »%s«:" +#: ../libsvn_fs_base/fs.c:642 +msgid "opening 'revisions' table" +msgstr "Öffne Tabelle »revisions«" -#: ../libsvn_ra_serf/options.c:446 -msgid "The OPTIONS response did not include the youngest revision" -msgstr "Die OPTIONS-Antwort enthielt nicht die jüngste Revision" +#: ../libsvn_fs_base/fs.c:647 +msgid "creating 'transactions' table" +msgstr "Erzeuge Tabelle »transactions«" -#: ../libsvn_ra_serf/options.c:487 -msgid "The OPTIONS response did not include the requested activity-collection-set value" -msgstr "Die OPTIONS-Antwort enthielt nicht den angeforderten Wert »activity-collection-set«" +#: ../libsvn_fs_base/fs.c:648 +msgid "opening 'transactions' table" +msgstr "Öffne Tabelle »transactions«" -#: ../libsvn_ra_serf/options.c:529 -msgid "Location header not set on redirect response" -msgstr "Location-Kopfzeile in der Umleitungsantwort nicht gesetzt" +#: ../libsvn_fs_base/fs.c:653 +msgid "creating 'copies' table" +msgstr "Erzeuge Tabelle »copies«" -#: ../libsvn_ra_serf/options.c:559 ../libsvn_ra_serf/util.c:1787 -#, c-format -msgid "Repository moved permanently to '%s'" -msgstr "Das Projektarchiv wurde permanent nach »%s« verschoben" +#: ../libsvn_fs_base/fs.c:654 +msgid "opening 'copies' table" +msgstr "Öffne Tabelle »copies«" -#: ../libsvn_ra_serf/options.c:560 ../libsvn_ra_serf/util.c:1788 -#, c-format -msgid "Repository moved temporarily to '%s'" -msgstr "Das Projektarchiv wurde zeitweilig nach »%s« verschoben" +#: ../libsvn_fs_base/fs.c:659 +msgid "creating 'changes' table" +msgstr "Erzeuge Tabelle »changes«" -#: ../libsvn_ra_serf/options.c:715 -#, c-format -msgid "Don't know how to handle '%s' for capability '%s'" -msgstr "Es ist unklar, wie mit »%s« für Eigenschaft »%s« verfahren werden soll" +#: ../libsvn_fs_base/fs.c:660 +msgid "opening 'changes' table" +msgstr "Öffne Tabelle »changes«" -#: ../libsvn_ra_serf/options.c:739 -#, c-format -msgid "Attempt to fetch capability '%s' resulted in '%s'" -msgstr "Der Versuch, die Eigenschaft »%s« abzufragen, führte zu »%s«" +#: ../libsvn_fs_base/fs.c:665 +msgid "creating 'representations' table" +msgstr "Erzeuge Tabelle »representations«" -#: ../libsvn_ra_serf/property.c:663 -msgid "The PROPFIND response did not include the requested baseline-collection value" -msgstr "Die PROPFIND-Antwort enthielt nicht den angeforderten Wert »baseline-collection«" +#: ../libsvn_fs_base/fs.c:666 +msgid "opening 'representations' table" +msgstr "Öffne Tabelle »representations«" -#: ../libsvn_ra_serf/property.c:683 -msgid "The PROPFIND response did not include the requested version-name value" -msgstr "Die PROPFIND-Antwort enthielt nicht den angeforderten Wert »version-name«" +#: ../libsvn_fs_base/fs.c:671 +msgid "creating 'strings' table" +msgstr "Erzeuge Tabelle »strings«" -#: ../libsvn_ra_serf/property.c:719 -msgid "The OPTIONS response did not include the requested checked-in value" -msgstr "Die OPTIONS-Antwort enthielt nicht den angeforderten Wert »checked-in«" +#: ../libsvn_fs_base/fs.c:672 +msgid "opening 'strings' table" +msgstr "Öffne Tabelle »strings«" -#: ../libsvn_ra_serf/property.c:891 -msgid "The PROPFIND response did not include the requested 'DAV:' properties" -msgstr "Die PROPFIND-Antwort enthielt nicht die angeforderten »DAV:«-Eigenschaften" +#: ../libsvn_fs_base/fs.c:677 +msgid "creating 'uuids' table" +msgstr "Erzeuge Tabelle »uuids«" -#: ../libsvn_ra_serf/replay.c:466 -msgid "Error writing stream: unexpected EOF" -msgstr "Fehler beim Schreiben in Datenstrom: unerwartetes EOF" +#: ../libsvn_fs_base/fs.c:678 +msgid "opening 'uuids' table" +msgstr "Öffne Tabelle »uuids«" -#: ../libsvn_ra_serf/sb_bucket.c:65 -msgid "Failed to read the request" -msgstr "Konnte die Anfrage nicht lesen" +#: ../libsvn_fs_base/fs.c:683 +msgid "creating 'locks' table" +msgstr "Erzeuge Tabelle »locks«" -#: ../libsvn_ra_serf/serf.c:63 -msgid "Module for accessing a repository via WebDAV protocol using serf." -msgstr "Modul zum Zugriff auf ein Projektarchiv über das Protokoll WebDAV mittels serf." +#: ../libsvn_fs_base/fs.c:684 +msgid "opening 'locks' table" +msgstr "Öffne Tabelle »locks«" -#: ../libsvn_ra_serf/serf.c:66 -#, c-format -msgid "" -"Module for accessing a repository via WebDAV protocol using serf.\n" -" - using serf %d.%d.%d" -msgstr "" -"Modul zum Zugriff auf ein Projektarchiv über das Protokoll WebDAV mittels serf.\n" -" - verwendet serf %d.%d.%d" +#: ../libsvn_fs_base/fs.c:689 +msgid "creating 'lock-tokens' table" +msgstr "Erzeuge Tabelle »lock-tokens«" -# password store: kwallet, ... -#: ../libsvn_ra_serf/serf.c:130 -#, c-format -msgid "Invalid config: unknown %s '%s'" -msgstr "Ungültige Konfiguration: Unbekanntes %s »%s«" +#: ../libsvn_fs_base/fs.c:690 +msgid "opening 'lock-tokens' table" +msgstr "Öffne Tabelle »lock-tokens«" -#: ../libsvn_ra_serf/serf.c:363 -msgid "Invalid config: illegal character in timeout value" -msgstr "Ungültige Konfiguration: Illegales Zeichen im Timeout-Wert" +#: ../libsvn_fs_base/fs.c:698 +msgid "creating 'node-origins' table" +msgstr "Erzeuge Tabelle »node-origins«" -#: ../libsvn_ra_serf/serf.c:367 -msgid "Invalid config: negative timeout value" -msgstr "Ungültige Konfiguration: Negativer Timeout-Wert" +#: ../libsvn_fs_base/fs.c:699 +msgid "opening 'node-origins' table" +msgstr "Öffne Tabelle »node-origin«" -#: ../libsvn_ra_serf/serf.c:380 -msgid "Invalid URL: illegal character in proxy port number" -msgstr "Ungültige URL: Illegales Zeichen in Proxy Portnummer" +#: ../libsvn_fs_base/fs.c:708 +msgid "creating 'miscellaneous' table" +msgstr "Erzeuge Tabelle »miscellaneous«" -#: ../libsvn_ra_serf/serf.c:384 -msgid "Invalid URL: negative proxy port number" -msgstr "Ungültige URL: Negative Proxy Portnummer" +#: ../libsvn_fs_base/fs.c:709 +msgid "opening 'miscellaneous' table" +msgstr "Öffne Tabelle »miscellaneous«" -#: ../libsvn_ra_serf/serf.c:387 -msgid "Invalid URL: proxy port number greater than maximum TCP port number 65535" -msgstr "Ungültige URL: Proxy Portnummer ist größer als die maximale TCP Portnummer 65535" +#: ../libsvn_fs_base/fs.c:718 +msgid "creating 'checksum-reps' table" +msgstr "Erzeuge Tabelle »checksum-reps«" -#: ../libsvn_ra_serf/serf.c:407 -#, c-format -msgid "Could not resolve proxy server '%s'" -msgstr "Konnte Proxy-Server »%s« nicht auflösen" +#: ../libsvn_fs_base/fs.c:719 +msgid "opening 'checksum-reps' table" +msgstr "Öffne Tabelle »checksum-reps«" -#: ../libsvn_ra_serf/serf.c:517 +#: ../libsvn_fs_base/fs.c:810 #, c-format -msgid "Illegal URL '%s'" -msgstr "Ungültige URL »%s«" +msgid "The '%s' feature requires version %d of the filesystem schema; filesystem '%s' uses only version %d" +msgstr "Das Merkmal »%s« erfordert Version %d des Dateisystemschemas; Dateisystem »%s« verwendet nur Version %d" -#: ../libsvn_ra_serf/serf.c:609 +#: ../libsvn_fs_base/fs.c:829 #, c-format -msgid "Connection to '%s' failed" -msgstr "Verbindung zu »%s« fehlgeschlagen" - -#: ../libsvn_ra_serf/serf.c:1028 -msgid "The UUID property was not found on the resource or any of its parents" -msgstr "Die UUID-Eigenschaft wurde weder auf der Ressource noch ihren Eltern gefunden." +msgid "Expected FS format '%d'; found format '%d'" +msgstr "Erwartetes Dateisystemformat »%d«; gefunden »%d«" -#: ../libsvn_ra_serf/serf.c:1103 +#: ../libsvn_fs_base/fs.c:1319 #, c-format -msgid "Unsupported RA loader version (%d) for ra_serf" -msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_serf" +msgid "BDB repositories do not support incremental hotcopy" +msgstr "BDB-Projektarchive unterstützen inkrementelle Kopien im laufenden Betrieb nicht" -#: ../libsvn_ra_serf/serf.c:1117 -#, c-format -msgid "ra_serf was compiled for serf %d.%d.%d but loaded an incompatible %d.%d.%d library" -msgstr "ra_serv wurde für serf %d.%d.%d übersetzt, lud aber die nicht kompatible Version %d.%d.%d der Bibliothek" +#: ../libsvn_fs_base/fs.c:1423 +msgid "" +"Error copying logfile; the DB_LOG_AUTOREMOVE feature\n" +"may be interfering with the hotcopy algorithm. If\n" +"the problem persists, try deactivating this feature\n" +"in DB_CONFIG" +msgstr "" +"Fehler beim Kopieren der Logdatei; die Funktion DB_LOG_AUTOREMOVE\n" +"könnte den Hotcopy-Algorithmus stören. Falls das Problem weiterhin\n" +"besteht, versuchen Sie diese Funktion in DB_CONFIG abzuschalten" -#: ../libsvn_ra_serf/stat.c:106 -msgid "The PROPFIND response did not include the requested resourcetype value" -msgstr "Die PROPFIND-Antwort enthielt nicht den angeforderten Wert »resourcetype«" +#: ../libsvn_fs_base/fs.c:1442 +msgid "" +"Error running catastrophic recovery on hotcopy; the\n" +"DB_LOG_AUTOREMOVE feature may be interfering with the\n" +"hotcopy algorithm. If the problem persists, try deactivating\n" +"this feature in DB_CONFIG" +msgstr "" +"Fehler beim Ausführen der Katastrophen-Wiederherstellung im\n" +"laufenden Betrieb (hotcopy); die Funktion DB_LOG_AUTOREMOVE\n" +"könnte den Hotcopy-Algorithmus stören. Wenn das Problem weiterhin\n" +"besteht, versuchen Sie diese Funktion in DB_CONFIG abzuschalten" -#: ../libsvn_ra_serf/stat.c:410 ../libsvn_ra_serf/stat.c:448 -msgid "Can't get properties of non-directory" -msgstr "Kann keine Eigenschaften eines nicht-Verzeichnises lesen" +#: ../libsvn_fs_base/fs.c:1487 +msgid "Module for working with a Berkeley DB repository." +msgstr "Modul zum Zugriff auf ein Berkeley-DB-Projektarchiv." -#: ../libsvn_ra_serf/update.c:1135 +#: ../libsvn_fs_base/fs.c:1537 #, c-format -msgid "GET request returned unexpected delta base: %s" -msgstr "GET-Anfrage gab eine nicht erwartete Delta-Basis zurück: %s" +msgid "Unsupported FS loader version (%d) for bdb" +msgstr "Nicht unterstützte Dateisystem-Laderversion (%d) für bdb" -#: ../libsvn_ra_serf/update.c:1692 ../libsvn_ra_serf/update.c:1742 +#: ../libsvn_fs_base/lock.c:122 ../libsvn_fs_base/lock.c:127 +#: ../libsvn_fs_fs/lock.c:740 ../libsvn_fs_fs/lock.c:745 +#: ../libsvn_fs_fs/lock.c:775 ../libsvn_fs_x/lock.c:760 +#: ../libsvn_fs_x/lock.c:765 ../libsvn_fs_x/lock.c:795 #, c-format -msgid "Missing '%s' attribute" -msgstr "Fehlendes Attribut »%s«" - -#: ../libsvn_ra_serf/update.c:1956 ../libsvn_ra_serf/update.c:1986 -msgid "The REPORT response did not include the requested checked-in value" -msgstr "Die REPORT-Antwort enthielt nicht den angeforderten Wert »checked-in«" +msgid "Path '%s' doesn't exist in HEAD revision" +msgstr "Pfad »%s« existiert nicht in HEAD-Revision" -#: ../libsvn_ra_serf/update.c:2636 -msgid "Missing update-report close tag" -msgstr "Abschließendes Tag »update-report« fehlt" +#: ../libsvn_fs_base/lock.c:616 ../libsvn_fs_fs/lock.c:613 +#: ../libsvn_fs_x/lock.c:631 +#, c-format +msgid "Cannot verify lock on path '%s'; no username available" +msgstr "Kann Sperre für Pfad »%s« nicht prüfen; keine Benutzername verfügbar" -#: ../libsvn_ra_serf/util.c:195 -msgid ": " -msgstr ": " +#: ../libsvn_fs_base/lock.c:622 ../libsvn_fs_fs/lock.c:619 +#: ../libsvn_fs_x/lock.c:637 +#, c-format +msgid "User '%s' does not own lock on path '%s' (currently locked by '%s')" +msgstr "Benutzer »%s« besitzt die Sperre für Pfad »%s« nicht (derzeit gesperrt durch »%s«)" -#: ../libsvn_ra_serf/util.c:197 -msgid ", " -msgstr ", " +#: ../libsvn_fs_base/lock.c:628 ../libsvn_fs_fs/lock.c:625 +#: ../libsvn_fs_x/lock.c:643 +#, c-format +msgid "Cannot verify lock on path '%s'; no matching lock-token available" +msgstr "Kann Sperre für Pfad »%s« nicht prüfen; keine entsprechende Sperrmarke verfügbar" -#: ../libsvn_ra_serf/util.c:407 -msgid "Server SSL certificate verification failed" -msgstr "Überprüfung des Server-SSL-Zertifikats fehlgeschlagen" +#. Helper macro that evaluates to an error message indicating that +#. the representation referred to by X has an unknown node kind. +#: ../libsvn_fs_base/reps-strings.c:58 +#, c-format +msgid "Unknown node kind for representation '%s'" +msgstr "Unbekannter Knotentyp für Darstellung »%s«" -#: ../libsvn_ra_serf/util.c:412 -msgid "certificate is not yet valid" -msgstr "Das Zertifikat ist noch nicht gültig" +#: ../libsvn_fs_base/reps-strings.c:110 +msgid "Representation is not of type 'delta'" +msgstr "Darstellung ist nicht vom Typ »delta«" -#: ../libsvn_ra_serf/util.c:415 -msgid "certificate has expired" -msgstr "Das Zertifikat ist abgelaufen" +#: ../libsvn_fs_base/reps-strings.c:380 +msgid "Svndiff source length inconsistency" +msgstr "Svndiff Quelllänge ist inkonsistent" -#: ../libsvn_ra_serf/util.c:419 -msgid "certificate issued for a different hostname" -msgstr "Zertifikat wurde für einen anderen Hostnamen ausgestellt" +#: ../libsvn_fs_base/reps-strings.c:506 +#, c-format +msgid "Diff version inconsistencies in representation '%s'" +msgstr "Inkonsistenzen in Diffversion in Darstellung »%s«" -#: ../libsvn_ra_serf/util.c:423 -msgid "issuer is not trusted" -msgstr "Herausgeber wird nicht vertraut" +#: ../libsvn_fs_base/reps-strings.c:532 +#, c-format +msgid "Corruption detected whilst reading delta chain from representation '%s' to '%s'" +msgstr "Beim Lesen der Delta-Kette aus der Darstellung »%s« nach »%s« wurde eine Beschädigung entdeckt" -#: ../libsvn_ra_serf/util.c:426 -msgid "and other reason(s)" -msgstr "und weitere Gründe" +#: ../libsvn_fs_base/reps-strings.c:798 +#, c-format +msgid "Rep contents are too large: got %s, limit is %s" +msgstr "Inhalt der Darstellung zu groß: »%s« erhalten, Grenze ist »%s«" -#: ../libsvn_ra_serf/util.c:473 +#: ../libsvn_fs_base/reps-strings.c:814 #, c-format -msgid "Invalid config: unable to load certificate file '%s'" -msgstr "Ungültige Konfiguration: Zertifikatsdatei »%s« kann nicht geladen werden" +msgid "Failure reading representation '%s'" +msgstr "Fehler beim Lesen der Darstellung »%s«" -#: ../libsvn_ra_serf/util.c:911 ../libsvn_ra_serf/util.c:914 -msgid "Error running context" -msgstr "Fehler beim Ausführen des Kontextes" +#: ../libsvn_fs_base/reps-strings.c:924 +#, c-format +msgid "MD5 checksum mismatch on representation '%s'" +msgstr "MD5-Prüfsummenfehler auf Darstellung »%s«" -#: ../libsvn_ra_serf/util.c:1186 -msgid "" -"No more credentials or we tried too many times.\n" -"Authentication failed" -msgstr "" -"Keine weiteren Zugangsdaten oder zu viele Versuche.\n" -"Anmeldung fehlgeschlagen" +#: ../libsvn_fs_base/reps-strings.c:934 +#, c-format +msgid "SHA1 checksum mismatch on representation '%s'" +msgstr "SHA1-Prüfsummenfehler auf Darstellung »%s«" -#: ../libsvn_ra_serf/util.c:1208 -msgid "Proxy authentication failed" -msgstr "Proxy-Anmeldung schlug fehl" +#: ../libsvn_fs_base/reps-strings.c:945 +msgid "Null rep, but offset past zero already" +msgstr "Leere Darstellung, aber der Offset ist bereits größer als Null" -#: ../libsvn_ra_serf/util.c:1263 +#: ../libsvn_fs_base/reps-strings.c:1062 ../libsvn_fs_base/reps-strings.c:1254 #, c-format -msgid "%s request on '%s' failed" -msgstr "%s-Anfrage auf »%s« schlug fehl" +msgid "Rep '%s' is not mutable" +msgstr "Darstellung »%s« ist nicht veränderlich" -#: ../libsvn_ra_serf/util.c:1335 +#: ../libsvn_fs_base/reps-strings.c:1077 #, c-format -msgid "Premature EOF seen from server (http status=%d)" -msgstr "Vorzeitiges EOF vom Server (http Status=%d)" +msgid "Rep '%s' both mutable and non-fulltext" +msgstr "Darstellung »%s« ist beides: veränderlich und kein Volltext" -#: ../libsvn_ra_serf/util.c:1686 -msgid "The PROPFIND response did not include the requested version-controlled-configuration value" -msgstr "Die PROPFIND-Antwort enthielt nicht den angeforderten Wert »version-controlled-configuration«" +#: ../libsvn_fs_base/reps-strings.c:1373 +msgid "Failed to get new string key" +msgstr "Konnte keinen neuen Schlüssel erzeugen" -#: ../libsvn_ra_serf/util.c:1792 +#: ../libsvn_fs_base/reps-strings.c:1450 #, c-format -msgid "Access to '%s' forbidden" -msgstr "Zugriff auf »%s« verboten" +msgid "Attempt to deltify '%s' against itself" +msgstr "Versuch, Deltas von »%s« gegen sich selber zu erstellen" -#: ../libsvn_ra_serf/util.c:1799 +#: ../libsvn_fs_base/reps-strings.c:1523 #, c-format -msgid "HTTP method is not allowed on '%s'" -msgstr "HTTP-Methode ist auf »%s« nicht erlaubt" +msgid "Failed to calculate MD5 digest for '%s'" +msgstr "Berechnung der MD5-Summe für »%s« schlug fehl" -#: ../libsvn_ra_serf/util.c:1803 +#: ../libsvn_fs_base/revs-txns.c:72 #, c-format -msgid "'%s' conflicts" -msgstr "»%s« ist von einem Konflikt betroffen" +msgid "Transaction is not dead: '%s'" +msgstr "Transaktion ist nicht tot: »%s«" -#: ../libsvn_ra_serf/util.c:1806 +#: ../libsvn_fs_base/revs-txns.c:75 #, c-format -msgid "Precondition on '%s' failed" -msgstr "Vorbedingung von »%s« fehlgeschlagen" +msgid "Transaction is dead: '%s'" +msgstr "Transaktion ist tot: »%s«" -#: ../libsvn_ra_serf/util.c:1809 +#: ../libsvn_fs_base/revs-txns.c:277 ../libsvn_fs_fs/fs_fs.c:2247 +#: ../libsvn_fs_x/fs_x.c:1210 #, c-format -msgid "'%s': no lock token available" -msgstr "»%s«: Keine Sperrmarke verfügbar" +msgid "revprop '%s' has unexpected value in filesystem" +msgstr "Revisionseigenschaft »%s« hat einen unerwarteten Wert im Dateisystem" -#: ../libsvn_ra_serf/util.c:1813 -#, c-format -msgid "DAV request failed: 411 Content length required. The server or an intermediate proxy does not accept chunked encoding. Try setting 'http-chunked-requests' to 'auto' or 'no' in your client configuration." -msgstr "DAV-Anfrage fehlgeschlagen: 411 Angabe zur Länge des Inhalts erforderlich. Der Server oder ein dazwischengeschalteter Proxy-Server akzeptiert Kodierung in Teilstücken nicht. Versuchen Sie »http-chunked-requests« auf »auto« oder »no« in der Konfiguration des Clients." +#: ../libsvn_fs_base/revs-txns.c:1065 +msgid "Transaction aborted, but cleanup failed" +msgstr "Transaktion abgebrochen, aber Aufräumen schlug fehl" -#: ../libsvn_ra_serf/util.c:1819 -#, c-format -msgid "Unexpected server error %d '%s' on '%s'" -msgstr "Unerwarteter Serverfehler %d »%s« auf »%s«" +#: ../libsvn_fs_base/trail.c:99 +msgid "beginning Berkeley DB transaction" +msgstr "Beginne Berkeley DB Transaktion" -#: ../libsvn_ra_serf/util.c:1823 -#, c-format -msgid "The requested feature is not supported by '%s'" -msgstr "Die angeforderte Funktion wird von »%s« nicht unterstützt" +#: ../libsvn_fs_base/trail.c:134 +msgid "aborting Berkeley DB transaction" +msgstr "Breche Berkeley DB Transaktion ab" -#: ../libsvn_ra_serf/util.c:1829 -#, c-format -msgid "Unexpected HTTP status %d '%s' on '%s'" -msgstr "Unerwarteter HTTP-Status %d »%s« auf »%s«" +#: ../libsvn_fs_base/trail.c:158 +msgid "committing Berkeley DB transaction" +msgstr "Schließe Berkeley DB Transaktion ab" -#: ../libsvn_ra_serf/util.c:1848 +#: ../libsvn_fs_base/tree.c:774 #, c-format -msgid "Path '%s' unexpectedly created" -msgstr "Pfad »%s« wurde unerwartet erstellt" +msgid "Failure opening '%s'" +msgstr "Fehler beim Öffnen von »%s«" -#: ../libsvn_ra_serf/util.c:1857 -#, c-format -msgid "The HTTP method '%s' is not allowed on '%s'" -msgstr "Die HTTP-Methode »%s« ist auf »%s« nicht erlaubt" +#: ../libsvn_fs_base/tree.c:1461 ../libsvn_fs_fs/tree.c:1693 +#: ../libsvn_fs_x/tree.c:602 +msgid "Cannot compare property value between two different filesystems" +msgstr "Kann Eigenschaftswert nicht zwischen verschiedenen Dateisystemen vergleichen" -#: ../libsvn_ra_serf/util.c:1862 -#, c-format -msgid "Unexpected HTTP status %d '%s' on '%s' request to '%s'" -msgstr "Unerwarteter HTTP-Status %d »%s« auf »%s« bei Anfrage an »%s«" +#: ../libsvn_fs_base/tree.c:1927 ../libsvn_fs_base/tree.c:1997 +msgid "Corrupt DB: faulty predecessor count" +msgstr "DB beschädigt: Fehlerhafte Vorgängeranzahl" -#: ../libsvn_ra_serf/xml.c:502 +#: ../libsvn_fs_base/tree.c:2054 #, c-format -msgid "XML stream truncated: closing '%s' missing" -msgstr "XML-Strom abgeschnitten: Abschließendes »%s« fehlt" - -#: ../libsvn_ra_serf/xml.c:530 -msgid "document element not found" -msgstr "Dokumenten-Element nicht gefunden" +msgid "Unexpected immutable node at '%s'" +msgstr "Unerwarteter unveränderlicher Knoten bei »%s«" -#: ../libsvn_ra_serf/xml.c:533 +#: ../libsvn_fs_base/tree.c:2075 ../libsvn_fs_fs/tree.c:1723 +#: ../libsvn_fs_x/tree.c:638 ../libsvn_repos/commit.c:1303 #, c-format -msgid "XML stream truncated: %s" -msgstr "XML-Strom abgeschnitten: %s" +msgid "Conflict at '%s'" +msgstr "Konflikt bei »%s«" + +#: ../libsvn_fs_base/tree.c:2128 ../libsvn_fs_base/tree.c:2892 +#: ../libsvn_fs_fs/tree.c:1821 ../libsvn_fs_fs/tree.c:2375 +#: ../libsvn_fs_x/tree.c:759 ../libsvn_fs_x/tree.c:1292 +msgid "Bad merge; ancestor, source, and target not all in same fs" +msgstr "Fehlerhaftes Zusammenführen: Vorgänger, Quelle und Ziel nicht im gleichen Dateisystem" -#: ../libsvn_ra_serf/xml.c:698 +#: ../libsvn_fs_base/tree.c:2144 ../libsvn_fs_fs/tree.c:1837 +#: ../libsvn_fs_x/tree.c:775 #, c-format -msgid "XML Parsing failed: Unexpected root element '%s'" -msgstr "XML-Parser schlug fehl: Nicht erwartetes Wurzelelement »%s«" +msgid "Bad merge; target '%s' has id '%s', same as ancestor" +msgstr "Fehlerhaftes Zusammenführen: Ziel »%s« hat die gleiche ID »%s« wie der Vorgänger." -#: ../libsvn_ra_serf/xml.c:758 +#: ../libsvn_fs_base/tree.c:2687 #, c-format -msgid "Missing XML attribute '%s' on '%s' element" -msgstr "Fehlendes XML-Attribut: »%s« in Element »%s«" +msgid "Transaction '%s' out-of-date with respect to revision '%s'" +msgstr "Transaktion »%s« ist in Bezug auf Revision »%s« veraltet" -#: ../libsvn_ra_serf/xml.c:916 +#: ../libsvn_fs_base/tree.c:2976 #, c-format -msgid "Malformed XML: %s" -msgstr "Fehlerhaftes XML: %s" +msgid "Cannot deltify revisions prior to r%ld" +msgstr "Die Erstellung von Deltas für Revisionen vor r%ld ist nicht möglich" -#: ../libsvn_ra_serf/xml.c:918 -msgid "The XML response contains invalid XML" -msgstr "Die XML-Antwort enthält ungültiges XML" +#: ../libsvn_fs_base/tree.c:3094 ../libsvn_fs_fs/tree.c:2557 +#: ../libsvn_fs_x/tree.c:1478 +msgid "The root directory cannot be deleted" +msgstr "Das Basisverzeichnis kann nicht gelöscht werden" -#: ../libsvn_ra_svn/client.c:142 +#: ../libsvn_fs_base/tree.c:3308 ../libsvn_fs_fs/tree.c:2627 +#: ../libsvn_fs_x/tree.c:1548 #, c-format -msgid "Unknown hostname '%s'" -msgstr "Unbekannter Hostname »%s«" +msgid "Cannot copy between two different filesystems ('%s' and '%s')" +msgstr "Kann nicht zwischen zwei verschiedenen Dateisystemen (»%s« und »%s«) kopieren" + +#: ../libsvn_fs_base/tree.c:3317 ../libsvn_fs_fs/tree.c:2634 +#: ../libsvn_fs_x/tree.c:1555 +msgid "Copy from mutable tree not currently supported" +msgstr "Kopieren eines veränderlichen Baumes wird derzeit nicht unterstützt" -#: ../libsvn_ra_svn/client.c:167 +#: ../libsvn_fs_base/tree.c:3827 ../libsvn_fs_fs/tree.c:3029 +#: ../libsvn_fs_x/tree.c:1964 #, c-format -msgid "Can't connect to host '%s'" -msgstr "Kann nicht mit Host »%s« verbinden" +msgid "Base checksum mismatch on '%s'" +msgstr "Basis-Prüfsummenfehler bei »%s«" -#: ../libsvn_ra_svn/client.c:205 -msgid "Prop diffs element not a list" -msgstr "Eigenschafts-Diff Element ist keine Liste" +#: ../libsvn_fs_base/tree.c:4103 ../libsvn_fs_fs/tree.c:3239 +#: ../libsvn_fs_x/tree.c:2182 +msgid "Cannot compare file contents between two different filesystems" +msgstr "Kann Dateiinhalte nicht zwischen verschiedenen Dateisystemen vergleichen" -#: ../libsvn_ra_svn/client.c:404 +#: ../libsvn_fs_base/tree.c:5152 ../libsvn_fs_base/tree.c:5331 #, c-format -msgid "Undefined tunnel scheme '%s'" -msgstr "Undefiniertes Tunnelschema »%s«" +msgid "Node-revision '%s' claims to have mergeinfo but doesn't" +msgstr "Knotenrevision »%s« behauptet, Zusammenführungsinformationen zu haben, hat aber keine" -#: ../libsvn_ra_svn/client.c:421 +#: ../libsvn_fs_base/tree.c:5190 #, c-format -msgid "Tunnel scheme %s requires environment variable %s to be defined" -msgstr "Für Tunnelschema %s muss die Umgebungsvariable %s definiert sein" +msgid "Node-revision '%s' claims to sit atop a tree containing mergeinfo but is not a directory" +msgstr "Knotenrevision »%s« behauptet, über einem Baum, der Zusammenführungsinformationen enthält, zu sitzen, ist aber kein Verzeichnis" -#: ../libsvn_ra_svn/client.c:432 -#, c-format -msgid "Can't tokenize command '%s'" -msgstr "Kann Anweisung »%s« nicht zerlegen" +#: ../libsvn_fs_fs/cached_data.c:819 ../libsvn_fs_x/cached_data.c:538 +msgid "Malformed svndiff data in representation" +msgstr "Fehlerhafte svndiff-Daten in Darstellung" -#: ../libsvn_ra_svn/client.c:475 +#: ../libsvn_fs_fs/cached_data.c:1064 ../libsvn_fs_x/cached_data.c:799 #, c-format -msgid "Error in child process: %s" -msgstr "Fehler in Kindprozess: %s" +msgid "No representation found at offset %s for item %s in revision %ld" +msgstr "Keine Darstellung gefunden bei Offset %s für Element %s in Revision %ld" -#: ../libsvn_ra_svn/client.c:554 -msgid "To better debug SSH connection problems, remove the -q option from 'ssh' in the [tunnels] section of your Subversion configuration file." -msgstr "Um Probleme mit der Konfiguration von SSH zu untersuchen, entfernen Sie die Option »-q« von »ssh« im Abschnitt »[tunnels]« Ihrer Konfigurationsdatei für Subversion." +#: ../libsvn_fs_fs/cached_data.c:1612 ../libsvn_fs_fs/cached_data.c:1625 +#: ../libsvn_fs_fs/cached_data.c:3335 ../libsvn_fs_x/cached_data.c:1356 +#: ../libsvn_fs_x/cached_data.c:1370 ../libsvn_fs_x/cached_data.c:1645 +msgid "Reading one svndiff window read beyond the end of the representation" +msgstr "Lesen eines svndiff-Fensters las über Ende der Darstellung hinaus" -#: ../libsvn_ra_svn/client.c:572 -#, c-format -msgid "Illegal svn repository URL '%s'" -msgstr "Illegale svn Projektarchiv URL »%s«" +#: ../libsvn_fs_fs/cached_data.c:1754 ../libsvn_fs_x/cached_data.c:1496 +msgid "svndiff window length is corrupt" +msgstr "Svndiff Fensterlänge ist beschädigt" -#: ../libsvn_ra_svn/client.c:723 -#, c-format -msgid "Server requires minimum version %d" -msgstr "Server erfordert mindestens Version %d" +#: ../libsvn_fs_fs/cached_data.c:2175 ../libsvn_fs_x/cached_data.c:2095 +msgid "Checksum mismatch while reading representation" +msgstr "Prüfsummenfehler beim Lesen der Darstellung" -#: ../libsvn_ra_svn/client.c:727 +#: ../libsvn_fs_fs/cached_data.c:2594 +#, fuzzy, c-format +msgid "Directory representation corrupt in '%s'" +msgstr "Verzeichniseintrag beschädigt in »%s«" + +#: ../libsvn_fs_fs/cached_data.c:2624 ../libsvn_fs_fs/cached_data.c:2638 +#: ../libsvn_fs_fs/cached_data.c:2645 #, c-format -msgid "Server only supports versions up to %d" -msgstr "Server unterstützt nur Versionen bis zu %d" +msgid "Directory entry corrupt in '%s'" +msgstr "Verzeichniseintrag beschädigt in »%s«" -#: ../libsvn_ra_svn/client.c:735 -msgid "Server does not support edit pipelining" -msgstr "Server unterstützt »edit pipelining« nicht" +#: ../libsvn_fs_fs/cached_data.c:2969 +#, fuzzy, c-format +msgid "malformed property list for node-revision '%s' in '%s'" +msgstr "Fehlerhafte »copyroot«-Zeile in Knotenrevision »%s«" -#: ../libsvn_ra_svn/client.c:772 -msgid "Impossibly long repository root from server" -msgstr "Unmöglich lange Projektarchivbasis vom Server" +#: ../libsvn_fs_fs/cached_data.c:3002 +#, fuzzy, c-format +msgid "malformed property list for node-revision '%s'" +msgstr "Fehlerhafte »copyroot«-Zeile in Knotenrevision »%s«" -#: ../libsvn_ra_svn/client.c:784 +#: ../libsvn_fs_fs/cached_data.c:3514 +#, c-format msgid "" -"Module for accessing a repository using the svn network protocol.\n" -" - with Cyrus SASL authentication" +"Low-level checksum mismatch while reading\n" +"%s bytes of meta data at offset %s for item %s in revision %ld" msgstr "" -"Modul zum Zugriff auf ein Projektarchiv über das svn-Netzwerkprotokoll.\n" -" - mit Cyrus-SASL-Authentifizierung" - -#: ../libsvn_ra_svn/client.c:788 -msgid "Module for accessing a repository using the svn network protocol." -msgstr "Modul zum Zugriff auf ein Projektarchiv über das svn-Netzwerkprotokoll" +"Interner Prüfsummenfehler beim Lesen von\n" +"%s Byte von Metadaten bei Offset %s für Element »%s« in Revision »%ld«" -#: ../libsvn_ra_svn/client.c:1025 -msgid "Server did not send repository root" -msgstr "Server gab keine Projektarchivbasis zurück" +#: ../libsvn_fs_fs/dag.c:431 ../libsvn_fs_fs/dag.c:448 +#: ../libsvn_fs_x/dag.c:257 ../libsvn_fs_x/dag.c:384 +#: ../libsvn_ra_serf/stat.c:553 +msgid "Can't get entries of non-directory" +msgstr "Kann keine Einträge aus einem nicht-Verzeichnis lesen" -#: ../libsvn_ra_svn/client.c:1101 +#: ../libsvn_fs_fs/dag.c:591 ../libsvn_fs_x/dag.c:497 #, c-format -msgid "ra_svn does not support not specifying a log message with pre-1.5 servers; consider passing an empty one, or upgrading the server" -msgstr "ra_svn unterstützt die Angabe einer Logmeldung mit Servern älter als 1.5 nicht; Versuchen Sie, eine leere Logmeldung zu übergeben oder verwenden Sie eine neuere Version auf dem Server" +msgid "Can't increment mergeinfo count on node-revision %%s to negative value %%%s" +msgstr "Kann Zusammenführungsinformationszähler für Knotenrevision %%s nicht auf negativen Wert %%%s erhöhen" -#: ../libsvn_ra_svn/client.c:1124 -msgid "Server doesn't support setting arbitrary revision properties during commit" -msgstr "Der Server unterstützt das Setzen beliebiger Revisionseigenschaften während eines Commits nicht" +# FIXME: node-revision or node-rev (wie überall)? +#: ../libsvn_fs_fs/dag.c:602 ../libsvn_fs_x/dag.c:509 +#, c-format +msgid "Can't increment mergeinfo count on *file* node-revision %%s to %%%s (> 1)" +msgstr "Kann Zusammenführungsinformationszähler für Datei-Knotenrevision %%s nicht auf %%%s (> 1) erhöhen" -#: ../libsvn_ra_svn/client.c:1227 -msgid "Inherited proplist element not a list" -msgstr "Element für geerbte Eigenschaften ist keine Liste" +#: ../libsvn_fs_fs/dag.c:1190 +msgid "Empty noderev in cache" +msgstr "Leere Knotenrevision im Zwischenspeicher" -#: ../libsvn_ra_svn/client.c:1302 -msgid "Non-string as part of file contents" -msgstr "Ein Teil des Dateiinhaltes ist keine Zeichenkette" +#: ../libsvn_fs_fs/dag.c:1417 ../libsvn_fs_x/dag.c:1076 +#, c-format +msgid "Attempted to update ancestry of non-mutable node" +msgstr "Versuchte, die Herkunft eines unveränderlichen Knotens zu ändern" -#: ../libsvn_ra_svn/client.c:1391 -msgid "Dirlist element not a list" -msgstr "Verzeichniseintrag ist keine Liste" +#: ../libsvn_fs_fs/fs.c:100 +#, c-format +msgid "Can't fetch FSFS shared data" +msgstr "Kann gemeinsame FSFS-Daten nicht holen" -#: ../libsvn_ra_svn/client.c:1400 +#: ../libsvn_fs_fs/fs.c:129 #, c-format -msgid "Invalid directory entry name '%s'" -msgstr "Ungültiger Name für Verzeichniseintrag »%s«" +msgid "Can't store FSFS shared data" +msgstr "Kann gemeinsame FSFS-Daten nicht speichern" -#: ../libsvn_ra_svn/client.c:1483 -msgid "Mergeinfo element is not a list" -msgstr "Zusammenführungsinfo-Element ist keine Liste" +#: ../libsvn_fs_fs/fs.c:562 +msgid "Module for working with a plain file (FSFS) repository." +msgstr "Modul zum Zugriff auf ein dateibasiertes (FSFS) Projektarchiv." -#: ../libsvn_ra_svn/client.c:1702 -msgid "Log entry not a list" -msgstr "Logeintrag ist keine Liste" +#: ../libsvn_fs_fs/fs.c:624 +#, c-format +msgid "Unsupported FS loader version (%d) for fsfs" +msgstr "Nicht unterstützte Dateisystem-Laderversion (%d) für fsfs" -#: ../libsvn_ra_svn/client.c:1750 -msgid "Changed-path entry not a list" -msgstr "Eintrag für geänderte Pfade ist keine Liste" +#: ../libsvn_fs_fs/fs_fs.c:444 +#, c-format +msgid "Found format '%d', only created by unreleased dev builds; see http://subversion.apache.org/docs/release-notes/1.7#revprop-packing" +msgstr "Format »%d« gefunden, das nur durch nicht veröffentlichte Entwicklungsversionen erstellt wurde; siehe http://subversion.apache.org/docs/release-notes/1.7#revprop-packing" -#: ../libsvn_ra_svn/client.c:1905 -msgid "'stat' not implemented" -msgstr "»stat« nicht implementiert" +#: ../libsvn_fs_fs/fs_fs.c:455 +#, c-format +msgid "Expected FS format between '1' and '%d'; found format '%d'" +msgstr "Erwartete Dateisystemformat zwischen 1 und %d; fand %d" -#: ../libsvn_ra_svn/client.c:1964 -msgid "'get-locations' not implemented" -msgstr "»get-locations« nicht implementiert" +#: ../libsvn_fs_fs/fs_fs.c:507 ../libsvn_fs_x/fs_x.c:143 +#, c-format +msgid "Can't read first line of format file '%s'" +msgstr "Die erste Zeile der Formatdatei »%s« kann nicht gelesen werden" -#: ../libsvn_ra_svn/client.c:1979 -msgid "Location entry not a list" -msgstr "Ortseintrag ist keine Liste" - -#: ../libsvn_ra_svn/client.c:2019 -msgid "'get-location-segments' not implemented" -msgstr "»get-location-segments« nicht implementiert" - -#: ../libsvn_ra_svn/client.c:2036 -msgid "Location segment entry not a list" -msgstr "Ortssegmenteintrag ist keine Liste" +#: ../libsvn_fs_fs/fs_fs.c:564 ../libsvn_fs_x/fs_x.c:165 +#, c-format +msgid "'%s' contains invalid filesystem format option '%s'" +msgstr "»%s« enthält eine ungültige Dateisystemformat-Option »%s«" -#: ../libsvn_ra_svn/client.c:2046 -msgid "Expected valid revision range" -msgstr "Erwartete einen gültigen Revisionsbereich" +#: ../libsvn_fs_fs/fs_fs.c:574 +#, c-format +msgid "'%s' specifies logical addressing for a non-sharded repository" +msgstr "»%s« bestimmt logische Adressierung für ein nicht fragmentiertes Projektarchiv" -#: ../libsvn_ra_svn/client.c:2117 -msgid "'get-file-revs' not implemented" -msgstr "»get-file-revs« nicht implementiert" +#: ../libsvn_fs_fs/fs_fs.c:657 ../libsvn_fs_x/fs_x.c:225 +#, c-format +msgid "%s is too small for fsfs.conf setting '%s'." +msgstr "»%s« ist zu klein für die Einstellung »%s« in fsfs.conf." -#: ../libsvn_ra_svn/client.c:2141 -msgid "Revision entry not a list" -msgstr "Revisionseintrag ist keine Liste" +#: ../libsvn_fs_fs/fs_fs.c:665 ../libsvn_fs_x/fs_x.c:233 +#, c-format +msgid "%s is too large for fsfs.conf setting '%s'." +msgstr "»%s« ist zu groß für die Einstellung »%s« in fsfs.conf." -#: ../libsvn_ra_svn/client.c:2158 ../libsvn_ra_svn/client.c:2188 -msgid "Text delta chunk not a string" -msgstr "Text-Deltastück ist kein String" +#: ../libsvn_fs_fs/fs_fs.c:676 ../libsvn_fs_x/fs_x.c:244 +#, c-format +msgid "%s is invalid for fsfs.conf setting '%s' because it is not a power of 2." +msgstr "»%s« ist ungültig für die Einstellung »%s« in fsfs.conf, da es keine Zweierpotenz ist." -#: ../libsvn_ra_svn/client.c:2200 -msgid "The get-file-revs command didn't return any revisions" -msgstr "Der »get-file-revs« Befehl gab keine Revisionen zurück" +#: ../libsvn_fs_fs/fs_fs.c:732 +#, fuzzy, c-format +msgid "Invalid 'compression' value '%s' in the config" +msgstr "Ungültige Komprimierungsmethode" -#: ../libsvn_ra_svn/client.c:2247 -msgid "Server doesn't support the lock command" -msgstr "Server unterstützt das Kommando »lock« nicht" +#: ../libsvn_fs_fs/fs_fs.c:878 +#, fuzzy +msgid "The 'compression' and 'compression-level' config options are mutually exclusive" +msgstr "»quiet« und »diff« schließen sich gegenseitig aus" -#: ../libsvn_ra_svn/client.c:2311 -msgid "Server doesn't support the unlock command" -msgstr "Server unterstützt das Kommando »unlock« nicht" +#: ../libsvn_fs_fs/fs_fs.c:890 +msgid "Compression type 'lz4' requires filesystem format 8 or higher" +msgstr "" -#: ../libsvn_ra_svn/client.c:2409 -msgid "Lock response not a list" -msgstr "Antwort beim Sperren ist keine Liste" +#: ../libsvn_fs_fs/fs_fs.c:1323 +#, c-format +msgid "'%s' is not a regular file. Please move it out of the way and try again" +msgstr "»%s« ist keine reguläre Datei. Bitte aus dem Weg bewegen und noch einmal versuchen." -#: ../libsvn_ra_svn/client.c:2423 -msgid "Unknown status for lock command" -msgstr "Unbekannter Status für Sperrbefehl" +#: ../libsvn_fs_fs/fs_fs.c:1491 ../libsvn_fs_x/fs_x.c:709 +#, c-format +msgid "Invalid revision number '%ld'" +msgstr "Ungültige Revisionsnummer »%ld«" -#: ../libsvn_ra_svn/client.c:2447 -msgid "Didn't receive end marker for lock responses" -msgstr "Keine Endemarke für Sperrantworten erhalten" +#: ../libsvn_fs_fs/fs_fs.c:1932 +msgid "FSFS is not compatible with Subversion prior to 1.1" +msgstr "FSFS ist nicht kompatibel mit Subversion älter als 1.1" -#: ../libsvn_ra_svn/client.c:2537 -msgid "Unlock response not a list" -msgstr "Antwort beim Entsperren ist keine Liste" +#: ../libsvn_fs_fs/fs_fs.c:2071 +#, fuzzy, c-format +msgid "malformed node origin data in '%s'" +msgstr "Fehlerhafte Zeichenkette für Knotenrevisions-ID." -#: ../libsvn_ra_svn/client.c:2551 -msgid "Unknown status for unlock command" -msgstr "Unbekannter Status für Entsperrbefehl" +#: ../libsvn_fs_fs/fs_fs.c:2139 +#, c-format +msgid "Node origin for '%s' exists with a different value (%s) than what we were about to store (%s)" +msgstr "Knotenursprung für »%s« existiert mit einem anderen Wert (%s) als der, der gespeichert werden soll (%s)" -#: ../libsvn_ra_svn/client.c:2574 -msgid "Didn't receive end marker for unlock responses" -msgstr "Keine Endemarke für Entsperrantworten erhalten" +#: ../libsvn_fs_fs/hotcopy.c:107 ../libsvn_fs_x/hotcopy.c:108 +#: ../libsvn_subr/io.c:293 +#, c-format +msgid "Error converting entry in directory '%s' to UTF-8" +msgstr "Fehler beim Konvertieren eines Eintrags im Verzeichnis »%s« nach UTF-8" -#: ../libsvn_ra_svn/client.c:2598 ../libsvn_ra_svn/client.c:2650 -msgid "Server doesn't support the get-lock command" -msgstr "Server unterstützt das Kommando »get-lock« nicht" +#: ../libsvn_fs_fs/hotcopy.c:147 ../libsvn_fs_x/hotcopy.c:148 +#: ../libsvn_subr/io.c:1084 +#, c-format +msgid "Source '%s' is not a directory" +msgstr "Quelle »%s« ist kein Verzeichnis" -#: ../libsvn_ra_svn/client.c:2664 -msgid "Lock element not a list" -msgstr "Sperrelement ist keine Liste" +#: ../libsvn_fs_fs/hotcopy.c:153 ../libsvn_fs_x/hotcopy.c:154 +#: ../libsvn_subr/io.c:1090 +#, c-format +msgid "Destination '%s' is not a directory" +msgstr "Ziel »%s« ist kein Verzeichnis" -#: ../libsvn_ra_svn/client.c:2707 -msgid "Server doesn't support the replay command" -msgstr "Server unterstützt das Kommando »replay« nicht" +#: ../libsvn_fs_fs/hotcopy.c:226 ../libsvn_fs_x/hotcopy.c:228 +#: ../libsvn_subr/io.c:1167 ../libsvn_subr/io.c:2863 +#, c-format +msgid "Can't read directory '%s'" +msgstr "Kann Verzeichnis »%s« nicht lesen" -#: ../libsvn_ra_svn/client.c:2738 -msgid "Server doesn't support the replay-range command" -msgstr "Server unterstützt das Kommando »replay-range« nicht" +#: ../libsvn_fs_fs/hotcopy.c:231 ../libsvn_fs_x/hotcopy.c:233 +#: ../libsvn_subr/io.c:1172 ../libsvn_subr/io.c:2868 ../libsvn_subr/io.c:4654 +#, c-format +msgid "Error closing directory '%s'" +msgstr "Fehler beim Schließen des Verzeichnisses »%s«" -#: ../libsvn_ra_svn/client.c:2761 +#: ../libsvn_fs_fs/hotcopy.c:490 #, c-format -msgid "Expected 'revprops', found '%s'" -msgstr "Erwartete »revprops«, fand »%s«" +msgid "The FSFS format (%d) of the hotcopy source does not match the FSFS format (%d) of the hotcopy destination; please upgrade both repositories to the same format" +msgstr "Das FSFS-Format (%d) der Quelle für die Kopie im laufenden Betrieb entspricht nicht dem FSFS-Format (%d) des Ziels; Verwenden Sie auf beiden Seiten das gleiche Format" -#: ../libsvn_ra_svn/client.c:2779 -msgid "Error while replaying commit" -msgstr "Fehler beim Wiederholen der Übertragung" +#: ../libsvn_fs_fs/hotcopy.c:499 ../libsvn_fs_x/hotcopy.c:363 +msgid "The UUID of the hotcopy source does not match the UUID of the hotcopy destination" +msgstr "Die UUID der Quelle für die Kopie im laufenden Betrieb entspricht nicht der UUID des Ziels" -#: ../libsvn_ra_svn/client.c:2852 -msgid "'get-deleted-rev' not implemented" -msgstr "»get-deleted-rev« nicht implementiert" +#: ../libsvn_fs_fs/hotcopy.c:506 ../libsvn_fs_x/hotcopy.c:370 +msgid "The sharding layout configuration of the hotcopy source does not match the sharding layout configuration of the hotcopy destination" +msgstr "Die Einstellungen zur Fragmentierung der Quelle der Kopie im laufenden Betrieb entspricht nicht den Einstellungen zur Fragmentierung des Ziels" -#: ../libsvn_ra_svn/client.c:2963 +#: ../libsvn_fs_fs/hotcopy.c:581 ../libsvn_fs_x/hotcopy.c:418 #, c-format -msgid "Unsupported RA loader version (%d) for ra_svn" -msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_svn" - -#: ../libsvn_ra_svn/cram.c:199 ../libsvn_ra_svn/cram.c:217 -#: ../libsvn_ra_svn/cyrus_auth.c:526 ../libsvn_ra_svn/cyrus_auth.c:582 -#: ../libsvn_ra_svn/internal_auth.c:66 -msgid "Unexpected server response to authentication" -msgstr "Unerwartete Serverantwort bei Anmeldung" +msgid "The hotcopy destination already contains more packed revisions (%lu) than the hotcopy source contains (%lu)" +msgstr "Das Ziel der Kopie im laufenden Betrieb enthält bereits mehr gepackte Revisionen (%lu) als die Quelle (%lu)" -#: ../libsvn_ra_svn/cyrus_auth.c:225 +#: ../libsvn_fs_fs/hotcopy.c:877 #, c-format -msgid "SASL authentication error: %s%s" -msgstr "SASL-Anmeldefehler: %s%s" +msgid "Failed to create hotcopy at '%s'. The file '%s' is missing from the source repository. Please create this file, for instance by running 'svnadmin upgrade %s'" +msgstr "Erstellen der hotcopy auf »%s« fehlgeschlagen. Die Datei »%s« fehlt im Quellprojektarchiv. Bitte diese Datei erstellen, z.B. durch die Ausführung von »svnadmin upgrade %s«" -#: ../libsvn_ra_svn/cyrus_auth.c:242 +#: ../libsvn_fs_fs/hotcopy.c:903 ../libsvn_fs_x/hotcopy.c:610 #, c-format -msgid "Could not initialized the SASL library: %s%s" -msgstr "Konnte die SASL-Bibliothek nicht initialisieren: %s%s" +msgid "The hotcopy destination already contains more revisions (%lu) than the hotcopy source contains (%lu); are source and destination swapped?" +msgstr "Das Ziel der Kopie im laufenden Betrieb enthält bereits mehr Revisionen (%lu) als die Quelle (%lu); Wurden Quelle und Ziel vertauscht?" -#: ../libsvn_ra_svn/cyrus_auth.c:415 +#: ../libsvn_fs_fs/index.c:289 #, c-format -msgid "Could not create SASL context: %s%s" -msgstr "Konnte SASL-Kontext nicht erstellen: %s%s" +msgid "Can't read index file '%s' at offset 0x%s" +msgstr "Kann Indexdatei »%s« bei Offset 0x%s nicht lesen" -#: ../libsvn_ra_svn/cyrus_auth.c:932 ../libsvn_ra_svn/internal_auth.c:63 -#: ../libsvn_ra_svn/internal_auth.c:114 +#: ../libsvn_fs_fs/index.c:299 #, c-format -msgid "Authentication error from server: %s" -msgstr "Anmeldefehler von Server: %s" +msgid "Unexpected end of index file %s at offset 0x%s" +msgstr "Unerwartetes Ende der Indexdatei %s bei Offset 0x%s" -#: ../libsvn_ra_svn/cyrus_auth.c:936 -msgid "Can't get username or password" -msgstr "Kann Benutzername oder Passwort nicht erhalten" +#: ../libsvn_fs_fs/index.c:334 ../libsvn_fs_x/index.c:334 +#, c-format +msgid "Corrupt index: number too large" +msgstr "Index beschädigt: Zahl ist zu groß" -#: ../libsvn_ra_svn/editorp.c:147 -msgid "Successful edit status returned too soon" -msgstr "Status für erfolgreiche Bearbeitung wurde zu früh zurückgegeben" +#: ../libsvn_fs_fs/index.c:377 ../libsvn_fs_x/index.c:372 +#, c-format +msgid "" +"Index stream header prefix mismatch.\n" +" expected: %s found: %s" +msgstr "" +"Fehler im Präfix der Kopfdaten des Indexstroms.\n" +" erwartet: %s tatsächlich: %s" -#: ../libsvn_ra_svn/editorp.c:495 -msgid "Invalid file or dir token during edit" -msgstr "Ungültige Datei- oder Verzeichnismarke während der Bearbeitung" +#: ../libsvn_fs_fs/index.c:604 ../libsvn_fs_x/index.c:551 +#, c-format +msgid "UINT32 0x%s too large, max = 0x%s" +msgstr "UINT32 0x%s ist zu groß, max. 0x%s" -#: ../libsvn_ra_svn/editorp.c:736 -msgid "Apply-textdelta already active" -msgstr "Text-Delta Anwendung bereits aktiv" +#: ../libsvn_fs_fs/index.c:636 ../libsvn_fs_x/index.c:583 +#, c-format +msgid "File offset 0x%s too large, max = 0x%s" +msgstr "Dateioffset 0x%s ist zu groß, max. 0x%s" -#: ../libsvn_ra_svn/editorp.c:758 ../libsvn_ra_svn/editorp.c:776 -msgid "Apply-textdelta not active" -msgstr "Text-Delta Anwendung nicht aktiv" +#: ../libsvn_fs_fs/index.c:810 ../libsvn_fs_x/index.c:936 +#, c-format +msgid "L2P index page size %s exceeds current limit of 2G entries" +msgstr "Seitengröße %s des L2P-Index überschreitet die gegenwärtige Grenze von 2G Einträgen" -#: ../libsvn_ra_svn/editorp.c:879 +#: ../libsvn_fs_fs/index.c:871 ../libsvn_fs_x/index.c:999 #, c-format -msgid "Command 'finish-replay' invalid outside of replays" -msgstr "Das Kommando »finish-replay« ist außerhalb von »replay«s ungültig" +msgid "Item index %s too large in l2p proto index for revision %ld" +msgstr "Elementindex %s zu groß in l2p-Proto-Index für Revision %ld" -#: ../libsvn_ra_svn/editorp.c:983 ../libsvn_ra_svn/marshal.c:1608 +#: ../libsvn_fs_fs/index.c:892 ../libsvn_fs_x/index.c:1023 #, c-format -msgid "Unknown editor command '%s'" -msgstr "Unbekannter Editorbefehl »%s«" +msgid "L2P index page count %d exceeds current limit of 2G pages" +msgstr "Seitenanzahl %d des L2P-Index überschreitet die gegenwärtige Grenze von 2G Seiten" -#: ../libsvn_ra_svn/internal_auth.c:101 -msgid "Can't get password" -msgstr "Kein Passwort erhalten" +#: ../libsvn_fs_fs/index.c:995 ../libsvn_fs_fs/index.c:2198 +#: ../libsvn_fs_x/index.c:1272 ../libsvn_fs_x/index.c:2489 +msgid "Index rev / pack file revision numbers do not match" +msgstr "Revisionsnummern in der REV/PACK Dateien des Index stimmen nicht überein" -#: ../libsvn_ra_svn/marshal.c:147 -msgid "Capability entry is not a word" -msgstr "Eigenschaftseintrag ist kein Wort" +#: ../libsvn_fs_fs/index.c:1001 ../libsvn_fs_x/index.c:1285 +msgid "L2P index page size is not a power of two" +msgstr "Seitengröße des L2P-Index ist keine Zweierpotenz" -#: ../libsvn_ra_svn/marshal.c:952 -msgid "String length larger than maximum" -msgstr "Stringlänge größer als Maximum" +#: ../libsvn_fs_fs/index.c:1008 ../libsvn_fs_x/index.c:1279 +msgid "Invalid number of revisions in L2P index" +msgstr "Ungültige Anzahl von Revisionen im L2P-Index" -#: ../libsvn_ra_svn/marshal.c:1019 -msgid "Items are nested too deeply" -msgstr "Elemente sind zu tief verschachtelt" +#: ../libsvn_fs_fs/index.c:1014 ../libsvn_fs_x/index.c:1291 +msgid "Fewer L2P index pages than revisions" +msgstr "Weniger Seiten im L2P-Index als Revisionen" -#: ../libsvn_ra_svn/marshal.c:1040 ../libsvn_ra_svn/marshal.c:1159 -msgid "Number is larger than maximum" -msgstr "Zahl ist größer als Maximum" +#: ../libsvn_fs_fs/index.c:1017 ../libsvn_fs_x/index.c:1294 +msgid "L2P index page count implausibly large" +msgstr "Anzahl der Seiten im L2P-Index ist unplausibel groß" -#: ../libsvn_ra_svn/marshal.c:1071 -msgid "Word is too long" -msgstr "Wort ist zu lang" +#: ../libsvn_fs_fs/index.c:1022 ../libsvn_fs_x/index.c:1299 +#, c-format +msgid "Corrupt L2P index for r%ld only covers r%ld:%ld" +msgstr "Beschädigter L2P-Index für r%ld deckt nur r%ld:%ld ab" -#: ../libsvn_ra_svn/marshal.c:1187 -msgid "Word too long" -msgstr "Wort zu lang" +#: ../libsvn_fs_fs/index.c:1041 ../libsvn_fs_x/index.c:1318 +msgid "Revision with no L2P index pages" +msgstr "Revision ohne Seiten im L2P-Index" -#: ../libsvn_ra_svn/marshal.c:1447 -msgid "Proplist element not a list" -msgstr "Eigenschaftselement ist keine Liste" +#: ../libsvn_fs_fs/index.c:1046 ../libsvn_fs_x/index.c:1323 +msgid "L2P page table exceeded" +msgstr "Größenüberschreitung der Seitentablelle des L2P-Index" -#: ../libsvn_ra_svn/marshal.c:1486 -msgid "Empty error list" -msgstr "Leere Fehlerliste" +#: ../libsvn_fs_fs/index.c:1053 ../libsvn_fs_x/index.c:1330 +msgid "Revisions do not cover the full L2P index page table" +msgstr "Revisionen decken nicht die gesamte Seitentabelle im L2P-Indexab" -#: ../libsvn_ra_svn/marshal.c:1495 ../libsvn_ra_svn/marshal.c:1521 -msgid "Malformed error list" -msgstr "Fehlerhafte Fehlerliste" +#: ../libsvn_fs_fs/index.c:1061 ../libsvn_fs_x/index.c:1338 +msgid "Empty L2P index page" +msgstr "Leere Seite im L2P-Index" -#: ../libsvn_ra_svn/marshal.c:1550 -#, c-format -msgid "Unknown status '%s' in command response" -msgstr "Unbekannter Status »%s« in Antwort auf Befehl" +#: ../libsvn_fs_fs/index.c:1067 ../libsvn_fs_x/index.c:1344 +msgid "Page exceeds L2P index page size" +msgstr "Seite überschreitet Seitengröße im L2P-Index" -#: ../libsvn_ra_svn/streams.c:110 +#: ../libsvn_fs_fs/index.c:1126 ../libsvn_fs_x/index.c:1119 #, c-format -msgid "Can't get socket timeout" -msgstr "Kann Socket-Timeout nicht erhalten" +msgid "Revision %ld not covered by item index" +msgstr "Revision %ld nicht vom Elementindex abgedeckt" -#: ../libsvn_ra_svn/streams.c:123 +#: ../libsvn_fs_fs/index.c:1152 ../libsvn_fs_x/index.c:1145 #, c-format -msgid "Can't read from connection" -msgstr "Kann nicht aus Verbindung lesen" +msgid "Item index %s exceeds l2p limit of %s for revision %ld" +msgstr "Elementindex %s überschreitet l2p-Grenze von %s für Revision %ld" -#: ../libsvn_ra_svn/streams.c:134 -#, c-format -msgid "Can't write to connection" -msgstr "Kann nicht in Verbindung schreiben" +#: ../libsvn_fs_fs/index.c:1359 ../libsvn_fs_x/index.c:1501 +msgid "L2P actual page size does not match page table value." +msgstr "Tatsächliche Seitengröße im L2P-Index stimmt nicht mit dem Wert in der Seitentabelle überein." -#: ../libsvn_repos/commit.c:172 +#: ../libsvn_fs_fs/index.c:1492 ../libsvn_fs_x/index.c:1545 #, c-format -msgid "'%s' is out of date" -msgstr "»%s« ist veraltet" +msgid "Item index %s too large in revision %ld" +msgstr "Elementindex %s ist zu groß in Revision %ld" -#: ../libsvn_repos/commit.c:320 +#: ../libsvn_fs_fs/index.c:1911 ../libsvn_fs_x/index.c:2115 #, c-format -msgid "Got source path but no source revision for '%s'" -msgstr "Quellpfad, aber keine Quellrevision für »%s« erhalten" +msgid "Revision 0x%s too large, max = 0x%s" +msgstr "Revision 0x%s ist zu groß, max. 0x%s" -#: ../libsvn_repos/commit.c:353 -#, c-format -msgid "Source url '%s' is from different repository" -msgstr "Quell URL »%s« stammt aus einem fremden Projektarchiv" +#: ../libsvn_fs_fs/index.c:2204 ../libsvn_fs_x/index.c:2495 +msgid "Index offset and rev / pack file size do not match" +msgstr "Index-Offset und Größe der REV/PACK-Datei stimmen nicht überein" -#: ../libsvn_repos/commit.c:691 -#, c-format -msgid "" -"Checksum mismatch for resulting fulltext\n" -"(%s)" -msgstr "" -"Prüfsummenfehler für Volltextergebnis\n" -"(%s)" - -#: ../libsvn_repos/commit.c:741 -msgid "(no error)" -msgstr "(kein Fehler)" - -#: ../libsvn_repos/commit.c:772 ../libsvn_repos/commit.c:778 -msgid "post-commit hook failed with no error message." -msgstr "Aktion »post-commit« schlug ohne Fehlermeldung fehl" - -#: ../libsvn_repos/commit.c:781 -#, c-format -msgid "" -"post commit FS processing had error:\n" -"%s\n" -"%s" -msgstr "" -"Aktion »post-commit« meldete einen Fehler:\n" -"%s\n" -"%s" +#: ../libsvn_fs_fs/index.c:2210 ../libsvn_fs_x/index.c:2501 +msgid "P2L index page size is not a power of two" +msgstr "Seitengröße des P2L-Index ist keine Zweierpotenz" -#: ../libsvn_repos/commit.c:782 ../libsvn_repos/commit.c:791 -msgid "(no error message)" -msgstr "(keine Fehlermeldung)" +#: ../libsvn_fs_fs/index.c:2216 ../libsvn_fs_x/index.c:2507 +msgid "P2L page count does not match rev / pack file size" +msgstr "Seitenanzahl im P2L-Index stimmt nicht mit der Größe der REV/PACK Datei überein" -#: ../libsvn_repos/commit.c:789 -#, c-format -msgid "" -"post commit FS processing had error:\n" -"%s" -msgstr "" -"Aktion »post-commit« meldete einen Fehler:\n" -"%s" +#: ../libsvn_fs_fs/index.c:2396 ../libsvn_fs_x/index.c:2596 +msgid "Invalid item type in P2L index" +msgstr "Ungültiger Elementtyp im P2L-Index" -#: ../libsvn_repos/commit.c:1316 ../libsvn_repos/fs-wrap.c:117 -#: ../libsvn_repos/load-fs-vtable.c:1113 -msgid "Commit succeeded, but post-commit hook failed" -msgstr "Übertragen erfolgreich, aber die »post-commit«-Aktion schlug fehl" +#: ../libsvn_fs_fs/index.c:2400 ../libsvn_fs_x/index.c:2649 +msgid "Changed path list must have item number 1" +msgstr "Liste der geänderten Pfade muss Elementnummer 1 tragen" -#: ../libsvn_repos/delta.c:192 -msgid "Unable to open root of edit" -msgstr "Kann Basis der Änderung nicht öffnen" +#: ../libsvn_fs_fs/index.c:2414 ../libsvn_fs_x/index.c:2606 +msgid "Invalid FNV1 checksum in P2L index" +msgstr "Ungültige FNV1-Prüfsumme im P2L-Index" -#: ../libsvn_repos/delta.c:236 -msgid "Invalid target path" -msgstr "Ungültiger Zielpfad" +#: ../libsvn_fs_fs/index.c:2423 +msgid "Empty regions must have item number 0 and checksum 0" +msgstr "Leere Bereiche müssen eine Elementnummer 0 und Prüfsumme 0 aufweisen" -#: ../libsvn_repos/delta.c:240 -msgid "Delta depth 'exclude' not supported" -msgstr "Delta-Tiefe »exclude« wird nicht unterstützt" +#: ../libsvn_fs_fs/index.c:2430 ../libsvn_fs_x/index.c:2658 +#, fuzzy +msgid "P2L index entry size overflow." +msgstr "Seitengröße des P2L-Index ist keine Zweierpotenz" -#: ../libsvn_repos/delta.c:266 -msgid "Invalid editor anchoring; at least one of the input paths is not a directory and there was no source entry" -msgstr "Ungültiger Editoranker; zumindest einer der Eingabepfade ist kein Verzeichnis und es gab keinen Quelleintrag" +#: ../libsvn_fs_fs/index.c:2500 ../libsvn_fs_x/index.c:2721 +msgid "P2L page description overlaps with next page description" +msgstr "P2L-Seitenbeschreibung überlappt mit der Beschreibung der nächsten Seite" -#: ../libsvn_repos/deprecated.c:647 ../svnadmin/svnadmin.c:923 +#: ../libsvn_fs_fs/index.c:2616 ../libsvn_fs_x/index.c:2836 #, c-format -msgid "* Dumped revision %ld.\n" -msgstr "* Revision %ld ausgegeben.\n" +msgid "Offset %s too large in revision %ld" +msgstr "Offset %s ist zu groß in Revision %ld" -#: ../libsvn_repos/deprecated.c:653 ../svnadmin/svnadmin.c:929 +#: ../libsvn_fs_fs/index.c:2806 ../libsvn_fs_x/index.c:3039 #, c-format -msgid "* Verified revision %ld.\n" -msgstr "* Revision %ld verifiziert.\n" +msgid "Last P2L index entry extends beyond the last page in revision %ld." +msgstr "Letzter Eintrag im P2L-Index geht über die letzte Seite in der Revision %ld hinaus." -#: ../libsvn_repos/deprecated.c:661 ../svnadmin/svnadmin.c:977 +#: ../libsvn_fs_fs/lock.c:120 ../libsvn_fs_x/lock.c:122 #, c-format -msgid "" -"\n" -"------- Committed revision %ld >>>\n" -"\n" -msgstr "" -"\n" -"------- Übertrage Revision %ld >>>\n" -"\n" +msgid "Corrupt lockfile for path '%s' in filesystem '%s'" +msgstr "Beschädigte Sperrdatei für Pfad »%s« in Dateisystem »%s«" -#: ../libsvn_repos/deprecated.c:667 ../svnadmin/svnadmin.c:983 +#: ../libsvn_fs_fs/lock.c:228 ../libsvn_fs_x/lock.c:241 #, c-format -msgid "" -"\n" -"------- Committed new rev %ld (loaded from original rev %ld) >>>\n" -"\n" -msgstr "" -"\n" -"------- Neue Revision %ld übertragen (geladen aus Original %ld) >>>\n" -"\n" +msgid "Cannot write lock/entries hashfile '%s'" +msgstr "Kann »lock/entries« Hashdatei »%s« nicht schreiben" -#: ../libsvn_repos/deprecated.c:680 ../svnadmin/svnadmin.c:996 +#: ../libsvn_fs_fs/lock.c:279 ../libsvn_fs_x/lock.c:293 #, c-format -msgid " * editing path : %s ..." -msgstr " * Bearbeite Pfad: %s ..." +msgid "Can't parse lock/entries hashfile '%s'" +msgstr "Kann »lock/entries« Hashdatei »%s« nicht zerlegen" -#: ../libsvn_repos/deprecated.c:686 ../svnadmin/svnadmin.c:1002 +#: ../libsvn_fs_fs/lock.c:784 ../libsvn_fs_x/lock.c:804 #, c-format -msgid " * deleting path : %s ..." -msgstr " * Lösche Pfad: %s ..." +msgid "Lock failed: newer version of '%s' exists" +msgstr "Sperren schlug fehl: eine neuere Version von »%s« existiert" -#: ../libsvn_repos/deprecated.c:692 ../svnadmin/svnadmin.c:1008 +#: ../libsvn_fs_fs/lock.c:1164 ../libsvn_fs_x/lock.c:1186 #, c-format -msgid " * adding path : %s ..." -msgstr " * Füge Pfad hinzu: %s ..." +msgid "Failed to lock '%s'" +msgstr "Konnte »%s« nicht sperren" -#: ../libsvn_repos/deprecated.c:698 ../svnadmin/svnadmin.c:1014 +#: ../libsvn_fs_fs/lock.c:1258 ../libsvn_fs_x/lock.c:1279 #, c-format -msgid " * replacing path : %s ..." -msgstr " * Ersetze Pfad: %s ..." +msgid "Failed to unlock '%s'" +msgstr "Konnte »%s« nicht entsperren" -#: ../libsvn_repos/deprecated.c:708 ../svnadmin/svnadmin.c:1023 -msgid " done.\n" -msgstr " erledigt.\n" +#: ../libsvn_fs_fs/low_level.c:97 ../libsvn_fs_x/low_level.c:99 +msgid "Invalid character in revision number" +msgstr "Ungültiges Zeichen in Revisionsnummer" -#: ../libsvn_repos/deprecated.c:718 ../svnadmin/svnadmin.c:1032 +#: ../libsvn_fs_fs/low_level.c:120 #, c-format -msgid "<<< Started new transaction, based on original revision %ld\n" -msgstr "<<< Neue Transaktion basierend auf Originalrevision %ld gestartet\n" +msgid "Revision file (r%ld) lacks trailing newline" +msgstr "Revisionsdatei (r%ld) hat keinen abschließenden Zeilenumbruch" -#: ../libsvn_repos/deprecated.c:725 ../svnadmin/svnadmin.c:1045 +#: ../libsvn_fs_fs/low_level.c:134 #, c-format -msgid " removing '\\r' from %s ..." -msgstr " Entferne »\\r« aus %s ..." +msgid "Final line in revision file (r%ld) longer than 64 characters" +msgstr "Letzte Zeile in der Revisionsdatei (r%ld) ist länger als 64 Zeichen" -#: ../libsvn_repos/dump.c:790 +#: ../libsvn_fs_fs/low_level.c:149 #, c-format -msgid "Path '%s' not found in r%ld." -msgstr "Pfad »%s« wurde in r%ld nicht gefunden." +msgid "Final line in revision file r%ld missing space" +msgstr "Letzte Zeile in der Revisionsdatei r%ld hat nicht genug Leerzeichen" -#: ../libsvn_repos/dump.c:795 -#, c-format -msgid "Unexpected node kind %d for '%s' at r%ld. Expected kind was %d." -msgstr "Unerwartete Knotenart %d für »%s« in r%ld. Erwartete Knotenart war %d." +#: ../libsvn_fs_fs/low_level.c:326 ../libsvn_fs_fs/low_level.c:331 +#: ../libsvn_fs_fs/low_level.c:337 ../libsvn_fs_fs/low_level.c:354 +#: ../libsvn_fs_fs/low_level.c:387 ../libsvn_fs_fs/low_level.c:407 +#: ../libsvn_fs_fs/low_level.c:432 ../libsvn_fs_x/low_level.c:836 +#: ../libsvn_fs_x/low_level.c:853 ../libsvn_fs_x/low_level.c:882 +#: ../libsvn_fs_x/low_level.c:902 ../libsvn_fs_x/low_level.c:922 +msgid "Invalid changes line in rev-file" +msgstr "Ungültige »changes« Zeile in Rev Datei" -#: ../libsvn_repos/dump.c:833 -#, c-format -msgid "Path '%s' exists in r%ld." -msgstr "Pfad »%s« existiert in r%ld." +#: ../libsvn_fs_fs/low_level.c:380 ../libsvn_fs_x/low_level.c:875 +msgid "Invalid change kind in rev file" +msgstr "Ungültiger Änderungstyp in Rev Datei" -#: ../libsvn_repos/dump.c:863 -#, c-format -msgid "Mergeinfo referencing revision(s) prior to the oldest dumped revision (r%ld). Loading this dump may result in invalid mergeinfo." -msgstr "Zusammenführungsinformationen verweisen auf Revision(en) vor der ältesten ausgegebene Revision (r%ld). Das Laden dieser Datei kann ungültige Zusammenführungsinformationen zur Folge haben." +#: ../libsvn_fs_fs/low_level.c:400 ../libsvn_fs_x/low_level.c:895 +msgid "Invalid text-mod flag in rev-file" +msgstr "Ungültiges »text-mod« Flag in Rev Datei" + +#: ../libsvn_fs_fs/low_level.c:420 ../libsvn_fs_x/low_level.c:915 +msgid "Invalid prop-mod flag in rev-file" +msgstr "Ungültiges »prop-mod« Flag in Rev Datei" + +#: ../libsvn_fs_fs/low_level.c:445 ../libsvn_fs_x/low_level.c:935 +msgid "Invalid mergeinfo-mod flag in rev-file" +msgstr "Ungültiges »mergeinfo-mod« Flag in Rev Datei" + +#: ../libsvn_fs_fs/low_level.c:452 ../libsvn_fs_x/low_level.c:941 +msgid "Invalid path in changes line" +msgstr "Ungültiger Pfad in Zeile »changes«" + +#: ../libsvn_fs_fs/low_level.c:472 ../libsvn_fs_x/low_level.c:964 +msgid "Invalid copy-from path in changes line" +msgstr "Ungültiger Pfad »copy-from« in Zeile »changes«" -#: ../libsvn_repos/dump.c:971 +#: ../libsvn_fs_fs/low_level.c:581 ../libsvn_fs_x/low_level.c:1063 #, c-format -msgid "Duplicate representation of path '%s' in %s property of '%s'" -msgstr "Doppelte Darstellung von Pfad »%s« in Eigenschaft %s von »%s«" +msgid "Invalid change type %d" +msgstr "Ungültiger Änderungstyp %d" -#: ../libsvn_repos/dump.c:1117 +#: ../libsvn_fs_fs/low_level.c:709 ../libsvn_fs_fs/low_level.c:726 +#: ../libsvn_fs_x/low_level.c:236 ../libsvn_fs_x/low_level.c:253 #, c-format -msgid "E%06d: While validating fspath '%s': %s" -msgstr "E%06d: Fehler bei Überprüfung von »fspath« »%s«: %s" +msgid "Found malformed header '%s' in revision file" +msgstr "Fehlerhafte Kopfdaten »%s« in Revisionsdatei gefunden" + +#: ../libsvn_fs_fs/low_level.c:776 ../libsvn_fs_fs/low_level.c:785 +#: ../libsvn_fs_fs/low_level.c:793 ../libsvn_fs_fs/low_level.c:802 +#: ../libsvn_fs_fs/low_level.c:827 ../libsvn_fs_fs/low_level.c:846 +#: ../libsvn_fs_fs/low_level.c:861 ../libsvn_fs_fs/low_level.c:868 +#: ../libsvn_fs_fs/low_level.c:876 ../libsvn_fs_x/low_level.c:289 +#: ../libsvn_fs_x/low_level.c:304 ../libsvn_fs_x/low_level.c:313 +#: ../libsvn_fs_x/low_level.c:321 ../libsvn_fs_x/low_level.c:330 +#: ../libsvn_fs_x/low_level.c:345 +msgid "Malformed text representation offset line in node-rev" +msgstr "Fehlerhafte »text representation offset«-Zeile in Knotenrevision" -#: ../libsvn_repos/dump.c:1156 +#: ../libsvn_fs_fs/low_level.c:903 ../libsvn_fs_x/low_level.c:378 #, c-format -msgid "Change invalid path '%s' in r%ld" -msgstr "Änderung eines ungültigen Pfades »%s« in r%ld" +msgid "While reading representation offsets for node-revision '%s':" +msgstr "Beim Lesen der Darstellungsoffsets für Knotenrevision »%s«" -#: ../libsvn_repos/dump.c:1180 +#: ../libsvn_fs_fs/low_level.c:937 +msgid "Missing id field in node-rev" +msgstr "Fehlendes ID-Feld in Knotenrevision" + +#: ../libsvn_fs_fs/low_level.c:952 ../libsvn_fs_x/low_level.c:494 #, c-format -msgid "Deleting invalid path '%s' in r%ld" -msgstr "Löschen eines ungültigen Pfades »%s« in r%ld" +msgid "Missing kind field in node-rev '%s'" +msgstr "Fehlendes Feld »kind« in Knotenrevision »%s«" -# TODO: Compare msgid "Attempted to open non-existent child node '%s'" -# (non-, vs. non; Attempted vs. Attempting) -#: ../libsvn_repos/dump.c:1199 +#: ../libsvn_fs_fs/low_level.c:987 ../libsvn_fs_x/low_level.c:531 #, c-format -msgid "Replacing non-existent path '%s' in r%ld" -msgstr "Ersetzen eines nicht existierenden Pfades »%s« in r%ld" +msgid "Missing cpath field in node-rev '%s'" +msgstr "Fehlendes Feld »cpath« in Knotenrevision »%s«" -#: ../libsvn_repos/dump.c:1240 +#: ../libsvn_fs_fs/low_level.c:994 ../libsvn_fs_x/low_level.c:538 #, c-format -msgid "Adding already existing path '%s' in r%ld" -msgstr "Hinzufügen eines schon vorhandenen Pfades »%s« in r%ld" +msgid "Non-canonical cpath field in node-rev '%s'" +msgstr "Nicht-kanonischer »cpath« in Knotenrevision »%s«" -#: ../libsvn_repos/dump.c:1263 +#: ../libsvn_fs_fs/low_level.c:1019 ../libsvn_fs_x/low_level.c:567 #, c-format -msgid "Copying from invalid path to '%s' in r%ld" -msgstr "Kopieren eines ungültigen Pfades »%s« in r%ld" +msgid "Malformed copyroot line in node-rev '%s'" +msgstr "Fehlerhafte »copyroot«-Zeile in Knotenrevision »%s«" -#: ../libsvn_repos/dump.c:1275 +#: ../libsvn_fs_fs/low_level.c:1037 ../libsvn_fs_x/low_level.c:587 #, c-format -msgid "Referencing data in revision %ld, which is older than the oldest dumped revision (r%ld). Loading this dump into an empty repository will fail." -msgstr "Verweis auf Daten in Revision %ld, welche älter als die älteste ausgegebene Revision (r%ld) ist. Das Laden dieser Datei in ein leeres Projektarchiv wird fehlschlagen." +msgid "Malformed copyfrom line in node-rev '%s'" +msgstr "Fehlerhafte »copyfrom«-Zeile in Knotenrevision »%s«" -#: ../libsvn_repos/dump.c:1995 ../libsvn_repos/dump.c:2397 +#: ../libsvn_fs_fs/low_level.c:1302 ../libsvn_fs_x/low_level.c:780 #, c-format -msgid "Start revision %ld is greater than end revision %ld" -msgstr "Startrevision %ld ist größer als Endrevision %ld" +msgid "Malformed representation header" +msgstr "Fehlerhafter Darstellungskopf" -#: ../libsvn_repos/dump.c:2000 ../libsvn_repos/dump.c:2402 +#: ../libsvn_fs_fs/pack.c:2118 #, c-format -msgid "End revision %ld is invalid (youngest revision is %ld)" -msgstr "Endrevision %ld ist ungültig (neueste Revision ist %ld)" +msgid "FSFS format (%d) too old to pack; please upgrade the filesystem." +msgstr "Das FSFS-Format (%d) ist zum Packen zu alt, bitte verwenden Sie ein neueres Format" -#: ../libsvn_repos/dump.c:2113 -msgid "The range of revisions dumped contained references to copy sources outside that range." -msgstr "Der ausgegebene Revisionsbereich enthält Verweise für Kopien auf Quellpfade außerhalb dieses Bereichs." +#: ../libsvn_fs_fs/recovery.c:172 +msgid "Recovery encountered a non-directory node" +msgstr "Wiederherstellung fand einen Nicht-Verzeichnisknoten" -#: ../libsvn_repos/dump.c:2125 -msgid "The range of revisions dumped contained mergeinfo which reference revisions outside that range." -msgstr "Der ausgegebene Revisionsbereich enthielt Zusammenführungsinformationen die auf Revisionen außerhalb dieses Bereichs verweisen." +#: ../libsvn_fs_fs/recovery.c:193 +msgid "Recovery encountered a deltified directory representation" +msgstr "Wiederherstellung fand eine deltifizierte Verzeichnisrepräsentation" -#: ../libsvn_repos/dump.c:2179 -#, c-format -msgid "Node '%s' is not a directory." -msgstr "Knoten »%s« ist kein Verzeichnis." +#: ../libsvn_fs_fs/recovery.c:214 +#, fuzzy, c-format +msgid "malformed representation for node-revision '%s'" +msgstr "Beim Lesen der Darstellungsoffsets für Knotenrevision »%s«" -#: ../libsvn_repos/dump.c:2187 -#, c-format -msgid "Node '%s' is not a file." -msgstr "Knoten »%s« ist keine Datei." +#: ../libsvn_fs_fs/recovery.c:240 ../libsvn_fs_fs/recovery.c:249 +#: ../libsvn_fs_fs/recovery.c:255 +msgid "Directory entry corrupt" +msgstr "Verzeichniseintrag beschädigt" -#: ../libsvn_repos/dump.c:2192 +# FIXME: rev ==> revision +#: ../libsvn_fs_fs/recovery.c:401 ../libsvn_fs_x/recovery.c:266 #, c-format -msgid "Unexpected node kind %d for '%s'" -msgstr "Unerwartete Knotenart %d für »%s«" +msgid "Expected current rev to be <= %ld but found %ld" +msgstr "Erwartete, dass aktuelle Revision <= %ld gilt, fand aber %ld" -#: ../libsvn_repos/dump.c:2239 +#: ../libsvn_fs_fs/recovery.c:452 ../libsvn_fs_x/recovery.c:303 #, c-format -msgid "Duplicate representation of path '%s'" -msgstr "Doppelte Darstellung von Pfad »%s«" +msgid "Revision %ld has a revs file but no revprops file" +msgstr "Revision %ld hat eine Revisions-Datei aber keine Revisionseigenschafts-Datei" -#: ../libsvn_repos/dump.c:2448 ../libsvn_repos/dump.c:2501 +#: ../libsvn_fs_fs/recovery.c:459 ../libsvn_fs_x/recovery.c:310 #, c-format -msgid "Repository '%s' failed to verify" -msgstr "Überprüfung des Projektarchivs »%s« fehlgeschlagen" +msgid "Revision %ld has a revs file but the revprops file is inaccessible" +msgstr "Revision %ld hat eine Revisions-Datei aber die Revisionseigenschafts-Datei ist nicht verfügbar" -#: ../libsvn_repos/fs-wrap.c:213 +#: ../libsvn_fs_fs/recovery.c:468 ../libsvn_fs_x/recovery.c:292 #, c-format -msgid "Storage of non-regular property '%s' is disallowed through the repository interface, and could indicate a bug in your client" -msgstr "Das Speichern der speziellen Eigenschaft »%s« wird vom Projektarchiv verhindert und könnte auf einen Bug in Ihrem Client hindeuten" +msgid "Revision %ld has a non-file where its revprops file should be" +msgstr "Revision %ld hat eine Nicht-Datei, wo seine Revisionseigenschafts-Datei sein sollte" + +#: ../libsvn_fs_fs/rep-cache.c:130 ../libsvn_fs_x/rep-cache.c:130 +#, fuzzy, c-format +msgid "Couldn't open rep-cache database '%s'" +msgstr "Konnte »rep-cache«-Datenbank des Projektarchivs nicht öffnen" + +# TODO: Same strings can be shared with another table! +#: ../libsvn_fs_fs/rep-cache.c:281 ../libsvn_fs_fs/rep-cache.c:343 +#: ../libsvn_fs_x/rep-cache.c:280 ../libsvn_fs_x/rep-cache.c:338 +msgid "Only SHA1 checksums can be used as keys in the rep_cache table.\n" +msgstr "Nur SHA1-Prüfsummen können als Schlüssel in der Tabelle rep_cache verwendet werden.\n" -#: ../libsvn_repos/fs-wrap.c:228 +#: ../libsvn_fs_fs/revprops.c:372 #, c-format -msgid "Cannot accept '%s' property because it is not encoded in UTF-8" -msgstr "Kann Eigenschaft »%s« nicht akzeptieren, da sie nicht in UTF-8 kodiert ist" +msgid "Packed revprop manifest for r%ld not properly terminated" +msgstr "Verzeichnis für gepackte Revisionseigenschaften für r%ld ist nicht korrekt abgeschlossen" -#: ../libsvn_repos/fs-wrap.c:238 +#: ../libsvn_fs_fs/revprops.c:414 #, c-format -msgid "Cannot accept non-LF line endings in '%s' property" -msgstr "Kann nicht-»LF« (LF = Unix-artige) Zeilenumbrüche in Eigenschaft »%s« nicht akzeptieren" +msgid "Packed revprop manifest for r%ld has too many entries" +msgstr "Verzeichnis für gepackte Revisionseigenschaften für r%ld hat zu viele Einträge" -#: ../libsvn_repos/fs-wrap.c:279 +#: ../libsvn_fs_fs/revprops.c:419 #, c-format -msgid "Commit rejected because mergeinfo on '%s' contains unexpected string terminator" -msgstr "Übertragung abgewiesen, da die Zusammenführungsinformationen von »%s« nicht erwartete Zeichenkettenendmarken enthalten" +msgid "Packed revprop manifest for r%ld has too few entries" +msgstr "Verzeichnis für gepackte Revisionseigenschaften für r%ld hat zu wenig Einträge" -#: ../libsvn_repos/fs-wrap.c:286 +#: ../libsvn_fs_fs/revprops.c:489 ../libsvn_fs_x/revprops.c:798 #, c-format -msgid "Commit rejected because mergeinfo on '%s' is syntactically invalid" -msgstr "Übertragung abgewiesen, da die Zusammenführungsinformationen von »%s« nicht syntaktisch korrekt sind" +msgid "Revprop pack for revision r%ld contains revprops for r%ld .. r%ld" +msgstr "Datei mit gepackten Revisionseigenschaften für Revision r%ld enthält Revisionseigenschaften für r%ld .. %ld" -#: ../libsvn_repos/fs-wrap.c:416 +#: ../libsvn_fs_fs/revprops.c:500 ../libsvn_fs_x/revprops.c:809 #, c-format -msgid "Write denied: not authorized to read all of revision %ld" -msgstr "Schreiben abgelehnt: Keine Berechtigung, alles von Revision %ld einzulesen." +msgid "Revprop pack for revision r%ld starts at non-packed revisions r%ld" +msgstr "Datei mit gepackten Revisionseigenschaften für Revision r%ld beginnt mit nicht gepackter Revision r%ld" -#: ../libsvn_repos/fs-wrap.c:629 -msgid "Locking succeeded, but post-lock hook failed" -msgstr "Sperrung erfolgreich, aber die Aktion »post-ock« schlug fehl" - -#: ../libsvn_repos/fs-wrap.c:735 -msgid "Cannot unlock, no authenticated username available" -msgstr "Kann nicht freigeben, kein angemeldeter Benutzername verfügbar" +#: ../libsvn_fs_fs/revprops.c:509 +msgid "Header end not found" +msgstr "Ende der Kopfdaten nicht gefunden" -#: ../libsvn_repos/fs-wrap.c:783 -msgid "Unlock succeeded, but post-unlock hook failed" -msgstr "Entsperren erfolgreich, aber die Aktion »post-unlock« schlug fehl" +#: ../libsvn_fs_fs/revprops.c:544 +msgid "Packed revprop size exceeds pack file size" +msgstr "Größe der gepackten Revisionseigenschaften überschreitet die größe der gepackten Datei" -#: ../libsvn_repos/hooks.c:92 +#: ../libsvn_fs_fs/revprops.c:628 ../libsvn_fs_x/revprops.c:887 #, c-format -msgid "'%s' hook succeeded, but error output could not be read" -msgstr "»%s«-Aktion war erfolgreich, aber die Fehlerausgabe konnte nicht gelesen werden" - -#: ../libsvn_repos/hooks.c:107 -msgid "[Error output could not be translated from the native locale to UTF-8.]" -msgstr "[Fehlerausgabe konnte nicht mit der aktuellen Locale-Einstellung nicht nach UTF-8 konvertiert werden.]" - -#: ../libsvn_repos/hooks.c:112 -msgid "[Error output could not be read.]" -msgstr "[Fehlerausgabe konnte nicht gelesen werden.]" +msgid "No such packed revision %ld" +msgstr "Keine gepackte Revision %ld" -# FIXME: two spaces at end? -#: ../libsvn_repos/hooks.c:121 +#: ../libsvn_fs_fs/revprops.c:660 ../libsvn_fs_x/revprops.c:936 #, c-format -msgid "'%s' hook failed (did not exit cleanly: apr_exit_why_e was %d, exitcode was %d). " -msgstr "Aktion »%s« schlug fehl (wurde nicht sauber beendet: apr_exit_why_e war %d, Exit-Code war %d). " +msgid "Failed to read revprop pack file for r%ld" +msgstr "Konnte gepackte Revisionseigenschaften-Datei für r%ld nicht lesen" -#: ../libsvn_repos/hooks.c:130 -msgid "Commit" -msgstr "Übertragen" +#: ../libsvn_fs_fs/revprops.c:668 +#, c-format +msgid "Revprop pack file for r%ld is corrupt" +msgstr "Daten mit gepackten Revisionseigenschaften für r%ld ist beschädigt" -#: ../libsvn_repos/hooks.c:132 -msgid "Revprop change" -msgstr "Ändern einer Revisionseigenschaft" +#: ../libsvn_fs_fs/revprops.c:758 ../libsvn_fs_x/revprops.c:1009 +#, c-format +msgid "Could not read revprops for revision %ld" +msgstr "Konnte Revisionseigenschaften für Revision %ld nicht lesen" -#: ../libsvn_repos/hooks.c:134 -msgid "Lock" -msgstr "Sperren" +#: ../libsvn_fs_fs/revprops.c:993 +#, c-format +msgid "Packed file '%s' misses a tag" +msgstr "Der gepackten Datei »%s« fehlt ein Tag" -#: ../libsvn_repos/hooks.c:136 -msgid "Unlock" -msgstr "Entsperren" +#: ../libsvn_fs_fs/transaction.c:250 ../libsvn_fs_x/transaction.c:529 +#, c-format +msgid "Can't unlock unknown transaction '%s'" +msgstr "Kann unbekannte Transaktion »%s« nicht freigeben" -#: ../libsvn_repos/hooks.c:141 +#: ../libsvn_fs_fs/transaction.c:254 ../libsvn_fs_x/transaction.c:533 #, c-format -msgid "%s hook failed (exit code %d)" -msgstr "Aktion »%s« schlug fehl (Exit-Code %d)" +msgid "Can't unlock nonlocked transaction '%s'" +msgstr "Nicht gesperrte Transaktion »%s« kann nicht freigeben werden" -#: ../libsvn_repos/hooks.c:145 +# FIXME: Dies ist aber nicht infinitisch übersetzt (siehe umliegenden Meldungen) +#: ../libsvn_fs_fs/transaction.c:261 ../libsvn_fs_x/transaction.c:540 #, c-format -msgid "%s blocked by %s hook (exit code %d)" -msgstr "%s wird durch Aktion %s behindert (Exit-Code %d)" +msgid "Can't unlock prototype revision lockfile for transaction '%s'" +msgstr "Kann Prototyp-Revisionssperrdatei für Transaktion »%s« nicht entsperren" -#: ../libsvn_repos/hooks.c:152 -msgid " with output:\n" -msgstr " mit Ausgabe:\n" +#: ../libsvn_fs_fs/transaction.c:267 ../libsvn_fs_x/transaction.c:546 +#, c-format +msgid "Can't close prototype revision lockfile for transaction '%s'" +msgstr "Kann Prototyp-Revisionssperrdatei für Transaktion »%s« nicht schließen" -#: ../libsvn_repos/hooks.c:158 -msgid " with no output." -msgstr " ohne Ausgabe." +#: ../libsvn_fs_fs/transaction.c:313 ../libsvn_fs_x/transaction.c:594 +#, c-format +msgid "Cannot write to the prototype revision file of transaction '%s' because a previous representation is currently being written by this process" +msgstr "Kann nicht in die Prototyp-Revisionsdatei der Transaktion »%s« schreiben, da eine frühere Darstellung zurzeit von diesem Prozess geschrieben wird" -#: ../libsvn_repos/hooks.c:233 +#: ../libsvn_fs_fs/transaction.c:350 ../libsvn_fs_x/transaction.c:632 #, c-format -msgid "Can't create null stdout for hook '%s'" -msgstr "Kann leere Standardausgabe für Aktion »%s« nicht anlegen" +msgid "Cannot write to the prototype revision file of transaction '%s' because a previous representation is currently being written by another process" +msgstr "Kann nicht in die Prototyp-Revisionsdatei der Transaktion »%s« schreiben, da eine frühere Darstellung zurzeit von einem anderen Prozess geschrieben wird" -#: ../libsvn_repos/hooks.c:260 +#: ../libsvn_fs_fs/transaction.c:358 ../libsvn_fs_x/transaction.c:640 +#: ../libsvn_subr/io.c:2347 #, c-format -msgid "Failed to start '%s' hook" -msgstr "Konnte Aktion »%s« nicht starten" +msgid "Can't get exclusive lock on file '%s'" +msgstr "Kann keinen exklusiven Zugriff auf Datei »%s« erlangen" -#: ../libsvn_repos/hooks.c:282 +#: ../libsvn_fs_fs/transaction.c:406 ../libsvn_fs_x/transaction.c:686 #, c-format -msgid "Error closing null file" -msgstr "Fehler beim Schließen der leeren Standardausgabe" +msgid "p2l proto index offset %s beyond protorev file size %s for TXN %s" +msgstr "Offset %s im p2l-Proto-Index überschreitet die Größe %s der protorev-Datei in Transaktion %s" -#: ../libsvn_repos/hooks.c:454 +#: ../libsvn_fs_fs/transaction.c:515 ../libsvn_fs_fs/transaction.c:2618 +#: ../libsvn_fs_x/transaction.c:816 ../libsvn_fs_x/transaction.c:2686 #, c-format -msgid "Failed to run '%s' hook; broken symlink" -msgstr "Ausführen der Aktion »%s« gescheitert; defekter »Symlink«" +msgid "Attempted to write to non-transaction '%s'" +msgstr "Versuch, in eine Nicht-Transaktion zu schreiben »%s«" -#: ../libsvn_repos/hooks.c:679 -msgid "" -"Repository has not been enabled to accept revision propchanges;\n" -"ask the administrator to create a pre-revprop-change hook" -msgstr "" -"Das Projektarchiv lässt keine Änderungen an Revisionseigenschaften zu.\n" -"Bitten Sie den Administrator darum, eine Aktion »pre-revprop-change«\n" -"einzurichten." +#: ../libsvn_fs_fs/transaction.c:986 ../libsvn_fs_x/transaction.c:1198 +msgid "Copying from transactions not allowed" +msgstr "Kopieren aus Transaktionen ist nicht erlaubt." -#: ../libsvn_repos/load-fs-vtable.c:589 ../svnrdump/load_editor.c:638 +#: ../libsvn_fs_fs/transaction.c:1120 #, c-format -msgid "Relative source revision %ld is not available in current repository" -msgstr "Relative Quellrevision %ld ist im aktuellen Projektarchiv nicht verfügbar." +msgid "Unable to create transaction directory in '%s' for revision %ld" +msgstr "Kann Transaktionsverzeichnis in »%s« in Revision %ld nicht anlegen" -# CHECKME: Check quotes, s/rev/revision/ -#: ../libsvn_repos/load-fs-vtable.c:603 -#, c-format -msgid "" -"Copy source checksum mismatch on copy from '%s'@%ld\n" -"to '%s' in rev based on r%ld" -msgstr "" -"Prüfsummenfehler beim Kopieren von »%s«@%ld\n" -"nach »%s« in der auf r%ld basierten Revision" +#: ../libsvn_fs_fs/transaction.c:1191 ../libsvn_fs_x/transaction.c:1383 +msgid "Internal error: a null transaction id was passed to get_txn_proplist()" +msgstr "Interner Fehler: eine Transaktionskennung von Null wurde übergeben um get_txn_proplist() zu erhalten" -#: ../libsvn_repos/load-fs-vtable.c:667 -msgid "Malformed dumpstream: Revision 0 must not contain node records" -msgstr "Fehlerhafter Dateiabzug: Revision 0 darf keine Knoteneinträge enthalten" +#: ../libsvn_fs_fs/transaction.c:1204 ../libsvn_fs_x/transaction.c:1397 +#, fuzzy, c-format +msgid "malformed property list in transaction '%s'" +msgstr "Fehlerhafte »copyroot«-Zeile in Knotenrevision »%s«" + +#: ../libsvn_fs_fs/transaction.c:1372 ../libsvn_fs_fs/transaction.c:1378 +#: ../libsvn_fs_x/transaction.c:1657 ../libsvn_fs_x/transaction.c:1663 +msgid "next-id file corrupt" +msgstr "»next-id« Datei beschädigt" -#: ../libsvn_repos/load-fs-vtable.c:683 +#: ../libsvn_fs_fs/transaction.c:1491 ../libsvn_fs_x/transaction.c:1776 #, c-format -msgid "Unrecognized node-action on node '%s'" -msgstr "Unerkannte Knotenaktion auf Knoten »%s«" +msgid "Transaction '%s' cleanup failed" +msgstr "Aufräumen der Transaktion »%s« schlug fehl" -#: ../libsvn_repos/load-fs-vtable.c:852 ../svnrdump/load_editor.c:774 -msgid "Invalid svn:mergeinfo value" -msgstr "Ungültiger Wert für svn:mergeinfo" +#: ../libsvn_fs_fs/transaction.c:1819 ../libsvn_fs_x/transaction.c:1583 +#, fuzzy +msgid "Unexpected itemidx file length" +msgstr "Unerwartetes Ende des Eintrags" -#: ../libsvn_repos/load-fs-vtable.c:861 -msgid "Invalid svn:mergeinfo value; leaving unchanged" -msgstr "Ungültiger Wert für svn:mergeinfo; keine Änderungen angewandt" +#: ../libsvn_fs_fs/transaction.c:2638 ../libsvn_fs_x/transaction.c:2707 +msgid "Can't set text contents of a directory" +msgstr "Kann Textinhalt im Verzeichnis nicht erzeugen" -#: ../libsvn_repos/load.c:46 -msgid "Premature end of content data in dumpstream" -msgstr "Vorzeitiges Ende der Daten im Dateiabzug" +#: ../libsvn_fs_fs/transaction.c:3067 ../libsvn_fs_x/transaction.c:3046 +#, c-format +msgid "predecessor count for the root node-revision is wrong: found (%d+%ld != %d), committing r%ld" +msgstr "Anzahl der Vorgänger für die Revision des Wurzelknotens ist falsch: Gefunden (%d+%ld != %d) bei Übertragung von r%ld" -#: ../libsvn_repos/load.c:53 -msgid "Dumpstream data appears to be malformed" -msgstr "Daten des Dateiabzugs scheinen fehlerhaft zu sein" +#: ../libsvn_fs_fs/transaction.c:3249 +msgid "Truncated protorev file detected" +msgstr "Abgeschnittene Datei »protorev« entdeckt" -#: ../libsvn_repos/load.c:102 -#, c-format -msgid "Dump stream contains a malformed header (with no ':') at '%.20s'" -msgstr "Datenstrom enthält fehlerhaften Kopf (ohne »:«) in »%.20s«" +#: ../libsvn_fs_fs/transaction.c:3786 ../libsvn_fs_x/transaction.c:3806 +msgid "Transaction out of date" +msgstr "Transaktion ist veraltet" -#: ../libsvn_repos/load.c:115 +#: ../libsvn_fs_fs/transaction.c:4085 ../libsvn_fs_x/transaction.c:4053 #, c-format -msgid "Dump stream contains a malformed header (with no value) at '%.20s'" -msgstr "Datenstrom enthält fehlerhaften Kopf (ohne Wert) in »%.20s«" +msgid "No such transaction '%s'" +msgstr "Keine solche Transaktion »%s«" -#: ../libsvn_repos/load.c:204 -msgid "Incomplete or unterminated property block" -msgstr "Eigenschaftsblock ist unvollständig oder nicht terminiert" +#: ../libsvn_fs_fs/tree.c:1161 +#, fuzzy, c-format +msgid "Failure opening '%s' in transaction '%s'" +msgstr "Fehler beim Lesen der Darstellung »%s«" -#: ../libsvn_repos/load.c:344 -msgid "Unexpected EOF writing contents" -msgstr "Unerwartetes EOF beim Schreiben der Daten" +#: ../libsvn_fs_fs/tree.c:1164 +#, fuzzy, c-format +msgid "Failure opening '%s' in revision %ld" +msgstr "Fehler beim Öffnen von »%s«" -#: ../libsvn_repos/load.c:374 -#, c-format -msgid "Malformed dumpfile header '%s'" -msgstr "Dateiabzug enthält ungültigen Kopf »%s«" +#: ../libsvn_fs_fs/tree.c:2639 ../libsvn_fs_x/tree.c:1560 +msgid "Copy immutable tree not supported" +msgstr "Kopieren eines unveränderlichen Baumes nicht unterstützt" -#: ../libsvn_repos/load.c:381 +#: ../libsvn_fs_fs/tree.c:4195 ../libsvn_fs_x/tree.c:2958 #, c-format -msgid "Unsupported dumpfile version: %d" -msgstr "Dateiabzug Version %d wird nicht unterstützt" - -#: ../libsvn_repos/load.c:522 -msgid "Unrecognized record type in stream" -msgstr "Unerkannter Datensatz im Datenstrom" +msgid "Node-revision #'%s' claims to have mergeinfo but doesn't" +msgstr "Knotenrevision #»%s« behauptet, Zusammenführungsinformationen zu haben, hat aber keine" -#: ../libsvn_repos/load.c:629 -msgid "Sum of subblock sizes larger than total block content length" -msgstr "Die Summe der Größen der Unterblöcke überschreitet die gesamte Blocklänge" +#: ../libsvn_fs_fs/tree.c:4310 ../libsvn_fs_x/tree.c:3050 +#, c-format +msgid "Node-revision '%s@%ld' claims to have mergeinfo but doesn't" +msgstr "Knotenrevision »%s@%ld« behauptet, Zusammenführungsinformationen zu haben, hat aber keine" -#: ../libsvn_repos/node_tree.c:244 +#: ../libsvn_fs_fs/tree.c:4509 #, c-format -msgid "'%s' not found in filesystem" -msgstr "»%s« nicht im Dateisystem gefunden" +msgid "Querying mergeinfo requires version %d of the FSFS filesystem schema; filesystem '%s' uses only version %d" +msgstr "Abfrage der Zusammenführungsinformationen erfordert Version %d des FSFS-Dateisystem-Schemas; Dateisystem »%s« verwendet nur Version %d" -#: ../libsvn_repos/replay.c:541 ../libsvn_repos/replay.c:1268 +#: ../libsvn_fs_fs/util.c:387 ../libsvn_fs_x/util.c:491 #, c-format -msgid "Filesystem path '%s' is neither a file nor a directory" -msgstr "Pfad »%s« ist weder eine Datei noch ein Verzeichnis" +msgid "%s file '%s' contains unexpected non-digit '%c' within '%s'" +msgstr "Die Datei %s (»%s«) enthält eine unerwartete Nicht-Ziffer »%c« innerhalb »%s«" -#: ../libsvn_repos/replay.c:556 -msgid "Root directory already exists." -msgstr "Wurzelverzeichnis existiert bereits." +#: ../libsvn_fs_fs/util.c:479 ../libsvn_fs_fs/util.c:484 +#: ../libsvn_fs_fs/util.c:489 ../libsvn_fs_x/util.c:566 +msgid "Corrupt 'current' file" +msgstr "Beschädigte Datei »current«" -#: ../libsvn_repos/reporter.c:205 +#: ../libsvn_fs_fs/util.c:585 ../libsvn_fs_x/util.c:662 #, c-format -msgid "Invalid length (%%%s) when about to read a string" -msgstr "Ungültige Länge (%%%s) beim Lesen einer Zeichenkette" +msgid "Can't read '%s'" +msgstr "Kann »%s« nicht lesen" -#: ../libsvn_repos/reporter.c:270 +#: ../libsvn_fs_fs/util.c:606 ../libsvn_fs_x/util.c:689 +msgid "Unexpected EOF" +msgstr "Unerwartetes Dateiende (EOF)" + +#: ../libsvn_fs_fs/util.c:613 ../libsvn_fs_x/util.c:696 #, c-format -msgid "Invalid depth (%c) for path '%s'" -msgstr "Ungültige Tiefe (%c) für Pfad »%s«" +msgid "Number '%s' invalid or too large" +msgstr "Zahl »%s« ist ungültig oder zu groß" -#: ../libsvn_repos/reporter.c:950 +#: ../libsvn_fs_fs/verify.c:209 ../libsvn_fs_x/verify.c:183 #, c-format -msgid "Working copy path '%s' does not exist in repository" -msgstr "Arbeitskopiepfad »%s« existiert nicht im Projektarchiv" +msgid "%s checksum mismatch in file %s" +msgstr "%s Prüfsummenfehler in Datei %s" -#: ../libsvn_repos/reporter.c:1357 -msgid "Not authorized to open root of edit operation" -msgstr "Keine Berechtigung die Basis der Änderung zu öffnen" +#: ../libsvn_fs_fs/verify.c:304 +#, c-format +msgid "p2l index entry not found for PHYS %s returned by l2p index for LOG r%ld:i%ld" +msgstr "P2L-Indexeintrag nicht gefunden für PHYS %s zurückgegeben von L2P-Index für LOG r%ld:i%ld" -#: ../libsvn_repos/reporter.c:1374 +#: ../libsvn_fs_fs/verify.c:314 ../libsvn_fs_x/verify.c:288 #, c-format -msgid "Target path '%s' does not exist" -msgstr "Zielpfad »%s« existiert nicht" +msgid "p2l index info LOG r%ld:i%ld does not match l2p index for LOG r%ld:i%ld" +msgstr "P2L-Indexinformation LOG r%ld:i%ld stimmt nicht mit dem L2P-Index für LOG r%ld:i%ld überein" -#: ../libsvn_repos/reporter.c:1382 -msgid "Cannot replace a directory from within" -msgstr "Kann ein Verzeichnis nicht innerhalb sich selbst ersetzen" +#: ../libsvn_fs_fs/verify.c:380 ../libsvn_fs_x/verify.c:356 +#, c-format +msgid "p2l does not cover offset %s for revision %ld" +msgstr "P2L-Index deckt Offset %s für Revision %ld nicht ab" -#: ../libsvn_repos/reporter.c:1422 -msgid "Invalid report for top level of working copy" -msgstr "Ungültiger Report für oberste Ebene der Arbeitskopie" +#: ../libsvn_fs_fs/verify.c:405 +#, c-format +msgid "Empty P2L entry for PHYS %s refers to revision %ld outside the rev / pack file (%ld-%ld)" +msgstr "Leerer P2L-Eintrag für PHYS %s bezieht sich auf Revision %ld außerhalb der REV/PACK-Datei (%ld-%ld)" -#: ../libsvn_repos/reporter.c:1437 -msgid "Two top-level reports with no target" -msgstr "Zwei oberste Reports ohne Zielangabe" +#: ../libsvn_fs_fs/verify.c:422 +#, c-format +msgid "l2p index entry PHYS %sdoes not match p2l index value LOG r%ld:i%ld for PHYS %s" +msgstr "L2P-Indexeintrag PHYS %sstimmt nicht mit dem P2L-Indexwert LOG r%ld:i%ld für PHYS %s überein" -#: ../libsvn_repos/reporter.c:1499 +#: ../libsvn_fs_fs/verify.c:487 ../libsvn_fs_x/verify.c:456 #, c-format -msgid "Unsupported report depth '%s'" -msgstr "Nicht unterstützte Reporttiefe »%s«" +msgid "Empty section in file %s contains non-NUL data at offset %s" +msgstr "Leerer Abschnitt in Datei %s enthält Daten verschieden von NUL bei Offset %s" -#: ../libsvn_repos/reporter.c:1529 -msgid "Depth 'exclude' not supported for link" -msgstr "Tiefe »exclude« wird für Links nicht unterstützt" +#: ../libsvn_fs_fs/verify.c:528 ../libsvn_fs_x/verify.c:498 +#, c-format +msgid "Checksum mismatch in item at offset %s of length %s bytes in file %s" +msgstr "Prüfsummenfehler in Element bei Offset %s der Länge %s Byte in Datei %s" -#: ../libsvn_repos/reporter.c:1586 -msgid "Request depth 'exclude' not supported" -msgstr "Angefragte Tiefe »exclude« wird nicht unterstützt" +#: ../libsvn_fs_fs/verify.c:624 ../libsvn_fs_x/verify.c:594 +#, c-format +msgid "File size of %s for revision r%ld does not match p2l index size of %s" +msgstr "Dateigröße von %s für Revision r%ld stimmt nicht mit der Größe des P2L-Index %s überein" -#: ../libsvn_repos/repos.c:188 +#: ../libsvn_fs_fs/verify.c:669 ../libsvn_fs_x/verify.c:640 #, c-format -msgid "'%s' exists and is non-empty" -msgstr "»%s« existiert und ist nicht leer" +msgid "p2l index entry for revision r%ld is non-contiguous between offsets %s and %s" +msgstr "P2L-Indexeintrag für Revision r%ld ist nicht zusammenhängend zwischen Offsets %s und %s" -#: ../libsvn_repos/repos.c:234 -msgid "Creating db logs lock file" -msgstr "Erzeuge Sperrdatei für Datenbanklogs" +#: ../libsvn_fs_fs/verify.c:682 +#, fuzzy, c-format +msgid "p2l index entry for revision r%ld at offset %s contains invalid item type %d" +msgstr "P2L-Indexeintrag für Revision r%ld ist nicht zusammenhängend zwischen Offsets %s und %s" -#: ../libsvn_repos/repos.c:252 -msgid "Creating db lock file" -msgstr "Erzeuge Datenbank-Sperrdatei" +#: ../libsvn_fs_fs/verify.c:696 +#, fuzzy, c-format +msgid "p2l index entry for changes in revision r%ld is item %ld of type %d at offset %s" +msgstr "P2L-Indexeintrag für Revision r%ld ist nicht zusammenhängend zwischen Offsets %s und %s" -#: ../libsvn_repos/repos.c:262 -msgid "Creating lock dir" -msgstr "Erzeuge Verzeichnis für Datenbanksperren" +#: ../libsvn_fs_util/fs-util.c:164 +msgid "Filesystem object has not been opened yet" +msgstr "Dateisystemobjekt ist noch nicht geöffnet" -#: ../libsvn_repos/repos.c:367 -msgid "Creating hook directory" -msgstr "Lege Verzeichnis für Aktionen an" +#: ../libsvn_fs_util/fs-util.c:167 +msgid "Filesystem object already open" +msgstr "Dateisystemobjekt ist bereits geöffnet" -#: ../libsvn_repos/repos.c:420 -msgid "Creating start-commit hook" -msgstr "Erzeuge Aktion »start-commit«" +#: ../libsvn_fs_x/batch_fsync.c:61 +#, fuzzy +msgid "Can't create condition variable" +msgstr "Kann Tunnel nicht erzeugen" -#: ../libsvn_repos/repos.c:483 -msgid "Creating pre-commit hook" -msgstr "Erzeuge Aktion »pre-commit«" +#: ../libsvn_fs_x/batch_fsync.c:78 ../libsvn_fs_x/batch_fsync.c:92 +msgid "Can't broadcast condition variable" +msgstr "" -#: ../libsvn_repos/repos.c:534 -msgid "Creating pre-revprop-change hook" -msgstr "Erzeuge Aktion »pre-revprop-change«" +#: ../libsvn_fs_x/batch_fsync.c:275 +#, fuzzy +msgid "Can't create fsync thread pool in FSX" +msgstr "Kann Thread-Pool nicht erzeugen" -#: ../libsvn_repos/repos.c:600 -msgid "Creating pre-lock hook" -msgstr "Erzeuge Aktion »pre-lock«" +#: ../libsvn_fs_x/batch_fsync.c:547 ../svnserve/svnserve.c:1380 +#, c-format +msgid "Can't push task" +msgstr "Kann Abarbeitung einer Anfrage nicht initiieren" -#: ../libsvn_repos/repos.c:658 -msgid "Creating pre-unlock hook" -msgstr "Erzeuge Aktion »pre-unlock«" +#: ../libsvn_fs_x/cached_data.c:2508 +#, fuzzy, c-format +msgid "Directory for '%s' is too large" +msgstr "Verzeichnis »%s« ist veraltet" -#: ../libsvn_repos/repos.c:691 -msgid "Creating post-commit hook" -msgstr "Erzeuge Aktion »post-commit«" +#: ../libsvn_fs_x/cached_data.c:2530 +#, fuzzy, c-format +msgid "Directory entry missing kind in '%s'" +msgstr "Verzeichniseintrag beschädigt in »%s«" -#: ../libsvn_repos/repos.c:726 -msgid "Creating post-lock hook" -msgstr "Erzeuge Aktion »post-lock«" +#: ../libsvn_fs_x/cached_data.c:2536 +#, fuzzy, c-format +msgid "Directory entry missing change set in '%s'" +msgstr "Verzeichniseintrag beschädigt in »%s«" -#: ../libsvn_repos/repos.c:758 -msgid "Creating post-unlock hook" -msgstr "Erzeuge Aktion »post-unlock«" +#: ../libsvn_fs_x/cached_data.c:2542 +#, fuzzy, c-format +msgid "Directory entry missing item number in '%s'" +msgstr "Verzeichniseintrag beschädigt in »%s«" -#: ../libsvn_repos/repos.c:799 -msgid "Creating post-revprop-change hook" -msgstr "Erzeuge Aktion »post-revprop-change«" +#: ../libsvn_fs_x/cached_data.c:2578 +#, fuzzy, c-format +msgid "Directory length mismatch in '%s'" +msgstr "Verzeichniseintrag beschädigt in »%s«" -#: ../libsvn_repos/repos.c:810 -msgid "Creating conf directory" -msgstr "Erzeuge Konfigurationsverzeichnis" +#: ../libsvn_fs_x/cached_data.c:3083 +#, c-format +msgid "" +"Low-level checksum mismatch while reading\n" +"%s bytes of meta data at offset %s " +msgstr "" +"Interner Prüfsummenfehler beim Lesen von\n" +"%s Byte von Metadaten bei Offset %s" -#: ../libsvn_repos/repos.c:894 -msgid "Creating svnserve.conf file" -msgstr "Erzeuge Datei »svnserve.conf«" +#: ../libsvn_fs_x/changes.c:232 +#, c-format +msgid "Changes list index %%%s exceeds container size %%d" +msgstr "Index für Änderungslisten %%%s überschreitet Größe des Containers %%d" -#: ../libsvn_repos/repos.c:912 -msgid "Creating passwd file" -msgstr "Erzeuge Datei »passwd«" +#: ../libsvn_fs_x/changes.c:485 +#, c-format +msgid "Changes list index %u exceeds container size %d" +msgstr "Index für Änderungslisten %u überschreitet Größe des Containers %d" -#: ../libsvn_repos/repos.c:954 -msgid "Creating authz file" -msgstr "Erzeuge Datei »authz«" +#: ../libsvn_fs_x/fs.c:103 +#, c-format +msgid "Can't fetch FSX shared data" +msgstr "Kann gemeinsame FSX-Daten nicht holen" -#: ../libsvn_repos/repos.c:984 -msgid "Creating hooks-env file" -msgstr "Erzeuge Datei »hooks-env«" +#: ../libsvn_fs_x/fs.c:132 +#, c-format +msgid "Can't store FSX shared data" +msgstr "Kann gemeinsame FSX-Daten nicht speichern" -#: ../libsvn_repos/repos.c:1040 -msgid "Could not create top-level directory" -msgstr "Konnte oberstes Verzeichnis nicht erzeugen" +#: ../libsvn_fs_x/fs.c:601 +msgid "Module for working with an experimental (FSX) repository." +msgstr "Modul zum Zugriff auf ein experimentelles (FSX) Projektarchiv." -#: ../libsvn_repos/repos.c:1050 -msgid "Creating DAV sandbox dir" -msgstr "Erzeuge Verzeichnis für DAV-Sandkasten" +#: ../libsvn_fs_x/fs.c:664 +#, c-format +msgid "Unsupported FS loader version (%d) for fsx" +msgstr "Nicht unterstützte Dateisystem-Laderversion (%d) für fsx" -#: ../libsvn_repos/repos.c:1119 -msgid "Error opening db lockfile" -msgstr "Fehler beim Öffnen der Datenbank-Sperrdatei" +#: ../libsvn_fs_x/fs_x.c:108 +#, fuzzy, c-format +msgid "Unsupported experimental FSX format '%d' found; current format is '%d'" +msgstr "Erwartetes Dateisystemformat »%d«; gefunden »%d«" + +#: ../libsvn_fs_x/fs_x.c:117 +#, fuzzy, c-format +msgid "Expected FSX format between '%d' and '%d'; found format '%d'" +msgstr "Erwartete Dateisystemformat zwischen 1 und %d; fand %d" -#: ../libsvn_repos/repos.c:1157 +#: ../libsvn_fs_x/fs_x.c:1063 +msgid "FSX is not compatible with Subversion prior to 1.9" +msgstr "FSX ist inkompatibel mit Subversion älter als 1.9" + +#: ../libsvn_fs_x/hotcopy.c:354 #, c-format -msgid "'%s' is an existing repository" -msgstr "»%s« ist ein vorhandenes Projektarchiv" +msgid "The FSX format (%d) of the hotcopy source does not match the FSX format (%d) of the hotcopy destination; please upgrade both repositories to the same format" +msgstr "Das FSX-Format (%d) der Quelle für die Kopie im laufenden Betrieb entspricht nicht dem FSX-Format (%d) des Ziels; Verwenden Sie auf beiden Seiten das gleiche Format" -#: ../libsvn_repos/repos.c:1162 +#: ../libsvn_fs_x/index.c:289 +msgid "Can't read index file '%s' at offset 0x%" +msgstr "Kann Indexdatei »%s« nicht lesen bei Offset 0x%" + +#: ../libsvn_fs_x/index.c:299 +msgid "Unexpected end of index file %s at offset 0x%" +msgstr "Unerwartetes Ende der Indexdatei %s bei Offset 0x%" + +#: ../libsvn_fs_x/index.c:2615 +msgid "Unused regions must be empty and have checksum 0" +msgstr "Nicht verwendete Regionen müssen leer sein und eine Prüfsumme von 0 haben" + +#: ../libsvn_fs_x/index.c:2629 +msgid "Only containers may have more than one sub-item" +msgstr "Nur Container dürfen mehr als ein Unterelement haben" + +#: ../libsvn_fs_x/low_level.c:455 #, c-format -msgid "'%s' is a subdirectory of an existing repository rooted at '%s'" -msgstr "»%s« ist ein Unterverzeichnis eines existierenden Projektarchivs mit der Wurzel-URL »%s«" +msgid "Missing %s field in node-rev" +msgstr "Fehlendes Feld %s in Knotenrevision" -#: ../libsvn_repos/repos.c:1172 -msgid "Repository creation failed" -msgstr "Anlegen des Projektarchivs schlug fehl" +#: ../libsvn_fs_x/noderevs.c:320 +#, c-format +msgid "ID part index %d exceeds container size %d" +msgstr "ID-Teilindex %d überschreitet Größe des Containers %d" -#: ../libsvn_repos/repos.c:1262 +#: ../libsvn_fs_x/noderevs.c:348 #, c-format -msgid "Expected repository format '%d' or '%d'; found format '%d'" -msgstr "Erwartetes Format des Projektarchivs »%d« oder »%d«; gefunden »%d«" +msgid "Node revision ID index %d exceeds container size %d" +msgstr "Index für Knotenrevisions-IDs %d überschreitet Größe des Containers %d" -#: ../libsvn_repos/repos.c:1566 +#: ../libsvn_fs_x/noderevs.c:377 #, c-format -msgid "unknown capability '%s'" -msgstr "unbekannte Eigenschaft »%s«" +msgid "Node revision index %%%s exceeds container size %%d" +msgstr "Index für Knotenrevisions-IDs %%%s überschreitet Größe des Containers %%d" -#: ../libsvn_repos/rev_hunt.c:73 +#: ../libsvn_fs_x/noderevs.c:618 #, c-format -msgid "Failed to find time on revision %ld" -msgstr "Konnte Zeit für Revision %ld nicht ermitteln" +msgid "Unexpected MD5 digest size %%%s" +msgstr "Unerwartete Länge für MD5-Prüfsumme %%%s" -#: ../libsvn_repos/rev_hunt.c:208 ../libsvn_repos/rev_hunt.c:323 +#: ../libsvn_fs_x/noderevs.c:630 #, c-format -msgid "Invalid start revision %ld" -msgstr "Ungültige Startrevision %ld" +msgid "Unexpected SHA1 digest size %%%s" +msgstr "Unerwartete Länge für SHA1-Prüfsumme %%%s" -#: ../libsvn_repos/rev_hunt.c:503 -msgid "Unreadable path encountered; access denied" -msgstr "Nichtlesbarer Pfad angetroffen; Zugriff verweigert" +#: ../libsvn_fs_x/reps.c:496 +msgid "Text body exceeds star delta container capacity" +msgstr "Textkörper überschreitet Kapazität des Star Delta Containers" + +#: ../libsvn_fs_x/reps.c:501 +msgid "Instruction count exceeds star delta container capacity" +msgstr "Anzahl der Instruktionen überschreitet Kapazität des Star Delta Containers" -#: ../libsvn_repos/rev_hunt.c:1127 ../libsvn_repos/rev_hunt.c:1466 +#: ../libsvn_fs_x/verify.c:279 #, c-format -msgid "'%s' is not a file in revision %ld" -msgstr "»%s« ist in Revision %ld keine Datei" +msgid "p2l index entry not found for PHYS o%s:s%ld returned by l2p index for LOG r%ld:i%ld" +msgstr "P2L-Indexeintrag nicht gefunden für PHYS o%s:s%ld zurückgegeben von L2P-Index für LOG r%ld:i%ld" -#: ../libsvn_subr/auth.c:246 -msgid "No authentication providers registered" -msgstr "Keine Anmeldemöglichkeiten registriert" +#: ../libsvn_fs_x/verify.c:387 +#, c-format +msgid "l2p index entry PHYS o%s:s%ld does not match p2l index value LOG r%ld:i%ld for PHYS o%s:s%ld" +msgstr "L2P-Indexeintrag PHYS o%s:s%ld stimmt nicht mit dem P2L-Indexwert LOG r%ld:i%ld für PHYS o%s:s%ld überein" -#: ../libsvn_subr/auth.c:252 +#: ../libsvn_ra/compat.c:183 #, c-format -msgid "No provider registered for '%s' credentials" -msgstr "Kein Anbieter für Zugangsdaten vom Typ »%s« registriert" +msgid "Missing changed-path information for '%s' in revision %ld" +msgstr "»%s« fehlt in der Liste der geänderten Pfade von Revision %ld" -#: ../libsvn_subr/cache-membuffer.c:628 +#: ../libsvn_ra/compat.c:328 ../libsvn_ra/compat.c:572 #, c-format -msgid "Can't lock cache mutex" -msgstr "Kann Zwischenspeicher-Mutex nicht sperren" +msgid "Path '%s' doesn't exist in revision %ld" +msgstr "Pfad »%s« existiert nicht in Revision %ld" -#: ../libsvn_subr/cache-membuffer.c:666 ../libsvn_subr/cache-membuffer.c:687 +#: ../libsvn_ra/compat.c:405 #, c-format -msgid "Can't write-lock cache mutex" -msgstr "Kann Zwischenspeicher-Mutex nicht für das Schreiben sperren" +msgid "'%s' in revision %ld is an unrelated object" +msgstr "»%s« in Revision %ld hat keinen Bezug zur Arbeitskopie" -#: ../libsvn_subr/cache-membuffer.c:711 +#: ../libsvn_ra/compat.c:845 ../libsvn_ra/ra_loader.c:1314 #, c-format -msgid "Can't unlock cache mutex" -msgstr "Kann Zwischenspeicher-Mutex nicht entsperren" +msgid "Invalid peg revision %ld" +msgstr "Ungültige Fix-Revision %ld" -#: ../libsvn_subr/cache-membuffer.c:1807 +#: ../libsvn_ra/compat.c:848 ../libsvn_ra/ra_loader.c:1317 +#: ../libsvn_repos/rev_hunt.c:214 ../libsvn_repos/rev_hunt.c:329 #, c-format -msgid "Can't create cache mutex" -msgstr "Kann Zwischenspeicher-Mutex nicht anlegen" +msgid "Invalid end revision %ld" +msgstr "Ungültige Endrevision %ld" -#: ../libsvn_subr/cache-membuffer.c:2811 -msgid "Can't iterate a membuffer-based cache" -msgstr "Kann einen »memcached«-Zwischenspeicher nicht durchlaufen" +#: ../libsvn_ra/compat.c:851 ../libsvn_ra/ra_loader.c:1320 +msgid "Peg revision must precede end revision" +msgstr "Fix-Revision muss vor der Endrevision liegen" -# memcached is an APR library -#: ../libsvn_subr/cache-memcache.c:170 +#: ../libsvn_ra/ra_loader.c:217 #, c-format -msgid "Unknown memcached error while reading" -msgstr "Unbekannter »memcached«-Fehler beim Lesen" +msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" +msgstr "Version des ZM »%s« stimmt nicht überein: gefunden %d.%d.%d%s, erwartet %d.%d.%d%s" -#: ../libsvn_subr/cache-memcache.c:258 +#: ../libsvn_ra/ra_loader.c:291 #, c-format -msgid "Unknown memcached error while writing" -msgstr "Unbekannter »memcached«-Fehler beim Schreiben" +msgid "Illegal repository URL '%s'" +msgstr "Illegale Projektarchiv-URL »%s«" -#: ../libsvn_subr/cache-memcache.c:364 -msgid "Can't iterate a memcached cache" -msgstr "Kann keinen »memcached«-Zwischenspeicher durchlaufen" +#: ../libsvn_ra/ra_loader.c:329 +#, c-format +msgid "Invalid config: unknown HTTP library '%s'" +msgstr "Ungültige Konfiguration: Unbekannte HTTP-Bibliothek »%s«" -#: ../libsvn_subr/cache-memcache.c:460 +#: ../libsvn_ra/ra_loader.c:373 #, c-format -msgid "Error parsing memcache server '%s'" -msgstr "Fehler beim Abfragen des »memcache«-Servers »%s«" +msgid "Unrecognized URL scheme for '%s'" +msgstr "Unbekanntes URL-Schema für »%s«" -#: ../libsvn_subr/cache-memcache.c:468 +#: ../libsvn_ra/ra_loader.c:397 #, c-format -msgid "Scope not allowed in memcache server '%s'" -msgstr "Bereich ist im »memcache«-Server »%s« nicht erlaubt" +msgid "Unable to connect to a repository at URL '%s'" +msgstr "Konnte nicht mit Projektarchiv bei URL »%s« verbinden" -#: ../libsvn_subr/cache-memcache.c:476 +#: ../libsvn_ra/ra_loader.c:428 #, c-format -msgid "Must specify host and port for memcache server '%s'" -msgstr "Der Rechner und Port muss für den »memcache«-Server »%s« festgelegt werden" +msgid "Repository UUID '%s' doesn't match expected UUID '%s'" +msgstr "UUID des Projektarchivs »%s« entspricht nicht der erwarteten UUID »%s«" -#: ../libsvn_subr/cache-memcache.c:496 +#: ../libsvn_ra/ra_loader.c:492 #, c-format -msgid "Unknown error creating memcache server" -msgstr "Unbekannter Fehler beim Erzeugen eines »memcache«-Servers" +msgid "'%s' isn't in the same repository as '%s'" +msgstr "»%s« ist nicht im selben Projektarchiv wie »%s«" -#: ../libsvn_subr/cache-memcache.c:504 +#: ../libsvn_ra/ra_loader.c:516 #, c-format -msgid "Unknown error adding server to memcache" -msgstr "Unbekannter Fehler beim Hinzufügen des Servers zu »memcache«" +msgid "'%s' isn't a child of session URL '%s'" +msgstr "»%s« ist kein Kind der Sitzungs-URL »%s«" -#: ../libsvn_subr/cache-memcache.c:574 +#: ../libsvn_ra/ra_loader.c:532 ../libsvn_ra_svn/client.c:2878 #, c-format -msgid "Unknown error creating apr_memcache_t" -msgstr "Unbekannter Fehler beim Anlegen von apr_memcache_t" +msgid "'%s' isn't a child of repository root URL '%s'" +msgstr "»%s« ist kein Kind der Projektarchivwurzel-URL »%s«" -#: ../libsvn_subr/checksum.c:626 +#: ../libsvn_ra/ra_loader.c:576 #, c-format -msgid "" -"%s:\n" -" expected: %s\n" -" actual: %s\n" -msgstr "" -"%s:\n" -" Erwartet: %s\n" -" Tatsächlich: %s\n" +msgid "Specifying 'old_value_p' is not allowed when the '%s' capability is not advertised, and could indicate a bug in your client" +msgstr "Die Angabe von »old_value_p« is nicht erlaubt, wenn die Fähigkeit »%s« nicht bekanntgemacht wurde, und könnte auf einen Bug in Ihrem Client hindeuten" -#: ../libsvn_subr/cmdline.c:760 +#: ../libsvn_ra/ra_loader.c:1460 #, c-format -msgid "Error initializing command line arguments" -msgstr "Fehler beim Initialisieren der Kommandozeilenparameter" +msgid " - handles '%s' scheme\n" +msgstr " - behandelt Schema »%s«\n" -#: ../libsvn_subr/cmdline.c:849 -msgid "Invalid syntax of argument of --config-option" -msgstr "Ungültige Syntax im Argument von --config-option" +#: ../libsvn_ra/ra_loader.c:1553 +#, c-format +msgid "Unrecognized URL scheme '%s'" +msgstr "Unbekanntes URL-Schema »%s«" + +#: ../libsvn_ra/util.c:55 +msgid "" +msgstr "" -#: ../libsvn_subr/cmdline.c:876 +#: ../libsvn_ra/util.c:73 #, c-format -msgid "Unrecognized file in argument of %s" -msgstr "Unbekannte Datei im Parameter von %s" +msgid "Retrieval of mergeinfo unsupported by '%s'" +msgstr "Abfrage der Zusammenführungsinformationen wird von »%s« nicht unterstützt" -# FIXME: s/whitespace/whitespaceS/? -#: ../libsvn_subr/cmdline.c:1122 -msgid "The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-time configuration option is empty or consists solely of whitespace. Expected a shell command." -msgstr "Die Umgebungsvariable EDITOR, SVN_EDITOR oder VISUAL oder die Laufzeitkonfigurationsoption »editor-cmd« ist leer oder besteht nur aus Leerzeichen. Erwartete ein Shell-Kommando." +#: ../libsvn_ra/util.c:99 +#, c-format +msgid "The '%s' feature is not supported by '%s'" +msgstr "Die Funktion »%s« wird von »%s« nicht unterstützt" -#: ../libsvn_subr/cmdline.c:1129 -msgid "None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and no 'editor-cmd' run-time configuration option was found" -msgstr "Keine der Umgebungsvariablen SVN_EDITOR, VISUAL oder EDITOR ist gesetzt und keine Laufzeitkonfigurationsoption »editor-cmd« wurde gefunden" +#: ../libsvn_ra/util.c:142 +#, c-format +msgid "Lock was stolen by '%s'; unable to remove it" +msgstr "Sperre durch »%s« gestohlen; Kann nicht entfernt werden" -#: ../libsvn_subr/cmdline.c:1154 ../libsvn_subr/cmdline.c:1238 +#: ../libsvn_ra/util.c:183 #, c-format -msgid "Can't get working directory" -msgstr "Kann Arbeitsverzeichnis nicht ermitteln" +msgid "Unable to determine local hostname" +msgstr "Kann den lokalen Hostnamen nicht ermitteln" -#: ../libsvn_subr/cmdline.c:1165 ../libsvn_subr/cmdline.c:1249 -#: ../libsvn_subr/cmdline.c:1274 +#: ../libsvn_ra/util.c:278 #, c-format -msgid "Can't change working directory to '%s'" -msgstr "Kann Arbeitsverzeichnis nicht nach »%s« wechseln" +msgid "Couldn't get lock on destination repos after %d attempts" +msgstr "Konnte Sperre für Zielprojektarchiv nach %d Versuchen nicht erhalten" + +#: ../libsvn_ra_local/ra_plugin.c:162 +msgid "memory-cache-size invalid" +msgstr "Ungültige »memory-cache-size«" + +#. ---------------------------------------------------------------- +#. ** The RA vtable routines ** +#: ../libsvn_ra_local/ra_plugin.c:509 +msgid "Module for accessing a repository on local disk." +msgstr "Modul zum Zugriff auf ein Projektarchiv auf der lokalen Festplatte" -#: ../libsvn_subr/cmdline.c:1173 ../libsvn_subr/cmdline.c:1401 +#: ../libsvn_ra_local/ra_plugin.c:685 ../libsvn_ra_serf/serf.c:824 #, c-format -msgid "Can't restore working directory" -msgstr "Kann nicht in das Arbeitsverzeichnis zurückwechseln" +msgid "URL '%s' is not a child of the session's repository root URL '%s'" +msgstr "URL »%s« ist kein Kind der Projektarchivwurzel-URL »%s« der Sitzung" -#: ../libsvn_subr/cmdline.c:1180 ../libsvn_subr/cmdline.c:1343 +#: ../libsvn_ra_local/ra_plugin.c:1285 ../libsvn_ra_local/ra_plugin.c:1740 +#: ../libsvn_ra_serf/util.c:1844 ../svnserve/serve.c:3554 #, c-format -msgid "system('%s') returned %d" -msgstr "Aufruf des Editors »%s« gab Fehler %d zurück" +msgid "'%s' path not found" +msgstr "»%s« Pfad nicht gefunden" -#: ../libsvn_subr/cmdline.c:1374 -msgid "Error normalizing edited contents to internal format" -msgstr "Fehler beim Normalisieren des bearbeiteten Inhalts ins interne Format" +#: ../libsvn_ra_local/ra_plugin.c:1692 ../libsvn_ra_serf/options.c:777 +#: ../libsvn_ra_svn/client.c:3093 +#, c-format +msgid "Don't know anything about capability '%s'" +msgstr "Es ist nichts über die Eigenschaft »%s« bekannt" -#: ../libsvn_subr/compress.c:143 -msgid "Compression of svndiff data failed" -msgstr "Komprimierung der svndiff-Daten schlug fehl" +#: ../libsvn_ra_local/ra_plugin.c:1946 +#, c-format +msgid "Unsupported RA loader version (%d) for ra_local" +msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_local" -#: ../libsvn_subr/compress.c:179 -msgid "Decompression of zlib compressed data failed: no size" -msgstr "Dekomprimierung der mit zlib komprimierten Daten schlug fehl: Größe nicht angegeben" +#: ../libsvn_ra_local/split_url.c:50 ../libsvn_ra_local/split_url.c:56 +#, c-format +msgid "Unable to open repository '%s'" +msgstr "Projektarchiv »%s« kann nicht geöffnet werden" -#: ../libsvn_subr/compress.c:182 -msgid "Decompression of zlib compressed data failed: size too large" -msgstr "Dekomprimierung der mit zlib komprimierten Daten schlug fehl: Größe zu groß" +#: ../libsvn_ra_serf/commit.c:291 +msgid "No Location header received" +msgstr "Kein »Location« Kopf empfangen" -#: ../libsvn_subr/compress.c:207 -msgid "Decompression of svndiff data failed" -msgstr "Dekomprimierung der svndiff-Daten schlug fehl" +#: ../libsvn_ra_serf/commit.c:301 +msgid "Error parsing Location header value" +msgstr "Fehler beim Auslesen des Wertes aus dem »Location« Kopf" -#: ../libsvn_subr/compress.c:214 -msgid "Size of uncompressed data does not match stored original length" -msgstr "Die Größe der unkomprimierten Daten entspricht nicht der gespeicherten Originallänge" +#: ../libsvn_ra_serf/commit.c:487 ../libsvn_repos/commit.c:551 +#, c-format +msgid "Path '%s' not present" +msgstr "Pfad »%s« existiert nicht" -#: ../libsvn_subr/compress.c:230 +#: ../libsvn_ra_serf/commit.c:1275 #, c-format -msgid "Unsupported compression method %d" -msgstr "Nicht unterstützte Komprimierungsmethode %d" +msgid "POST request did not return transaction information" +msgstr "POST-Anfrage lieferte keine Transaktionsinformationen zurück" -#: ../libsvn_subr/config.c:805 +#: ../libsvn_ra_serf/commit.c:1566 ../libsvn_ra_serf/update.c:2126 #, c-format -msgid "Config error: invalid boolean value '%s' for '[%s] %s'" -msgstr "Konfigurationsfehler: Ungültiger logischer Wert »%s« für »[%s] %s«" +msgid "Unable to parse URL '%s'" +msgstr "Konnte die URL »%s« nicht zerlegen" -#: ../libsvn_subr/config.c:810 +#: ../libsvn_ra_serf/commit.c:1818 #, c-format -msgid "Config error: invalid boolean value '%s' for '%s'" -msgstr "Konfigurationsfehler: Ungültiger logischer Wert »%s« für »%s«" +msgid "File '%s' already exists" +msgstr "Datei »%s« existiert bereits" + +#: ../libsvn_ra_serf/commit.c:2252 ../libsvn_ra_svn/editorp.c:901 +msgid "Closing editor with directories or files open" +msgstr "Schließen des Editors mit geöffneten Verzeichnissen oder Dateien" -#: ../libsvn_subr/config.c:1239 +#: ../libsvn_ra_serf/get_deleted_rev.c:173 #, c-format -msgid "Config error: invalid integer value '%s'" -msgstr "Konfigurationsfehler: Ungültige Ganzzahl »%s«" +msgid "'%s' REPORT not implemented" +msgstr "»%s« REPORT nicht implementiert" -#: ../libsvn_subr/config_auth.c:96 -msgid "Unable to open auth file for reading" -msgstr "Kann »Auth« Datei nicht zum Lesen öffnen" +#: ../libsvn_ra_serf/get_file.c:378 +msgid "Can't get text contents of a directory" +msgstr "Kann Textinhalt eines Verzeichnisses nicht lesen" -#: ../libsvn_subr/config_auth.c:101 +#: ../libsvn_ra_serf/get_lock.c:170 ../libsvn_ra_serf/lock.c:165 #, c-format -msgid "Error parsing '%s'" -msgstr "Fehler beim Zerlegen von »%s«" +msgid "Invalid LOCK timeout value '%s'" +msgstr "Ungültiger Timeout-Wert für Sperre »%s«" -# Ist hier jetzt 'Authentifizierung' = Anmeldung oder 'Autorisierung' = Berechtigung gemeint? -#: ../libsvn_subr/config_auth.c:130 -msgid "Unable to locate auth file" -msgstr "Kann »Auth« Datei nicht finden" +#: ../libsvn_ra_serf/get_lock.c:323 +msgid "Server does not support locking features" +msgstr "Server unterstützt keine Sperroperationen" -#: ../libsvn_subr/config_auth.c:142 -msgid "Unable to open auth file for writing" -msgstr "Kann »Auth« Datei nicht zum Schreiben öffnen" +#: ../libsvn_ra_serf/getdate.c:167 +msgid "The REPORT response did not include the requested properties" +msgstr "Die REPORT-Antwort enthielt nicht den angeforderten Eigenschaften" -#: ../libsvn_subr/config_auth.c:144 +#: ../libsvn_ra_serf/inherited_props.c:171 ../libsvn_ra_serf/property.c:264 +#: ../libsvn_ra_serf/update.c:1749 #, c-format -msgid "Error writing hash to '%s'" -msgstr "Fehler beim Schreiben des Hashwerts nach »%s«" +msgid "Got unrecognized encoding '%s'" +msgstr "Unbekannte Codierung »%s«" -#: ../libsvn_subr/config_file.c:344 +#: ../libsvn_ra_serf/list.c:113 ../libsvn_ra_serf/log.c:172 #, c-format -msgid "line %d: Option must end with ':' or '='" -msgstr "Zeile %d: Option muss mit »:« oder »=« enden" +msgid "Unsupported encoding '%s'" +msgstr "Nicht unterstützte Kodierung »%s«" -#: ../libsvn_subr/config_file.c:387 +#: ../libsvn_ra_serf/lock.c:261 #, c-format -msgid "line %d: Section header must end with ']'" -msgstr "Zeile %d: Abschnittskopf muss mit »]« enden" +msgid "No lock on path '%s' (%d %s)" +msgstr "Keine Sperre für Pfad »%s« (%d %s)" -#: ../libsvn_subr/config_file.c:554 -#, c-format -msgid "Error while parsing config file: %s:" -msgstr "Fehler beim Auswerten der Konfigurationsdatei: %s:" +#: ../libsvn_ra_serf/lock.c:270 +#, fuzzy, c-format +msgid "Not authorized to perform lock operation on '%s'" +msgstr "Keine Berechtigung die Basis der Änderung zu öffnen" -#: ../libsvn_subr/config_file.c:596 +#: ../libsvn_ra_serf/lock.c:277 #, c-format -msgid "line %d: Section header must start in the first column" -msgstr "Zeile %d: Abschnittskopf muss in der ersten Spalte beginnen" +msgid "Path '%s' doesn't exist in HEAD revision (%d %s)" +msgstr "Pfad »%s« existiert nicht in HEAD-Revision (%d %s)" -#: ../libsvn_subr/config_file.c:609 +#: ../libsvn_ra_serf/lock.c:293 #, c-format -msgid "line %d: Comment must start in the first column" -msgstr "Zeile %d: Kommentar muss in der ersten Spalte beginnen" +msgid "Path '%s' already locked (%d %s)" +msgstr "Pfad »%s« bereits gesperrt (%d %s)" -#: ../libsvn_subr/config_file.c:624 +#: ../libsvn_ra_serf/lock.c:609 #, c-format -msgid "line %d: Section header expected" -msgstr "Zeile %d: Abschnittskopf erwartet" +msgid "'%s' is not locked in the repository" +msgstr "»%s« ist im Projektarchiv nicht gesperrt" + +#: ../libsvn_ra_serf/log.c:574 ../libsvn_ra_svn/client.c:1946 +msgid "Server does not support custom revprops via log" +msgstr "Server unterstützt benutzerdefinierte Revisionseigenschaften mittels log nicht" -#: ../libsvn_subr/config_file.c:628 +#: ../libsvn_ra_serf/merge.c:206 #, c-format -msgid "line %d: Option expected" -msgstr "Zeile %d: Option erwartet" +msgid "A MERGE response for '%s' is not a child of the destination ('%s')" +msgstr "Eine MERGE-Antwort für »%s« ist kein Kind des Ziels (»%s«)" -#: ../libsvn_subr/config_win.c:93 -msgid "Can't determine the system config path" -msgstr "Kann Pfad für die Systemeinstellungen nicht ermitteln" +#: ../libsvn_ra_serf/merge.c:461 +msgid "The MERGE response did not include a new revision" +msgstr "Die MERGE-Antwort enthielt keine neue Revision" -#: ../libsvn_subr/config_win.c:94 -msgid "Can't determine the user's config path" -msgstr "Kann Pfad für die Benutzereinstellungen nicht ermitteln" +#: ../libsvn_ra_serf/multistatus.c:226 ../libsvn_ra_serf/multistatus.c:231 +#, c-format +msgid "Malformed DAV:status '%s'" +msgstr "Fehlerhaftes Format in »DAV:status«: »%s«" -#: ../libsvn_subr/config_win.c:137 -msgid "Can't enumerate registry values" -msgstr "Kann Werte in der Registrierungsdatenbank nicht aufzählen" +#: ../libsvn_ra_serf/multistatus.c:534 +#, c-format +msgid "Property operation on '%s' failed" +msgstr "Operation auf Eigenschaft von »%s« fehlgeschlagen" -#: ../libsvn_subr/config_win.c:154 -msgid "Can't read registry value data" -msgstr "Kann Daten für Werte in der Registrierungsdatenbank nicht lesen" +#: ../libsvn_ra_serf/multistatus.c:553 +msgid "" +msgstr "" -#: ../libsvn_subr/config_win.c:191 +#: ../libsvn_ra_serf/multistatus.c:562 #, c-format -msgid "Unrecognised registry path '%s'" -msgstr "Unbekannter Pfad in Registrierungsdatenbank »%s«" +msgid "While handling the '%s' property on '%s':" +msgstr "Während der Abwicklung der Eigenschaft »%s« von »%s«:" -#: ../libsvn_subr/config_win.c:208 +#: ../libsvn_ra_serf/multistatus.c:566 #, c-format -msgid "Can't open registry key '%s'" -msgstr "Kann Schlüssel »%s« in Registrierungsdatenbank nicht öffnen" +msgid "While handling the '%s' path:" +msgstr "Während der Abwicklung des Pfades »%s«:" -#: ../libsvn_subr/config_win.c:246 -msgid "Can't enumerate registry keys" -msgstr "Kann Schlüssel in der Registrierungsdatenbank nicht aufzählen" +#: ../libsvn_ra_serf/options.c:413 +#, c-format +msgid "The server at '%s' does not support the HTTP/DAV protocol" +msgstr "" -#: ../libsvn_subr/config_win.c:256 -msgid "Can't open existing subkey" -msgstr "Kann vorhandenen Unterschlüssel nicht öffnen" +#: ../libsvn_ra_serf/options.c:491 +msgid "The OPTIONS response did not include the youngest revision" +msgstr "Die OPTIONS-Antwort enthielt nicht die jüngste Revision" -#: ../libsvn_subr/crypto.c:93 +#: ../libsvn_ra_serf/options.c:532 +msgid "The OPTIONS response did not include the requested activity-collection-set value" +msgstr "Die OPTIONS-Antwort enthielt nicht den angeforderten Wert »activity-collection-set«" + +#: ../libsvn_ra_serf/options.c:574 +msgid "Location header not set on redirect response" +msgstr "Location-Kopfzeile in der Umleitungsantwort nicht gesetzt" + +#: ../libsvn_ra_serf/options.c:604 ../libsvn_ra_serf/util.c:1835 #, c-format -msgid "Failed to initialize cryptography subsystem" -msgstr "Konnte Kryptographie-Subsystem nicht initialisieren" +msgid "Repository moved permanently to '%s'" +msgstr "Das Projektarchiv wurde permanent nach »%s« verschoben" -#: ../libsvn_subr/crypto.c:108 +#: ../libsvn_ra_serf/options.c:605 ../libsvn_ra_serf/util.c:1836 #, c-format -msgid "code (%d), reason (\"%s\"), msg (\"%s\")" -msgstr "Code (%d), Ursache (\"%s\"), Meldung (\"%s\")" +msgid "Repository moved temporarily to '%s'" +msgstr "Das Projektarchiv wurde zeitweilig nach »%s« verschoben" -#: ../libsvn_subr/crypto.c:134 +#: ../libsvn_ra_serf/options.c:760 #, c-format -msgid "Fetching error from APR" -msgstr "Hole Fehler von APR" +msgid "Don't know how to handle '%s' for capability '%s'" +msgstr "Es ist unklar, wie mit »%s« für Eigenschaft »%s« verfahren werden soll" -#: ../libsvn_subr/crypto.c:154 +#: ../libsvn_ra_serf/options.c:784 #, c-format -msgid "Error obtaining random data" -msgstr "Fehler bei der Abfrage von Zufallsdaten" +msgid "Attempt to fetch capability '%s' resulted in '%s'" +msgstr "Der Versuch, die Eigenschaft »%s« abzufragen, führte zu »%s«" -#: ../libsvn_subr/crypto.c:224 -msgid "OpenSSL crypto driver error" -msgstr "Fehler im OpenSSL Kryptologietreiber" +#: ../libsvn_ra_serf/property.c:668 +msgid "The PROPFIND response did not include the requested baseline-collection value" +msgstr "Die PROPFIND-Antwort enthielt nicht den angeforderten Wert »baseline-collection«" -#: ../libsvn_subr/crypto.c:228 -msgid "Bad return value while loading crypto driver" -msgstr "Fehlerhafter Rückgabewert beim Laden des Kryptologietreibers" +#: ../libsvn_ra_serf/property.c:688 +msgid "The PROPFIND response did not include the requested version-name value" +msgstr "Die PROPFIND-Antwort enthielt nicht den angeforderten Wert »version-name«" -#: ../libsvn_subr/crypto.c:234 -msgid "Error creating OpenSSL crypto context" -msgstr "Fehler beim Erzeugen des OpenSSL Kryptologiekontextes" - -#: ../libsvn_subr/crypto.c:291 ../libsvn_subr/crypto.c:294 -#: ../libsvn_subr/crypto.c:419 ../libsvn_subr/crypto.c:422 -#: ../libsvn_subr/crypto.c:526 ../libsvn_subr/crypto.c:529 -#: ../libsvn_subr/crypto.c:641 ../libsvn_subr/crypto.c:644 -msgid "Error creating derived key" -msgstr "Fehler beim Erstellen des abgeleiteten Schlüssels" +#: ../libsvn_ra_serf/property.c:724 +msgid "The OPTIONS response did not include the requested checked-in value" +msgstr "Die OPTIONS-Antwort enthielt nicht den angeforderten Wert »checked-in«" -#: ../libsvn_subr/crypto.c:297 ../libsvn_subr/crypto.c:425 -#: ../libsvn_subr/crypto.c:532 ../libsvn_subr/crypto.c:647 -msgid "Unexpected IV length returned" -msgstr "Unerwartete Länge des Initialisierungsvektors erhalten" +#: ../libsvn_ra_serf/property.c:896 +msgid "The PROPFIND response did not include the requested 'DAV:' properties" +msgstr "Die PROPFIND-Antwort enthielt nicht die angeforderten »DAV:«-Eigenschaften" -#: ../libsvn_subr/crypto.c:308 ../libsvn_subr/crypto.c:543 -msgid "Error initializing block encryption" -msgstr "Fehler bei der Initialisierung der Blockverschlüsselung" +#: ../libsvn_ra_serf/replay.c:468 +msgid "Error writing stream: unexpected EOF" +msgstr "Fehler beim Schreiben in Datenstrom: unerwartetes EOF" -#: ../libsvn_subr/crypto.c:347 ../libsvn_subr/crypto.c:444 -#: ../libsvn_subr/crypto.c:565 ../libsvn_subr/crypto.c:666 -msgid "Error fetching result length" -msgstr "Fehler beim Lesen der Länge des Ergebisses" +#: ../libsvn_ra_serf/sb_bucket.c:65 +msgid "Failed to read the request" +msgstr "Konnte die Anfrage nicht lesen" -#: ../libsvn_subr/crypto.c:360 ../libsvn_subr/crypto.c:578 -msgid "Error during block encryption" -msgstr "Fehler bei der Verschlüsselung eines Blocks" +#: ../libsvn_ra_serf/serf.c:63 +msgid "Module for accessing a repository via WebDAV protocol using serf." +msgstr "Modul zum Zugriff auf ein Projektarchiv über das Protokoll WebDAV mittels serf." -#: ../libsvn_subr/crypto.c:372 ../libsvn_subr/crypto.c:590 -msgid "Error finalizing block encryption" -msgstr "Fehler beim Abschließen der Blockverschlüsselung" +#: ../libsvn_ra_serf/serf.c:66 +#, fuzzy, c-format +msgid "" +"Module for accessing a repository via WebDAV protocol using serf.\n" +" - using serf %d.%d.%d (compiled with %d.%d.%d)" +msgstr "" +"Modul zum Zugriff auf ein Projektarchiv über das Protokoll WebDAV mittels serf.\n" +" - verwendet serf %d.%d.%d" -#: ../libsvn_subr/crypto.c:428 ../libsvn_subr/crypto.c:650 -msgid "Provided IV has incorrect length" -msgstr "Angegebener Initialisierungsvektor hat eine falsche Länge" +# password store: kwallet, ... +#: ../libsvn_ra_serf/serf.c:135 +#, c-format +msgid "Invalid config: unknown %s '%s'" +msgstr "Ungültige Konfiguration: Unbekanntes %s »%s«" -#: ../libsvn_subr/crypto.c:436 ../libsvn_subr/crypto.c:658 -msgid "Error initializing block decryption" -msgstr "Fehler bei der Initialisierung des Blockentschlüsselung" +# password store: kwallet, ... +#: ../libsvn_ra_serf/serf.c:370 +#, fuzzy, c-format +msgid "invalid config: bad value for '%s' option" +msgstr "Ungültige Konfiguration: Unbekanntes %s »%s«" -#: ../libsvn_subr/crypto.c:455 ../libsvn_subr/crypto.c:677 -msgid "Error during block decryption" -msgstr "Fehler bei der Entschlüsselung eines Blocks" +#: ../libsvn_ra_serf/serf.c:383 +msgid "Invalid URL: illegal character in proxy port number" +msgstr "Ungültige URL: Illegales Zeichen in Proxy Portnummer" -#: ../libsvn_subr/crypto.c:464 ../libsvn_subr/crypto.c:686 -msgid "Error finalizing block decryption" -msgstr "Fehler beim Abschließen der Blockentschlüsselung" +#: ../libsvn_ra_serf/serf.c:387 +msgid "Invalid URL: negative proxy port number" +msgstr "Ungültige URL: Negative Proxy Portnummer" -#: ../libsvn_subr/date.c:307 -#, c-format -msgid "Can't manipulate current date" -msgstr "Kann das aktuelle Datum nicht manipulieren" +#: ../libsvn_ra_serf/serf.c:390 +msgid "Invalid URL: proxy port number greater than maximum TCP port number 65535" +msgstr "Ungültige URL: Proxy Portnummer ist größer als die maximale TCP Portnummer 65535" -#: ../libsvn_subr/date.c:381 ../libsvn_subr/date.c:389 +#: ../libsvn_ra_serf/serf.c:410 #, c-format -msgid "Can't calculate requested date" -msgstr "Kann die das angeforderte Datum nicht berechnen" +msgid "Could not resolve proxy server '%s'" +msgstr "Konnte Proxy-Server »%s« nicht auflösen" -#: ../libsvn_subr/date.c:384 +#: ../libsvn_ra_serf/serf.c:607 #, c-format -msgid "Can't expand time" -msgstr "Kann Zeitangabe nicht expandieren" - -#: ../libsvn_subr/deprecated.c:364 ../libsvn_subr/opt.c:302 -msgid "" -"\n" -"Valid options:\n" -msgstr "" -"\n" -"Gültige Optionen:\n" +msgid "Connection to '%s' failed" +msgstr "Verbindung zu »%s« fehlgeschlagen" -#: ../libsvn_subr/deprecated.c:440 ../libsvn_subr/opt.c:417 -#, c-format -msgid "" -"\"%s\": unknown command.\n" -"\n" -msgstr "" -"»%s«: unbekannter Befehl.\n" -"\n" +#: ../libsvn_ra_serf/serf.c:1016 +msgid "The UUID property was not found on the resource or any of its parents" +msgstr "Die UUID-Eigenschaft wurde weder auf der Ressource noch ihren Eltern gefunden." -#: ../libsvn_subr/deprecated.c:618 ../libsvn_subr/opt.c:1232 -#: ../svnrdump/svnrdump.c:615 +#: ../libsvn_ra_serf/serf.c:1095 #, c-format -msgid "Type '%s help' for usage.\n" -msgstr "Geben Sie »%s help« für weitere Hilfe ein.\n" +msgid "Unsupported RA loader version (%d) for ra_serf" +msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_serf" -#: ../libsvn_subr/deprecated.c:1026 +#: ../libsvn_ra_serf/serf.c:1109 #, c-format -msgid "'%s' is neither a file nor a directory name" -msgstr "»%s« ist weder ein Datei- noch ein Verzeichnisname" +msgid "ra_serf was compiled for serf %d.%d.%d but loaded an incompatible %d.%d.%d library" +msgstr "ra_serv wurde für serf %d.%d.%d übersetzt, lud aber die nicht kompatible Version %d.%d.%d der Bibliothek" -#: ../libsvn_subr/dirent_uri.c:1628 -#, c-format -msgid "Couldn't determine absolute path of '%s'" -msgstr "Konnte den absoluten Pfad von »%s« nicht ermitteln" +#: ../libsvn_ra_serf/stat.c:106 +msgid "The PROPFIND response did not include the requested resourcetype value" +msgstr "Die PROPFIND-Antwort enthielt nicht den angeforderten Wert »resourcetype«" -#: ../libsvn_subr/dirent_uri.c:2342 -#, c-format -msgid "Local URL '%s' does not contain 'file://' prefix" -msgstr "Lokale URL »%s« enthält keinen »file://« Präfix" +#: ../libsvn_ra_serf/stat.c:357 ../libsvn_ra_serf/stat.c:395 +msgid "Can't get properties of non-directory" +msgstr "Kann keine Eigenschaften eines nicht-Verzeichnises lesen" -#: ../libsvn_subr/dirent_uri.c:2421 +#: ../libsvn_ra_serf/update.c:992 ../libsvn_ra_serf/update.c:998 #, c-format -msgid "Local URL '%s' contains only a hostname, no path" -msgstr "Lokale URL »%s« enthält nur einen Rechnernamen aber keinen Pfad" +msgid "GET request returned unexpected delta base: %s" +msgstr "GET-Anfrage gab eine nicht erwartete Delta-Basis zurück: %s" -#: ../libsvn_subr/dirent_uri.c:2435 +#: ../libsvn_ra_serf/update.c:1555 ../libsvn_ra_serf/update.c:1605 #, c-format -msgid "Local URL '%s' contains unsupported hostname" -msgstr "Lokale URL »%s« enthält einen nicht unterstützten Rechnernamen" - -#: ../libsvn_subr/error.c:634 -msgid "Can't recode error string from APR" -msgstr "Kann Fehlermeldung von APR nicht umkodieren" +msgid "Missing '%s' attribute" +msgstr "Fehlendes Attribut »%s«" -#: ../libsvn_subr/error.c:727 -#, c-format -msgid "%swarning: W%06d: %s\n" -msgstr "%sWarnung: W%06d: %s\n" +#: ../libsvn_ra_serf/update.c:1819 ../libsvn_ra_serf/update.c:1849 +msgid "The REPORT response did not include the requested checked-in value" +msgstr "Die REPORT-Antwort enthielt nicht den angeforderten Wert »checked-in«" -#: ../libsvn_subr/error.c:833 -#, c-format -msgid "In file '%s' line %d: assertion failed (%s)" -msgstr "In Datei »%s«, Zeile %d: Assert-Anweisung schlug fehl (%s)" +#: ../libsvn_ra_serf/update.c:2459 +msgid "Missing update-report close tag" +msgstr "Abschließendes Tag »update-report« fehlt" -#: ../libsvn_subr/error.c:837 -#, c-format -msgid "In file '%s' line %d: internal malfunction" -msgstr "In Datei »%s«, Zeile %d: interne Fehlfunktion" +#: ../libsvn_ra_serf/util.c:197 +msgid ": " +msgstr ": " -#: ../libsvn_subr/error.c:899 -msgid "stream error" -msgstr "Datenstromfehler" +#: ../libsvn_ra_serf/util.c:199 +msgid ", " +msgstr ", " -#: ../libsvn_subr/error.c:904 -msgid "out of memory" -msgstr "Nicht genügend Speicher" +#: ../libsvn_ra_serf/util.c:409 +msgid "Server SSL certificate verification failed" +msgstr "Überprüfung des Server-SSL-Zertifikats fehlgeschlagen" -#: ../libsvn_subr/error.c:909 -msgid "buffer error" -msgstr "Pufferfehler" +#: ../libsvn_ra_serf/util.c:414 +msgid "certificate is not yet valid" +msgstr "Das Zertifikat ist noch nicht gültig" -#: ../libsvn_subr/error.c:914 -msgid "version error" -msgstr "Versionsfehler" +#: ../libsvn_ra_serf/util.c:417 +msgid "certificate has expired" +msgstr "Das Zertifikat ist abgelaufen" -#: ../libsvn_subr/error.c:919 -msgid "corrupt data" -msgstr "Fehlerhafte Daten" +#: ../libsvn_ra_serf/util.c:421 +msgid "certificate issued for a different hostname" +msgstr "Zertifikat wurde für einen anderen Hostnamen ausgestellt" -# FIXME: Grammar depends on usage!!!!!!! (prepanded by "bei") -#: ../libsvn_subr/error.c:924 -msgid "unknown error" -msgstr "Unbekannter Fehler" +#: ../libsvn_ra_serf/util.c:425 +msgid "issuer is not trusted" +msgstr "Herausgeber wird nicht vertraut" -#: ../libsvn_subr/gpg_agent.c:409 ../libsvn_subr/prompt.c:627 -#, c-format -msgid "Password for '%s': " -msgstr "Passwort für »%s«: " +#: ../libsvn_ra_serf/util.c:428 +msgid "and other reason(s)" +msgstr "und weitere Gründe" -#: ../libsvn_subr/gpg_agent.c:410 +#: ../libsvn_ra_serf/util.c:475 #, c-format -msgid "Enter your Subversion password for %s" -msgstr "Geben Sie Ihr Subversion-Passwort für %s ein" +msgid "Invalid config: unable to load certificate file '%s'" +msgstr "Ungültige Konfiguration: Zertifikatsdatei »%s« kann nicht geladen werden" -#: ../libsvn_subr/hash.c:129 -msgid "Serialized hash missing terminator" -msgstr "Serialisierte Prüfsumme hat kein Endzeichen" +#: ../libsvn_ra_serf/util.c:955 ../libsvn_ra_serf/util.c:958 +msgid "Error running context" +msgstr "Fehler beim Ausführen des Kontextes" -#: ../libsvn_subr/hash.c:138 ../libsvn_subr/hash.c:151 -#: ../libsvn_subr/hash.c:163 ../libsvn_subr/hash.c:175 -#: ../libsvn_subr/hash.c:179 ../libsvn_subr/hash.c:189 -#: ../libsvn_subr/hash.c:202 ../libsvn_subr/hash.c:211 -msgid "Serialized hash malformed" -msgstr "Fehlerhafte serialisierte Prüfsumme" +#: ../libsvn_ra_serf/util.c:1230 +msgid "" +"No more credentials or we tried too many times.\n" +"Authentication failed" +msgstr "" +"Keine weiteren Zugangsdaten oder zu viele Versuche.\n" +"Anmeldung fehlgeschlagen" -#: ../libsvn_subr/hash.c:285 -msgid "Cannot serialize negative length" -msgstr "Kann negative Länge nicht serialisieren" +#: ../libsvn_ra_serf/util.c:1252 +msgid "Proxy authentication failed" +msgstr "Proxy-Anmeldung schlug fehl" -#: ../libsvn_subr/io.c:331 +#: ../libsvn_ra_serf/util.c:1307 #, c-format -msgid "Can't check path '%s'" -msgstr "Kann Pfad »%s« nicht prüfen" +msgid "%s request on '%s' failed" +msgstr "%s-Anfrage auf »%s« schlug fehl" -#: ../libsvn_subr/io.c:578 ../libsvn_subr/io.c:4958 +#: ../libsvn_ra_serf/util.c:1383 #, c-format -msgid "Can't open '%s'" -msgstr "Kann »%s« nicht öffnen" +msgid "Premature EOF seen from server (http status=%d)" +msgstr "Vorzeitiges EOF vom Server (http Status=%d)" -#: ../libsvn_subr/io.c:604 ../libsvn_subr/io.c:690 -#, c-format -msgid "Unable to make name for '%s'" -msgstr "Kann Namen für »%s« nicht erstellen" +#: ../libsvn_ra_serf/util.c:1734 +msgid "The PROPFIND response did not include the requested version-controlled-configuration value" +msgstr "Die PROPFIND-Antwort enthielt nicht den angeforderten Wert »version-controlled-configuration«" -#: ../libsvn_subr/io.c:677 +#: ../libsvn_ra_serf/util.c:1840 #, c-format -msgid "Can't create symbolic link '%s'" -msgstr "Kann symbolischen Link »%s« nicht anlegen" - -#: ../libsvn_subr/io.c:694 ../libsvn_subr/io.c:729 ../libsvn_subr/io.c:757 -#: ../libsvn_subr/io.c:1935 -msgid "Symbolic links are not supported on this platform" -msgstr "Symbolische Verweise werden auf dieser Plattform nicht unterstützt" +msgid "Access to '%s' forbidden" +msgstr "Zugriff auf »%s« verboten" -#: ../libsvn_subr/io.c:717 ../libsvn_subr/io.c:1894 ../libsvn_subr/io.c:1914 +#: ../libsvn_ra_serf/util.c:1847 #, c-format -msgid "Can't read contents of link" -msgstr "Kann Inhalt des Verweises nicht lesen" +msgid "HTTP method is not allowed on '%s'" +msgstr "HTTP-Methode ist auf »%s« nicht erlaubt" -#: ../libsvn_subr/io.c:777 +#: ../libsvn_ra_serf/util.c:1851 #, c-format -msgid "Can't find a temporary directory" -msgstr "Kann temporäres Verzeichnis nicht finden" +msgid "'%s' conflicts" +msgstr "»%s« ist von einem Konflikt betroffen" -#: ../libsvn_subr/io.c:895 +#: ../libsvn_ra_serf/util.c:1854 #, c-format -msgid "Can't copy '%s' to '%s'" -msgstr "Kann »%s« nicht nach »%s« kopieren" +msgid "Precondition on '%s' failed" +msgstr "Vorbedingung von »%s« fehlgeschlagen" -#: ../libsvn_subr/io.c:938 ../libsvn_subr/io.c:960 ../libsvn_subr/io.c:1006 -#: ../libsvn_subr/io.c:5090 +#: ../libsvn_ra_serf/util.c:1857 #, c-format -msgid "Can't set permissions on '%s'" -msgstr "Kann Berechtigungen auf »%s« nicht setzen" +msgid "'%s': no lock token available" +msgstr "»%s«: Keine Sperrmarke verfügbar" -#: ../libsvn_subr/io.c:956 ../libsvn_subr/io.c:2159 ../libsvn_subr/io.c:2218 -#: ../libsvn_subr/io.c:4996 +#: ../libsvn_ra_serf/util.c:1861 #, c-format -msgid "Can't get file name" -msgstr "Kann keinen Dateinamen holen" +msgid "DAV request failed: 411 Content length required. The server or an intermediate proxy does not accept chunked encoding. Try setting 'http-chunked-requests' to 'auto' or 'no' in your client configuration." +msgstr "DAV-Anfrage fehlgeschlagen: 411 Angabe zur Länge des Inhalts erforderlich. Der Server oder ein dazwischengeschalteter Proxy-Server akzeptiert Kodierung in Teilstücken nicht. Versuchen Sie »http-chunked-requests« auf »auto« oder »no« in der Konfiguration des Clients." -#: ../libsvn_subr/io.c:1029 +#: ../libsvn_ra_serf/util.c:1867 #, c-format -msgid "Can't append '%s' to '%s'" -msgstr "Kann »%s« nicht an »%s« anhängen" +msgid "Unexpected server error %d '%s' on '%s'" +msgstr "Unerwarteter Serverfehler %d »%s« auf »%s«" -#: ../libsvn_subr/io.c:1075 +#: ../libsvn_ra_serf/util.c:1871 #, c-format -msgid "Destination '%s' already exists" -msgstr "Ziel »%s« existiert bereits" +msgid "The requested feature is not supported by '%s'" +msgstr "Die angeforderte Funktion wird von »%s« nicht unterstützt" -#: ../libsvn_subr/io.c:1184 +#: ../libsvn_ra_serf/util.c:1877 #, c-format -msgid "Can't make directory '%s'" -msgstr "Kann Verzeichnis »%s« nicht anlegen" +msgid "Unexpected HTTP status %d '%s' on '%s'" +msgstr "Unerwarteter HTTP-Status %d »%s« auf »%s«" -#: ../libsvn_subr/io.c:1288 +#: ../libsvn_ra_serf/util.c:1896 #, c-format -msgid "Can't set access time of '%s'" -msgstr "Kann Zugriffszeit von »%s« nicht setzen" +msgid "Path '%s' unexpectedly created" +msgstr "Pfad »%s« wurde unerwartet erstellt" -#: ../libsvn_subr/io.c:1618 ../libsvn_subr/io.c:1720 +#: ../libsvn_ra_serf/util.c:1905 #, c-format -msgid "Can't change perms of file '%s'" -msgstr "Kann die Zugriffsrechte der Datei »%s« nicht ändern" +msgid "The HTTP method '%s' is not allowed on '%s'" +msgstr "Die HTTP-Methode »%s« ist auf »%s« nicht erlaubt" -#: ../libsvn_subr/io.c:1848 +#: ../libsvn_ra_serf/util.c:1910 #, c-format -msgid "Can't get attributes of file '%s'" -msgstr "Kann Attributinformationen der Datei »%s« nicht lesen" +msgid "Unexpected HTTP status %d '%s' on '%s' request to '%s'" +msgstr "Unerwarteter HTTP-Status %d »%s« auf »%s« bei Anfrage an »%s«" -#: ../libsvn_subr/io.c:1856 +#: ../libsvn_ra_serf/util.c:2013 #, c-format -msgid "Can't set attributes of file '%s'" -msgstr "Kann Attributinformationen der Datei »%s« nicht setzen" +msgid "Illegal URL '%s'" +msgstr "Ungültige URL »%s«" -#: ../libsvn_subr/io.c:1978 +#: ../libsvn_ra_serf/xml.c:483 #, c-format -msgid "Can't set file '%s' read-only" -msgstr "Kann den Schreibschutz der Datei »%s« nicht setzen" +msgid "XML stream truncated: closing '%s' missing" +msgstr "XML-Strom abgeschnitten: Abschließendes »%s« fehlt" -#: ../libsvn_subr/io.c:2010 -#, c-format -msgid "Can't set file '%s' read-write" -msgstr "Kann den Schreibschutz der Datei »%s« nicht aufheben" +#: ../libsvn_ra_serf/xml.c:511 +msgid "document element not found" +msgstr "Dokumenten-Element nicht gefunden" -#: ../libsvn_subr/io.c:2049 ../libsvn_subr/io.c:2083 +#: ../libsvn_ra_serf/xml.c:514 #, c-format -msgid "Error getting UID of process" -msgstr "Fehler beim Ermitteln der Prozess-UID" +msgid "XML stream truncated: %s" +msgstr "XML-Strom abgeschnitten: %s" -#: ../libsvn_subr/io.c:2185 +#: ../libsvn_ra_serf/xml.c:679 #, c-format -msgid "Can't get shared lock on file '%s'" -msgstr "Kann keine gemeinsame Sperre für Datei »%s« erhalten" +msgid "XML Parsing failed: Unexpected root element '%s'" +msgstr "XML-Parser schlug fehl: Nicht erwartetes Wurzelelement »%s«" -#: ../libsvn_subr/io.c:2223 +#: ../libsvn_ra_serf/xml.c:739 #, c-format -msgid "Can't unlock file '%s'" -msgstr "Kann Datei »%s« nicht entsprerren" +msgid "Missing XML attribute '%s' on '%s' element" +msgstr "Fehlendes XML-Attribut: »%s« in Element »%s«" -#: ../libsvn_subr/io.c:2321 ../libsvn_subr/io.c:2342 +#: ../libsvn_ra_serf/xml.c:878 +msgid "The XML response contains invalid XML" +msgstr "Die XML-Antwort enthält ungültiges XML" + +#: ../libsvn_ra_svn/client.c:144 #, c-format -msgid "Can't flush file to disk" -msgstr "Kann Datei nicht auf Festplatte leeren" +msgid "Unknown hostname '%s'" +msgstr "Unbekannter Hostname »%s«" -#: ../libsvn_subr/io.c:2432 ../libsvn_subr/prompt.c:197 +#: ../libsvn_ra_svn/client.c:169 #, c-format -msgid "Can't open stdin" -msgstr "Kann Standardeingabe nicht öffnen" +msgid "Can't connect to host '%s'" +msgstr "Kann nicht mit Host »%s« verbinden" -#: ../libsvn_subr/io.c:2452 -msgid "Reading from stdin is disallowed" -msgstr "Lesen von der Standardeingabe ist nicht erlaubt" +#: ../libsvn_ra_svn/client.c:207 +msgid "Prop diffs element not a list" +msgstr "Eigenschafts-Diff Element ist keine Liste" -#: ../libsvn_subr/io.c:2521 +#: ../libsvn_ra_svn/client.c:407 #, c-format -msgid "Can't remove file '%s'" -msgstr "Kann Datei »%s« nicht löschen" +msgid "Undefined tunnel scheme '%s'" +msgstr "Undefiniertes Tunnelschema »%s«" -#: ../libsvn_subr/io.c:2608 +#: ../libsvn_ra_svn/client.c:424 #, c-format -msgid "Can't remove '%s'" -msgstr "Kann »%s« nicht löschen" +msgid "Tunnel scheme %s requires environment variable %s to be defined" +msgstr "Für Tunnelschema %s muss die Umgebungsvariable %s definiert sein" -#: ../libsvn_subr/io.c:2771 +#: ../libsvn_ra_svn/client.c:435 #, c-format -msgid "Path '%s' not found, case obstructed by '%s'" -msgstr "Pfad »%s« nicht gefunden, Groß- und Kleinschreibung durch »%s« blockiert" +msgid "Can't tokenize command '%s'" +msgstr "Kann Anweisung »%s« nicht zerlegen" -#: ../libsvn_subr/io.c:2810 +#: ../libsvn_ra_svn/client.c:478 #, c-format -msgid "Path '%s' not found" -msgstr "Pfad »%s« nicht gefunden" +msgid "Error in child process: %s" +msgstr "Fehler in Kindprozess: %s" -#: ../libsvn_subr/io.c:2884 -#, c-format -msgid "Can't create process '%s' attributes" -msgstr "Kann Attribute von Prozess »%s« nicht erzeugen" +#: ../libsvn_ra_svn/client.c:557 +msgid "To better debug SSH connection problems, remove the -q option from 'ssh' in the [tunnels] section of your Subversion configuration file." +msgstr "Um Probleme mit der Konfiguration von SSH zu untersuchen, entfernen Sie die Option »-q« von »ssh« im Abschnitt »[tunnels]« Ihrer Konfigurationsdatei für Subversion." -#: ../libsvn_subr/io.c:2891 +#: ../libsvn_ra_svn/client.c:575 #, c-format -msgid "Can't set process '%s' cmdtype" -msgstr "Kann Kommandotyp von Prozess »%s« nicht setzen " +msgid "Illegal svn repository URL '%s'" +msgstr "Illegale svn Projektarchiv URL »%s«" -#: ../libsvn_subr/io.c:2907 +#: ../libsvn_ra_svn/client.c:732 #, c-format -msgid "Can't set process '%s' directory" -msgstr "Kann Verzeichnis von Prozess »%s« nicht setzen" +msgid "Server requires minimum version %d" +msgstr "Server erfordert mindestens Version %d" -#: ../libsvn_subr/io.c:2921 +#: ../libsvn_ra_svn/client.c:736 #, c-format -msgid "Can't set process '%s' child input" -msgstr "Kann Eingabe des Kindprozesses »%s« nicht setzen" +msgid "Server only supports versions up to %d" +msgstr "Server unterstützt nur Versionen bis zu %d" -#: ../libsvn_subr/io.c:2929 -#, c-format -msgid "Can't set process '%s' child outfile" -msgstr "Kann Ausgabe des Kindprozesses »%s« nicht setzen" +#: ../libsvn_ra_svn/client.c:744 +msgid "Server does not support edit pipelining" +msgstr "Server unterstützt »edit pipelining« nicht" -# FIXME: Laut Code ist %s der Kindprozess. Müsste es dann nicht -# "Can't set child process '%s' errfile" (oder ganz ohne child) heißen? -# (Es gibt kein child von %s) -#: ../libsvn_subr/io.c:2937 -#, c-format -msgid "Can't set process '%s' child errfile" -msgstr "Kann Fehlerausgabe des Kindprozesses »%s« nicht setzen" +#: ../libsvn_ra_svn/client.c:782 +msgid "Impossibly long repository root from server" +msgstr "Unmöglich lange Projektarchivbasis vom Server" -#: ../libsvn_subr/io.c:2951 -#, c-format -msgid "Can't set process '%s' stdio pipes" -msgstr "Kann Standard-IO-Datenströme des Prozesses »%s« nicht setzen " +#: ../libsvn_ra_svn/client.c:794 +msgid "" +"Module for accessing a repository using the svn network protocol.\n" +" - with Cyrus SASL authentication" +msgstr "" +"Modul zum Zugriff auf ein Projektarchiv über das svn-Netzwerkprotokoll.\n" +" - mit Cyrus-SASL-Authentifizierung" -#: ../libsvn_subr/io.c:2959 -#, c-format -msgid "Can't set process '%s' child errfile for error handler" -msgstr "Kann Datei für die Fehlerbehandlung des Kindprozesses »%s« nicht setzen" +#: ../libsvn_ra_svn/client.c:798 +msgid "Module for accessing a repository using the svn network protocol." +msgstr "Modul zum Zugriff auf ein Projektarchiv über das svn-Netzwerkprotokoll" -#: ../libsvn_subr/io.c:2966 -#, c-format -msgid "Can't set process '%s' error handler" -msgstr "Kann die Fehlerbehandlung des Prozesses »%s« nicht setzen" +#: ../libsvn_ra_svn/client.c:880 +#, fuzzy, c-format +msgid "Invalid host '%s'" +msgstr "Ungültiger Port »%s«" -#: ../libsvn_subr/io.c:2989 -#, c-format -msgid "Can't start process '%s'" -msgstr "Kann Prozess »%s« nicht starten" +#: ../libsvn_ra_svn/client.c:1209 +msgid "Server did not send repository root" +msgstr "Server gab keine Projektarchivbasis zurück" -#: ../libsvn_subr/io.c:3013 +#: ../libsvn_ra_svn/client.c:1285 #, c-format -msgid "Error waiting for process '%s'" -msgstr "Fehler beim Warten auf Prozess »%s«" +msgid "ra_svn does not support not specifying a log message with pre-1.5 servers; consider passing an empty one, or upgrading the server" +msgstr "ra_svn unterstützt die Angabe einer Logmeldung mit Servern älter als 1.5 nicht; Versuchen Sie, eine leere Logmeldung zu übergeben oder verwenden Sie eine neuere Version auf dem Server" -# CHECKME: Isn't "exitwhy" an internal detail? -#: ../libsvn_subr/io.c:3022 -#, c-format -msgid "Process '%s' failed (signal %d, core dumped)" -msgstr "Prozess »%s« schlug fehl (Signal %d, Core-Dump)" +#: ../libsvn_ra_svn/client.c:1308 +msgid "Server doesn't support setting arbitrary revision properties during commit" +msgstr "Der Server unterstützt das Setzen beliebiger Revisionseigenschaften während eines Commits nicht" -# CHECKME: Isn't "exitwhy" an internal detail? -#: ../libsvn_subr/io.c:3027 -#, c-format -msgid "Process '%s' failed (signal %d)" -msgstr "Prozess »%s« schlug fehl (Signal %d)" +#: ../libsvn_ra_svn/client.c:1410 +msgid "Inherited proplist element not a list" +msgstr "Element für geerbte Eigenschaften ist keine Liste" -# CHECKME: Isn't "exitwhy" an internal detail? -#: ../libsvn_subr/io.c:3033 -#, c-format -msgid "Process '%s' failed (exitwhy %d, exitcode %d)" -msgstr "Prozess »%s« schlug fehl (Exit-Grund %d, Exit-Code %d)" +#: ../libsvn_ra_svn/client.c:1484 +msgid "Non-string as part of file contents" +msgstr "Ein Teil des Dateiinhaltes ist keine Zeichenkette" -#: ../libsvn_subr/io.c:3041 -#, c-format -msgid "Process '%s' returned error exitcode %d" -msgstr "Prozess »%s« hat Fehlerwert %d zurückgegeben" +#: ../libsvn_ra_svn/client.c:1592 +msgid "Dirlist element not a list" +msgstr "Verzeichniseintrag ist keine Liste" -#: ../libsvn_subr/io.c:3148 +#: ../libsvn_ra_svn/client.c:1601 #, c-format -msgid "'%s' returned %d" -msgstr "»%s« hat %d zurückgegeben" +msgid "Invalid directory entry name '%s'" +msgstr "Ungültiger Name für Verzeichniseintrag »%s«" -#: ../libsvn_subr/io.c:3269 -#, c-format -msgid "" -"Error running '%s': exitcode was %d, args were:\n" -"in directory '%s', basenames:\n" -"%s\n" -"%s\n" -"%s" -msgstr "" -"Fehler beim Ausführen von »%s«: Rückgabewert: %d, Parameter:\n" -"in Verzeichnis »%s«, Basisnamen:\n" -"%s\n" -"%s\n" -"%s" +#: ../libsvn_ra_svn/client.c:1686 +msgid "Mergeinfo element is not a list" +msgstr "Zusammenführungsinfo-Element ist keine Liste" -#: ../libsvn_subr/io.c:3410 -#, c-format -msgid "Can't detect MIME type of non-file '%s'" -msgstr "Kann MIME Typ der nicht-Datei »%s« nicht ermitteln" +#: ../libsvn_ra_svn/client.c:1934 +msgid "Log entry not a list" +msgstr "Logeintrag ist keine Liste" -#: ../libsvn_subr/io.c:3505 -#, c-format -msgid "Can't open file '%s'" -msgstr "Kann Datei »%s« nicht öffnen" +#: ../libsvn_ra_svn/client.c:1981 +msgid "Changed-path entry not a list" +msgstr "Eintrag für geänderte Pfade ist keine Liste" -#: ../libsvn_subr/io.c:3545 -#, c-format -msgid "Can't close file '%s'" -msgstr "Kann Datei »%s« nicht schließen" +#: ../libsvn_ra_svn/client.c:2148 +msgid "'stat' not implemented" +msgstr "»stat« nicht implementiert" -#: ../libsvn_subr/io.c:3546 -#, c-format -msgid "Can't close stream" -msgstr "Kann Datenstrom nicht schließen" +#: ../libsvn_ra_svn/client.c:2210 +msgid "'get-locations' not implemented" +msgstr "»get-locations« nicht implementiert" -#: ../libsvn_subr/io.c:3555 ../libsvn_subr/io.c:3591 ../libsvn_subr/io.c:3616 -#: ../libsvn_subr/io.c:3706 -#, c-format -msgid "Can't read file '%s'" -msgstr "Kann Datei »%s« nicht lesen" +#: ../libsvn_ra_svn/client.c:2227 +msgid "Location entry not a list" +msgstr "Ortseintrag ist keine Liste" -#: ../libsvn_subr/io.c:3556 ../libsvn_subr/io.c:3592 ../libsvn_subr/io.c:3617 -#: ../libsvn_subr/io.c:3707 -#, c-format -msgid "Can't read stream" -msgstr "Kann nicht aus Datenstrom lesen" +#: ../libsvn_ra_svn/client.c:2271 +msgid "'get-location-segments' not implemented" +msgstr "»get-location-segments« nicht implementiert" -#: ../libsvn_subr/io.c:3565 -#, c-format -msgid "Can't write file '%s'" -msgstr "Kann Datei »%s« nicht schreiben" +#: ../libsvn_ra_svn/client.c:2288 +msgid "Location segment entry not a list" +msgstr "Ortssegmenteintrag ist keine Liste" -#: ../libsvn_subr/io.c:3566 -#, c-format -msgid "Can't write stream" -msgstr "Kann nicht in Datenstrom schreiben" +#: ../libsvn_ra_svn/client.c:2298 +msgid "Expected valid revision range" +msgstr "Erwartete einen gültigen Revisionsbereich" -#: ../libsvn_subr/io.c:3580 -#, c-format -msgid "Can't get attribute information from file '%s'" -msgstr "Kann keine Attributinformationen aus Datei »%s« lesen" +#: ../libsvn_ra_svn/client.c:2371 +msgid "'get-file-revs' not implemented" +msgstr "»get-file-revs« nicht implementiert" -#: ../libsvn_subr/io.c:3581 -#, c-format -msgid "Can't get attribute information from stream" -msgstr "Kann keine Attributinformationen aus Datenstrom lesen" +#: ../libsvn_ra_svn/client.c:2395 +msgid "Revision entry not a list" +msgstr "Revisionseintrag ist keine Liste" -#: ../libsvn_subr/io.c:3628 -#, c-format -msgid "Can't set position pointer in file '%s'" -msgstr "Kann Positionszeiger in Datei »%s« nicht setzen" +#: ../libsvn_ra_svn/client.c:2412 ../libsvn_ra_svn/client.c:2442 +msgid "Text delta chunk not a string" +msgstr "Text-Deltastück ist kein String" -#: ../libsvn_subr/io.c:3629 -#, c-format -msgid "Can't set position pointer in stream" -msgstr "Kann Positionszeiger in Datenstrom nicht setzen" +#: ../libsvn_ra_svn/client.c:2454 +msgid "The get-file-revs command didn't return any revisions" +msgstr "Der »get-file-revs« Befehl gab keine Revisionen zurück" -#: ../libsvn_subr/io.c:3716 -#, c-format -msgid "Can't seek in file '%s'" -msgstr "Kann Position in Datei »%s« nicht setzen" +#: ../libsvn_ra_svn/client.c:2501 +msgid "Server doesn't support the lock command" +msgstr "Server unterstützt das Kommando »lock« nicht" -#: ../libsvn_subr/io.c:3717 -#, c-format -msgid "Can't seek in stream" -msgstr "Kann Position im Datenstrom nicht setzen" +#: ../libsvn_ra_svn/client.c:2565 +msgid "Server doesn't support the unlock command" +msgstr "Server unterstützt das Kommando »unlock« nicht" -#: ../libsvn_subr/io.c:3734 ../libsvn_subr/io.c:3791 -#, c-format -msgid "Can't write to file '%s'" -msgstr "Kann nicht in Datei »%s« schreiben" +#: ../libsvn_ra_svn/client.c:2664 +msgid "Lock response not a list" +msgstr "Antwort beim Sperren ist keine Liste" -#: ../libsvn_subr/io.c:3735 ../libsvn_subr/io.c:3792 -#, c-format -msgid "Can't write to stream" -msgstr "Kann nicht in Datenstrom schreiben" +#: ../libsvn_ra_svn/client.c:2677 +msgid "Unknown status for lock command" +msgstr "Unbekannter Status für Sperrbefehl" -#: ../libsvn_subr/io.c:3745 ../libsvn_subr/io.c:3897 -#, c-format -msgid "Can't flush file '%s'" -msgstr "Kann Datei »%s« nicht leeren" +#: ../libsvn_ra_svn/client.c:2701 +msgid "Didn't receive end marker for lock responses" +msgstr "Keine Endemarke für Sperrantworten erhalten" -#: ../libsvn_subr/io.c:3746 ../libsvn_subr/io.c:3898 -#, c-format -msgid "Can't flush stream" -msgstr "Kann Datenstrom nicht leeren" +#: ../libsvn_ra_svn/client.c:2792 +msgid "Unlock response not a list" +msgstr "Antwort beim Entsperren ist keine Liste" -#: ../libsvn_subr/io.c:3866 -#, c-format -msgid "Can't write '%s' atomically" -msgstr "Kann »%s« nicht unteilbar schreiben" +#: ../libsvn_ra_svn/client.c:2805 +msgid "Unknown status for unlock command" +msgstr "Unbekannter Status für Entsperrbefehl" -#: ../libsvn_subr/io.c:3902 -#, c-format -msgid "Can't truncate file '%s'" -msgstr "Kann Datei »%s« nicht abschneiden" +#: ../libsvn_ra_svn/client.c:2828 +msgid "Didn't receive end marker for unlock responses" +msgstr "Keine Endemarke für Entsperrantworten erhalten" -#: ../libsvn_subr/io.c:3903 -#, c-format -msgid "Can't truncate stream" -msgstr "Kann Datenstrom nicht abschneiden" +#: ../libsvn_ra_svn/client.c:2853 ../libsvn_ra_svn/client.c:2906 +msgid "Server doesn't support the get-lock command" +msgstr "Server unterstützt das Kommando »get-lock« nicht" + +#: ../libsvn_ra_svn/client.c:2920 +msgid "Lock element not a list" +msgstr "Sperrelement ist keine Liste" + +#: ../libsvn_ra_svn/client.c:2966 +msgid "Server doesn't support the replay command" +msgstr "Server unterstützt das Kommando »replay« nicht" + +#: ../libsvn_ra_svn/client.c:3000 +msgid "Server doesn't support the replay-range command" +msgstr "Server unterstützt das Kommando »replay-range« nicht" -#: ../libsvn_subr/io.c:3976 +#: ../libsvn_ra_svn/client.c:3023 #, c-format -msgid "Can't read length line in file '%s'" -msgstr "Kann Längenzeile nicht aus Datei »%s« lesen" +msgid "Expected 'revprops', found '%s'" +msgstr "Erwartete »revprops«, fand »%s«" -#: ../libsvn_subr/io.c:3980 -msgid "Can't read length line in stream" -msgstr "Kann Längenzeile nicht aus Datenstrom lesen" +#: ../libsvn_ra_svn/client.c:3041 +msgid "Error while replaying commit" +msgstr "Fehler beim Wiederholen der Übertragung" + +#: ../libsvn_ra_svn/client.c:3117 +msgid "'get-deleted-rev' not implemented" +msgstr "»get-deleted-rev« nicht implementiert" -#: ../libsvn_subr/io.c:4002 +#: ../libsvn_ra_svn/client.c:3223 +#, fuzzy +msgid "List entry not a list" +msgstr "Logeintrag ist keine Liste" + +#: ../libsvn_ra_svn/client.c:3310 #, c-format -msgid "Can't stat '%s'" -msgstr "Kann Status von »%s« nicht ermitteln" +msgid "Unsupported RA loader version (%d) for ra_svn" +msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_svn" + +#: ../libsvn_ra_svn/cram.c:199 ../libsvn_ra_svn/cram.c:217 +#: ../libsvn_ra_svn/cyrus_auth.c:526 ../libsvn_ra_svn/cyrus_auth.c:582 +#: ../libsvn_ra_svn/internal_auth.c:66 +msgid "Unexpected server response to authentication" +msgstr "Unerwartete Serverantwort bei Anmeldung" -#: ../libsvn_subr/io.c:4037 ../libsvn_subr/stream.c:2265 +#: ../libsvn_ra_svn/cyrus_auth.c:225 #, c-format -msgid "Can't move '%s' to '%s'" -msgstr "Kann »%s« nicht nach »%s« verschieben" +msgid "SASL authentication error: %s%s" +msgstr "SASL-Anmeldefehler: %s%s" -#: ../libsvn_subr/io.c:4128 +#: ../libsvn_ra_svn/cyrus_auth.c:242 #, c-format -msgid "Can't create directory '%s'" -msgstr "Kann Verzeichnis »%s« nicht anlegen" +msgid "Could not initialized the SASL library: %s%s" +msgstr "Konnte die SASL-Bibliothek nicht initialisieren: %s%s" -#: ../libsvn_subr/io.c:4140 ../libsvn_subr/io.c:4154 +#: ../libsvn_ra_svn/cyrus_auth.c:415 #, c-format -msgid "Can't hide directory '%s'" -msgstr "Kann Verzeichnis »%s« nicht verstecken" +msgid "Could not create SASL context: %s%s" +msgstr "Konnte SASL-Kontext nicht erstellen: %s%s" -#: ../libsvn_subr/io.c:4215 ../libsvn_subr/io.c:4338 +#: ../libsvn_ra_svn/cyrus_auth.c:933 ../libsvn_ra_svn/internal_auth.c:63 +#: ../libsvn_ra_svn/internal_auth.c:114 #, c-format -msgid "Can't open directory '%s'" -msgstr "Kann Verzeichnis »%s« nicht öffnen" +msgid "Authentication error from server: %s" +msgstr "Anmeldefehler von Server: %s" + +#: ../libsvn_ra_svn/cyrus_auth.c:937 +msgid "Can't get username or password" +msgstr "Kann Benutzername oder Passwort nicht erhalten" + +#: ../libsvn_ra_svn/editorp.c:163 +msgid "Successful edit status returned too soon" +msgstr "Status für erfolgreiche Bearbeitung wurde zu früh zurückgegeben" + +#: ../libsvn_ra_svn/editorp.c:515 +msgid "Invalid file or dir token during edit" +msgstr "Ungültige Datei- oder Verzeichnismarke während der Bearbeitung" + +#: ../libsvn_ra_svn/editorp.c:779 +msgid "Apply-textdelta already active" +msgstr "Text-Delta Anwendung bereits aktiv" + +#: ../libsvn_ra_svn/editorp.c:802 ../libsvn_ra_svn/editorp.c:821 +msgid "Apply-textdelta not active" +msgstr "Text-Delta Anwendung nicht aktiv" -#: ../libsvn_subr/io.c:4250 +#: ../libsvn_ra_svn/editorp.c:930 #, c-format -msgid "Can't remove directory '%s'" -msgstr "Kann Verzeichnis »%s« nicht entfernen" +msgid "Command 'finish-replay' invalid outside of replays" +msgstr "Das Kommando »finish-replay« ist außerhalb von »replay«s ungültig" -#: ../libsvn_subr/io.c:4268 +#: ../libsvn_ra_svn/editorp.c:1130 ../libsvn_ra_svn/marshal.c:1967 #, c-format -msgid "Can't read directory" -msgstr "Kann Verzeichnis nicht lesen" +msgid "Unknown editor command '%s'" +msgstr "Unbekannter Editorbefehl »%s«" -#: ../libsvn_subr/io.c:4288 +#: ../libsvn_ra_svn/internal_auth.c:101 +msgid "Can't get password" +msgstr "Kein Passwort erhalten" + +#: ../libsvn_ra_svn/marshal.c:261 +msgid "Capability entry is not a word" +msgstr "Eigenschaftseintrag ist kein Wort" + +#: ../libsvn_ra_svn/marshal.c:1228 +msgid "String length larger than maximum" +msgstr "Stringlänge größer als Maximum" + +#: ../libsvn_ra_svn/marshal.c:1308 +msgid "Items are nested too deeply" +msgstr "Elemente sind zu tief verschachtelt" + +#: ../libsvn_ra_svn/marshal.c:1329 ../libsvn_ra_svn/marshal.c:1489 +msgid "Number is larger than maximum" +msgstr "Zahl ist größer als Maximum" + +#: ../libsvn_ra_svn/marshal.c:1384 +msgid "Word is too long" +msgstr "Wort ist zu lang" + +#: ../libsvn_ra_svn/marshal.c:1517 +msgid "Word too long" +msgstr "Wort zu lang" + +#: ../libsvn_ra_svn/marshal.c:1781 +msgid "Proplist element not a list" +msgstr "Eigenschaftselement ist keine Liste" + +#: ../libsvn_ra_svn/marshal.c:1818 +msgid "Empty error list" +msgstr "Leere Fehlerliste" + +#: ../libsvn_ra_svn/marshal.c:1826 ../libsvn_ra_svn/marshal.c:1850 +msgid "Malformed error list" +msgstr "Fehlerhafte Fehlerliste" + +#: ../libsvn_ra_svn/marshal.c:1879 #, c-format -msgid "Error closing directory" -msgstr "Fehler beim Schließen eines Verzeichnisses" +msgid "Unknown status '%s' in command response" +msgstr "Unbekannter Status »%s« in Antwort auf Befehl" -#: ../libsvn_subr/io.c:4357 +#: ../libsvn_ra_svn/streams.c:110 #, c-format -msgid "Can't read directory entry in '%s'" -msgstr "Kann Verzeichniseintrag in »%s« nicht lesen" +msgid "Can't get socket timeout" +msgstr "Kann Socket-Timeout nicht erhalten" -#: ../libsvn_subr/io.c:4483 +#: ../libsvn_ra_svn/streams.c:123 #, c-format -msgid "Can't check directory '%s'" -msgstr "Kann Verzeichnis »%s« nicht prüfen" +msgid "Can't read from connection" +msgstr "Kann nicht aus Verbindung lesen" -#: ../libsvn_subr/io.c:4545 +#: ../libsvn_ra_svn/streams.c:134 #, c-format -msgid "Reading '%s'" -msgstr "Lese »%s«" +msgid "Can't write to connection" +msgstr "Kann nicht in Verbindung schreiben" -#: ../libsvn_subr/io.c:4564 +#: ../libsvn_repos/authz_parse.c:285 #, c-format -msgid "First line of '%s' contains non-digit" -msgstr "Die erste Zeile von »%s« enthält eine Nicht-Ziffer" +msgid "Section appears more than once in the global groups file: [%s]" +msgstr "" -#: ../libsvn_subr/io.c:4879 +#: ../libsvn_repos/authz_parse.c:291 #, c-format -msgid "Can't create temporary file from template '%s'" -msgstr "Kann temporäre Datei von Vorlage »%s« nicht anlegen" +msgid "Section appears more than once in the authz file: [%s]" +msgstr "" -#: ../libsvn_subr/io.c:4968 +#: ../libsvn_repos/authz_parse.c:320 #, c-format -msgid "Can't set aside '%s'" -msgstr "Kann »%s« nicht beiseitelegen" +msgid "Section is not valid in the global group file: [%s]" +msgstr "" -#: ../libsvn_subr/io.c:4980 ../libsvn_subr/stream.c:2079 +#: ../libsvn_repos/authz_parse.c:321 #, c-format -msgid "Unable to make name in '%s'" -msgstr "Kann Namen in »%s« nicht erstellen" +msgid "Section is not valid in the authz file: [%s]" +msgstr "" -#: ../libsvn_subr/mergeinfo.c:101 ../libsvn_subr/mergeinfo.c:714 -msgid "Pathname not terminated by ':'" -msgstr "Pfadnamen sind nicht durch »:« getrennt" +#: ../libsvn_repos/authz_parse.c:342 +#, fuzzy, c-format +msgid "Global group name '%s' may not begin with '%c'" +msgstr "Eigenschaft »%s« darf nicht nach »%s« zusammengeführt werden." -#: ../libsvn_subr/mergeinfo.c:518 -#, c-format -msgid "Invalid character '%c' found in revision list" -msgstr "Ungültiges Zeichen »%c« in Revisionsliste gefunden" +#: ../libsvn_repos/authz_parse.c:347 +#, fuzzy, c-format +msgid "Group name '%s' may not begin with '%c'" +msgstr "Eigenschaft »%s« darf nicht nach »%s« zusammengeführt werden." -#: ../libsvn_subr/mergeinfo.c:526 -#, c-format -msgid "Invalid revision number '0' found in range list" -msgstr "Ungültige Revisionsnummer '0' in Revisionsbereichsliste gefunden" +#: ../libsvn_repos/authz_parse.c:358 +#, fuzzy, c-format +msgid "Can't override definition of global group '%s'" +msgstr "Kann nicht in Knoten mit Konflikt »%s« zusammenführen" -#: ../libsvn_subr/mergeinfo.c:537 -#, c-format -msgid "Unable to parse reversed revision range '%ld-%ld'" -msgstr "Rückwärtiger Revisionsbereich »%ld-%ld« kann nicht verarbeitet werden" +#: ../libsvn_repos/authz_parse.c:363 +#, fuzzy, c-format +msgid "Can't override definition of group '%s'" +msgstr "Kann nicht in Knoten mit Konflikt »%s« zusammenführen" -#: ../libsvn_subr/mergeinfo.c:542 -#, c-format -msgid "Unable to parse revision range '%ld-%ld' with same start and end revisions" -msgstr "Revisionbereich »%ld-%ld« mit selber Start- und Endrevision kann nicht verarbeitet werden" +#: ../libsvn_repos/authz_parse.c:486 +msgid "Found empty name in authz rule path" +msgstr "" -#: ../libsvn_subr/mergeinfo.c:579 ../libsvn_subr/mergeinfo.c:586 -#, c-format -msgid "Invalid character '%c' found in range list" -msgstr "Ungültiges Zeichen »%c« in der Bereichsliste gefunden" +#: ../libsvn_repos/authz_parse.c:487 ../libsvn_repos/authz_parse.c:502 +#, fuzzy, c-format +msgid "Non-canonical path '%s' in authz rule [%s]" +msgstr "Nicht-kanonischer »cpath« in Knotenrevision »%s«" -#: ../libsvn_subr/mergeinfo.c:593 -msgid "Range list parsing ended before hitting newline" -msgstr "Einlesen der Bereichsliste endete vor dem Zeilenumbruch" +#: ../libsvn_repos/authz_parse.c:499 +#, fuzzy +msgid "Found '.' in authz rule path" +msgstr "Pfad nicht ausgeben" -#: ../libsvn_subr/mergeinfo.c:670 -#, c-format -msgid "Unable to parse overlapping revision ranges '%s' and '%s' with different inheritance types" -msgstr "Überlappende Revisionsbereiche »%s« und »%s« mit verschiedenen Vererbungstypen können nicht verarbeitet werden" +#: ../libsvn_repos/authz_parse.c:501 +#, fuzzy +msgid "Found '..' in authz rule path" +msgstr "Pfad nicht ausgeben" -#: ../libsvn_subr/mergeinfo.c:722 +#: ../libsvn_repos/authz_parse.c:661 #, c-format -msgid "Mergeinfo for '%s' maps to an empty revision range" -msgstr "Zusammenführungsinformationen für »%s« verweisen auf einen leeren Revisionsbereich" +msgid "Section [%s] describes the same rule as section [%s]" +msgstr "" -#: ../libsvn_subr/mergeinfo.c:726 +#: ../libsvn_repos/authz_parse.c:700 ../libsvn_repos/authz_parse.c:730 #, c-format -msgid "Could not find end of line in range list line in '%s'" -msgstr "Konnte Zeilenende in Bereichslistenzeile in »%s« nicht finden" +msgid "Empty repository name in authz rule [%s]" +msgstr "" -#: ../libsvn_subr/mergeinfo.c:790 +#: ../libsvn_repos/authz_parse.c:709 #, c-format -msgid "Could not parse mergeinfo string '%s'" -msgstr "Konnte Zusammenführungsinformationszeichenkette »%s« nicht einlesen" +msgid "Invalid type token '%s' in authz rule [%s]" +msgstr "" -#: ../libsvn_subr/mergeinfo.c:2367 -msgid "NULL mergeinfo catalog\n" -msgstr "Zusammenführungsinformationskatalog ist NULL\n" +#: ../libsvn_repos/authz_parse.c:785 +#, fuzzy, c-format +msgid "Alias name '%s' may not begin with '%c'" +msgstr "Eigenschaft »%s« darf nicht nach »%s« zusammengeführt werden." -#: ../libsvn_subr/mergeinfo.c:2372 -msgid "empty mergeinfo catalog\n" -msgstr "Zusammenführungsinformationskatalog ist leer\n" +#: ../libsvn_repos/authz_parse.c:794 +#, fuzzy, c-format +msgid "Can't override definition of alias '%s'" +msgstr "Kann nicht in Datei »%s« schreiben" -#: ../libsvn_subr/mutex.c:69 +#: ../libsvn_repos/authz_parse.c:835 #, c-format -msgid "Can't create mutex" -msgstr "Kann Mutex nicht erzeugen" +msgid "Access entry '%s' has more than one inversion; double negatives are not permitted" +msgstr "" -#: ../libsvn_subr/mutex.c:86 +#: ../libsvn_repos/authz_parse.c:844 #, c-format -msgid "Can't lock mutex" -msgstr "Kann Mutex nicht sperren" +msgid "Access entry '%s' is not valid; it must be a single '*'" +msgstr "" -#: ../libsvn_subr/mutex.c:102 +#: ../libsvn_repos/authz_parse.c:851 #, c-format -msgid "Can't unlock mutex" -msgstr "Kann Mutex nicht entsperren" +msgid "Access entry '~*' will never match" +msgstr "" -#: ../libsvn_subr/nls.c:69 +#: ../libsvn_repos/authz_parse.c:875 #, c-format -msgid "Can't get module file name" -msgstr "Kann Namen der Moduldatei nicht ermitteln" - -#: ../libsvn_subr/opt.c:189 -msgid " ARG" -msgstr " PAR" +msgid "Access entry token '%s' is not valid; should be '%s' or '%s'" +msgstr "" -#: ../libsvn_subr/opt.c:324 -msgid "" -"\n" -"Global options:\n" +#: ../libsvn_repos/authz_parse.c:902 +#, c-format +msgid "The access mode '%c' in access entry '%s' of rule [%s] is not valid" msgstr "" -"\n" -"Globale Optionen:\n" -#: ../libsvn_subr/opt.c:818 +#: ../libsvn_repos/authz_parse.c:912 #, c-format -msgid "Syntax error parsing peg revision '%s'; did you mean '%s@'?" -msgstr "Syntaxfehler bei der Analyse der Fix-Revision »%s«; Meinten Sie '%s@'?" +msgid "Write-only access entry '%s' of rule [%s] is not valid" +msgstr "" -#: ../libsvn_subr/opt.c:824 +#: ../libsvn_repos/authz_parse.c:1033 #, c-format -msgid "Syntax error parsing peg revision '%s'" -msgstr "Syntaxfehler bei der Analyse der Fix-Revision »%s«" +msgid "Recursive definition of group '%s'" +msgstr "" -#: ../libsvn_subr/opt.c:961 -msgid "Revision property pair is empty" -msgstr "Revisionseigenschaftspaar ist leer" +#: ../libsvn_repos/authz_parse.c:1044 ../libsvn_repos/authz_parse.c:1102 +#, fuzzy, c-format +msgid "Alias '%s' was never defined" +msgstr "Pfad »%s« wurde nicht hierhin verschoben" -#: ../libsvn_subr/opt.c:981 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:338 -#: ../svn/propset-cmd.c:68 +#: ../libsvn_repos/authz_parse.c:1065 +#, fuzzy, c-format +msgid "Undefined group '%s'" +msgstr "Undefiniertes Tunnelschema »%s«" + +#: ../libsvn_repos/authz_parse.c:1158 #, c-format -msgid "'%s' is not a valid Subversion property name" -msgstr "»%s« ist kein gültiger Subversion-Eigenschaftsname" +msgid "Access entry refers to undefined group '%s'" +msgstr "" -#: ../libsvn_subr/opt.c:1057 +#: ../libsvn_repos/commit.c:172 #, c-format -msgid "URL '%s' contains a '..' element" -msgstr "URL »%s« enthält ein »..« Element" +msgid "'%s' is out of date" +msgstr "»%s« ist veraltet" -#: ../libsvn_subr/opt.c:1090 +#: ../libsvn_repos/commit.c:321 #, c-format -msgid "Error resolving case of '%s'" -msgstr "Fehler beim Ermitteln der Groß-/Kleinschreibung von »%s«" +msgid "Got source path but no source revision for '%s'" +msgstr "Quellpfad, aber keine Quellrevision für »%s« erhalten" -#: ../libsvn_subr/opt.c:1112 +#: ../libsvn_repos/commit.c:353 +#, c-format +msgid "Source url '%s' is from different repository" +msgstr "Quell URL »%s« stammt aus einem fremden Projektarchiv" + +#: ../libsvn_repos/commit.c:689 +#, c-format +msgid "" +"Checksum mismatch for resulting fulltext\n" +"(%s)" +msgstr "" +"Prüfsummenfehler für Volltextergebnis\n" +"(%s)" + +#: ../libsvn_repos/commit.c:739 +msgid "(no error)" +msgstr "(kein Fehler)" + +#: ../libsvn_repos/commit.c:770 ../libsvn_repos/commit.c:776 +msgid "post-commit hook failed with no error message." +msgstr "Aktion »post-commit« schlug ohne Fehlermeldung fehl" + +#: ../libsvn_repos/commit.c:779 +#, c-format +msgid "" +"post commit FS processing had error:\n" +"%s\n" +"%s" +msgstr "" +"Aktion »post-commit« meldete einen Fehler:\n" +"%s\n" +"%s" + +#: ../libsvn_repos/commit.c:780 ../libsvn_repos/commit.c:789 +msgid "(no error message)" +msgstr "(keine Fehlermeldung)" + +#: ../libsvn_repos/commit.c:787 +#, c-format +msgid "" +"post commit FS processing had error:\n" +"%s" +msgstr "" +"Aktion »post-commit« meldete einen Fehler:\n" +"%s" + +#: ../libsvn_repos/commit.c:1314 ../libsvn_repos/fs-wrap.c:120 +#: ../libsvn_repos/load-fs-vtable.c:1129 +msgid "Commit succeeded, but post-commit hook failed" +msgstr "Übertragen erfolgreich, aber die »post-commit«-Aktion schlug fehl" + +#: ../libsvn_repos/delta.c:192 +msgid "Unable to open root of edit" +msgstr "Kann Basis der Änderung nicht öffnen" + +#: ../libsvn_repos/delta.c:236 +msgid "Invalid target path" +msgstr "Ungültiger Zielpfad" + +#: ../libsvn_repos/delta.c:240 +msgid "Delta depth 'exclude' not supported" +msgstr "Delta-Tiefe »exclude« wird nicht unterstützt" + +#: ../libsvn_repos/delta.c:266 +msgid "Invalid editor anchoring; at least one of the input paths is not a directory and there was no source entry" +msgstr "Ungültiger Editoranker; zumindest einer der Eingabepfade ist kein Verzeichnis und es gab keinen Quelleintrag" + +#: ../libsvn_repos/deprecated.c:715 ../svnadmin/svnadmin.c:1051 +#, c-format +msgid "* Dumped revision %ld.\n" +msgstr "* Revision %ld ausgegeben.\n" + +#: ../libsvn_repos/deprecated.c:721 ../svnadmin/svnadmin.c:1057 +#, c-format +msgid "* Verified revision %ld.\n" +msgstr "* Revision %ld verifiziert.\n" + +#: ../libsvn_repos/deprecated.c:729 ../svnadmin/svnadmin.c:1105 #, c-format msgid "" -"%s, version %s\n" -" compiled %s, %s on %s\n" +"\n" +"------- Committed revision %ld >>>\n" "\n" msgstr "" -"%s, Version %s\n" -" übersetzt am %s, um %s auf %s\n" +"\n" +"------- Übertrage Revision %ld >>>\n" "\n" -#: ../libsvn_subr/opt.c:1129 +#: ../libsvn_repos/deprecated.c:735 ../svnadmin/svnadmin.c:1111 +#, c-format msgid "" -"System information:\n" +"\n" +"------- Committed new rev %ld (loaded from original rev %ld) >>>\n" "\n" msgstr "" -"Systeminformationen:\n" +"\n" +"------- Neue Revision %ld übertragen (geladen aus Original %ld) >>>\n" "\n" -#: ../libsvn_subr/opt.c:1130 +#: ../libsvn_repos/deprecated.c:748 ../svnadmin/svnadmin.c:1124 #, c-format -msgid "* running on %s\n" -msgstr "* ausgeführt auf %s\n" +msgid " * editing path : %s ..." +msgstr " * Bearbeite Pfad: %s ..." -#: ../libsvn_subr/opt.c:1134 +#: ../libsvn_repos/deprecated.c:754 ../svnadmin/svnadmin.c:1130 #, c-format -msgid " - %s\n" -msgstr " - %s\n" +msgid " * deleting path : %s ..." +msgstr " * Lösche Pfad: %s ..." -#: ../libsvn_subr/opt.c:1144 -msgid "* linked dependencies:\n" -msgstr "* eingebundene Abhändigleiten:\n" +#: ../libsvn_repos/deprecated.c:760 ../svnadmin/svnadmin.c:1136 +#, c-format +msgid " * adding path : %s ..." +msgstr " * Füge Pfad hinzu: %s ..." -#: ../libsvn_subr/opt.c:1169 -msgid "* loaded shared libraries:\n" -msgstr "* geladene dynamische Bibliotheken:\n" +#: ../libsvn_repos/deprecated.c:766 ../svnadmin/svnadmin.c:1142 +#, c-format +msgid " * replacing path : %s ..." +msgstr " * Ersetze Pfad: %s ..." -#: ../libsvn_subr/packed_data.c:736 -msgid "Unexpected end of stream" -msgstr "Unerwartetes Ende des Datenstroms" +#: ../libsvn_repos/deprecated.c:776 ../svnadmin/svnadmin.c:1151 +msgid " done.\n" +msgstr " erledigt.\n" -#: ../libsvn_subr/packed_data.c:742 -msgid "Integer representation too long" -msgstr "Ganzzahldarstellung zu lang" +#: ../libsvn_repos/deprecated.c:786 ../svnadmin/svnadmin.c:1160 +#, c-format +msgid "<<< Started new transaction, based on original revision %ld\n" +msgstr "<<< Neue Transaktion basierend auf Originalrevision %ld gestartet\n" -#: ../libsvn_subr/path.c:1114 +#: ../libsvn_repos/deprecated.c:793 ../svnadmin/svnadmin.c:1173 #, c-format -msgid "Can't determine the native path encoding" -msgstr "Kann die Zeichencodierung des Pfades nicht ermitteln" +msgid " removing '\\r' from %s ..." +msgstr " Entferne »\\r« aus %s ..." -#: ../libsvn_subr/path.c:1299 +#: ../libsvn_repos/dump.c:794 #, c-format -msgid "Improper relative URL '%s'" -msgstr "Fehlerhafte relative URL »%s«" +msgid "Path '%s' not found in r%ld." +msgstr "Pfad »%s« wurde in r%ld nicht gefunden." -#: ../libsvn_subr/prompt.c:147 -msgid "Can't close terminal" -msgstr "Kann Terminal nicht schließen" +#: ../libsvn_repos/dump.c:799 +#, c-format +msgid "Unexpected node kind %d for '%s' at r%ld. Expected kind was %d." +msgstr "Unerwartete Knotenart %d für »%s« in r%ld. Erwartete Knotenart war %d." -#: ../libsvn_subr/prompt.c:200 +#: ../libsvn_repos/dump.c:837 #, c-format -msgid "Can't open stderr" -msgstr "Kann Standardfehlerausgabe nicht öffnen" +msgid "Path '%s' exists in r%ld." +msgstr "Pfad »%s« existiert in r%ld." -#: ../libsvn_subr/prompt.c:381 ../libsvn_subr/prompt.c:468 +#: ../libsvn_repos/dump.c:867 #, c-format -msgid "Can't read from terminal" -msgstr "Kann nicht vom Terminal lesen" +msgid "Mergeinfo referencing revision(s) prior to the oldest dumped revision (r%ld). Loading this dump may result in invalid mergeinfo." +msgstr "Zusammenführungsinformationen verweisen auf Revision(en) vor der ältesten ausgegebene Revision (r%ld). Das Laden dieser Datei kann ungültige Zusammenführungsinformationen zur Folge haben." -#: ../libsvn_subr/prompt.c:536 -msgid "End of file while reading from terminal" -msgstr "Dateiende während des Lesens vom Terminal" +#: ../libsvn_repos/dump.c:975 +#, c-format +msgid "Duplicate representation of path '%s' in %s property of '%s'" +msgstr "Doppelte Darstellung von Pfad »%s« in Eigenschaft %s von »%s«" -#: ../libsvn_subr/prompt.c:598 ../svn/auth-cmd.c:241 +#: ../libsvn_repos/dump.c:1121 #, c-format -msgid "Authentication realm: %s\n" -msgstr "Anmeldebereich: %s\n" +msgid "E%06d: While validating fspath '%s': %s" +msgstr "E%06d: Fehler bei Überprüfung von »fspath« »%s«: %s" -#: ../libsvn_subr/prompt.c:625 ../libsvn_subr/prompt.c:648 -msgid "Username: " -msgstr "Benutzername: " +#: ../libsvn_repos/dump.c:1160 +#, c-format +msgid "Change invalid path '%s' in r%ld" +msgstr "Änderung eines ungültigen Pfades »%s« in r%ld" -#: ../libsvn_subr/prompt.c:670 +#: ../libsvn_repos/dump.c:1184 #, c-format -msgid "Error validating server certificate for '%s':\n" -msgstr "Fehler bei der Validierung des Serverzertifikats für »%s«:\n" +msgid "Deleting invalid path '%s' in r%ld" +msgstr "Löschen eines ungültigen Pfades »%s« in r%ld" -#: ../libsvn_subr/prompt.c:676 -msgid "" -" - The certificate is not issued by a trusted authority. Use the\n" -" fingerprint to validate the certificate manually!\n" -msgstr "" -" - Das Zertifikat ist nicht von einer vertrauenswürdigen Instanz ausgestellt\n" -" Überprüfen Sie den Fingerabdruck, um das Zertifikat zu validieren!\n" +# TODO: Compare msgid "Attempted to open non-existent child node '%s'" +# (non-, vs. non; Attempted vs. Attempting) +#: ../libsvn_repos/dump.c:1203 +#, c-format +msgid "Replacing non-existent path '%s' in r%ld" +msgstr "Ersetzen eines nicht existierenden Pfades »%s« in r%ld" -#: ../libsvn_subr/prompt.c:683 -msgid " - The certificate hostname does not match.\n" -msgstr " - Der Hostname des Zertifikats stimmt nicht überein.\n" +#: ../libsvn_repos/dump.c:1244 +#, c-format +msgid "Adding already existing path '%s' in r%ld" +msgstr "Hinzufügen eines schon vorhandenen Pfades »%s« in r%ld" -#: ../libsvn_subr/prompt.c:689 -msgid " - The certificate is not yet valid.\n" -msgstr " - Das Zertifikat ist noch nicht gültig.\n" +#: ../libsvn_repos/dump.c:1267 +#, c-format +msgid "Copying from invalid path to '%s' in r%ld" +msgstr "Kopieren eines ungültigen Pfades »%s« in r%ld" -#: ../libsvn_subr/prompt.c:695 -msgid " - The certificate has expired.\n" -msgstr " - Das Zertifikat ist abgelaufen.\n" +#: ../libsvn_repos/dump.c:1279 +#, c-format +msgid "Referencing data in revision %ld, which is older than the oldest dumped revision (r%ld). Loading this dump into an empty repository will fail." +msgstr "Verweis auf Daten in Revision %ld, welche älter als die älteste ausgegebene Revision (r%ld) ist. Das Laden dieser Datei in ein leeres Projektarchiv wird fehlschlagen." -#: ../libsvn_subr/prompt.c:701 -msgid " - The certificate has an unknown error.\n" -msgstr " - Das Zertifikat hat einen unbekannten Fehler.\n" +#: ../libsvn_repos/dump.c:2045 ../libsvn_repos/dump.c:2475 +#, c-format +msgid "Start revision %ld is greater than end revision %ld" +msgstr "Startrevision %ld ist größer als Endrevision %ld" -#: ../libsvn_subr/prompt.c:706 +#: ../libsvn_repos/dump.c:2050 ../libsvn_repos/dump.c:2480 #, c-format -msgid "" -"Certificate information:\n" -" - Hostname: %s\n" -" - Valid: from %s until %s\n" -" - Issuer: %s\n" -" - Fingerprint: %s\n" -msgstr "" -"Zertifikats-Informationen:\n" -" - Hostname: %s\n" -" - Gültig: von %s bis %s\n" -" - Aussteller: %s\n" -" - Fingerabdruck: %s\n" +msgid "End revision %ld is invalid (youngest revision is %ld)" +msgstr "Endrevision %ld ist ungültig (neueste Revision ist %ld)" -#: ../libsvn_subr/prompt.c:721 -msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? " -msgstr "Ve(r)werfen, (t)emporär akzeptieren oder (p)ermanent akzeptieren? " +#: ../libsvn_repos/dump.c:2178 +msgid "The range of revisions dumped contained references to copy sources outside that range." +msgstr "Der ausgegebene Revisionsbereich enthält Verweise für Kopien auf Quellpfade außerhalb dieses Bereichs." -#: ../libsvn_subr/prompt.c:725 -msgid "(R)eject or accept (t)emporarily? " -msgstr "Ve(r)werfen oder (t)emporär akzeptieren? " +#: ../libsvn_repos/dump.c:2190 +msgid "The range of revisions dumped contained mergeinfo which reference revisions outside that range." +msgstr "Der ausgegebene Revisionsbereich enthielt Zusammenführungsinformationen die auf Revisionen außerhalb dieses Bereichs verweisen." -#: ../libsvn_subr/prompt.c:765 -msgid "Client certificate filename: " -msgstr "Client Zertifikatsdatei: " +#: ../libsvn_repos/dump.c:2244 +#, c-format +msgid "Node '%s' is not a directory." +msgstr "Knoten »%s« ist kein Verzeichnis." -#: ../libsvn_subr/prompt.c:789 +#: ../libsvn_repos/dump.c:2252 #, c-format -msgid "Passphrase for '%s': " -msgstr "Passphrase für »%s«: " +msgid "Node '%s' is not a file." +msgstr "Knoten »%s« ist keine Datei." -#: ../libsvn_subr/prompt.c:841 -msgid "yes" -msgstr "ja" +#: ../libsvn_repos/dump.c:2257 +#, c-format +msgid "Unexpected node kind %d for '%s'" +msgstr "Unerwartete Knotenart %d für »%s«" -#: ../libsvn_subr/prompt.c:842 -msgid "y" -msgstr "j" +#: ../libsvn_repos/dump.c:2304 +#, c-format +msgid "Duplicate representation of path '%s'" +msgstr "Doppelte Darstellung von Pfad »%s«" -#: ../libsvn_subr/prompt.c:847 -msgid "no" -msgstr "nein" +#: ../libsvn_repos/fs-wrap.c:216 +#, c-format +msgid "Storage of non-regular property '%s' is disallowed through the repository interface, and could indicate a bug in your client" +msgstr "Das Speichern der speziellen Eigenschaft »%s« wird vom Projektarchiv verhindert und könnte auf einen Bug in Ihrem Client hindeuten" -#: ../libsvn_subr/prompt.c:848 -msgid "n" -msgstr "n" +#: ../libsvn_repos/fs-wrap.c:231 +#, c-format +msgid "Cannot accept '%s' property because it is not encoded in UTF-8" +msgstr "Kann Eigenschaft »%s« nicht akzeptieren, da sie nicht in UTF-8 kodiert ist" -#: ../libsvn_subr/prompt.c:854 -msgid "Please type 'yes' or 'no': " -msgstr "Bitte geben Sie »ja« oder »nein« ein: " +#: ../libsvn_repos/fs-wrap.c:241 +#, c-format +msgid "Cannot accept non-LF line endings in '%s' property" +msgstr "Kann nicht-»LF« (LF = Unix-artige) Zeilenumbrüche in Eigenschaft »%s« nicht akzeptieren" -#: ../libsvn_subr/prompt.c:868 -msgid "Store password unencrypted (yes/no)? " -msgstr "Passwort unverschlüsselt speichern (ja/nein)? " +#: ../libsvn_repos/fs-wrap.c:245 +#, fuzzy +msgid "Invalid property value" +msgstr "Lokaler Eigenschaftswert:\n" -#: ../libsvn_subr/prompt.c:870 +#: ../libsvn_repos/fs-wrap.c:313 #, c-format -msgid "" -"\n" -"-----------------------------------------------------------------------\n" -"ATTENTION! Your password for authentication realm:\n" -"\n" -" %s\n" -"\n" -"can only be stored to disk unencrypted! You are advised to configure\n" -"your system so that Subversion can store passwords encrypted, if\n" -"possible. See the documentation for details.\n" -"\n" -"You can avoid future appearances of this warning by setting the value\n" -"of the 'store-plaintext-passwords' option to either 'yes' or 'no' in\n" -"'%s'.\n" -"-----------------------------------------------------------------------\n" -msgstr "" -"\n" -"-----------------------------------------------------------------------\n" -"ACHTUNG! Ihr Password für den Anmeldebereich\n" -"\n" -" %s\n" -"\n" -"kann auf der Festplatte nur unverschlüsselt gespeichert werden! Es wird\n" -"empfohlen, falls möglich Ihr System so zu konfigurieren, dass Subversion\n" -"Passwörter verschlüsselt speichern kann. Siehe die Dokumentation für\n" -"Details.\n" -"\n" -"Sie können ein weiteres Anzeigen dieser Warnung verhindern, indem Sie\n" -"den Wert der Option »store-plaintext-passwords« in\n" -"»%s«\n" -"entweder auf »yes« oder »no« setzen.\n" -"-----------------------------------------------------------------------\n" - -#: ../libsvn_subr/prompt.c:897 -msgid "Store passphrase unencrypted (yes/no)? " -msgstr "Passphrase unverschlüsselt speichern (ja/nein)? " - -#: ../libsvn_subr/prompt.c:899 -#, c-format -msgid "" -"\n" -"-----------------------------------------------------------------------\n" -"ATTENTION! Your passphrase for client certificate:\n" -"\n" -" %s\n" -"\n" -"can only be stored to disk unencrypted! You are advised to configure\n" -"your system so that Subversion can store passphrase encrypted, if\n" -"possible. See the documentation for details.\n" -"\n" -"You can avoid future appearances of this warning by setting the value\n" -"of the 'store-ssl-client-cert-pp-plaintext' option to either 'yes' or\n" -"'no' in '%s'.\n" -"-----------------------------------------------------------------------\n" -msgstr "" -"\n" -"-----------------------------------------------------------------------\n" -"ACHTUNG! Ihre Passphrase für das Klient-Zertifikat:\n" -"\n" -" %s\n" -"\n" -"kann auf der Festplatte nur unverschlüsselt gespeichert werden! Es wird\n" -"empfohlen, falls möglich Ihr System so zu konfigurieren, dass Subversion\n" -"Passphrasen verschlüsselt speichern kann. Siehe die Dokumentation für\n" -"Details.\n" -"\n" -"Sie können ein weiteres Anzeigen dieser Warnung verhindern, indem Sie\n" -"den Wert der Option »store-ssl-client-cert-pp-plaintext« in\n" -"»%s«\n" -"entweder auf »yes« oder »no« setzen.\n" -"-----------------------------------------------------------------------\n" +msgid "Commit rejected because mergeinfo on '%s' contains unexpected string terminator" +msgstr "Übertragung abgewiesen, da die Zusammenführungsinformationen von »%s« nicht erwartete Zeichenkettenendmarken enthalten" -#: ../libsvn_subr/prompt.c:945 +#: ../libsvn_repos/fs-wrap.c:320 #, c-format -msgid "Password for '%s' GNOME keyring: " -msgstr "Passwort für GNOME-Schlüsselring »%s«: " +msgid "Commit rejected because mergeinfo on '%s' is syntactically invalid" +msgstr "Übertragung abgewiesen, da die Zusammenführungsinformationen von »%s« nicht syntaktisch korrekt sind" -#: ../libsvn_subr/simple_providers.c:444 -#: ../libsvn_subr/ssl_client_cert_pw_providers.c:286 +#: ../libsvn_repos/fs-wrap.c:451 #, c-format -msgid "Config error: invalid value '%s' for option '%s'" -msgstr "Konfigurationsfehler: Ungültiger Wert »%s« für Option »%s«" +msgid "Write denied: not authorized to read all of revision %ld" +msgstr "Schreiben abgelehnt: Keine Berechtigung, alles von Revision %ld einzulesen." -#: ../libsvn_subr/sqlite.c:242 -#, c-format -msgid "sqlite[S%d]: %s, executing statement '%s'" -msgstr "sqlite[S%d]: %s, Ausgeführte Anweisung '%s'" +#: ../libsvn_repos/fs-wrap.c:667 +msgid "Locking succeeded, but post-lock hook failed" +msgstr "Sperrung erfolgreich, aber die Aktion »post-ock« schlug fehl" -#: ../libsvn_subr/sqlite.c:331 -msgid "sqlite: Expected database row missing" -msgstr "sqlite: Erwartete Zeile in der Datenbank fehlt" +#: ../libsvn_repos/fs-wrap.c:773 +msgid "Cannot unlock, no authenticated username available" +msgstr "Kann nicht freigeben, kein angemeldeter Benutzername verfügbar" -#: ../libsvn_subr/sqlite.c:332 -msgid "sqlite: Extra database row found" -msgstr "sqlite: Zusätzliche Zeile der Datenbank wurde gefunden" +#: ../libsvn_repos/fs-wrap.c:821 +msgid "Unlock succeeded, but post-unlock hook failed" +msgstr "Entsperren erfolgreich, aber die Aktion »post-unlock« schlug fehl" -#: ../libsvn_subr/sqlite.c:803 +#: ../libsvn_repos/hooks.c:92 #, c-format -msgid "SQLite compiled for %s, but running with %s" -msgstr "SQLite wurde für %s kompiliert, läuft aber mit %s" +msgid "'%s' hook succeeded, but error output could not be read" +msgstr "»%s«-Aktion war erfolgreich, aber die Fehlerausgabe konnte nicht gelesen werden" -#: ../libsvn_subr/sqlite.c:815 -msgid "SQLite is required to be compiled and run in thread-safe mode" -msgstr "Es wird erwartet, dass SQLite im Thread-sicheren Modus kompiliert und gestartet wird" +#: ../libsvn_repos/hooks.c:107 +msgid "[Error output could not be translated from the native locale to UTF-8.]" +msgstr "[Fehlerausgabe konnte nicht mit der aktuellen Locale-Einstellung nicht nach UTF-8 konvertiert werden.]" + +#: ../libsvn_repos/hooks.c:112 +msgid "[Error output could not be read.]" +msgstr "[Fehlerausgabe konnte nicht gelesen werden.]" -#: ../libsvn_subr/sqlite.c:824 +# FIXME: two spaces at end? +#: ../libsvn_repos/hooks.c:121 #, c-format -msgid "Could not configure SQLite [S%d]" -msgstr "Konnte SQLite nicht konfigurieren [S%d]" +msgid "'%s' hook failed (did not exit cleanly: apr_exit_why_e was %d, exitcode was %d). " +msgstr "Aktion »%s« schlug fehl (wurde nicht sauber beendet: apr_exit_why_e war %d, Exit-Code war %d). " -#: ../libsvn_subr/sqlite.c:826 -msgid "Could not initialize SQLite" -msgstr "Konnte SQLite nicht initialisieren" +#: ../libsvn_repos/hooks.c:130 +msgid "Commit" +msgstr "Übertragen" -#: ../libsvn_subr/sqlite.c:1445 -#, c-format -msgid "SQLite hotcopy failed for %s" -msgstr "SQLite-Hotcopy fehlgeschlagen für »%s«" +#: ../libsvn_repos/hooks.c:132 +msgid "Revprop change" +msgstr "Ändern einer Revisionseigenschaft" -#: ../libsvn_subr/stream.c:968 -#, c-format -msgid "Polling for available data on filestream failed" -msgstr "Abfrage aller verfügbarer Daten des Dateistroms fehlgeschlagen" +#: ../libsvn_repos/hooks.c:134 +msgid "Lock" +msgstr "Sperren" -#: ../libsvn_subr/string.c:981 ../libsvn_subr/string.c:1025 -#, c-format -msgid "Could not convert '%s' into a number" -msgstr "Konnte »%s« nicht in Zahl umwandeln" +#: ../libsvn_repos/hooks.c:136 +msgid "Unlock" +msgstr "Entsperren" -#: ../libsvn_subr/subst.c:1820 ../libsvn_wc/props.c:1767 +#: ../libsvn_repos/hooks.c:141 #, c-format -msgid "File '%s' has inconsistent newlines" -msgstr "Datei »%s« hat inkonsistente Zeilenenden" +msgid "%s hook failed (exit code %d)" +msgstr "Aktion »%s« schlug fehl (Exit-Code %d)" -#: ../libsvn_subr/subst.c:1858 +#: ../libsvn_repos/hooks.c:145 #, c-format -msgid "Can't read special file: File '%s' not found" -msgstr "Kann spezielle Datei nicht lesen: Datei »%s« nicht gefunden" - -#: ../libsvn_subr/sysinfo.c:1209 -msgid "Intel" -msgstr "Intel" - -#: ../libsvn_subr/sysinfo.c:1210 -msgid "Intel 64-bit" -msgstr "Intel 64 Bit" - -#: ../libsvn_subr/sysinfo.c:1211 -msgid "PowerPC" -msgstr "PowerPC" +msgid "%s blocked by %s hook (exit code %d)" +msgstr "%s wird durch Aktion %s behindert (Exit-Code %d)" -#: ../libsvn_subr/sysinfo.c:1212 -msgid "PowerPC 64-bit" -msgstr "PowerPC 64 Bit" +#: ../libsvn_repos/hooks.c:152 +msgid " with output:\n" +msgstr " mit Ausgabe:\n" -#. Human explanatory part, generated by apr_strftime as "Sat, 01 Jan 2000" -#: ../libsvn_subr/time.c:87 -msgid " (%a, %d %b %Y)" -msgstr " (%a, %d. %b %Y)" +#: ../libsvn_repos/hooks.c:158 +msgid " with no output." +msgstr " ohne Ausgabe." -#: ../libsvn_subr/token.c:66 +#: ../libsvn_repos/hooks.c:233 #, c-format -msgid "Token '%s' is unrecognized" -msgstr "Marke »%s« nicht erkannt" +msgid "Can't create null stdout for hook '%s'" +msgstr "Kann leere Standardausgabe für Aktion »%s« nicht anlegen" -#: ../libsvn_subr/types.c:52 +#: ../libsvn_repos/hooks.c:260 #, c-format -msgid "Negative revision number found parsing '%s'" -msgstr "Negative Revisionsnummer beim Einlesen von »%s« gefunden" +msgid "Failed to start '%s' hook" +msgstr "Konnte Aktion »%s« nicht starten" -#: ../libsvn_subr/types.c:53 +#: ../libsvn_repos/hooks.c:282 #, c-format -msgid "Invalid revision number found parsing '%s'" -msgstr "Ungültige Revisionsnummer beim Einlesen von »%s« gefunden" +msgid "Error closing null file" +msgstr "Fehler beim Schließen der leeren Standardausgabe" -#: ../libsvn_subr/types.c:64 +#: ../libsvn_repos/hooks.c:454 #, c-format -msgid "Revision number longer than 10 digits '%s'" -msgstr "Revisionsnummer ist länger als 10 Ziffern »%s«" +msgid "Failed to run '%s' hook; broken symlink" +msgstr "Ausführen der Aktion »%s« gescheitert; defekter »Symlink«" -#: ../libsvn_subr/types.c:70 -#, c-format -msgid "Revision number too large '%s'" -msgstr "Revisionsnummer ist zu groß »%s«" +#: ../libsvn_repos/hooks.c:676 +msgid "" +"Repository has not been enabled to accept revision propchanges;\n" +"ask the administrator to create a pre-revprop-change hook" +msgstr "" +"Das Projektarchiv lässt keine Änderungen an Revisionseigenschaften zu.\n" +"Bitten Sie den Administrator darum, eine Aktion »pre-revprop-change«\n" +"einzurichten." -#: ../libsvn_subr/utf.c:245 +#: ../libsvn_repos/list.c:314 ../libsvn_subr/io.c:2972 #, c-format -msgid "Can't create a character converter from native encoding to '%s'" -msgstr "Kann keinen Zeichenkonverter von der eigenen Codierung nach »%s« erzeugen" +msgid "Path '%s' not found" +msgstr "Pfad »%s« nicht gefunden" -#: ../libsvn_subr/utf.c:249 +#: ../libsvn_repos/load-fs-vtable.c:594 ../svnrdump/load_editor.c:637 #, c-format -msgid "Can't create a character converter from '%s' to native encoding" -msgstr "Kann keinen Zeichenkonverter von »%s« in die eigene Kodierung erzeugen" +msgid "Relative source revision %ld is not available in current repository" +msgstr "Relative Quellrevision %ld ist im aktuellen Projektarchiv nicht verfügbar." -#: ../libsvn_subr/utf.c:253 +# CHECKME: Check quotes, s/rev/revision/ +#: ../libsvn_repos/load-fs-vtable.c:608 #, c-format -msgid "Can't create a character converter from '%s' to '%s'" -msgstr "Kann keinen Zeichenkonverter von »%s« nach »%s« erzeugen" +msgid "" +"Copy source checksum mismatch on copy from '%s'@%ld\n" +"to '%s' in rev based on r%ld" +msgstr "" +"Prüfsummenfehler beim Kopieren von »%s«@%ld\n" +"nach »%s« in der auf r%ld basierten Revision" -#: ../libsvn_subr/utf.c:548 -#, c-format -msgid "Can't convert string from native encoding to '%s':" -msgstr "Kann Zeichenkette nicht von der eigenen Codierung nach »%s« konvertieren:" +#: ../libsvn_repos/load-fs-vtable.c:664 +msgid "Malformed dumpstream: Revision 0 must not contain node records" +msgstr "Fehlerhafter Dateiabzug: Revision 0 darf keine Knoteneinträge enthalten" -#: ../libsvn_subr/utf.c:552 +#: ../libsvn_repos/load-fs-vtable.c:680 #, c-format -msgid "Can't convert string from '%s' to native encoding:" -msgstr "Kann Zeichenkette nicht von »%s« in die eigene Codierung konvertieren:" +msgid "Unrecognized node-action on node '%s'" +msgstr "Unerkannte Knotenaktion auf Knoten »%s«" -#: ../libsvn_subr/utf.c:556 -#, c-format -msgid "Can't convert string from '%s' to '%s':" -msgstr "Kann Zeichenkette nicht von »%s« nach »%s« konvertieren:" +#: ../libsvn_repos/load-fs-vtable.c:849 ../svnrdump/load_editor.c:772 +msgid "Invalid svn:mergeinfo value" +msgstr "Ungültiger Wert für svn:mergeinfo" -#: ../libsvn_subr/utf.c:601 -#, c-format -msgid "Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from UTF-8" -msgstr "Auf sichere Daten »%s« folgte ein nicht-ASCII Byte %d, das nicht von/nach UTF-8 konvertiert werden konnte" +#: ../libsvn_repos/load-fs-vtable.c:858 +msgid "Invalid svn:mergeinfo value; leaving unchanged" +msgstr "Ungültiger Wert für svn:mergeinfo; keine Änderungen angewandt" + +#: ../libsvn_repos/load.c:46 +msgid "Premature end of content data in dumpstream" +msgstr "Vorzeitiges Ende der Daten im Dateiabzug" + +#: ../libsvn_repos/load.c:53 +msgid "Dumpstream data appears to be malformed" +msgstr "Daten des Dateiabzugs scheinen fehlerhaft zu sein" -#: ../libsvn_subr/utf.c:609 +#: ../libsvn_repos/load.c:102 #, c-format -msgid "Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8" -msgstr "Ein Nicht-ASCII Zeichen (Kode %d) wurde gefunden, das nicht von/nach UTF-8 konvertiert werden konnte" +msgid "Dump stream contains a malformed header (with no ':') at '%.20s'" +msgstr "Datenstrom enthält fehlerhaften Kopf (ohne »:«) in »%.20s«" -#: ../libsvn_subr/utf.c:654 +#: ../libsvn_repos/load.c:115 #, c-format -msgid "" -"Valid UTF-8 data\n" -"(hex:%s)\n" -"followed by invalid UTF-8 sequence\n" -"(hex:%s)" -msgstr "" -"Auf gültige UTF-8-Daten\n" -"(hex:%s)\n" -"folgte eine ungültige UTF-8-Sequenz\n" -"(hex:%s)" +msgid "Dump stream contains a malformed header (with no value) at '%.20s'" +msgstr "Datenstrom enthält fehlerhaften Kopf (ohne Wert) in »%.20s«" -#: ../libsvn_subr/utf.c:1202 ../libsvn_subr/utf.c:1211 -#, c-format -msgid "Conversion to UTF-16 failed" -msgstr "Umwandlung nach UTF-16 fehlgeschlagen" +#: ../libsvn_repos/load.c:204 +msgid "Incomplete or unterminated property block" +msgstr "Eigenschaftsblock ist unvollständig oder nicht terminiert" + +#: ../libsvn_repos/load.c:344 +msgid "Unexpected EOF writing contents" +msgstr "Unerwartetes EOF beim Schreiben der Daten" -#: ../libsvn_subr/utf.c:1240 ../libsvn_subr/utf.c:1250 +#: ../libsvn_repos/load.c:374 #, c-format -msgid "Conversion from UTF-16 failed" -msgstr "Umwandlung von UTF-16 fehlgeschlagen" +msgid "Malformed dumpfile header '%s'" +msgstr "Dateiabzug enthält ungültigen Kopf »%s«" -#: ../libsvn_subr/utf8proc.c:215 +#: ../libsvn_repos/load.c:381 #, c-format -msgid "Invalid Unicode character U+%04lX" -msgstr "Ungültiges Unicode-Zeichen U+%04lX" +msgid "Unsupported dumpfile version: %d" +msgstr "Dateiabzug Version %d wird nicht unterstützt" -#: ../libsvn_subr/utf8proc.c:252 -msgid "Cannot use a custom escape token in glob matching mode" -msgstr "Kann kein benutzerdefiniertes geschütztes Zeichen im Platzhalter-Suchmodus verwenden" +#: ../libsvn_repos/load.c:654 +msgid "Unrecognized record type in stream" +msgstr "Unerkannter Datensatz im Datenstrom" -#: ../libsvn_subr/utf8proc.c:283 -msgid "Escape token must be one character" -msgstr "Geschützes Zeichen muss ein einzelnes Zeichen sein" +#: ../libsvn_repos/load.c:761 +msgid "Sum of subblock sizes larger than total block content length" +msgstr "Die Summe der Größen der Unterblöcke überschreitet die gesamte Blocklänge" -#: ../libsvn_subr/utf8proc.c:286 +#: ../libsvn_repos/node_tree.c:244 #, c-format -msgid "Invalid escape character U+%04lX" -msgstr "Ungültiges geschütztes Zeichen U+%04lX" +msgid "'%s' not found in filesystem" +msgstr "»%s« nicht im Dateisystem gefunden" -#: ../libsvn_subr/utf8proc/utf8proc.c:117 -msgid "Memory for processing UTF-8 data could not be allocated." -msgstr "Speicher für die Verarbeitung von UTF-8 Daten konnte nicht zugewiesen werden." +#: ../libsvn_repos/replay.c:541 ../libsvn_repos/replay.c:1301 +#, c-format +msgid "Filesystem path '%s' is neither a file nor a directory" +msgstr "Pfad »%s« ist weder eine Datei noch ein Verzeichnis" -#: ../libsvn_subr/utf8proc/utf8proc.c:119 -msgid "UTF-8 string is too long to be processed." -msgstr "UTF-8 Zeichenkette ist für die Verarbeitung zu lang." +#: ../libsvn_repos/replay.c:556 +msgid "Root directory already exists." +msgstr "Wurzelverzeichnis existiert bereits." -#: ../libsvn_subr/utf8proc/utf8proc.c:121 -msgid "Invalid UTF-8 string" -msgstr "Ungültige UTF-8 Zeichenkette" +#: ../libsvn_repos/reporter.c:205 +#, c-format +msgid "Invalid length (%%%s) when about to read a string" +msgstr "Ungültige Länge (%%%s) beim Lesen einer Zeichenkette" -#: ../libsvn_subr/utf8proc/utf8proc.c:123 -msgid "Unassigned Unicode code point found in UTF-8 string." -msgstr "Nicht zugewiesener Unicode-Codepunkt in UTF-8 Zeichenkette gefunden." +#: ../libsvn_repos/reporter.c:270 +#, c-format +msgid "Invalid depth (%c) for path '%s'" +msgstr "Ungültige Tiefe (%c) für Pfad »%s«" -#: ../libsvn_subr/utf8proc/utf8proc.c:125 -msgid "Invalid options for UTF-8 processing chosen." -msgstr "Ungültige Optionen für die Verarbeitung von UTF-8 ausgewählt." +#: ../libsvn_repos/reporter.c:952 +#, c-format +msgid "Working copy path '%s' does not exist in repository" +msgstr "Arbeitskopiepfad »%s« existiert nicht im Projektarchiv" -#: ../libsvn_subr/utf8proc/utf8proc.c:127 -msgid "An unknown error occured while processing UTF-8 data." -msgstr "Ein unbekannter Fehler trat bei der Verarbeitung von UTF-8 Daten auf." +#: ../libsvn_repos/reporter.c:1378 +msgid "Not authorized to open root of edit operation" +msgstr "Keine Berechtigung die Basis der Änderung zu öffnen" -#: ../libsvn_subr/validate.c:56 +#: ../libsvn_repos/reporter.c:1395 #, c-format -msgid "MIME type '%s' has empty media type" -msgstr "MIME-Typ »%s« hat einen leeren Medientyp" +msgid "Target path '%s' does not exist" +msgstr "Zielpfad »%s« existiert nicht" -#: ../libsvn_subr/validate.c:61 -#, c-format -msgid "MIME type '%s' does not contain '/'" -msgstr "MIME-Typ »%s« enthält keinen »/«" +#: ../libsvn_repos/reporter.c:1403 +msgid "Cannot replace a directory from within" +msgstr "Kann ein Verzeichnis nicht innerhalb sich selbst ersetzen" -#: ../libsvn_subr/validate.c:73 -#, c-format -msgid "MIME type '%s' contains invalid character '%c' in media type" -msgstr "MIME-Typ »%s« enthält ein ungültiges Zeichen »%c« im Medientyp" +#: ../libsvn_repos/reporter.c:1443 +msgid "Invalid report for top level of working copy" +msgstr "Ungültiger Report für oberste Ebene der Arbeitskopie" -#: ../libsvn_subr/validate.c:84 +#: ../libsvn_repos/reporter.c:1458 +msgid "Two top-level reports with no target" +msgstr "Zwei oberste Reports ohne Zielangabe" + +#: ../libsvn_repos/reporter.c:1520 #, c-format -msgid "MIME type '%s' contains invalid character '0x%02x' in postfix" -msgstr "MIME-Typ »%s« enthält ein ungültiges Zeichen »0x%02x« im Postfix" +msgid "Unsupported report depth '%s'" +msgstr "Nicht unterstützte Reporttiefe »%s«" + +#: ../libsvn_repos/reporter.c:1550 +msgid "Depth 'exclude' not supported for link" +msgstr "Tiefe »exclude« wird für Links nicht unterstützt" -#: ../libsvn_subr/version.c:91 +#: ../libsvn_repos/reporter.c:1608 +msgid "Request depth 'exclude' not supported" +msgstr "Angefragte Tiefe »exclude« wird nicht unterstützt" + +#: ../libsvn_repos/repos.c:188 #, c-format -msgid "Version mismatch in '%s'%s: found %d.%d.%d%s, expected %d.%d.%d%s" -msgstr "Versionskonflikt in »%s«%s: gefunden %d.%d.%d%s, erwartet %d.%d.%d%s" +msgid "'%s' exists and is non-empty" +msgstr "»%s« existiert und ist nicht leer" -#: ../libsvn_subr/version.c:96 -msgid " (expecting equality)" -msgstr " (Übereinstimmung erwartet)" +#: ../libsvn_repos/repos.c:234 +msgid "Creating db logs lock file" +msgstr "Erzeuge Sperrdatei für Datenbanklogs" -#: ../libsvn_subr/version.c:98 -msgid " (expecting compatibility)" -msgstr " (Kompatibilität erwartet)" +#: ../libsvn_repos/repos.c:252 +msgid "Creating db lock file" +msgstr "Erzeuge Datenbank-Sperrdatei" -#: ../libsvn_subr/version.c:139 -msgid "" -"Copyright (C) 2015 The Apache Software Foundation.\n" -"This software consists of contributions made by many people;\n" -"see the NOTICE file for more information.\n" -"Subversion is open source software, see http://subversion.apache.org/\n" -msgstr "" -"Copyright (C) 2015 The Apache Software Foundation.\n" -"Diese Software besteht aus Beiträgen vieler Personen;\n" -"siehe Datei NOTICE für weitere Informationen.\n" -"Subversion ist Open Source Software, siehe http://subversion.apache.org/\n" +#: ../libsvn_repos/repos.c:262 +msgid "Creating lock dir" +msgstr "Erzeuge Verzeichnis für Datenbanksperren" -#: ../libsvn_subr/version.c:217 ../libsvn_subr/version.c:228 -#: ../libsvn_subr/version.c:234 ../libsvn_subr/version.c:251 -#: ../libsvn_subr/version.c:258 -#, c-format -msgid "Failed to parse version number string '%s'" -msgstr "Konnte Zeichenkette mit Versionsnummer »%s« nicht verarbeiten" +#: ../libsvn_repos/repos.c:367 +msgid "Creating hook directory" +msgstr "Lege Verzeichnis für Aktionen an" -#: ../libsvn_subr/xml.c:416 -#, c-format -msgid "Malformed XML: %s at line %ld" -msgstr "Fehlerhaftes XML: %s in Zeile %ld" +#: ../libsvn_repos/repos.c:420 +msgid "Creating start-commit hook" +msgstr "Erzeuge Aktion »start-commit«" -#: ../libsvn_wc/adm_crawler.c:119 -#, c-format -msgid "The existing node '%s' can not be restored." -msgstr "Der vorhandene Knoten »%s« kann nicht wiederhergestellt werden." +#: ../libsvn_repos/repos.c:483 +msgid "Creating pre-commit hook" +msgstr "Erzeuge Aktion »pre-commit«" -#: ../libsvn_wc/adm_crawler.c:138 -#, c-format -msgid "The node '%s' can not be restored." -msgstr "Der Knoten »%s« kann nicht wiederhergestellt werden." +#: ../libsvn_repos/repos.c:534 +msgid "Creating pre-revprop-change hook" +msgstr "Erzeuge Aktion »pre-revprop-change«" -#: ../libsvn_wc/adm_crawler.c:865 -msgid "Error aborting report" -msgstr "Fehler beim Abbrechen des Reports" +#: ../libsvn_repos/repos.c:600 +msgid "Creating pre-lock hook" +msgstr "Erzeuge Aktion »pre-lock«" -#: ../libsvn_wc/adm_crawler.c:978 -#, c-format -msgid "Pristine checksum for file '%s' is missing" -msgstr "Prüfsumme für ursprünglichen Inhalt der Datei »%s« fehlt" +#: ../libsvn_repos/repos.c:658 +msgid "Creating pre-unlock hook" +msgstr "Erzeuge Aktion »pre-unlock«" -#: ../libsvn_wc/adm_crawler.c:1143 -#, c-format -msgid "Checksum mismatch for text base of '%s'" -msgstr "Prüfsummenfehler für Textbasis von »%s«" +#: ../libsvn_repos/repos.c:691 +msgid "Creating post-commit hook" +msgstr "Erzeuge Aktion »post-commit«" -#: ../libsvn_wc/adm_crawler.c:1154 -#, c-format -msgid "While preparing '%s' for commit" -msgstr "Beim Vorbereiten von »%s« für die Übertragung" +#: ../libsvn_repos/repos.c:726 +msgid "Creating post-lock hook" +msgstr "Erzeuge Aktion »post-lock«" -#: ../libsvn_wc/adm_files.c:105 -#, c-format -msgid "'%s' is not a valid administrative directory name" -msgstr "»%s« ist kein gültiger Verwaltungsverzeichnisname" +#: ../libsvn_repos/repos.c:758 +msgid "Creating post-unlock hook" +msgstr "Erzeuge Aktion »post-unlock«" -#: ../libsvn_wc/adm_files.c:185 ../libsvn_wc/adm_files.c:241 -#, c-format -msgid "Can only get the pristine contents of files; '%s' is not a file" -msgstr "Kann nur ursprünglichen Inhalt von Dateien holen; »%s« ist keine Datei" +#: ../libsvn_repos/repos.c:799 +msgid "Creating post-revprop-change hook" +msgstr "Erzeuge Aktion »post-revprop-change«" -#: ../libsvn_wc/adm_files.c:194 ../libsvn_wc/adm_files.c:256 -#, c-format -msgid "Cannot get the pristine contents of '%s' because its delete is already committed" -msgstr "Kann den ursprünglichen Inhalt von »%s« nicht holen, da sein Löschen schon übertragen wurde" +#: ../libsvn_repos/repos.c:810 +msgid "Creating conf directory" +msgstr "Erzeuge Konfigurationsverzeichnis" -#: ../libsvn_wc/adm_files.c:202 ../libsvn_wc/adm_files.c:264 -#, c-format -msgid "Cannot get the pristine contents of '%s' because it has an unexpected status" -msgstr "Kann den ursprünglichen Inhalt von »%s« nicht holen, da es einen unerwarteten Status hat" +#: ../libsvn_repos/repos.c:899 +msgid "Creating svnserve.conf file" +msgstr "Erzeuge Datei »svnserve.conf«" -#: ../libsvn_wc/adm_files.c:209 -#, c-format -msgid "Node '%s' has no pristine text" -msgstr "Knoten »%s« hat keinen Ursprungstext" +#: ../libsvn_repos/repos.c:917 +msgid "Creating passwd file" +msgstr "Erzeuge Datei »passwd«" -#: ../libsvn_wc/adm_files.c:420 -#, c-format -msgid "Revision %ld doesn't match existing revision %ld in '%s'" -msgstr "Revision %ld passt nicht zur existierenden Revision %ld in »%s«" +#: ../libsvn_repos/repos.c:959 +msgid "Creating authz file" +msgstr "Erzeuge Datei »authz«" -#: ../libsvn_wc/adm_files.c:460 -#, c-format -msgid "URL '%s' (uuid: '%s') doesn't match existing URL '%s' (uuid: '%s') in '%s'" -msgstr "URL »%s« (UUID: »%s«) stimmt nicht mit der existierenden URL »%s« (UUID: »%s«) in »%s« überein" +#: ../libsvn_repos/repos.c:989 +msgid "Creating hooks-env file" +msgstr "Erzeuge Datei »hooks-env«" -#: ../libsvn_wc/adm_ops.c:313 ../libsvn_wc/update_editor.c:5302 -#, c-format -msgid "Can't find parent directory's node while trying to add '%s'" -msgstr "Kann Knoten des Elternverzeichnisses während des Hinzufügens von »%s« nicht finden" +#: ../libsvn_repos/repos.c:1045 +msgid "Could not create top-level directory" +msgstr "Konnte oberstes Verzeichnis nicht erzeugen" -#: ../libsvn_wc/adm_ops.c:322 ../libsvn_wc/update_editor.c:5296 -#, c-format -msgid "Can't add '%s' to a parent directory scheduled for deletion" -msgstr "" -"Kann »%s« nicht zu einem Elternverzeichnis hinzufügen, das selbst zum Löschen\n" -"vorgesehen ist" +#: ../libsvn_repos/repos.c:1055 +msgid "Creating DAV sandbox dir" +msgstr "Erzeuge Verzeichnis für DAV-Sandkasten" -#: ../libsvn_wc/adm_ops.c:329 ../libsvn_wc/update_editor.c:5309 -#, c-format -msgid "Can't schedule an addition of '%s' below a not-directory node" -msgstr "Kann »%s« nicht zum Hinzufügen unter einem Knoten vorsehen, der kein Verzeichnis ist" +#: ../libsvn_repos/repos.c:1124 +msgid "Error opening db lockfile" +msgstr "Fehler beim Öffnen der Datenbank-Sperrdatei" -#: ../libsvn_wc/adm_ops.c:390 +#: ../libsvn_repos/repos.c:1162 #, c-format -msgid "Can't create an entry with a reserved name while trying to add '%s'" -msgstr "Kann einen Eintrag mit einem reservierten Namen nicht erzeugen, während versucht wird, »%s« hinzuzufügen" +msgid "'%s' is an existing repository" +msgstr "»%s« ist ein vorhandenes Projektarchiv" -#: ../libsvn_wc/adm_ops.c:594 +#: ../libsvn_repos/repos.c:1167 #, c-format -msgid "The URL '%s' has a different repository root than its parent" -msgstr "Die URL »%s« hat eine andere Projektarchiv-Basis als ihr Vorgänger" +msgid "'%s' is a subdirectory of an existing repository rooted at '%s'" +msgstr "»%s« ist ein Unterverzeichnis eines existierenden Projektarchivs mit der Wurzel-URL »%s«" -#: ../libsvn_wc/adm_ops.c:614 -#, c-format -msgid "Can't schedule the working copy at '%s' from repository '%s' with uuid '%s' for addition under a working copy from repository '%s' with uuid '%s'." -msgstr "Kann Arbeitkopie »%s« des Projektarchivs »%s« mit UUID »%s« nicht zum Hinzufügen unter einer Arbeitskopie des Projektarchivs »%s« mit UUID »%s« vorsehen." +#: ../libsvn_repos/repos.c:1177 +msgid "Repository creation failed" +msgstr "Anlegen des Projektarchivs schlug fehl" -#: ../libsvn_wc/adm_ops.c:628 +#: ../libsvn_repos/repos.c:1267 #, c-format -msgid "Can't add '%s' with URL '%s', but with the data from '%s'" -msgstr "Kann »%s« mit URL »%s« aber den Daten von »%s« nicht hinzufügen" +msgid "Expected repository format '%d' or '%d'; found format '%d'" +msgstr "Erwartetes Format des Projektarchivs »%d« oder »%d«; gefunden »%d«" -#: ../libsvn_wc/cleanup.c:58 +#: ../libsvn_repos/repos.c:1580 #, c-format -msgid "'%s' is not a working copy directory" -msgstr "»%s« ist kein Verzeichnis einer Arbeitskopie" - -#: ../libsvn_wc/cleanup.c:64 -msgid "Log format too old, please use Subversion 1.6 or earlier" -msgstr "Log-Format zu alt, bitte verwenden Sie Subversion 1.6 oder älter" +msgid "unknown capability '%s'" +msgstr "unbekannte Eigenschaft »%s«" -#: ../libsvn_wc/conflicts.c:83 -msgid "Not a conflict skel" -msgstr "Ungültiges Konfliktskeleton" +#: ../libsvn_repos/rev_hunt.c:73 +#, c-format +msgid "Failed to find time on revision %ld" +msgstr "Konnte Zeit für Revision %ld nicht ermitteln" -#: ../libsvn_wc/conflicts.c:607 ../libsvn_wc/conflicts.c:704 -msgid "Not a completed conflict skel" -msgstr "Kein vollständiges Konfliktskeleton" +#: ../libsvn_repos/rev_hunt.c:210 ../libsvn_repos/rev_hunt.c:325 +#, c-format +msgid "Invalid start revision %ld" +msgstr "Ungültige Startrevision %ld" -#: ../libsvn_wc/conflicts.c:785 ../libsvn_wc/conflicts.c:858 -#: ../libsvn_wc/conflicts.c:948 -msgid "Conflict not set" -msgstr "Konflikt nicht gesetzt" +#: ../libsvn_repos/rev_hunt.c:505 +msgid "Unreadable path encountered; access denied" +msgstr "Nichtlesbarer Pfad angetroffen; Zugriff verweigert" -# CHECKME: s/callback/hook/ ?? -#: ../libsvn_wc/conflicts.c:1315 ../libsvn_wc/conflicts.c:1974 -#: ../libsvn_wc/conflicts.c:2019 -msgid "Conflict callback violated API: returned no results" -msgstr "Konflikt-Aktion Rückruffunktion die API: keine Ergebnisse wurden zurückgeliefert" +#: ../libsvn_repos/rev_hunt.c:1139 ../libsvn_repos/rev_hunt.c:1523 +#, c-format +msgid "'%s' is not a file in revision %ld" +msgstr "»%s« ist in Revision %ld keine Datei" -#: ../libsvn_wc/conflicts.c:1360 -msgid "Conflict callback violated API: returned no merged file" -msgstr "Konflikt-Aktion verletzte die API: keine zusammengeführte Datei wurde zurückgeliefert" +#: ../libsvn_subr/auth.c:246 +msgid "No authentication providers registered" +msgstr "Keine Anmeldemöglichkeiten registriert" -#: ../libsvn_wc/conflicts.c:1674 +#: ../libsvn_subr/auth.c:252 #, c-format -msgid "Conflict on '%s' could not be resolved because the chosen version of the file is not available." -msgstr "Konflikt von »%s« konnte nicht aufgelöst werden, da die gewählte Version der Datei nicht verfügbar ist." +msgid "No provider registered for '%s' credentials" +msgstr "Kein Anbieter für Zugangsdaten vom Typ »%s« registriert" -#: ../libsvn_wc/conflicts.c:2481 -msgid "Invalid 'conflict_result' argument" -msgstr "Ungültiger Parameter »conflict_result«" +#: ../libsvn_subr/cache-membuffer.c:838 +#, c-format +msgid "Can't lock cache mutex" +msgstr "Kann Zwischenspeicher-Mutex nicht sperren" -#: ../libsvn_wc/conflicts.c:2725 ../libsvn_wc/conflicts.c:2784 +#: ../libsvn_subr/cache-membuffer.c:876 ../libsvn_subr/cache-membuffer.c:897 #, c-format -msgid "Tree conflict can only be resolved to 'working' or 'mine-conflict' state; '%s' not resolved" -msgstr "Baumkonflikt kann nur zum Zustand »working« oder »mine-conflict« aufgelöst werden; Konflikt in »%s« nicht aufgelöst" +msgid "Can't write-lock cache mutex" +msgstr "Kann Zwischenspeicher-Mutex nicht für das Schreiben sperren" -#: ../libsvn_wc/conflicts.c:2811 +#: ../libsvn_subr/cache-membuffer.c:921 #, c-format -msgid "Tree conflict can only be resolved to 'working' state; '%s' is no longer moved" -msgstr "Baumkonflikt kann nur zum Zustand »working« aufgelöst werden; »%s« nicht länger verschoben" +msgid "Can't unlock cache mutex" +msgstr "Kann Zwischenspeicher-Mutex nicht entsperren" -#: ../libsvn_wc/conflicts.c:2829 +#: ../libsvn_subr/cache-membuffer.c:2040 #, c-format -msgid "Tree conflict can only be resolved to 'working' state; '%s' not resolved" -msgstr "Baumkonflikt kann nur zum Zustand »working« aufgelöst werden; Konflikt in »%s« nicht aufgelöst" +msgid "Can't create cache mutex" +msgstr "Kann Zwischenspeicher-Mutex nicht anlegen" -#: ../libsvn_wc/conflicts.c:3006 -msgid "No conflict-callback and no pre-defined conflict-choice provided" -msgstr "Keine Konflikt-Rückruffunktion oder Standard-Konfliktlösungsauswahl angegeben" +#: ../libsvn_subr/cache-membuffer.c:3036 +msgid "Can't iterate a membuffer-based cache" +msgstr "Kann einen »memcached«-Zwischenspeicher nicht durchlaufen" -#: ../libsvn_wc/conflicts.c:3234 -#, c-format -msgid "Unable to resolve pending conflict on '%s'" -msgstr "Kann ausstehenden Konflikt in »%s« nicht auflösen" +#: ../libsvn_subr/cache-membuffer.c:3387 +#, fuzzy +msgid "Prefix too long" +msgstr "Wort zu lang" -#: ../libsvn_wc/conflicts.c:3246 +# memcached is an APR library +#: ../libsvn_subr/cache-memcache.c:170 #, c-format -msgid "Unable to resolve conflicts on '%s'" -msgstr "Kann Konflikte in »%s« nicht auflösen" +msgid "Unknown memcached error while reading" +msgstr "Unbekannter »memcached«-Fehler beim Lesen" -#: ../libsvn_wc/copy.c:103 +#: ../libsvn_subr/cache-memcache.c:258 #, c-format -msgid "Source '%s' is unexpected kind" -msgstr "Quelle »%s« ist unbekannten Typs" +msgid "Unknown memcached error while writing" +msgstr "Unbekannter »memcached«-Fehler beim Schreiben" -#: ../libsvn_wc/copy.c:471 +#: ../libsvn_subr/cache-memcache.c:364 +msgid "Can't iterate a memcached cache" +msgstr "Kann keinen »memcached«-Zwischenspeicher durchlaufen" + +#: ../libsvn_subr/cache-memcache.c:460 #, c-format -msgid "cannot handle node kind for '%s'" -msgstr "Kann Knotentyp für »%s« nicht verarbeiten" +msgid "Error parsing memcache server '%s'" +msgstr "Fehler beim Abfragen des »memcache«-Servers »%s«" -#: ../libsvn_wc/copy.c:493 ../libsvn_wc/wc_db.c:4626 ../libsvn_wc/wc_db.c:5429 +#: ../libsvn_subr/cache-memcache.c:468 #, c-format -msgid "Cannot handle status of '%s'" -msgstr "Kann Status von »%s« nicht verarbeiten" +msgid "Scope not allowed in memcache server '%s'" +msgstr "Bereich ist im »memcache«-Server »%s« nicht erlaubt" -#: ../libsvn_wc/copy.c:502 ../libsvn_wc/wc_db.c:4617 ../libsvn_wc/wc_db.c:5423 -#: ../libsvn_wc/wc_db.c:5667 +#: ../libsvn_subr/cache-memcache.c:476 #, c-format -msgid "Cannot copy '%s' excluded by server" -msgstr "Kann vom Server ausgeschlossenes »%s« nicht kopieren" +msgid "Must specify host and port for memcache server '%s'" +msgstr "Der Rechner und Port muss für den »memcache«-Server »%s« festgelegt werden" -#: ../libsvn_wc/copy.c:643 +#: ../libsvn_subr/cache-memcache.c:496 #, c-format -msgid "Deleted node '%s' can't be copied." -msgstr "Gelöschter Knoten »%s« kann nicht kopiert werden." +msgid "Unknown error creating memcache server" +msgstr "Unbekannter Fehler beim Erzeugen eines »memcache«-Servers" -#: ../libsvn_wc/copy.c:661 +#: ../libsvn_subr/cache-memcache.c:504 #, c-format -msgid "'%s' is the root of a working copy and cannot be moved" -msgstr "»%s« ist das Basisverzeichnis einer Arbeitskopie und kann nicht verschoben werden" +msgid "Unknown error adding server to memcache" +msgstr "Unbekannter Fehler beim Hinzufügen des Servers zu »memcache«" -#: ../libsvn_wc/copy.c:669 +#: ../libsvn_subr/cache-memcache.c:574 #, c-format -msgid "'%s' represents the repository root and cannot be moved" -msgstr "»%s« repräsentiert die Wurzel eines Projektarchivs und kann nicht verschoben werden " +msgid "Unknown error creating apr_memcache_t" +msgstr "Unbekannter Fehler beim Anlegen von apr_memcache_t" -#: ../libsvn_wc/copy.c:744 +#: ../libsvn_subr/checksum.c:353 +#, fuzzy, c-format +msgid "Invalid prefix in checksum '%s'" +msgstr "Ungültige Revisionsnummer »%s«" + +#: ../libsvn_subr/checksum.c:689 #, c-format -msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'" +msgid "" +"%s:\n" +" expected: %s\n" +" actual: %s\n" msgstr "" -"Kann »%s« nicht kopieren, da es nicht aus dem Projektarchiv »%s« stammt\n" -"sondern aus »%s«" +"%s:\n" +" Erwartet: %s\n" +" Tatsächlich: %s\n" -#: ../libsvn_wc/copy.c:752 +#: ../libsvn_subr/cmdline.c:779 #, c-format -msgid "Cannot copy to '%s' as it is scheduled for deletion" -msgstr "Kann nach »%s« kopieren, da es zum Löschen vorgesehen ist" +msgid "Error initializing command line arguments" +msgstr "Fehler beim Initialisieren der Kommandozeilenparameter" -#: ../libsvn_wc/copy.c:780 -#, c-format -msgid "'%s' is already under version control but is excluded." -msgstr "»%s« befindet sich bereits unter Versionskontrolle, ist aber ausgeschlossen." +#: ../libsvn_subr/cmdline.c:889 +#, fuzzy, c-format +msgid "Ignoring unknown value '%s'; did you mean '%s'?" +msgstr "Syntaxfehler bei der Analyse der Fix-Revision »%s«; Meinten Sie '%s@'?" -#: ../libsvn_wc/copy.c:795 -#, c-format -msgid "There is already a versioned item '%s'" -msgstr "Es existiert bereits ein versioniertes Objekt »%s«" +# password store: kwallet, ... +#: ../libsvn_subr/cmdline.c:894 +#, fuzzy, c-format +msgid "Ignoring unknown value '%s'" +msgstr "Ungültige Konfiguration: Unbekanntes %s »%s«" + +#: ../libsvn_subr/cmdline.c:989 +msgid "Invalid syntax of argument of --config-option" +msgstr "Ungültige Syntax im Argument von --config-option" -#: ../libsvn_wc/copy.c:811 +#: ../libsvn_subr/cmdline.c:1016 #, c-format -msgid "'%s' already exists and is in the way" -msgstr "»%s« existiert bereits und ist im Weg" +msgid "Unrecognized file in argument of %s" +msgstr "Unbekannte Datei im Parameter von %s" + +# FIXME: s/whitespace/whitespaceS/? +#: ../libsvn_subr/cmdline.c:1288 +msgid "The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-time configuration option is empty or consists solely of whitespace. Expected a shell command." +msgstr "Die Umgebungsvariable EDITOR, SVN_EDITOR oder VISUAL oder die Laufzeitkonfigurationsoption »editor-cmd« ist leer oder besteht nur aus Leerzeichen. Erwartete ein Shell-Kommando." + +#: ../libsvn_subr/cmdline.c:1295 +msgid "None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and no 'editor-cmd' run-time configuration option was found" +msgstr "Keine der Umgebungsvariablen SVN_EDITOR, VISUAL oder EDITOR ist gesetzt und keine Laufzeitkonfigurationsoption »editor-cmd« wurde gefunden" -#: ../libsvn_wc/copy.c:863 +#: ../libsvn_subr/cmdline.c:1320 ../libsvn_subr/cmdline.c:1404 #, c-format -msgid "Cannot move mixed-revision subtree '%s' [%ld:%ld]; try updating it first" -msgstr "Kann Unterbaum »%s« mit verschiedenen Revisionen nicht verschieben [%ld:%ld], versuchen Sie erst zu aktualisieren" +msgid "Can't get working directory" +msgstr "Kann Arbeitsverzeichnis nicht ermitteln" -#: ../libsvn_wc/crop.c:206 +#: ../libsvn_subr/cmdline.c:1331 ../libsvn_subr/cmdline.c:1415 +#: ../libsvn_subr/cmdline.c:1440 #, c-format -msgid "Cannot exclude '%s': it is a working copy root" -msgstr "Kann »%s« nicht ausschließen: Es ist die Basis einer Arbeitskopie" +msgid "Can't change working directory to '%s'" +msgstr "Kann Arbeitsverzeichnis nicht nach »%s« wechseln" -#: ../libsvn_wc/crop.c:214 +#: ../libsvn_subr/cmdline.c:1339 ../libsvn_subr/cmdline.c:1567 #, c-format -msgid "Cannot exclude '%s': it is a switched path" -msgstr "Kann »%s« nicht ausschließen: Es ist ein umgestellter Pfad" +msgid "Can't restore working directory" +msgstr "Kann nicht in das Arbeitsverzeichnis zurückwechseln" -#: ../libsvn_wc/crop.c:241 +#: ../libsvn_subr/cmdline.c:1346 ../libsvn_subr/cmdline.c:1509 #, c-format -msgid "Cannot exclude '%s': it is to be added to the repository. Try commit instead" -msgstr "Kann »%s« nicht ausschließen: Es soll dem Projektarchiv hinzugefügt werden. Versuchen Sie stattdessen es zu übertragen" +msgid "system('%s') returned %d" +msgstr "Aufruf des Editors »%s« gab Fehler %d zurück" -#: ../libsvn_wc/crop.c:248 +#: ../libsvn_subr/cmdline.c:1540 +msgid "Error normalizing edited contents to internal format" +msgstr "Fehler beim Normalisieren des bearbeiteten Inhalts ins interne Format" + +#: ../libsvn_subr/cmdline.c:1610 #, c-format -msgid "Cannot exclude '%s': it is to be deleted from the repository. Try commit instead" -msgstr "Kann »%s« nicht ausschließen: Es soll aus dem Projektarchiv entfernt werden. Versuchen Sie stattdessen es zu übertragen" +msgid "" +"Unknown value '%s' for %s.\n" +"Supported values: %s" +msgstr "" -# CHECKME: Check translation of crop (beschneiden?)!!!! -#: ../libsvn_wc/crop.c:319 -msgid "Can only crop a working copy with a restrictive depth" -msgstr "Kann nur eine Arbeitskopie mit einer eingeschränkten Tiefe beschneiden" +#: ../libsvn_subr/cmdline.c:1663 +msgid "Caught signal" +msgstr "Abbruchsignal empfangen" -#: ../libsvn_wc/crop.c:330 -msgid "Can only crop directories" -msgstr "Kann nur Verzeichnisse beschneiden" +#: ../libsvn_subr/compress_lz4.c:92 +#, fuzzy +msgid "Decompression of compressed data failed: no size" +msgstr "Dekomprimierung der mit zlib komprimierten Daten schlug fehl: Größe nicht angegeben" -#: ../libsvn_wc/crop.c:343 -#, c-format -msgid "Cannot crop '%s': it is going to be removed from repository. Try commit instead" -msgstr "Kann »%s« nicht beschneiden: Es soll vom Projektarchiv entfernt werden. Versuchen Sie stattdessen es zu übertragen" +#: ../libsvn_subr/compress_lz4.c:96 +#, fuzzy +msgid "Decompression of compressed data failed: size too large" +msgstr "Dekomprimierung der mit zlib komprimierten Daten schlug fehl: Größe zu groß" -#: ../libsvn_wc/crop.c:350 -#, c-format -msgid "Cannot crop '%s': it is to be added to the repository. Try commit instead" -msgstr "Kann »%s« nicht beschneiden: Es soll dem Projektarchiv hinzugefügt werden. Versuchen Sie stattdessen es zu übertragen" +#: ../libsvn_subr/compress_lz4.c:120 ../libsvn_subr/compress_zlib.c:173 +msgid "Size of uncompressed data does not match stored original length" +msgstr "Die Größe der unkomprimierten Daten entspricht nicht der gespeicherten Originallänge" -#: ../libsvn_wc/delete.c:238 ../libsvn_wc/delete.c:358 -#, c-format -msgid "'%s' cannot be deleted" -msgstr "»%s« kann nicht gelöscht werden" +#: ../libsvn_subr/compress_zlib.c:102 +msgid "Compression of svndiff data failed" +msgstr "Komprimierung der svndiff-Daten schlug fehl" -#: ../libsvn_wc/delete.c:256 ../libsvn_wc/delete.c:374 -#, c-format -msgid "'%s' is the root of a working copy and cannot be deleted" -msgstr "»%s« ist das Basisverzeichnis einer Arbeitskopie und kann nicht gelöscht werden" +#: ../libsvn_subr/compress_zlib.c:138 +msgid "Decompression of zlib compressed data failed: no size" +msgstr "Dekomprimierung der mit zlib komprimierten Daten schlug fehl: Größe nicht angegeben" -#: ../libsvn_wc/delete.c:263 ../libsvn_wc/delete.c:380 -#, c-format -msgid "'%s' represents the repository root and cannot be deleted" -msgstr "»%s« repräsentiert die Wurzel eines Projektarchivs und kann nicht gelöscht werden" +#: ../libsvn_subr/compress_zlib.c:141 +msgid "Decompression of zlib compressed data failed: size too large" +msgstr "Dekomprimierung der mit zlib komprimierten Daten schlug fehl: Größe zu groß" -#: ../libsvn_wc/delete.c:474 -#, c-format -msgid "File '%s' has local modifications" -msgstr "Die Datei »%s« hat lokale Änderungen" +#: ../libsvn_subr/compress_zlib.c:166 +msgid "Decompression of svndiff data failed" +msgstr "Dekomprimierung der svndiff-Daten schlug fehl" -#: ../libsvn_wc/deprecated.c:2363 +#: ../libsvn_subr/compress_zlib.c:189 #, c-format -msgid "Unexpectedly found '%s': path is marked 'missing'" -msgstr "Unerwartetes »%s« gefunden: Pfad wird als »fehlend« markiert" +msgid "Unsupported compression method %d" +msgstr "Nicht unterstützte Komprimierungsmethode %d" -#: ../libsvn_wc/entries.c:1100 +#: ../libsvn_subr/config.c:883 #, c-format -msgid "'%s' is not a versioned working copy" -msgstr "»%s« ist keine versionierte Arbeitskopie" +msgid "Config error: invalid boolean value '%s' for '[%s] %s'" +msgstr "Konfigurationsfehler: Ungültiger logischer Wert »%s« für »[%s] %s«" -#: ../libsvn_wc/entries.c:1396 +#: ../libsvn_subr/config.c:888 #, c-format -msgid "Admin area of '%s' is missing" -msgstr "Administrativer Bereich von »%s« fehlt" +msgid "Config error: invalid boolean value '%s' for '%s'" +msgstr "Konfigurationsfehler: Ungültiger logischer Wert »%s« für »%s«" -#: ../libsvn_wc/entries.c:1416 +#: ../libsvn_subr/config.c:1306 #, c-format -msgid "'%s' is not of the right kind" -msgstr "»%s« hat einen falschen Typ" +msgid "Config error: invalid integer value '%s'" +msgstr "Konfigurationsfehler: Ungültige Ganzzahl »%s«" -#: ../libsvn_wc/entries.c:1578 -#, c-format -msgid "The file '%s' has no checksum" -msgstr "Datei »%s« hat keine Prüfsumme" +#: ../libsvn_subr/config_auth.c:96 +msgid "Unable to open auth file for reading" +msgstr "Kann »Auth« Datei nicht zum Lesen öffnen" -#: ../libsvn_wc/entries.c:1696 +#: ../libsvn_subr/config_auth.c:101 #, c-format -msgid "Unable to upgrade '%s' at line %d" -msgstr "Kann »%s« nicht in ein neues Format überführen in Zeile %d" +msgid "Error parsing '%s'" +msgstr "Fehler beim Zerlegen von »%s«" -#: ../libsvn_wc/entries.c:1935 -#, c-format -msgid "No copyfrom URL for '%s'" -msgstr "Keine »copyfrom« URL für »%s« " +# Ist hier jetzt 'Authentifizierung' = Anmeldung oder 'Autorisierung' = Berechtigung gemeint? +#: ../libsvn_subr/config_auth.c:130 +msgid "Unable to locate auth file" +msgstr "Kann »Auth« Datei nicht finden" -#: ../libsvn_wc/entries.c:2167 -#, c-format -msgid "Bad base MD5 checksum for '%s'; expected: '%s'; found '%s'; " -msgstr "MD5-Prüfsummenfehler für Basis »%s«; erwartet: »%s«, tatsächlich: »%s«" +#: ../libsvn_subr/config_auth.c:142 +msgid "Unable to open auth file for writing" +msgstr "Kann »Auth« Datei nicht zum Schreiben öffnen" -#: ../libsvn_wc/entries.c:2520 +#: ../libsvn_subr/config_auth.c:144 #, c-format -msgid "No default entry in directory '%s'" -msgstr "Verzeichnis »%s« hat keinen Standardeintrag" +msgid "Error writing hash to '%s'" +msgstr "Fehler beim Schreiben des Hashwerts nach »%s«" -#: ../libsvn_wc/entries.c:2676 +#: ../libsvn_subr/config_file.c:524 #, c-format -msgid "Directory '%s' has no THIS_DIR entry" -msgstr "Verzeichnis »%s« hat keinen »THIS_DIR« Eintrag" +msgid "line %d: Option must end with ':' or '='" +msgstr "Zeile %d: Option muss mit »:« oder »=« enden" -#: ../libsvn_wc/entries.c:2856 ../libsvn_wc/node.c:403 +#: ../libsvn_subr/config_file.c:576 #, c-format -msgid "'%s' has an unrecognized node kind" -msgstr "»%s« hat einen nicht erkannten Knotentyp" +msgid "line %d: Section header must end with ']'" +msgstr "Zeile %d: Abschnittskopf muss mit »]« enden" -#: ../libsvn_wc/externals.c:158 ../libsvn_wc/externals.c:247 +#: ../libsvn_subr/config_file.c:748 #, c-format -msgid "Error parsing %s property on '%s': '%s'" -msgstr "Fehler beim Analysieren der %s Eigenschaft für »%s«: »%s«" +msgid "Error while parsing config file: %s:" +msgstr "Fehler beim Auswerten der Konfigurationsdatei: %s:" -#: ../libsvn_wc/externals.c:214 +#: ../libsvn_subr/config_file.c:795 #, c-format -msgid "Can't split line into components: '%s'" -msgstr "Zeile kann nicht in Komponenten zerlegt werden: »%s«" +msgid "line %d: Section header must start in the first column" +msgstr "Zeile %d: Abschnittskopf muss in der ersten Spalte beginnen" -#: ../libsvn_wc/externals.c:273 +#: ../libsvn_subr/config_file.c:820 #, c-format -msgid "Invalid %s property on '%s': cannot use two absolute URLs ('%s' and '%s') in an external; one must be a path where an absolute or relative URL is checked out to" -msgstr "Ungültige Eigenschaft %s zu »%s«: Es können nicht zwei absolute URLs (»%s« und »%s«) in einem externen Verweis verwendet werden; eine muss ein Pfad sein, in den eine absolute oder relative URL ausgecheckt wird" +msgid "line %d: Comment must start in the first column" +msgstr "Zeile %d: Kommentar muss in der ersten Spalte beginnen" -#: ../libsvn_wc/externals.c:282 ../libsvn_wc/externals.c:290 +#: ../libsvn_subr/config_file.c:835 #, c-format -msgid "Invalid %s property on '%s': cannot use a URL '%s' as the target directory for an external definition" -msgstr "Ungültige Eigenschaft %s zu »%s«: Eine URL »%s« kann nicht als Zielverzeichnis für eine externe Definition verwendet werden" +msgid "line %d: Section header expected" +msgstr "Zeile %d: Abschnittskopf erwartet" -#: ../libsvn_wc/externals.c:354 +#: ../libsvn_subr/config_file.c:839 #, c-format -msgid "Invalid %s property on '%s': target '%s' is an absolute path or involves '..'" -msgstr "Ungültige Eigenschaft %s auf »%s«: Ziel »%s« ist ein absoluter Pfad oder enthält »..«" +msgid "line %d: Option expected" +msgstr "Zeile %d: Option erwartet" -#: ../libsvn_wc/externals.c:546 ../libsvn_wc/externals.c:569 -#, c-format -msgid "This editor can only update '%s'" -msgstr "Dieser Editor kann nur »%s« aktualisieren" +#: ../libsvn_subr/config_win.c:93 +msgid "Can't determine the system config path" +msgstr "Kann Pfad für die Systemeinstellungen nicht ermitteln" -#: ../libsvn_wc/externals.c:584 ../libsvn_wc/externals.c:1031 -#, c-format -msgid "Node '%s' is no existing file external" -msgstr "Knoten »%s« ist kein vorhandener externer Dateiverweis" +#: ../libsvn_subr/config_win.c:94 +msgid "Can't determine the user's config path" +msgstr "Kann Pfad für die Benutzereinstellungen nicht ermitteln" -#: ../libsvn_wc/externals.c:1600 -#, c-format -msgid "URL '%s' does not begin with a scheme" -msgstr "Die URL »%s« beginnt nicht mit einem Schema" +#: ../libsvn_subr/config_win.c:137 +msgid "Can't enumerate registry values" +msgstr "Kann Werte in der Registrierungsdatenbank nicht aufzählen" -#: ../libsvn_wc/externals.c:1655 -#, c-format -msgid "Illegal parent directory URL '%s'" -msgstr "Illegale URL des übergeordneten Verzeichnisses »%s«" +#: ../libsvn_subr/config_win.c:154 +msgid "Can't read registry value data" +msgstr "Kann Daten für Werte in der Registrierungsdatenbank nicht lesen" -#: ../libsvn_wc/externals.c:1694 +#: ../libsvn_subr/config_win.c:191 #, c-format -msgid "Illegal repository root URL '%s'" -msgstr "Illegale Projektarchivwurzel-URL »%s«" +msgid "Unrecognised registry path '%s'" +msgstr "Unbekannter Pfad in Registrierungsdatenbank »%s«" -#: ../libsvn_wc/externals.c:1739 +#: ../libsvn_subr/config_win.c:207 ../libsvn_subr/config_win.c:212 #, c-format -msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'" -msgstr "Die externe relative URL »%s« darf keinen Verweis auf übergeordnete Pfade haben, d.h. »..«" +msgid "Can't open registry key '%s'" +msgstr "Kann Schlüssel »%s« in Registrierungsdatenbank nicht öffnen" -#: ../libsvn_wc/externals.c:1767 -#, c-format -msgid "Unrecognized format for the relative external URL '%s'" -msgstr "Unbekanntes Format für die relative externe URL »%s«" +#: ../libsvn_subr/config_win.c:250 +msgid "Can't enumerate registry keys" +msgstr "Kann Schlüssel in der Registrierungsdatenbank nicht aufzählen" -#: ../libsvn_wc/lock.c:529 -#, c-format -msgid "Path '%s' ends in '%s', which is unsupported for this operation" -msgstr "Pfad »%s« endet mit »%s«, was für diese Operation nicht erlaubt ist" +#: ../libsvn_subr/config_win.c:260 +msgid "Can't open existing subkey" +msgstr "Kann vorhandenen Unterschlüssel nicht öffnen" -#: ../libsvn_wc/lock.c:773 +#: ../libsvn_subr/crypto.c:93 #, c-format -msgid "Working copy '%s' locked" -msgstr "Arbeitskopie »%s« gesperrt" +msgid "Failed to initialize cryptography subsystem" +msgstr "Konnte Kryptographie-Subsystem nicht initialisieren" -#: ../libsvn_wc/lock.c:918 +#: ../libsvn_subr/crypto.c:108 #, c-format -msgid "Unable to check path existence for '%s'" -msgstr "Kann die Existenz des Pfades »%s« nicht prüfen" +msgid "code (%d), reason (\"%s\"), msg (\"%s\")" +msgstr "Code (%d), Ursache (\"%s\"), Meldung (\"%s\")" -#: ../libsvn_wc/lock.c:941 +#: ../libsvn_subr/crypto.c:134 #, c-format -msgid "Expected '%s' to be a directory but found a file" -msgstr "Erwartete, dass »%s« ein Verzeichnis ist, es ist aber eine Datei" +msgid "Fetching error from APR" +msgstr "Hole Fehler von APR" -#: ../libsvn_wc/lock.c:951 +#: ../libsvn_subr/crypto.c:154 #, c-format -msgid "Can't retrieve an access baton for non-directory '%s'" -msgstr "Kann keine Zugriffsreferenz für nicht-Verzeichnis »%s« erhalten" +msgid "Error obtaining random data" +msgstr "Fehler bei der Abfrage von Zufallsdaten" -#: ../libsvn_wc/lock.c:960 -#, c-format -msgid "Directory '%s' is missing" -msgstr "Verzeichnis »%s« fehlt" +#: ../libsvn_subr/crypto.c:224 +msgid "OpenSSL crypto driver error" +msgstr "Fehler im OpenSSL Kryptologietreiber" -#: ../libsvn_wc/lock.c:968 -#, c-format -msgid "Working copy '%s' is not locked" -msgstr "Arbeitskopie »%s« ist nicht gesperrt" +#: ../libsvn_subr/crypto.c:228 +msgid "Bad return value while loading crypto driver" +msgstr "Fehlerhafter Rückgabewert beim Laden des Kryptologietreibers" -#: ../libsvn_wc/lock.c:1382 ../libsvn_wc/wc_db.c:4950 -#: ../libsvn_wc/wc_db.c:16213 ../libsvn_wc/wc_db_update_move.c:130 -#, c-format -msgid "No write-lock in '%s'" -msgstr "Keine Schreibsperre in »%s«" +#: ../libsvn_subr/crypto.c:234 +msgid "Error creating OpenSSL crypto context" +msgstr "Fehler beim Erzeugen des OpenSSL Kryptologiekontextes" -#: ../libsvn_wc/lock.c:1496 -#, c-format -msgid "Can't obtain lock on non-directory '%s'." -msgstr "Kann keine Sperre für nicht-Verzeichnis »%s« erhalten." +#: ../libsvn_subr/crypto.c:291 ../libsvn_subr/crypto.c:294 +#: ../libsvn_subr/crypto.c:419 ../libsvn_subr/crypto.c:422 +#: ../libsvn_subr/crypto.c:526 ../libsvn_subr/crypto.c:529 +#: ../libsvn_subr/crypto.c:641 ../libsvn_subr/crypto.c:644 +msgid "Error creating derived key" +msgstr "Fehler beim Erstellen des abgeleiteten Schlüssels" -#: ../libsvn_wc/merge.c:1285 ../libsvn_wc/props.c:232 -#, c-format -msgid "Can't merge into conflicted node '%s'" -msgstr "Kann nicht in Knoten mit Konflikt »%s« zusammenführen" +#: ../libsvn_subr/crypto.c:297 ../libsvn_subr/crypto.c:425 +#: ../libsvn_subr/crypto.c:532 ../libsvn_subr/crypto.c:647 +msgid "Unexpected IV length returned" +msgstr "Unerwartete Länge des Initialisierungsvektors erhalten" -#: ../libsvn_wc/merge.c:1328 ../libsvn_wc/props.c:248 -#, c-format -msgid "The property '%s' may not be merged into '%s'." -msgstr "Eigenschaft »%s« darf nicht nach »%s« zusammengeführt werden." +#: ../libsvn_subr/crypto.c:308 ../libsvn_subr/crypto.c:543 +msgid "Error initializing block encryption" +msgstr "Fehler bei der Initialisierung der Blockverschlüsselung" -#: ../libsvn_wc/node.c:749 -#, c-format -msgid "Incomplete copy information on path '%s'." -msgstr "Unvollständige Informationen für Kopie in Pfad »%s«" +#: ../libsvn_subr/crypto.c:347 ../libsvn_subr/crypto.c:444 +#: ../libsvn_subr/crypto.c:565 ../libsvn_subr/crypto.c:666 +msgid "Error fetching result length" +msgstr "Fehler beim Lesen der Länge des Ergebisses" -#: ../libsvn_wc/node.c:914 -#, c-format -msgid "'%s' is not the root of the working copy '%s'" -msgstr "»%s« ist nicht die Basis des Projektarchivs »%s«" +#: ../libsvn_subr/crypto.c:360 ../libsvn_subr/crypto.c:578 +msgid "Error during block encryption" +msgstr "Fehler bei der Verschlüsselung eines Blocks" -#: ../libsvn_wc/old-and-busted.c:123 -msgid "Invalid escape sequence" -msgstr "Ungültige Escape-Sequenz" +#: ../libsvn_subr/crypto.c:372 ../libsvn_subr/crypto.c:590 +msgid "Error finalizing block encryption" +msgstr "Fehler beim Abschließen der Blockverschlüsselung" -#: ../libsvn_wc/old-and-busted.c:130 -msgid "Invalid escaped character" -msgstr "Ungültiges geschütztes Zeichen" +#: ../libsvn_subr/crypto.c:428 ../libsvn_subr/crypto.c:650 +msgid "Provided IV has incorrect length" +msgstr "Angegebener Initialisierungsvektor hat eine falsche Länge" -#: ../libsvn_wc/old-and-busted.c:148 ../libsvn_wc/old-and-busted.c:177 -#: ../libsvn_wc/old-and-busted.c:241 ../libsvn_wc/old-and-busted.c:253 -msgid "Unexpected end of entry" -msgstr "Unerwartetes Ende des Eintrags" +#: ../libsvn_subr/crypto.c:436 ../libsvn_subr/crypto.c:658 +msgid "Error initializing block decryption" +msgstr "Fehler bei der Initialisierung des Blockentschlüsselung" -#: ../libsvn_wc/old-and-busted.c:203 -#, c-format -msgid "Entry contains non-canonical path '%s'" -msgstr "Eintrag enthält nichtkanonischen Pfad »%s«" +#: ../libsvn_subr/crypto.c:455 ../libsvn_subr/crypto.c:677 +msgid "Error during block decryption" +msgstr "Fehler bei der Entschlüsselung eines Blocks" -#: ../libsvn_wc/old-and-busted.c:275 +#: ../libsvn_subr/crypto.c:464 ../libsvn_subr/crypto.c:686 +msgid "Error finalizing block decryption" +msgstr "Fehler beim Abschließen der Blockentschlüsselung" + +#: ../libsvn_subr/date.c:307 #, c-format -msgid "Invalid value for field '%s'" -msgstr "Ungültiger Wert für Feld »%s«" +msgid "Can't manipulate current date" +msgstr "Kann das aktuelle Datum nicht manipulieren" -#: ../libsvn_wc/old-and-busted.c:347 +#: ../libsvn_subr/date.c:381 ../libsvn_subr/date.c:389 #, c-format -msgid "Found an unexpected \\0 in the file external '%s'" -msgstr "Ein nicht erwartetes \\0 wurde im externen Dateiverweis »%s« gefunden" +msgid "Can't calculate requested date" +msgstr "Kann die das angeforderte Datum nicht berechnen" -#: ../libsvn_wc/old-and-busted.c:391 +#: ../libsvn_subr/date.c:384 #, c-format -msgid "Illegal file external revision kind %d for path '%s'" -msgstr "Ungültiger Revisionstyp des externen Dateiverweises %d für Pfad »%s«" +msgid "Can't expand time" +msgstr "Kann Zeitangabe nicht expandieren" -#: ../libsvn_wc/old-and-busted.c:489 ../libsvn_wc/old-and-busted.c:847 +#: ../libsvn_subr/deprecated.c:365 ../libsvn_subr/opt.c:410 +#: ../libsvn_subr/opt.c:513 +msgid "" +"\n" +"Valid options:\n" +msgstr "" +"\n" +"Gültige Optionen:\n" + +#: ../libsvn_subr/deprecated.c:441 ../libsvn_subr/opt.c:693 +#: ../libsvn_subr/opt.c:719 #, c-format -msgid "Entry '%s' has invalid node kind" -msgstr "Eintrag »%s« hat einen ungültigen Knotentyp" +msgid "" +"\"%s\": unknown command.\n" +"\n" +msgstr "" +"»%s«: unbekannter Befehl.\n" +"\n" -#: ../libsvn_wc/old-and-busted.c:510 ../libsvn_wc/old-and-busted.c:827 +#: ../libsvn_subr/deprecated.c:619 ../libsvn_subr/opt.c:1534 +#: ../libsvn_subr/opt.c:1584 ../svnrdump/svnrdump.c:603 #, c-format -msgid "Entry for '%s' has invalid repository root" -msgstr "Eintrag »%s« hat eine ungültige Projektarchiv-Basis" +msgid "Type '%s help' for usage.\n" +msgstr "Geben Sie »%s help« für weitere Hilfe ein.\n" -#: ../libsvn_wc/old-and-busted.c:531 ../libsvn_wc/old-and-busted.c:872 +#: ../libsvn_subr/deprecated.c:1047 #, c-format -msgid "Entry '%s' has invalid 'schedule' value" -msgstr "Eintrag »%s« hat einen ungültigen Wert für »schedule«" +msgid "'%s' is neither a file nor a directory name" +msgstr "»%s« ist weder ein Datei- noch ein Verzeichnisname" -#: ../libsvn_wc/old-and-busted.c:681 +#: ../libsvn_subr/dirent_uri.c:1634 #, c-format -msgid "Entry '%s' has invalid 'depth' value" -msgstr "Eintrag »%s« hat einen ungültigen Wert für »depth«" +msgid "Couldn't determine absolute path of '%s'" +msgstr "Konnte den absoluten Pfad von »%s« nicht ermitteln" -#: ../libsvn_wc/old-and-busted.c:732 +#: ../libsvn_subr/dirent_uri.c:2348 #, c-format -msgid "Entry '%s' has invalid '%s' value" -msgstr "Eintrag »%s« hat einen ungültigen »%s« Wert" +msgid "Local URL '%s' does not contain 'file://' prefix" +msgstr "Lokale URL »%s« enthält keinen »file://« Präfix" -#: ../libsvn_wc/old-and-busted.c:1085 +#: ../libsvn_subr/dirent_uri.c:2432 #, c-format -msgid "XML parser failed in '%s'" -msgstr "XML-Parser schlug in »%s« fehl" - -#: ../libsvn_wc/old-and-busted.c:1141 -msgid "Missing default entry" -msgstr "Fehlender Standardeintrag" - -#: ../libsvn_wc/old-and-busted.c:1146 -msgid "Default entry has no revision number" -msgstr "Standardeintrag hat keine Revisionsnummer" - -#: ../libsvn_wc/old-and-busted.c:1151 -msgid "Default entry is missing URL" -msgstr "Standardeintrag hat keine URL" +msgid "Local URL '%s' contains only a hostname, no path" +msgstr "Lokale URL »%s« enthält nur einen Rechnernamen aber keinen Pfad" -#: ../libsvn_wc/old-and-busted.c:1230 +#: ../libsvn_subr/dirent_uri.c:2446 #, c-format -msgid "Invalid version line in entries file of '%s'" -msgstr "Ungültige Versionszeile in Datei »entry« von »%s«" - -#: ../libsvn_wc/old-and-busted.c:1247 -msgid "Missing entry terminator" -msgstr "Fehlender Abschluss des Eintrags" - -#: ../libsvn_wc/old-and-busted.c:1250 -msgid "Invalid entry terminator" -msgstr "Ungültiger Abschluss des Eintrags" +msgid "Local URL '%s' contains unsupported hostname" +msgstr "Lokale URL »%s« enthält einen nicht unterstützten Rechnernamen" -#: ../libsvn_wc/old-and-busted.c:1254 -#, c-format -msgid "Error at entry %d in entries file for '%s':" -msgstr "Fehler bei Eintrag %d in Eintragsdatei für »%s«:" +#: ../libsvn_subr/error.c:634 +msgid "Can't recode error string from APR" +msgstr "Kann Fehlermeldung von APR nicht umkodieren" -#: ../libsvn_wc/props.c:211 +#: ../libsvn_subr/error.c:727 #, c-format -msgid "The node '%s' does not have properties in this state." -msgstr "Der Knoten »%s« hat in diesem Zustand keine Eigenschaften." +msgid "%swarning: W%06d: %s\n" +msgstr "%sWarnung: W%06d: %s\n" -#: ../libsvn_wc/props.c:377 +#: ../libsvn_subr/error.c:833 #, c-format -msgid "" -"Trying to add new property '%s'\n" -"but the property already exists.\n" -msgstr "" -"Versuch, eine neue Eigenschaft »%s« hinzuzufügen,\n" -"aber die Eigenschaft existiert bereits.\n" +msgid "In file '%s' line %d: assertion failed (%s)" +msgstr "In Datei »%s«, Zeile %d: Assert-Anweisung schlug fehl (%s)" -#: ../libsvn_wc/props.c:386 +#: ../libsvn_subr/error.c:837 #, c-format -msgid "" -"Trying to add new property '%s'\n" -"but the property has been locally deleted.\n" -msgstr "" -"Versuch, eine neue Eigenschaft »%s« hinzuzufügen,\n" -"aber die Eigenschaft wurde lokal gelöscht.\n" +msgid "In file '%s' line %d: internal malfunction" +msgstr "In Datei »%s«, Zeile %d: interne Fehlfunktion" -#: ../libsvn_wc/props.c:400 -#, c-format -msgid "" -"Trying to delete property '%s'\n" -"but the property has been locally added.\n" -msgstr "" -"Versuch, die Eigenschaft »%s« zu löschen,\n" -"aber die Eigenschaft wurde lokal hinzugefügt.\n" +#: ../libsvn_subr/error.c:899 +msgid "stream error" +msgstr "Datenstromfehler" -#: ../libsvn_wc/props.c:416 -#, c-format -msgid "" -"Trying to delete property '%s'\n" -"but the property has been locally modified.\n" -msgstr "" -"Versuch, die Eigenschaft »%s« zu löschen,\n" -"aber die Eigenschaft wurde lokal verändert.\n" +#: ../libsvn_subr/error.c:904 +msgid "out of memory" +msgstr "Nicht genügend Speicher" -#: ../libsvn_wc/props.c:426 -#, c-format -msgid "" -"Trying to delete property '%s'\n" -"but the property has been locally deleted and had a different value.\n" -msgstr "" -"Versuch, die Eigenschaft »%s« zu löschen,\n" -"aber die Eigenschaft wurde lokal gelöscht und hatte einen anderen Wert.\n" +#: ../libsvn_subr/error.c:909 +msgid "buffer error" +msgstr "Pufferfehler" -#: ../libsvn_wc/props.c:438 -#, c-format -msgid "" -"Trying to delete property '%s'\n" -"but the local property value is different.\n" -msgstr "" -"Versuch, die Eigenschaft »%s« zu löschen,\n" -"aber der lokale Wert ist ein anderer.\n" +#: ../libsvn_subr/error.c:914 +msgid "version error" +msgstr "Versionsfehler" -#: ../libsvn_wc/props.c:457 -#, c-format -msgid "" -"Trying to change property '%s'\n" -"but the local property value conflicts with the incoming change.\n" -msgstr "" -"Versuch, die Eigenschaft »%s« zu ändern,\n" -"aber der lokale Eigenschaftswert steht mit den empfangenen Änderungen im Konflikt.\n" +#: ../libsvn_subr/error.c:919 +msgid "corrupt data" +msgstr "Fehlerhafte Daten" -#: ../libsvn_wc/props.c:465 -#, c-format -msgid "" -"Trying to change property '%s'\n" -"but the property has already been locally changed to a different value.\n" -msgstr "" -"Versuch, die Eigenschaft »%s« zu ändern,\n" -"aber die Eigenschaft wurde lokal schon auf einen anderen Wert gesetzt.\n" +# FIXME: Grammar depends on usage!!!!!!! (prepanded by "bei") +#: ../libsvn_subr/error.c:924 +msgid "unknown error" +msgstr "Unbekannter Fehler" -#: ../libsvn_wc/props.c:472 +#: ../libsvn_subr/gpg_agent.c:505 ../libsvn_subr/prompt.c:627 #, c-format -msgid "" -"Trying to change property '%s'\n" -"but the property has been locally deleted.\n" -msgstr "" -"Versuch, die Eigenschaft »%s« zu ändern,\n" -"aber die Eigenschaft wurde lokal gelöscht.\n" +msgid "Password for '%s': " +msgstr "Passwort für »%s«: " -#: ../libsvn_wc/props.c:478 +#: ../libsvn_subr/gpg_agent.c:506 #, c-format -msgid "" -"Trying to change property '%s'\n" -"but the property has been locally added with a different value.\n" -msgstr "" -"Versuch, die Eigenschaft »%s« zu ändern,\n" -"aber die Eigenschaft wurde lokal mit einem anderen Wert hinzugefügt.\n" +msgid "Enter your Subversion password for %s" +msgstr "Geben Sie Ihr Subversion-Passwort für %s ein" -#: ../libsvn_wc/props.c:484 -#, c-format -msgid "" -"Trying to change property '%s'\n" -"but the property does not exist locally.\n" -msgstr "" -"Versuch, die Eigenschaft »%s« zu ändern,\n" -"aber die Eigenschaft existiert lokal nicht.\n" +#: ../libsvn_subr/hash.c:129 +msgid "Serialized hash missing terminator" +msgstr "Serialisierte Prüfsumme hat kein Endzeichen" -#: ../libsvn_wc/props.c:594 -msgid "<<<<<<< (local property value)" -msgstr "<<<<<<< (lokaler Eigenschaftswert)" +#: ../libsvn_subr/hash.c:138 ../libsvn_subr/hash.c:189 +#, fuzzy +msgid "Serialized hash malformed key length" +msgstr "Fehlerhafte serialisierte Prüfsumme" -#: ../libsvn_wc/props.c:595 -msgid ">>>>>>> (incoming 'changed to' value)" -msgstr ">>>>>>> (empfangener Zielwert)" +#: ../libsvn_subr/hash.c:151 ../libsvn_subr/hash.c:202 +#, fuzzy +msgid "Serialized hash malformed key data" +msgstr "Fehlerhafte serialisierte Prüfsumme" -#: ../libsvn_wc/props.c:596 -msgid "||||||| (incoming 'changed from' value)" -msgstr "||||||| (empfangener Ausgangswert)" +#: ../libsvn_subr/hash.c:163 +#, fuzzy +msgid "Serialized hash malformed value length" +msgstr "Fehlerhafte serialisierte Prüfsumme" -#: ../libsvn_wc/props.c:633 -msgid "Local property value:\n" -msgstr "Lokaler Eigenschaftswert:\n" +#: ../libsvn_subr/hash.c:175 +#, fuzzy +msgid "Serialized hash malformed value data" +msgstr "Fehlerhafte serialisierte Prüfsumme" -#: ../libsvn_wc/props.c:635 ../libsvn_wc/props.c:646 -msgid "Cannot display: property value is binary data\n" -msgstr "Kann nicht anzeigen: Eigenschaftswert sind Binärdaten\n" +#: ../libsvn_subr/hash.c:179 ../libsvn_subr/hash.c:211 +msgid "Serialized hash malformed" +msgstr "Fehlerhafte serialisierte Prüfsumme" -#: ../libsvn_wc/props.c:644 -msgid "Incoming property value:\n" -msgstr "Empfangener Eigenschaftswert:\n" +#: ../libsvn_subr/hash.c:285 +msgid "Cannot serialize negative length" +msgstr "Kann negative Länge nicht serialisieren" -#: ../libsvn_wc/props.c:1582 ../libsvn_wc/props.c:1991 -#: ../libsvn_wc/props.c:2092 +#: ../libsvn_subr/io.c:354 #, c-format -msgid "Property '%s' is an entry property" -msgstr "Eigenschaft »%s« ist eine Eintragseigenschaft" - -#: ../libsvn_wc/props.c:1619 ../libsvn_wc/props.c:1626 -msgid "Failed to load properties" -msgstr "Konnte Eigenschaften nicht laden" +msgid "Can't check path '%s'" +msgstr "Kann Pfad »%s« nicht prüfen" -#: ../libsvn_wc/props.c:1662 +#: ../libsvn_subr/io.c:599 ../libsvn_subr/io.c:5208 #, c-format -msgid "Cannot set '%s' on a directory ('%s')" -msgstr "Kann »%s« nicht für ein Verzeichnis setzen (»%s«)" +msgid "Can't open '%s'" +msgstr "Kann »%s« nicht öffnen" -#: ../libsvn_wc/props.c:1669 +#: ../libsvn_subr/io.c:625 ../libsvn_subr/io.c:711 #, c-format -msgid "Cannot set '%s' on a file ('%s')" -msgstr "Kann »%s« nicht für eine Datei setzen (»%s«)" +msgid "Unable to make name for '%s'" +msgstr "Kann Namen für »%s« nicht erstellen" -#: ../libsvn_wc/props.c:1748 +#: ../libsvn_subr/io.c:698 #, c-format -msgid "Can't set '%s': file '%s' has binary mime type property" -msgstr "Kann »%s« nicht setzen: Datei »%s« hat die MIME-Typ Eigenschaft »binär«" +msgid "Can't create symbolic link '%s'" +msgstr "Kann symbolischen Link »%s« nicht anlegen" -#: ../libsvn_wc/props.c:1793 -msgid "Failed to load current properties" -msgstr "Konnte aktuelle Eigenschaften nicht laden" +#: ../libsvn_subr/io.c:715 ../libsvn_subr/io.c:750 ../libsvn_subr/io.c:778 +#: ../libsvn_subr/io.c:1971 +msgid "Symbolic links are not supported on this platform" +msgstr "Symbolische Verweise werden auf dieser Plattform nicht unterstützt" -#: ../libsvn_wc/props.c:2013 +#: ../libsvn_subr/io.c:738 ../libsvn_subr/io.c:1930 ../libsvn_subr/io.c:1950 #, c-format -msgid "Can't set properties on '%s': invalid status for updating properties." -msgstr "Kann Eigenschaften für »%s« nicht setzen: ungültiger Status beim Aktualisieren von Eigenschaften" +msgid "Can't read contents of link" +msgstr "Kann Inhalt des Verweises nicht lesen" -#: ../libsvn_wc/props.c:2097 +#: ../libsvn_subr/io.c:798 #, c-format -msgid "Property '%s' is a WC property, not a regular property" -msgstr "Eigenschaft »%s« ist eine Arbeitskopieeigenschaft, keine reguläre Eigenschaft" +msgid "Can't find a temporary directory" +msgstr "Kann temporäres Verzeichnis nicht finden" -#: ../libsvn_wc/props.c:2191 +#: ../libsvn_subr/io.c:916 #, c-format -msgid "Unrecognized line ending style '%s' for '%s'" -msgstr "Stil für Zeilenende »%s« nicht erkannt für »%s«" +msgid "Can't copy '%s' to '%s'" +msgstr "Kann »%s« nicht nach »%s« kopieren" -#. scratch_ -#: ../libsvn_wc/props.c:2242 +#: ../libsvn_subr/io.c:959 ../libsvn_subr/io.c:981 ../libsvn_subr/io.c:1027 +#: ../libsvn_subr/io.c:5341 #, c-format -msgid " (%d more duplicate targets found)" -msgstr "(%d mehrmals auftauchende Ziele gefunden)" +msgid "Can't set permissions on '%s'" +msgstr "Kann Berechtigungen auf »%s« nicht setzen" -#: ../libsvn_wc/props.c:2247 +#: ../libsvn_subr/io.c:977 ../libsvn_subr/io.c:2317 ../libsvn_subr/io.c:2377 +#: ../libsvn_subr/io.c:2466 ../libsvn_subr/io.c:5246 #, c-format -msgid "Invalid %s property on '%s': target '%s' appears more than once%s" -msgstr "Ungültige Eigenschaft %s auf »%s«: Ziel »%s« taucht mehrmals auf%s" +msgid "Can't get file name" +msgstr "Kann keinen Dateinamen holen" -#: ../libsvn_wc/props.c:2278 +#: ../libsvn_subr/io.c:1050 #, c-format -msgid "Cannot set non-inheritable mergeinfo on a non-directory ('%s')" -msgstr "Kann nicht-vererbbare Zusammenführungsinformationen auf ein nicht-Verzeichnis (»%s«) nicht setzen" +msgid "Can't append '%s' to '%s'" +msgstr "Kann »%s« nicht an »%s« anhängen" -#: ../libsvn_wc/relocate.c:111 +#: ../libsvn_subr/io.c:1096 #, c-format -msgid "Cannot relocate '%s' as it is not the root of a working copy" -msgstr "Kann »%s« nicht umplatzieren da es keine Basis einer Arbeitskopie ist" - -#: ../libsvn_wc/relocate.c:118 -#, c-format -msgid "Cannot relocate '%s' as it is not the root of a working copy; try relocating '%s' instead" -msgstr "Kann »%s« nicht umplatzieren da es keine Basis einer Arbeitskopie ist; Versuchen Sie stattdessen »%s« umzuplatzieren" - -#: ../libsvn_wc/relocate.c:136 -msgid "Cannot relocate a single file" -msgstr "Kann eine einzelne Datei nicht umplatzieren" +msgid "Destination '%s' already exists" +msgstr "Ziel »%s« existiert bereits" -#: ../libsvn_wc/relocate.c:144 +#: ../libsvn_subr/io.c:1205 #, c-format -msgid "Invalid source URL prefix: '%s' (does not overlap target's URL '%s')" -msgstr "Ungültiger Prefix der Quell-URL: »%s« (Keine Überlappung mit Ziel-URL »%s«)" +msgid "Can't make directory '%s'" +msgstr "Kann Verzeichnis »%s« nicht anlegen" -#: ../libsvn_wc/relocate.c:154 +#: ../libsvn_subr/io.c:1309 #, c-format -msgid "Invalid relocation destination: '%s' (not a URL)" -msgstr "Ungültiges Ziel für Umplatzierung: »%s« (keine URL)" +msgid "Can't set access time of '%s'" +msgstr "Kann Zugriffszeit von »%s« nicht setzen" -#: ../libsvn_wc/relocate.c:161 +#: ../libsvn_subr/io.c:1647 ../libsvn_subr/io.c:1749 #, c-format -msgid "Invalid relocation destination: '%s' (does not point to target)" -msgstr "Ungültiges Ziel für Umplatzierung: »%s« (zeigt nicht auf Ziel)" - -#: ../libsvn_wc/tree_conflicts.c:137 -msgid "Unknown enumeration value in tree conflict description" -msgstr "Unbekannter Aufzählungswert in Baumkonfliktbeschreibung" - -#: ../libsvn_wc/tree_conflicts.c:161 -msgid "Invalid version info in tree conflict description" -msgstr "Ungültige Versionsinformation in Baumkonfliktbeschreibung" +msgid "Can't change perms of file '%s'" +msgstr "Kann die Zugriffsrechte der Datei »%s« nicht ändern" -#: ../libsvn_wc/tree_conflicts.c:219 +#: ../libsvn_subr/io.c:1877 #, c-format -msgid "Invalid conflict info '%s' in tree conflict description" -msgstr "Ungültige Konfliktinformationen »%s« in Baumkonfliktbeschreibung" +msgid "Can't get attributes of file '%s'" +msgstr "Kann Attributinformationen der Datei »%s« nicht lesen" -#: ../libsvn_wc/tree_conflicts.c:230 -msgid "Empty 'victim' field in tree conflict description" -msgstr "Leeres Feld »victim« in Baumkonfliktbeschreibung" +#: ../libsvn_subr/io.c:1885 +#, c-format +msgid "Can't set attributes of file '%s'" +msgstr "Kann Attributinformationen der Datei »%s« nicht setzen" -#: ../libsvn_wc/tree_conflicts.c:238 -msgid "Invalid 'node_kind' field in tree conflict description" -msgstr "Ungültiges Feld »node_kind« in Baumkonfliktbeschreibung" +#: ../libsvn_subr/io.c:2022 ../libsvn_subr/io.c:2683 +#, c-format +msgid "Can't remove file '%s'" +msgstr "Kann Datei »%s« nicht löschen" -#: ../libsvn_wc/tree_conflicts.c:432 +#: ../libsvn_subr/io.c:2092 ../libsvn_subr/io.c:4286 #, c-format -msgid "Attempt to add tree conflict that already exists at '%s'" -msgstr "Es wurde versucht, einen Baumkonflikt hinzuzufügen, der in »%s« bereits vorhanden ist" +msgid "Can't move '%s' to '%s'" +msgstr "Kann »%s« nicht nach »%s« verschieben" -#: ../libsvn_wc/update_editor.c:994 +#: ../libsvn_subr/io.c:2138 #, c-format -msgid "" -"Checksum mismatch while updating '%s':\n" -" expected: %s\n" -" actual: %s\n" -msgstr "" -"Prüfsummenfehler beim Aktualisieren von »%s«:\n" -" Erwartet: %s\n" -" Tatsächlich: %s\n" +msgid "Can't set file '%s' read-only" +msgstr "Kann den Schreibschutz der Datei »%s« nicht setzen" -#: ../libsvn_wc/update_editor.c:1129 +#: ../libsvn_subr/io.c:2170 #, c-format -msgid "'%s' is not valid as filename in directory '%s'" -msgstr "»%s« ist als Dateiname im Verzeichnis »%s« nicht gültig" +msgid "Can't set file '%s' read-write" +msgstr "Kann den Schreibschutz der Datei »%s« nicht aufheben" -#: ../libsvn_wc/update_editor.c:1507 +#: ../libsvn_subr/io.c:2209 ../libsvn_subr/io.c:2243 #, c-format -msgid "Unexpected attempt to add a node at path '%s'" -msgstr "Unerwarteter Versuch, einen Knoten im Pfad »%s« hinzuzufügen" +msgid "Error getting UID of process" +msgstr "Fehler beim Ermitteln der Prozess-UID" -#: ../libsvn_wc/update_editor.c:1518 +#: ../libsvn_subr/io.c:2343 #, c-format -msgid "Unexpected attempt to edit, delete, or replace a node at path '%s'" -msgstr "Unerwarteter Versuch, einen Knoten im Pfad »%s« zu bearbeiten, zu löschen oder zu ersetzen" +msgid "Can't get shared lock on file '%s'" +msgstr "Kann keine gemeinsame Sperre für Datei »%s« erhalten" -#: ../libsvn_wc/update_editor.c:1898 +#: ../libsvn_subr/io.c:2382 #, c-format -msgid "Failed to add directory '%s': object of the same name as the administrative directory" -msgstr "" -"Konnte Verzeichnis »%s« nicht hinzufügen, da es denselben Namen wie das\n" -"Administrationsverzeichnis trägt" +msgid "Can't unlock file '%s'" +msgstr "Kann Datei »%s« nicht entsprerren" -#: ../libsvn_wc/update_editor.c:2571 -msgid "Couldn't do property merge" -msgstr "Konnte Eigenschaften nicht zusammenführen" +#: ../libsvn_subr/io.c:2484 ../libsvn_subr/io.c:2506 +#, fuzzy, c-format +msgid "Can't flush file '%s' to disk" +msgstr "Kann Datei nicht auf Festplatte leeren" -#: ../libsvn_wc/update_editor.c:3087 +#: ../libsvn_subr/io.c:2597 ../libsvn_subr/prompt.c:197 #, c-format -msgid "Failed to add file '%s': object of the same name as the administrative directory" -msgstr "Konnte Datei »%s« nicht hinzufügen, da es denselben Namen wie Administrationsverzeichnis trägt" +msgid "Can't open stdin" +msgstr "Kann Standardeingabe nicht öffnen" -#: ../libsvn_wc/update_editor.c:3618 -#, c-format -msgid "" -"Checksum mismatch for '%s':\n" -" expected: %s\n" -" recorded: %s\n" -msgstr "" -"Prüfsummenfehler für »%s«:\n" -" erwartet: %s\n" -"verzeichnet: %s\n" +#: ../libsvn_subr/io.c:2617 +msgid "Reading from stdin is disallowed" +msgstr "Lesen von der Standardeingabe ist nicht erlaubt" -#: ../libsvn_wc/update_editor.c:5277 +#: ../libsvn_subr/io.c:2770 #, c-format -msgid "Node '%s' exists." -msgstr "Knoten »%s« existiert bereits" +msgid "Can't remove '%s'" +msgstr "Kann »%s« nicht löschen" -#: ../libsvn_wc/update_editor.c:5337 +#: ../libsvn_subr/io.c:2933 #, c-format -msgid "Copyfrom-url '%s' has different repository root than '%s'" -msgstr "Die Quell-URL »%s« hat eine andere Projektarchiv-Basis als »%s«" +msgid "Path '%s' not found, case obstructed by '%s'" +msgstr "Pfad »%s« nicht gefunden, Groß- und Kleinschreibung durch »%s« blockiert" -#: ../libsvn_wc/update_editor.c:5549 +#: ../libsvn_subr/io.c:3046 #, c-format -msgid "'%s' is not an unmodified copied directory" -msgstr "»%s« ist kein kopiertes Verzeichnis ohne Veränderungen" +msgid "Can't create process '%s' attributes" +msgstr "Kann Attribute von Prozess »%s« nicht erzeugen" -#: ../libsvn_wc/update_editor.c:5560 +#: ../libsvn_subr/io.c:3053 #, c-format -msgid "Copyfrom '%s' doesn't match original location of '%s'" -msgstr "Quell-URL »%s« stimmt nicht mit der ursprünglichen Position von »%s« überein" +msgid "Can't set process '%s' cmdtype" +msgstr "Kann Kommandotyp von Prozess »%s« nicht setzen " -#: ../libsvn_wc/upgrade.c:256 +#: ../libsvn_subr/io.c:3069 #, c-format -msgid "Missing end of line in wcprops file for '%s'" -msgstr "Fehlendes Zeilenende in Datei »wcprops« für »%s«" +msgid "Can't set process '%s' directory" +msgstr "Kann Verzeichnis von Prozess »%s« nicht setzen" -#: ../libsvn_wc/upgrade.c:632 +#: ../libsvn_subr/io.c:3083 #, c-format -msgid "Working copy '%s' can't be upgraded because the repository root is not available and can't be retrieved" -msgstr "Arbeitskopie »%s« kann nicht in ein neueres Format gebracht werden, da die Wurzel des Projektarchivs nicht verfügbar ist und nicht bestimmt werden kann" +msgid "Can't set process '%s' child input" +msgstr "Kann Eingabe des Kindprozesses »%s« nicht setzen" -#: ../libsvn_wc/upgrade.c:639 +#: ../libsvn_subr/io.c:3091 #, c-format -msgid "Working copy '%s' can't be upgraded because the repository uuid is not available and can't be retrieved" -msgstr "Arbeitskopie »%s« kann nicht in ein neueres Format gebracht werden, da die UUID des Projektarchivs nicht verfügbar ist und nicht bestimmt werden kann" +msgid "Can't set process '%s' child outfile" +msgstr "Kann Ausgabe des Kindprozesses »%s« nicht setzen" -#: ../libsvn_wc/upgrade.c:646 +# FIXME: Laut Code ist %s der Kindprozess. Müsste es dann nicht +# "Can't set child process '%s' errfile" (oder ganz ohne child) heißen? +# (Es gibt kein child von %s) +#: ../libsvn_subr/io.c:3099 #, c-format -msgid "Working copy '%s' can't be upgraded because it doesn't have a url" -msgstr "Arbeitskopie »%s« kann nicht in ein neueres Format gebracht werden, da sie keine URL hat" - -#: ../libsvn_wc/upgrade.c:691 -msgid "Error parsing tree conflict skel" -msgstr "Fehler beim Einlesen des Baumkonfliktskeletons" +msgid "Can't set process '%s' child errfile" +msgstr "Kann Fehlerausgabe des Kindprozesses »%s« nicht setzen" -#: ../libsvn_wc/upgrade.c:922 +#: ../libsvn_subr/io.c:3113 #, c-format -msgid "The properties of '%s' are in an indeterminate state and cannot be upgraded. See issue #2530." -msgstr "Die Eigenschaften von »%s« sind in einem unbestimmten Zustand und können nicht in ein neues Format gebreacht werden. Siehe Fehlerbericht #2530." +msgid "Can't set process '%s' stdio pipes" +msgstr "Kann Standard-IO-Datenströme des Prozesses »%s« nicht setzen " -#: ../libsvn_wc/upgrade.c:934 +#: ../libsvn_subr/io.c:3121 #, c-format -msgid "Insufficient NODES rows for '%s'" -msgstr "Nicht genügend »NODES«-Zeilen für »%s«" +msgid "Can't set process '%s' child errfile for error handler" +msgstr "Kann Datei für die Fehlerbehandlung des Kindprozesses »%s« nicht setzen" -#: ../libsvn_wc/upgrade.c:1357 +#: ../libsvn_subr/io.c:3128 #, c-format -msgid "The working copy at '%s' is format 22 with WORKING nodes; use a format 22 client to diff/revert before using this client" -msgstr "Die Arbeitskopie in »%s« hat das Format 22 mit »WORKING«-Knoten; Verwenden Sie zuerst einen Client mit Format 22 um sie zurückzusetzen oder Unterschiede zu speichern, bevor Sie diesen Client verwenden" +msgid "Can't set process '%s' error handler" +msgstr "Kann die Fehlerbehandlung des Prozesses »%s« nicht setzen" -#: ../libsvn_wc/upgrade.c:1401 +#: ../libsvn_subr/io.c:3151 #, c-format -msgid "The working copy at '%s' is format 26 with conflicts; use a format 26 client to resolve before using this client" -msgstr "Die Arbeitskopie in »%s« hat das Format 26 mit Konflikten; Verwenden Sie zuerst einen Client mit Format 26 um diese aufzulösen, bevor Sie diesen Client verwenden" - -#: ../libsvn_wc/upgrade.c:1945 -msgid "Cannot upgrade with existing logs; run a cleanup operation on this working copy using a client version which is compatible with this working copy's format (such as the version you are upgrading from), then retry the upgrade with the current version" -msgstr "Kann mit vorhandenen Logdateien nicht in ein neues Format bringen; Starten Sie »svn cleanup« auf dieser Arbeitskopie mit einer Version des Clienten die mit dem Format der Arbeitskopie kompatibel ist (z.B. mit der Version, die sie gerade ersetzen) und versuchen Sie dann den Vorgang mit der neuen Version erneut" - -#: ../libsvn_wc/upgrade.c:2014 -msgid "This working copy is corrupt and cannot be upgraded. Please check out a new working copy." -msgstr "Diese Arbeitskopie ist beschädigt und kann nicht in ein neues Format gebracht werden. Bitte erzeugen Sie eine neue Arbeitskopie mit »svn checkout«." - -#: ../libsvn_wc/upgrade.c:2059 -msgid "(unreleased development version)" -msgstr "(nicht veröffentlichte Entwicklungsversion)" +msgid "Can't start process '%s'" +msgstr "Kann Prozess »%s« nicht starten" -#: ../libsvn_wc/upgrade.c:2075 +#: ../libsvn_subr/io.c:3175 #, c-format -msgid "Working copy '%s' is too old (format %d, created by Subversion %s)" -msgstr "Format der Arbeitskopie »%s« ist zu alt (Format %d, erzeugt von Subversion %s)" +msgid "Error waiting for process '%s'" +msgstr "Fehler beim Warten auf Prozess »%s«" -#: ../libsvn_wc/upgrade.c:2085 +# CHECKME: Isn't "exitwhy" an internal detail? +#: ../libsvn_subr/io.c:3184 #, c-format -msgid "Working copy '%s' is an old development version (format %d); to upgrade it, use a format 18 client, then use 'tools/dev/wc-ng/bump-to-19.py', then use the current client" -msgstr "Format der Arbeitskopie »%s« ist das einer alten Entwicklungsversion (Format %d); Um sie in ein neues Format zu bringen, verwenden Sie einen mit Format 18 kompatiblen Client, starten Sie »tools/dev/wc-ng/bump-to-19.py« und verwenden Sie danach die neue Version" +msgid "Process '%s' failed (signal %d, core dumped)" +msgstr "Prozess »%s« schlug fehl (Signal %d, Core-Dump)" -#: ../libsvn_wc/upgrade.c:2314 +# CHECKME: Isn't "exitwhy" an internal detail? +#: ../libsvn_subr/io.c:3189 #, c-format -msgid "Can't upgrade '%s' as it is not a working copy" -msgstr "Kann »%s« nicht in ein neueres Format bringen, da es keine Arbeitkopie ist" +msgid "Process '%s' failed (signal %d)" +msgstr "Prozess »%s« schlug fehl (Signal %d)" -#: ../libsvn_wc/upgrade.c:2363 +# CHECKME: Isn't "exitwhy" an internal detail? +#: ../libsvn_subr/io.c:3195 #, c-format -msgid "Can't upgrade '%s' as it is not a working copy root, the root is '%s'" -msgstr "Kann »%s« nicht in ein neueres Format bringen, da es nicht die Basis einer Arbeitskopie ist - die Basis ist »%s«" +msgid "Process '%s' failed (exitwhy %d, exitcode %d)" +msgstr "Prozess »%s« schlug fehl (Exit-Grund %d, Exit-Code %d)" -#: ../libsvn_wc/wc_db.c:445 +#: ../libsvn_subr/io.c:3203 #, c-format -msgid "No REPOSITORY table entry for id '%ld'" -msgstr "Kein REPOSITORY-Tabelleneintrag für ID »%ld«" +msgid "Process '%s' returned error exitcode %d" +msgstr "Prozess »%s« hat Fehlerwert %d zurückgegeben" -#: ../libsvn_wc/wc_db.c:778 +#: ../libsvn_subr/io.c:3310 #, c-format -msgid "The file '%s' has no checksum." -msgstr "Die Datei »%s« hat keine Prüfsumme." +msgid "'%s' returned %d" +msgstr "»%s« hat %d zurückgegeben" -#: ../libsvn_wc/wc_db.c:2092 +#: ../libsvn_subr/io.c:3431 #, c-format -msgid "Path '%s' is not moved" -msgstr "Pfad »%s« wurde nicht verschoben" +msgid "" +"Error running '%s': exitcode was %d, args were:\n" +"in directory '%s', basenames:\n" +"%s\n" +"%s\n" +"%s" +msgstr "" +"Fehler beim Ausführen von »%s«: Rückgabewert: %d, Parameter:\n" +"in Verzeichnis »%s«, Basisnamen:\n" +"%s\n" +"%s\n" +"%s" -#: ../libsvn_wc/wc_db.c:2566 ../libsvn_wc/wc_db.c:3001 -#: ../libsvn_wc/wc_db.c:9866 +#: ../libsvn_subr/io.c:3572 #, c-format -msgid "The node '%s' has a corrupt checksum value." -msgstr "Der Knoten »%s« hat einen fehlerhaften Prüfsummenwert." +msgid "Can't detect MIME type of non-file '%s'" +msgstr "Kann MIME Typ der nicht-Datei »%s« nicht ermitteln" -#: ../libsvn_wc/wc_db.c:2786 +#: ../libsvn_subr/io.c:3667 #, c-format -msgid "The node '%s' has a BASE status that has no properties." -msgstr "Der Knoten »%s« hat einen »BASE«-Status, der keine Eigenschaften hat." +msgid "Can't open file '%s'" +msgstr "Kann Datei »%s« nicht öffnen" -#: ../libsvn_wc/wc_db.c:3528 ../libsvn_wc/wc_db.c:3648 +#: ../libsvn_subr/io.c:3707 #, c-format -msgid "The node '%s' is not an external." -msgstr "Der Knoten »%s« ist kein externer Verweis." +msgid "Can't close file '%s'" +msgstr "Kann Datei »%s« nicht schließen" -#: ../libsvn_wc/wc_db.c:4060 +#: ../libsvn_subr/io.c:3708 #, c-format -msgid "Expected node '%s' to be deleted." -msgstr "Erwartete, dass Knoten »%s« gelöscht wird." +msgid "Can't close stream" +msgstr "Kann Datenstrom nicht schließen" -#: ../libsvn_wc/wc_db.c:6857 ../libsvn_wc/wc_db.c:6909 +#: ../libsvn_subr/io.c:3717 ../libsvn_subr/io.c:3779 ../libsvn_subr/io.c:3804 +#: ../libsvn_subr/io.c:3894 #, c-format -msgid "Can't revert '%s' without reverting children" -msgstr "Kann »%s« nicht zurücksetzen, ohne dessen Kindelemente zurückzusetzen" +msgid "Can't read file '%s'" +msgstr "Kann Datei »%s« nicht lesen" -#: ../libsvn_wc/wc_db.c:7065 +#: ../libsvn_subr/io.c:3718 ../libsvn_subr/io.c:3780 ../libsvn_subr/io.c:3805 +#: ../libsvn_subr/io.c:3895 #, c-format -msgid "Can't revert '%s' without reverting parent" -msgstr "Kann »%s« nicht zurücksetzen, ohne dessen Elternelement zurückzusetzen" +msgid "Can't read stream" +msgstr "Kann nicht aus Datenstrom lesen" -#: ../libsvn_wc/wc_db.c:7200 +#: ../libsvn_subr/io.c:3727 #, c-format -msgid "Unsupported depth for revert of '%s'" -msgstr "Nicht unterstützte Tiefe für Zurücksetzung von »%s«" +msgid "Can't write file '%s'" +msgstr "Kann Datei »%s« nicht schreiben" -#: ../libsvn_wc/wc_db.c:7770 +#: ../libsvn_subr/io.c:3728 #, c-format -msgid "The node '%s' is not a committed directory" -msgstr "Der Knoten »%s« ist kein übertragenes Verzeichnis" +msgid "Can't write stream" +msgstr "Kann nicht in Datenstrom schreiben" -#: ../libsvn_wc/wc_db.c:8160 +#: ../libsvn_subr/io.c:3742 #, c-format -msgid "Cannot delete '%s' as '%s' is excluded by server" -msgstr "Kann »%s« nicht löschen, da »%s« vom Server ausgeschlossen wurde" +msgid "Can't get attribute information from file '%s'" +msgstr "Kann keine Attributinformationen aus Datei »%s« lesen" -#: ../libsvn_wc/wc_db.c:8171 +#: ../libsvn_subr/io.c:3743 #, c-format -msgid "Cannot delete '%s' as it is excluded by server" -msgstr "Kann »%s« nicht löschen, da es vom Server ausgeschlossen wurde" +msgid "Can't get attribute information from stream" +msgstr "Kann keine Attributinformationen aus Datenstrom lesen" -#: ../libsvn_wc/wc_db.c:8178 +#: ../libsvn_subr/io.c:3816 #, c-format -msgid "Cannot delete '%s' as it is excluded" -msgstr "Kann »%s« nicht löschen, da es ausgeschlossen wurde" +msgid "Can't set position pointer in file '%s'" +msgstr "Kann Positionszeiger in Datei »%s« nicht setzen" -#: ../libsvn_wc/wc_db.c:8635 +#: ../libsvn_subr/io.c:3817 #, c-format -msgid "Cannot move '%s' to '%s' because they are not in the same working copy" -msgstr "Kann »%s« nicht nach »%s« verschieben, da dies nicht in der selben Arbeitskopie ist" +msgid "Can't set position pointer in stream" +msgstr "Kann Positionszeiger in Datenstrom nicht setzen" -#: ../libsvn_wc/wc_db.c:8993 +#: ../libsvn_subr/io.c:3904 #, c-format -msgid "Corrupt data for '%s'" -msgstr "Fehlerhafte Daten für »%s«" +msgid "Can't seek in file '%s'" +msgstr "Kann Position in Datei »%s« nicht setzen" -#: ../libsvn_wc/wc_db.c:9065 +#: ../libsvn_subr/io.c:3905 #, c-format -msgid "Error reading node '%s'" -msgstr "Fehler beim Lesen des Knotens »%s«" +msgid "Can't seek in stream" +msgstr "Kann Position im Datenstrom nicht setzen" -#: ../libsvn_wc/wc_db.c:9323 +#: ../libsvn_subr/io.c:3922 ../libsvn_subr/io.c:3978 #, c-format -msgid "The node '%s' comes from unexpected repository '%s', expected '%s'; if this node is a file external using the correct URL in the external definition can fix the problem, see issue #4087" -msgstr "Der Knoten »%s« gehört unerwartet zum Projektarchiv »%s«, erwartet war »%s«; Falls der Knoten ein externer Dateiverweis ist, kann die Verwendung der korrekten URL in der Definition des externen Dateiverweises das Problem beheben, siehe Fehlerbericht #4087" +msgid "Can't write to file '%s'" +msgstr "Kann nicht in Datei »%s« schreiben" -#: ../libsvn_wc/wc_db.c:9997 +#: ../libsvn_subr/io.c:3923 ../libsvn_subr/io.c:3979 #, c-format -msgid "The node '%s' is not in working copy '%s'" -msgstr "Der Knoten »%s« ist nicht in der Arbeitskopie »%s«" +msgid "Can't write to stream" +msgstr "Kann nicht in Datenstrom schreiben" -#: ../libsvn_wc/wc_db.c:10034 +#: ../libsvn_subr/io.c:3933 ../libsvn_subr/io.c:4090 #, c-format -msgid "The node '%s' is not installable" -msgstr "Der Knoten »%s« konnte nicht installiert werden" +msgid "Can't flush file '%s'" +msgstr "Kann Datei »%s« nicht leeren" -#: ../libsvn_wc/wc_db.c:10473 ../libsvn_wc/wc_db.c:10732 +#: ../libsvn_subr/io.c:3934 ../libsvn_subr/io.c:4091 #, c-format -msgid "The node '%s' has a status that has no properties." -msgstr "Der Knoten »%s« hat einen Status, der keine Eigenschaften hat" +msgid "Can't flush stream" +msgstr "Kann Datenstrom nicht leeren" -#: ../libsvn_wc/wc_db.c:12684 +#: ../libsvn_subr/io.c:4055 #, c-format -msgid "Expected node '%s' to be added." -msgstr "Erwartete, dass Knoten »%s« hinzugefügt wird." +msgid "Can't write '%s' atomically" +msgstr "Kann »%s« nicht unteilbar schreiben" -#: ../libsvn_wc/wc_db.c:13012 +#: ../libsvn_subr/io.c:4095 #, c-format -msgid "Path '%s' was not moved here" -msgstr "Pfad »%s« wurde nicht hierhin verschoben" +msgid "Can't truncate file '%s'" +msgstr "Kann Datei »%s« nicht abschneiden" -#: ../libsvn_wc/wc_db.c:13200 +#: ../libsvn_subr/io.c:4096 #, c-format -msgid "Node '%s' is not shadowed" -msgstr "Knoten »%s« wird nicht überdeckt" +msgid "Can't truncate stream" +msgstr "Kann Datenstrom nicht abschneiden" -#: ../libsvn_wc/wc_db.c:14441 ../libsvn_wc/wc_db.c:14489 +#: ../libsvn_subr/io.c:4176 #, c-format -msgid "'%s' is already locked." -msgstr "»%s« ist bereits gesperrt" +msgid "Can't read length line in file '%s'" +msgstr "Kann Längenzeile nicht aus Datei »%s« lesen" -#: ../libsvn_wc/wc_db.c:14446 ../libsvn_wc/wc_db.c:14497 +#: ../libsvn_subr/io.c:4180 +msgid "Can't read length line in stream" +msgstr "Kann Längenzeile nicht aus Datenstrom lesen" + +#: ../libsvn_subr/io.c:4202 #, c-format -msgid "Working copy '%s' locked." -msgstr "Arbeitskopie »%s« gesperrt." +msgid "Can't stat '%s'" +msgstr "Kann Status von »%s« nicht ermitteln" -#: ../libsvn_wc/wc_db.c:14520 +#: ../libsvn_subr/io.c:4380 #, c-format -msgid "Failed to lock working copy '%s'." -msgstr "Konnte Arbeitskopie »%s« nicht sperren. " +msgid "Can't create directory '%s'" +msgstr "Kann Verzeichnis »%s« nicht anlegen" -#: ../libsvn_wc/wc_db.c:14569 +#: ../libsvn_subr/io.c:4392 ../libsvn_subr/io.c:4406 #, c-format -msgid "'%s' is already locked via '%s'." -msgstr "»%s« ist bereits durch »%s« gesperrt." +msgid "Can't hide directory '%s'" +msgstr "Kann Verzeichnis »%s« nicht verstecken" -#: ../libsvn_wc/wc_db.c:14743 +#: ../libsvn_subr/io.c:4467 ../libsvn_subr/io.c:4590 #, c-format -msgid "Working copy not locked at '%s'." -msgstr "Arbeitskopie »%s« ist nicht gesperrt." +msgid "Can't open directory '%s'" +msgstr "Kann Verzeichnis »%s« nicht öffnen" -#: ../libsvn_wc/wc_db.c:15242 +#: ../libsvn_subr/io.c:4502 #, c-format -msgid "Modification of '%s' already exists" -msgstr "Änderung von »%s« existiert bereits" +msgid "Can't remove directory '%s'" +msgstr "Kann Verzeichnis »%s« nicht entfernen" -#. If EXPRESSION is false, cause the caller to return an SVN_ERR_WC_CORRUPT -#. * error, showing EXPRESSION and the caller's LOCAL_RELPATH in the message. -#: ../libsvn_wc/wc_db.c:15839 +#: ../libsvn_subr/io.c:4520 #, c-format -msgid "database inconsistency at local_relpath='%s' verifying expression '%s'" -msgstr "Datenbankinkonsistenz bei »local_relpath« »%s« beim Auswerten des Ausdrucks »%s«" +msgid "Can't read directory" +msgstr "Kann Verzeichnis nicht lesen" -#: ../libsvn_wc/wc_db.c:16027 +#: ../libsvn_subr/io.c:4540 #, c-format -msgid "Can't upgrade '%s' as it is not a working copy root" -msgstr "Kann »%s« nicht in ein neueres Format bringen, da es keine Basis einer Arbeitskopie ist" +msgid "Error closing directory" +msgstr "Fehler beim Schließen eines Verzeichnisses" -#: ../libsvn_wc/wc_db.c:16033 +#: ../libsvn_subr/io.c:4609 #, c-format -msgid "Working copy '%s' is too old and must be upgraded to at least format %d, as created by Subversion %s" -msgstr "Arbeitskopie »%s« ist zu alt und muss mindestens in das Format %d gebracht werden, wie es von Subversion %s erstellt wurde" +msgid "Can't read directory entry in '%s'" +msgstr "Kann Verzeichniseintrag in »%s« nicht lesen" -#: ../libsvn_wc/wc_db.c:16051 -msgid "Working copy upgrade failed" -msgstr "Arbeitskopie konnte nicht in ein nees Format gebracht werden" +#: ../libsvn_subr/io.c:4735 +#, c-format +msgid "Can't check directory '%s'" +msgstr "Kann Verzeichnis »%s« nicht prüfen" -#: ../libsvn_wc/wc_db.c:16152 +#: ../libsvn_subr/io.c:4797 #, c-format -msgid "The path '%s' is not in the working copy '%s'" -msgstr "Der Pfad »%s« ist nicht in der Arbeitskopie »%s« " +msgid "Reading '%s'" +msgstr "Lese »%s«" -#: ../libsvn_wc/wc_db_pristine.c:128 ../libsvn_wc/wc_db_pristine.c:467 +#: ../libsvn_subr/io.c:4816 #, c-format -msgid "The pristine text with checksum '%s' was not found" -msgstr "Der Ursprungstext mit der Prüfsumme »%s« wurde nicht gefunden." +msgid "First line of '%s' contains non-digit" +msgstr "Die erste Zeile von »%s« enthält eine Nicht-Ziffer" -#: ../libsvn_wc/wc_db_pristine.c:194 +#: ../libsvn_subr/io.c:5131 #, c-format -msgid "Pristine text '%s' not present" -msgstr "Ursprungstext »%s« nicht vorhanden" +msgid "Can't create temporary file from template '%s'" +msgstr "Kann temporäre Datei von Vorlage »%s« nicht anlegen" -#: ../libsvn_wc/wc_db_pristine.c:237 +#: ../libsvn_subr/io.c:5218 #, c-format -msgid "Can't read '%s' from pristine store because no checksum supplied" -msgstr "Kann »%s« nicht aus dem Speicherbereich für ürsprüngliche Dateiinhalte lesen, da keine Prüfsumme angegeben wurde" +msgid "Can't set aside '%s'" +msgstr "Kann »%s« nicht beiseitelegen" -#: ../libsvn_wc/wc_db_pristine.c:320 +#: ../libsvn_subr/io.c:5230 ../libsvn_subr/stream.c:2231 #, c-format -msgid "New pristine text '%s' has different size: %ld versus %ld" -msgstr "Neuer ursprünglicher Dateitext »%s« hat eine andere Größe: %ld im Vergleich zu %ld" +msgid "Unable to make name in '%s'" +msgstr "Kann Namen in »%s« nicht erstellen" + +#: ../libsvn_subr/mergeinfo.c:109 ../libsvn_subr/mergeinfo.c:710 +msgid "Pathname not terminated by ':'" +msgstr "Pfadnamen sind nicht durch »:« getrennt" -#: ../libsvn_wc/wc_db_pristine.c:506 +#: ../libsvn_subr/mergeinfo.c:515 #, c-format -msgid "The pristine text with MD5 checksum '%s' was not found" -msgstr "Der Ursprungstext mit der MD5-Prüfsumme »%s« wurde nicht gefunden." +msgid "Invalid character '%c' found in revision list" +msgstr "Ungültiges Zeichen »%c« in Revisionsliste gefunden" -#: ../libsvn_wc/wc_db_update_move.c:170 +#: ../libsvn_subr/mergeinfo.c:523 #, c-format -msgid "'%s' is not deleted" -msgstr "»%s« ist nicht gelöscht" +msgid "Invalid revision number '0' found in range list" +msgstr "Ungültige Revisionsnummer '0' in Revisionsbereichsliste gefunden" -#: ../libsvn_wc/wc_db_update_move.c:404 ../libsvn_wc/wc_db_update_move.c:428 +#: ../libsvn_subr/mergeinfo.c:534 #, c-format -msgid "'%s' already in conflict" -msgstr "»%s« ist schon von einem Konflikt betroffen" +msgid "Unable to parse reversed revision range '%ld-%ld'" +msgstr "Rückwärtiger Revisionsbereich »%ld-%ld« kann nicht verarbeitet werden" -#: ../libsvn_wc/wc_db_update_move.c:1631 +#: ../libsvn_subr/mergeinfo.c:539 #, c-format -msgid "Cannot apply update because move source %s' is a mixed-revision working copy" -msgstr "Kann Aktualisierung nicht anwenden, da die Quelle der Verschiebung »%s« eine Arbeitskopie mit verschiedenen Revisionen ist" +msgid "Unable to parse revision range '%ld-%ld' with same start and end revisions" +msgstr "Revisionbereich »%ld-%ld« mit selber Start- und Endrevision kann nicht verarbeitet werden" -#: ../libsvn_wc/wc_db_update_move.c:1639 +#: ../libsvn_subr/mergeinfo.c:576 ../libsvn_subr/mergeinfo.c:583 #, c-format -msgid "Cannot apply update because move source '%s' is a switched subtree" -msgstr "Kann Aktualisierung nicht anwenden, da die Quelle der Verschiebung »%s« ein umgestellter Unterbaum ist" +msgid "Invalid character '%c' found in range list" +msgstr "Ungültiges Zeichen »%c« in der Bereichsliste gefunden" + +#: ../libsvn_subr/mergeinfo.c:590 +msgid "Range list parsing ended before hitting newline" +msgstr "Einlesen der Bereichsliste endete vor dem Zeilenumbruch" -#: ../libsvn_wc/wc_db_update_move.c:1692 +#: ../libsvn_subr/mergeinfo.c:666 #, c-format -msgid "The node '%s' has not been moved away" -msgstr "Der Knoten »%s« wurde nicht an einen anderen Ort verschoben" +msgid "Unable to parse overlapping revision ranges '%s' and '%s' with different inheritance types" +msgstr "Überlappende Revisionsbereiche »%s« und »%s« mit verschiedenen Vererbungstypen können nicht verarbeitet werden" -#: ../libsvn_wc/wc_db_update_move.c:2300 +#: ../libsvn_subr/mergeinfo.c:718 #, c-format -msgid "'%s' is not in conflict" -msgstr "»%s« ist nicht von einem Konflikt betroffen" +msgid "Mergeinfo for '%s' maps to an empty revision range" +msgstr "Zusammenführungsinformationen für »%s« verweisen auf einen leeren Revisionsbereich" -#: ../libsvn_wc/wc_db_update_move.c:2313 +#: ../libsvn_subr/mergeinfo.c:722 #, c-format -msgid "'%s' is not a valid tree-conflict victim" -msgstr "»%s« ist kein gültiges von einem Baumkonflikt betroffenes Element" +msgid "Could not find end of line in range list line in '%s'" +msgstr "Konnte Zeilenende in Bereichslistenzeile in »%s« nicht finden" -#: ../libsvn_wc/wc_db_update_move.c:2326 +#: ../libsvn_subr/mergeinfo.c:786 #, c-format -msgid "'%s' is already a moved away tree-conflict" -msgstr "»%s« ist schon ein Baumkonflikt mit Verschiebung anderswo hin" +msgid "Could not parse mergeinfo string '%s'" +msgstr "Konnte Zusammenführungsinformationszeichenkette »%s« nicht einlesen" -# CHECKME: What's WCROOT? A variable or short for "working copy root"? -#: ../libsvn_wc/wc_db_util.c:69 +#: ../libsvn_subr/mergeinfo.c:2418 +msgid "NULL mergeinfo catalog\n" +msgstr "Zusammenführungsinformationskatalog ist NULL\n" + +#: ../libsvn_subr/mergeinfo.c:2423 +msgid "empty mergeinfo catalog\n" +msgstr "Zusammenführungsinformationskatalog ist leer\n" + +#: ../libsvn_subr/mutex.c:69 #, c-format -msgid "Missing a row in WCROOT." -msgstr "Fehlende Zeile in WCROOT." +msgid "Can't create mutex" +msgstr "Kann Mutex nicht erzeugen" -#: ../libsvn_wc/wc_db_util.c:136 +#: ../libsvn_subr/mutex.c:86 #, c-format -msgid "Working copy database '%s' not found" -msgstr "Datenbank der Arbeitskopie »%s« ist gefunden" +msgid "Can't lock mutex" +msgstr "Kann Mutex nicht sperren" -#: ../libsvn_wc/wc_db_wcroot.c:318 +#: ../libsvn_subr/mutex.c:102 #, c-format -msgid "Working copy format of '%s' is too old (%d); please check out your working copy again" -msgstr "" -"Format der Arbeitskopie »%s« ist zu alt (%d); bitte checken Sie die\n" -"Arbeitskopie erneut aus" +msgid "Can't unlock mutex" +msgstr "Kann Mutex nicht entsperren" -#: ../libsvn_wc/wc_db_wcroot.c:328 +#: ../libsvn_subr/nls.c:69 #, c-format -msgid "" -"This client is too old to work with the working copy at\n" -"'%s' (format %d).\n" -"You need to get a newer Subversion client. For more details, see\n" -" http://subversion.apache.org/faq.html#working-copy-format-change\n" -msgstr "" -"Dieser Client ist zu alt, um mit dieser Arbeitskopie umzugehen:\n" -"»%s« (Format %d).\n" -"Sie benötigen einen neueren Subversion-Client. Für mehr Details, siehe\n" -" http://subversion.apache.org/faq.html#working-copy-format-change\n" +msgid "Can't get module file name" +msgstr "Kann Namen der Moduldatei nicht ermitteln" -#: ../libsvn_wc/wc_db_wcroot.c:349 -msgid "Cleanup with an older 1.7 client before upgrading with this client" -msgstr "Starten Sie »svn cleanup« mit einem älteren 1.7 Client bevor Sie mit diesem Client operieren" +#: ../libsvn_subr/opt.c:273 +msgid " ARG" +msgstr " PAR" -#: ../libsvn_wc/wc_db_wcroot.c:360 -#, c-format +#: ../libsvn_subr/opt.c:432 ../libsvn_subr/opt.c:535 msgid "" -"The working copy at '%s'\n" -"is too old (format %d) to work with client version '%s' (expects format %d). You need to upgrade the working copy first.\n" +"\n" +"Global options:\n" msgstr "" -"Die Arbeitskopie in »%s«\n" -"ist zu alt (Format %d) für die Verwendung mit der Version »%s« (erwartet Format %d). Sie müssen die Arbeitskopie zuerst in ein neues Format bringen.\n" +"\n" +"Globale Optionen:\n" -#: ../libsvn_wc/wc_db_wcroot.c:438 +#: ../libsvn_subr/opt.c:1120 #, c-format -msgid "The symlink at '%s' points nowhere" -msgstr "Der symbolische Link »%s« zeigt nirgendwohin." +msgid "Syntax error parsing peg revision '%s'; did you mean '%s@'?" +msgstr "Syntaxfehler bei der Analyse der Fix-Revision »%s«; Meinten Sie '%s@'?" -# CHECKME: What's WCROOT? A variable or short for "working copy root"? -#: ../libsvn_wc/wc_db_wcroot.c:757 +#: ../libsvn_subr/opt.c:1126 #, c-format -msgid "Missing a row in WCROOT for '%s'." -msgstr "Fehlende Zeile in WCROOT für »%s«." +msgid "Syntax error parsing peg revision '%s'" +msgstr "Syntaxfehler bei der Analyse der Fix-Revision »%s«" -#: ../libsvn_wc/wc_db_wcroot.c:811 -#, c-format -msgid "The working copy at '%s' is corrupt." -msgstr "Die Arbeitskopie in »%s« ist beschädigt." +#: ../libsvn_subr/opt.c:1263 +msgid "Revision property pair is empty" +msgstr "Revisionseigenschaftspaar ist leer" -#: ../libsvn_wc/wc_db_wcroot.c:827 +#: ../libsvn_subr/opt.c:1283 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:337 +#: ../svn/propset-cmd.c:68 #, c-format -msgid "The working copy database at '%s' is missing." -msgstr "Die Datenbank der Arbeitskopie in »%s« fehlt." +msgid "'%s' is not a valid Subversion property name" +msgstr "»%s« ist kein gültiger Subversion-Eigenschaftsname" -#: ../libsvn_wc/wc_db_wcroot.c:836 +#: ../libsvn_subr/opt.c:1359 #, c-format -msgid "The working copy database at '%s' is corrupt." -msgstr "Die Datenbank der Arbeitskopie in »%s« ist beschädigt." +msgid "URL '%s' contains a '..' element" +msgstr "URL »%s« enthält ein »..« Element" -#: ../libsvn_wc/wc_db_wcroot.c:994 +#: ../libsvn_subr/opt.c:1392 #, c-format -msgid "'%s' is not a working copy root" -msgstr "»%s« ist keine Basis einer Arbeitskopie" +msgid "Error resolving case of '%s'" +msgstr "Fehler beim Ermitteln der Groß-/Kleinschreibung von »%s«" -#: ../libsvn_wc/workqueue.c:512 +#: ../libsvn_subr/opt.c:1414 #, c-format -msgid "Can't install '%s' from pristine store, because no checksum is recorded for this file" -msgstr "Kann »%s« nicht im Speicherbereich für ursprünglichen Dateiinhalt ablegen, da keine Prüfsumme für diese Datei eingetragen ist" +msgid "" +"%s, version %s\n" +" compiled %s, %s on %s\n" +"\n" +msgstr "" +"%s, Version %s\n" +" übersetzt am %s, um %s auf %s\n" +"\n" + +#: ../libsvn_subr/opt.c:1431 +msgid "" +"System information:\n" +"\n" +msgstr "" +"Systeminformationen:\n" +"\n" -#: ../libsvn_wc/workqueue.c:1469 +#: ../libsvn_subr/opt.c:1432 #, c-format -msgid "Unrecognized work item in the queue" -msgstr "Unbekannter Arbeitsschritt in Warteschlange" +msgid "* running on %s\n" +msgstr "* ausgeführt auf %s\n" -#: ../libsvn_wc/workqueue.c:1552 +#: ../libsvn_subr/opt.c:1436 #, c-format -msgid "Failed to run the WC DB work queue associated with '%s', work item %d %s" -msgstr "Konnte die mit »%s« zusammenhängende Arbeitsschrittwarteschlange der Datenbank der Arbeitskopie nicht ausführen, Arbeitsschritt %d %s" +msgid " - %s\n" +msgstr " - %s\n" -#: ../svn/add-cmd.c:101 -msgid "Could not add all targets because some targets don't exist" -msgstr "Konnte nicht alle Ziele hinzufügen, da einige Ziele nicht existieren" +#: ../libsvn_subr/opt.c:1446 +msgid "* linked dependencies:\n" +msgstr "* eingebundene Abhändigleiten:\n" -#: ../svn/add-cmd.c:105 -msgid "Could not add all targets because some targets are already versioned" -msgstr "Konnte nicht alle Ziele hinzufügen, da einige Ziele schon versioniert sind" +#: ../libsvn_subr/opt.c:1471 +msgid "* loaded shared libraries:\n" +msgstr "* geladene dynamische Bibliotheken:\n" -#: ../svn/auth-cmd.c:72 -#, c-format -msgid "Automatic certificate validity check failed because:\n" -msgstr "Automatische Gültigkeitsprüfung des Zertifikats fehlgeschlagen:\n" +#: ../libsvn_subr/packed_data.c:742 +msgid "Unexpected end of stream" +msgstr "Unerwartetes Ende des Datenstroms" -#: ../svn/auth-cmd.c:77 -#, c-format -msgid " The certificate is not yet valid.\n" -msgstr " Das Zertifikat ist noch nicht gültig.\n" +#: ../libsvn_subr/packed_data.c:748 +msgid "Integer representation too long" +msgstr "Ganzzahldarstellung zu lang" -#: ../svn/auth-cmd.c:81 +#: ../libsvn_subr/path.c:1125 #, c-format -msgid " The certificate has expired.\n" -msgstr " Das Zertifikat ist abgelaufen.\n" +msgid "Can't determine the native path encoding" +msgstr "Kann die Zeichencodierung des Pfades nicht ermitteln" -#: ../svn/auth-cmd.c:85 +#: ../libsvn_subr/path.c:1310 #, c-format -msgid " The certificate's Common Name (hostname) does not match the remote hostname.\n" -msgstr " Der Hostname im Zertifikat stimmt nicht mit dem Hostnamen des Servers überein.\n" +msgid "Improper relative URL '%s'" +msgstr "Fehlerhafte relative URL »%s«" -#: ../svn/auth-cmd.c:90 -#, c-format -msgid " The certificate issuer is unknown.\n" -msgstr " Der Aussteller des Zertifikats ist unbekannt.\n" +#: ../libsvn_subr/prompt.c:147 +msgid "Can't close terminal" +msgstr "Kann Terminal nicht schließen" -#: ../svn/auth-cmd.c:94 +#: ../libsvn_subr/prompt.c:200 #, c-format -msgid " Unknown verification failure.\n" -msgstr " Unbekannter Fehler bei der Gültigkeitsprüfung.\n" +msgid "Can't open stderr" +msgstr "Kann Standardfehlerausgabe nicht öffnen" -#: ../svn/auth-cmd.c:191 +#: ../libsvn_subr/prompt.c:381 ../libsvn_subr/prompt.c:468 #, c-format -msgid "Subject: %s\n" -msgstr "Zertifikatsempfänger: %s\n" +msgid "Can't read from terminal" +msgstr "Kann nicht vom Terminal lesen" -#: ../svn/auth-cmd.c:193 -#, c-format -msgid "Valid from: %s\n" -msgstr "Gültig ab: %s\n" +#: ../libsvn_subr/prompt.c:536 +msgid "End of file while reading from terminal" +msgstr "Dateiende während des Lesens vom Terminal" -#: ../svn/auth-cmd.c:197 +#: ../libsvn_subr/prompt.c:598 ../svn/auth-cmd.c:312 #, c-format -msgid "Valid until: %s\n" -msgstr "Gültig bis: %s\n" +msgid "Authentication realm: %s\n" +msgstr "Anmeldebereich: %s\n" -#: ../svn/auth-cmd.c:201 -#, c-format -msgid "Issuer: %s\n" -msgstr "Herausgeber: %s\n" +#: ../libsvn_subr/prompt.c:625 ../libsvn_subr/prompt.c:648 +msgid "Username: " +msgstr "Benutzername: " -#: ../svn/auth-cmd.c:203 +#: ../libsvn_subr/prompt.c:670 #, c-format -msgid "Fingerprint: %s\n" -msgstr "Fingerabdruck: %s\n" +msgid "Error validating server certificate for '%s':\n" +msgstr "Fehler bei der Validierung des Serverzertifikats für »%s«:\n" -#: ../svn/auth-cmd.c:220 -#, c-format -msgid "Hostnames: %s\n" -msgstr "Hostnamen: %s\n" +#: ../libsvn_subr/prompt.c:676 +msgid "" +" - The certificate is not issued by a trusted authority. Use the\n" +" fingerprint to validate the certificate manually!\n" +msgstr "" +" - Das Zertifikat ist nicht von einer vertrauenswürdigen Instanz ausgestellt\n" +" Überprüfen Sie den Fingerabdruck, um das Zertifikat zu validieren!\n" -#: ../svn/auth-cmd.c:239 -#, c-format -msgid "Credential kind: %s\n" -msgstr "Art der Zugangsdaten: %s\n" +#: ../libsvn_subr/prompt.c:683 +msgid " - The certificate hostname does not match.\n" +msgstr " - Der Hostname des Zertifikats stimmt nicht überein.\n" -#: ../svn/auth-cmd.c:259 -#, c-format -msgid "Password: %s\n" -msgstr "Passwort: %s\n" +#: ../libsvn_subr/prompt.c:689 +msgid " - The certificate is not yet valid.\n" +msgstr " - Das Zertifikat ist noch nicht gültig.\n" -#: ../svn/auth-cmd.c:261 -#, c-format -msgid "Password: [not shown]\n" -msgstr "Passwort: [nicht angezeigt]\n" +#: ../libsvn_subr/prompt.c:695 +msgid " - The certificate has expired.\n" +msgstr " - Das Zertifikat ist abgelaufen.\n" -#: ../svn/auth-cmd.c:267 -#, c-format -msgid "Passphrase: %s\n" -msgstr "Passphrase: %s\n" +#: ../libsvn_subr/prompt.c:701 +msgid " - The certificate has an unknown error.\n" +msgstr " - Das Zertifikat hat einen unbekannten Fehler.\n" -#: ../svn/auth-cmd.c:270 +#: ../libsvn_subr/prompt.c:706 #, c-format -msgid "Passphrase: [not shown]\n" -msgstr "Passphrase: [nicht angezeigt]\n" +msgid "" +"Certificate information:\n" +" - Hostname: %s\n" +" - Valid: from %s until %s\n" +" - Issuer: %s\n" +" - Fingerprint: %s\n" +msgstr "" +"Zertifikats-Informationen:\n" +" - Hostname: %s\n" +" - Gültig: von %s bis %s\n" +" - Aussteller: %s\n" +" - Fingerabdruck: %s\n" -#: ../svn/auth-cmd.c:273 -#, c-format -msgid "Password cache: %s\n" -msgstr "Passwortspeicher: %s\n" +#: ../libsvn_subr/prompt.c:721 +msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? " +msgstr "Ve(r)werfen, (t)emporär akzeptieren oder (p)ermanent akzeptieren? " -#: ../svn/auth-cmd.c:276 -#, c-format -msgid "Username: %s\n" -msgstr "Benutzername: %s\n" +#: ../libsvn_subr/prompt.c:725 +msgid "(R)eject or accept (t)emporarily? " +msgstr "Ve(r)werfen oder (t)emporär akzeptieren? " -#: ../svn/auth-cmd.c:327 -#, c-format -msgid "Deleting %s credential for realm '%s'\n" -msgstr "Entferne Zugangsdaten %s für Anmeldebereich »%s«\n" +#: ../libsvn_subr/prompt.c:765 +msgid "Client certificate filename: " +msgstr "Client Zertifikatsdatei: " -#: ../svn/auth-cmd.c:374 +#: ../libsvn_subr/prompt.c:789 #, c-format -msgid "Credentials cache in '%s' is empty\n" -msgstr "Speicher für Zugangsdaten in »%s« ist leer\n" +msgid "Passphrase for '%s': " +msgstr "Passphrase für »%s«: " -#: ../svn/auth-cmd.c:378 ../svn/auth-cmd.c:401 -#, c-format -msgid "Credentials cache in '%s' contains no matching credentials" -msgstr "Speicher für Zugangsdaten in »%s« enthält keine passende Zugangsdaten" +#: ../libsvn_subr/prompt.c:832 +msgid "yes" +msgstr "ja" -#: ../svn/auth-cmd.c:386 -#, c-format -msgid "Credentials cache in '%s' contains %d credentials\n" -msgstr "Speicher für Zugangsdaten in »%s« enthält %d Zugangsdaten\n" +#: ../libsvn_subr/prompt.c:833 +msgid "y" +msgstr "j" -#: ../svn/auth-cmd.c:390 -#, c-format -msgid "Credentials cache in '%s' contains %d matching credentials\n" -msgstr "Speicher für Zugangsdaten in »%s« enthält %d passende Zugangsdaten\n" +#: ../libsvn_subr/prompt.c:838 +msgid "no" +msgstr "nein" -#: ../svn/auth-cmd.c:405 -#, c-format -msgid "Deleted %d matching credentials from '%s'\n" -msgstr "%d passende Zugangsdaten aus »%s« gelöscht\n" +#: ../libsvn_subr/prompt.c:839 +msgid "n" +msgstr "n" -#: ../svn/blame-cmd.c:314 ../svn/list-cmd.c:301 -msgid "'verbose' option invalid in XML mode" -msgstr "Option »verbose« ist im XML-Modus ungültig" +#: ../libsvn_subr/prompt.c:845 +msgid "Please type 'yes' or 'no': " +msgstr "Bitte geben Sie »ja« oder »nein« ein: " -#: ../svn/blame-cmd.c:326 ../svn/list-cmd.c:313 ../svn/status-cmd.c:315 -msgid "'incremental' option only valid in XML mode" -msgstr "Option »incremental« ist nur im XML-Modus gültig" +#: ../libsvn_subr/prompt.c:859 +msgid "Store password unencrypted (yes/no)? " +msgstr "Passwort unverschlüsselt speichern (ja/nein)? " -#: ../svn/blame-cmd.c:389 +#: ../libsvn_subr/prompt.c:861 #, c-format -msgid "Skipping binary file (use --force to treat as text): '%s'\n" -msgstr "Überspringe Binärdatei (--force erzwingt Behandlung als Text): »%s«\n" +msgid "" +"\n" +"-----------------------------------------------------------------------\n" +"ATTENTION! Your password for authentication realm:\n" +"\n" +" %s\n" +"\n" +"can only be stored to disk unencrypted! You are advised to configure\n" +"your system so that Subversion can store passwords encrypted, if\n" +"possible. See the documentation for details.\n" +"\n" +"You can avoid future appearances of this warning by setting the value\n" +"of the 'store-plaintext-passwords' option to either 'yes' or 'no' in\n" +"'%s'.\n" +"-----------------------------------------------------------------------\n" +msgstr "" +"\n" +"-----------------------------------------------------------------------\n" +"ACHTUNG! Ihr Password für den Anmeldebereich\n" +"\n" +" %s\n" +"\n" +"kann auf der Festplatte nur unverschlüsselt gespeichert werden! Es wird\n" +"empfohlen, falls möglich Ihr System so zu konfigurieren, dass Subversion\n" +"Passwörter verschlüsselt speichern kann. Siehe die Dokumentation für\n" +"Details.\n" +"\n" +"Sie können ein weiteres Anzeigen dieser Warnung verhindern, indem Sie\n" +"den Wert der Option »store-plaintext-passwords« in\n" +"»%s«\n" +"entweder auf »yes« oder »no« setzen.\n" +"-----------------------------------------------------------------------\n" -#: ../svn/blame-cmd.c:426 -msgid "Could not perform blame on all targets because some targets don't exist" -msgstr "Konnte nicht für alle Ziele annotieren, da einige Ziele nicht existieren" +#: ../libsvn_subr/prompt.c:888 +msgid "Store passphrase unencrypted (yes/no)? " +msgstr "Passphrase unverschlüsselt speichern (ja/nein)? " -#: ../svn/cat-cmd.c:103 -msgid "Could not cat all targets because some targets don't exist" -msgstr "Konnte nicht alle Ziele ausgeben, da einige Ziele nicht existieren" +#: ../libsvn_subr/prompt.c:890 +#, c-format +msgid "" +"\n" +"-----------------------------------------------------------------------\n" +"ATTENTION! Your passphrase for client certificate:\n" +"\n" +" %s\n" +"\n" +"can only be stored to disk unencrypted! You are advised to configure\n" +"your system so that Subversion can store passphrase encrypted, if\n" +"possible. See the documentation for details.\n" +"\n" +"You can avoid future appearances of this warning by setting the value\n" +"of the 'store-ssl-client-cert-pp-plaintext' option to either 'yes' or\n" +"'no' in '%s'.\n" +"-----------------------------------------------------------------------\n" +msgstr "" +"\n" +"-----------------------------------------------------------------------\n" +"ACHTUNG! Ihre Passphrase für das Klient-Zertifikat:\n" +"\n" +" %s\n" +"\n" +"kann auf der Festplatte nur unverschlüsselt gespeichert werden! Es wird\n" +"empfohlen, falls möglich Ihr System so zu konfigurieren, dass Subversion\n" +"Passphrasen verschlüsselt speichern kann. Siehe die Dokumentation für\n" +"Details.\n" +"\n" +"Sie können ein weiteres Anzeigen dieser Warnung verhindern, indem Sie\n" +"den Wert der Option »store-ssl-client-cert-pp-plaintext« in\n" +"»%s«\n" +"entweder auf »yes« oder »no« setzen.\n" +"-----------------------------------------------------------------------\n" -#: ../svn/cat-cmd.c:107 -msgid "Could not cat all targets because some targets are not versioned" -msgstr "Konnte nicht alle Ziele ausgeben, da einige Ziele nicht versioniert sind" +#: ../libsvn_subr/prompt.c:936 +#, c-format +msgid "Password for '%s' GNOME keyring: " +msgstr "Passwort für GNOME-Schlüsselring »%s«: " -#: ../svn/cat-cmd.c:111 -msgid "Could not cat all targets because some targets are directories" -msgstr "Konnte nicht alle Ziele ausgeben, da einige Ziele Verzeichnisse sind" +#: ../libsvn_subr/simple_providers.c:444 +#: ../libsvn_subr/ssl_client_cert_pw_providers.c:286 +#, c-format +msgid "Config error: invalid value '%s' for option '%s'" +msgstr "Konfigurationsfehler: Ungültiger Wert »%s« für Option »%s«" -#: ../svn/changelist-cmd.c:117 -msgid "Could not set changelists on all targets because some targets don't exist" -msgstr "Konnte nicht alle Ziele Änderungslisten zuweisen, da einige Ziele nicht existieren" +#: ../libsvn_subr/sqlite.c:235 +#, c-format +msgid "sqlite[S%d]: %s, executing statement '%s'" +msgstr "sqlite[S%d]: %s, Ausgeführte Anweisung '%s'" -#: ../svn/changelist-cmd.c:122 -msgid "Could not set changelists on all targets because some targets are not versioned" -msgstr "Konnte nicht alle Ziele Änderungslisten zuweisen, da einige Ziele nicht versioniert sind" +#: ../libsvn_subr/sqlite.c:324 +msgid "sqlite: Expected database row missing" +msgstr "sqlite: Erwartete Zeile in der Datenbank fehlt" + +#: ../libsvn_subr/sqlite.c:325 +msgid "sqlite: Extra database row found" +msgstr "sqlite: Zusätzliche Zeile der Datenbank wurde gefunden" -#: ../svn/checkout-cmd.c:140 ../svn/switch-cmd.c:138 +#: ../libsvn_subr/sqlite.c:796 #, c-format -msgid "'%s' does not appear to be a URL" -msgstr "»%s« scheint keine URL zu sein" +msgid "SQLite compiled for %s, but running with %s" +msgstr "SQLite wurde für %s kompiliert, läuft aber mit %s" -#: ../svn/checkout-cmd.c:181 ../svn/export-cmd.c:130 ../svn/list-cmd.c:413 -#: ../svn/switch-cmd.c:188 ../svn/update-cmd.c:177 -msgid "Failure occurred processing one or more externals definitions" -msgstr "Fehler bei der Verarbeitung eines oder mehrerer externer Verweise" +#: ../libsvn_subr/sqlite.c:808 +msgid "SQLite is required to be compiled and run in thread-safe mode" +msgstr "Es wird erwartet, dass SQLite im Thread-sicheren Modus kompiliert und gestartet wird" -#: ../svn/cl-conflicts.c:82 -msgid "local file edit" -msgstr "lokale Datei geändert" +#: ../libsvn_subr/sqlite.c:817 +#, c-format +msgid "Could not configure SQLite [S%d]" +msgstr "Konnte SQLite nicht konfigurieren [S%d]" -#: ../svn/cl-conflicts.c:84 -msgid "local file obstruction" -msgstr "lokale Datei blockiert" +#: ../libsvn_subr/sqlite.c:819 +msgid "Could not initialize SQLite" +msgstr "Konnte SQLite nicht initialisieren" -#: ../svn/cl-conflicts.c:86 -msgid "local file delete" -msgstr "lokale Datei gelöscht" +#: ../libsvn_subr/sqlite.c:1482 +#, c-format +msgid "SQLite hotcopy failed for %s" +msgstr "SQLite-Hotcopy fehlgeschlagen für »%s«" -#: ../svn/cl-conflicts.c:89 -msgid "local file missing or deleted or moved away" -msgstr "lokale Datei fehlt, wurde gelöscht oder verschoben" +#: ../libsvn_subr/stream.c:846 +#, c-format +msgid "Polling for available data on filestream failed" +msgstr "Abfrage aller verfügbarer Daten des Dateistroms fehlgeschlagen" -#: ../svn/cl-conflicts.c:91 -msgid "local file missing" -msgstr "lokale Datei fehlt" +#: ../libsvn_subr/stream.c:866 +#, fuzzy +msgid "Windows doesn't support polling on files" +msgstr "Server unterstützt keine Sperroperationen" -#: ../svn/cl-conflicts.c:93 -msgid "local file unversioned" -msgstr "lokale Datei nicht versioniert" +#: ../libsvn_subr/stream.c:908 +#, fuzzy, c-format +msgid "Can't read a line from file '%s'" +msgstr "Die erste Zeile der Formatdatei »%s« kann nicht gelesen werden" -#: ../svn/cl-conflicts.c:95 -msgid "local file add" -msgstr "lokale Datei hinzugefügt" +#: ../libsvn_subr/stream.c:912 +#, fuzzy, c-format +msgid "Can't read a line from stream" +msgstr "Kann Längenzeile nicht aus Datenstrom lesen" -#: ../svn/cl-conflicts.c:97 -msgid "local file replace" -msgstr "lokale Datei ersetzt" +#: ../libsvn_subr/string.c:1076 ../libsvn_subr/string.c:1120 +#, c-format +msgid "Could not convert '%s' into a number" +msgstr "Konnte »%s« nicht in Zahl umwandeln" -#: ../svn/cl-conflicts.c:99 -msgid "local file moved away" -msgstr "lokale Datei verschoben" +#: ../libsvn_subr/subst.c:1813 ../libsvn_wc/props.c:1767 +#, c-format +msgid "File '%s' has inconsistent newlines" +msgstr "Datei »%s« hat inkonsistente Zeilenenden" -#: ../svn/cl-conflicts.c:101 -msgid "local file moved here" -msgstr "lokale Datei hierher verschoben" +#: ../libsvn_subr/subst.c:1851 +#, c-format +msgid "Can't read special file: File '%s' not found" +msgstr "Kann spezielle Datei nicht lesen: Datei »%s« nicht gefunden" -#: ../svn/cl-conflicts.c:108 -msgid "local dir edit" -msgstr "lokales Verzeichnis geändert" +#: ../libsvn_subr/sysinfo.c:1239 +msgid "Intel" +msgstr "Intel" -#: ../svn/cl-conflicts.c:110 -msgid "local dir obstruction" -msgstr "lokales Verzeichnis blockiert" +#: ../libsvn_subr/sysinfo.c:1240 +msgid "Intel 64-bit" +msgstr "Intel 64 Bit" -#: ../svn/cl-conflicts.c:112 -msgid "local dir delete" -msgstr "lokales Verzeichnis gelöscht" +#: ../libsvn_subr/sysinfo.c:1241 +msgid "PowerPC" +msgstr "PowerPC" -#: ../svn/cl-conflicts.c:115 -msgid "local dir missing or deleted or moved away" -msgstr "lokales Verzeichnis fehlt, wurde gelöscht oder verschoben" +#: ../libsvn_subr/sysinfo.c:1242 +msgid "PowerPC 64-bit" +msgstr "PowerPC 64 Bit" -#: ../svn/cl-conflicts.c:117 -msgid "local dir missing" -msgstr "lokales Verzeichnis fehlt" +#. Human explanatory part, generated by apr_strftime as "Sat, 01 Jan 2000" +#: ../libsvn_subr/time.c:87 +msgid " (%a, %d %b %Y)" +msgstr " (%a, %d. %b %Y)" -#: ../svn/cl-conflicts.c:119 -msgid "local dir unversioned" -msgstr "lokales Verzeichnis nicht versioniert" +#: ../libsvn_subr/token.c:66 +#, c-format +msgid "Token '%s' is unrecognized" +msgstr "Marke »%s« nicht erkannt" -#: ../svn/cl-conflicts.c:121 -msgid "local dir add" -msgstr "lokales Verzeichnis hinzugefügt" +#: ../libsvn_subr/types.c:52 +#, c-format +msgid "Negative revision number found parsing '%s'" +msgstr "Negative Revisionsnummer beim Einlesen von »%s« gefunden" -#: ../svn/cl-conflicts.c:123 -msgid "local dir replace" -msgstr "lokales Verzeichnis ersetzt" +#: ../libsvn_subr/types.c:53 +#, c-format +msgid "Invalid revision number found parsing '%s'" +msgstr "Ungültige Revisionsnummer beim Einlesen von »%s« gefunden" -#: ../svn/cl-conflicts.c:125 -msgid "local dir moved away" -msgstr "lokales Verzeichnis verschoben" +#: ../libsvn_subr/types.c:64 +#, c-format +msgid "Revision number longer than 10 digits '%s'" +msgstr "Revisionsnummer ist länger als 10 Ziffern »%s«" -#: ../svn/cl-conflicts.c:127 -msgid "local dir moved here" -msgstr "lokales Verzeichnis hierher verschoben" +#: ../libsvn_subr/types.c:70 +#, c-format +msgid "Revision number too large '%s'" +msgstr "Revisionsnummer ist zu groß »%s«" -#: ../svn/cl-conflicts.c:135 ../svn/cl-conflicts.c:242 -msgid "local edit" -msgstr "lokale geändert" +#: ../libsvn_subr/utf.c:243 +#, c-format +msgid "Can't create a character converter from native encoding to '%s'" +msgstr "Kann keinen Zeichenkonverter von der eigenen Codierung nach »%s« erzeugen" -#: ../svn/cl-conflicts.c:137 ../svn/cl-conflicts.c:251 -msgid "local obstruction" -msgstr "lokal blockiert" +#: ../libsvn_subr/utf.c:247 +#, c-format +msgid "Can't create a character converter from '%s' to native encoding" +msgstr "Kann keinen Zeichenkonverter von »%s« in die eigene Kodierung erzeugen" -#: ../svn/cl-conflicts.c:139 ../svn/cl-conflicts.c:248 -msgid "local delete" -msgstr "lokal gelöscht" +#: ../libsvn_subr/utf.c:251 +#, c-format +msgid "Can't create a character converter from '%s' to '%s'" +msgstr "Kann keinen Zeichenkonverter von »%s« nach »%s« erzeugen" -#: ../svn/cl-conflicts.c:142 -msgid "local missing or deleted or moved away" -msgstr "lokales Element fehlt, wurde gelöscht oder verschoben" +#: ../libsvn_subr/utf.c:546 +#, c-format +msgid "Can't convert string from native encoding to '%s':" +msgstr "Kann Zeichenkette nicht von der eigenen Codierung nach »%s« konvertieren:" -#: ../svn/cl-conflicts.c:144 -msgid "local missing" -msgstr "lokales Element fehlt" +#: ../libsvn_subr/utf.c:550 +#, c-format +msgid "Can't convert string from '%s' to native encoding:" +msgstr "Kann Zeichenkette nicht von »%s« in die eigene Codierung konvertieren:" -#: ../svn/cl-conflicts.c:146 -msgid "local unversioned" -msgstr "lokales Element nicht versioniert" +#: ../libsvn_subr/utf.c:554 +#, c-format +msgid "Can't convert string from '%s' to '%s':" +msgstr "Kann Zeichenkette nicht von »%s« nach »%s« konvertieren:" -#: ../svn/cl-conflicts.c:148 ../svn/cl-conflicts.c:245 -msgid "local add" -msgstr "lokal hinzugefügt" +#: ../libsvn_subr/utf.c:599 +#, c-format +msgid "Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from UTF-8" +msgstr "Auf sichere Daten »%s« folgte ein nicht-ASCII Byte %d, das nicht von/nach UTF-8 konvertiert werden konnte" -#: ../svn/cl-conflicts.c:150 -msgid "local replace" -msgstr "lokale ersetzt" +#: ../libsvn_subr/utf.c:607 +#, c-format +msgid "Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8" +msgstr "Ein Nicht-ASCII Zeichen (Kode %d) wurde gefunden, das nicht von/nach UTF-8 konvertiert werden konnte" -#: ../svn/cl-conflicts.c:152 -msgid "local moved away" -msgstr "lokale verschoben" +#: ../libsvn_subr/utf.c:652 +#, c-format +msgid "" +"Valid UTF-8 data\n" +"(hex:%s)\n" +"followed by invalid UTF-8 sequence\n" +"(hex:%s)" +msgstr "" +"Auf gültige UTF-8-Daten\n" +"(hex:%s)\n" +"folgte eine ungültige UTF-8-Sequenz\n" +"(hex:%s)" -#: ../svn/cl-conflicts.c:154 -msgid "local moved here" -msgstr "lokale hierher verschoben" +#: ../libsvn_subr/utf.c:1207 ../libsvn_subr/utf.c:1216 +#, c-format +msgid "Conversion to UTF-16 failed" +msgstr "Umwandlung nach UTF-16 fehlgeschlagen" -#: ../svn/cl-conflicts.c:173 -msgid "incoming file edit" -msgstr "eingehende Änderung einer Datei" +#: ../libsvn_subr/utf.c:1245 ../libsvn_subr/utf.c:1255 +#, c-format +msgid "Conversion from UTF-16 failed" +msgstr "Umwandlung von UTF-16 fehlgeschlagen" -#: ../svn/cl-conflicts.c:175 -msgid "incoming file add" -msgstr "eingehendes Hinzufügen einer Datei" +#: ../libsvn_subr/utf8proc.c:298 +#, c-format +msgid "Invalid Unicode character U+%04lX" +msgstr "Ungültiges Unicode-Zeichen U+%04lX" -#: ../svn/cl-conflicts.c:177 -msgid "incoming file delete or move" -msgstr "eingehendes Löschen oder Verschieben einer Datei" +#: ../libsvn_subr/utf8proc.c:335 +msgid "Cannot use a custom escape token in glob matching mode" +msgstr "Kann kein benutzerdefiniertes geschütztes Zeichen im Platzhalter-Suchmodus verwenden" -#: ../svn/cl-conflicts.c:179 -msgid "incoming replace with file" -msgstr "eingehendes Ersetzen mit einer Datei" +#: ../libsvn_subr/utf8proc.c:366 +msgid "Escape token must be one character" +msgstr "Geschützes Zeichen muss ein einzelnes Zeichen sein" -#: ../svn/cl-conflicts.c:186 -msgid "incoming dir edit" -msgstr "eingehende Änderung eines Verzeichnisses" +#: ../libsvn_subr/utf8proc.c:369 +#, c-format +msgid "Invalid escape character U+%04lX" +msgstr "Ungültiges geschütztes Zeichen U+%04lX" -#: ../svn/cl-conflicts.c:188 -msgid "incoming dir add" -msgstr "eingehendes Hinzufügen eines Verzeichnisses" +#: ../libsvn_subr/validate.c:56 +#, c-format +msgid "MIME type '%s' has empty media type" +msgstr "MIME-Typ »%s« hat einen leeren Medientyp" -#: ../svn/cl-conflicts.c:190 -msgid "incoming dir delete or move" -msgstr "eingehendes Löschen oder Verschieben eines Verzeichnisses" +#: ../libsvn_subr/validate.c:61 +#, c-format +msgid "MIME type '%s' does not contain '/'" +msgstr "MIME-Typ »%s« enthält keinen »/«" -#: ../svn/cl-conflicts.c:192 -msgid "incoming replace with dir" -msgstr "eingehendes Ersetzen mit einem Verzeichnis" +#: ../libsvn_subr/validate.c:73 +#, c-format +msgid "MIME type '%s' contains invalid character '%c' in media type" +msgstr "MIME-Typ »%s« enthält ein ungültiges Zeichen »%c« im Medientyp" -#: ../svn/cl-conflicts.c:200 ../svn/cl-conflicts.c:262 -msgid "incoming edit" -msgstr "eingehende Änderung" +#: ../libsvn_subr/validate.c:84 +#, c-format +msgid "MIME type '%s' contains invalid character '0x%02x' in postfix" +msgstr "MIME-Typ »%s« enthält ein ungültiges Zeichen »0x%02x« im Postfix" -#: ../svn/cl-conflicts.c:202 ../svn/cl-conflicts.c:265 -msgid "incoming add" -msgstr "eingehendes Hinzufügen" +#: ../libsvn_subr/version.c:98 +#, c-format +msgid "Version mismatch in '%s'%s: found %d.%d.%d%s, expected %d.%d.%d%s" +msgstr "Versionskonflikt in »%s«%s: gefunden %d.%d.%d%s, erwartet %d.%d.%d%s" -#: ../svn/cl-conflicts.c:204 -msgid "incoming delete or move" -msgstr "eingehendes Löschen oder Verschieben" +#: ../libsvn_subr/version.c:103 +msgid " (expecting equality)" +msgstr " (Übereinstimmung erwartet)" -#: ../svn/cl-conflicts.c:206 -msgid "incoming replace" -msgstr "eingehendes Ersetzen" +#: ../libsvn_subr/version.c:105 +msgid " (expecting compatibility)" +msgstr " (Kompatibilität erwartet)" -#: ../svn/cl-conflicts.c:220 -msgid "upon update" -msgstr "bei Aktualisierung" +#: ../libsvn_subr/version.c:146 +#, fuzzy +msgid "" +"Copyright (C) 2018 The Apache Software Foundation.\n" +"This software consists of contributions made by many people;\n" +"see the NOTICE file for more information.\n" +"Subversion is open source software, see http://subversion.apache.org/\n" +msgstr "" +"Copyright (C) 2015 The Apache Software Foundation.\n" +"Diese Software besteht aus Beiträgen vieler Personen;\n" +"siehe Datei NOTICE für weitere Informationen.\n" +"Subversion ist Open Source Software, siehe http://subversion.apache.org/\n" -#: ../svn/cl-conflicts.c:221 -msgid "upon switch" -msgstr "bei Umstellung" +#: ../libsvn_subr/version.c:224 ../libsvn_subr/version.c:235 +#: ../libsvn_subr/version.c:241 ../libsvn_subr/version.c:258 +#: ../libsvn_subr/version.c:265 +#, c-format +msgid "Failed to parse version number string '%s'" +msgstr "Konnte Zeichenkette mit Versionsnummer »%s« nicht verarbeiten" -#: ../svn/cl-conflicts.c:222 -msgid "upon merge" -msgstr "bei Zusammenführung" +#: ../libsvn_subr/xml.c:518 +#, c-format +msgid "Malformed XML: %s at line %ld" +msgstr "Fehlerhaftes XML: %s in Zeile %ld" -#: ../svn/cl-conflicts.c:223 -msgid "upon none" -msgstr "ohne Operation" +#: ../libsvn_wc/adm_crawler.c:119 +#, c-format +msgid "The existing node '%s' can not be restored." +msgstr "Der vorhandene Knoten »%s« kann nicht wiederhergestellt werden." -#: ../svn/cl-conflicts.c:254 +#: ../libsvn_wc/adm_crawler.c:138 #, c-format -msgid "local %s" -msgstr "lokal %s" +msgid "The node '%s' can not be restored." +msgstr "Der Knoten »%s« kann nicht wiederhergestellt werden." -#: ../svn/cl-conflicts.c:268 -msgid "incoming delete" -msgstr "eingehendes Löschen" +#: ../libsvn_wc/adm_crawler.c:865 +msgid "Error aborting report" +msgstr "Fehler beim Abbrechen des Reports" -#: ../svn/cl-conflicts.c:271 +#: ../libsvn_wc/adm_crawler.c:1004 #, c-format -msgid "incoming %s" -msgstr "eingehendes %s" +msgid "Pristine checksum for file '%s' is missing" +msgstr "Prüfsumme für ursprünglichen Inhalt der Datei »%s« fehlt" -#: ../svn/cl-conflicts.c:277 ../svn/cl-conflicts.c:320 +#: ../libsvn_wc/adm_crawler.c:1194 #, c-format -msgid "%s, %s %s" -msgstr "%s, %s %s" +msgid "Checksum mismatch for text base of '%s'" +msgstr "Prüfsummenfehler für Textbasis von »%s«" -#. A catch-all message for very rare or nominally impossible cases. -#. It will not be pretty, but is closer to an internal error than -#. an ordinary user-facing string. -#: ../svn/cl-conflicts.c:328 +#: ../libsvn_wc/adm_crawler.c:1205 #, c-format -msgid "local: %s %s incoming: %s %s %s" -msgstr "lokal: %s %s, empfangen: %s %s %s" +msgid "While preparing '%s' for commit" +msgstr "Beim Vorbereiten von »%s« für die Übertragung" -#: ../svn/cl-conflicts.c:355 +#: ../libsvn_wc/adm_files.c:105 #, c-format -msgid "%s %s" -msgstr "%s %s" +msgid "'%s' is not a valid administrative directory name" +msgstr "»%s« ist kein gültiger Verwaltungsverzeichnisname" -#: ../svn/cleanup-cmd.c:87 -msgid "Working copy locked; if no other Subversion client is currently using the working copy, try running 'svn cleanup' without the --remove-unversioned and --remove-ignored options first." -msgstr "Arbeitskopie gesperrt; Wenn kein anderer Subversion-Client gerade die Arbeitskopie verwendet, versuchen Sie zuerst »svn cleanup« ohne die Optionen »--remove-unversioned« und »--remove-ignored« auszuführen." +#: ../libsvn_wc/adm_files.c:185 ../libsvn_wc/adm_files.c:241 +#, c-format +msgid "Can only get the pristine contents of files; '%s' is not a file" +msgstr "Kann nur ursprünglichen Inhalt von Dateien holen; »%s« ist keine Datei" -#: ../svn/cleanup-cmd.c:95 -msgid "Cannot remove unversioned or ignored items from something that is not a working copy" -msgstr "Kann ignorierte oder nicht versionierte Elemente nicht aus etwas entfernen, was keine Arbeitskopie ist" +#: ../libsvn_wc/adm_files.c:194 ../libsvn_wc/adm_files.c:256 +#, c-format +msgid "Cannot get the pristine contents of '%s' because its delete is already committed" +msgstr "Kann den ursprünglichen Inhalt von »%s« nicht holen, da sein Löschen schon übertragen wurde" -#: ../svn/cleanup-cmd.c:122 +#: ../libsvn_wc/adm_files.c:202 ../libsvn_wc/adm_files.c:264 #, c-format -msgid "Working copy locked; try running 'svn cleanup' on the root of the working copy ('%s') instead." -msgstr "Arbeitskopie gesperrt; Versuchen Sie stattdessen »svn cleanup« auf der Basis der Arbeitskopie (»%s«) auszuführen" +msgid "Cannot get the pristine contents of '%s' because it has an unexpected status" +msgstr "Kann den ursprünglichen Inhalt von »%s« nicht holen, da es einen unerwarteten Status hat" -#: ../svn/commit-cmd.c:80 +#: ../libsvn_wc/adm_files.c:209 #, c-format -msgid "svn: The depth of this commit is '%s', but copies are always performed recursively in the repository.\n" -msgstr "svn: Die Tiefe dieser Übertragung ist »%s«, Kopien werden aber im Projektarchiv immer rekursiv ausgeführt.\n" +msgid "Node '%s' has no pristine text" +msgstr "Knoten »%s« hat keinen Ursprungstext" -#: ../svn/commit-cmd.c:116 -msgid "Commit targets must be local paths" -msgstr "Ziele der Übertragung müssen lokale Pfade sein" +#: ../libsvn_wc/adm_files.c:420 +#, c-format +msgid "Revision %ld doesn't match existing revision %ld in '%s'" +msgstr "Revision %ld passt nicht zur existierenden Revision %ld in »%s«" -#: ../svn/conflict-callbacks.c:159 ../svn/conflict-callbacks.c:176 -msgid "MINE" -msgstr "EIGENE" +#: ../libsvn_wc/adm_files.c:460 +#, c-format +msgid "URL '%s' (uuid: '%s') doesn't match existing URL '%s' (uuid: '%s') in '%s'" +msgstr "URL »%s« (UUID: »%s«) stimmt nicht mit der existierenden URL »%s« (UUID: »%s«) in »%s« überein" -#: ../svn/conflict-callbacks.c:164 ../svn/conflict-callbacks.c:174 -msgid "THEIRS" -msgstr "FREMDE" +#: ../libsvn_wc/adm_ops.c:313 ../libsvn_wc/update_editor.c:5345 +#, c-format +msgid "Can't find parent directory's node while trying to add '%s'" +msgstr "Kann Knoten des Elternverzeichnisses während des Hinzufügens von »%s« nicht finden" -#: ../svn/conflict-callbacks.c:167 -msgid "MERGED" -msgstr "ZUSAMMENGEFÜHRT" +#: ../libsvn_wc/adm_ops.c:322 ../libsvn_wc/update_editor.c:5339 +#, c-format +msgid "Can't add '%s' to a parent directory scheduled for deletion" +msgstr "" +"Kann »%s« nicht zu einem Elternverzeichnis hinzufügen, das selbst zum Löschen\n" +"vorgesehen ist" -#: ../svn/conflict-callbacks.c:229 ../svn/conflict-callbacks.c:289 -msgid "||||||| ORIGINAL" -msgstr "||||||| ORIGINAL" +#: ../libsvn_wc/adm_ops.c:329 ../libsvn_wc/update_editor.c:5352 +#, c-format +msgid "Can't schedule an addition of '%s' below a not-directory node" +msgstr "Kann »%s« nicht zum Hinzufügen unter einem Knoten vorsehen, der kein Verzeichnis ist" -#: ../svn/conflict-callbacks.c:230 -msgid "<<<<<<< MINE (select with 'mc')" -msgstr "<<<<<<< EIGENE (Auswahl mit »mc«)" +#: ../libsvn_wc/adm_ops.c:390 +#, c-format +msgid "Can't create an entry with a reserved name while trying to add '%s'" +msgstr "Kann einen Eintrag mit einem reservierten Namen nicht erzeugen, während versucht wird, »%s« hinzuzufügen" -#: ../svn/conflict-callbacks.c:231 -msgid ">>>>>>> THEIRS (select with 'tc')" -msgstr ">>>>>>> FREMDE (Auswahl mit »tc«)" +#: ../libsvn_wc/adm_ops.c:594 +#, c-format +msgid "The URL '%s' has a different repository root than its parent" +msgstr "Die URL »%s« hat eine andere Projektarchiv-Basis als ihr Vorgänger" -#: ../svn/conflict-callbacks.c:290 -msgid "<<<<<<< MINE" -msgstr "<<<<<<< EIGENE" +#: ../libsvn_wc/adm_ops.c:614 +#, c-format +msgid "Can't schedule the working copy at '%s' from repository '%s' with uuid '%s' for addition under a working copy from repository '%s' with uuid '%s'." +msgstr "Kann Arbeitkopie »%s« des Projektarchivs »%s« mit UUID »%s« nicht zum Hinzufügen unter einer Arbeitskopie des Projektarchivs »%s« mit UUID »%s« vorsehen." -#: ../svn/conflict-callbacks.c:291 -msgid ">>>>>>> THEIRS" -msgstr ">>>>>>> FREMDE" +#: ../libsvn_wc/adm_ops.c:628 +#, c-format +msgid "Can't add '%s' with URL '%s', but with the data from '%s'" +msgstr "Kann »%s« mit URL »%s« aber den Daten von »%s« nicht hinzufügen" -#: ../svn/conflict-callbacks.c:362 +#: ../libsvn_wc/cleanup.c:58 #, c-format -msgid "" -"Invalid option; there's no merged version to edit.\n" -"\n" -msgstr "" -"Ungültige Option; es gibt keine zusammengeführte Version zum Bearbeiten.\n" -"\n" +msgid "'%s' is not a working copy directory" +msgstr "»%s« ist kein Verzeichnis einer Arbeitskopie" -#: ../svn/conflict-callbacks.c:420 -msgid "change merged file in an editor [edit]" -msgstr "Bearbeitet die zusammengeführte Datei in einem Editor [edit]" +#: ../libsvn_wc/cleanup.c:64 +msgid "Log format too old, please use Subversion 1.6 or earlier" +msgstr "Log-Format zu alt, bitte verwenden Sie Subversion 1.6 oder älter" -#. Translators: keep long_desc below 70 characters (wrap with a left -#. margin of 9 spaces if needed); don't translate the words within square -#. brackets. -#: ../svn/conflict-callbacks.c:420 -msgid "edit file" -msgstr "Datei bearbeiten" +#: ../libsvn_wc/conflicts.c:84 +msgid "Not a conflict skel" +msgstr "Ungültiges Konfliktskeleton" -#: ../svn/conflict-callbacks.c:423 -msgid "show all changes made to merged file" -msgstr "Zeigt alle Änderungen an der zusammengeführten Datei an" +#: ../libsvn_wc/conflicts.c:624 ../libsvn_wc/conflicts.c:721 +msgid "Not a completed conflict skel" +msgstr "Kein vollständiges Konfliktskeleton" -#: ../svn/conflict-callbacks.c:423 -msgid "show diff" -msgstr "Änderungen anzeigen" +#: ../libsvn_wc/conflicts.c:802 ../libsvn_wc/conflicts.c:875 +#: ../libsvn_wc/conflicts.c:966 +msgid "Conflict not set" +msgstr "Konflikt nicht gesetzt" -#: ../svn/conflict-callbacks.c:425 -msgid "accept merged version of file [working]" -msgstr "Akzeptiert die zusammengeführte Version der Datei [working]" +# CHECKME: s/callback/hook/ ?? +#: ../libsvn_wc/conflicts.c:1350 ../libsvn_wc/conflicts.c:2025 +#: ../libsvn_wc/conflicts.c:2070 +msgid "Conflict callback violated API: returned no results" +msgstr "Konflikt-Aktion Rückruffunktion die API: keine Ergebnisse wurden zurückgeliefert" -#. Translators: keep long_desc below 70 characters (wrap with a left -#. margin of 9 spaces if needed); don't translate the words within square -#. brackets. -#: ../svn/conflict-callbacks.c:425 ../svn/conflict-callbacks.c:470 -#: ../svn/conflict-callbacks.c:500 ../svn/conflict-callbacks.c:515 -msgid "mark resolved" -msgstr "als aufgelöst markieren" +#: ../libsvn_wc/conflicts.c:1393 +msgid "Conflict callback violated API: returned no merged file" +msgstr "Konflikt-Aktion verletzte die API: keine zusammengeführte Datei wurde zurückgeliefert" -#: ../svn/conflict-callbacks.c:428 ../svn/conflict-callbacks.c:495 -msgid "display conflict" -msgstr "Konflikte anzeigen" +#: ../libsvn_wc/conflicts.c:1680 +#, fuzzy, c-format +msgid "Conflict on '%s' cannot be resolved to 'theirs-conflict' or 'mine-conflict' because a merged version of the file cannot be created." +msgstr "Konflikt von »%s« konnte nicht aufgelöst werden, da die gewählte Version der Datei nicht verfügbar ist." -#: ../svn/conflict-callbacks.c:428 -msgid "show all conflicts (ignoring merged version)" -msgstr "Zeigt alle Konflikte an (ignoriert zusammengeführte Datei)" +#: ../libsvn_wc/conflicts.c:1725 +#, c-format +msgid "Conflict on '%s' could not be resolved because the chosen version of the file is not available." +msgstr "Konflikt von »%s« konnte nicht aufgelöst werden, da die gewählte Version der Datei nicht verfügbar ist." -#: ../svn/conflict-callbacks.c:431 -msgid "accept my version for all conflicts (same) [mine-conflict]" -msgstr "Akzeptiert eigene Version für alle Konflikte (ebenso) [mine-conflict]" +#: ../libsvn_wc/conflicts.c:2540 +msgid "Invalid 'conflict_result' argument" +msgstr "Ungültiger Parameter »conflict_result«" -#: ../svn/conflict-callbacks.c:431 -msgid "my side of conflict" -msgstr "eigene Seite des Konflikts" +#: ../libsvn_wc/conflicts.c:2803 ../libsvn_wc/conflicts.c:2848 +#, c-format +msgid "Tree conflict can only be resolved to 'working' or 'mine-conflict' state; '%s' not resolved" +msgstr "Baumkonflikt kann nur zum Zustand »working« oder »mine-conflict« aufgelöst werden; Konflikt in »%s« nicht aufgelöst" -#: ../svn/conflict-callbacks.c:434 -msgid "accept their version for all conflicts (same) [theirs-conflict]" -msgstr "Akzeptiert fremde Version für alle Konflikte (ebenso) [theirs-conflict]" +#: ../libsvn_wc/conflicts.c:2875 +#, c-format +msgid "Tree conflict can only be resolved to 'working' state; '%s' is no longer moved" +msgstr "Baumkonflikt kann nur zum Zustand »working« aufgelöst werden; »%s« nicht länger verschoben" -#: ../svn/conflict-callbacks.c:434 -msgid "their side of conflict" -msgstr "fremde Seite des Konflikts" +#: ../libsvn_wc/conflicts.c:2893 +#, c-format +msgid "Tree conflict can only be resolved to 'working' state; '%s' not resolved" +msgstr "Baumkonflikt kann nur zum Zustand »working« aufgelöst werden; Konflikt in »%s« nicht aufgelöst" -#: ../svn/conflict-callbacks.c:439 -msgid "accept my version of entire file (even non-conflicts) [mine-full]" -msgstr "Akzeptiert eigene Version für ganze Datei (alles, nicht nur Konflikte) [mine-full]" +#: ../libsvn_wc/conflicts.c:3070 +msgid "No conflict-callback and no pre-defined conflict-choice provided" +msgstr "Keine Konflikt-Rückruffunktion oder Standard-Konfliktlösungsauswahl angegeben" -#: ../svn/conflict-callbacks.c:439 ../svn/conflict-callbacks.c:489 -msgid "my version" -msgstr "meine Version" +#: ../libsvn_wc/conflicts.c:3339 +#, c-format +msgid "Unable to resolve conflicts on '%s'" +msgstr "Kann Konflikte in »%s« nicht auflösen" -#: ../svn/conflict-callbacks.c:442 -msgid "accept their version of entire file (same) [theirs-full]" -msgstr "Akzeptiert fremde Version für ganze Datei (ebenso) [theirs-full]" +#: ../libsvn_wc/conflicts.c:3530 ../libsvn_wc/conflicts.c:3616 +#: ../libsvn_wc/conflicts.c:3695 ../libsvn_wc/conflicts.c:3781 +#: ../libsvn_wc/conflicts.c:3848 +#, fuzzy, c-format +msgid "Unexpected conflict operation '%s' on '%s'" +msgstr "Unerwarteter Serverfehler %d »%s« auf »%s«" -#: ../svn/conflict-callbacks.c:442 ../svn/conflict-callbacks.c:473 -#: ../svn/conflict-callbacks.c:492 -msgid "their version" -msgstr "fremde Version" +#: ../libsvn_wc/conflicts.c:3538 ../libsvn_wc/conflicts.c:3623 +#: ../libsvn_wc/conflicts.c:3701 ../libsvn_wc/conflicts.c:3787 +#: ../libsvn_wc/conflicts.c:3854 +#, fuzzy, c-format +msgid "Unexpected conflict reason '%s' on '%s'" +msgstr "Unerwarteter HTTP-Status %d »%s« auf »%s«" -#: ../svn/conflict-callbacks.c:446 ../svn/util.c:776 -msgid "merge" -msgstr "Zusammenführung" +#: ../libsvn_wc/conflicts.c:3629 ../libsvn_wc/conflicts.c:3707 +#: ../libsvn_wc/conflicts.c:3793 ../libsvn_wc/conflicts.c:3860 +#, fuzzy, c-format +msgid "Unexpected conflict action '%s' on '%s'" +msgstr "Unerwarteter HTTP-Status %d »%s« auf »%s«" -#: ../svn/conflict-callbacks.c:446 -msgid "use merge tool to resolve conflict" -msgstr "Verwendet ein Werkzeug zum Zusammenführen für die Konfliktlösung" +#: ../libsvn_wc/copy.c:103 +#, c-format +msgid "Source '%s' is unexpected kind" +msgstr "Quelle »%s« ist unbekannten Typs" -#: ../svn/conflict-callbacks.c:448 -msgid "launch external merge tool to resolve conflict [launch]" -msgstr "Startet ein externes Werkzeug zum Zusammenführen für die Konfliktlösung [launch]" +#: ../libsvn_wc/copy.c:471 +#, c-format +msgid "cannot handle node kind for '%s'" +msgstr "Kann Knotentyp für »%s« nicht verarbeiten" -#: ../svn/conflict-callbacks.c:448 -msgid "launch tool" -msgstr "Werkzeug starten" +#: ../libsvn_wc/copy.c:493 ../libsvn_wc/wc_db.c:4623 ../libsvn_wc/wc_db.c:5426 +#, c-format +msgid "Cannot handle status of '%s'" +msgstr "Kann Status von »%s« nicht verarbeiten" -#: ../svn/conflict-callbacks.c:451 -msgid "internal merge tool" -msgstr "internes Werkzeug zum Zusammenführen" +#: ../libsvn_wc/copy.c:502 ../libsvn_wc/wc_db.c:4614 ../libsvn_wc/wc_db.c:5420 +#: ../libsvn_wc/wc_db.c:5664 +#, c-format +msgid "Cannot copy '%s' excluded by server" +msgstr "Kann vom Server ausgeschlossenes »%s« nicht kopieren" -#: ../svn/conflict-callbacks.c:451 -msgid "use built-in merge tool to resolve conflict" -msgstr "Verwendet das interne Werkzeug zum Zusammenführen für die Konfliktlösung" +#: ../libsvn_wc/copy.c:643 +#, c-format +msgid "Deleted node '%s' can't be copied." +msgstr "Gelöschter Knoten »%s« kann nicht kopiert werden." -#: ../svn/conflict-callbacks.c:454 ../svn/conflict-callbacks.c:476 -#: ../svn/conflict-callbacks.c:502 -msgid "mark the conflict to be resolved later [postpone]" -msgstr "Markiert den Konflikt für eine spätere Auflösung [postpone]" +#: ../libsvn_wc/copy.c:661 +#, c-format +msgid "'%s' is the root of a working copy and cannot be moved" +msgstr "»%s« ist das Basisverzeichnis einer Arbeitskopie und kann nicht verschoben werden" -#: ../svn/conflict-callbacks.c:454 ../svn/conflict-callbacks.c:476 -#: ../svn/conflict-callbacks.c:502 ../svn/conflict-callbacks.c:517 -#: ../svn/conflict-callbacks.c:532 ../svn/conflict-callbacks.c:547 -msgid "postpone" -msgstr "später auflösen" +#: ../libsvn_wc/copy.c:669 +#, c-format +msgid "'%s' represents the repository root and cannot be moved" +msgstr "»%s« repräsentiert die Wurzel eines Projektarchivs und kann nicht verschoben werden " -#: ../svn/conflict-callbacks.c:457 ../svn/conflict-callbacks.c:479 -#: ../svn/conflict-callbacks.c:505 ../svn/conflict-callbacks.c:519 -#: ../svn/conflict-callbacks.c:534 ../svn/conflict-callbacks.c:549 -msgid "postpone all remaining conflicts" -msgstr "Alle verbleibenen Konflikte zurückstellen" +#: ../libsvn_wc/copy.c:744 +#, c-format +msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'" +msgstr "" +"Kann »%s« nicht kopieren, da es nicht aus dem Projektarchiv »%s« stammt\n" +"sondern aus »%s«" -#: ../svn/conflict-callbacks.c:457 ../svn/conflict-callbacks.c:479 -#: ../svn/conflict-callbacks.c:505 ../svn/conflict-callbacks.c:519 -#: ../svn/conflict-callbacks.c:534 ../svn/conflict-callbacks.c:549 -msgid "quit resolution" -msgstr "Konfliktauflösung beenden" +#: ../libsvn_wc/copy.c:752 +#, c-format +msgid "Cannot copy to '%s' as it is scheduled for deletion" +msgstr "Kann nach »%s« kopieren, da es zum Löschen vorgesehen ist" -#: ../svn/conflict-callbacks.c:459 ../svn/conflict-callbacks.c:481 -msgid "show all options" -msgstr "alle Optionen anzeigen" +#: ../libsvn_wc/copy.c:780 +#, c-format +msgid "'%s' is already under version control but is excluded." +msgstr "»%s« befindet sich bereits unter Versionskontrolle, ist aber ausgeschlossen." -#: ../svn/conflict-callbacks.c:459 ../svn/conflict-callbacks.c:481 -msgid "show this list (also 'h', '?')" -msgstr "Gibt diese Liste aus (auch: »h«, »?«)" +#: ../libsvn_wc/copy.c:796 +#, c-format +msgid "There is already a versioned item '%s'" +msgstr "Es existiert bereits ein versioniertes Objekt »%s«" -#: ../svn/conflict-callbacks.c:470 -msgid "accept the working copy version of file [working]" -msgstr "Akzeptiert die Arbeitskopieversion der Datei [working]" +#: ../libsvn_wc/copy.c:812 +#, c-format +msgid "'%s' already exists and is in the way" +msgstr "»%s« existiert bereits und ist im Weg" -#: ../svn/conflict-callbacks.c:473 -msgid "accept the incoming version of file [theirs-full]" -msgstr "Akzeptiert fremde Version der Datei [theirs-full]" - -#: ../svn/conflict-callbacks.c:489 -msgid "accept my version of entire property (even non-conflicts) [mine-full]" -msgstr "Akzeptiert eigene Version für ganze Eigenschaft (alles, nicht nur Konflikte) [mine-full]" +#: ../libsvn_wc/copy.c:864 +#, c-format +msgid "Cannot move mixed-revision subtree '%s' [%ld:%ld]; try updating it first" +msgstr "Kann Unterbaum »%s« mit verschiedenen Revisionen nicht verschieben [%ld:%ld], versuchen Sie erst zu aktualisieren" -#: ../svn/conflict-callbacks.c:492 -msgid "accept their version of entire property (same) [theirs-full]" -msgstr "Akzeptiert fremde Version für ganze Eigenschaft (ebenso) [theirs-full]" +#: ../libsvn_wc/crop.c:211 +#, c-format +msgid "Cannot exclude '%s': it is a working copy root" +msgstr "Kann »%s« nicht ausschließen: Es ist die Basis einer Arbeitskopie" -#: ../svn/conflict-callbacks.c:495 -msgid "show conflicts in this property" -msgstr "Zeigt Konflikte in dieser Eigenschaft an" +#: ../libsvn_wc/crop.c:219 +#, c-format +msgid "Cannot exclude '%s': it is a switched path" +msgstr "Kann »%s« nicht ausschließen: Es ist ein umgestellter Pfad" -#: ../svn/conflict-callbacks.c:497 -msgid "change merged property value in an editor [edit]" -msgstr "Bearbeitet den zusammengeführten Eigenschaftswert in einem Editor [edit]" +#: ../libsvn_wc/crop.c:246 +#, c-format +msgid "Cannot exclude '%s': it is to be added to the repository. Try commit instead" +msgstr "Kann »%s« nicht ausschließen: Es soll dem Projektarchiv hinzugefügt werden. Versuchen Sie stattdessen es zu übertragen" -#: ../svn/conflict-callbacks.c:497 -msgid "edit property" -msgstr "Eigenschaft bearbeiten" +#: ../libsvn_wc/crop.c:253 +#, c-format +msgid "Cannot exclude '%s': it is to be deleted from the repository. Try commit instead" +msgstr "Kann »%s« nicht ausschließen: Es soll aus dem Projektarchiv entfernt werden. Versuchen Sie stattdessen es zu übertragen" -#: ../svn/conflict-callbacks.c:500 -msgid "accept edited version of property" -msgstr "Akzeptiert die bearbeitete Version der Eigenschaft" +# CHECKME: Check translation of crop (beschneiden?)!!!! +#: ../libsvn_wc/crop.c:324 +msgid "Can only crop a working copy with a restrictive depth" +msgstr "Kann nur eine Arbeitskopie mit einer eingeschränkten Tiefe beschneiden" -#: ../svn/conflict-callbacks.c:507 ../svn/conflict-callbacks.c:521 -#: ../svn/conflict-callbacks.c:536 ../svn/conflict-callbacks.c:551 -msgid "help" -msgstr "Hilfe" +#: ../libsvn_wc/crop.c:335 +msgid "Can only crop directories" +msgstr "Kann nur Verzeichnisse beschneiden" -#: ../svn/conflict-callbacks.c:507 ../svn/conflict-callbacks.c:521 -#: ../svn/conflict-callbacks.c:536 ../svn/conflict-callbacks.c:551 -msgid "show this help (also '?')" -msgstr "Zeigt diese Hilfe an (auch: »?«)" +#: ../libsvn_wc/crop.c:348 +#, c-format +msgid "Cannot crop '%s': it is going to be removed from repository. Try commit instead" +msgstr "Kann »%s« nicht beschneiden: Es soll vom Projektarchiv entfernt werden. Versuchen Sie stattdessen es zu übertragen" -#: ../svn/conflict-callbacks.c:515 -msgid "accept current working copy state" -msgstr "Akzeptiert aktuellen Zustand in der Arbeitskopie" +#: ../libsvn_wc/crop.c:355 +#, c-format +msgid "Cannot crop '%s': it is to be added to the repository. Try commit instead" +msgstr "Kann »%s« nicht beschneiden: Es soll dem Projektarchiv hinzugefügt werden. Versuchen Sie stattdessen es zu übertragen" -#: ../svn/conflict-callbacks.c:517 ../svn/conflict-callbacks.c:532 -#: ../svn/conflict-callbacks.c:547 -msgid "resolve the conflict later [postpone]" -msgstr "Löst den Konflikt später auf [postpone]" +#: ../libsvn_wc/delete.c:238 ../libsvn_wc/delete.c:358 +#, c-format +msgid "'%s' cannot be deleted" +msgstr "»%s« kann nicht gelöscht werden" -#: ../svn/conflict-callbacks.c:528 -msgid "apply update to move destination (recommended)" -msgstr "Wendet die Aktualisierung auf das verschobene Ziel an (empfohlen)" +#: ../libsvn_wc/delete.c:256 ../libsvn_wc/delete.c:374 +#, c-format +msgid "'%s' is the root of a working copy and cannot be deleted" +msgstr "»%s« ist das Basisverzeichnis einer Arbeitskopie und kann nicht gelöscht werden" -#: ../svn/conflict-callbacks.c:529 -msgid "apply incoming update to move destination [mine-conflict]" -msgstr "Wendet empfangene Aktualisierung auf das verschobene Ziel an [mine-conflict]" +#: ../libsvn_wc/delete.c:263 ../libsvn_wc/delete.c:380 +#, c-format +msgid "'%s' represents the repository root and cannot be deleted" +msgstr "»%s« repräsentiert die Wurzel eines Projektarchivs und kann nicht gelöscht werden" -#: ../svn/conflict-callbacks.c:543 -msgid "prepare for updating moved-away children, if any (recommended)" -msgstr "Bereitet die Aktualisierung von ggf. verschobenen Kindelementen vor (empfohlen)" +#: ../libsvn_wc/delete.c:474 +#, c-format +msgid "File '%s' has local modifications" +msgstr "Die Datei »%s« hat lokale Änderungen" -#: ../svn/conflict-callbacks.c:544 -msgid "allow updating moved-away children with 'svn resolve' [mine-conflict]" -msgstr "Erlaubt die Aktualisierung von verschobenen Kindelementen mit »svn resolve« [mine-conflict]" +#: ../libsvn_wc/deprecated.c:2420 +#, c-format +msgid "Unexpectedly found '%s': path is marked 'missing'" +msgstr "Unerwartetes »%s« gefunden: Pfad wird als »fehlend« markiert" -#: ../svn/conflict-callbacks.c:580 -msgid "Select:" -msgstr "Auswahl:" +#: ../libsvn_wc/entries.c:1100 +#, c-format +msgid "'%s' is not a versioned working copy" +msgstr "»%s« ist keine versionierte Arbeitskopie" -#: ../svn/conflict-callbacks.c:607 +#: ../libsvn_wc/entries.c:1396 #, c-format -msgid " (%s) %s" -msgstr " (%s) %s" +msgid "Admin area of '%s' is missing" +msgstr "Administrativer Bereich von »%s« fehlt" -#: ../svn/conflict-callbacks.c:647 -msgid "Words in square brackets are the corresponding --accept option arguments.\n" -msgstr "Worte in eckigen Klammen geben das entsprechende Argument für die Option »--accept« an.\n" +#: ../libsvn_wc/entries.c:1416 +#, c-format +msgid "'%s' is not of the right kind" +msgstr "»%s« hat einen falschen Typ" -#: ../svn/conflict-callbacks.c:686 +#: ../libsvn_wc/entries.c:1578 #, c-format -msgid "" -"Unrecognized option.\n" -"\n" -msgstr "" -"Unbekannte Option.\n" -"\n" +msgid "The file '%s' has no checksum" +msgstr "Datei »%s« hat keine Prüfsumme" -# TODO: leicht inkonsistent zu obigen Strings (tritt in svn info-Ausgabe auf) -#: ../svn/conflict-callbacks.c:721 +#: ../libsvn_wc/entries.c:1696 #, c-format -msgid "Conflict discovered in binary file '%s'.\n" -msgstr "Konflikt in Binärdatei »%s« entdeckt.\n" +msgid "Unable to upgrade '%s' at line %d" +msgstr "Kann »%s« nicht in ein neues Format überführen in Zeile %d" -# TODO: leicht inkonsistent zu obigen Strings (tritt in svn info-Ausgabe auf) -#: ../svn/conflict-callbacks.c:725 +#: ../libsvn_wc/entries.c:1935 #, c-format -msgid "Conflict discovered in file '%s'.\n" -msgstr "Konflikt in Datei »%s« entdeckt.\n" +msgid "No copyfrom URL for '%s'" +msgstr "Keine »copyfrom« URL für »%s« " -# TODO: "for binary files" for consistency with "for properties" -#: ../svn/conflict-callbacks.c:816 +#: ../libsvn_wc/entries.c:2167 #, c-format -msgid "" -"Invalid option; cannot display conflicts for a binary file.\n" -"\n" -msgstr "" -"Ungültige Option; Anzeige von Konflikten ist für Binärdateien nicht möglich.\n" -"\n" +msgid "Bad base MD5 checksum for '%s'; expected: '%s'; found '%s'; " +msgstr "MD5-Prüfsummenfehler für Basis »%s«; erwartet: »%s«, tatsächlich: »%s«" -#: ../svn/conflict-callbacks.c:825 +#: ../libsvn_wc/entries.c:2520 #, c-format -msgid "" -"Invalid option; original files not available.\n" -"\n" -msgstr "" -"Ungültige Option; Originaldateien nicht verfügbar.\n" -"\n" +msgid "No default entry in directory '%s'" +msgstr "Verzeichnis »%s« hat keinen Standardeintrag" -#: ../svn/conflict-callbacks.c:841 +#: ../libsvn_wc/entries.c:2676 #, c-format -msgid "" -"Invalid option; there's no merged version to diff.\n" -"\n" -msgstr "" -"Ungültige Option; es gibt keine zusammengeführte Version zum Vergleichen.\n" -"\n" +msgid "Directory '%s' has no THIS_DIR entry" +msgstr "Verzeichnis »%s« hat keinen »THIS_DIR« Eintrag" -#: ../svn/conflict-callbacks.c:866 +#: ../libsvn_wc/entries.c:2856 ../libsvn_wc/node.c:403 #, c-format -msgid "" -"Invalid option; there's no base path to merge.\n" -"\n" -msgstr "" -"Ungültige Option; es gibt keinen Basispfad zum Zusammenführen.\n" -"\n" +msgid "'%s' has an unrecognized node kind" +msgstr "»%s« hat einen nicht erkannten Knotentyp" -#: ../svn/conflict-callbacks.c:960 +#: ../libsvn_wc/externals.c:158 ../libsvn_wc/externals.c:247 #, c-format -msgid "" -"Invalid option.\n" -"\n" -msgstr "" -"Ungültige Option.\n" -"\n" +msgid "Error parsing %s property on '%s': '%s'" +msgstr "Fehler beim Analysieren der %s Eigenschaft für »%s«: »%s«" -# CHECKME: proper English? -#: ../svn/conflict-callbacks.c:989 +#: ../libsvn_wc/externals.c:214 #, c-format -msgid "" -"Invalid option; cannot choose based on conflicts in a binary file.\n" -"\n" -msgstr "" -"Ungültige Option; Auswahl anhand von Konflikten ist in einer Binärdatei nicht möglich.\n" -"\n" +msgid "Can't split line into components: '%s'" +msgstr "Zeile kann nicht in Komponenten zerlegt werden: »%s«" -#: ../svn/conflict-callbacks.c:1003 +#: ../libsvn_wc/externals.c:273 #, c-format -msgid "" -"Invalid option; use diff/edit/merge/launch before choosing 'mark resolved'.\n" -"\n" -msgstr "Ungültige Option; Verwenden Sie Änderungen anzeigen / Datei bearbeiten / Zusammenführung / Werkzeug starten bevor Sie den Konflikt als aufgelöst markieren.\n" +msgid "Invalid %s property on '%s': cannot use two absolute URLs ('%s' and '%s') in an external; one must be a path where an absolute or relative URL is checked out to" +msgstr "Ungültige Eigenschaft %s zu »%s«: Es können nicht zwei absolute URLs (»%s« und »%s«) in einem externen Verweis verwendet werden; eine muss ein Pfad sein, in den eine absolute oder relative URL ausgecheckt wird" -#: ../svn/conflict-callbacks.c:1044 +#: ../libsvn_wc/externals.c:282 ../libsvn_wc/externals.c:290 #, c-format -msgid "Conflict for property '%s' discovered on '%s'.\n" -msgstr "Konflikt für Eigenschaft »%s« für »%s« entdeckt.\n" +msgid "Invalid %s property on '%s': cannot use a URL '%s' as the target directory for an external definition" +msgstr "Ungültige Eigenschaft %s zu »%s«: Eine URL »%s« kann nicht als Zielverzeichnis für eine externe Definition verwendet werden" -#: ../svn/conflict-callbacks.c:1104 +#: ../libsvn_wc/externals.c:354 #, c-format -msgid "" -"Invalid option; please edit the property first.\n" -"\n" -msgstr "" -"Ungültige Option; Bearbeiten Sie zuerst die Eigenschaft.\n" -"\n" +msgid "Invalid %s property on '%s': target '%s' is an absolute path or involves '..'" +msgstr "Ungültige Eigenschaft %s auf »%s«: Ziel »%s« ist ein absoluter Pfad oder enthält »..«" -#: ../svn/conflict-callbacks.c:1141 +#: ../libsvn_wc/externals.c:549 ../libsvn_wc/externals.c:572 #, c-format -msgid "" -"Tree conflict on '%s'\n" -" > %s\n" -msgstr "" -"Baumkonflikt in »%s«\n" -" > %s\n" +msgid "This editor can only update '%s'" +msgstr "Dieser Editor kann nur »%s« aktualisieren" -#: ../svn/copy-cmd.c:123 ../svn/export-cmd.c:94 ../svn/util.c:959 +#: ../libsvn_wc/externals.c:588 #, c-format -msgid "'%s': a peg revision is not allowed here" -msgstr "»%s«: Eine Fix-Revision ist hier nicht erlaubt" +msgid "Node '%s' is no existing file external" +msgstr "Knoten »%s« ist kein vorhandener externer Dateiverweis" -#: ../svn/copy-cmd.c:162 ../svn/delete-cmd.c:69 ../svn/mkdir-cmd.c:68 -#: ../svn/move-cmd.c:77 ../svn/propedit-cmd.c:260 -msgid "Local, non-commit operations do not take a log message or revision properties" -msgstr "Lokale Operationen ohne Übertragung benötigen keine Logmeldung oder Revisionseigenschaften" +#: ../libsvn_wc/externals.c:1595 +#, c-format +msgid "URL '%s' does not begin with a scheme" +msgstr "Die URL »%s« beginnt nicht mit einem Schema" -#: ../svn/diff-cmd.c:227 -msgid "'--xml' option only valid with '--summarize' option" -msgstr "Option »--xml« ist nur in Verbindung mit der Option »--summarize« zulässig" +#: ../libsvn_wc/externals.c:1650 +#, c-format +msgid "Illegal parent directory URL '%s'" +msgstr "Illegale URL des übergeordneten Verzeichnisses »%s«" -#: ../svn/diff-cmd.c:240 ../svn/diff-cmd.c:244 ../svn/diff-cmd.c:248 -#: ../svn/diff-cmd.c:252 ../svn/diff-cmd.c:256 ../svn/diff-cmd.c:260 -#: ../svn/diff-cmd.c:264 ../svn/diff-cmd.c:268 +#: ../libsvn_wc/externals.c:1689 #, c-format -msgid "'%s' not valid with '--summarize' option" -msgstr "»%s« mit der Option »--summarize« nicht zulässig" +msgid "Illegal repository root URL '%s'" +msgstr "Illegale Projektarchivwurzel-URL »%s«" -#: ../svn/diff-cmd.c:355 -msgid "'--new' option only valid with '--old' option" -msgstr "Option »--new« ist nur in Verbindung mit der Option »--old« zulässig" +#: ../libsvn_wc/externals.c:1734 +#, c-format +msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'" +msgstr "Die externe relative URL »%s« darf keinen Verweis auf übergeordnete Pfade haben, d.h. »..«" -#: ../svn/diff-cmd.c:373 -msgid "'svn diff [-r N[:M]] [TARGET[@REV]...]' does not support mixed target types. Try using the --old and --new options or one of the shorthand invocations listed in 'svn help diff'." -msgstr "»svn diff [-r N[:M]] [ZIEL[@REV]...]« unterstützt keine gemischten Zieltypen. Versuchen Sie die Optionen »--old« und »--new« oder eine der Kurzfassungen des Aufrufs, die in »svn help diff« aufgelistet sind." +#: ../libsvn_wc/externals.c:1762 +#, c-format +msgid "Unrecognized format for the relative external URL '%s'" +msgstr "Unbekanntes Format für die relative externe URL »%s«" -#: ../svn/diff-cmd.c:430 +#: ../libsvn_wc/lock.c:529 #, c-format -msgid "Path '%s' not relative to base URLs" -msgstr "Pfad »%s« ist nicht relativ zur Basis-URL" +msgid "Path '%s' ends in '%s', which is unsupported for this operation" +msgstr "Pfad »%s« endet mit »%s«, was für diese Operation nicht erlaubt ist" -#: ../svn/export-cmd.c:121 -msgid "Destination directory exists; please remove the directory or use --force to overwrite" -msgstr "Zielverzeichnis existiert; bitte löschen Sie das Verzeichnis oder verwenden Sie »--force« zum Überschreiben" +#: ../libsvn_wc/lock.c:773 +#, c-format +msgid "Working copy '%s' locked" +msgstr "Arbeitskopie »%s« gesperrt" -#: ../svn/file-merge.c:139 ../svn/file-merge.c:809 -msgid "Could not write data to merged file" -msgstr "Konnte Daten nicht in zusammengeführte Datei schreiben" +#: ../libsvn_wc/lock.c:918 +#, c-format +msgid "Unable to check path existence for '%s'" +msgstr "Kann die Existenz des Pfades »%s« nicht prüfen" -#: ../svn/file-merge.c:495 -msgid "Could not write data to temporary file" -msgstr "Konnte Daten nicht in temporäre Datei schreiben" +#: ../libsvn_wc/lock.c:941 +#, c-format +msgid "Expected '%s' to be a directory but found a file" +msgstr "Erwartete, dass »%s« ein Verzeichnis ist, es ist aber eine Datei" -#: ../svn/file-merge.c:507 -msgid "No editor found." -msgstr "Kein Editor gefunden." +#: ../libsvn_wc/lock.c:951 +#, c-format +msgid "Can't retrieve an access baton for non-directory '%s'" +msgstr "Kann keine Zugriffsreferenz für nicht-Verzeichnis »%s« erhalten" -#: ../svn/file-merge.c:519 -msgid "Error running editor." -msgstr "Fehler beim Ausführen des Editors." +#: ../libsvn_wc/lock.c:960 +#, c-format +msgid "Directory '%s' is missing" +msgstr "Verzeichnis »%s« fehlt" -#: ../svn/file-merge.c:604 -msgid "Conflicting section found during merge:" -msgstr "Abschnitt mit Konflikt während Zusammenführung gefunden:" - -#: ../svn/file-merge.c:607 +#: ../libsvn_wc/lock.c:968 #, c-format -msgid "(1) their version (at line %lu)" -msgstr "(1) fremde Version (in Zeile %lu)" +msgid "Working copy '%s' is not locked" +msgstr "Arbeitskopie »%s« ist nicht gesperrt" -#: ../svn/file-merge.c:612 +#: ../libsvn_wc/lock.c:1382 ../libsvn_wc/wc_db.c:4947 +#: ../libsvn_wc/wc_db.c:16218 ../libsvn_wc/wc_db_update_move.c:185 #, c-format -msgid "(2) your version (at line %lu)" -msgstr "(2) eigene Version (in Zeile %lu)" - -#: ../svn/file-merge.c:661 -msgid "" -"Select: (1) use their version, (2) use your version,\n" -" (12) their version first, then yours,\n" -" (21) your version first, then theirs,\n" -" (e1) edit their version and use the result,\n" -" (e2) edit your version and use the result,\n" -" (eb) edit both versions and use the result,\n" -" (p) postpone this conflicting section leaving conflict markers,\n" -" (a) abort file merge and return to main menu: " -msgstr "" -"Auswahl: (1) verwendet fremde Version, (2) verwendet eigene Version,\n" -" (12) verwendet fremde Version zuerst, dann eigene,\n" -" (21) verwendet eigene Version zuerst, dann fremde,\n" -" (e1) bearbeitet fremde Version und verwendet das Ergebnis,\n" -" (e2) bearbeitet eigene Version und verwendet das Ergebnis,\n" -" (eb) bearbeitet beide Versionen und verwendet das Ergebnis,\n" -" (p) Verschiebt Konfliktlösung für diesen Abschnitt und setzt Konfliktmarkierungen,\n" -" (a) Bricht Zusammenführung der Datei ab und kehrt zum Hauptmenü zurück: " +msgid "No write-lock in '%s'" +msgstr "Keine Schreibsperre in »%s«" -#: ../svn/file-merge.c:894 +#: ../libsvn_wc/lock.c:1496 #, c-format -msgid "Merging '%s'.\n" -msgstr "Zusammenführung von »%s«.\n" +msgid "Can't obtain lock on non-directory '%s'." +msgstr "Kann keine Sperre für nicht-Verzeichnis »%s« erhalten." -#: ../svn/file-merge.c:942 +#: ../libsvn_wc/merge.c:1285 ../libsvn_wc/props.c:232 #, c-format -msgid "Merge of '%s' aborted.\n" -msgstr "Zusammenführung von »%s« abgebrochen.\n" +msgid "Can't merge into conflicted node '%s'" +msgstr "Kann nicht in Knoten mit Konflikt »%s« zusammenführen" -#: ../svn/file-merge.c:960 +#: ../libsvn_wc/merge.c:1328 ../libsvn_wc/props.c:248 #, c-format -msgid "" -"Could not write merged result to '%s', saved instead at '%s'.\n" -"'%s' remains in conflict.\n" -msgstr "" -"Ergebnis der Zusammenführung konnte nicht nach »%s« geschrieben werden, es wurde stattdessen in »%s« gespeichert.\n" -"Konflikt in »%s« bleibt bestehen.\n" +msgid "The property '%s' may not be merged into '%s'." +msgstr "Eigenschaft »%s« darf nicht nach »%s« zusammengeführt werden." -#: ../svn/file-merge.c:978 +#: ../libsvn_wc/node.c:749 #, c-format -msgid "Merge of '%s' completed (remains in conflict).\n" -msgstr "Zusammenführung von »%s« abgeschlossen (Konflikt bleibt bestehen)\n" +msgid "Incomplete copy information on path '%s'." +msgstr "Unvollständige Informationen für Kopie in Pfad »%s«" -#: ../svn/file-merge.c:982 +#: ../libsvn_wc/node.c:915 #, c-format -msgid "Merge of '%s' completed.\n" -msgstr "Zusammenführung von »%s« abgeschlossen.\n" - -#: ../svn/help-cmd.c:53 -msgid "" -"usage: svn [options] [args]\n" -"Subversion command-line client.\n" -"Type 'svn help ' for help on a specific subcommand.\n" -"Type 'svn --version' to see the program version and RA modules\n" -" or 'svn --version --quiet' to see just the version number.\n" -"\n" -"Most subcommands take file and/or directory arguments, recursing\n" -"on the directories. If no arguments are supplied to such a\n" -"command, it recurses on the current directory (inclusive) by default.\n" -"\n" -"Available subcommands:\n" -msgstr "" -"Aufruf: svn [Optionen] [Parameter]\n" -"Subversion-Kommandozeilenclient.\n" -"Geben Sie »svn help « ein, um Hilfe zu einem Unterbefehl\n" -" zu erhalten.\n" -"Geben Sie »svn --version« ein, um die Programmversion und die Zugriffsmodule\n" -" oder »svn --version --quiet«, um nur die Versionsnummer zu sehen.\n" -"\n" -"Die meisten Unterbefehle akzeptieren Datei- und/oder Verzeichnisparameter,\n" -"wobei die Verzeichnisse rekursiv durchlaufen werden. Wenn keine Parameter\n" -"angegeben werden, durchläuft der Befehl das aktuelle Verzeichnis rekursiv.\n" -"\n" -"Verfügbare Unterbefehle:\n" - -#: ../svn/help-cmd.c:66 ../svnbench/help-cmd.c:62 -msgid "" -"Subversion is a tool for version control.\n" -"For additional information, see http://subversion.apache.org/\n" -msgstr "" -"Subversion ist ein Programm zur Versionskontrolle.\n" -"Für weitere Informationen, siehe: http://subversion.apache.org/\n" +msgid "'%s' is not the root of the working copy '%s'" +msgstr "»%s« ist nicht die Basis des Projektarchivs »%s«" -#: ../svn/help-cmd.c:70 ../svnbench/help-cmd.c:66 ../svnrdump/svnrdump.c:628 -#: ../svnsync/svnsync.c:1916 -msgid "" -"The following repository access (RA) modules are available:\n" -"\n" -msgstr "" -"Die folgenden ZugriffsModule (ZM) für Projektarchive stehen zur Verfügung:\n" -"\n" +#: ../libsvn_wc/old-and-busted.c:123 +msgid "Invalid escape sequence" +msgstr "Ungültige Escape-Sequenz" -#: ../svn/help-cmd.c:124 -msgid "" -"WARNING: Plaintext password storage is enabled!\n" -"\n" -msgstr "" -"WARNUNG: Speicherung von Passwörtern im Klartext ist aktiviert!\n" -"\n" +#: ../libsvn_wc/old-and-busted.c:130 +msgid "Invalid escaped character" +msgstr "Ungültiges geschütztes Zeichen" -#: ../svn/help-cmd.c:147 -msgid "" -"\n" -"The following authentication credential caches are available:\n" -"\n" -msgstr "" -"\n" -"Die folgenden Speicherbereiche für Zugangsdaten sind verfügbar:\n" -"\n" +#: ../libsvn_wc/old-and-busted.c:148 ../libsvn_wc/old-and-busted.c:177 +#: ../libsvn_wc/old-and-busted.c:241 ../libsvn_wc/old-and-busted.c:253 +msgid "Unexpected end of entry" +msgstr "Unerwartetes Ende des Eintrags" -#: ../svn/help-cmd.c:152 +#: ../libsvn_wc/old-and-busted.c:203 #, c-format -msgid "%s* Wincrypt cache in %s\n" -msgstr "%s* Wincrypt-Speicher in %s\n" +msgid "Entry contains non-canonical path '%s'" +msgstr "Eintrag enthält nichtkanonischen Pfad »%s«" -#: ../svn/help-cmd.c:159 +#: ../libsvn_wc/old-and-busted.c:275 #, c-format -msgid "%s* Plaintext cache in %s\n" -msgstr "%s* Klartext-Speicher in %s\n" - -#: ../svn/import-cmd.c:87 -msgid "Repository URL required when importing" -msgstr "Projektarchiv URL ist beim Import erforderlich" - -#: ../svn/import-cmd.c:91 -msgid "Too many arguments to import command" -msgstr "Zu viele Parameter für Import Befehl" +msgid "Invalid value for field '%s'" +msgstr "Ungültiger Wert für Feld »%s«" -#: ../svn/import-cmd.c:107 +#: ../libsvn_wc/old-and-busted.c:347 #, c-format -msgid "Invalid URL '%s'" -msgstr "Ungültige URL »%s«" +msgid "Found an unexpected \\0 in the file external '%s'" +msgstr "Ein nicht erwartetes \\0 wurde im externen Dateiverweis »%s« gefunden" -#: ../svn/info-cmd.c:207 +#: ../libsvn_wc/old-and-busted.c:391 #, c-format -msgid "'%s' is not a valid value for --show-item" -msgstr "»%s« ist kein gültiger Wert für --show-item" +msgid "Illegal file external revision kind %d for path '%s'" +msgstr "Ungültiger Revisionstyp des externen Dateiverweises %d für Pfad »%s«" -#: ../svn/info-cmd.c:215 +#: ../libsvn_wc/old-and-busted.c:489 ../libsvn_wc/old-and-busted.c:847 #, c-format -msgid "'%s' is not a valid value for --show-item; did you mean '%s'?" -msgstr "»%s« ist kein gültiger Wert für --show-item; Meinten Sie »%s«?" +msgid "Entry '%s' has invalid node kind" +msgstr "Eintrag »%s« hat einen ungültigen Knotentyp" -#: ../svn/info-cmd.c:225 +#: ../libsvn_wc/old-and-busted.c:510 ../libsvn_wc/old-and-busted.c:827 #, c-format -msgid "'%s' is not a valid value for --show-item; did you mean '%s' or '%s'?" -msgstr "»%s« ist kein gültiger Wert für --show-item; Meinten Sie »%s« oder »%s«?" +msgid "Entry for '%s' has invalid repository root" +msgstr "Eintrag »%s« hat eine ungültige Projektarchiv-Basis" -#: ../svn/info-cmd.c:236 +#: ../libsvn_wc/old-and-busted.c:531 ../libsvn_wc/old-and-busted.c:872 #, c-format -msgid "'%s' is not a valid value for --show-item; did you mean '%s', '%s' or '%s'?" -msgstr "»%s« ist kein gültiger Wert für --show-item; Meinten Sie »%s«, »%s« oder »%s«?" - -# CHECKME: full stop? -#: ../svn/info-cmd.c:257 -msgid "Resource is not under version control." -msgstr "Ressource ist nicht unter Versionskontrolle." +msgid "Entry '%s' has invalid 'schedule' value" +msgstr "Eintrag »%s« hat einen ungültigen Wert für »schedule«" -#: ../svn/info-cmd.c:424 ../svnadmin/svnadmin.c:1949 -#: ../svnadmin/svnadmin.c:2167 +#: ../libsvn_wc/old-and-busted.c:681 #, c-format -msgid "Path: %s\n" -msgstr "Pfad: %s\n" +msgid "Entry '%s' has invalid 'depth' value" +msgstr "Eintrag »%s« hat einen ungültigen Wert für »depth«" -#: ../svn/info-cmd.c:431 +#: ../libsvn_wc/old-and-busted.c:732 #, c-format -msgid "Name: %s\n" -msgstr "Name: %s\n" +msgid "Entry '%s' has invalid '%s' value" +msgstr "Eintrag »%s« hat einen ungültigen »%s« Wert" -#: ../svn/info-cmd.c:435 +#: ../libsvn_wc/old-and-busted.c:1085 #, c-format -msgid "Working Copy Root Path: %s\n" -msgstr "Wurzelpfad der Arbeitskopie: %s\n" +msgid "XML parser failed in '%s'" +msgstr "XML-Parser schlug in »%s« fehl" -#: ../svn/info-cmd.c:441 -#, c-format -msgid "URL: %s\n" -msgstr "URL: %s\n" +#: ../libsvn_wc/old-and-busted.c:1141 +msgid "Missing default entry" +msgstr "Fehlender Standardeintrag" -#: ../svn/info-cmd.c:444 -#, c-format -msgid "Relative URL: %s\n" -msgstr "Relative URL: %s\n" +#: ../libsvn_wc/old-and-busted.c:1146 +msgid "Default entry has no revision number" +msgstr "Standardeintrag hat keine Revisionsnummer" -#: ../svn/info-cmd.c:448 -#, c-format -msgid "Repository Root: %s\n" -msgstr "Basis des Projektarchivs: %s\n" +#: ../libsvn_wc/old-and-busted.c:1151 +msgid "Default entry is missing URL" +msgstr "Standardeintrag hat keine URL" -#: ../svn/info-cmd.c:452 +#: ../libsvn_wc/old-and-busted.c:1231 #, c-format -msgid "Repository UUID: %s\n" -msgstr "UUID des Projektarchivs: %s\n" +msgid "Invalid version line in entries file of '%s'" +msgstr "Ungültige Versionszeile in Datei »entry« von »%s«" -#: ../svn/info-cmd.c:456 -#, c-format -msgid "Revision: %ld\n" -msgstr "Revision: %ld\n" +#: ../libsvn_wc/old-and-busted.c:1248 +msgid "Missing entry terminator" +msgstr "Fehlender Abschluss des Eintrags" -#: ../svn/info-cmd.c:461 -#, c-format -msgid "Node Kind: file\n" -msgstr "Knotentyp: Datei\n" +#: ../libsvn_wc/old-and-busted.c:1251 +msgid "Invalid entry terminator" +msgstr "Ungültiger Abschluss des Eintrags" -#: ../svn/info-cmd.c:465 +#: ../libsvn_wc/old-and-busted.c:1255 #, c-format -msgid "Node Kind: directory\n" -msgstr "Knotentyp: Verzeichnis\n" +msgid "Error at entry %d in entries file for '%s':" +msgstr "Fehler bei Eintrag %d in Eintragsdatei für »%s«:" -#: ../svn/info-cmd.c:469 +#: ../libsvn_wc/props.c:211 #, c-format -msgid "Node Kind: none\n" -msgstr "Knotentyp: keiner\n" +msgid "The node '%s' does not have properties in this state." +msgstr "Der Knoten »%s« hat in diesem Zustand keine Eigenschaften." -#: ../svn/info-cmd.c:474 +#: ../libsvn_wc/props.c:377 #, c-format -msgid "Node Kind: unknown\n" -msgstr "Knotentyp: unbekannt\n" +msgid "" +"Trying to add new property '%s'\n" +"but the property already exists.\n" +msgstr "" +"Versuch, eine neue Eigenschaft »%s« hinzuzufügen,\n" +"aber die Eigenschaft existiert bereits.\n" -#: ../svn/info-cmd.c:483 +#: ../libsvn_wc/props.c:386 #, c-format -msgid "Schedule: normal\n" -msgstr "Plan: normal\n" +msgid "" +"Trying to add new property '%s'\n" +"but the property has been locally deleted.\n" +msgstr "" +"Versuch, eine neue Eigenschaft »%s« hinzuzufügen,\n" +"aber die Eigenschaft wurde lokal gelöscht.\n" -#: ../svn/info-cmd.c:487 +#: ../libsvn_wc/props.c:400 #, c-format -msgid "Schedule: add\n" -msgstr "Plan: hinzufügen\n" - -#: ../svn/info-cmd.c:491 -#, c-format -msgid "Schedule: delete\n" -msgstr "Plan: löschen\n" +msgid "" +"Trying to delete property '%s'\n" +"but the property has been locally added.\n" +msgstr "" +"Versuch, die Eigenschaft »%s« zu löschen,\n" +"aber die Eigenschaft wurde lokal hinzugefügt.\n" -#: ../svn/info-cmd.c:495 +#: ../libsvn_wc/props.c:416 #, c-format -msgid "Schedule: replace\n" -msgstr "Plan: ersetzen\n" +msgid "" +"Trying to delete property '%s'\n" +"but the property has been locally modified.\n" +msgstr "" +"Versuch, die Eigenschaft »%s« zu löschen,\n" +"aber die Eigenschaft wurde lokal verändert.\n" -#: ../svn/info-cmd.c:511 +#: ../libsvn_wc/props.c:426 #, c-format -msgid "Depth: empty\n" -msgstr "Tiefe: »empty«\n" +msgid "" +"Trying to delete property '%s'\n" +"but the property has been locally deleted and had a different value.\n" +msgstr "" +"Versuch, die Eigenschaft »%s« zu löschen,\n" +"aber die Eigenschaft wurde lokal gelöscht und hatte einen anderen Wert.\n" -#: ../svn/info-cmd.c:515 +#: ../libsvn_wc/props.c:438 #, c-format -msgid "Depth: files\n" -msgstr "Tiefe: »files«\n" +msgid "" +"Trying to delete property '%s'\n" +"but the local property value is different.\n" +msgstr "" +"Versuch, die Eigenschaft »%s« zu löschen,\n" +"aber der lokale Wert ist ein anderer.\n" -#: ../svn/info-cmd.c:519 +#: ../libsvn_wc/props.c:457 #, c-format -msgid "Depth: immediates\n" -msgstr "Tiefe: »immediates«\n" +msgid "" +"Trying to change property '%s'\n" +"but the local property value conflicts with the incoming change.\n" +msgstr "" +"Versuch, die Eigenschaft »%s« zu ändern,\n" +"aber der lokale Eigenschaftswert steht mit den empfangenen Änderungen im Konflikt.\n" -#: ../svn/info-cmd.c:523 +#: ../libsvn_wc/props.c:465 #, c-format -msgid "Depth: exclude\n" -msgstr "Tiefe: »exclude«\n" +msgid "" +"Trying to change property '%s'\n" +"but the property has already been locally changed to a different value.\n" +msgstr "" +"Versuch, die Eigenschaft »%s« zu ändern,\n" +"aber die Eigenschaft wurde lokal schon auf einen anderen Wert gesetzt.\n" -#. Other depths should never happen here. -#: ../svn/info-cmd.c:534 +#: ../libsvn_wc/props.c:472 #, c-format -msgid "Depth: INVALID\n" -msgstr "Tiefe: UNGÜLTIG\n" +msgid "" +"Trying to change property '%s'\n" +"but the property has been locally deleted.\n" +msgstr "" +"Versuch, die Eigenschaft »%s« zu ändern,\n" +"aber die Eigenschaft wurde lokal gelöscht.\n" -#: ../svn/info-cmd.c:538 +#: ../libsvn_wc/props.c:478 #, c-format -msgid "Copied From URL: %s\n" -msgstr "Kopiert von URL: %s\n" +msgid "" +"Trying to change property '%s'\n" +"but the property has been locally added with a different value.\n" +msgstr "" +"Versuch, die Eigenschaft »%s« zu ändern,\n" +"aber die Eigenschaft wurde lokal mit einem anderen Wert hinzugefügt.\n" -#: ../svn/info-cmd.c:542 +#: ../libsvn_wc/props.c:484 #, c-format -msgid "Copied From Rev: %ld\n" -msgstr "Kopiert von Rev: %ld\n" +msgid "" +"Trying to change property '%s'\n" +"but the property does not exist locally.\n" +msgstr "" +"Versuch, die Eigenschaft »%s« zu ändern,\n" +"aber die Eigenschaft existiert lokal nicht.\n" -#: ../svn/info-cmd.c:545 -#, c-format -msgid "Moved From: %s\n" -msgstr "Verschoben von: %s\n" +#: ../libsvn_wc/props.c:594 +msgid "<<<<<<< (local property value)" +msgstr "<<<<<<< (lokaler Eigenschaftswert)" -#: ../svn/info-cmd.c:552 -#, c-format -msgid "Moved To: %s\n" -msgstr "Verschoben nach: %s\n" +#: ../libsvn_wc/props.c:595 +msgid ">>>>>>> (incoming 'changed to' value)" +msgstr ">>>>>>> (empfangener Zielwert)" -#: ../svn/info-cmd.c:560 -#, c-format -msgid "Last Changed Author: %s\n" -msgstr "Letzter Autor: %s\n" +#: ../libsvn_wc/props.c:596 +msgid "||||||| (incoming 'changed from' value)" +msgstr "||||||| (empfangener Ausgangswert)" -#: ../svn/info-cmd.c:564 -#, c-format -msgid "Last Changed Rev: %ld\n" -msgstr "Letzte geänderte Rev: %ld\n" +#: ../libsvn_wc/props.c:633 +msgid "Local property value:\n" +msgstr "Lokaler Eigenschaftswert:\n" -#: ../svn/info-cmd.c:569 -msgid "Last Changed Date" -msgstr "Letztes Änderungsdatum" +#: ../libsvn_wc/props.c:635 ../libsvn_wc/props.c:646 +msgid "Cannot display: property value is binary data\n" +msgstr "Kann nicht anzeigen: Eigenschaftswert sind Binärdaten\n" -#: ../svn/info-cmd.c:575 -msgid "Text Last Updated" -msgstr "Text zuletzt geändert" +#: ../libsvn_wc/props.c:644 +msgid "Incoming property value:\n" +msgstr "Empfangener Eigenschaftswert:\n" -#: ../svn/info-cmd.c:578 +#: ../libsvn_wc/props.c:1582 ../libsvn_wc/props.c:1991 +#: ../libsvn_wc/props.c:2092 #, c-format -msgid "Checksum: %s\n" -msgstr "Prüfsumme: %s\n" +msgid "Property '%s' is an entry property" +msgstr "Eigenschaft »%s« ist eine Eintragseigenschaft" + +#: ../libsvn_wc/props.c:1619 ../libsvn_wc/props.c:1626 +msgid "Failed to load properties" +msgstr "Konnte Eigenschaften nicht laden" -#: ../svn/info-cmd.c:600 +#: ../libsvn_wc/props.c:1662 #, c-format -msgid "Conflict Previous Base File: %s\n" -msgstr "Konflikt: vorherige Ausgangsdatei: %s\n" +msgid "Cannot set '%s' on a directory ('%s')" +msgstr "Kann »%s« nicht für ein Verzeichnis setzen (»%s«)" -#: ../svn/info-cmd.c:608 +#: ../libsvn_wc/props.c:1669 #, c-format -msgid "Conflict Previous Working File: %s\n" -msgstr "Konflikt: vorherige Arbeitsdatei: %s\n" +msgid "Cannot set '%s' on a file ('%s')" +msgstr "Kann »%s« nicht für eine Datei setzen (»%s«)" -#: ../svn/info-cmd.c:616 +#: ../libsvn_wc/props.c:1748 #, c-format -msgid "Conflict Current Base File: %s\n" -msgstr "Konflikt: aktuelle Ausgangsdatei: %s\n" +msgid "Can't set '%s': file '%s' has binary mime type property" +msgstr "Kann »%s« nicht setzen: Datei »%s« hat die MIME-Typ Eigenschaft »binär«" -# TODO: leicht inkonsistent zu obigen Strings (tritt in svn info-Ausgabe auf) -#: ../svn/info-cmd.c:626 +#: ../libsvn_wc/props.c:1793 +msgid "Failed to load current properties" +msgstr "Konnte aktuelle Eigenschaften nicht laden" + +#: ../libsvn_wc/props.c:2013 #, c-format -msgid "Conflict Properties File: %s\n" -msgstr "Konfliktdatei mit Eigenschaften: %s\n" +msgid "Can't set properties on '%s': invalid status for updating properties." +msgstr "Kann Eigenschaften für »%s« nicht setzen: ungültiger Status beim Aktualisieren von Eigenschaften" -#: ../svn/info-cmd.c:641 -msgid "Tree conflict" -msgstr "Baumkonflikt" +#: ../libsvn_wc/props.c:2097 +#, c-format +msgid "Property '%s' is a WC property, not a regular property" +msgstr "Eigenschaft »%s« ist eine Arbeitskopieeigenschaft, keine reguläre Eigenschaft" -#: ../svn/info-cmd.c:667 -msgid "Conflict Details" -msgstr "Konfliktdetails" +#: ../libsvn_wc/props.c:2188 +#, c-format +msgid "Unrecognized line ending style '%s' for '%s'" +msgstr "Stil für Zeilenende »%s« nicht erkannt für »%s«" -#: ../svn/info-cmd.c:680 -msgid "Source left" -msgstr "Quelle links" +#. scratch_ +#: ../libsvn_wc/props.c:2239 +#, c-format +msgid " (%d more duplicate targets found)" +msgstr "(%d mehrmals auftauchende Ziele gefunden)" -#: ../svn/info-cmd.c:689 -msgid "Source right" -msgstr "Quelle rechts" +#: ../libsvn_wc/props.c:2244 +#, c-format +msgid "Invalid %s property on '%s': target '%s' appears more than once%s" +msgstr "Ungültige Eigenschaft %s auf »%s«: Ziel »%s« taucht mehrmals auf%s" -#: ../svn/info-cmd.c:698 +#: ../libsvn_wc/props.c:2275 #, c-format -msgid "Lock Token: %s\n" -msgstr "Sperrmarke: %s\n" +msgid "Cannot set non-inheritable mergeinfo on a non-directory ('%s')" +msgstr "Kann nicht-vererbbare Zusammenführungsinformationen auf ein nicht-Verzeichnis (»%s«) nicht setzen" -#: ../svn/info-cmd.c:702 +#: ../libsvn_wc/relocate.c:111 #, c-format -msgid "Lock Owner: %s\n" -msgstr "Sperreigner: %s\n" +msgid "Cannot relocate '%s' as it is not the root of a working copy" +msgstr "Kann »%s« nicht umplatzieren da es keine Basis einer Arbeitskopie ist" -#: ../svn/info-cmd.c:707 -msgid "Lock Created" -msgstr "Sperre erzeugt" +#: ../libsvn_wc/relocate.c:118 +#, c-format +msgid "Cannot relocate '%s' as it is not the root of a working copy; try relocating '%s' instead" +msgstr "Kann »%s« nicht umplatzieren da es keine Basis einer Arbeitskopie ist; Versuchen Sie stattdessen »%s« umzuplatzieren" -#: ../svn/info-cmd.c:711 -msgid "Lock Expires" -msgstr "Sperre läuft ab" +#: ../libsvn_wc/relocate.c:136 +msgid "Cannot relocate a single file" +msgstr "Kann eine einzelne Datei nicht umplatzieren" -#: ../svn/info-cmd.c:719 +#: ../libsvn_wc/relocate.c:144 #, c-format -msgid "" -"Lock Comment (%i line):\n" -"%s\n" -msgid_plural "" -"Lock Comment (%i lines):\n" -"%s\n" -msgstr[0] "" -"Sperrkommentar (%i Zeile):\n" -"%s\n" -msgstr[1] "" -"Sperrkommentar (%i Zeilen):\n" -"%s\n" +msgid "Invalid source URL prefix: '%s' (does not overlap target's URL '%s')" +msgstr "Ungültiger Prefix der Quell-URL: »%s« (Keine Überlappung mit Ziel-URL »%s«)" -#: ../svn/info-cmd.c:728 +#: ../libsvn_wc/relocate.c:154 #, c-format -msgid "Changelist: %s\n" -msgstr "Änderungsliste: %s\n" +msgid "Invalid relocation destination: '%s' (not a URL)" +msgstr "Ungültiges Ziel für Umplatzierung: »%s« (keine URL)" -#: ../svn/info-cmd.c:884 -msgid "--show-item is not valid in --xml mode" -msgstr "Die Option »--show-item« ist im Modus »--xml« nicht gültig" +#: ../libsvn_wc/relocate.c:161 +#, c-format +msgid "Invalid relocation destination: '%s' (does not point to target)" +msgstr "Ungültiges Ziel für Umplatzierung: »%s« (zeigt nicht auf Ziel)" -#: ../svn/info-cmd.c:888 -msgid "--no-newline is not valid in --xml mode" -msgstr "Die Option »--no-newline« ist im Modus »--xml« nicht gültig" +#: ../libsvn_wc/tree_conflicts.c:137 +msgid "Unknown enumeration value in tree conflict description" +msgstr "Unbekannter Aufzählungswert in Baumkonfliktbeschreibung" -#: ../svn/info-cmd.c:903 ../svn/info-cmd.c:923 -msgid "--incremental is only valid in --xml mode" -msgstr "Die Option »--incremental« ist nur Modus »--xml« gültig" +#: ../libsvn_wc/tree_conflicts.c:161 +msgid "Invalid version info in tree conflict description" +msgstr "Ungültige Versionsinformation in Baumkonfliktbeschreibung" -#: ../svn/info-cmd.c:910 -msgid "--no-newline is only available for single-target, non-recursive info operations" -msgstr "Die Option »--no-newline« ist nur für einzelne Ziele und nicht-rekursive Info-Operationen verfügbar" +#: ../libsvn_wc/tree_conflicts.c:219 +#, c-format +msgid "Invalid conflict info '%s' in tree conflict description" +msgstr "Ungültige Konfliktinformationen »%s« in Baumkonfliktbeschreibung" -#: ../svn/info-cmd.c:927 -msgid "--no-newline' is only valid with --show-item" -msgstr "Die Option »--no-newline« ist nur mit »--show-item« gültig" +#: ../libsvn_wc/tree_conflicts.c:230 +msgid "Empty 'victim' field in tree conflict description" +msgstr "Leeres Feld »victim« in Baumkonfliktbeschreibung" -#: ../svn/info-cmd.c:1000 ../svnbench/null-info-cmd.c:283 -msgid "Could not display info for all targets because some targets don't exist" -msgstr "Konnte Information nicht für alle Ziele anzeigen, da einige Ziele nicht existieren" +#: ../libsvn_wc/tree_conflicts.c:238 +msgid "Invalid 'node_kind' field in tree conflict description" +msgstr "Ungültiges Feld »node_kind« in Baumkonfliktbeschreibung" -#: ../svn/list-cmd.c:73 -msgid "%b %d %H:%M" -msgstr "%d. %b %H:%M" +#: ../libsvn_wc/tree_conflicts.c:432 +#, c-format +msgid "Attempt to add tree conflict that already exists at '%s'" +msgstr "Es wurde versucht, einen Baumkonflikt hinzuzufügen, der in »%s« bereits vorhanden ist" -#: ../svn/list-cmd.c:75 -msgid "%b %d %Y" -msgstr "%d. %b %Y" +#: ../libsvn_wc/update_editor.c:994 +#, c-format +msgid "" +"Checksum mismatch while updating '%s':\n" +" expected: %s\n" +" actual: %s\n" +msgstr "" +"Prüfsummenfehler beim Aktualisieren von »%s«:\n" +" Erwartet: %s\n" +" Tatsächlich: %s\n" -# Currently this is used for checkouts and switches too. If we -# want different output, we'll have to add new actions. -#: ../svn/list-cmd.c:101 +#: ../libsvn_wc/update_editor.c:1129 #, c-format -msgid "Listing external '%s' defined on '%s':\n" -msgstr "Auflistung des externen Verweises »%s« definiert auf »%s«:\n" +msgid "'%s' is not valid as filename in directory '%s'" +msgstr "»%s« ist als Dateiname im Verzeichnis »%s« nicht gültig" -#: ../svn/list-cmd.c:422 ../svnbench/null-list-cmd.c:166 -msgid "Could not list all targets because some targets don't exist" -msgstr "Konnte nicht alle Ziele auflisten, da einige Ziele nicht existieren" +#: ../libsvn_wc/update_editor.c:1511 +#, c-format +msgid "Unexpected attempt to add a node at path '%s'" +msgstr "Unerwarteter Versuch, einen Knoten im Pfad »%s« hinzuzufügen" -#: ../svn/lock-cmd.c:58 -msgid "Lock comment contains a zero byte" -msgstr "Sperrkommentar enthält ein Null-Byte" +#: ../libsvn_wc/update_editor.c:1522 +#, c-format +msgid "Unexpected attempt to edit, delete, or replace a node at path '%s'" +msgstr "Unerwarteter Versuch, einen Knoten im Pfad »%s« zu bearbeiten, zu löschen oder zu ersetzen" -#: ../svn/log-cmd.c:109 -msgid "\n" -msgstr "\n" +#: ../libsvn_wc/update_editor.c:1904 +#, c-format +msgid "Failed to add directory '%s': object of the same name as the administrative directory" +msgstr "" +"Konnte Verzeichnis »%s« nicht hinzufügen, da es denselben Namen wie das\n" +"Administrationsverzeichnis trägt" -#: ../svn/log-cmd.c:321 -msgid "(no author)" -msgstr "(kein Autor)" +#: ../libsvn_wc/update_editor.c:2580 +msgid "Couldn't do property merge" +msgstr "Konnte Eigenschaften nicht zusammenführen" -#: ../svn/log-cmd.c:327 -msgid "(no date)" -msgstr "(kein Datum)" +#: ../libsvn_wc/update_editor.c:3119 +#, c-format +msgid "Failed to add file '%s': object of the same name as the administrative directory" +msgstr "Konnte Datei »%s« nicht hinzufügen, da es denselben Namen wie Administrationsverzeichnis trägt" -#: ../svn/log-cmd.c:357 +#: ../libsvn_wc/update_editor.c:3661 #, c-format -msgid " | %d line" -msgid_plural " | %d lines" -msgstr[0] " | %d Zeile" -msgstr[1] " | %d Zeilen" +msgid "" +"Checksum mismatch for '%s':\n" +" expected: %s\n" +" recorded: %s\n" +msgstr "" +"Prüfsummenfehler für »%s«:\n" +" erwartet: %s\n" +"verzeichnet: %s\n" -#: ../svn/log-cmd.c:374 +#: ../libsvn_wc/update_editor.c:5320 #, c-format -msgid "Changed paths:\n" -msgstr "Geänderte Pfade:\n" +msgid "Node '%s' exists." +msgstr "Knoten »%s« existiert bereits" -#: ../svn/log-cmd.c:394 +#: ../libsvn_wc/update_editor.c:5380 #, c-format -msgid " (from %s:%ld)" -msgstr " (von %s:%ld)" +msgid "Copyfrom-url '%s' has different repository root than '%s'" +msgstr "Die Quell-URL »%s« hat eine andere Projektarchiv-Basis als »%s«" -#: ../svn/log-cmd.c:412 +#: ../libsvn_wc/update_editor.c:5592 #, c-format -msgid "Reverse merged via:" -msgstr "Rückwärtig zusammengeführt mittels:" +msgid "'%s' is not an unmodified copied directory" +msgstr "»%s« ist kein kopiertes Verzeichnis ohne Veränderungen" -#: ../svn/log-cmd.c:414 +#: ../libsvn_wc/update_editor.c:5603 #, c-format -msgid "Merged via:" -msgstr "Zusammengeführt mittels:" +msgid "Copyfrom '%s' doesn't match original location of '%s'" +msgstr "Quell-URL »%s« stimmt nicht mit der ursprünglichen Position von »%s« überein" -#: ../svn/log-cmd.c:697 -msgid "'with-all-revprops' option only valid in XML mode" -msgstr "Option »with-all-revprops« ist nur im XML-Modus gültig" +#: ../libsvn_wc/upgrade.c:256 +#, c-format +msgid "Missing end of line in wcprops file for '%s'" +msgstr "Fehlendes Zeilenende in Datei »wcprops« für »%s«" -#: ../svn/log-cmd.c:701 -msgid "'with-no-revprops' option only valid in XML mode" -msgstr "Option »with-no-revprops« ist nur im XML-Modus gültig" +#: ../libsvn_wc/upgrade.c:632 +#, c-format +msgid "Working copy '%s' can't be upgraded because the repository root is not available and can't be retrieved" +msgstr "Arbeitskopie »%s« kann nicht in ein neueres Format gebracht werden, da die Wurzel des Projektarchivs nicht verfügbar ist und nicht bestimmt werden kann" -# TODO: combine -# CHECKME: s/with-revprop/with-revprops/ ??? -#: ../svn/log-cmd.c:705 -msgid "'with-revprop' option only valid in XML mode" -msgstr "Option »with-revprop« ist nur im XML-Modus gültig" +#: ../libsvn_wc/upgrade.c:639 +#, c-format +msgid "Working copy '%s' can't be upgraded because the repository uuid is not available and can't be retrieved" +msgstr "Arbeitskopie »%s« kann nicht in ein neueres Format gebracht werden, da die UUID des Projektarchivs nicht verfügbar ist und nicht bestimmt werden kann" -#: ../svn/log-cmd.c:712 -msgid "'diff' option is not supported in XML mode" -msgstr "Option »diff« wird im XML-Modus nicht unterstützt" +#: ../libsvn_wc/upgrade.c:646 +#, c-format +msgid "Working copy '%s' can't be upgraded because it doesn't have a url" +msgstr "Arbeitskopie »%s« kann nicht in ein neueres Format gebracht werden, da sie keine URL hat" -#: ../svn/log-cmd.c:718 -msgid "'quiet' and 'diff' options are mutually exclusive" -msgstr "»quiet« und »diff« schließen sich gegenseitig aus" +#: ../libsvn_wc/upgrade.c:750 +#, c-format +msgid "The properties of '%s' are in an indeterminate state and cannot be upgraded. See issue #2530." +msgstr "Die Eigenschaften von »%s« sind in einem unbestimmten Zustand und können nicht in ein neues Format gebreacht werden. Siehe Fehlerbericht #2530." -#: ../svn/log-cmd.c:722 -msgid "'diff-cmd' option requires 'diff' option" -msgstr "Option »diff-cmd« erfordert Option »diff«" +#: ../libsvn_wc/upgrade.c:762 +#, c-format +msgid "Insufficient NODES rows for '%s'" +msgstr "Nicht genügend »NODES«-Zeilen für »%s«" -#: ../svn/log-cmd.c:726 -msgid "'internal-diff' option requires 'diff' option" -msgstr "Option »internal-diff« erfordert Option »diff«" +#: ../libsvn_wc/upgrade.c:1514 +msgid "Cannot upgrade with existing logs; run a cleanup operation on this working copy using a client version which is compatible with this working copy's format (such as the version you are upgrading from), then retry the upgrade with the current version" +msgstr "Kann mit vorhandenen Logdateien nicht in ein neues Format bringen; Starten Sie »svn cleanup« auf dieser Arbeitskopie mit einer Version des Clienten die mit dem Format der Arbeitskopie kompatibel ist (z.B. mit der Version, die sie gerade ersetzen) und versuchen Sie dann den Vorgang mit der neuen Version erneut" -#: ../svn/log-cmd.c:730 -msgid "'extensions' option requires 'diff' option" -msgstr "Option »extensions« erfordert Option »diff«" +#: ../libsvn_wc/upgrade.c:1583 +msgid "This working copy is corrupt and cannot be upgraded. Please check out a new working copy." +msgstr "Diese Arbeitskopie ist beschädigt und kann nicht in ein neues Format gebracht werden. Bitte erzeugen Sie eine neue Arbeitskopie mit »svn checkout«." -#: ../svn/log-cmd.c:735 -msgid "'depth' option requires 'diff' option" -msgstr "Option »depth« erfordert Option »diff«" +#: ../libsvn_wc/upgrade.c:1628 +msgid "(unreleased development version)" +msgstr "(nicht veröffentlichte Entwicklungsversion)" -#: ../svn/log-cmd.c:751 ../svnbench/null-log-cmd.c:158 -msgid "-c and -r are mutually exclusive" -msgstr "-c und -r schließen einander aus" +#: ../libsvn_wc/upgrade.c:1644 +#, c-format +msgid "Working copy '%s' is too old (format %d, created by Subversion %s)" +msgstr "Format der Arbeitskopie »%s« ist zu alt (Format %d, erzeugt von Subversion %s)" -#: ../svn/log-cmd.c:783 +#: ../libsvn_wc/upgrade.c:1654 #, c-format -msgid "Only relative paths can be specified after a URL for 'svn log', but '%s' is not a relative path" -msgstr "Mit »svn log« können nach einer URL nur relative Pfade angegeben werden, »%s« ist aber kein relativer Pfad" +msgid "Working copy '%s' is an old development version (format %d); to upgrade it, use a format 18 client, then use 'tools/dev/wc-ng/bump-to-19.py', then use the current client" +msgstr "Format der Arbeitskopie »%s« ist das einer alten Entwicklungsversion (Format %d); Um sie in ein neues Format zu bringen, verwenden Sie einen mit Format 18 kompatiblen Client, starten Sie »tools/dev/wc-ng/bump-to-19.py« und verwenden Sie danach die neue Version" -#: ../svn/log-cmd.c:829 +#: ../libsvn_wc/upgrade.c:1664 +#, fuzzy, c-format +msgid "Working copy '%s' is an old development version (format %d); to upgrade it, use a Subversion 1.7-1.9 client, then use the current client" +msgstr "Format der Arbeitskopie »%s« ist das einer alten Entwicklungsversion (Format %d); Um sie in ein neues Format zu bringen, verwenden Sie einen mit Format 18 kompatiblen Client, starten Sie »tools/dev/wc-ng/bump-to-19.py« und verwenden Sie danach die neue Version" + +#: ../libsvn_wc/upgrade.c:1832 #, c-format -msgid "cannot assign with 'with-revprop' option (drop the '=')" -msgstr "Kann nicht mit Option »with-revprop« zuweisen (»=« entfernen)" +msgid "Can't upgrade '%s' as it is not a working copy" +msgstr "Kann »%s« nicht in ein neueres Format bringen, da es keine Arbeitkopie ist" -#: ../svn/merge-cmd.c:103 ../svn/merge-cmd.c:127 +#: ../libsvn_wc/upgrade.c:1881 #, c-format -msgid "--- Merging\n" -msgstr "--- Zusammenführung\n" +msgid "Can't upgrade '%s' as it is not a working copy root, the root is '%s'" +msgstr "Kann »%s« nicht in ein neueres Format bringen, da es nicht die Basis einer Arbeitskopie ist - die Basis ist »%s«" -#: ../svn/merge-cmd.c:171 -msgid "-r and -c can't be used with --reintegrate" -msgstr "-r und -c können nicht mit --reintegrate verwendet werden" +#: ../libsvn_wc/wc_db.c:445 +#, c-format +msgid "No REPOSITORY table entry for id '%ld'" +msgstr "Kein REPOSITORY-Tabelleneintrag für ID »%ld«" -#: ../svn/merge-cmd.c:226 -msgid "Merge source required" -msgstr "Die Zusammenführungsquelle muss angegeben werden" +#: ../libsvn_wc/wc_db.c:778 +#, c-format +msgid "The file '%s' has no checksum." +msgstr "Die Datei »%s« hat keine Prüfsumme." -#: ../svn/merge-cmd.c:272 -msgid "Second revision required" -msgstr "Eine zweite Revision muss angegeben werden" +#: ../libsvn_wc/wc_db.c:2089 +#, c-format +msgid "Path '%s' is not moved" +msgstr "Pfad »%s« wurde nicht verschoben" -#: ../svn/merge-cmd.c:281 ../svn/merge-cmd.c:308 ../svn/mergeinfo-cmd.c:361 -#: ../svnadmin/svnadmin.c:2138 ../svnlook/svnlook.c:2077 -#: ../svnlook/svnlook.c:2271 ../svnlook/svnlook.c:2375 -#: ../svnlook/svnlook.c:2410 -msgid "Too many arguments given" -msgstr "Zu viele Parameter angegeben" +#: ../libsvn_wc/wc_db.c:2563 ../libsvn_wc/wc_db.c:2998 +#: ../libsvn_wc/wc_db.c:9923 +#, c-format +msgid "The node '%s' has a corrupt checksum value." +msgstr "Der Knoten »%s« hat einen fehlerhaften Prüfsummenwert." -#: ../svn/merge-cmd.c:298 -msgid "Cannot specify a revision range with two URLs" -msgstr "Die Angabe eines Revisionsbereichs mit zwei URLs ist nicht möglich" +#: ../libsvn_wc/wc_db.c:2783 +#, c-format +msgid "The node '%s' has a BASE status that has no properties." +msgstr "Der Knoten »%s« hat einen »BASE«-Status, der keine Eigenschaften hat." -#: ../svn/merge-cmd.c:402 -msgid "--reintegrate cannot be used with --ignore-ancestry" -msgstr "»--reintegrate« kann nicht mit »--ignore-ancestry« verwendet werden" +#: ../libsvn_wc/wc_db.c:3525 ../libsvn_wc/wc_db.c:3645 +#, c-format +msgid "The node '%s' is not an external." +msgstr "Der Knoten »%s« ist kein externer Verweis." -#: ../svn/merge-cmd.c:407 -msgid "--reintegrate cannot be used with --record-only" -msgstr "»--reintegrate« kann nicht mit »--record-only« verwendet werden" +#: ../libsvn_wc/wc_db.c:4057 +#, c-format +msgid "Expected node '%s' to be deleted." +msgstr "Erwartete, dass Knoten »%s« gelöscht wird." -#: ../svn/merge-cmd.c:412 -msgid "--depth cannot be used with --reintegrate" -msgstr "»--depth« kann nicht mit »--reintegrate« verwendet werden" +#: ../libsvn_wc/wc_db.c:6925 ../libsvn_wc/wc_db.c:6972 +#, c-format +msgid "Can't revert '%s' without reverting children" +msgstr "Kann »%s« nicht zurücksetzen, ohne dessen Kindelemente zurückzusetzen" -#: ../svn/merge-cmd.c:417 -msgid "--force cannot be used with --reintegrate" -msgstr "»--force« kann nicht mit »--reintegrate« verwendet werden" +#: ../libsvn_wc/wc_db.c:7086 +#, c-format +msgid "Can't revert '%s' without reverting parent" +msgstr "Kann »%s« nicht zurücksetzen, ohne dessen Elternelement zurückzusetzen" -#: ../svn/merge-cmd.c:422 -msgid "--reintegrate can only be used with a single merge source" -msgstr "»--reintegrate« kann nur mit einer einzelnen Zusammenführungsquelle verwendet werden" +#: ../libsvn_wc/wc_db.c:7221 +#, c-format +msgid "Unsupported depth for revert of '%s'" +msgstr "Nicht unterstützte Tiefe für Zurücksetzung von »%s«" -#: ../svn/merge-cmd.c:426 -msgid "--allow-mixed-revisions cannot be used with --reintegrate" -msgstr "»--allow-mixed-revisions« kann nicht mit »--reintegrate« verwendet werden" +#: ../libsvn_wc/wc_db.c:7791 +#, c-format +msgid "The node '%s' is not a committed directory" +msgstr "Der Knoten »%s« ist kein übertragenes Verzeichnis" -#: ../svn/merge-cmd.c:441 -msgid "" -"Merge tracking not possible, use --ignore-ancestry or\n" -"fix invalid mergeinfo in target with 'svn propset'" -msgstr "" -"Zusammenführungsverfolgung nicht möglich, verwenden Sie »--ignore-ancestry« oder\n" -"reparieren Sie die ungültigen Zusammenführungsinformationen im Ziel mit »svn propset«" +#: ../libsvn_wc/wc_db.c:8181 +#, c-format +msgid "Cannot delete '%s' as '%s' is excluded by server" +msgstr "Kann »%s« nicht löschen, da »%s« vom Server ausgeschlossen wurde" -#: ../svn/mergeinfo-cmd.c:193 -msgid "last full merge" -msgstr "Letzte vollständige Zusammenführung" +#: ../libsvn_wc/wc_db.c:8192 +#, c-format +msgid "Cannot delete '%s' as it is excluded by server" +msgstr "Kann »%s« nicht löschen, da es vom Server ausgeschlossen wurde" -#: ../svn/mergeinfo-cmd.c:193 -msgid "youngest common ancestor" -msgstr "Jüngster gemeinsame Vorfahre" +#: ../libsvn_wc/wc_db.c:8199 +#, c-format +msgid "Cannot delete '%s' as it is excluded" +msgstr "Kann »%s« nicht löschen, da es ausgeschlossen wurde" -#: ../svn/mergeinfo-cmd.c:194 -msgid "repository path" -msgstr "Pfad im Projektarchiv" +#: ../libsvn_wc/wc_db.c:8656 +#, c-format +msgid "Cannot move '%s' to '%s' because they are not in the same working copy" +msgstr "Kann »%s« nicht nach »%s« verschieben, da dies nicht in der selben Arbeitskopie ist" -#: ../svn/mergeinfo-cmd.c:194 -msgid "tip of branch" -msgstr "Spitze des Zweiges" +#: ../libsvn_wc/wc_db.c:8795 +#, c-format +msgid "Encountered invalid node state in column %d of info query to working copy database" +msgstr "" -#: ../svn/mergeinfo-cmd.c:358 -msgid "Not enough arguments given" -msgstr "Nicht genügend Parameter angegeben" +#: ../libsvn_wc/wc_db.c:9050 +#, c-format +msgid "Corrupt data for '%s'" +msgstr "Fehlerhafte Daten für »%s«" -#: ../svn/mergeinfo-cmd.c:404 -msgid "--quiet (-q) option valid only with --log option" -msgstr "Option »--quiet« »--q« ist nur in Verbindung mit der Option »--log« zulässig" +#: ../libsvn_wc/wc_db.c:9122 +#, c-format +msgid "Error reading node '%s'" +msgstr "Fehler beim Lesen des Knotens »%s«" -#: ../svn/mergeinfo-cmd.c:409 -msgid "--verbose (-v) option valid only with --log option" -msgstr "Option »--verbose« »--v« ist nur in Verbindung mit der Option »--log« zulässig" +#: ../libsvn_wc/wc_db.c:9380 +#, c-format +msgid "The node '%s' comes from unexpected repository '%s', expected '%s'; if this node is a file external using the correct URL in the external definition can fix the problem, see issue #4087" +msgstr "Der Knoten »%s« gehört unerwartet zum Projektarchiv »%s«, erwartet war »%s«; Falls der Knoten ein externer Dateiverweis ist, kann die Verwendung der korrekten URL in der Definition des externen Dateiverweises das Problem beheben, siehe Fehlerbericht #4087" -#: ../svn/mergeinfo-cmd.c:414 -msgid "--incremental option valid only with --log option" -msgstr "Option »--incremental« ist nur in Verbindung mit der Option »--log« zulässig" +#: ../libsvn_wc/wc_db.c:10054 +#, c-format +msgid "The node '%s' is not in working copy '%s'" +msgstr "Der Knoten »%s« ist nicht in der Arbeitskopie »%s«" -#: ../svn/mergeinfo-cmd.c:444 -msgid "--revision (-r) option valid only with --show-revs option" -msgstr "Option »--revision« »--r« ist nur in Verbindung mit der Option »--show-revs« zulässig" - -#: ../svn/mergeinfo-cmd.c:448 -msgid "Depth specification options valid only with --show-revs option" -msgstr "Angabe der Tiefe für die Operation ist nur in Verbindung mit der Option »--show-revs« zulässig" - -#: ../svn/mergeinfo-cmd.c:452 -msgid "--log option valid only with --show-revs option" -msgstr "Option »--log« ist nur in Verbindung mit der Option »--show-revs« zulässig" - -#: ../svn/mkdir-cmd.c:92 -msgid "Try 'svn add' or 'svn add --non-recursive' instead?" -msgstr "Versuchen Sie »svn add« oder »svn add --non-recursive«." - -#: ../svn/mkdir-cmd.c:98 -msgid "Try 'svn mkdir --parents' instead?" -msgstr "Versuchen Sie »svn mkdir --parents« stattdessen?" - -# number of text, property or tree conflicts remaining to be resolved -#: ../svn/notify.c:132 +#: ../libsvn_wc/wc_db.c:10091 #, c-format -msgid "%d remaining" -msgid_plural "%d remaining" -msgstr[0] "%d verbleibend" -msgstr[1] "%d verbleibend" +msgid "The node '%s' is not installable" +msgstr "Der Knoten »%s« konnte nicht installiert werden" -# number of already resolved text, property or tree conflicts -#: ../svn/notify.c:141 +#: ../libsvn_wc/wc_db.c:10532 ../libsvn_wc/wc_db.c:10729 #, c-format -msgid "and %d already resolved" -msgid_plural "and %d already resolved" -msgstr[0] "und %d bereits aufgelöst" -msgstr[1] "und %d bereits aufgelöst" +msgid "The node '%s' has a status that has no properties." +msgstr "Der Knoten »%s« hat einen Status, der keine Eigenschaften hat" -#: ../svn/notify.c:163 ../svn/status-cmd.c:93 +#: ../libsvn_wc/wc_db.c:12688 #, c-format -msgid "Summary of conflicts:\n" -msgstr "Konfliktübersicht:\n" +msgid "Expected node '%s' to be added." +msgstr "Erwartete, dass Knoten »%s« hinzugefügt wird." -#: ../svn/notify.c:169 +#: ../libsvn_wc/wc_db.c:13017 #, c-format -msgid " Text conflicts: %d\n" -msgstr " Textkonflikte: %d\n" +msgid "Path '%s' was not moved here" +msgstr "Pfad »%s« wurde nicht hierhin verschoben" -#: ../svn/notify.c:173 +#: ../libsvn_wc/wc_db.c:13205 #, c-format -msgid " Property conflicts: %d\n" -msgstr " Eigenschaftskonflikte: %d\n" +msgid "Node '%s' is not shadowed" +msgstr "Knoten »%s« wird nicht überdeckt" -#: ../svn/notify.c:177 +#: ../libsvn_wc/wc_db.c:14446 ../libsvn_wc/wc_db.c:14494 #, c-format -msgid " Tree conflicts: %d\n" -msgstr " Baumkonflikte: %d\n" +msgid "'%s' is already locked." +msgstr "»%s« ist bereits gesperrt" -#: ../svn/notify.c:184 +#: ../libsvn_wc/wc_db.c:14451 ../libsvn_wc/wc_db.c:14502 #, c-format -msgid " Text conflicts: %s (%s)\n" -msgstr " Textkonflikte: %s (%s\n" +msgid "Working copy '%s' locked." +msgstr "Arbeitskopie »%s« gesperrt." -#: ../svn/notify.c:189 +#: ../libsvn_wc/wc_db.c:14525 #, c-format -msgid " Property conflicts: %s (%s)\n" -msgstr " Eigenschaftskonflikte: %s (%s)\n" +msgid "Failed to lock working copy '%s'." +msgstr "Konnte Arbeitskopie »%s« nicht sperren. " -#: ../svn/notify.c:194 +#: ../libsvn_wc/wc_db.c:14574 #, c-format -msgid " Tree conflicts: %s (%s)\n" -msgstr " Baumkonflikte: %s (%s)\n" +msgid "'%s' is already locked via '%s'." +msgstr "»%s« ist bereits durch »%s« gesperrt." -#: ../svn/notify.c:200 +#: ../libsvn_wc/wc_db.c:14748 #, c-format -msgid " Skipped paths: %d\n" -msgstr " Übersprungene Pfade: %d\n" +msgid "Working copy not locked at '%s'." +msgstr "Arbeitskopie »%s« ist nicht gesperrt." -#: ../svn/notify.c:246 ../svnbench/notify.c:107 +#: ../libsvn_wc/wc_db.c:15247 #, c-format -msgid "Skipped missing target: '%s'\n" -msgstr "Fehlendes Ziel: »%s« übersprungen\n" +msgid "Modification of '%s' already exists" +msgstr "Änderung von »%s« existiert bereits" -#: ../svn/notify.c:253 ../svnbench/notify.c:114 +#. If EXPRESSION is false, cause the caller to return an SVN_ERR_WC_CORRUPT +#. * error, showing EXPRESSION and the caller's LOCAL_RELPATH in the message. +#: ../libsvn_wc/wc_db.c:15844 #, c-format -msgid "Skipped target: '%s' -- copy-source is missing\n" -msgstr "Ziel: »%s« übersprungen -- copy-source fehlt\n" +msgid "database inconsistency at local_relpath='%s' verifying expression '%s'" +msgstr "Datenbankinkonsistenz bei »local_relpath« »%s« beim Auswerten des Ausdrucks »%s«" -#: ../svn/notify.c:258 ../svnbench/notify.c:121 +#: ../libsvn_wc/wc_db.c:16032 #, c-format -msgid "Skipped '%s'\n" -msgstr "Überspringe »%s«\n" +msgid "Can't upgrade '%s' as it is not a working copy root" +msgstr "Kann »%s« nicht in ein neueres Format bringen, da es keine Basis einer Arbeitskopie ist" -#: ../svn/notify.c:265 ../svnbench/notify.c:128 +#: ../libsvn_wc/wc_db.c:16038 #, c-format -msgid "Skipped '%s' -- An obstructing working copy was found\n" -msgstr "Überspringe »%s« -- Eine blockierende Arbeitskopie wurde gefunden\n" +msgid "Working copy '%s' is too old and must be upgraded to at least format %d, as created by Subversion %s" +msgstr "Arbeitskopie »%s« ist zu alt und muss mindestens in das Format %d gebracht werden, wie es von Subversion %s erstellt wurde" -#: ../svn/notify.c:271 ../svnbench/notify.c:135 -#, c-format -msgid "Skipped '%s' -- Has no versioned parent\n" -msgstr "Überspringe »%s« -- Hat keine versioniertes Elternelement\n" +#: ../libsvn_wc/wc_db.c:16056 +msgid "Working copy upgrade failed" +msgstr "Arbeitskopie konnte nicht in ein nees Format gebracht werden" -#: ../svn/notify.c:277 ../svnbench/notify.c:142 +#: ../libsvn_wc/wc_db.c:16157 #, c-format -msgid "Skipped '%s' -- Access denied\n" -msgstr "Überspringe »%s« -- Zugriff verweigert\n" +msgid "The path '%s' is not in the working copy '%s'" +msgstr "Der Pfad »%s« ist nicht in der Arbeitskopie »%s« " -#: ../svn/notify.c:283 ../svnbench/notify.c:149 +#: ../libsvn_wc/wc_db_pristine.c:128 ../libsvn_wc/wc_db_pristine.c:466 #, c-format -msgid "Skipped '%s' -- Node remains in conflict\n" -msgstr "Überspringe »%s« -- Knoten bleibt im Konflikt\n" +msgid "The pristine text with checksum '%s' was not found" +msgstr "Der Ursprungstext mit der Prüfsumme »%s« wurde nicht gefunden." -#: ../svn/notify.c:299 +#: ../libsvn_wc/wc_db_pristine.c:194 #, c-format -msgid "Removed external '%s': %s\n" -msgstr "Externer Verweis »%s« entfernt: %s\n" +msgid "Pristine text '%s' not present" +msgstr "Ursprungstext »%s« nicht vorhanden" -#: ../svn/notify.c:304 +#: ../libsvn_wc/wc_db_pristine.c:236 #, c-format -msgid "Removed external '%s'\n" -msgstr "Externer Verweis »%s« entfernt\n" +msgid "Can't read '%s' from pristine store because no checksum supplied" +msgstr "Kann »%s« nicht aus dem Speicherbereich für ürsprüngliche Dateiinhalte lesen, da keine Prüfsumme angegeben wurde" -#: ../svn/notify.c:310 -#, c-format -msgid "Left local modifications as '%s'\n" -msgstr "Lokale Änderungen in »%s« belassen\n" +#: ../libsvn_wc/wc_db_pristine.c:319 +#, fuzzy, c-format +msgid "New pristine text '%s' has different size: %s versus %s" +msgstr "Neuer ursprünglicher Dateitext »%s« hat eine andere Größe: %ld im Vergleich zu %ld" + +#: ../libsvn_wc/wc_db_pristine.c:387 +#, fuzzy +msgid "Unable to create pristine install stream" +msgstr "Kann den lokalen Hostnamen nicht ermitteln" -#: ../svn/notify.c:354 ../svnbench/notify.c:233 +#: ../libsvn_wc/wc_db_pristine.c:505 #, c-format -msgid "Restored '%s'\n" -msgstr "Wieder hergestellt »%s«\n" +msgid "The pristine text with MD5 checksum '%s' was not found" +msgstr "Der Ursprungstext mit der MD5-Prüfsumme »%s« wurde nicht gefunden." -#: ../svn/notify.c:359 ../svnbench/notify.c:239 +#: ../libsvn_wc/wc_db_update_move.c:225 #, c-format -msgid "Reverted '%s'\n" -msgstr "Rückgängig gemacht: »%s«\n" +msgid "'%s' is not deleted" +msgstr "»%s« ist nicht gelöscht" -#: ../svn/notify.c:364 ../svnbench/notify.c:245 +#: ../libsvn_wc/wc_db_update_move.c:464 ../libsvn_wc/wc_db_update_move.c:488 #, c-format -msgid "Failed to revert '%s' -- try updating instead.\n" -msgstr "Wiederherstellen von »%s« schlug fehl -- Versuchen Sie statt dessen zu aktualisieren.\n" +msgid "'%s' already in conflict" +msgstr "»%s« ist schon von einem Konflikt betroffen" + +# File names not translated +#: ../libsvn_wc/wc_db_update_move.c:1627 +#, fuzzy +msgid ".working" +msgstr ".working%s%s" -#: ../svn/notify.c:371 ../svnbench/notify.c:253 +#: ../libsvn_wc/wc_db_update_move.c:2189 #, c-format -msgid "Resolved conflicted state of '%s'\n" -msgstr "Konflikt von »%s« aufgelöst\n" +msgid "Cannot apply update because '%s' is a switched path (please switch it back to its original URL and try again)" +msgstr "" -#: ../svn/notify.c:461 ../svn/notify.c:498 ../svnbench/notify.c:344 -#: ../svnbench/notify.c:384 +#: ../libsvn_wc/wc_db_update_move.c:2198 +#, fuzzy, c-format +msgid "Cannot apply update because '%s' is a mixed-revision working copy (please update and try again)" +msgstr "Kann Aktualisierung nicht anwenden, da die Quelle der Verschiebung »%s« eine Arbeitskopie mit verschiedenen Revisionen ist" + +#: ../libsvn_wc/wc_db_update_move.c:2251 #, c-format -msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with offset %s" -msgstr "> Abschnitt ## -%lu,%lu +%lu,%lu ## mit Versatz %s angewandt" +msgid "The node '%s' has not been moved away" +msgstr "Der Knoten »%s« wurde nicht an einen anderen Ort verschoben" -#: ../svn/notify.c:478 ../svn/notify.c:512 ../svnbench/notify.c:361 -#: ../svnbench/notify.c:398 +#: ../libsvn_wc/wc_db_update_move.c:2715 #, c-format -msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with offset %s" -msgstr "> Abschnitt @@ -%lu,%lu +%lu,%lu @@ mit Versatz %s angewandt" +msgid "Cannot merge local changes from '%s' because '%s' already contains other local changes (please commit or revert these other changes and try again)" +msgstr "" -#: ../svn/notify.c:530 ../svnbench/notify.c:419 +#: ../libsvn_wc/wc_db_update_move.c:4089 #, c-format -msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with fuzz %lu (%s)\n" -msgstr "> Abschnitt ## -%lu,%lu +%lu,%lu ## mit Unschärfe %lu (%s) angewandt\n" +msgid "'%s' is not in conflict" +msgstr "»%s« ist nicht von einem Konflikt betroffen" -#: ../svn/notify.c:540 ../svnbench/notify.c:429 +#: ../libsvn_wc/wc_db_update_move.c:4102 #, c-format -msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with fuzz %lu\n" -msgstr "> Abschnitt @@ -%lu,%lu +%lu,%lu @@ mit Unschärfe %lu angewandt\n" +msgid "'%s' is not a valid tree-conflict victim" +msgstr "»%s« ist kein gültiges von einem Baumkonflikt betroffenes Element" -#: ../svn/notify.c:556 ../svnbench/notify.c:447 +#: ../libsvn_wc/wc_db_update_move.c:4115 #, c-format -msgid "> rejected hunk ## -%lu,%lu +%lu,%lu ## (%s)\n" -msgstr "> Abschnitt ## -%lu,%lu +%lu,%lu ## (%s) zurückgewiesen\n" +msgid "'%s' is already a moved away tree-conflict" +msgstr "»%s« ist schon ein Baumkonflikt mit Verschiebung anderswo hin" -#: ../svn/notify.c:565 ../svnbench/notify.c:456 +# CHECKME: What's WCROOT? A variable or short for "working copy root"? +#: ../libsvn_wc/wc_db_util.c:69 #, c-format -msgid "> rejected hunk @@ -%lu,%lu +%lu,%lu @@\n" -msgstr "> Abschnitt @@ -%lu,%lu +%lu,%lu @@ zurückgewiesen\n" +msgid "Missing a row in WCROOT." +msgstr "Fehlende Zeile in WCROOT." -#: ../svn/notify.c:577 ../svnbench/notify.c:470 +#: ../libsvn_wc/wc_db_util.c:136 #, c-format -msgid "> hunk ## -%lu,%lu +%lu,%lu ## already applied (%s)\n" -msgstr "> Abschnitt ## -%lu,%lu +%lu,%lu ## bereits angewandt (%s)\n" +msgid "Working copy database '%s' not found" +msgstr "Datenbank der Arbeitskopie »%s« ist gefunden" -#: ../svn/notify.c:587 ../svnbench/notify.c:480 +#: ../libsvn_wc/wc_db_wcroot.c:318 #, c-format -msgid "> hunk @@ -%lu,%lu +%lu,%lu @@ already applied\n" -msgstr "> Abschnitt @@ -%lu,%lu +%lu,%lu @@ bereits angewandt\n" +msgid "Working copy format of '%s' is too old (%d); please check out your working copy again" +msgstr "" +"Format der Arbeitskopie »%s« ist zu alt (%d); bitte checken Sie die\n" +"Arbeitskopie erneut aus" -# Currently this is used for checkouts and switches too. If we -# want different output, we'll have to add new actions. -#: ../svn/notify.c:644 ../svnbench/notify.c:542 +#: ../libsvn_wc/wc_db_wcroot.c:328 #, c-format msgid "" -"\n" -"Fetching external item into '%s':\n" +"This client is too old to work with the working copy at\n" +"'%s' (format %d).\n" +"You need to get a newer Subversion client. For more details, see\n" +" http://subversion.apache.org/faq.html#working-copy-format-change\n" msgstr "" -"\n" -"Hole externen Verweis nach »%s«:\n" +"Dieser Client ist zu alt, um mit dieser Arbeitskopie umzugehen:\n" +"»%s« (Format %d).\n" +"Sie benötigen einen neueren Subversion-Client. Für mehr Details, siehe\n" +" http://subversion.apache.org/faq.html#working-copy-format-change\n" -#: ../svn/notify.c:668 ../svnbench/notify.c:568 -#, c-format -msgid "Error handling externals definition for '%s':" -msgstr "Fehler beim Umgang mit der Definition des externen Verweises für »%s«:" +#: ../libsvn_wc/wc_db_wcroot.c:349 +msgid "Cleanup with an older 1.7 client before upgrading with this client" +msgstr "Starten Sie »svn cleanup« mit einem älteren 1.7 Client bevor Sie mit diesem Client operieren" -#: ../svn/notify.c:681 ../svnbench/notify.c:581 +#: ../libsvn_wc/wc_db_wcroot.c:360 #, c-format -msgid "Updating '%s':\n" -msgstr "Aktualisiere »%s«:\n" +msgid "" +"The working copy at '%s'\n" +"is too old (format %d) to work with client version '%s' (expects format %d). You need to upgrade the working copy first.\n" +msgstr "" +"Die Arbeitskopie in »%s«\n" +"ist zu alt (Format %d) für die Verwendung mit der Version »%s« (erwartet Format %d). Sie müssen die Arbeitskopie zuerst in ein neues Format bringen.\n" -#: ../svn/notify.c:694 ../svnbench/notify.c:595 +#: ../libsvn_wc/wc_db_wcroot.c:438 #, c-format -msgid "Exported external at revision %ld.\n" -msgstr "Externer Verweis exportiert, Revision %ld.\n" +msgid "The symlink at '%s' points nowhere" +msgstr "Der symbolische Link »%s« zeigt nirgendwohin." -#: ../svn/notify.c:695 ../svnbench/notify.c:596 +# CHECKME: What's WCROOT? A variable or short for "working copy root"? +#: ../libsvn_wc/wc_db_wcroot.c:757 #, c-format -msgid "Exported revision %ld.\n" -msgstr "Exportiert, Revision %ld.\n" +msgid "Missing a row in WCROOT for '%s'." +msgstr "Fehlende Zeile in WCROOT für »%s«." -#: ../svn/notify.c:702 ../svnbench/notify.c:604 +#: ../libsvn_wc/wc_db_wcroot.c:811 #, c-format -msgid "Checked out external at revision %ld.\n" -msgstr "Externer Verweis ausgecheckt, Revision %ld.\n" +msgid "The working copy at '%s' is corrupt." +msgstr "Die Arbeitskopie in »%s« ist beschädigt." -#: ../svn/notify.c:703 ../svnbench/notify.c:605 +#: ../libsvn_wc/wc_db_wcroot.c:827 #, c-format -msgid "Checked out revision %ld.\n" -msgstr "Ausgecheckt, Revision %ld.\n" +msgid "The working copy database at '%s' is missing." +msgstr "Die Datenbank der Arbeitskopie in »%s« fehlt." -#: ../svn/notify.c:713 ../svnbench/notify.c:616 +#: ../libsvn_wc/wc_db_wcroot.c:836 #, c-format -msgid "Updated external to revision %ld.\n" -msgstr "Externer Verweis aktualisiert zu Revision %ld.\n" +msgid "The working copy database at '%s' is corrupt." +msgstr "Die Datenbank der Arbeitskopie in »%s« ist beschädigt." -#: ../svn/notify.c:714 ../svnbench/notify.c:617 +#: ../libsvn_wc/wc_db_wcroot.c:994 #, c-format -msgid "Updated to revision %ld.\n" -msgstr "Aktualisiert zu Revision %ld.\n" +msgid "'%s' is not a working copy root" +msgstr "»%s« ist keine Basis einer Arbeitskopie" -#: ../svn/notify.c:721 ../svnbench/notify.c:625 +#: ../libsvn_wc/workqueue.c:513 #, c-format -msgid "External at revision %ld.\n" -msgstr "Externer Verweis, Revision %ld.\n" +msgid "Can't install '%s' from pristine store, because no checksum is recorded for this file" +msgstr "Kann »%s« nicht im Speicherbereich für ursprünglichen Dateiinhalt ablegen, da keine Prüfsumme für diese Datei eingetragen ist" -#: ../svn/notify.c:722 ../svnbench/notify.c:626 +#: ../libsvn_wc/workqueue.c:1470 #, c-format -msgid "At revision %ld.\n" -msgstr "Revision %ld.\n" +msgid "Unrecognized work item in the queue" +msgstr "Unbekannter Arbeitsschritt in Warteschlange" -#: ../svn/notify.c:733 ../svnbench/notify.c:638 +#: ../libsvn_wc/workqueue.c:1553 #, c-format -msgid "External export complete.\n" -msgstr "Export des externen Verweises abgeschlossen.\n" +msgid "Failed to run the WC DB work queue associated with '%s', work item %d %s" +msgstr "Konnte die mit »%s« zusammenhängende Arbeitsschrittwarteschlange der Datenbank der Arbeitskopie nicht ausführen, Arbeitsschritt %d %s" -#: ../svn/notify.c:734 ../svnbench/notify.c:639 -#, c-format -msgid "Export complete.\n" -msgstr "Export abgeschlossen.\n" +#: ../svn/add-cmd.c:101 +msgid "Could not add all targets because some targets don't exist" +msgstr "Konnte nicht alle Ziele hinzufügen, da einige Ziele nicht existieren" + +#: ../svn/add-cmd.c:105 +msgid "Could not add all targets because some targets are already versioned" +msgstr "Konnte nicht alle Ziele hinzufügen, da einige Ziele schon versioniert sind" -#: ../svn/notify.c:740 ../svnbench/notify.c:646 +#: ../svn/auth-cmd.c:72 #, c-format -msgid "External checkout complete.\n" -msgstr "Auschecken des externen Verweises abgeschlossen.\n" - -#: ../svn/notify.c:741 ../svnbench/notify.c:647 -#, c-format -msgid "Checkout complete.\n" -msgstr "Auschecken abgeschlossen.\n" +msgid "Automatic certificate validity check failed because:\n" +msgstr "Automatische Gültigkeitsprüfung des Zertifikats fehlgeschlagen:\n" -#: ../svn/notify.c:747 ../svnbench/notify.c:654 +#: ../svn/auth-cmd.c:77 #, c-format -msgid "External update complete.\n" -msgstr "Aktualisierung des externen Verweises abgeschlossen.\n" +msgid " The certificate is not yet valid.\n" +msgstr " Das Zertifikat ist noch nicht gültig.\n" -#: ../svn/notify.c:748 ../svnbench/notify.c:655 +#: ../svn/auth-cmd.c:81 #, c-format -msgid "Update complete.\n" -msgstr "Aktualisierung abgeschlossen.\n" +msgid " The certificate has expired.\n" +msgstr " Das Zertifikat ist abgelaufen.\n" -#: ../svn/notify.c:762 ../svnbench/notify.c:671 +#: ../svn/auth-cmd.c:85 #, c-format -msgid "" -"\n" -"Performing status on external item at '%s':\n" -msgstr "" -"\n" -"Hole Status des externen Verweises in »%s«:\n" +msgid " The certificate's Common Name (hostname) does not match the remote hostname.\n" +msgstr " Der Hostname im Zertifikat stimmt nicht mit dem Hostnamen des Servers überein.\n" -#: ../svn/notify.c:768 +#: ../svn/auth-cmd.c:90 #, c-format -msgid "" -"\n" -"Performing info on external item at '%s':\n" -msgstr "" -"\n" -"Hole Informationen des externen Verweises in »%s«:\n" +msgid " The certificate issuer is unknown.\n" +msgstr " Der Aussteller des Zertifikats ist unbekannt.\n" -#: ../svn/notify.c:775 ../svnbench/notify.c:679 +#: ../svn/auth-cmd.c:94 #, c-format -msgid "Status against revision: %6ld\n" -msgstr "Status bezogen auf Revision: %6ld\n" +msgid " Unknown verification failure.\n" +msgstr " Unbekannter Fehler bei der Gültigkeitsprüfung.\n" -#: ../svn/notify.c:783 ../svnbench/notify.c:688 +#: ../svn/auth-cmd.c:261 #, c-format -msgid "Sending copy of %s\n" -msgstr "Sende Kopie von %s\n" +msgid "Subject: %s\n" +msgstr "Zertifikatsempfänger: %s\n" -#: ../svn/notify.c:784 ../svnbench/notify.c:689 +#: ../svn/auth-cmd.c:263 #, c-format -msgid "Sending %s\n" -msgstr "Sende %s\n" +msgid "Valid from: %s\n" +msgstr "Gültig ab: %s\n" -#: ../svn/notify.c:794 ../svnbench/notify.c:700 +#: ../svn/auth-cmd.c:267 #, c-format -msgid "Adding copy of (bin) %s\n" -msgstr "Füge Kopie hinzu (binär) %s\n" +msgid "Valid until: %s\n" +msgstr "Gültig bis: %s\n" -#: ../svn/notify.c:795 ../svnbench/notify.c:701 +#: ../svn/auth-cmd.c:271 #, c-format -msgid "Adding (bin) %s\n" -msgstr "Füge hinzu (binär) %s\n" +msgid "Issuer: %s\n" +msgstr "Herausgeber: %s\n" -#: ../svn/notify.c:802 ../svnbench/notify.c:709 +#: ../svn/auth-cmd.c:273 #, c-format -msgid "Adding copy of %s\n" -msgstr "Füge Kopie hinzu %s\n" +msgid "Fingerprint: %s\n" +msgstr "Fingerabdruck: %s\n" -#: ../svn/notify.c:803 ../svnbench/notify.c:710 +#: ../svn/auth-cmd.c:290 #, c-format -msgid "Adding %s\n" -msgstr "Füge hinzu %s\n" +msgid "Hostnames: %s\n" +msgstr "Hostnamen: %s\n" -#: ../svn/notify.c:811 ../svnbench/notify.c:719 +#: ../svn/auth-cmd.c:310 #, c-format -msgid "Deleting copy of %s\n" -msgstr "Lösche Kopie von %s\n" +msgid "Credential kind: %s\n" +msgstr "Art der Zugangsdaten: %s\n" -#: ../svn/notify.c:812 ../svnbench/notify.c:720 +#: ../svn/auth-cmd.c:330 #, c-format -msgid "Deleting %s\n" -msgstr "Lösche %s\n" +msgid "Password: %s\n" +msgstr "Passwort: %s\n" -#: ../svn/notify.c:820 ../svnbench/notify.c:729 +#: ../svn/auth-cmd.c:332 #, c-format -msgid "Replacing copy of %s\n" -msgstr "Ersetze Kopie von %s\n" +msgid "Password: [not shown]\n" +msgstr "Passwort: [nicht angezeigt]\n" -#: ../svn/notify.c:821 ../svnbench/notify.c:730 +#: ../svn/auth-cmd.c:338 #, c-format -msgid "Replacing %s\n" -msgstr "Ersetze %s\n" +msgid "Passphrase: %s\n" +msgstr "Passphrase: %s\n" -#: ../svn/notify.c:830 ../svnbench/notify.c:740 ../svnsync/sync.c:416 +#: ../svn/auth-cmd.c:341 #, c-format -msgid "Transmitting file data " -msgstr "Übertrage Daten " +msgid "Passphrase: [not shown]\n" +msgstr "Passphrase: [nicht angezeigt]\n" -#: ../svn/notify.c:837 ../svnadmin/svnadmin.c:2116 ../svnbench/notify.c:749 +#: ../svn/auth-cmd.c:344 #, c-format -msgid "'%s' locked by user '%s'.\n" -msgstr "»%s« gesperrt durch »%s«.\n" +msgid "Password cache: %s\n" +msgstr "Passwortspeicher: %s\n" -#: ../svn/notify.c:842 ../svnbench/notify.c:755 +#: ../svn/auth-cmd.c:347 #, c-format -msgid "'%s' unlocked.\n" -msgstr "»%s« freigegeben.\n" +msgid "Username: %s\n" +msgstr "Benutzername: %s\n" -#: ../svn/notify.c:866 ../svnbench/notify.c:782 +#: ../svn/auth-cmd.c:399 #, c-format -msgid "--- Merging differences between repository URLs into '%s':\n" -msgstr "-- Zusammenführen der Unterschiede zwischen Projektarchiv-URLs in »%s«:\n" +msgid "Deleting %s credential for realm '%s'\n" +msgstr "Entferne Zugangsdaten %s für Anmeldebereich »%s«\n" -#: ../svn/notify.c:871 ../svnbench/notify.c:787 +#: ../svn/auth-cmd.c:446 #, c-format -msgid "--- Merging r%ld into '%s':\n" -msgstr "-- Zusammenführen von r%ld in »%s«:\n" +msgid "Credentials cache in '%s' is empty\n" +msgstr "Speicher für Zugangsdaten in »%s« ist leer\n" -#: ../svn/notify.c:875 ../svnbench/notify.c:791 +#: ../svn/auth-cmd.c:450 ../svn/auth-cmd.c:473 #, c-format -msgid "--- Reverse-merging r%ld into '%s':\n" -msgstr "-- Rückwärtiges Zusammenführen von r%ld in »%s«:\n" +msgid "Credentials cache in '%s' contains no matching credentials" +msgstr "Speicher für Zugangsdaten in »%s« enthält keine passende Zugangsdaten" -#: ../svn/notify.c:879 ../svnbench/notify.c:795 +#: ../svn/auth-cmd.c:458 #, c-format -msgid "--- Merging r%ld through r%ld into '%s':\n" -msgstr "-- Zusammenführen von r%ld bis r%ld in »%s«:\n" +msgid "Credentials cache in '%s' contains %d credentials\n" +msgstr "Speicher für Zugangsdaten in »%s« enthält %d Zugangsdaten\n" -#: ../svn/notify.c:885 ../svnbench/notify.c:801 +#: ../svn/auth-cmd.c:462 #, c-format -msgid "--- Reverse-merging r%ld through r%ld into '%s':\n" -msgstr "-- Rückwärtiges Zusammenführen von r%ld bis r%ld in »%s«:\n" +msgid "Credentials cache in '%s' contains %d matching credentials\n" +msgstr "Speicher für Zugangsdaten in »%s« enthält %d passende Zugangsdaten\n" -#: ../svn/notify.c:895 ../svnbench/notify.c:813 +#: ../svn/auth-cmd.c:477 #, c-format -msgid "--- Recording mergeinfo for merge between repository URLs into '%s':\n" -msgstr "-- Aufzeichnung der Informationen für Zusammenführung zwischen Projektarchiv-URLs in »%s«:\n" +msgid "Deleted %d matching credentials from '%s'\n" +msgstr "%d passende Zugangsdaten aus »%s« gelöscht\n" -#: ../svn/notify.c:905 ../svnbench/notify.c:823 -#, c-format -msgid "--- Recording mergeinfo for merge of r%ld into '%s':\n" -msgstr "-- Aufzeichnung der Informationen für Zusammenführung von r%ld in »%s«:\n" +#: ../svn/blame-cmd.c:314 ../svn/list-cmd.c:310 +msgid "'verbose' option invalid in XML mode" +msgstr "Option »verbose« ist im XML-Modus ungültig" -#: ../svn/notify.c:910 ../svnbench/notify.c:828 -#, c-format -msgid "--- Recording mergeinfo for reverse merge of r%ld into '%s':\n" -msgstr "-- Aufzeichnung der Informationen für rückwärtiges Zusammenführen von r%ld in »%s«:\n" +#: ../svn/blame-cmd.c:326 ../svn/list-cmd.c:322 ../svn/status-cmd.c:315 +msgid "'incremental' option only valid in XML mode" +msgstr "Option »incremental« ist nur im XML-Modus gültig" -#: ../svn/notify.c:915 ../svnbench/notify.c:833 +#: ../svn/blame-cmd.c:389 #, c-format -msgid "--- Recording mergeinfo for merge of r%ld through r%ld into '%s':\n" -msgstr "-- Aufzeichnung der Informationen für Zusammenführung von r%ld bis r%ld in »%s«:\n" +msgid "Skipping binary file (use --force to treat as text): '%s'\n" +msgstr "Überspringe Binärdatei (--force erzwingt Behandlung als Text): »%s«\n" -#: ../svn/notify.c:920 ../svnbench/notify.c:838 -#, c-format -msgid "--- Recording mergeinfo for reverse merge of r%ld through r%ld into '%s':\n" -msgstr "-- Aufzeichnung der Informationen für rückwärtiges Zusammenführen von r%ld bis r%ld in »%s«:\n" +#: ../svn/blame-cmd.c:426 ../svnbench/null-blame-cmd.c:272 +msgid "Could not perform blame on all targets because some targets don't exist" +msgstr "Konnte nicht für alle Ziele annotieren, da einige Ziele nicht existieren" -#: ../svn/notify.c:927 ../svnbench/notify.c:848 -#, c-format -msgid "--- Eliding mergeinfo from '%s':\n" -msgstr "-- Entfernung der Zusammenführungsinformationen von »%s«:\n" +#: ../svn/cat-cmd.c:103 +msgid "Could not cat all targets because some targets don't exist" +msgstr "Konnte nicht alle Ziele ausgeben, da einige Ziele nicht existieren" -#: ../svn/notify.c:934 ../svnbench/notify.c:856 -#, c-format -msgid "--- Merging differences between foreign repository URLs into '%s':\n" -msgstr "-- Zusammenführen der Unterschiede zwischen fremden Projektarchiv-URLs in »%s«:\n" +#: ../svn/cat-cmd.c:107 +msgid "Could not cat all targets because some targets are not versioned" +msgstr "Konnte nicht alle Ziele ausgeben, da einige Ziele nicht versioniert sind" -#: ../svn/notify.c:940 ../svnbench/notify.c:862 -#, c-format -msgid "--- Merging (from foreign repository) r%ld into '%s':\n" -msgstr "-- Zusammenführen (aus fremden Projektarchiv) von r%ld in »%s«:\n" +#: ../svn/cat-cmd.c:111 +msgid "Could not cat all targets because some targets are directories" +msgstr "Konnte nicht alle Ziele ausgeben, da einige Ziele Verzeichnisse sind" -#: ../svn/notify.c:945 ../svnbench/notify.c:867 -#, c-format -msgid "--- Reverse-merging (from foreign repository) r%ld into '%s':\n" -msgstr "-- Rückwärtiges Zusammenführen (aus fremden Projektarchiv) von r%ld in »%s«:\n" +#: ../svn/changelist-cmd.c:117 +msgid "Could not set changelists on all targets because some targets don't exist" +msgstr "Konnte nicht alle Ziele Änderungslisten zuweisen, da einige Ziele nicht existieren" -#: ../svn/notify.c:950 ../svnbench/notify.c:872 -#, c-format -msgid "--- Merging (from foreign repository) r%ld through r%ld into '%s':\n" -msgstr "-- Zusammenführen (aus fremden Projektarchiv) von r%ld bis r%ld in »%s«:\n" +#: ../svn/changelist-cmd.c:122 +msgid "Could not set changelists on all targets because some targets are not versioned" +msgstr "Konnte nicht alle Ziele Änderungslisten zuweisen, da einige Ziele nicht versioniert sind" -#: ../svn/notify.c:956 ../svnbench/notify.c:878 +#: ../svn/checkout-cmd.c:140 ../svn/switch-cmd.c:141 #, c-format -msgid "--- Reverse-merging (from foreign repository) r%ld through r%ld into '%s':\n" -msgstr "-- Rückwärtiges Zusammenführen (aus fremden Projektarchiv) von r%ld bis r%ld in »%s«:\n" +msgid "'%s' does not appear to be a URL" +msgstr "»%s« scheint keine URL zu sein" -#: ../svn/notify.c:986 ../svnbench/notify.c:915 -#, c-format -msgid "property '%s' set on '%s'\n" -msgstr "Eigenschaft »%s« für »%s« gesetzt\n" +#: ../svn/checkout-cmd.c:181 ../svn/export-cmd.c:130 ../svn/list-cmd.c:451 +#: ../svn/switch-cmd.c:191 ../svn/update-cmd.c:181 +msgid "Failure occurred processing one or more externals definitions" +msgstr "Fehler bei der Verarbeitung eines oder mehrerer externer Verweise" -#: ../svn/notify.c:992 ../svnbench/notify.c:923 -#, c-format -msgid "property '%s' deleted from '%s'.\n" -msgstr "Eigenschaft »%s« wurde von »%s« gelöscht.\n" +#: ../svn/cl-conflicts.c:74 +msgid "local file edit" +msgstr "lokale Datei geändert" -# TODO: Compare msgid "Attempted to open non-existent child node '%s'" -# (non-, vs. non; Attempted vs. Attempting) -#: ../svn/notify.c:998 ../svnbench/notify.c:931 -#, c-format -msgid "Attempting to delete nonexistent property '%s' on '%s'\n" -msgstr "Versuchte, nicht existierende Eigenschaft »%s« von »%s« zu löschen\n" +#: ../svn/cl-conflicts.c:76 +msgid "local file obstruction" +msgstr "lokale Datei blockiert" -#: ../svn/notify.c:1005 ../svnbench/notify.c:940 -#, c-format -msgid "property '%s' set on repository revision %ld\n" -msgstr "Eigenschaft »%s« wurde für Revision %ld im Projektarchiv gesetzt\n" +#: ../svn/cl-conflicts.c:78 +msgid "local file delete" +msgstr "lokale Datei gelöscht" -#: ../svn/notify.c:1011 ../svnbench/notify.c:948 -#, c-format -msgid "property '%s' deleted from repository revision %ld\n" -msgstr "Eigenschaft »%s« wurde von Revision %ld im Projektarchiv gelöscht\n" +#: ../svn/cl-conflicts.c:81 +msgid "local file missing or deleted or moved away" +msgstr "lokale Datei fehlt, wurde gelöscht oder verschoben" -#: ../svn/notify.c:1016 ../svnbench/notify.c:955 -#, c-format -msgid "Upgraded '%s'\n" -msgstr "In neues Format gebracht: »%s«\n" +#: ../svn/cl-conflicts.c:83 +msgid "local file missing" +msgstr "lokale Datei fehlt" -#: ../svn/notify.c:1020 ../svnbench/notify.c:961 -#, c-format -msgid "Redirecting to URL '%s':\n" -msgstr "Umleitung zur URL »%s«:\n" +#: ../svn/cl-conflicts.c:85 +msgid "local file unversioned" +msgstr "lokale Datei nicht versioniert" -#: ../svn/notify.c:1044 -#, c-format -msgid "--- Copying from foreign repository URL '%s':\n" -msgstr "-- Kopieren aus fremdem Projektarchiv bei URL »%s«:\n" +#: ../svn/cl-conflicts.c:87 +msgid "local file add" +msgstr "lokale Datei hinzugefügt" -#: ../svn/notify.c:1051 -#, c-format -msgid "Breaking move with source path '%s'\n" -msgstr "Zertrennung der Verschiebeoperation mit Quellpfad »%s«\n" +#: ../svn/cl-conflicts.c:89 +msgid "local file replace" +msgstr "lokale Datei ersetzt" -#: ../svn/notify.c:1057 -#, c-format -msgid "Performing cleanup on external item at '%s'.\n" -msgstr "Räume externen Verweis »%s« auf.\n" +#: ../svn/cl-conflicts.c:91 +msgid "local file moved away" +msgstr "lokale Datei verschoben" -#: ../svn/notify.c:1064 -#, c-format -msgid "done\n" -msgstr "erledigt\n" +#: ../svn/cl-conflicts.c:93 +msgid "local file moved here" +msgstr "lokale Datei hierher verschoben" -#: ../svn/notify.c:1066 -#, c-format -msgid "Committing transaction...\n" -msgstr "Übertrage Transaktion...\n" +#: ../svn/cl-conflicts.c:100 +msgid "local dir edit" +msgstr "lokales Verzeichnis geändert" -#: ../svn/propdel-cmd.c:88 -#, c-format -msgid "Cannot specify revision for deleting versioned property '%s'" -msgstr "Zum Löschen der versionierten Eigenschaft »%s« darf keine Revision angegeben werden" +#: ../svn/cl-conflicts.c:102 +msgid "local dir obstruction" +msgstr "lokales Verzeichnis blockiert" -#: ../svn/propedit-cmd.c:62 ../svn/propedit-cmd.c:341 -#, c-format -msgid "Set new value for property '%s' on '%s'\n" -msgstr "Neuer Wert für Eigenschaft »%s« für »%s« gesetzt\n" +#: ../svn/cl-conflicts.c:104 +msgid "local dir delete" +msgstr "lokales Verzeichnis gelöscht" -#: ../svn/propedit-cmd.c:96 ../svn/propset-cmd.c:97 -msgid "--encoding option applies only to textual Subversion-controlled properties" -msgstr "Option --encoding ist nur für textbasierte von Subversion kontrollierte Eigenschaften angebbar" +#: ../svn/cl-conflicts.c:107 +msgid "local dir missing or deleted or moved away" +msgstr "lokales Verzeichnis fehlt, wurde gelöscht oder verschoben" -#: ../svn/propedit-cmd.c:162 -#, c-format -msgid "Set new value for property '%s' on revision %ld\n" -msgstr "Neuen Wert für Eigenschaft »%s« in Revision %ld gesetzt\n" - -#: ../svn/propedit-cmd.c:168 -#, c-format -msgid "No changes to property '%s' on revision %ld\n" -msgstr "Eigenschaft »%s« in Revision %ld nicht geändert\n" - -#: ../svn/propedit-cmd.c:176 -#, c-format -msgid "Cannot specify revision for editing versioned property '%s'" -msgstr "Beim Bearbeiten der versionierten Eigenschaft »%s« darf keine Revision angegeben werden" - -#: ../svn/propedit-cmd.c:204 ../svn/propset-cmd.c:172 -msgid "Explicit target argument required" -msgstr "Expliziter Zielparameter benötigt" +#: ../svn/cl-conflicts.c:109 +msgid "local dir missing" +msgstr "lokales Verzeichnis fehlt" -#: ../svn/propedit-cmd.c:271 -#, c-format -msgid "'%s' does not appear to be a working copy path" -msgstr "»%s« scheint kein Arbeitskopiepfad zu sein" +#: ../svn/cl-conflicts.c:111 +msgid "local dir unversioned" +msgstr "lokales Verzeichnis nicht versioniert" -#: ../svn/propedit-cmd.c:348 -#, c-format -msgid "No changes to property '%s' on '%s'\n" -msgstr "Keine Änderungen der Eigenschaft »%s« für »%s«\n" +#: ../svn/cl-conflicts.c:113 +msgid "local dir add" +msgstr "lokales Verzeichnis hinzugefügt" -#: ../svn/propget-cmd.c:67 -msgid "Error writing to stream" -msgstr "Fehler beim Schreiben in Datenstrom" +#: ../svn/cl-conflicts.c:115 +msgid "local dir replace" +msgstr "lokales Verzeichnis ersetzt" -#: ../svn/propget-cmd.c:187 ../svn/proplist-cmd.c:156 -#: ../svn/proplist-cmd.c:160 ../svnlook/svnlook.c:1769 -#: ../svnlook/svnlook.c:1923 -#, c-format -msgid "" -"Inherited properties on '%s',\n" -"from '%s':\n" -msgstr "" -"Geerbte Eigenschaften von »%s«,\n" -"geerbt von »%s«:\n" +#: ../svn/cl-conflicts.c:117 +msgid "local dir moved away" +msgstr "lokales Verzeichnis verschoben" -#. Not a --revprop -#: ../svn/propget-cmd.c:197 ../svn/proplist-cmd.c:175 -#: ../svnlook/svnlook.c:1804 ../svnlook/svnlook.c:1958 -#, c-format -msgid "Properties on '%s':\n" -msgstr "Eigenschaften von »%s«:\n" +#: ../svn/cl-conflicts.c:119 +msgid "local dir moved here" +msgstr "lokales Verzeichnis hierher verschoben" -#: ../svn/propget-cmd.c:328 -msgid "--verbose cannot be used with --revprop or --no-newline or --xml" -msgstr "»--verbose« kann nicht mit »--revprop«, »--no-newline« oder »--xml« verwendet werden" +#: ../svn/cl-conflicts.c:134 +msgid "local missing or deleted or moved away" +msgstr "lokales Element fehlt, wurde gelöscht oder verschoben" -#: ../svn/propget-cmd.c:360 ../svn/proplist-cmd.c:214 -msgid "--show-inherited-props can't be used with --revprop" -msgstr "»--show-inherited-props« kann nicht mit »--revprop« verwendet werden" +#: ../svn/cl-conflicts.c:136 +msgid "local missing" +msgstr "lokales Element fehlt" -#: ../svn/propget-cmd.c:373 -#, c-format -msgid "Property '%s' not found on revision %s" -msgstr "Eigenschaft »%s« wurde in Revision %s nicht gefunden" +#: ../svn/cl-conflicts.c:138 +msgid "local unversioned" +msgstr "lokales Element nicht versioniert" -#: ../svn/propget-cmd.c:438 -msgid "--no-newline is only available for single-target, non-recursive propget operations" -msgstr "Die Option »--no-newline« ist nur für einzelne Ziele und nicht-rekursive Propget-Operationen verfügbar" +#: ../svn/cl-conflicts.c:142 +msgid "local replace" +msgstr "lokale ersetzt" -#: ../svn/propget-cmd.c:493 -#, c-format -msgid "Property '%s' not found on '%s'" -msgstr "Eigenschaft »%s« von »%s« nicht gefunden" +#: ../svn/cl-conflicts.c:144 +msgid "local moved away" +msgstr "lokale verschoben" -#: ../svn/proplist-cmd.c:246 -#, c-format -msgid "Unversioned properties on revision %ld:\n" -msgstr "Nicht versionierte Eigenschaft in Revision %ld:\n" +#: ../svn/cl-conflicts.c:146 +msgid "local moved here" +msgstr "lokale hierher verschoben" -#: ../svn/proplist-cmd.c:321 -msgid "Could not display properties of all targets because some targets don't exist" -msgstr "Konnte Eigenschaften nicht für alle Ziele anzeigen, da einige Ziele nicht existieren" +#: ../svn/cl-conflicts.c:165 +msgid "incoming file edit" +msgstr "eingehende Änderung einer Datei" -#: ../svn/proplist-cmd.c:326 -msgid "Could not display properties of all targets because some targets are not versioned" -msgstr "Konnte Eigenschaften nicht für alle Ziele anzeigen, da einige Ziele nicht versioniert sind" +#: ../svn/cl-conflicts.c:167 +msgid "incoming file add" +msgstr "eingehendes Hinzufügen einer Datei" -#: ../svn/props.c:66 -msgid "Must specify the revision as a number, a date or 'HEAD' when operating on a revision property" -msgstr "Die Revision muss als Zahl, Datum oder »HEAD« angegeben werden, wenn auf eine Revisionseigenschaft zugegriffen wird" +#: ../svn/cl-conflicts.c:169 +msgid "incoming file delete or move" +msgstr "eingehendes Löschen oder Verschieben einer Datei" -#: ../svn/props.c:73 -msgid "Wrong number of targets specified" -msgstr "Falsche Anzahl Ziele angegeben" +#: ../svn/cl-conflicts.c:171 +msgid "incoming replace with file" +msgstr "eingehendes Ersetzen mit einer Datei" -#: ../svn/props.c:82 -msgid "Either a URL or versioned item is required" -msgstr "Eine URL oder ein versioniertes Objekt muss angegeben werden" +#: ../svn/cl-conflicts.c:178 +msgid "incoming dir edit" +msgstr "eingehende Änderung eines Verzeichnisses" -#: ../svn/props.c:107 -#, c-format -msgid "" -"To turn off the %s property, use 'svn propdel';\n" -"setting the property to '%s' will not turn it off." -msgstr "" -"Um die Eigenschaft %s abzuschalten, ist »svn propdel« zu verwenden;\n" -"setzen der Eigenschaft auf »%s« wird sie nicht ausschalten." +#: ../svn/cl-conflicts.c:180 +msgid "incoming dir add" +msgstr "eingehendes Hinzufügen eines Verzeichnisses" -#: ../svn/props.c:124 -#, c-format -msgid "Use '--force' to set the '%s' property." -msgstr "»--force« erzwingt das Setzen der Eigenschaft »%s«." +#: ../svn/cl-conflicts.c:182 +msgid "incoming dir delete or move" +msgstr "eingehendes Löschen oder Verschieben eines Verzeichnisses" -#: ../svn/props.c:129 -#, c-format -msgid "Use '--force' to edit the '%s' property." -msgstr "»--force« erzwingt das Bearbeiten der Eigenschaft »%s«." +#: ../svn/cl-conflicts.c:184 +msgid "incoming replace with dir" +msgstr "eingehendes Ersetzen mit einem Verzeichnis" -#: ../svn/props.c:135 -#, c-format -msgid "Use '--force' to use the '%s' property'." -msgstr "»--force« erzwingt die Verwendung der Eigenschaft »%s«." +#: ../svn/cl-conflicts.c:196 +msgid "incoming delete or move" +msgstr "eingehendes Löschen oder Verschieben" -#: ../svn/props.c:149 -#, c-format -msgid "'%s' is not a valid %s property name; use '--force' to set it" -msgstr "»%s« ist kein gültiger »%s«-Eigenschaftsname; Verwenden Sie »--force« um das Setzen zu erzwingen" +#: ../svn/cl-conflicts.c:198 +msgid "incoming replace" +msgstr "eingehendes Ersetzen" -#: ../svn/props.c:154 +#. A catch-all message for very rare or nominally impossible cases. +#. It will not be pretty, but is closer to an internal error than +#. an ordinary user-facing string. +#: ../svn/cl-conflicts.c:334 #, c-format -msgid "'%s' is not a valid %s property name; use '--force' to edit it" -msgstr "»%s« ist kein gültiger »%s«-Eigenschaftsname; Verwenden Sie »--force« um das Bearbeiten zu erzwingen" +msgid "local: %s %s incoming: %s %s %s" +msgstr "lokal: %s %s, empfangen: %s %s %s" -#: ../svn/props.c:160 +#: ../svn/cl-conflicts.c:361 #, c-format -msgid "'%s' is not a valid %s property name; use '--force' to use it" -msgstr "»%s« ist kein gültiger »%s«-Eigenschaftsname; Verwenden Sie »--force« um ihn zu verwenden" +msgid "%s %s" +msgstr "%s %s" -#: ../svn/props.c:226 ../svn/props.c:269 -#, c-format -msgid "'%s' is not a valid %s property name; did you mean '%s'?" -msgstr "»%s« ist kein gültiger »%s«-Eigenschaftsname; Meinten Sie »%s«?" +#: ../svn/cleanup-cmd.c:88 +msgid "Working copy locked; if no other Subversion client is currently using the working copy, try running 'svn cleanup' without the --remove-unversioned and --remove-ignored options first." +msgstr "Arbeitskopie gesperrt; Wenn kein anderer Subversion-Client gerade die Arbeitskopie verwendet, versuchen Sie zuerst »svn cleanup« ohne die Optionen »--remove-unversioned« und »--remove-ignored« auszuführen." -#: ../svn/props.c:278 -#, c-format -msgid "'%s' is not a valid %s property name; did you mean '%s' or '%s'?" -msgstr "»%s« ist kein gültiger »%s«-Eigenschaftsname; Meinten Sie »%s« oder »%s«?" +#: ../svn/cleanup-cmd.c:96 +msgid "Cannot remove unversioned or ignored items from something that is not a working copy" +msgstr "Kann ignorierte oder nicht versionierte Elemente nicht aus etwas entfernen, was keine Arbeitskopie ist" -#: ../svn/props.c:288 +#: ../svn/cleanup-cmd.c:123 #, c-format -msgid "'%s' is not a valid %s property name; did you mean '%s', '%s' or '%s'?" -msgstr "»%s« ist kein gültiger »%s«-Eigenschaftsname; Meinten Sie »%s«, »%s« oder »%s«?" +msgid "Working copy locked; try running 'svn cleanup' on the root of the working copy ('%s') instead." +msgstr "Arbeitskopie gesperrt; Versuchen Sie stattdessen »svn cleanup« auf der Basis der Arbeitskopie (»%s«) auszuführen" -#: ../svn/propset-cmd.c:132 +#: ../svn/commit-cmd.c:80 #, c-format -msgid "Cannot specify revision for setting versioned property '%s'" -msgstr "Beim Setzen der versionierten Eigenschaft »%s« darf keine Revision angegeben werden" +msgid "svn: The depth of this commit is '%s', but copies are always performed recursively in the repository.\n" +msgstr "svn: Die Tiefe dieser Übertragung ist »%s«, Kopien werden aber im Projektarchiv immer rekursiv ausgeführt.\n" -#: ../svn/propset-cmd.c:165 -#, c-format -msgid "Explicit target required ('%s' interpreted as prop value)" -msgstr "Explizites Ziel erforderlich (»%s« als Eigenschaftswert interpretiert)" +#: ../svn/commit-cmd.c:116 +msgid "Commit targets must be local paths" +msgstr "Ziele der Übertragung müssen lokale Pfade sein" -#: ../svn/resolve-cmd.c:79 -msgid "missing --accept option" -msgstr "fehlende Option --accept" +#: ../svn/conflict-callbacks.c:127 ../svn/conflict-callbacks.c:144 +msgid "MINE" +msgstr "EIGENE" -#: ../svn/resolve-cmd.c:84 -msgid "invalid 'accept' ARG" -msgstr "ungültiger Parameter »accept«" +#: ../svn/conflict-callbacks.c:132 ../svn/conflict-callbacks.c:142 +msgid "THEIRS" +msgstr "FREMDE" -#: ../svn/resolve-cmd.c:127 -msgid "Failure occurred resolving one or more conflicts" -msgstr "Fehler bei der Auflösung einer oder mehrerer Konflikte" +#: ../svn/conflict-callbacks.c:135 +msgid "MERGED" +msgstr "ZUSAMMENGEFÜHRT" -#: ../svn/revert-cmd.c:80 -msgid "Try 'svn revert --depth infinity' instead?" -msgstr "Versuchen Sie »svn revert --depth infinity« stattdessen?" +#: ../svn/conflict-callbacks.c:198 ../svn/conflict-callbacks.c:246 +msgid "||||||| ORIGINAL" +msgstr "||||||| ORIGINAL" -#: ../svn/status-cmd.c:97 -#, c-format -msgid " Text conflicts: %u\n" -msgstr " Textkonflikte: %u\n" +#: ../svn/conflict-callbacks.c:199 +msgid "<<<<<<< MINE (select with 'mc')" +msgstr "<<<<<<< EIGENE (Auswahl mit »mc«)" -#: ../svn/status-cmd.c:101 -#, c-format -msgid " Property conflicts: %u\n" -msgstr " Eigenschaftskonflikte: %u\n" +#: ../svn/conflict-callbacks.c:200 +msgid ">>>>>>> THEIRS (select with 'tc')" +msgstr ">>>>>>> FREMDE (Auswahl mit »tc«)" -#: ../svn/status-cmd.c:105 -#, c-format -msgid " Tree conflicts: %u\n" -msgstr " Baumkonflikte: %u\n" +#: ../svn/conflict-callbacks.c:247 +msgid "<<<<<<< MINE" +msgstr "<<<<<<< EIGENE" -#: ../svn/status-cmd.c:296 -msgid "--revision (-r) option valid only with --show-updates (-u) option" -msgstr "Option »--revision« (»--r«) ist nur in Verbindung mit der Option »--show-updates« (»-u«) zulässig" +#: ../svn/conflict-callbacks.c:248 +msgid ">>>>>>> THEIRS" +msgstr ">>>>>>> FREMDE" -#: ../svn/status-cmd.c:406 +#: ../svn/conflict-callbacks.c:322 #, c-format msgid "" +"Invalid option; there's no merged version to edit.\n" "\n" -"--- Changelist '%s':\n" msgstr "" +"Ungültige Option; es gibt keine zusammengeführte Version zum Bearbeiten.\n" "\n" -"--- Änderungsliste »%s«:\n" - -#: ../svn/status.c:316 -#, c-format -msgid "swapped places with %s" -msgstr "Platz mit %s vertauscht" -#: ../svn/status.c:331 -#, c-format -msgid "moved from %s" -msgstr "Verschoben von %s" +#. Translators: keep long_desc below 70 characters (wrap with a left +#. margin of 9 spaces if needed) +#: ../svn/conflict-callbacks.c:452 +#, fuzzy +msgid "Quit resolution" +msgstr "Konfliktauflösung beenden" -#: ../svn/status.c:343 -#, c-format -msgid "moved to %s" -msgstr "Verschoben nach %s" +#: ../svn/conflict-callbacks.c:452 +msgid "postpone all remaining conflicts" +msgstr "Alle verbleibenen Konflikte zurückstellen" -#: ../svn/svn.c:159 -msgid "force operation to run" -msgstr "Durchführung des Befehls erzwingen" +#. Translators: keep long_desc below 70 characters (wrap with a left +#. margin of 9 spaces if needed) +#: ../svn/conflict-callbacks.c:463 +#, fuzzy +msgid "Edit file" +msgstr "Datei bearbeiten" -#: ../svn/svn.c:161 -msgid "force validity of log message source" -msgstr "Gültigkeit der Quelle für die Logmeldung erzwingen" +#: ../svn/conflict-callbacks.c:463 +#, fuzzy +msgid "change merged file in an editor" +msgstr "Bearbeitet die zusammengeführte Datei in einem Editor [edit]" -#: ../svn/svn.c:162 ../svn/svn.c:163 ../svnadmin/svnadmin.c:227 -#: ../svnadmin/svnadmin.c:230 ../svnbench/svnbench.c:85 -#: ../svnbench/svnbench.c:86 ../svndumpfilter/svndumpfilter.c:977 -#: ../svndumpfilter/svndumpfilter.c:980 ../svnfsfs/svnfsfs.c:129 -#: ../svnfsfs/svnfsfs.c:132 ../svnlook/svnlook.c:115 ../svnlook/svnlook.c:127 -#: ../svnsync/svnsync.c:275 ../svnsync/svnsync.c:277 -msgid "show help on a subcommand" -msgstr "zeige Hilfe zu einem Unterbefehl" +#: ../svn/conflict-callbacks.c:466 +#, fuzzy +msgid "Show diff" +msgstr "Änderungen anzeigen" -#: ../svn/svn.c:164 -msgid "specify log message ARG" -msgstr "PAR als Logmeldung verwenden" +#: ../svn/conflict-callbacks.c:466 +msgid "show all changes made to merged file" +msgstr "Zeigt alle Änderungen an der zusammengeführten Datei an" -#: ../svn/svn.c:165 ../svnbench/svnbench.c:87 -msgid "print nothing, or only summary information" -msgstr "nichts oder nur Zusammenfassungen ausgeben" +#. Translators: keep long_desc below 70 characters (wrap with a left +#. margin of 9 spaces if needed) +#: ../svn/conflict-callbacks.c:468 ../svn/conflict-callbacks.c:490 +#, fuzzy +msgid "Display conflict" +msgstr "Konflikte anzeigen" -#: ../svn/svn.c:166 ../svnbench/svnbench.c:88 -msgid "descend recursively, same as --depth=infinity" -msgstr "" -"rekursiv absteigen, das gleiche wie\n" -" --depth=infinity" +#: ../svn/conflict-callbacks.c:468 +msgid "show all conflicts (ignoring merged version)" +msgstr "Zeigt alle Konflikte an (ignoriert zusammengeführte Datei)" -#: ../svn/svn.c:167 ../svnbench/svnbench.c:89 -msgid "obsolete; try --depth=files or --depth=immediates" -msgstr "" -"veraltet; versuchen Sie --depth=files oder\n" -" --depth=immediates" +#: ../svn/conflict-callbacks.c:471 +#, fuzzy +msgid "Merge" +msgstr "Zusammenführung" -#: ../svn/svn.c:169 ../svnbench/svnbench.c:91 -msgid "" -"the change made by revision ARG (like -r ARG-1:ARG)\n" -" If ARG is negative this is like -r ARG:ARG-1\n" -" If ARG is of the form ARG1-ARG2 then this is like\n" -" ARG1:ARG2, where ARG1 is inclusive" -msgstr "" -"Durch Revision PAR erzeugte Änderung (wie -r PAR-1:PAR)\n" -" Falls PAR negativ ist, gleichbedeutend mit -r PAR:PAR-1\n" -" Falls PAR die Form PAR1-PAR2 hat, dann wie\n" -" PAR1:PAR2, wobei PAR1 eingeschlossen ist" +#: ../svn/conflict-callbacks.c:471 +msgid "use merge tool to resolve conflict" +msgstr "Verwendet ein Werkzeug zum Zusammenführen für die Konfliktlösung" -#: ../svn/svn.c:177 ../svnbench/svnbench.c:99 -msgid "" -"ARG (some commands also take ARG1:ARG2 range)\n" -" A revision argument can be one of:\n" -" NUMBER revision number\n" -" '{' DATE '}' revision at start of the date\n" -" 'HEAD' latest in repository\n" -" 'BASE' base rev of item's working copy\n" -" 'COMMITTED' last commit at or before BASE\n" -" 'PREV' revision just before COMMITTED" -msgstr "" -"PAR (manche Befehle akzeptieren auch einen\n" -" Wertebereich PAR1:PAR2)\n" -" Ein Revisionsparameter kann sein:\n" -" NUMMER Revisionsnummer\n" -" »{«DATUM»}« Revision zum Startdatum\n" -" »HEAD« neueste Revision im Projektarchiv\n" -" »BASE« Basisrevision der Arbeitskopie\n" -" »COMMITTED« letzte übertragene Revision zu\n" -" oder vor BASE\n" -" »PREV« letzte Revision vor COMMITTED" +#: ../svn/conflict-callbacks.c:473 +#, fuzzy +msgid "Launch tool" +msgstr "Werkzeug starten" -#: ../svn/svn.c:192 -msgid "read log message from file ARG" -msgstr "Logmeldung aus Datei PAR lesen" +#: ../svn/conflict-callbacks.c:473 +#, fuzzy +msgid "launch external merge tool to resolve conflict" +msgstr "Startet ein externes Werkzeug zum Zusammenführen für die Konfliktlösung [launch]" -#: ../svn/svn.c:194 -msgid "give output suitable for concatenation" -msgstr "Ausgabe für Verkettung formatieren" +#: ../svn/conflict-callbacks.c:477 +#, fuzzy +msgid "Internal merge tool" +msgstr "internes Werkzeug zum Zusammenführen" -#: ../svn/svn.c:196 -msgid "treat value as being in charset encoding ARG" -msgstr "" -"Wert behandeln, als sei er in der Zeichenkodierung\n" -" PAR" +#: ../svn/conflict-callbacks.c:477 +msgid "use built-in merge tool to resolve conflict" +msgstr "Verwendet das interne Werkzeug zum Zusammenführen für die Konfliktlösung" -#: ../svn/svn.c:197 ../svnadmin/svnadmin.c:233 ../svnbench/svnbench.c:114 -#: ../svndumpfilter/svndumpfilter.c:983 ../svnfsfs/svnfsfs.c:135 -#: ../svnlook/svnlook.c:172 ../svnrdump/svnrdump.c:158 -#: ../svnserve/svnserve.c:378 ../svnsync/svnsync.c:273 -#: ../svnversion/svnversion.c:144 -msgid "show program version information" -msgstr "Zeige Versionsinformationen des Programms" +#: ../svn/conflict-callbacks.c:480 +#, fuzzy +msgid "Show all options" +msgstr "alle Optionen anzeigen" -#: ../svn/svn.c:198 ../svnbench/svnbench.c:115 -msgid "print extra information" -msgstr "zusätzliche Informationen ausgeben" +#: ../svn/conflict-callbacks.c:480 +msgid "show this list (also 'h', '?')" +msgstr "Gibt diese Liste aus (auch: »h«, »?«)" -#: ../svn/svn.c:199 -msgid "display update information" -msgstr "Aktualisierungsinformation ausgeben" +#: ../svn/conflict-callbacks.c:490 +msgid "show conflicts in this property" +msgstr "Zeigt Konflikte in dieser Eigenschaft an" -#: ../svn/svn.c:200 ../svnbench/svnbench.c:116 ../svnrdump/svnrdump.c:142 -msgid "specify a username ARG" -msgstr "Benutzername PAR angeben" +#: ../svn/conflict-callbacks.c:492 +#, fuzzy +msgid "Edit property" +msgstr "Eigenschaft bearbeiten" -#: ../svn/svn.c:202 -msgid "" -"specify a password ARG (caution: on many operating\n" -" systems, other users will be able to see this)" -msgstr "" -"gibt ein Passwort PAR an (Vorsicht: Auf vielen Betriebssystemen\n" -" ist dies für andere Benutzer sichtbar)" +#: ../svn/conflict-callbacks.c:492 +#, fuzzy +msgid "change merged property value in an editor" +msgstr "Bearbeitet den zusammengeführten Eigenschaftswert in einem Editor [edit]" -#: ../svn/svn.c:206 -msgid "" -"Specify differencing options for external diff or\n" -" internal diff or blame. Default: '-u'. Options are\n" -" separated by spaces. Internal diff and blame take:\n" -" -u, --unified: Show 3 lines of unified context\n" -" -b, --ignore-space-change: Ignore changes in\n" -" amount of white space\n" -" -w, --ignore-all-space: Ignore all white space\n" -" --ignore-eol-style: Ignore changes in EOL style\n" -" -U ARG, --context ARG: Show ARG lines of context\n" -" -p, --show-c-function: Show C function name" +#: ../svn/conflict-callbacks.c:496 ../svn/conflict-callbacks.c:514 +msgid "Help" msgstr "" -"Gibt Optionen für ein externes Vergleichsprogramm oder internes\n" -" Programm zum Vergleichen oder Annotieren an.\n" -" Vorgabe: »-u«. Optionen werden durch Leerzeichen\n" -" getrennt angegeben. Das interne Programm zum\n" -" Vergleichen und Annotieren kennt folgende Optionen:\n" -" -u (--unified):\n" -" Gibt 3 Zeilen Standardkontext aus.\n" -" -b (--ignore-space-change):\n" -" Ignoriert Änderungen in der Anzahl von\n" -" Leerzeichen.\n" -" -w (--ignore-all-space):\n" -" Ignoriert sämtliche Leerzeichen.\n" -" --ignore-eol-style:\n" -" Ignoriert Änderungen im Zeilenendestil.\n" -" -U PAR, --context PAR: Gibt PAR Zeilen Kontext aus.\n" -" -p (--show-c-function):\n" -" Zeigt C-Funktionsname in Diff-Ausgabe." -#: ../svn/svn.c:226 ../svnbench/svnbench.c:119 -msgid "pass contents of file ARG as additional args" -msgstr "" -"Inhalt der Datei PAR als zusätzliche Parameter\n" -" übergeben" +#: ../svn/conflict-callbacks.c:496 ../svn/conflict-callbacks.c:514 +msgid "show this help (also '?')" +msgstr "Zeigt diese Hilfe an (auch: »?«)" -#: ../svn/svn.c:228 ../svnbench/svnbench.c:121 -msgid "" -"limit operation by depth ARG ('empty', 'files',\n" -" 'immediates', or 'infinity')" +#. Translators: keep long_desc below 70 characters (wrap with a left +#. margin of 9 spaces if needed) +#: ../svn/conflict-callbacks.c:506 +msgid "Set repository move destination path" msgstr "" -"begrenzt Operation auf Tiefe PAR (»empty«, »files«,\n" -" »immediates« oder »infinity«)" -#: ../svn/svn.c:232 -msgid "" -"set new working copy depth to ARG ('exclude',\n" -" 'empty', 'files', 'immediates', or 'infinity')" +#: ../svn/conflict-callbacks.c:507 +msgid "pick repository move target from list of possible targets" msgstr "" -"setzt eine neue Tiefe PAR der Arbeitskopie (»exclude«,\n" -" »empty«, »files«, »immediates« oder »infinity«)" -#: ../svn/svn.c:235 ../svnlook/svnlook.c:175 -msgid "output in XML" -msgstr "gibt XML aus" +#: ../svn/conflict-callbacks.c:510 +#, fuzzy +msgid "Set working copy move destination path" +msgstr "Die Arbeitskopie muss in ein neueres Format gebracht werden" -#: ../svn/svn.c:236 -msgid "DEPRECATED" -msgstr "VERALTET" +#: ../svn/conflict-callbacks.c:511 +msgid "pick working copy move target from list of possible targets" +msgstr "" -#: ../svn/svn.c:238 ../svnbench/svnbench.c:126 -msgid "do not cross copies while traversing history" -msgstr "beendet Log-Ausgabe bei Kopieroperationen" +#: ../svn/conflict-callbacks.c:613 +msgid "Select:" +msgstr "Auswahl:" + +#: ../svn/conflict-callbacks.c:699 +msgid "Words in square brackets are the corresponding --accept option arguments.\n" +msgstr "Worte in eckigen Klammen geben das entsprechende Argument für die Option »--accept« an.\n" -#: ../svn/svn.c:240 +#: ../svn/conflict-callbacks.c:744 +#, c-format msgid "" -"disregard default and svn:ignore and\n" -" svn:global-ignores property ignores" +"Unrecognized option.\n" +"\n" msgstr "" -"ignoriert Einstellungen aus »global-ignores« und den\n" -" Eigenschaften »svn:ignore« und »svn:global-ignores«" +"Unbekannte Option.\n" +"\n" -#: ../svn/svn.c:244 ../svnbench/svnbench.c:128 ../svnrdump/svnrdump.c:154 -#: ../svnsync/svnsync.c:197 -msgid "do not cache authentication tokens" -msgstr "Anmeldeinformationen nicht zwischenspeichern" +# TODO: leicht inkonsistent zu obigen Strings (tritt in svn info-Ausgabe auf) +#: ../svn/conflict-callbacks.c:909 +#, fuzzy, c-format +msgid "Merge conflict discovered in binary file '%s'.\n" +msgstr "Konflikt in Binärdatei »%s« entdeckt.\n" -#: ../svn/svn.c:246 ../svnbench/svnbench.c:130 ../svnrdump/svnrdump.c:168 -#: ../svnsync/svnsync.c:207 -msgid "deprecated; same as --trust-unknown-ca" -msgstr "Veraltet; identisch mit --trust-unknown-ca" +# TODO: leicht inkonsistent zu obigen Strings (tritt in svn info-Ausgabe auf) +#: ../svn/conflict-callbacks.c:914 +#, fuzzy, c-format +msgid "Merge conflict discovered in file '%s'.\n" +msgstr "Konflikt in Datei »%s« entdeckt.\n" -#: ../svn/svn.c:248 ../svnbench/svnbench.c:132 ../svnrdump/svnrdump.c:170 -#: ../svnsync/svnsync.c:209 +# TODO: "for binary files" for consistency with "for properties" +#: ../svn/conflict-callbacks.c:997 +#, c-format msgid "" -"with --non-interactive, accept SSL server\n" -" certificates from unknown certificate authorities" +"Invalid option; cannot display conflicts for a binary file.\n" +"\n" msgstr "" -"mit --non-interactive, akzeptiert SSL Server-Zertifikate\n" -" von unbekannten Zertifizierungsstellen" +"Ungültige Option; Anzeige von Konflikten ist für Binärdateien nicht möglich.\n" +"\n" -#: ../svn/svn.c:252 ../svnbench/svnbench.c:136 ../svnrdump/svnrdump.c:174 -#: ../svnsync/svnsync.c:213 +#: ../svn/conflict-callbacks.c:1005 +#, c-format msgid "" -"with --non-interactive, accept SSL server\n" -" certificates even if the server hostname does not\n" -" match the certificate's common name attribute" +"Invalid option; original files not available.\n" +"\n" msgstr "" -"mit --non-interactive, akzeptiert SSL Server-Zertifikate\n" -" auch falls der Hostname nicht mit dem Common\n" -" Name Attribut im Zertifikat übereinstimmt" +"Ungültige Option; Originaldateien nicht verfügbar.\n" +"\n" -#: ../svn/svn.c:258 ../svnbench/svnbench.c:142 ../svnrdump/svnrdump.c:180 -#: ../svnsync/svnsync.c:219 +#: ../svn/conflict-callbacks.c:1021 +#, c-format msgid "" -"with --non-interactive, accept expired SSL server\n" -" certificates" +"Invalid option; there's no merged version to diff.\n" +"\n" msgstr "" -"mit --non-interactive, akzeptiert SSL Server-Zertifikate\n" -" die abgelaufen sind" +"Ungültige Option; es gibt keine zusammengeführte Version zum Vergleichen.\n" +"\n" -#: ../svn/svn.c:262 ../svnbench/svnbench.c:146 ../svnrdump/svnrdump.c:184 -#: ../svnsync/svnsync.c:223 +#: ../svn/conflict-callbacks.c:1047 +#, c-format msgid "" -"with --non-interactive, accept SSL server\n" -" certificates from the future" +"Invalid option; there's no base path to merge.\n" +"\n" msgstr "" -"mit --non-interactive, akzeptiert SSL Server-Zertifikate\n" -" die noch nicht gültig sind" +"Ungültige Option; es gibt keinen Basispfad zum Zusammenführen.\n" +"\n" -#: ../svn/svn.c:266 ../svnbench/svnbench.c:150 ../svnrdump/svnrdump.c:188 -#: ../svnsync/svnsync.c:227 +#: ../svn/conflict-callbacks.c:1140 +#, c-format msgid "" -"with --non-interactive, accept SSL server\n" -" certificates with failures other than the above" +"Invalid option.\n" +"\n" msgstr "" -"mit --non-interactive, akzeptiert SSL Server-Zertifikate\n" -" mit anderen als den vorherigen Fehlern" +"Ungültige Option.\n" +"\n" -#: ../svn/svn.c:270 ../svnrdump/svnrdump.c:146 ../svnsync/svnsync.c:189 +# CHECKME: proper English? +#: ../svn/conflict-callbacks.c:1169 +#, c-format msgid "" -"do no interactive prompting (default is to prompt\n" -" only if standard input is a terminal device)" +"Invalid option; cannot choose based on conflicts in a binary file.\n" +"\n" msgstr "" -"verhindert interaktive Nachfragen (Standard sind Nachfragen\n" -" nur wenn die Standardeingabe ein Terminal ist)" +"Ungültige Option; Auswahl anhand von Konflikten ist in einer Binärdatei nicht möglich.\n" +"\n" -#: ../svn/svn.c:274 ../svnrdump/svnrdump.c:150 ../svnsync/svnsync.c:193 +#: ../svn/conflict-callbacks.c:1183 +#, c-format msgid "" -"do interactive prompting even if standard input\n" -" is not a terminal device" -msgstr "" -"erzwingt interaktive Nachfragen auch wenn die\n" -" Standardeingabe kein Terminal ist" +"Invalid option; use diff/edit/merge/launch before choosing 'mark resolved'.\n" +"\n" +msgstr "Ungültige Option; Verwenden Sie Änderungen anzeigen / Datei bearbeiten / Zusammenführung / Werkzeug starten bevor Sie den Konflikt als aufgelöst markieren.\n" -#: ../svn/svn.c:278 -msgid "try operation but make no changes" -msgstr "Operation testen, aber keine Änderungen durchführen" +#: ../svn/conflict-callbacks.c:1296 +#, c-format +msgid "Conflict for property '%s' discovered on '%s'.\n" +msgstr "Konflikt für Eigenschaft »%s« für »%s« entdeckt.\n" -#: ../svn/svn.c:280 -msgid "disable merge tracking; diff nodes as if related" -msgstr "deaktiviert Zusammenführungsverfolgung; erzeugt Unterschiede als ob Knoten verwandt wären" +#: ../svn/conflict-callbacks.c:1365 +#, c-format +msgid "" +"Invalid option; please edit the property first.\n" +"\n" +msgstr "" +"Ungültige Option; Bearbeiten Sie zuerst die Eigenschaft.\n" +"\n" -#: ../svn/svn.c:282 -msgid "ignore externals definitions" -msgstr "»svn:externals«-Definitionen ignorieren" - -#: ../svn/svn.c:283 -msgid "use ARG as merge command" -msgstr "PAR als Konflikteditor verwenden" +#: ../svn/conflict-callbacks.c:1625 +#, c-format +msgid "" +"Possible working copy destinations for moved-away '%s' are:\n" +"%sOnly one destination can be a move; the others are copies.\n" +"Specify the correct move target path by number: " +msgstr "" -#: ../svn/svn.c:284 -msgid "use ARG as external editor" -msgstr "PAR als externen Editor verwenden" +#: ../svn/conflict-callbacks.c:1634 +#, c-format +msgid "" +"Possible repository destinations for moved-away '%s' are:\n" +"%sOnly one destination can be a move; the others are copies.\n" +"Specify the correct move target path by number: " +msgstr "" -#: ../svn/svn.c:286 -msgid "merge only mergeinfo differences" -msgstr "Führt nur Unterschiede in den Zusammenführungsinformationen zusammen" +#: ../svn/conflict-callbacks.c:1716 +#, fuzzy, c-format +msgid "" +"Tree conflict on '%s':\n" +"%s\n" +msgstr "" +"Baumkonflikt in »%s«\n" +" > %s\n" -#: ../svn/svn.c:287 -msgid "use ARG as the older target" -msgstr "PAR als älteres Ziel verwenden" +#: ../svn/conflict-callbacks.c:1736 +#, c-format +msgid "Applying recommended resolution '%s':\n" +msgstr "" -#: ../svn/svn.c:288 -msgid "use ARG as the newer target" -msgstr "PAR als neueres Ziel verwenden" +#: ../svn/conflict-callbacks.c:1761 +#, c-format +msgid "" +"\n" +"Subversion is not smart enough to resolve this tree conflict automatically!\n" +"See 'svn help resolve' for more information.\n" +"\n" +msgstr "" -#: ../svn/svn.c:290 -msgid "operate on a revision property (use with -r)" +#: ../svn/conflict-callbacks.c:1776 +#, c-format +msgid "Ambiguous move destinations exist in the repository; try the 'd' option\n" msgstr "" -"auf einer Revisionseigenschaft arbeiten (mit -r\n" -" verwenden)" -#: ../svn/svn.c:291 -msgid "relocate via URL-rewriting" -msgstr "durch Umschreiben der URL umplatzieren" +#: ../svn/conflict-callbacks.c:1781 +#, fuzzy, c-format +msgid "Ambiguous move destinations exist in the working copy; try the 'w' option\n" +msgstr "Ein Konflikt in der Arbeitskopie behindert die aktuelle Operation" -#: ../svn/svn.c:293 ../svnadmin/svnadmin.c:280 ../svnbench/svnbench.c:156 -#: ../svnrdump/svnrdump.c:140 ../svnsync/svnsync.c:239 -msgid "read user configuration files from directory ARG" -msgstr "" -"Benutzerkonfigurationsdateien aus dem Verzeichnis\n" -" PAR lesen" +#: ../svn/copy-cmd.c:123 ../svn/export-cmd.c:94 ../svn/util.c:963 +#, c-format +msgid "'%s': a peg revision is not allowed here" +msgstr "»%s«: Eine Fix-Revision ist hier nicht erlaubt" -#: ../svn/svn.c:295 ../svnbench/svnbench.c:158 ../svnrdump/svnrdump.c:160 -#: ../svnsync/svnsync.c:241 -msgid "" -"set user configuration option in the format:\n" -" FILE:SECTION:OPTION=[VALUE]\n" -" For example:\n" -" servers:global:http-library=serf" -msgstr "" -"Setzt Benutzerkonfigurationsoption im Format:\n" -" DATEI:ABSCHNITT:OPTION=[WERT]\n" -" Zum Beispiel:\n" -" servers:global:http-library=serf" +#: ../svn/copy-cmd.c:162 ../svn/delete-cmd.c:69 ../svn/mkdir-cmd.c:68 +#: ../svn/move-cmd.c:77 ../svn/propedit-cmd.c:260 +msgid "Local, non-commit operations do not take a log message or revision properties" +msgstr "Lokale Operationen ohne Übertragung benötigen keine Logmeldung oder Revisionseigenschaften" -#: ../svn/svn.c:302 -msgid "enable automatic properties" -msgstr "automatische Eigenschaften einschalten" +#: ../svn/diff-cmd.c:227 +msgid "'--xml' option only valid with '--summarize' option" +msgstr "Option »--xml« ist nur in Verbindung mit der Option »--summarize« zulässig" -#: ../svn/svn.c:303 -msgid "disable automatic properties" -msgstr "automatische Eigenschaften ausschalten" +#: ../svn/diff-cmd.c:240 ../svn/diff-cmd.c:244 ../svn/diff-cmd.c:248 +#: ../svn/diff-cmd.c:252 ../svn/diff-cmd.c:256 ../svn/diff-cmd.c:260 +#: ../svn/diff-cmd.c:264 ../svn/diff-cmd.c:268 +#, c-format +msgid "'%s' not valid with '--summarize' option" +msgstr "»%s« mit der Option »--summarize« nicht zulässig" -#: ../svn/svn.c:305 -msgid "" -"use a different EOL marker than the standard\n" -" system marker for files with the svn:eol-style\n" -" property set to 'native'.\n" -" ARG may be one of 'LF', 'CR', 'CRLF'" -msgstr "" -"Verwende eine andere Zeilenendemarke als den\n" -" Standard für Dateien mit der Eigenschaft\n" -" »svn:eol-style native«.\n" -" PAR kann »LF«, »CR« oder »CRLF« sein." +#: ../svn/diff-cmd.c:355 +msgid "'--new' option only valid with '--old' option" +msgstr "Option »--new« ist nur in Verbindung mit der Option »--old« zulässig" -#: ../svn/svn.c:312 ../svnbench/svnbench.c:165 -msgid "maximum number of log entries" -msgstr "maximale Anzahl Logeinträge" +#: ../svn/diff-cmd.c:373 +msgid "'svn diff [-r N[:M]] [TARGET[@REV]...]' does not support mixed target types. Try using the --old and --new options or one of the shorthand invocations listed in 'svn help diff'." +msgstr "»svn diff [-r N[:M]] [ZIEL[@REV]...]« unterstützt keine gemischten Zieltypen. Versuchen Sie die Optionen »--old« und »--new« oder eine der Kurzfassungen des Aufrufs, die in »svn help diff« aufgelistet sind." -#: ../svn/svn.c:313 -msgid "don't unlock the targets" -msgstr "Ziele nicht freigeben" +#: ../svn/diff-cmd.c:430 +#, c-format +msgid "Path '%s' not relative to base URLs" +msgstr "Pfad »%s« ist nicht relativ zur Basis-URL" -# CHECKME -#: ../svn/svn.c:314 -msgid "remove changelist association" -msgstr "Bezug zur Änderungsliste entfernen" +#: ../svn/export-cmd.c:121 +msgid "Destination directory exists; please remove the directory or use --force to overwrite" +msgstr "Zielverzeichnis existiert; bitte löschen Sie das Verzeichnis oder verwenden Sie »--force« zum Überschreiben" -#: ../svn/svn.c:316 -msgid "operate only on members of changelist ARG" -msgstr "nur auf Elementen der Änderungsliste PAR operieren" +#: ../svn/file-merge.c:139 ../svn/file-merge.c:809 +msgid "Could not write data to merged file" +msgstr "Konnte Daten nicht in zusammengeführte Datei schreiben" -#: ../svn/svn.c:318 -msgid "don't delete changelists after commit" -msgstr "Änderungslisten nach Übertragung nicht löschen" +#: ../svn/file-merge.c:495 +msgid "Could not write data to temporary file" +msgstr "Konnte Daten nicht in temporäre Datei schreiben" -#: ../svn/svn.c:319 -msgid "keep path in working copy" -msgstr "Pfad in Arbeitskopie beibehalten" +#: ../svn/file-merge.c:507 +msgid "No editor found." +msgstr "Kein Editor gefunden." -#: ../svn/svn.c:321 ../svnbench/svnbench.c:167 -msgid "retrieve all revision properties" -msgstr "alle Revisionseigenschaften abfragen" +#: ../svn/file-merge.c:519 +msgid "Error running editor." +msgstr "Fehler beim Ausführen des Editors." -#: ../svn/svn.c:323 ../svnbench/svnbench.c:169 -msgid "retrieve no revision properties" -msgstr "keine Revisionseigenschaften abfragen" +#: ../svn/file-merge.c:604 +msgid "Conflicting section found during merge:" +msgstr "Abschnitt mit Konflikt während Zusammenführung gefunden:" + +#: ../svn/file-merge.c:607 +#, c-format +msgid "(1) their version (at line %lu)" +msgstr "(1) fremde Version (in Zeile %lu)" + +#: ../svn/file-merge.c:612 +#, c-format +msgid "(2) your version (at line %lu)" +msgstr "(2) eigene Version (in Zeile %lu)" -#: ../svn/svn.c:325 ../svnbench/svnbench.c:171 +#: ../svn/file-merge.c:661 msgid "" -"set revision property ARG in new revision\n" -" using the name[=value] format" +"Select: (1) use their version, (2) use your version,\n" +" (12) their version first, then yours,\n" +" (21) your version first, then theirs,\n" +" (e1) edit their version and use the result,\n" +" (e2) edit your version and use the result,\n" +" (eb) edit both versions and use the result,\n" +" (p) postpone this conflicting section leaving conflict markers,\n" +" (a) abort file merge and return to main menu: " msgstr "" -"Revisionseigenschaft PAR in neuer Revision\n" -" unter Verwendung des Formats name[=Wert] setzen" +"Auswahl: (1) verwendet fremde Version, (2) verwendet eigene Version,\n" +" (12) verwendet fremde Version zuerst, dann eigene,\n" +" (21) verwendet eigene Version zuerst, dann fremde,\n" +" (e1) bearbeitet fremde Version und verwendet das Ergebnis,\n" +" (e2) bearbeitet eigene Version und verwendet das Ergebnis,\n" +" (eb) bearbeitet beide Versionen und verwendet das Ergebnis,\n" +" (p) Verschiebt Konfliktlösung für diesen Abschnitt und setzt Konfliktmarkierungen,\n" +" (a) Bricht Zusammenführung der Datei ab und kehrt zum Hauptmenü zurück: " -#: ../svn/svn.c:328 -msgid "make intermediate directories" -msgstr "Zwischenverzeichnisse erzeugen" +#: ../svn/file-merge.c:894 +#, c-format +msgid "Merging '%s'.\n" +msgstr "Zusammenführung von »%s«.\n" + +#: ../svn/file-merge.c:942 +#, c-format +msgid "Merge of '%s' aborted.\n" +msgstr "Zusammenführung von »%s« abgebrochen.\n" -#: ../svn/svn.c:330 ../svnbench/svnbench.c:175 +#: ../svn/file-merge.c:960 +#, c-format msgid "" -"use/display additional information from merge\n" -" history" +"Could not write merged result to '%s', saved instead at '%s'.\n" +"'%s' remains in conflict.\n" msgstr "" -"verwendet und zeigt zusätzliche Informationen aus der\n" -" Zusammenführungsgeschichte an" +"Ergebnis der Zusammenführung konnte nicht nach »%s« geschrieben werden, es wurde stattdessen in »%s« gespeichert.\n" +"Konflikt in »%s« bleibt bestehen.\n" + +#: ../svn/file-merge.c:978 +#, c-format +msgid "Merge of '%s' completed (remains in conflict).\n" +msgstr "Zusammenführung von »%s« abgeschlossen (Konflikt bleibt bestehen)\n" + +#: ../svn/file-merge.c:982 +#, c-format +msgid "Merge of '%s' completed.\n" +msgstr "Zusammenführung von »%s« abgeschlossen.\n" -#: ../svn/svn.c:334 +#: ../svn/help-cmd.c:53 +#, fuzzy msgid "" -"specify automatic conflict resolution action\n" -" ('postpone', 'working', 'base', 'mine-conflict',\n" -" 'theirs-conflict', 'mine-full', 'theirs-full',\n" -" 'edit', 'launch')\n" -" (shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', 'l')" +"usage: svn [options] [args]\n" +"Subversion command-line client.\n" +"Type 'svn help ' for help on a specific subcommand.\n" +"Type 'svn --version' to see the program version and RA modules,\n" +" 'svn --version --verbose' to see dependency versions as well,\n" +" 'svn --version --quiet' to see just the version number.\n" +"\n" +"Most subcommands take file and/or directory arguments, recursing\n" +"on the directories. If no arguments are supplied to such a\n" +"command, it recurses on the current directory (inclusive) by default.\n" +"\n" +"Available subcommands:\n" msgstr "" -"automatische Konfliktauflösungsaktion angeben\n" -" (»postpone«, »working«, »base«, »mine-conflict«,\n" -" »theirs-conflict«, »mine-full«, »theirs-full«,\n" -" »edit«, »launch«)\n" -" (kurz: »p«, »mc«, »tc«, »mf«, »tf«, »e«, »l«)" +"Aufruf: svn [Optionen] [Parameter]\n" +"Subversion-Kommandozeilenclient.\n" +"Geben Sie »svn help « ein, um Hilfe zu einem Unterbefehl\n" +" zu erhalten.\n" +"Geben Sie »svn --version« ein, um die Programmversion und die Zugriffsmodule\n" +" oder »svn --version --quiet«, um nur die Versionsnummer zu sehen.\n" +"\n" +"Die meisten Unterbefehle akzeptieren Datei- und/oder Verzeichnisparameter,\n" +"wobei die Verzeichnisse rekursiv durchlaufen werden. Wenn keine Parameter\n" +"angegeben werden, durchläuft der Befehl das aktuelle Verzeichnis rekursiv.\n" +"\n" +"Verfügbare Unterbefehle:\n" -#: ../svn/svn.c:345 +#: ../svn/help-cmd.c:67 ../svnbench/help-cmd.c:62 msgid "" -"specify which collection of revisions to display\n" -" ('merged', 'eligible')" +"Subversion is a tool for version control.\n" +"For additional information, see http://subversion.apache.org/\n" msgstr "" -"gibt anzuzeigende Menge der Revisionen an\n" -" (»merged«, »eligible«)" - -#: ../svn/svn.c:349 -msgid "deprecated" -msgstr "veraltet" +"Subversion ist ein Programm zur Versionskontrolle.\n" +"Für weitere Informationen, siehe: http://subversion.apache.org/\n" -#: ../svn/svn.c:351 +#: ../svn/help-cmd.c:71 ../svnbench/help-cmd.c:66 ../svnrdump/svnrdump.c:616 +#: ../svnsync/svnsync.c:1938 msgid "" -"number of leading path components to strip from\n" -" paths parsed from the patch file. --strip 0\n" -" is the default and leaves paths unmodified.\n" -" --strip 1 would change the path\n" -" 'doc/fudge/crunchy.html' to 'fudge/crunchy.html'.\n" -" --strip 2 would leave just 'crunchy.html'\n" -" The expected component separator is '/' on all\n" -" platforms. A leading '/' counts as one component." +"The following repository access (RA) modules are available:\n" +"\n" msgstr "" -"Anzahl der führenden Pfadkomponenten, die aus den aus der Patch-Datei\n" -" eingelesenen Pfaden entfernt werden sollen.\n" -" »--strip 0« ist die Vorgabe und lässt die Pfade unverändert.\n" -" »--strip 1« ändert z.B. »beispiel/txt/datei.txt« zu »txt/datei.txt«\n" -" »--strip 2« ließe noch »datei.txt«\n" -" Das erwartete Trennzeichen für Pfadkomponenten ist »/« auf\n" -" allen Plattformen. Ein einleitendes »/« zählt als eine Komponente." +"Die folgenden ZugriffsModule (ZM) für Projektarchive stehen zur Verfügung:\n" +"\n" -#: ../svn/svn.c:367 -msgid "don't expand keywords" -msgstr "Schlüsselwörter nicht expandieren" +#: ../svn/help-cmd.c:125 +msgid "" +"WARNING: Plaintext password storage is enabled!\n" +"\n" +msgstr "" +"WARNUNG: Speicherung von Passwörtern im Klartext ist aktiviert!\n" +"\n" -#: ../svn/svn.c:369 -msgid "apply the unidiff in reverse" -msgstr "Wendet Unidiff rückwärts an" +#: ../svn/help-cmd.c:148 +msgid "" +"\n" +"The following authentication credential caches are available:\n" +"\n" +msgstr "" +"\n" +"Die folgenden Speicherbereiche für Zugangsdaten sind verfügbar:\n" +"\n" -#: ../svn/svn.c:371 -msgid "ignore whitespace during pattern matching" -msgstr "Ignoriert während des Mustervergleichs Leerzeichen, Tabulatoren und andere nicht druckbare Zeichen" +#: ../svn/help-cmd.c:155 +#, c-format +msgid "%s* Wincrypt cache in %s\n" +msgstr "%s* Wincrypt-Speicher in %s\n" -#: ../svn/svn.c:372 -msgid "produce diff output" -msgstr "Erzeugt Ausgabe von Unterschieden" +#: ../svn/help-cmd.c:162 +#, c-format +msgid "%s* Plaintext cache in %s\n" +msgstr "%s* Klartext-Speicher in %s\n" -#. maps to show_diff -#. diff options -#: ../svn/svn.c:374 ../svnlook/svnlook.c:139 -msgid "use ARG as diff command" -msgstr "PAR als Vergleichsprogramm verwenden" +#: ../svn/import-cmd.c:87 +msgid "Repository URL required when importing" +msgstr "Projektarchiv URL ist beim Import erforderlich" -#: ../svn/svn.c:376 -msgid "override diff-cmd specified in config file" -msgstr "Setzt in den Einstellungen angegebenes »diff-cmd« außer Kraft" +#: ../svn/import-cmd.c:91 +msgid "Too many arguments to import command" +msgstr "Zu viele Parameter für Import Befehl" -#: ../svn/svn.c:378 ../svnlook/svnlook.c:133 -msgid "do not print differences for added files" -msgstr "Keine Unterschiede für hinzugefügte Dateien ausgeben" +#: ../svn/import-cmd.c:107 +#, c-format +msgid "Invalid URL '%s'" +msgstr "Ungültige URL »%s«" -#: ../svn/svn.c:380 ../svnlook/svnlook.c:136 -msgid "do not print differences for deleted files" -msgstr "keine Unterschiede für gelöschte Dateien ausgeben" +#: ../svn/info-cmd.c:210 +#, c-format +msgid "'%s' is not a valid value for --show-item" +msgstr "»%s« ist kein gültiger Wert für --show-item" -#: ../svn/svn.c:382 -msgid "don't diff copied or moved files with their source" -msgstr "Gibt kopierte oder verschobene Dateien nicht als Unterschied zu ihrer Quelle aus" +#: ../svn/info-cmd.c:218 +#, c-format +msgid "'%s' is not a valid value for --show-item; did you mean '%s'?" +msgstr "»%s« ist kein gültiger Wert für --show-item; Meinten Sie »%s«?" -#: ../svn/svn.c:384 -msgid "diff unrelated nodes as delete and add" -msgstr "Gibt nicht verwandte Knoten als Löschungen und Hinzufügung aus" +#: ../svn/info-cmd.c:228 +#, c-format +msgid "'%s' is not a valid value for --show-item; did you mean '%s' or '%s'?" +msgstr "»%s« ist kein gültiger Wert für --show-item; Meinten Sie »%s« oder »%s«?" -#: ../svn/svn.c:385 -msgid "show a summary of the results" -msgstr "Zeige eine Zusammenfassung der Ergebnisse" +#: ../svn/info-cmd.c:239 +#, c-format +msgid "'%s' is not a valid value for --show-item; did you mean '%s', '%s' or '%s'?" +msgstr "»%s« ist kein gültiger Wert für --show-item; Meinten Sie »%s«, »%s« oder »%s«?" -#: ../svn/svn.c:387 -msgid "use git's extended diff format" -msgstr "Erweitertes Format von git verwenden" +# CHECKME: full stop? +#: ../svn/info-cmd.c:260 +msgid "Resource is not under version control." +msgstr "Ressource ist nicht unter Versionskontrolle." -#: ../svn/svn.c:389 ../svnlook/svnlook.c:142 -msgid "ignore properties during the operation" -msgstr "Während des Vorgangs Eigenschaften ignorieren" +#: ../svn/info-cmd.c:436 ../svnadmin/svnadmin.c:2367 +#: ../svnadmin/svnadmin.c:2603 +#, c-format +msgid "Path: %s\n" +msgstr "Pfad: %s\n" -#: ../svn/svn.c:391 ../svnlook/svnlook.c:145 -msgid "show only properties during the operation" -msgstr "Während des Vorgangs nur Eigenschaften anzeigen" +#: ../svn/info-cmd.c:443 +#, c-format +msgid "Name: %s\n" +msgstr "Name: %s\n" -#: ../svn/svn.c:393 -msgid "" -"generate diff suitable for generic third-party\n" -" patch tools; currently the same as\n" -" --show-copies-as-adds --ignore-properties" -msgstr "" -"Erzeugt Unterschiede, die sich für die Verarbeitung durch generische\n" -" Werkzeuge von Drittanbietern eignen; momentan identisch\n" -" mit --show-copies-as-adds --ignore-properties" +#: ../svn/info-cmd.c:447 +#, c-format +msgid "Working Copy Root Path: %s\n" +msgstr "Wurzelpfad der Arbeitskopie: %s\n" -#: ../svn/svn.c:401 -msgid "" -"Allow operation on mixed-revision working copy.\n" -" Use of this option is not recommended!\n" -" Please run 'svn update' instead." -msgstr "" -"Erlaubt Operation auf einer Arbeitskopie mit unterschiedlichen Revisionen.\n" -" Wie Verwendung dieser Option wird nicht empfohlen!\n" -" Führen Sie stattdessen »svn update« aus." +#: ../svn/info-cmd.c:453 +#, c-format +msgid "URL: %s\n" +msgstr "URL: %s\n" -#: ../svn/svn.c:407 -msgid "" -"also operate on externals defined by\n" -" svn:externals properties" -msgstr "" -"Arbeitet auch auf externen Verweisen\n" -" (»svn:externals« Eigenschaften)" +#: ../svn/info-cmd.c:456 +#, c-format +msgid "Relative URL: %s\n" +msgstr "Relative URL: %s\n" -#: ../svn/svn.c:411 -msgid "retrieve target's inherited properties" -msgstr "Geerbte Eigenschaften des Ziels abfragen" +#: ../svn/info-cmd.c:460 +#, c-format +msgid "Repository Root: %s\n" +msgstr "Basis des Projektarchivs: %s\n" -#: ../svn/svn.c:413 -msgid "use ARG as search pattern (glob syntax)" -msgstr "PAR als Suchmuster verwenden (mit Platzhaltern)" +#: ../svn/info-cmd.c:464 +#, c-format +msgid "Repository UUID: %s\n" +msgstr "UUID des Projektarchivs: %s\n" -#: ../svn/svn.c:415 -msgid "combine ARG with the previous search pattern" -msgstr "PAR mit dem vorherigen Suchmuster kombinieren" +#: ../svn/info-cmd.c:468 +#, c-format +msgid "Revision: %ld\n" +msgstr "Revision: %ld\n" -#: ../svn/svn.c:417 -msgid "show revision log message, author and date" -msgstr "Zeigt Logmeldung, Author und Datum der Revision an" +#: ../svn/info-cmd.c:473 +#, c-format +msgid "Node Kind: file\n" +msgstr "Knotentyp: Datei\n" -#: ../svn/svn.c:419 -msgid "remove unversioned items" -msgstr "Entfernt nicht versionierte Objekte" +#: ../svn/info-cmd.c:477 +#, c-format +msgid "Node Kind: directory\n" +msgstr "Knotentyp: Verzeichnis\n" -#: ../svn/svn.c:420 -msgid "remove ignored items" -msgstr "Entfernt ignorierte Objekte" +#: ../svn/info-cmd.c:481 +#, c-format +msgid "Node Kind: none\n" +msgstr "Knotentyp: keiner\n" -#: ../svn/svn.c:421 ../svnlook/svnlook.c:148 ../svnversion/svnversion.c:140 -msgid "do not output the trailing newline" -msgstr "Gibt den anhängenden Zeilenumbruch nicht aus" +#: ../svn/info-cmd.c:486 +#, c-format +msgid "Node Kind: unknown\n" +msgstr "Knotentyp: unbekannt\n" -#: ../svn/svn.c:422 -msgid "show cached passwords" -msgstr "Zeigt gespeicherte Passwörter an" +#: ../svn/info-cmd.c:495 +#, c-format +msgid "Schedule: normal\n" +msgstr "Plan: normal\n" -#: ../svn/svn.c:424 -msgid "" -"pin externals with no explicit revision to their\n" -" current revision (recommended when tagging)" -msgstr "" -"Legt externe Verweise ohne ausgewiesene Revision\n" -" auf aktuelle Revision fest (Empfohlen für Tags)" +#: ../svn/info-cmd.c:499 +#, c-format +msgid "Schedule: add\n" +msgstr "Plan: hinzufügen\n" -#: ../svn/svn.c:428 -msgid "print only the item identified by ARG" -msgstr "Gibt nur das mit PAR angegebene Element aus" +#: ../svn/info-cmd.c:503 +#, c-format +msgid "Schedule: delete\n" +msgstr "Plan: löschen\n" -#: ../svn/svn.c:479 -msgid "" -"Put files and directories under version control, scheduling\n" -"them for addition to repository. They will be added in next commit.\n" -"usage: add PATH...\n" -msgstr "" -"Stellt Dateien und Verzeichnisse unter Versionskontrolle und\n" -"plant sie zur Übertragung ins Projektarchiv ein.\n" -"Das tatsächliche Hinzufügen findet erst beim nächsten Übertragen statt.\n" -"Aufruf: add PFAD...\n" +#: ../svn/info-cmd.c:507 +#, c-format +msgid "Schedule: replace\n" +msgstr "Plan: ersetzen\n" -#: ../svn/svn.c:484 -msgid "add intermediate parents" -msgstr "direkte Eltern hinzufügen" +#: ../svn/info-cmd.c:523 +#, c-format +msgid "Depth: empty\n" +msgstr "Tiefe: »empty«\n" -# Asked ML for clarification. -# Mattern matches AND or OR? -# Case sensitive or case in-sensitive? -# What about fingerprints? -#: ../svn/svn.c:487 -msgid "" -"Manage cached authentication credentials.\n" -"usage: 1. svn auth [PATTERN ...]\n" -"usage: 2. svn auth --remove PATTERN [PATTERN ...]\n" -"\n" -" With no arguments, list all cached authentication credentials.\n" -" Authentication credentials include usernames, passwords,\n" -" SSL certificates, and SSL client-certificate passphrases.\n" -" If PATTERN is specified, only list credentials with attributes matching one\n" -" or more patterns. With the --remove option, remove cached authentication\n" -" credentials matching one or more patterns.\n" -"\n" -" If more than one pattern is specified credentials are considered only they\n" -" match all specified patterns. Patterns are matched case-sensitively and may\n" -" contain glob wildcards:\n" -" ? matches any single character\n" -" * matches a sequence of arbitrary characters\n" -" [abc] matches any of the characters listed inside the brackets\n" -" Note that wildcards will usually need to be quoted or escaped on the\n" -" command line because many command shells will interfere by trying to\n" -" expand them.\n" -msgstr "" -"Verwaltet gespeicherte Zugangsdaten.\n" -"Aufruf: 1. svn auth [MUSTER ...]\n" -"Aufruf: 2. svn auth --remove MUSTER [MUSTER ...]\n" -"\n" -" Listet ohne Argumente alle gespeicherten Zugangsdaten auf.\n" -" Dies beinhaltet Benutzernamen, Passwörter, SSL-Zertifikate\n" -" und Passphrasen für SSL-Client-Zertifikate.\n" -" Gibt mit angegebener MUSTER nur die Zugangsdaten aus, deren\n" -" Attribute mit einem oder mehreren Mustern übereinstimmen.\n" -" Die Option --remove entfernt gespeicherte Zugangsdaten, die\n" -" einem oder mehreren Mustern entsprechen.\n" -"\n" -" Ist mehr als ein Muster angegeben ist, werden nur solche\n" -" Zugangsdaten beachtet, die allen Mustern entsprechen. Muster\n" -" unterscheiden Groß- und Kleinschreibung und können folgende Platz-\n" -" halter enthalten:\n" -" ? entspricht einem einzelnen Zeichen\n" -" * entspricht einer Anzahl von beliebigen Zeichen\n" -" [abc] entspricht einem der Zeichen innerhalb der Klammer\n" -" Platzhalter müssen in den meisten Fällen in der Kommandozeile mit\n" -" Anführungszeichen oder Escape-Zeichen angegeben werden, damit sie\n" -" nicht von der Befehlsumgebung als Dateimuster interpretiert werden.\n" -"\n" +#: ../svn/info-cmd.c:527 +#, c-format +msgid "Depth: files\n" +msgstr "Tiefe: »files«\n" -#: ../svn/svn.c:508 -msgid "remove matching authentication credentials" -msgstr "entfernt passende Zugangsdaten" +#: ../svn/info-cmd.c:531 +#, c-format +msgid "Depth: immediates\n" +msgstr "Tiefe: »immediates«\n" -#: ../svn/svn.c:513 -msgid "" -"Show when each line of a file was last (or\n" -"next) changed.\n" -"usage: blame [-rM:N] TARGET[@REV]...\n" -"\n" -" Annotate each line of a file with the revision number and author of the\n" -" last change (or optionally the next change) to that line.\n" -"\n" -" With no revision range (same as -r0:REV), or with '-r M:N' where M < N,\n" -" annotate each line that is present in revision N of the file, with\n" -" the last revision at or before rN that changed or added the line,\n" -" looking back no further than rM.\n" -"\n" -" With a reverse revision range '-r M:N' where M > N,\n" -" annotate each line that is present in revision N of the file, with\n" -" the next revision after rN that changed or deleted the line,\n" -" looking forward no further than rM.\n" -"\n" -" If specified, REV determines in which revision the target is first\n" -" looked up.\n" -"\n" -" Write the annotated result to standard output.\n" -msgstr "" -"Gibt für jede Zeile einer Datei die letzte (oder\n" -"nächste) Änderung aus.\n" -"Aufruf: blame [-rM:N] ZIEL[@REV]...\n" -"\n" -" Kommentiert jede Zeile einer Datei mit Revisionsnummer und Autor der\n" -" letzten Änderung (optional der nächsten Änderung) dieser Zeile.\n" -"\n" -" Kommentiert ohne angegebenen Revisionsbereich (dann wie -r0:REV),\n" -" oder mit »-r M:N« mit M < N, jede in Revision N vorhandene Zeile der Datei\n" -" mit der letzten Revision rN oder davor die diese Zeile änderte oder hinzufügte,\n" -" und blick dabei nicht weiter als rM zurück.\n" -"\n" -" Kommentiert mit einem umgekehrten Revisionsbereich »-rM:N« mit M > N,\n" -" jede in Revision N vorhandene Zeile der Datei mit der nächsten Revision nach rN\n" -" die diese Zeile ändert oder entfernt, und blick dabei nicht weiter als rM.\n" -"\n" -" Falls angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut wird.\n" -"\n" -" Gibt das kommentierte Ergebnis auf der Standardausgabe aus.\n" +#: ../svn/info-cmd.c:535 +#, c-format +msgid "Depth: exclude\n" +msgstr "Tiefe: »exclude«\n" -#: ../svn/svn.c:537 -msgid "" -"Output the content of specified files or URLs.\n" -"usage: cat TARGET[@REV]...\n" -"\n" -" If specified, REV determines in which revision the target is first\n" -" looked up.\n" -msgstr "" -"Gibt den Inhalt der angegebenen Dateien oder URLs aus.\n" -"Aufruf: cat ZIEL[@REV]...\n" -"\n" -" Falls angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut wird.\n" +#. Other depths should never happen here. +#: ../svn/info-cmd.c:546 +#, c-format +msgid "Depth: INVALID\n" +msgstr "Tiefe: UNGÜLTIG\n" -#: ../svn/svn.c:545 -msgid "" -"Associate (or dissociate) changelist CLNAME with the named files.\n" -"usage: 1. changelist CLNAME PATH...\n" -" 2. changelist --remove PATH...\n" -msgstr "" -"Verknüpft Änderungsliste CLNAME (oder löst diese Verknüpfung)\n" -"mit den angegebenen Dateien.\n" -"Aufruf: 1. changelist CLNAME PFAD...\n" -" 2. changelist --remove PFAD...\n" +#: ../svn/info-cmd.c:550 +#, c-format +msgid "Copied From URL: %s\n" +msgstr "Kopiert von URL: %s\n" -#: ../svn/svn.c:551 -msgid "" -"Check out a working copy from a repository.\n" -"usage: checkout URL[@REV]... [PATH]\n" -"\n" -" If specified, REV determines in which revision the URL is first\n" -" looked up.\n" -"\n" -" If PATH is omitted, the basename of the URL will be used as\n" -" the destination. If multiple URLs are given each will be checked\n" -" out into a sub-directory of PATH, with the name of the sub-directory\n" -" being the basename of the URL.\n" -"\n" -" If --force is used, unversioned obstructing paths in the working\n" -" copy destination do not automatically cause the check out to fail.\n" -" If the obstructing path is the same type (file or directory) as the\n" -" corresponding path in the repository it becomes versioned but its\n" -" contents are left 'as-is' in the working copy. This means that an\n" -" obstructing directory's unversioned children may also obstruct and\n" -" become versioned. For files, any content differences between the\n" -" obstruction and the repository are treated like a local modification\n" -" to the working copy. All properties from the repository are applied\n" -" to the obstructing path.\n" -"\n" -" See also 'svn help update' for a list of possible characters\n" -" reporting the action taken.\n" -msgstr "" -"Checkt eine Arbeitskopie aus einem Projektarchiv aus.\n" -"Aufruf: checkout URL[@REV]... [PFAD]\n" -"\n" -" Falls angegeben, legt REV fest, in welcher Revision die URL zuerst\n" -" nachgeschlagen wird.\n" -"\n" -" Ohne Angabe von PFAD wird der Basisname der URL als Ziel verwendet.\n" -" Sind mehrere URLs angegeben, wird jede in ein Unterverzeichnis von\n" -" PFAD ausgecheckt, dessen Name der Basisname der URL ist.\n" -"\n" -" Bei Angabe von --force lassen nicht versionierte, behindernde Objekte\n" -" in der Arbeitskopie den Vorgang nicht automatisch fehlschlagen. Falls\n" -" der behindernde Pfad vom gleichen Typ (Datei oder Verzeichnis) wie der\n" -" entsprechende Pfad im Projektarchiv ist, wird er versioniert, behält\n" -" aber seinen ursprünglichen Inhalt. Das bedeutet, dass nicht versionierte\n" -" Unterverzeichnisse eines behindernden Verzeichnisses ebenfalls versioniert\n" -" werden können. Bei Dateien werden alle Unterschiede im Inhalt wie lokale\n" -" Modifikationen in der Arbeitskopie behandelt. Sämtliche Eigenschaften\n" -" aus dem Projektarchiv werden auf den behindernden Pfad angewendet.\n" -"\n" -" Siehe auch »svn help update« für eine Liste möglicher Buchstaben,\n" -" die die durchgeführte Aktion beschreiben.\n" +#: ../svn/info-cmd.c:554 +#, c-format +msgid "Copied From Rev: %ld\n" +msgstr "Kopiert von Rev: %ld\n" -#: ../svn/svn.c:578 -msgid "" -"Recursively clean up the working copy, removing write locks, resuming\n" -"unfinished operations, etc.\n" -"usage: cleanup [WCPATH...]\n" -"\n" -" By default, finish any unfinished business in the working copy at WCPATH,\n" -" and remove write locks (shown as 'L' by the 'svn status' command) from\n" -" the working copy. Usually, this is only necessary if a Subversion client\n" -" has crashed while using the working copy, leaving it in an unusable state.\n" -"\n" -" WARNING: There is no mechanism that will protect write locks still\n" -" being used by other Subversion clients. Running this command\n" -" while another client is using the working copy can corrupt\n" -" the working copy beyond repair!\n" -"\n" -" If the --remove-unversioned option or the --remove-ignored option\n" -" is given, remove any unversioned or ignored items within WCPATH.\n" -" To prevent accidental working copy corruption, unversioned or ignored\n" -" items can only be removed if the working copy is not already locked\n" -" for writing by another Subversion client.\n" -" Note that the 'svn status' command shows unversioned items as '?',\n" -" and ignored items as 'I' if the --no-ignore option is given to it.\n" -msgstr "" -"Räumt eine Arbeitskopie rekursiv auf, entfernt Schreibsperren, führt nicht\n" -"beendete Operationen zu Ende usw.\n" -"Aufruf: cleanup [AKPFAD...]\n" -"\n" -" Ohne weitere Parameter führt der Aufruf unterbrochene Operationen in\n" -" AKPFAD zu Ende und entfernt Schreibsperren (mit »L« in »svn status«\n" -" angezeigt). Dies ist allgemein nur notwendig, nachdem ein Subversion-\n" -" Client abgestürzt ist, während dieser auf die Arbeitskopie zugriff, und so\n" -" die Arbeitskopie in einem nicht verwendbaren Zustand hinterließ.\n" -"\n" -" WARNUNG: Es gibt keinen Mechanismus, der noch verwendete Schreib-\n" -" sperren anderer Subversion-Clients schützt. Die Ausführung dieses\n" -" Kommandos während des Zugriffs eines anderen Clients auf die\n" -" Arbeitskopie kann diese irreparabel beschädigen!\n" -"\n" -" Wenn die Optionen --remove-unversioned oder --remove-ignored gegeben\n" -" sind, werden nicht versionierte bzw. ignorierte Objekte in AKPFAD entfernt.\n" -" Um unbeabsichtigte Beschädigungen der Arbeitskopie zu vermeiden,\n" -" können nicht versionierte bzw. ignorierte Objekte nur entfernt werden, wenn\n" -" die Arbeitskopie nicht schon von einem anderen Subversion-Client zum\n" -" Schreiben gesperrt wurde.\n" -" »svn status« zeigt nicht versionierte Objekte als »?« an, sowie ignorierte\n" -" Objekte mit »I«, wenn die Option --no-ignore verwendet wird.\n" +#: ../svn/info-cmd.c:557 +#, c-format +msgid "Moved From: %s\n" +msgstr "Verschoben von: %s\n" -#: ../svn/svn.c:603 -msgid "" -"Send changes from your working copy to the repository.\n" -"usage: commit [PATH...]\n" -"\n" -" A log message must be provided, but it can be empty. If it is not\n" -" given by a --message or --file option, an editor will be started.\n" -" If any targets are (or contain) locked items, those will be\n" -" unlocked after a successful commit.\n" -"\n" -" If --include-externals is given, also commit file and directory\n" -" externals reached by recursion. Do not commit externals with a\n" -" fixed revision.\n" -msgstr "" -"Überträgt Änderungen Ihrer Arbeitskopie ins Projektarchiv.\n" -"Aufruf: commit [PFAD...]\n" -"\n" -" Eine Logmeldung muss angegeben werden; diese kann jedoch leer sein.\n" -" Wird sie nicht mittels einer --message- oder --file-Option übergeben, wird\n" -" ein Editor gestartet.\n" -" Falls Objekte gesperrt sind oder gesperrte Objekte enthalten, werden diese\n" -" nach einer erfolgreichen Übertragung entsperrt.\n" -"\n" -" Wenn --include-externals angegeben wird, werden auch Dateien und\n" -" Verzeichnisse in externen Verweisen übertragen, die durch Rekursion\n" -" erreicht werden. Übertragen Sie keine externen Verweise mit einer\n" -" festgelegten Revision.\n" +#: ../svn/info-cmd.c:564 +#, c-format +msgid "Moved To: %s\n" +msgstr "Verschoben nach: %s\n" -#: ../svn/svn.c:618 -msgid "" -"Copy files and directories in a working copy or repository.\n" -"usage: copy SRC[@REV]... DST\n" -"\n" -" SRC and DST can each be either a working copy (WC) path or URL:\n" -" WC -> WC: copy and schedule for addition (with history)\n" -" WC -> URL: immediately commit a copy of WC to URL\n" -" URL -> WC: check out URL into WC, schedule for addition\n" -" URL -> URL: complete server-side copy; used to branch and tag\n" -" All the SRCs must be of the same type. When copying multiple sources,\n" -" they will be added as children of DST, which must be a directory.\n" -"\n" -" WARNING: For compatibility with previous versions of Subversion,\n" -" copies performed using two working copy paths (WC -> WC) will not\n" -" contact the repository. As such, they may not, by default, be able\n" -" to propagate merge tracking information from the source of the copy\n" -" to the destination.\n" -msgstr "" -"Kopiert Dateien und Verzeichnisse in einer Arbeitskopie oder im einem Projektarchiv\n" -"Aufruf: copy QUELLE[@REV]... ZIEL\n" -"\n" -" QUELLE und ZIEL können jeweils entweder ein Arbeitskopiepfad (AK) oder eine\n" -" URL sein:\n" -" AK -> AK: Kopieren und zum Hinzufügen einplanen (inklusive Historie)\n" -" AK -> URL: Sofort eine Kopie von AK zur URL übertragen\n" -" URL -> AK: Eine Kopie von URL nach AK auschecken und zum Hinzufügen\n" -" einplanen\n" -" URL -> URL: Kopie vollständig auf dem Server. Wird zum Verzweigen\n" -" und Markieren (branch & tag) verwendet.\n" -" Alle QUELLEn müssen vom selben Typ sein. Werden mehrere Quellen kopiert,\n" -" werden sie als Kindelemente von ZIEL hinzugefügt, welches dann ein\n" -" Verzeichnis sein muss.\n" -"\n" -" WARNUNG: Für Kompatibilität mit älteren Versionen von Subversion,\n" -" werden Kopien, die über zwei Arbeitskopiepfade (WC -> WC) vorgenommen\n" -" wurden, nicht das Projektarchiv kontaktieren. Deswegen könnten sie\n" -" standardmäßig nicht in der Lage sein, Zusammenführungsinformationen\n" -" von der Quelle der Kopie in das Ziel weiterzureichen.\n" +#: ../svn/info-cmd.c:572 +#, c-format +msgid "Last Changed Author: %s\n" +msgstr "Letzter Autor: %s\n" -#: ../svn/svn.c:638 -msgid "" -"Remove files and directories from version control.\n" -"usage: 1. delete PATH...\n" -" 2. delete URL...\n" -"\n" -" 1. Each item specified by a PATH is scheduled for deletion upon\n" -" the next commit. Files, and directories that have not been\n" -" committed, are immediately removed from the working copy\n" -" unless the --keep-local option is given.\n" -" PATHs that are, or contain, unversioned or modified items will\n" -" not be removed unless the --force or --keep-local option is given.\n" -"\n" -" 2. Each item specified by a URL is deleted from the repository\n" -" via an immediate commit.\n" -msgstr "" -"Entfernt Dateien und Verzeichnisse aus der Versionskontrolle.\n" -"Aufruf: 1. delete PFAD...\n" -" 2. delete URL...\n" -"\n" -" 1. Jeder PFAD wird zum Löschen bei der nächsten Übertragung\n" -" markiert. Dateien und Verzeichnisse, die noch nicht übertragen\n" -" wurden, werden sofort aus der Arbeitskopie entfernt, es sei denn,\n" -" die Option --keep-local wurde angegeben.\n" -" PFAD(e), die nicht versioniert oder geändert sind, bzw.\n" -" entsprechende Einträge enthalten, werden nur gelöscht, wenn\n" -" die Optionen --force oder --keep-local angegeben wird.\n" -"\n" -" 2. Jedes mit einer URL angegebene Element wird mittels sofortiger\n" -" Übertragung aus dem Projektarchiv entfernt.\n" +#: ../svn/info-cmd.c:576 +#, c-format +msgid "Last Changed Rev: %ld\n" +msgstr "Letzte geänderte Rev: %ld\n" -#: ../svn/svn.c:654 +#: ../svn/info-cmd.c:581 +msgid "Last Changed Date" +msgstr "Letztes Änderungsdatum" + +#: ../svn/info-cmd.c:587 +msgid "Text Last Updated" +msgstr "Text zuletzt geändert" + +#: ../svn/info-cmd.c:590 +#, c-format +msgid "Checksum: %s\n" +msgstr "Prüfsumme: %s\n" + +#: ../svn/info-cmd.c:624 +#, c-format +msgid "Conflict Previous Base File: %s\n" +msgstr "Konflikt: vorherige Ausgangsdatei: %s\n" + +#: ../svn/info-cmd.c:632 +#, c-format +msgid "Conflict Previous Working File: %s\n" +msgstr "Konflikt: vorherige Arbeitsdatei: %s\n" + +#: ../svn/info-cmd.c:640 +#, c-format +msgid "Conflict Current Base File: %s\n" +msgstr "Konflikt: aktuelle Ausgangsdatei: %s\n" + +#: ../svn/info-cmd.c:676 +msgid "Tree conflict" +msgstr "Baumkonflikt" + +# TODO: leicht inkonsistent zu obigen Strings (tritt in svn info-Ausgabe auf) +#: ../svn/info-cmd.c:680 +#, fuzzy, c-format +msgid "Conflicted Properties: %s\n" +msgstr "Konfliktdatei mit Eigenschaften: %s\n" + +#: ../svn/info-cmd.c:706 +msgid "Conflict Details" +msgstr "Konfliktdetails" + +#: ../svn/info-cmd.c:727 +msgid "Source left" +msgstr "Quelle links" + +#: ../svn/info-cmd.c:736 +msgid "Source right" +msgstr "Quelle rechts" + +#: ../svn/info-cmd.c:745 +#, c-format +msgid "Lock Token: %s\n" +msgstr "Sperrmarke: %s\n" + +#: ../svn/info-cmd.c:749 +#, c-format +msgid "Lock Owner: %s\n" +msgstr "Sperreigner: %s\n" + +#: ../svn/info-cmd.c:754 +msgid "Lock Created" +msgstr "Sperre erzeugt" + +#: ../svn/info-cmd.c:758 +msgid "Lock Expires" +msgstr "Sperre läuft ab" + +#: ../svn/info-cmd.c:766 +#, c-format msgid "" -"Display local changes or differences between two revisions or paths.\n" -"usage: 1. diff\n" -" 2. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n" -" 3. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] \\\n" -" [PATH...]\n" -" 4. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n" -" 5. diff OLD-URL[@OLDREV] NEW-PATH[@NEWREV]\n" -" 6. diff OLD-PATH[@OLDREV] NEW-URL[@NEWREV]\n" -"\n" -" 1. Use just 'svn diff' to display local modifications in a working copy.\n" -"\n" -" 2. Display the changes made to TARGETs as they are seen in REV between\n" -" two revisions. TARGETs may be all working copy paths or all URLs.\n" -" If TARGETs are working copy paths, N defaults to BASE and M to the\n" -" working copy; if URLs, N must be specified and M defaults to HEAD.\n" -" The '-c M' option is equivalent to '-r N:M' where N = M-1.\n" -" Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n" -"\n" -" 3. Display the differences between OLD-TGT as it was seen in OLDREV and\n" -" NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n" -" OLD-TGT and NEW-TGT and restrict the output to differences for those\n" -" paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV].\n" -" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV default\n" -" to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n" -" If OLDREV or NEWREV are not specified, they default to WORKING for\n" -" working copy targets and to HEAD for URL targets.\n" -"\n" -" Either or both OLD-TGT and NEW-TGT may also be paths to unversioned\n" -" targets. Revisions cannot be specified for unversioned targets.\n" -" Both targets must be of the same node kind (file or directory).\n" -" Diffing unversioned targets against URL targets is not supported.\n" -"\n" -" 4. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n" -" 5. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-PATH[@NEWREV]'\n" -" 6. Shorthand for 'svn diff --old=OLD-PATH[@OLDREV] --new=NEW-URL[@NEWREV]'\n" -msgstr "" -"Zeigt lokale Änderungen oder Unterschiede zwischen zwei Revisionen oder Pfaden an.\n" -"Aufruf: 1. diff\n" -" 2. diff [-c M | -r N[:M]] [ZIEL[@REV]...]\n" -" 3. diff [-r N[:M]] --old=ZIEL-ALT[@REVALT] [--new=ZIEL-NEU[@NEWREV]] \\\n" -" [PFAD...]\n" -" 4. diff URL-ALT[@REVALT] URL-NEU[@REVNEU]\n" -" 5. diff URL-ALT[@REVALT] NEW-PATH[@REVNEU]\n" -" 6. diff PFAD-ALT[@REVALT] URL-NEU[@REVNEU]\n" -"\n" -" 1. Verwenden Sie nur »svn diff«, um lokale Änderungen einer Arbeitskopie anzuzeigen.\n" -"\n" -" 2. Zeigt die Änderungen an ZIELen, wie sie in REV zwischen zwei Revisionen\n" -" sichtbar sind. ZIELe können alle Arbeitskopien oder URLs sein.\n" -"\n" -" Falls ZIELe Arbeitskopiepfade sind, wird standardmäßig BASE für N und\n" -" die Version der Arbeitskopie für M verwendet; bei URLs muss N angegeben\n" -" werden und M entspricht HEAD.\n" -" Die Option »-c M« ist äquivalent zu »-r N:M«, wobei N = M-1 gilt.\n" -" Die Verwendung von »-c -M« macht es andersherum: »-r M:N« mit N = M-1.\n" -"\n" -" 3. Zeigt die Unterschiede zwischen ZIEL-ALT in REVALT und ZIEL-NEU in REVNEU.\n" -" Wenn PFADe angegeben werden, sind diese relativ zu ZIEL-ALT und ZIEL-NEU,\n" -" und die Ausgabe ist auf Unterschiede zwischen diesen Pfaden beschränkt.\n" -" ZIEL-ALT und ZIEL-NEU können Pfade der Arbeitskopie oder der Art URL[@REV]\n" -" sein. ZIEL-NEU entspricht ZIEL-ALT, falls es nicht angegeben wurde.\n" -" -r N setzt REVALT auf N, -r N:M setzt REVALT auf N und REVNEU auf M.\n" -" Wenn REVALT oder REVNEU nicht angegeben sind, wird für Ziele in Arbeitskopien\n" -" »WORKING« und für solche in ULRs »HEAD« angenommen.\n" -"\n" -" ZIEL-ALT, ZIEL-NEU oder beide dürfen auch Pfade von nicht versionieren Zielen sein.\n" -" Revisionen können aber für solche Ziele nicht angegeben werden. Beide Ziele\n" -" müssen vom selben Knotentyp sein (Datei bzw. Verzeichnis). Die Anzeige von\n" -" Unterschieden zwischen nicht versionierten Zielen und URL-Zielen wird nicht\n" -" unterstützt.\n" -"\n" -" 4. Kurzform für »svn diff --old=URL-ALT[@REVALT] --new=URL-NEU[@REVNEU]«\n" -" 5. Kurzform für »svn diff --old=URL-ALT[@REVALT] --new=URL-NEU[@REVNEU]«\n" -" 6. Kurzform für »svn diff --old=URL-ALT[@REVALT] --new=URL-NEU[@REVNEU]«\n" - -#: ../svn/svn.c:695 -msgid "" -"Create an unversioned copy of a tree.\n" -"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n" -" 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n" -"\n" -" 1. Exports a clean directory tree from the repository specified by\n" -" URL, at revision REV if it is given, otherwise at HEAD, into\n" -" PATH. If PATH is omitted, the last component of the URL is used\n" -" for the local directory name.\n" -"\n" -" 2. Exports a clean directory tree from the working copy specified by\n" -" PATH1, at revision REV if it is given, otherwise at WORKING, into\n" -" PATH2. If PATH2 is omitted, the last component of the PATH1 is used\n" -" for the local directory name. If REV is not specified, all local\n" -" changes will be preserved. Files not under version control will\n" -" not be copied.\n" -"\n" -" If specified, PEGREV determines in which revision the target is first\n" -" looked up.\n" -msgstr "" -"Erzeugt eine nicht versionierte Kopie eines Dateibaumes.\n" -"Aufruf: 1. export [-r REV] URL[@PEGREV] [PFAD]\n" -" 2. export [-r REV] PFAD1[@PEGREV] [PFAD2]\n" -"\n" -" 1. Exportiert einen sauberen Verzeichnisbaum, der durch die URL\n" -" spezifiziert ist, aus dem Projektarchiv nach PFAD. Ohne Angabe von REV\n" -" wird HEAD exportiert, sonst REV. Ohne Angabe von PFAD wird der letzte\n" -" Abschnitt der URL als lokaler Verzeichnisname verwendet.\n" -"\n" -" 2. Exportiert einen sauberen Verzeichnisbaum aus PFAD1 heraus in das\n" -" Verzeichnis PFAD2. Ohne Angabe von REV wird WORKING exportiert,\n" -" sonst REV. Ohne Angabe von PFAD2 wird der letzte Abschnitt von PFAD1\n" -" als lokaler Verzeichnisname verwendet. Ohne Angabe von REV werden alle\n" -" lokalen Änderungen beibehalten. Objekte, die sich nicht unter\n" -" Versionskontrolle befinden, werden nicht kopiert.\n" -"\n" -" PEGREV gibt an, in welcher Revision das Ziel zuerst gesucht wird.\n" +"Lock Comment (%i line):\n" +"%s\n" +msgid_plural "" +"Lock Comment (%i lines):\n" +"%s\n" +msgstr[0] "" +"Sperrkommentar (%i Zeile):\n" +"%s\n" +msgstr[1] "" +"Sperrkommentar (%i Zeilen):\n" +"%s\n" -#: ../svn/svn.c:717 ../svnbench/svnbench.c:217 -msgid "" -"Describe the usage of this program or its subcommands.\n" -"usage: help [SUBCOMMAND...]\n" -msgstr "" -"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n" -"Aufruf: help [UNTERBEFEHL...]\n" +#: ../svn/info-cmd.c:775 +#, c-format +msgid "Changelist: %s\n" +msgstr "Änderungsliste: %s\n" -#: ../svn/svn.c:723 -msgid "" -"Commit an unversioned file or tree into the repository.\n" -"usage: import [PATH] URL\n" -"\n" -" Recursively commit a copy of PATH to URL.\n" -" If PATH is omitted '.' is assumed.\n" -" Parent directories are created as necessary in the repository.\n" -" If PATH is a directory, the contents of the directory are added\n" -" directly under URL.\n" -" Unversionable items such as device files and pipes are ignored\n" -" if --force is specified.\n" -msgstr "" -"Überträgt eine nicht versionierte Datei oder einen Dateibaum in das\n" -"Projektarchiv.\n" -"Aufruf: import [PFAD] URL\n" -"\n" -" Überträgt rekursiv eine Kopie des PFADes zur URL.\n" -" Ohne Angabe von PFAD wird ».« angenommen. Übergeordnete Verzeichnisse\n" -" werden soweit erforderlich im Projektarchiv angelegt.\n" -" Falls PFAD ein Verzeichnis ist, wird dessen Inhalt direkt unterhalb der URL\n" -" hinzugefügt.\n" -" Nichtversionierbare Elemente wie Gerätedateien und Pipes werden ignoriert,\n" -" falls --force angegeben wird.\n" +#: ../svn/info-cmd.c:933 +msgid "--show-item is not valid in --xml mode" +msgstr "Die Option »--show-item« ist im Modus »--xml« nicht gültig" -#: ../svn/svn.c:737 -msgid "" -"Display information about a local or remote item.\n" -"usage: info [TARGET[@REV]...]\n" -"\n" -" Print information about each TARGET (default: '.').\n" -" TARGET may be either a working-copy path or URL. If specified, REV\n" -" determines in which revision the target is first looked up.\n" -"\n" -" With --show-item, print only the value of one item of information\n" -" about TARGET. One of the following items can be selected:\n" -" kind the kind of TARGET\n" -" url the URL of TARGET in the repository\n" -" relative-url the repository-relative URL\n" -" repos-root-url the repository root URL\n" -" repos-uuid the repository UUID\n" -" revision the revision of TARGET (defaults to BASE\n" -" for working copy paths and HEAD for URLs)\n" -" last-changed-revision the most recent revision in which TARGET\n" -" was changed\n" -" last-changed-date the date of the last-changed revision\n" -" last-changed-author the author of the last-changed revision\n" -" wc-root the root of TARGET's working copy" -msgstr "" -"Gibt Informationen über ein lokales oder entferntes Element aus.\n" -"Aufruf: info [ZIEL[@REV]...]\n" -"\n" -" Gibt Informationen über jedes ZIEL aus (Vorgabe: ».«).\n" -" ZIEL kann entweder ein Pfad in einer Arbeitskopie oder eine URL sein. Falls\n" -" angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut wird.\n" -"\n" -" Gibt mit »--show-item« nur den Wert eines Informationsfeldes von ZIEL aus.\n" -" Eines dieser Felder kann gewählt werden:\n" -" kind Art des ZIELs\n" -" url URL des ZIELs im Projektarchiv\n" -" relative-url URL relativ zum Projektarchiv\n" -" repos-root-url Wurzel-URL des Projektarchivs\n" -" repos-uuid UUID des Projektarchivs\n" -" revision Die Revision von ZIEL (Immer BASE für\n" -" Pfade in der Arbeitskopie und HEAD für eine URL)\n" -" last-changed-revision Letzte Revision in der ZIEL geändert wurde\n" -" last-changed-date Datum der Revision mit der letzten Änderung\n" -" last-changed-author Autor der Revision mit der letzten Änderung\n" -" wc-root Wurzel der Arbeitskopie, die ZIEL enthält" +#: ../svn/info-cmd.c:937 +msgid "--no-newline is not valid in --xml mode" +msgstr "Die Option »--no-newline« ist im Modus »--xml« nicht gültig" -# FIXME: "looked up" ist überall leicht unterschiedlich übersetzt -# Ich (Jens) bevorzuge "gesucht" statt "nachgeschlagen" oder "durchsucht", "nachgeschaut" -# FIXME: Standardsätze sollten eigene msgid haben! -#: ../svn/svn.c:763 -msgid "" -"List directory entries in the repository.\n" -"usage: list [TARGET[@REV]...]\n" -"\n" -" List each TARGET file and the contents of each TARGET directory as\n" -" they exist in the repository. If TARGET is a working copy path, the\n" -" corresponding repository URL will be used. If specified, REV determines\n" -" in which revision the target is first looked up.\n" -"\n" -" The default TARGET is '.', meaning the repository URL of the current\n" -" working directory.\n" -"\n" -" With --verbose, the following fields will be shown for each item:\n" -"\n" -" Revision number of the last commit\n" -" Author of the last commit\n" -" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n" -" Size (in bytes)\n" -" Date and time of the last commit\n" -msgstr "" -"Zeigt Verzeichniseinträge im Projektarchiv.\n" -"Aufruf: list [ZIEL[@REV]...]\n" -"\n" -" Listet jede ZIEL-Datei und die Inhalte jedes ZIEL-Verzeichnisses, wie\n" -" sie im Projektarchiv existieren, auf. Wenn ZIEL ein Arbeitskopiepfad ist,\n" -" wird die entsprechende URL des Projektarchivs verwendet. REV bestimmt,\n" -" in welcher Revision zuerst nachgeschaut wird.\n" -"\n" -" Die Vorgabe für ZIEL ist ».«, d.h. die URL vom Projektarchiv des\n" -" aktuellen Verzeichnisses.\n" -"\n" -" Mit »--verbose« werden die folgenden Felder pro Objekt angezeigt:\n" -"\n" -" Revisionsnummer der letzten Übertragung\n" -" Autor der letzten Übertragung\n" -" Falls gesperrt, der Buchstabe »O« (»svn info URL« für Details)\n" -" Größe (in Bytes)\n" -" Datum und Zeit der letzten Übertragung\n" +#: ../svn/info-cmd.c:952 ../svn/info-cmd.c:972 +msgid "--incremental is only valid in --xml mode" +msgstr "Die Option »--incremental« ist nur Modus »--xml« gültig" -#: ../svn/svn.c:785 -msgid "" -"Lock working copy paths or URLs in the repository, so that\n" -"no other user can commit changes to them.\n" -"usage: lock TARGET...\n" -"\n" -" Use --force to steal the lock from another user or working copy.\n" -msgstr "" -"Sperrt Arbeitskopiepfade oder URLs im Projektarchiv, so dass kein\n" -"anderer Anwender Änderungen an ihnen übertragen kann.\n" -"Aufruf: lock ZIEL...\n" -"\n" -" Benutze --force, um eine bereits vorhandene Sperre zu stehlen.\n" +#: ../svn/info-cmd.c:959 +msgid "--no-newline is only available for single-target, non-recursive info operations" +msgstr "Die Option »--no-newline« ist nur für einzelne Ziele und nicht-rekursive Info-Operationen verfügbar" -#: ../svn/svn.c:791 -msgid "read lock comment from file ARG" -msgstr "Sperrkommentar aus Datei PAR lesen" +#: ../svn/info-cmd.c:976 +msgid "--no-newline' is only valid with --show-item" +msgstr "Die Option »--no-newline« ist nur mit »--show-item« gültig" -#: ../svn/svn.c:792 -msgid "specify lock comment ARG" -msgstr "PAR als Sperrkommentar verwenden" +#: ../svn/info-cmd.c:1049 ../svnbench/null-info-cmd.c:283 +msgid "Could not display info for all targets because some targets don't exist" +msgstr "Konnte Information nicht für alle Ziele anzeigen, da einige Ziele nicht existieren" -#: ../svn/svn.c:793 -msgid "force validity of lock comment source" +#: ../svn/list-cmd.c:79 +msgid "%b %d %H:%M" +msgstr "%d. %b %H:%M" + +#: ../svn/list-cmd.c:81 +msgid "%b %d %Y" +msgstr "%d. %b %Y" + +# Currently this is used for checkouts and switches too. If we +# want different output, we'll have to add new actions. +#: ../svn/list-cmd.c:107 +#, c-format +msgid "Listing external '%s' defined on '%s':\n" +msgstr "Auflistung des externen Verweises »%s« definiert auf »%s«:\n" + +#: ../svn/list-cmd.c:393 ../svnbench/null-list-cmd.c:148 +#, fuzzy +msgid "'search-and' option is not supported" +msgstr "Die angegebene Vergleichsoption wird nicht unterstützt" + +#: ../svn/list-cmd.c:460 ../svnbench/null-list-cmd.c:193 +msgid "Could not list all targets because some targets don't exist" +msgstr "Konnte nicht alle Ziele auflisten, da einige Ziele nicht existieren" + +#: ../svn/lock-cmd.c:58 +msgid "Lock comment contains a zero byte" +msgstr "Sperrkommentar enthält ein Null-Byte" + +#: ../svn/lock-cmd.c:144 +msgid "One or more locks could not be obtained" msgstr "" -"Gültigkeit der Quelle für die Sperrmeldung\n" -" erzwingen" -#: ../svn/svn.c:796 -msgid "" -"Show the log messages for a set of revision(s) and/or path(s).\n" -"usage: 1. log [PATH][@REV]\n" -" 2. log URL[@REV] [PATH...]\n" -"\n" -" 1. Print the log messages for the URL corresponding to PATH\n" -" (default: '.'). If specified, REV is the revision in which the\n" -" URL is first looked up, and the default revision range is REV:1.\n" -" If REV is not specified, the default revision range is BASE:1,\n" -" since the URL might not exist in the HEAD revision.\n" -"\n" -" 2. Print the log messages for the PATHs (default: '.') under URL.\n" -" If specified, REV is the revision in which the URL is first\n" -" looked up, and the default revision range is REV:1; otherwise,\n" -" the URL is looked up in HEAD, and the default revision range is\n" -" HEAD:1.\n" -"\n" -" Multiple '-c' or '-r' options may be specified (but not a\n" -" combination of '-c' and '-r' options), and mixing of forward and\n" -" reverse ranges is allowed.\n" -"\n" -" With -v, also print all affected paths with each log message.\n" -" With -q, don't print the log message body itself (note that this is\n" -" compatible with -v).\n" -"\n" -" Each log message is printed just once, even if more than one of the\n" -" affected paths for that revision were explicitly requested. Logs\n" -" follow copy history by default. Use --stop-on-copy to disable this\n" -" behavior, which can be useful for determining branchpoints.\n" -"\n" -" The --depth option is only valid in combination with the --diff option\n" -" and limits the scope of the displayed diff to the specified depth.\n" -"\n" -" If the --search option is used, log messages are displayed only if the\n" -" provided search pattern matches any of the author, date, log message\n" -" text (unless --quiet is used), or, if the --verbose option is also\n" -" provided, a changed path.\n" -" The search pattern may include \"glob syntax\" wildcards:\n" -" ? matches any single character\n" -" * matches a sequence of arbitrary characters\n" -" [abc] matches any of the characters listed inside the brackets\n" -" If multiple --search options are provided, a log message is shown if\n" -" it matches any of the provided search patterns. If the --search-and\n" -" option is used, that option's argument is combined with the pattern\n" -" from the previous --search or --search-and option, and a log message\n" -" is shown only if it matches the combined search pattern.\n" -" If --limit is used in combination with --search, --limit restricts the\n" -" number of log messages searched, rather than restricting the output\n" -" to a particular number of matching log messages.\n" -"\n" -" Examples:\n" -"\n" -" Show the latest 5 log messages for the current working copy\n" -" directory and display paths changed in each commit:\n" -" svn log -l 5 -v\n" -"\n" -" Show the log for bar.c as of revision 42:\n" -" svn log bar.c@42\n" -"\n" -" Show log messages and diffs for each commit to foo.c:\n" +#: ../svn/log-cmd.c:111 ../svn/svn.c:1129 ../svn/svn.c:1201 ../svn/svn.c:1267 +msgid "\n" +msgstr "\n" + +#: ../svn/log-cmd.c:341 +msgid "(no author)" +msgstr "(kein Autor)" + +#: ../svn/log-cmd.c:347 +msgid "(no date)" +msgstr "(kein Datum)" + +#: ../svn/log-cmd.c:377 +#, c-format +msgid " | %d line" +msgid_plural " | %d lines" +msgstr[0] " | %d Zeile" +msgstr[1] " | %d Zeilen" + +#: ../svn/log-cmd.c:394 +#, c-format +msgid "Changed paths:\n" +msgstr "Geänderte Pfade:\n" + +#: ../svn/log-cmd.c:414 +#, c-format +msgid " (from %s:%ld)" +msgstr " (von %s:%ld)" + +#: ../svn/log-cmd.c:432 +#, c-format +msgid "Reverse merged via:" +msgstr "Rückwärtig zusammengeführt mittels:" + +#: ../svn/log-cmd.c:434 +#, c-format +msgid "Merged via:" +msgstr "Zusammengeführt mittels:" + +#: ../svn/log-cmd.c:717 +msgid "'with-all-revprops' option only valid in XML mode" +msgstr "Option »with-all-revprops« ist nur im XML-Modus gültig" + +#: ../svn/log-cmd.c:721 +msgid "'with-no-revprops' option only valid in XML mode" +msgstr "Option »with-no-revprops« ist nur im XML-Modus gültig" + +# TODO: combine +# CHECKME: s/with-revprop/with-revprops/ ??? +#: ../svn/log-cmd.c:725 +msgid "'with-revprop' option only valid in XML mode" +msgstr "Option »with-revprop« ist nur im XML-Modus gültig" + +#: ../svn/log-cmd.c:732 +msgid "'diff' option is not supported in XML mode" +msgstr "Option »diff« wird im XML-Modus nicht unterstützt" + +#: ../svn/log-cmd.c:738 +msgid "'quiet' and 'diff' options are mutually exclusive" +msgstr "»quiet« und »diff« schließen sich gegenseitig aus" + +#: ../svn/log-cmd.c:742 +msgid "'diff-cmd' option requires 'diff' option" +msgstr "Option »diff-cmd« erfordert Option »diff«" + +#: ../svn/log-cmd.c:746 +msgid "'internal-diff' option requires 'diff' option" +msgstr "Option »internal-diff« erfordert Option »diff«" + +#: ../svn/log-cmd.c:750 +msgid "'extensions' option requires 'diff' option" +msgstr "Option »extensions« erfordert Option »diff«" + +#: ../svn/log-cmd.c:755 +msgid "'depth' option requires 'diff' option" +msgstr "Option »depth« erfordert Option »diff«" + +#: ../svn/log-cmd.c:771 ../svnbench/null-log-cmd.c:158 +msgid "-c and -r are mutually exclusive" +msgstr "-c und -r schließen einander aus" + +#: ../svn/log-cmd.c:803 +#, c-format +msgid "Only relative paths can be specified after a URL for 'svn log', but '%s' is not a relative path" +msgstr "Mit »svn log« können nach einer URL nur relative Pfade angegeben werden, »%s« ist aber kein relativer Pfad" + +#: ../svn/log-cmd.c:850 +#, c-format +msgid "cannot assign with 'with-revprop' option (drop the '=')" +msgstr "Kann nicht mit Option »with-revprop« zuweisen (»=« entfernen)" + +#: ../svn/merge-cmd.c:103 ../svn/merge-cmd.c:132 +#, c-format +msgid "--- Merging\n" +msgstr "--- Zusammenführung\n" + +#: ../svn/merge-cmd.c:128 +#, fuzzy, c-format +msgid "Merge target '%s' must be a local path but looks like a URL" +msgstr "Ziele der Übertragung müssen lokale Pfade sein" + +#: ../svn/merge-cmd.c:258 +msgid "-r and -c can't be used with --reintegrate" +msgstr "-r und -c können nicht mit --reintegrate verwendet werden" + +#: ../svn/merge-cmd.c:313 +msgid "Merge source required" +msgstr "Die Zusammenführungsquelle muss angegeben werden" + +#: ../svn/merge-cmd.c:359 +msgid "Second revision required" +msgstr "Eine zweite Revision muss angegeben werden" + +#: ../svn/merge-cmd.c:368 ../svn/merge-cmd.c:395 ../svn/mergeinfo-cmd.c:361 +#: ../svnadmin/svnadmin.c:2571 ../svnlook/svnlook.c:2086 +#: ../svnlook/svnlook.c:2280 ../svnlook/svnlook.c:2384 +#: ../svnlook/svnlook.c:2419 +msgid "Too many arguments given" +msgstr "Zu viele Parameter angegeben" + +#: ../svn/merge-cmd.c:385 +msgid "Cannot specify a revision range with two URLs" +msgstr "Die Angabe eines Revisionsbereichs mit zwei URLs ist nicht möglich" + +#: ../svn/merge-cmd.c:489 +msgid "--reintegrate cannot be used with --ignore-ancestry" +msgstr "»--reintegrate« kann nicht mit »--ignore-ancestry« verwendet werden" + +#: ../svn/merge-cmd.c:494 +msgid "--reintegrate cannot be used with --record-only" +msgstr "»--reintegrate« kann nicht mit »--record-only« verwendet werden" + +#: ../svn/merge-cmd.c:499 +msgid "--depth cannot be used with --reintegrate" +msgstr "»--depth« kann nicht mit »--reintegrate« verwendet werden" + +#: ../svn/merge-cmd.c:504 +msgid "--force cannot be used with --reintegrate" +msgstr "»--force« kann nicht mit »--reintegrate« verwendet werden" + +#: ../svn/merge-cmd.c:509 +msgid "--reintegrate can only be used with a single merge source" +msgstr "»--reintegrate« kann nur mit einer einzelnen Zusammenführungsquelle verwendet werden" + +#: ../svn/merge-cmd.c:513 +msgid "--allow-mixed-revisions cannot be used with --reintegrate" +msgstr "»--allow-mixed-revisions« kann nicht mit »--reintegrate« verwendet werden" + +#: ../svn/merge-cmd.c:544 +msgid "" +"Merge tracking not possible, use --ignore-ancestry or\n" +"fix invalid mergeinfo in target with 'svn propset'" +msgstr "" +"Zusammenführungsverfolgung nicht möglich, verwenden Sie »--ignore-ancestry« oder\n" +"reparieren Sie die ungültigen Zusammenführungsinformationen im Ziel mit »svn propset«" + +#: ../svn/mergeinfo-cmd.c:193 +msgid "last full merge" +msgstr "Letzte vollständige Zusammenführung" + +#: ../svn/mergeinfo-cmd.c:193 +msgid "youngest common ancestor" +msgstr "Jüngster gemeinsame Vorfahre" + +#: ../svn/mergeinfo-cmd.c:194 +msgid "repository path" +msgstr "Pfad im Projektarchiv" + +#: ../svn/mergeinfo-cmd.c:194 +msgid "tip of branch" +msgstr "Spitze des Zweiges" + +#: ../svn/mergeinfo-cmd.c:358 +msgid "Not enough arguments given" +msgstr "Nicht genügend Parameter angegeben" + +#: ../svn/mergeinfo-cmd.c:404 +msgid "--quiet (-q) option valid only with --log option" +msgstr "Option »--quiet« »--q« ist nur in Verbindung mit der Option »--log« zulässig" + +#: ../svn/mergeinfo-cmd.c:409 +msgid "--verbose (-v) option valid only with --log option" +msgstr "Option »--verbose« »--v« ist nur in Verbindung mit der Option »--log« zulässig" + +#: ../svn/mergeinfo-cmd.c:414 +msgid "--incremental option valid only with --log option" +msgstr "Option »--incremental« ist nur in Verbindung mit der Option »--log« zulässig" + +#: ../svn/mergeinfo-cmd.c:444 +msgid "--revision (-r) option valid only with --show-revs option" +msgstr "Option »--revision« »--r« ist nur in Verbindung mit der Option »--show-revs« zulässig" + +#: ../svn/mergeinfo-cmd.c:448 +msgid "Depth specification options valid only with --show-revs option" +msgstr "Angabe der Tiefe für die Operation ist nur in Verbindung mit der Option »--show-revs« zulässig" + +#: ../svn/mergeinfo-cmd.c:452 +msgid "--log option valid only with --show-revs option" +msgstr "Option »--log« ist nur in Verbindung mit der Option »--show-revs« zulässig" + +#: ../svn/mkdir-cmd.c:92 +msgid "Try 'svn add' or 'svn add --non-recursive' instead?" +msgstr "Versuchen Sie »svn add« oder »svn add --non-recursive«." + +#: ../svn/mkdir-cmd.c:98 +msgid "Try 'svn mkdir --parents' instead?" +msgstr "Versuchen Sie »svn mkdir --parents« stattdessen?" + +# number of text, property or tree conflicts remaining to be resolved +#: ../svn/notify.c:134 +#, c-format +msgid "%d remaining" +msgid_plural "%d remaining" +msgstr[0] "%d verbleibend" +msgstr[1] "%d verbleibend" + +# number of already resolved text, property or tree conflicts +#: ../svn/notify.c:143 +#, c-format +msgid "and %d already resolved" +msgid_plural "and %d already resolved" +msgstr[0] "und %d bereits aufgelöst" +msgstr[1] "und %d bereits aufgelöst" + +#: ../svn/notify.c:235 ../svn/status-cmd.c:93 +#, c-format +msgid "Summary of conflicts:\n" +msgstr "Konfliktübersicht:\n" + +#: ../svn/notify.c:241 +#, c-format +msgid " Text conflicts: %d\n" +msgstr " Textkonflikte: %d\n" + +#: ../svn/notify.c:245 +#, c-format +msgid " Property conflicts: %d\n" +msgstr " Eigenschaftskonflikte: %d\n" + +#: ../svn/notify.c:249 +#, c-format +msgid " Tree conflicts: %d\n" +msgstr " Baumkonflikte: %d\n" + +#: ../svn/notify.c:256 +#, c-format +msgid " Text conflicts: %s (%s)\n" +msgstr " Textkonflikte: %s (%s\n" + +#: ../svn/notify.c:261 +#, c-format +msgid " Property conflicts: %s (%s)\n" +msgstr " Eigenschaftskonflikte: %s (%s)\n" + +#: ../svn/notify.c:266 +#, c-format +msgid " Tree conflicts: %s (%s)\n" +msgstr " Baumkonflikte: %s (%s)\n" + +#: ../svn/notify.c:272 +#, c-format +msgid " Skipped paths: %d\n" +msgstr " Übersprungene Pfade: %d\n" + +#: ../svn/notify.c:318 ../svnbench/notify.c:107 +#, c-format +msgid "Skipped missing target: '%s'\n" +msgstr "Fehlendes Ziel: »%s« übersprungen\n" + +#: ../svn/notify.c:325 ../svnbench/notify.c:114 +#, c-format +msgid "Skipped target: '%s' -- copy-source is missing\n" +msgstr "Ziel: »%s« übersprungen -- copy-source fehlt\n" + +#: ../svn/notify.c:332 +#, fuzzy, c-format +msgid "Skipped '%s' -- obstructed by unversioned node\n" +msgstr "Überspringe »%s« -- Hat keine versioniertes Elternelement\n" + +#: ../svn/notify.c:337 ../svnbench/notify.c:121 +#, c-format +msgid "Skipped '%s'\n" +msgstr "Überspringe »%s«\n" + +#: ../svn/notify.c:344 ../svnbench/notify.c:128 +#, c-format +msgid "Skipped '%s' -- An obstructing working copy was found\n" +msgstr "Überspringe »%s« -- Eine blockierende Arbeitskopie wurde gefunden\n" + +#: ../svn/notify.c:350 ../svnbench/notify.c:135 +#, c-format +msgid "Skipped '%s' -- Has no versioned parent\n" +msgstr "Überspringe »%s« -- Hat keine versioniertes Elternelement\n" + +#: ../svn/notify.c:356 ../svnbench/notify.c:142 +#, c-format +msgid "Skipped '%s' -- Access denied\n" +msgstr "Überspringe »%s« -- Zugriff verweigert\n" + +#: ../svn/notify.c:362 ../svnbench/notify.c:149 +#, c-format +msgid "Skipped '%s' -- Node remains in conflict\n" +msgstr "Überspringe »%s« -- Knoten bleibt im Konflikt\n" + +#: ../svn/notify.c:378 +#, c-format +msgid "Removed external '%s': %s\n" +msgstr "Externer Verweis »%s« entfernt: %s\n" + +#: ../svn/notify.c:383 +#, c-format +msgid "Removed external '%s'\n" +msgstr "Externer Verweis »%s« entfernt\n" + +#: ../svn/notify.c:389 +#, c-format +msgid "Left local modifications as '%s'\n" +msgstr "Lokale Änderungen in »%s« belassen\n" + +#: ../svn/notify.c:433 ../svnbench/notify.c:233 +#, c-format +msgid "Restored '%s'\n" +msgstr "Wieder hergestellt »%s«\n" + +#: ../svn/notify.c:438 ../svnbench/notify.c:239 +#, c-format +msgid "Reverted '%s'\n" +msgstr "Rückgängig gemacht: »%s«\n" + +#: ../svn/notify.c:443 ../svnbench/notify.c:245 +#, c-format +msgid "Failed to revert '%s' -- try updating instead.\n" +msgstr "Wiederherstellen von »%s« schlug fehl -- Versuchen Sie statt dessen zu aktualisieren.\n" + +#: ../svn/notify.c:450 ../svnbench/notify.c:253 +#, c-format +msgid "Resolved conflicted state of '%s'\n" +msgstr "Konflikt von »%s« aufgelöst\n" + +#: ../svn/notify.c:456 +#, fuzzy, c-format +msgid "Merge conflicts in '%s' marked as resolved.\n" +msgstr "" +"Baumkonflikt in »%s«\n" +" > %s\n" + +#: ../svn/notify.c:464 +#, fuzzy, c-format +msgid "Conflict in property '%s' at '%s' marked as resolved.\n" +msgstr "Konflikt für Eigenschaft »%s« für »%s« entdeckt.\n" + +#: ../svn/notify.c:471 +#, fuzzy, c-format +msgid "Tree conflict at '%s' marked as resolved.\n" +msgstr "" +"Baumkonflikt in »%s«\n" +" > %s\n" + +#: ../svn/notify.c:478 +#, c-format +msgid "Searching tree conflict details for '%s' in repository:\n" +msgstr "" + +#: ../svn/notify.c:500 +#, fuzzy, c-format +msgid " done\n" +msgstr " erledigt.\n" + +#: ../svn/notify.c:592 ../svn/notify.c:629 ../svnbench/notify.c:344 +#: ../svnbench/notify.c:384 +#, c-format +msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with offset %s" +msgstr "> Abschnitt ## -%lu,%lu +%lu,%lu ## mit Versatz %s angewandt" + +#: ../svn/notify.c:609 ../svn/notify.c:643 ../svnbench/notify.c:361 +#: ../svnbench/notify.c:398 +#, c-format +msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with offset %s" +msgstr "> Abschnitt @@ -%lu,%lu +%lu,%lu @@ mit Versatz %s angewandt" + +#: ../svn/notify.c:661 ../svnbench/notify.c:419 +#, c-format +msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with fuzz %lu (%s)\n" +msgstr "> Abschnitt ## -%lu,%lu +%lu,%lu ## mit Unschärfe %lu (%s) angewandt\n" + +#: ../svn/notify.c:671 ../svnbench/notify.c:429 +#, c-format +msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with fuzz %lu\n" +msgstr "> Abschnitt @@ -%lu,%lu +%lu,%lu @@ mit Unschärfe %lu angewandt\n" + +#: ../svn/notify.c:687 ../svnbench/notify.c:447 +#, c-format +msgid "> rejected hunk ## -%lu,%lu +%lu,%lu ## (%s)\n" +msgstr "> Abschnitt ## -%lu,%lu +%lu,%lu ## (%s) zurückgewiesen\n" + +#: ../svn/notify.c:696 ../svnbench/notify.c:456 +#, c-format +msgid "> rejected hunk @@ -%lu,%lu +%lu,%lu @@\n" +msgstr "> Abschnitt @@ -%lu,%lu +%lu,%lu @@ zurückgewiesen\n" + +#: ../svn/notify.c:708 ../svnbench/notify.c:470 +#, c-format +msgid "> hunk ## -%lu,%lu +%lu,%lu ## already applied (%s)\n" +msgstr "> Abschnitt ## -%lu,%lu +%lu,%lu ## bereits angewandt (%s)\n" + +#: ../svn/notify.c:718 ../svnbench/notify.c:480 +#, c-format +msgid "> hunk @@ -%lu,%lu +%lu,%lu @@ already applied\n" +msgstr "> Abschnitt @@ -%lu,%lu +%lu,%lu @@ bereits angewandt\n" + +# Currently this is used for checkouts and switches too. If we +# want different output, we'll have to add new actions. +#: ../svn/notify.c:775 ../svnbench/notify.c:542 +#, c-format +msgid "" +"\n" +"Fetching external item into '%s':\n" +msgstr "" +"\n" +"Hole externen Verweis nach »%s«:\n" + +#: ../svn/notify.c:799 ../svnbench/notify.c:568 +#, c-format +msgid "Error handling externals definition for '%s':" +msgstr "Fehler beim Umgang mit der Definition des externen Verweises für »%s«:" + +#: ../svn/notify.c:812 ../svnbench/notify.c:581 +#, c-format +msgid "Updating '%s':\n" +msgstr "Aktualisiere »%s«:\n" + +#: ../svn/notify.c:825 ../svnbench/notify.c:595 +#, c-format +msgid "Exported external at revision %ld.\n" +msgstr "Externer Verweis exportiert, Revision %ld.\n" + +#: ../svn/notify.c:826 ../svnbench/notify.c:596 +#, c-format +msgid "Exported revision %ld.\n" +msgstr "Exportiert, Revision %ld.\n" + +#: ../svn/notify.c:833 ../svnbench/notify.c:604 +#, c-format +msgid "Checked out external at revision %ld.\n" +msgstr "Externer Verweis ausgecheckt, Revision %ld.\n" + +#: ../svn/notify.c:834 ../svnbench/notify.c:605 +#, c-format +msgid "Checked out revision %ld.\n" +msgstr "Ausgecheckt, Revision %ld.\n" + +#: ../svn/notify.c:844 ../svnbench/notify.c:616 +#, c-format +msgid "Updated external to revision %ld.\n" +msgstr "Externer Verweis aktualisiert zu Revision %ld.\n" + +#: ../svn/notify.c:845 ../svnbench/notify.c:617 +#, c-format +msgid "Updated to revision %ld.\n" +msgstr "Aktualisiert zu Revision %ld.\n" + +#: ../svn/notify.c:852 ../svnbench/notify.c:625 +#, c-format +msgid "External at revision %ld.\n" +msgstr "Externer Verweis, Revision %ld.\n" + +#: ../svn/notify.c:853 ../svnbench/notify.c:626 +#, c-format +msgid "At revision %ld.\n" +msgstr "Revision %ld.\n" + +#: ../svn/notify.c:864 ../svnbench/notify.c:638 +#, c-format +msgid "External export complete.\n" +msgstr "Export des externen Verweises abgeschlossen.\n" + +#: ../svn/notify.c:865 ../svnbench/notify.c:639 +#, c-format +msgid "Export complete.\n" +msgstr "Export abgeschlossen.\n" + +#: ../svn/notify.c:871 ../svnbench/notify.c:646 +#, c-format +msgid "External checkout complete.\n" +msgstr "Auschecken des externen Verweises abgeschlossen.\n" + +#: ../svn/notify.c:872 ../svnbench/notify.c:647 +#, c-format +msgid "Checkout complete.\n" +msgstr "Auschecken abgeschlossen.\n" + +#: ../svn/notify.c:878 ../svnbench/notify.c:654 +#, c-format +msgid "External update complete.\n" +msgstr "Aktualisierung des externen Verweises abgeschlossen.\n" + +#: ../svn/notify.c:879 ../svnbench/notify.c:655 +#, c-format +msgid "Update complete.\n" +msgstr "Aktualisierung abgeschlossen.\n" + +#: ../svn/notify.c:893 ../svnbench/notify.c:671 +#, c-format +msgid "" +"\n" +"Performing status on external item at '%s':\n" +msgstr "" +"\n" +"Hole Status des externen Verweises in »%s«:\n" + +#: ../svn/notify.c:899 +#, c-format +msgid "" +"\n" +"Performing info on external item at '%s':\n" +msgstr "" +"\n" +"Hole Informationen des externen Verweises in »%s«:\n" + +#: ../svn/notify.c:906 ../svnbench/notify.c:679 +#, c-format +msgid "Status against revision: %6ld\n" +msgstr "Status bezogen auf Revision: %6ld\n" + +#: ../svn/notify.c:914 ../svnbench/notify.c:688 +#, c-format +msgid "Sending copy of %s\n" +msgstr "Sende Kopie von %s\n" + +#: ../svn/notify.c:915 ../svnbench/notify.c:689 +#, c-format +msgid "Sending %s\n" +msgstr "Sende %s\n" + +#: ../svn/notify.c:925 ../svnbench/notify.c:700 +#, c-format +msgid "Adding copy of (bin) %s\n" +msgstr "Füge Kopie hinzu (binär) %s\n" + +#: ../svn/notify.c:926 ../svnbench/notify.c:701 +#, c-format +msgid "Adding (bin) %s\n" +msgstr "Füge hinzu (binär) %s\n" + +#: ../svn/notify.c:933 ../svnbench/notify.c:709 +#, c-format +msgid "Adding copy of %s\n" +msgstr "Füge Kopie hinzu %s\n" + +#: ../svn/notify.c:934 ../svnbench/notify.c:710 +#, c-format +msgid "Adding %s\n" +msgstr "Füge hinzu %s\n" + +#: ../svn/notify.c:942 ../svnbench/notify.c:719 +#, c-format +msgid "Deleting copy of %s\n" +msgstr "Lösche Kopie von %s\n" + +#: ../svn/notify.c:943 ../svnbench/notify.c:720 +#, c-format +msgid "Deleting %s\n" +msgstr "Lösche %s\n" + +#: ../svn/notify.c:951 ../svnbench/notify.c:729 +#, c-format +msgid "Replacing copy of %s\n" +msgstr "Ersetze Kopie von %s\n" + +#: ../svn/notify.c:952 ../svnbench/notify.c:730 +#, c-format +msgid "Replacing %s\n" +msgstr "Ersetze %s\n" + +#: ../svn/notify.c:961 ../svnbench/notify.c:740 ../svnsync/sync.c:416 +#, c-format +msgid "Transmitting file data " +msgstr "Übertrage Daten " + +#: ../svn/notify.c:968 ../svnadmin/svnadmin.c:2548 ../svnbench/notify.c:749 +#, c-format +msgid "'%s' locked by user '%s'.\n" +msgstr "»%s« gesperrt durch »%s«.\n" + +#: ../svn/notify.c:973 ../svnbench/notify.c:755 +#, c-format +msgid "'%s' unlocked.\n" +msgstr "»%s« freigegeben.\n" + +#: ../svn/notify.c:997 ../svnbench/notify.c:782 +#, c-format +msgid "--- Merging differences between repository URLs into '%s':\n" +msgstr "-- Zusammenführen der Unterschiede zwischen Projektarchiv-URLs in »%s«:\n" + +#: ../svn/notify.c:1002 ../svnbench/notify.c:787 +#, c-format +msgid "--- Merging r%ld into '%s':\n" +msgstr "-- Zusammenführen von r%ld in »%s«:\n" + +#: ../svn/notify.c:1006 ../svnbench/notify.c:791 +#, c-format +msgid "--- Reverse-merging r%ld into '%s':\n" +msgstr "-- Rückwärtiges Zusammenführen von r%ld in »%s«:\n" + +#: ../svn/notify.c:1010 ../svnbench/notify.c:795 +#, c-format +msgid "--- Merging r%ld through r%ld into '%s':\n" +msgstr "-- Zusammenführen von r%ld bis r%ld in »%s«:\n" + +#: ../svn/notify.c:1016 ../svnbench/notify.c:801 +#, c-format +msgid "--- Reverse-merging r%ld through r%ld into '%s':\n" +msgstr "-- Rückwärtiges Zusammenführen von r%ld bis r%ld in »%s«:\n" + +#: ../svn/notify.c:1026 ../svnbench/notify.c:813 +#, c-format +msgid "--- Recording mergeinfo for merge between repository URLs into '%s':\n" +msgstr "-- Aufzeichnung der Informationen für Zusammenführung zwischen Projektarchiv-URLs in »%s«:\n" + +#: ../svn/notify.c:1036 ../svnbench/notify.c:823 +#, c-format +msgid "--- Recording mergeinfo for merge of r%ld into '%s':\n" +msgstr "-- Aufzeichnung der Informationen für Zusammenführung von r%ld in »%s«:\n" + +#: ../svn/notify.c:1041 ../svnbench/notify.c:828 +#, c-format +msgid "--- Recording mergeinfo for reverse merge of r%ld into '%s':\n" +msgstr "-- Aufzeichnung der Informationen für rückwärtiges Zusammenführen von r%ld in »%s«:\n" + +#: ../svn/notify.c:1046 ../svnbench/notify.c:833 +#, c-format +msgid "--- Recording mergeinfo for merge of r%ld through r%ld into '%s':\n" +msgstr "-- Aufzeichnung der Informationen für Zusammenführung von r%ld bis r%ld in »%s«:\n" + +#: ../svn/notify.c:1051 ../svnbench/notify.c:838 +#, c-format +msgid "--- Recording mergeinfo for reverse merge of r%ld through r%ld into '%s':\n" +msgstr "-- Aufzeichnung der Informationen für rückwärtiges Zusammenführen von r%ld bis r%ld in »%s«:\n" + +#: ../svn/notify.c:1058 ../svnbench/notify.c:848 +#, c-format +msgid "--- Eliding mergeinfo from '%s':\n" +msgstr "-- Entfernung der Zusammenführungsinformationen von »%s«:\n" + +#: ../svn/notify.c:1065 ../svnbench/notify.c:856 +#, c-format +msgid "--- Merging differences between foreign repository URLs into '%s':\n" +msgstr "-- Zusammenführen der Unterschiede zwischen fremden Projektarchiv-URLs in »%s«:\n" + +#: ../svn/notify.c:1071 ../svnbench/notify.c:862 +#, c-format +msgid "--- Merging (from foreign repository) r%ld into '%s':\n" +msgstr "-- Zusammenführen (aus fremden Projektarchiv) von r%ld in »%s«:\n" + +#: ../svn/notify.c:1076 ../svnbench/notify.c:867 +#, c-format +msgid "--- Reverse-merging (from foreign repository) r%ld into '%s':\n" +msgstr "-- Rückwärtiges Zusammenführen (aus fremden Projektarchiv) von r%ld in »%s«:\n" + +#: ../svn/notify.c:1081 ../svnbench/notify.c:872 +#, c-format +msgid "--- Merging (from foreign repository) r%ld through r%ld into '%s':\n" +msgstr "-- Zusammenführen (aus fremden Projektarchiv) von r%ld bis r%ld in »%s«:\n" + +#: ../svn/notify.c:1087 ../svnbench/notify.c:878 +#, c-format +msgid "--- Reverse-merging (from foreign repository) r%ld through r%ld into '%s':\n" +msgstr "-- Rückwärtiges Zusammenführen (aus fremden Projektarchiv) von r%ld bis r%ld in »%s«:\n" + +#: ../svn/notify.c:1117 ../svnbench/notify.c:915 +#, c-format +msgid "property '%s' set on '%s'\n" +msgstr "Eigenschaft »%s« für »%s« gesetzt\n" + +#: ../svn/notify.c:1123 ../svnbench/notify.c:923 +#, c-format +msgid "property '%s' deleted from '%s'.\n" +msgstr "Eigenschaft »%s« wurde von »%s« gelöscht.\n" + +# TODO: Compare msgid "Attempted to open non-existent child node '%s'" +# (non-, vs. non; Attempted vs. Attempting) +#: ../svn/notify.c:1129 ../svnbench/notify.c:931 +#, c-format +msgid "Attempting to delete nonexistent property '%s' on '%s'\n" +msgstr "Versuchte, nicht existierende Eigenschaft »%s« von »%s« zu löschen\n" + +#: ../svn/notify.c:1136 ../svnbench/notify.c:940 +#, c-format +msgid "property '%s' set on repository revision %ld\n" +msgstr "Eigenschaft »%s« wurde für Revision %ld im Projektarchiv gesetzt\n" + +#: ../svn/notify.c:1142 ../svnbench/notify.c:948 +#, c-format +msgid "property '%s' deleted from repository revision %ld\n" +msgstr "Eigenschaft »%s« wurde von Revision %ld im Projektarchiv gelöscht\n" + +#: ../svn/notify.c:1147 ../svnbench/notify.c:955 +#, c-format +msgid "Upgraded '%s'\n" +msgstr "In neues Format gebracht: »%s«\n" + +#: ../svn/notify.c:1151 ../svnbench/notify.c:961 +#, c-format +msgid "Redirecting to URL '%s':\n" +msgstr "Umleitung zur URL »%s«:\n" + +#: ../svn/notify.c:1175 +#, c-format +msgid "--- Copying from foreign repository URL '%s':\n" +msgstr "-- Kopieren aus fremdem Projektarchiv bei URL »%s«:\n" + +#: ../svn/notify.c:1182 +#, c-format +msgid "Breaking move with source path '%s'\n" +msgstr "Zertrennung der Verschiebeoperation mit Quellpfad »%s«\n" + +#: ../svn/notify.c:1188 +#, c-format +msgid "Performing cleanup on external item at '%s'.\n" +msgstr "Räume externen Verweis »%s« auf.\n" + +#: ../svn/notify.c:1195 +#, c-format +msgid "done\n" +msgstr "erledigt\n" + +#: ../svn/notify.c:1197 +#, c-format +msgid "Committing transaction...\n" +msgstr "Übertrage Transaktion...\n" + +#: ../svn/propdel-cmd.c:88 +#, c-format +msgid "Cannot specify revision for deleting versioned property '%s'" +msgstr "Zum Löschen der versionierten Eigenschaft »%s« darf keine Revision angegeben werden" + +#: ../svn/propedit-cmd.c:62 ../svn/propedit-cmd.c:341 +#, c-format +msgid "Set new value for property '%s' on '%s'\n" +msgstr "Neuer Wert für Eigenschaft »%s« für »%s« gesetzt\n" + +#: ../svn/propedit-cmd.c:96 ../svn/propset-cmd.c:97 +msgid "--encoding option applies only to textual Subversion-controlled properties" +msgstr "Option --encoding ist nur für textbasierte von Subversion kontrollierte Eigenschaften angebbar" + +#: ../svn/propedit-cmd.c:162 +#, c-format +msgid "Set new value for property '%s' on revision %ld\n" +msgstr "Neuen Wert für Eigenschaft »%s« in Revision %ld gesetzt\n" + +#: ../svn/propedit-cmd.c:168 +#, c-format +msgid "No changes to property '%s' on revision %ld\n" +msgstr "Eigenschaft »%s« in Revision %ld nicht geändert\n" + +#: ../svn/propedit-cmd.c:176 +#, c-format +msgid "Cannot specify revision for editing versioned property '%s'" +msgstr "Beim Bearbeiten der versionierten Eigenschaft »%s« darf keine Revision angegeben werden" + +#: ../svn/propedit-cmd.c:204 ../svn/propset-cmd.c:172 +msgid "Explicit target argument required" +msgstr "Expliziter Zielparameter benötigt" + +#: ../svn/propedit-cmd.c:271 +#, c-format +msgid "'%s' does not appear to be a working copy path" +msgstr "»%s« scheint kein Arbeitskopiepfad zu sein" + +#: ../svn/propedit-cmd.c:348 +#, c-format +msgid "No changes to property '%s' on '%s'\n" +msgstr "Keine Änderungen der Eigenschaft »%s« für »%s«\n" + +#: ../svn/propget-cmd.c:67 +msgid "Error writing to stream" +msgstr "Fehler beim Schreiben in Datenstrom" + +#: ../svn/propget-cmd.c:187 ../svn/proplist-cmd.c:156 +#: ../svn/proplist-cmd.c:160 ../svnlook/svnlook.c:1777 +#: ../svnlook/svnlook.c:1932 +#, c-format +msgid "" +"Inherited properties on '%s',\n" +"from '%s':\n" +msgstr "" +"Geerbte Eigenschaften von »%s«,\n" +"geerbt von »%s«:\n" + +#. Not a --revprop +#: ../svn/propget-cmd.c:197 ../svn/proplist-cmd.c:175 +#: ../svnlook/svnlook.c:1812 ../svnlook/svnlook.c:1967 +#, c-format +msgid "Properties on '%s':\n" +msgstr "Eigenschaften von »%s«:\n" + +#: ../svn/propget-cmd.c:328 +msgid "--verbose cannot be used with --revprop or --no-newline or --xml" +msgstr "»--verbose« kann nicht mit »--revprop«, »--no-newline« oder »--xml« verwendet werden" + +#: ../svn/propget-cmd.c:359 ../svn/proplist-cmd.c:214 +msgid "--show-inherited-props can't be used with --revprop" +msgstr "»--show-inherited-props« kann nicht mit »--revprop« verwendet werden" + +#: ../svn/propget-cmd.c:372 +#, c-format +msgid "Property '%s' not found on revision %s" +msgstr "Eigenschaft »%s« wurde in Revision %s nicht gefunden" + +#: ../svn/propget-cmd.c:437 +msgid "--no-newline is only available for single-target, non-recursive propget operations" +msgstr "Die Option »--no-newline« ist nur für einzelne Ziele und nicht-rekursive Propget-Operationen verfügbar" + +#: ../svn/propget-cmd.c:492 +#, c-format +msgid "Property '%s' not found on '%s'" +msgstr "Eigenschaft »%s« von »%s« nicht gefunden" + +#: ../svn/proplist-cmd.c:246 +#, c-format +msgid "Unversioned properties on revision %ld:\n" +msgstr "Nicht versionierte Eigenschaft in Revision %ld:\n" + +#: ../svn/proplist-cmd.c:321 +msgid "Could not display properties of all targets because some targets don't exist" +msgstr "Konnte Eigenschaften nicht für alle Ziele anzeigen, da einige Ziele nicht existieren" + +#: ../svn/proplist-cmd.c:326 +msgid "Could not display properties of all targets because some targets are not versioned" +msgstr "Konnte Eigenschaften nicht für alle Ziele anzeigen, da einige Ziele nicht versioniert sind" + +#: ../svn/props.c:66 +msgid "Must specify the revision as a number, a date or 'HEAD' when operating on a revision property" +msgstr "Die Revision muss als Zahl, Datum oder »HEAD« angegeben werden, wenn auf eine Revisionseigenschaft zugegriffen wird" + +#: ../svn/props.c:73 +msgid "Wrong number of targets specified" +msgstr "Falsche Anzahl Ziele angegeben" + +#: ../svn/props.c:82 +msgid "Either a URL or versioned item is required" +msgstr "Eine URL oder ein versioniertes Objekt muss angegeben werden" + +#: ../svn/props.c:107 +#, c-format +msgid "" +"To turn off the %s property, use 'svn propdel';\n" +"setting the property to '%s' will not turn it off." +msgstr "" +"Um die Eigenschaft %s abzuschalten, ist »svn propdel« zu verwenden;\n" +"setzen der Eigenschaft auf »%s« wird sie nicht ausschalten." + +#: ../svn/props.c:124 +#, c-format +msgid "Use '--force' to set the '%s' property." +msgstr "»--force« erzwingt das Setzen der Eigenschaft »%s«." + +#: ../svn/props.c:129 +#, c-format +msgid "Use '--force' to edit the '%s' property." +msgstr "»--force« erzwingt das Bearbeiten der Eigenschaft »%s«." + +#: ../svn/props.c:135 +#, c-format +msgid "Use '--force' to use the '%s' property'." +msgstr "»--force« erzwingt die Verwendung der Eigenschaft »%s«." + +#: ../svn/props.c:149 +#, c-format +msgid "'%s' is not a valid %s property name; use '--force' to set it" +msgstr "»%s« ist kein gültiger »%s«-Eigenschaftsname; Verwenden Sie »--force« um das Setzen zu erzwingen" + +#: ../svn/props.c:154 +#, c-format +msgid "'%s' is not a valid %s property name; use '--force' to edit it" +msgstr "»%s« ist kein gültiger »%s«-Eigenschaftsname; Verwenden Sie »--force« um das Bearbeiten zu erzwingen" + +#: ../svn/props.c:160 +#, c-format +msgid "'%s' is not a valid %s property name; use '--force' to use it" +msgstr "»%s« ist kein gültiger »%s«-Eigenschaftsname; Verwenden Sie »--force« um ihn zu verwenden" + +#: ../svn/props.c:226 ../svn/props.c:269 +#, c-format +msgid "'%s' is not a valid %s property name; did you mean '%s'?" +msgstr "»%s« ist kein gültiger »%s«-Eigenschaftsname; Meinten Sie »%s«?" + +#: ../svn/props.c:278 +#, c-format +msgid "'%s' is not a valid %s property name; did you mean '%s' or '%s'?" +msgstr "»%s« ist kein gültiger »%s«-Eigenschaftsname; Meinten Sie »%s« oder »%s«?" + +#: ../svn/props.c:288 +#, c-format +msgid "'%s' is not a valid %s property name; did you mean '%s', '%s' or '%s'?" +msgstr "»%s« ist kein gültiger »%s«-Eigenschaftsname; Meinten Sie »%s«, »%s« oder »%s«?" + +#: ../svn/propset-cmd.c:132 +#, c-format +msgid "Cannot specify revision for setting versioned property '%s'" +msgstr "Beim Setzen der versionierten Eigenschaft »%s« darf keine Revision angegeben werden" + +#: ../svn/propset-cmd.c:165 +#, c-format +msgid "Explicit target required ('%s' interpreted as prop value)" +msgstr "Explizites Ziel erforderlich (»%s« als Eigenschaftswert interpretiert)" + +#: ../svn/resolve-cmd.c:158 +msgid "Failure occurred resolving one or more conflicts" +msgstr "Fehler bei der Auflösung einer oder mehrerer Konflikte" + +#: ../svn/resolve-cmd.c:198 +msgid "missing --accept option" +msgstr "fehlende Option --accept" + +#: ../svn/resolve-cmd.c:205 +msgid "invalid 'accept' ARG" +msgstr "ungültiger Parameter »accept«" + +#: ../svn/revert-cmd.c:81 +msgid "Try 'svn revert --depth infinity' instead?" +msgstr "Versuchen Sie »svn revert --depth infinity« stattdessen?" + +#: ../svn/shelf-cmd.c:123 +#, fuzzy +msgid "All targets must be in the same WC" +msgstr "Alle nicht-relativen Ziele müssen die selbe Wurzel-URL haben" + +#: ../svn/shelf-cmd.c:141 +#, c-format +msgid "%d days" +msgstr "" + +#: ../svn/shelf-cmd.c:143 +#, c-format +msgid "%d hours" +msgstr "" + +#: ../svn/shelf-cmd.c:145 +#, c-format +msgid "%d minutes" +msgstr "" + +#: ../svn/shelf-cmd.c:174 +#, fuzzy, c-format +msgid "Could not run external command '%s'" +msgstr "Kann Anweisung »%s« nicht zerlegen" + +#: ../svn/shelf-cmd.c:263 +#, fuzzy, c-format +msgid "version %d" +msgstr "meine Version" + +#: ../svn/shelf-cmd.c:266 +#, fuzzy, c-format +msgid "version %d of %d" +msgstr "Nicht versionierte Datei%s" + +#: ../svn/shelf-cmd.c:272 +#, c-format +msgid ", %d paths changed" +msgstr "" + +#: ../svn/shelf-cmd.c:274 +#, fuzzy, c-format +msgid "%s, %s ago%s\n" +msgstr "%s, %s %s" + +#: ../svn/shelf-cmd.c:289 +#, c-format +msgid " %.50s\n" +msgstr "" + +#: ../svn/shelf-cmd.c:390 +#, fuzzy +msgid "No shelves found" +msgstr "Kein Editor gefunden." + +#: ../svn/shelf-cmd.c:542 +#, fuzzy, c-format +msgid "--- Save a new version of '%s' in WC root '%s'\n" +msgstr "Sperren schlug fehl: eine neuere Version von »%s« existiert" + +#: ../svn/shelf-cmd.c:543 +#, c-format +msgid "--- Shelve '%s' in WC root '%s'\n" +msgstr "" + +#: ../svn/shelf-cmd.c:550 +msgid "--- Modifications to save:\n" +msgstr "" + +#: ../svn/shelf-cmd.c:551 +msgid "--- Modifications to shelve:\n" +msgstr "" + +#: ../svn/shelf-cmd.c:564 +#, fuzzy, c-format +msgid "No local modifications found" +msgstr "Lokale Änderungen in »%s« belassen\n" + +#: ../svn/shelf-cmd.c:569 +#, fuzzy, c-format +msgid "--- Saving...\n" +msgstr "--- Zusammenführung\n" + +#: ../svn/shelf-cmd.c:570 +#, fuzzy, c-format +msgid "--- Shelving...\n" +msgstr "--- Zusammenführung\n" + +#: ../svn/shelf-cmd.c:578 +#, fuzzy, c-format +msgid "None of the local modifications could be saved" +msgstr "Lokale Änderungen in »%s« belassen\n" + +#: ../svn/shelf-cmd.c:579 +#, fuzzy, c-format +msgid "None of the local modifications could be shelved" +msgstr "Lokale Änderungen in »%s« belassen\n" + +#: ../svn/shelf-cmd.c:648 +msgid "--- Paths modified in shelf and in WC:\n" +msgstr "" + +#: ../svn/shelf-cmd.c:678 +msgid "Cannot unshelve/restore, as at least one path is modified in shelf and in WC" +msgstr "" + +#: ../svn/shelf-cmd.c:743 +#, c-format +msgid "--- Unshelve '%s' in WC root '%s'\n" +msgstr "" + +#: ../svn/shelf-cmd.c:768 +msgid "Unshelve/restore failed due to conflicts" +msgstr "" + +#: ../svn/shelf-cmd.c:781 +#, c-format +msgid "restored '%s' version %d and deleted %d newer versions\n" +msgstr "" + +#: ../svn/shelf-cmd.c:785 +#, c-format +msgid "restored '%s' version %d (the newest version)\n" +msgstr "" + +#: ../svn/shelf-cmd.c:842 +#, fuzzy, c-format +msgid "deleted '%s'\n" +msgstr "Rückgängig gemacht: »%s«\n" + +#: ../svn/shelf-cmd.c:942 +#, fuzzy, c-format +msgid "saved '%s' version %d\n" +msgstr " »%s« auf r%ld aktualisiert.\n" + +#: ../svn/shelf-cmd.c:946 +#, fuzzy, c-format +msgid "shelved '%s' version %d\n" +msgstr "Ausgecheckt, Revision %ld.\n" + +#: ../svn/shelf-cmd.c:977 +#, c-format +msgid "unshelving the youngest shelf, '%s'\n" +msgstr "" + +#: ../svn/shelf-cmd.c:987 ../svn/shelf-cmd.c:1155 ../svn/shelf-cmd.c:1203 +#: ../svnadmin/svnadmin.c:766 +msgid "Too many arguments" +msgstr "Zu viele Parameter" + +#: ../svn/status-cmd.c:97 +#, c-format +msgid " Text conflicts: %u\n" +msgstr " Textkonflikte: %u\n" + +#: ../svn/status-cmd.c:101 +#, c-format +msgid " Property conflicts: %u\n" +msgstr " Eigenschaftskonflikte: %u\n" + +#: ../svn/status-cmd.c:105 +#, c-format +msgid " Tree conflicts: %u\n" +msgstr " Baumkonflikte: %u\n" + +#: ../svn/status-cmd.c:296 +msgid "--revision (-r) option valid only with --show-updates (-u) option" +msgstr "Option »--revision« (»--r«) ist nur in Verbindung mit der Option »--show-updates« (»-u«) zulässig" + +#: ../svn/status-cmd.c:406 +#, c-format +msgid "" +"\n" +"--- Changelist '%s':\n" +msgstr "" +"\n" +"--- Änderungsliste »%s«:\n" + +#: ../svn/status.c:315 +#, c-format +msgid "swapped places with %s" +msgstr "Platz mit %s vertauscht" + +#: ../svn/status.c:330 +#, c-format +msgid "moved from %s" +msgstr "Verschoben von %s" + +#: ../svn/status.c:342 +#, c-format +msgid "moved to %s" +msgstr "Verschoben nach %s" + +#: ../svn/svn.c:159 +msgid "force operation to run" +msgstr "Durchführung des Befehls erzwingen" + +#: ../svn/svn.c:161 +msgid "force validity of log message source" +msgstr "Gültigkeit der Quelle für die Logmeldung erzwingen" + +#: ../svn/svn.c:162 ../svn/svn.c:163 ../svnadmin/svnadmin.c:168 +#: ../svnadmin/svnadmin.c:171 ../svnbench/svnbench.c:83 +#: ../svnbench/svnbench.c:84 ../svndumpfilter/svndumpfilter.c:944 +#: ../svndumpfilter/svndumpfilter.c:947 ../svnfsfs/svnfsfs.c:89 +#: ../svnfsfs/svnfsfs.c:92 ../svnlook/svnlook.c:115 ../svnlook/svnlook.c:127 +#: ../svnsync/svnsync.c:289 ../svnsync/svnsync.c:291 +msgid "show help on a subcommand" +msgstr "zeige Hilfe zu einem Unterbefehl" + +#: ../svn/svn.c:164 +msgid "specify log message ARG" +msgstr "PAR als Logmeldung verwenden" + +#: ../svn/svn.c:165 ../svnbench/svnbench.c:85 +msgid "print nothing, or only summary information" +msgstr "nichts oder nur Zusammenfassungen ausgeben" + +#: ../svn/svn.c:166 ../svnbench/svnbench.c:86 +msgid "descend recursively, same as --depth=infinity" +msgstr "" +"rekursiv absteigen, das gleiche wie\n" +" --depth=infinity" + +#: ../svn/svn.c:167 ../svnbench/svnbench.c:87 +msgid "obsolete; try --depth=files or --depth=immediates" +msgstr "" +"veraltet; versuchen Sie --depth=files oder\n" +" --depth=immediates" + +#: ../svn/svn.c:169 ../svnbench/svnbench.c:89 +msgid "" +"the change made by revision ARG (like -r ARG-1:ARG)\n" +" If ARG is negative this is like -r ARG:ARG-1\n" +" If ARG is of the form ARG1-ARG2 then this is like\n" +" ARG1:ARG2, where ARG1 is inclusive" +msgstr "" +"Durch Revision PAR erzeugte Änderung (wie -r PAR-1:PAR)\n" +" Falls PAR negativ ist, gleichbedeutend mit -r PAR:PAR-1\n" +" Falls PAR die Form PAR1-PAR2 hat, dann wie\n" +" PAR1:PAR2, wobei PAR1 eingeschlossen ist" + +#: ../svn/svn.c:177 ../svnbench/svnbench.c:97 +msgid "" +"ARG (some commands also take ARG1:ARG2 range)\n" +" A revision argument can be one of:\n" +" NUMBER revision number\n" +" '{' DATE '}' revision at start of the date\n" +" 'HEAD' latest in repository\n" +" 'BASE' base rev of item's working copy\n" +" 'COMMITTED' last commit at or before BASE\n" +" 'PREV' revision just before COMMITTED" +msgstr "" +"PAR (manche Befehle akzeptieren auch einen\n" +" Wertebereich PAR1:PAR2)\n" +" Ein Revisionsparameter kann sein:\n" +" NUMMER Revisionsnummer\n" +" »{«DATUM»}« Revision zum Startdatum\n" +" »HEAD« neueste Revision im Projektarchiv\n" +" »BASE« Basisrevision der Arbeitskopie\n" +" »COMMITTED« letzte übertragene Revision zu\n" +" oder vor BASE\n" +" »PREV« letzte Revision vor COMMITTED" + +#: ../svn/svn.c:192 +msgid "read log message from file ARG" +msgstr "Logmeldung aus Datei PAR lesen" + +#: ../svn/svn.c:194 +msgid "give output suitable for concatenation" +msgstr "Ausgabe für Verkettung formatieren" + +#: ../svn/svn.c:196 +msgid "treat value as being in charset encoding ARG" +msgstr "" +"Wert behandeln, als sei er in der Zeichenkodierung\n" +" PAR" + +#: ../svn/svn.c:197 ../svnadmin/svnadmin.c:174 ../svnbench/svnbench.c:112 +#: ../svndumpfilter/svndumpfilter.c:950 ../svnfsfs/svnfsfs.c:95 +#: ../svnlook/svnlook.c:179 ../svnrdump/svnrdump.c:140 +#: ../svnserve/svnserve.c:419 ../svnsync/svnsync.c:287 +#: ../svnversion/svnversion.c:144 +msgid "show program version information" +msgstr "Zeige Versionsinformationen des Programms" + +#: ../svn/svn.c:198 ../svnbench/svnbench.c:113 +msgid "print extra information" +msgstr "zusätzliche Informationen ausgeben" + +#: ../svn/svn.c:199 +msgid "display update information" +msgstr "Aktualisierungsinformation ausgeben" + +#: ../svn/svn.c:200 ../svnbench/svnbench.c:114 ../svnrdump/svnrdump.c:122 +msgid "specify a username ARG" +msgstr "Benutzername PAR angeben" + +#: ../svn/svn.c:202 +msgid "" +"specify a password ARG (caution: on many operating\n" +" systems, other users will be able to see this)" +msgstr "" +"gibt ein Passwort PAR an (Vorsicht: Auf vielen Betriebssystemen\n" +" ist dies für andere Benutzer sichtbar)" + +#: ../svn/svn.c:207 ../svnbench/svnbench.c:117 ../svnrdump/svnrdump.c:126 +msgid "read password from stdin" +msgstr "" + +#: ../svn/svn.c:209 +msgid "" +"Specify differencing options for external diff or\n" +" internal diff or blame. Default: '-u'. Options are\n" +" separated by spaces. Internal diff and blame take:\n" +" -u, --unified: Show 3 lines of unified context\n" +" -b, --ignore-space-change: Ignore changes in\n" +" amount of white space\n" +" -w, --ignore-all-space: Ignore all white space\n" +" --ignore-eol-style: Ignore changes in EOL style\n" +" -U ARG, --context ARG: Show ARG lines of context\n" +" -p, --show-c-function: Show C function name" +msgstr "" +"Gibt Optionen für ein externes Vergleichsprogramm oder internes\n" +" Programm zum Vergleichen oder Annotieren an.\n" +" Vorgabe: »-u«. Optionen werden durch Leerzeichen\n" +" getrennt angegeben. Das interne Programm zum\n" +" Vergleichen und Annotieren kennt folgende Optionen:\n" +" -u (--unified):\n" +" Gibt 3 Zeilen Standardkontext aus.\n" +" -b (--ignore-space-change):\n" +" Ignoriert Änderungen in der Anzahl von\n" +" Leerzeichen.\n" +" -w (--ignore-all-space):\n" +" Ignoriert sämtliche Leerzeichen.\n" +" --ignore-eol-style:\n" +" Ignoriert Änderungen im Zeilenendestil.\n" +" -U PAR, --context PAR: Gibt PAR Zeilen Kontext aus.\n" +" -p (--show-c-function):\n" +" Zeigt C-Funktionsname in Diff-Ausgabe." + +#: ../svn/svn.c:229 ../svnbench/svnbench.c:119 +msgid "pass contents of file ARG as additional args" +msgstr "" +"Inhalt der Datei PAR als zusätzliche Parameter\n" +" übergeben" + +#: ../svn/svn.c:231 ../svnbench/svnbench.c:121 +msgid "" +"limit operation by depth ARG ('empty', 'files',\n" +" 'immediates', or 'infinity')" +msgstr "" +"begrenzt Operation auf Tiefe PAR (»empty«, »files«,\n" +" »immediates« oder »infinity«)" + +#: ../svn/svn.c:235 +msgid "" +"set new working copy depth to ARG ('exclude',\n" +" 'empty', 'files', 'immediates', or 'infinity')" +msgstr "" +"setzt eine neue Tiefe PAR der Arbeitskopie (»exclude«,\n" +" »empty«, »files«, »immediates« oder »infinity«)" + +#: ../svn/svn.c:238 ../svnlook/svnlook.c:182 +msgid "output in XML" +msgstr "gibt XML aus" + +#: ../svn/svn.c:239 +msgid "DEPRECATED" +msgstr "VERALTET" + +#: ../svn/svn.c:241 ../svnbench/svnbench.c:126 +msgid "do not cross copies while traversing history" +msgstr "beendet Log-Ausgabe bei Kopieroperationen" + +#: ../svn/svn.c:243 +msgid "" +"disregard default and svn:ignore and\n" +" svn:global-ignores property ignores" +msgstr "" +"ignoriert Einstellungen aus »global-ignores« und den\n" +" Eigenschaften »svn:ignore« und »svn:global-ignores«" + +#: ../svn/svn.c:247 ../svnbench/svnbench.c:128 ../svnrdump/svnrdump.c:136 +#: ../svnsync/svnsync.c:203 +msgid "do not cache authentication tokens" +msgstr "Anmeldeinformationen nicht zwischenspeichern" + +#: ../svn/svn.c:249 ../svnbench/svnbench.c:130 ../svnrdump/svnrdump.c:150 +#, fuzzy +msgid "" +"deprecated; same as\n" +" --trust-server-cert-failures=unknown-ca" +msgstr "Veraltet; identisch mit --trust-unknown-ca" + +#: ../svn/svn.c:253 ../svnbench/svnbench.c:134 ../svnrdump/svnrdump.c:154 +msgid "" +"with --non-interactive, accept SSL server\n" +" certificates with failures; ARG is comma-separated\n" +" list of 'unknown-ca' (Unknown Authority),\n" +" 'cn-mismatch' (Hostname mismatch), 'expired'\n" +" (Expired certificate), 'not-yet-valid' (Not yet\n" +" valid certificate) and 'other' (all other not\n" +" separately classified certificate errors)." +msgstr "" + +#: ../svn/svn.c:267 ../svnrdump/svnrdump.c:128 ../svnsync/svnsync.c:195 +msgid "" +"do no interactive prompting (default is to prompt\n" +" only if standard input is a terminal device)" +msgstr "" +"verhindert interaktive Nachfragen (Standard sind Nachfragen\n" +" nur wenn die Standardeingabe ein Terminal ist)" + +#: ../svn/svn.c:271 ../svnrdump/svnrdump.c:132 ../svnsync/svnsync.c:199 +msgid "" +"do interactive prompting even if standard input\n" +" is not a terminal device" +msgstr "" +"erzwingt interaktive Nachfragen auch wenn die\n" +" Standardeingabe kein Terminal ist" + +#: ../svn/svn.c:275 +msgid "try operation but make no changes" +msgstr "Operation testen, aber keine Änderungen durchführen" + +#: ../svn/svn.c:277 +msgid "disable merge tracking; diff nodes as if related" +msgstr "deaktiviert Zusammenführungsverfolgung; erzeugt Unterschiede als ob Knoten verwandt wären" + +#: ../svn/svn.c:279 +msgid "ignore externals definitions" +msgstr "»svn:externals«-Definitionen ignorieren" + +#: ../svn/svn.c:280 +msgid "use ARG as merge command" +msgstr "PAR als Konflikteditor verwenden" + +#: ../svn/svn.c:281 +msgid "use ARG as external editor" +msgstr "PAR als externen Editor verwenden" + +#: ../svn/svn.c:283 +msgid "merge only mergeinfo differences" +msgstr "Führt nur Unterschiede in den Zusammenführungsinformationen zusammen" + +#: ../svn/svn.c:284 +msgid "use ARG as the older target" +msgstr "PAR als älteres Ziel verwenden" + +#: ../svn/svn.c:285 +msgid "use ARG as the newer target" +msgstr "PAR als neueres Ziel verwenden" + +#: ../svn/svn.c:287 +msgid "operate on a revision property (use with -r)" +msgstr "" +"auf einer Revisionseigenschaft arbeiten (mit -r\n" +" verwenden)" + +#: ../svn/svn.c:288 +msgid "relocate via URL-rewriting" +msgstr "durch Umschreiben der URL umplatzieren" + +#: ../svn/svn.c:290 ../svnadmin/svnadmin.c:221 ../svnbench/svnbench.c:150 +#: ../svnrdump/svnrdump.c:120 ../svnsync/svnsync.c:253 +msgid "read user configuration files from directory ARG" +msgstr "" +"Benutzerkonfigurationsdateien aus dem Verzeichnis\n" +" PAR lesen" + +#: ../svn/svn.c:292 ../svnbench/svnbench.c:152 ../svnrdump/svnrdump.c:142 +#: ../svnsync/svnsync.c:255 +msgid "" +"set user configuration option in the format:\n" +" FILE:SECTION:OPTION=[VALUE]\n" +" For example:\n" +" servers:global:http-library=serf" +msgstr "" +"Setzt Benutzerkonfigurationsoption im Format:\n" +" DATEI:ABSCHNITT:OPTION=[WERT]\n" +" Zum Beispiel:\n" +" servers:global:http-library=serf" + +#: ../svn/svn.c:299 +msgid "enable automatic properties" +msgstr "automatische Eigenschaften einschalten" + +#: ../svn/svn.c:300 +msgid "disable automatic properties" +msgstr "automatische Eigenschaften ausschalten" + +#: ../svn/svn.c:302 +msgid "" +"use a different EOL marker than the standard\n" +" system marker for files with the svn:eol-style\n" +" property set to 'native'.\n" +" ARG may be one of 'LF', 'CR', 'CRLF'" +msgstr "" +"Verwende eine andere Zeilenendemarke als den\n" +" Standard für Dateien mit der Eigenschaft\n" +" »svn:eol-style native«.\n" +" PAR kann »LF«, »CR« oder »CRLF« sein." + +#: ../svn/svn.c:309 ../svnbench/svnbench.c:159 +msgid "maximum number of log entries" +msgstr "maximale Anzahl Logeinträge" + +#: ../svn/svn.c:310 +msgid "don't unlock the targets" +msgstr "Ziele nicht freigeben" + +# CHECKME +#: ../svn/svn.c:311 +msgid "remove changelist association" +msgstr "Bezug zur Änderungsliste entfernen" + +#: ../svn/svn.c:313 +msgid "operate only on members of changelist ARG" +msgstr "nur auf Elementen der Änderungsliste PAR operieren" + +#: ../svn/svn.c:315 +msgid "don't delete changelists after commit" +msgstr "Änderungslisten nach Übertragung nicht löschen" + +#: ../svn/svn.c:316 +msgid "keep path in working copy" +msgstr "Pfad in Arbeitskopie beibehalten" + +#: ../svn/svn.c:318 ../svnbench/svnbench.c:161 +msgid "retrieve all revision properties" +msgstr "alle Revisionseigenschaften abfragen" + +#: ../svn/svn.c:320 ../svnbench/svnbench.c:163 +msgid "retrieve no revision properties" +msgstr "keine Revisionseigenschaften abfragen" + +#: ../svn/svn.c:322 ../svnbench/svnbench.c:165 +msgid "" +"set revision property ARG in new revision\n" +" using the name[=value] format" +msgstr "" +"Revisionseigenschaft PAR in neuer Revision\n" +" unter Verwendung des Formats name[=Wert] setzen" + +#: ../svn/svn.c:325 +msgid "make intermediate directories" +msgstr "Zwischenverzeichnisse erzeugen" + +#: ../svn/svn.c:327 ../svnbench/svnbench.c:169 +msgid "" +"use/display additional information from merge\n" +" history" +msgstr "" +"verwendet und zeigt zusätzliche Informationen aus der\n" +" Zusammenführungsgeschichte an" + +#: ../svn/svn.c:331 +#, fuzzy +msgid "" +"specify automatic conflict resolution action\n" +" ('postpone', 'working', 'base', 'mine-conflict',\n" +" 'theirs-conflict', 'mine-full', 'theirs-full',\n" +" 'edit', 'launch', 'recommended') (shorthand:\n" +" 'p', 'mc', 'tc', 'mf', 'tf', 'e', 'l', 'r')" +msgstr "" +"automatische Konfliktauflösungsaktion angeben\n" +" (»postpone«, »working«, »base«, »mine-conflict«,\n" +" »theirs-conflict«, »mine-full«, »theirs-full«,\n" +" »edit«, »launch«)\n" +" (kurz: »p«, »mc«, »tc«, »mf«, »tf«, »e«, »l«)" + +#: ../svn/svn.c:342 +msgid "" +"specify which collection of revisions to display\n" +" ('merged', 'eligible')" +msgstr "" +"gibt anzuzeigende Menge der Revisionen an\n" +" (»merged«, »eligible«)" + +#: ../svn/svn.c:346 +msgid "deprecated" +msgstr "veraltet" + +#: ../svn/svn.c:348 +msgid "" +"number of leading path components to strip from\n" +" paths parsed from the patch file. --strip 0\n" +" is the default and leaves paths unmodified.\n" +" --strip 1 would change the path\n" +" 'doc/fudge/crunchy.html' to 'fudge/crunchy.html'.\n" +" --strip 2 would leave just 'crunchy.html'\n" +" The expected component separator is '/' on all\n" +" platforms. A leading '/' counts as one component." +msgstr "" +"Anzahl der führenden Pfadkomponenten, die aus den aus der Patch-Datei\n" +" eingelesenen Pfaden entfernt werden sollen.\n" +" »--strip 0« ist die Vorgabe und lässt die Pfade unverändert.\n" +" »--strip 1« ändert z.B. »beispiel/txt/datei.txt« zu »txt/datei.txt«\n" +" »--strip 2« ließe noch »datei.txt«\n" +" Das erwartete Trennzeichen für Pfadkomponenten ist »/« auf\n" +" allen Plattformen. Ein einleitendes »/« zählt als eine Komponente." + +#: ../svn/svn.c:364 +msgid "don't expand keywords" +msgstr "Schlüsselwörter nicht expandieren" + +#: ../svn/svn.c:366 +msgid "apply the unidiff in reverse" +msgstr "Wendet Unidiff rückwärts an" + +#: ../svn/svn.c:368 +msgid "ignore whitespace during pattern matching" +msgstr "Ignoriert während des Mustervergleichs Leerzeichen, Tabulatoren und andere nicht druckbare Zeichen" + +#: ../svn/svn.c:369 +msgid "produce diff output" +msgstr "Erzeugt Ausgabe von Unterschieden" + +#. maps to show_diff +#. diff options +#: ../svn/svn.c:371 ../svnlook/svnlook.c:139 +msgid "use ARG as diff command" +msgstr "PAR als Vergleichsprogramm verwenden" + +#: ../svn/svn.c:373 +msgid "override diff-cmd specified in config file" +msgstr "Setzt in den Einstellungen angegebenes »diff-cmd« außer Kraft" + +#: ../svn/svn.c:375 ../svnlook/svnlook.c:133 +msgid "do not print differences for added files" +msgstr "Keine Unterschiede für hinzugefügte Dateien ausgeben" + +#: ../svn/svn.c:377 ../svnlook/svnlook.c:136 +msgid "do not print differences for deleted files" +msgstr "keine Unterschiede für gelöschte Dateien ausgeben" + +#: ../svn/svn.c:379 +msgid "don't diff copied or moved files with their source" +msgstr "Gibt kopierte oder verschobene Dateien nicht als Unterschied zu ihrer Quelle aus" + +#: ../svn/svn.c:381 +msgid "diff unrelated nodes as delete and add" +msgstr "Gibt nicht verwandte Knoten als Löschungen und Hinzufügung aus" + +#: ../svn/svn.c:382 +msgid "show a summary of the results" +msgstr "Zeige eine Zusammenfassung der Ergebnisse" + +#: ../svn/svn.c:384 +msgid "use git's extended diff format" +msgstr "Erweitertes Format von git verwenden" + +#: ../svn/svn.c:386 ../svnlook/svnlook.c:142 +msgid "ignore properties during the operation" +msgstr "Während des Vorgangs Eigenschaften ignorieren" + +#: ../svn/svn.c:388 ../svnlook/svnlook.c:145 +msgid "show only properties during the operation" +msgstr "Während des Vorgangs nur Eigenschaften anzeigen" + +#: ../svn/svn.c:390 +msgid "" +"generate diff suitable for generic third-party\n" +" patch tools; currently the same as\n" +" --show-copies-as-adds --ignore-properties" +msgstr "" +"Erzeugt Unterschiede, die sich für die Verarbeitung durch generische\n" +" Werkzeuge von Drittanbietern eignen; momentan identisch\n" +" mit --show-copies-as-adds --ignore-properties" + +#: ../svn/svn.c:398 +msgid "" +"Allow operation on mixed-revision working copy.\n" +" Use of this option is not recommended!\n" +" Please run 'svn update' instead." +msgstr "" +"Erlaubt Operation auf einer Arbeitskopie mit unterschiedlichen Revisionen.\n" +" Wie Verwendung dieser Option wird nicht empfohlen!\n" +" Führen Sie stattdessen »svn update« aus." + +#: ../svn/svn.c:404 +msgid "" +"also operate on externals defined by\n" +" svn:externals properties" +msgstr "" +"Arbeitet auch auf externen Verweisen\n" +" (»svn:externals« Eigenschaften)" + +#: ../svn/svn.c:408 +msgid "retrieve properties set on parents of the target" +msgstr "" + +#: ../svn/svn.c:410 +msgid "" +"use ARG as search pattern (glob syntax, case-\n" +" and accent-insensitive, may require quotation marks\n" +" to prevent shell expansion)" +msgstr "" + +#: ../svn/svn.c:416 +msgid "combine ARG with the previous search pattern" +msgstr "PAR mit dem vorherigen Suchmuster kombinieren" + +#: ../svn/svn.c:418 +msgid "show revision log message, author and date" +msgstr "Zeigt Logmeldung, Author und Datum der Revision an" + +#: ../svn/svn.c:420 +msgid "remove unversioned items" +msgstr "Entfernt nicht versionierte Objekte" + +#: ../svn/svn.c:421 +msgid "remove ignored items" +msgstr "Entfernt ignorierte Objekte" + +#: ../svn/svn.c:422 ../svnlook/svnlook.c:155 ../svnversion/svnversion.c:140 +msgid "do not output the trailing newline" +msgstr "Gibt den anhängenden Zeilenumbruch nicht aus" + +#: ../svn/svn.c:423 +msgid "show cached passwords" +msgstr "Zeigt gespeicherte Passwörter an" + +#: ../svn/svn.c:425 +msgid "" +"pin externals with no explicit revision to their\n" +" current revision (recommended when tagging)" +msgstr "" +"Legt externe Verweise ohne ausgewiesene Revision\n" +" auf aktuelle Revision fest (Empfohlen für Tags)" + +#: ../svn/svn.c:429 +msgid "" +"print only the item identified by ARG:\n" +" 'kind' node kind of TARGET\n" +" 'url' URL of TARGET in the repository\n" +" 'relative-url'\n" +" repository-relative URL of TARGET\n" +" 'repos-root-url'\n" +" root URL of repository\n" +" 'repos-uuid' UUID of repository\n" +" 'revision' specified or implied revision\n" +" 'last-changed-revision'\n" +" last change of TARGET at or before\n" +" 'revision'\n" +" 'last-changed-date'\n" +" date of 'last-changed-revision'\n" +" 'last-changed-author'\n" +" author of 'last-changed-revision'\n" +" 'wc-root' root of TARGET's working copy" +msgstr "" + +#: ../svn/svn.c:464 +#, fuzzy +msgid "" +"Local additions are merged with incoming additions\n" +" instead of causing a tree conflict. Use of this\n" +" option is not recommended! Use 'svn resolve' to\n" +" resolve tree conflicts instead." +msgstr "" +"entfernt Sperren wenn nötig. Zu verwenden, mit Vorsicht,\n" +" wenn das Spiegelprojektarchiv nicht mehr notwendige Sperren enthält\n" +" und nicht gleichzeitig von einer anderen svnsync-Instanz verwendet wird." + +#: ../svn/svn.c:473 +msgid "remove unreferenced pristines from .svn directory" +msgstr "" + +#: ../svn/svn.c:476 +msgid "drop shelf after successful unshelve" +msgstr "" + +#: ../svn/svn.c:526 +msgid "" +"Put files and directories under version control, scheduling\n" +"them for addition to repository. They will be added in next commit.\n" +"usage: add PATH...\n" +msgstr "" +"Stellt Dateien und Verzeichnisse unter Versionskontrolle und\n" +"plant sie zur Übertragung ins Projektarchiv ein.\n" +"Das tatsächliche Hinzufügen findet erst beim nächsten Übertragen statt.\n" +"Aufruf: add PFAD...\n" + +#: ../svn/svn.c:532 +msgid "add intermediate parents" +msgstr "direkte Eltern hinzufügen" + +#: ../svn/svn.c:535 +msgid "" +"Manage cached authentication credentials.\n" +"usage: 1. svn auth [PATTERN ...]\n" +"usage: 2. svn auth --remove PATTERN [PATTERN ...]\n" +"\n" +msgstr "" + +#: ../svn/svn.c:539 +msgid "" +" With no arguments, list all cached authentication credentials.\n" +" Authentication credentials include usernames, passwords,\n" +" SSL certificates, and SSL client-certificate passphrases.\n" +" If PATTERN is specified, only list credentials with attributes matching one\n" +" or more patterns. With the --remove option, remove cached authentication\n" +" credentials matching one or more patterns.\n" +"\n" +msgstr "" + +# Asked ML for clarification. +# Mattern matches AND or OR? +# Case sensitive or case in-sensitive? +# What about fingerprints? +#: ../svn/svn.c:546 +#, fuzzy +msgid "" +" If more than one pattern is specified credentials are considered only if they\n" +" match all specified patterns. Patterns are matched case-sensitively and may\n" +" contain glob wildcards:\n" +" ? matches any single character\n" +" * matches a sequence of arbitrary characters\n" +" [abc] matches any of the characters listed inside the brackets\n" +" Note that wildcards will usually need to be quoted or escaped on the\n" +" command line because many command shells will interfere by trying to\n" +" expand them.\n" +msgstr "" +"Verwaltet gespeicherte Zugangsdaten.\n" +"Aufruf: 1. svn auth [MUSTER ...]\n" +"Aufruf: 2. svn auth --remove MUSTER [MUSTER ...]\n" +"\n" +" Listet ohne Argumente alle gespeicherten Zugangsdaten auf.\n" +" Dies beinhaltet Benutzernamen, Passwörter, SSL-Zertifikate\n" +" und Passphrasen für SSL-Client-Zertifikate.\n" +" Gibt mit angegebener MUSTER nur die Zugangsdaten aus, deren\n" +" Attribute mit einem oder mehreren Mustern übereinstimmen.\n" +" Die Option --remove entfernt gespeicherte Zugangsdaten, die\n" +" einem oder mehreren Mustern entsprechen.\n" +"\n" +" Ist mehr als ein Muster angegeben ist, werden nur solche\n" +" Zugangsdaten beachtet, die allen Mustern entsprechen. Muster\n" +" unterscheiden Groß- und Kleinschreibung und können folgende Platz-\n" +" halter enthalten:\n" +" ? entspricht einem einzelnen Zeichen\n" +" * entspricht einer Anzahl von beliebigen Zeichen\n" +" [abc] entspricht einem der Zeichen innerhalb der Klammer\n" +" Platzhalter müssen in den meisten Fällen in der Kommandozeile mit\n" +" Anführungszeichen oder Escape-Zeichen angegeben werden, damit sie\n" +" nicht von der Befehlsumgebung als Dateimuster interpretiert werden.\n" +"\n" + +#: ../svn/svn.c:557 +msgid "remove matching authentication credentials" +msgstr "entfernt passende Zugangsdaten" + +#: ../svn/svn.c:562 +msgid "" +"Show when each line of a file was last (or\n" +"next) changed.\n" +"usage: blame [-rM:N] TARGET[@REV]...\n" +"\n" +msgstr "" + +#: ../svn/svn.c:566 +msgid "" +" Annotate each line of a file with the revision number and author of the\n" +" last change (or optionally the next change) to that line.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:569 ../svnbench/svnbench.c:222 +msgid "" +" With no revision range (same as -r0:REV), or with '-r M:N' where M < N,\n" +" annotate each line that is present in revision N of the file, with\n" +" the last revision at or before rN that changed or added the line,\n" +" looking back no further than rM.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:574 ../svnbench/svnbench.c:227 +msgid "" +" With a reverse revision range '-r M:N' where M > N,\n" +" annotate each line that is present in revision N of the file, with\n" +" the next revision after rN that changed or deleted the line,\n" +" looking forward no further than rM.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:579 ../svnbench/svnbench.c:232 +#, fuzzy +msgid "" +" If specified, REV determines in which revision the target is first\n" +" looked up.\n" +"\n" +msgstr "" +"Gibt den Inhalt der angegebenen Dateien oder URLs aus.\n" +"Aufruf: cat ZIEL[@REV]...\n" +"\n" +" Falls angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut wird.\n" + +#: ../svn/svn.c:582 ../svnbench/svnbench.c:235 +msgid " Write the annotated result to standard output.\n" +msgstr "" + +#: ../svn/svn.c:587 +#, fuzzy +msgid "" +"Output the content of specified files or URLs.\n" +"usage: cat TARGET[@REV]...\n" +"\n" +msgstr "" +"Gibt den Inhalt der angegebenen Dateien oder URLs aus.\n" +"Aufruf: cat ZIEL[@REV]...\n" +"\n" +" Falls angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut wird.\n" + +#: ../svn/svn.c:590 +#, fuzzy +msgid "" +" If specified, REV determines in which revision the target is first\n" +" looked up.\n" +msgstr "" +"Gibt den Inhalt der angegebenen Dateien oder URLs aus.\n" +"Aufruf: cat ZIEL[@REV]...\n" +"\n" +" Falls angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut wird.\n" + +#: ../svn/svn.c:596 +msgid "" +"Associate (or dissociate) changelist CLNAME with the named files.\n" +"usage: 1. changelist CLNAME PATH...\n" +" 2. changelist --remove PATH...\n" +msgstr "" +"Verknüpft Änderungsliste CLNAME (oder löst diese Verknüpfung)\n" +"mit den angegebenen Dateien.\n" +"Aufruf: 1. changelist CLNAME PFAD...\n" +" 2. changelist --remove PFAD...\n" + +#: ../svn/svn.c:603 +msgid "" +"Check out a working copy from a repository.\n" +"usage: checkout URL[@REV]... [PATH]\n" +"\n" +msgstr "" + +#: ../svn/svn.c:606 +#, fuzzy +msgid "" +" If specified, REV determines in which revision the URL is first\n" +" looked up.\n" +"\n" +msgstr "" +"Gibt den Inhalt der angegebenen Dateien oder URLs aus.\n" +"Aufruf: cat ZIEL[@REV]...\n" +"\n" +" Falls angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut wird.\n" + +#: ../svn/svn.c:609 +msgid "" +" If PATH is omitted, the basename of the URL will be used as\n" +" the destination. If multiple URLs are given each will be checked\n" +" out into a sub-directory of PATH, with the name of the sub-directory\n" +" being the basename of the URL.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:614 +#, fuzzy +msgid "" +" If --force is used, unversioned obstructing paths in the working\n" +" copy destination do not automatically cause the check out to fail.\n" +" If the obstructing path is the same type (file or directory) as the\n" +" corresponding path in the repository it becomes versioned but its\n" +" contents are left 'as-is' in the working copy. This means that an\n" +" obstructing directory's unversioned children may also obstruct and\n" +" become versioned. For files, any content differences between the\n" +" obstruction and the repository are treated like a local modification\n" +" to the working copy. All properties from the repository are applied\n" +" to the obstructing path.\n" +"\n" +msgstr "" +"Checkt eine Arbeitskopie aus einem Projektarchiv aus.\n" +"Aufruf: checkout URL[@REV]... [PFAD]\n" +"\n" +" Falls angegeben, legt REV fest, in welcher Revision die URL zuerst\n" +" nachgeschlagen wird.\n" +"\n" +" Ohne Angabe von PFAD wird der Basisname der URL als Ziel verwendet.\n" +" Sind mehrere URLs angegeben, wird jede in ein Unterverzeichnis von\n" +" PFAD ausgecheckt, dessen Name der Basisname der URL ist.\n" +"\n" +" Bei Angabe von --force lassen nicht versionierte, behindernde Objekte\n" +" in der Arbeitskopie den Vorgang nicht automatisch fehlschlagen. Falls\n" +" der behindernde Pfad vom gleichen Typ (Datei oder Verzeichnis) wie der\n" +" entsprechende Pfad im Projektarchiv ist, wird er versioniert, behält\n" +" aber seinen ursprünglichen Inhalt. Das bedeutet, dass nicht versionierte\n" +" Unterverzeichnisse eines behindernden Verzeichnisses ebenfalls versioniert\n" +" werden können. Bei Dateien werden alle Unterschiede im Inhalt wie lokale\n" +" Modifikationen in der Arbeitskopie behandelt. Sämtliche Eigenschaften\n" +" aus dem Projektarchiv werden auf den behindernden Pfad angewendet.\n" +"\n" +" Siehe auch »svn help update« für eine Liste möglicher Buchstaben,\n" +" die die durchgeführte Aktion beschreiben.\n" + +#: ../svn/svn.c:625 +msgid "" +" See also 'svn help update' for a list of possible characters\n" +" reporting the action taken.\n" +msgstr "" + +#: ../svn/svn.c:631 +msgid "" +"Either recover from an interrupted operation that left the working copy locked,\n" +"or remove unwanted files.\n" +"usage: 1. cleanup [WCPATH...]\n" +" 2. cleanup --remove-unversioned [WCPATH...]\n" +" cleanup --remove-ignored [WCPATH...]\n" +" 3. cleanup --vacuum-pristines [WCPATH...]\n" +"\n" +msgstr "" + +#: ../svn/svn.c:638 +msgid "" +" 1. When none of the options --remove-unversioned, --remove-ignored, and\n" +" --vacuum-pristines is specified, remove all write locks (shown as 'L' by\n" +" the 'svn status' command) from the working copy. Usually, this is only\n" +" necessary if a Subversion client has crashed while using the working copy,\n" +" leaving it in an unusable state.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:644 +msgid "" +" WARNING: There is no mechanism that will protect write locks still\n" +" being used by other Subversion clients. Running this command\n" +" without any options while another client is using the working\n" +" copy can corrupt the working copy beyond repair!\n" +"\n" +msgstr "" + +#: ../svn/svn.c:649 +msgid "" +" 2. If the --remove-unversioned option or the --remove-ignored option\n" +" is given, remove any unversioned or ignored items within WCPATH.\n" +" Note that the 'svn status' command shows unversioned items as '?',\n" +" and ignored items as 'I' if the --no-ignore option is given to it.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:654 +msgid "" +" 3. If the --vacuum-pristines option is given, remove pristine copies of\n" +" files which are stored inside the .svn directory and which are no longer\n" +" referenced by any file in the working copy.\n" +msgstr "" + +#: ../svn/svn.c:660 +#, fuzzy +msgid "deprecated and ignored" +msgstr "veraltet" + +#: ../svn/svn.c:663 +msgid "" +"Send changes from your working copy to the repository.\n" +"usage: commit [PATH...]\n" +"\n" +msgstr "" + +#: ../svn/svn.c:666 +msgid "" +" A log message must be provided, but it can be empty. If it is not\n" +" given by a --message or --file option, an editor will be started.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:669 +msgid "" +" If any targets are (or contain) locked items, those will be\n" +" unlocked after a successful commit, unless --no-unlock is given.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:672 +msgid "" +" If --include-externals is given, also commit file and directory\n" +" externals reached by recursion. Do not commit externals with a\n" +" fixed revision.\n" +msgstr "" + +#: ../svn/svn.c:680 +msgid "" +"Copy files and directories in a working copy or repository.\n" +"usage: copy SRC[@REV]... DST\n" +"\n" +msgstr "" + +#: ../svn/svn.c:683 +#, fuzzy +msgid "" +" SRC and DST can each be either a working copy (WC) path or URL:\n" +" WC -> WC: copy and schedule for addition (with history)\n" +" WC -> URL: immediately commit a copy of WC to URL\n" +" URL -> WC: check out URL into WC, schedule for addition\n" +" URL -> URL: complete server-side copy; used to branch and tag\n" +" All the SRCs must be of the same type. If DST is an existing directory,\n" +" the sources will be added as children of DST. When copying multiple\n" +" sources, DST must be an existing directory.\n" +"\n" +msgstr "" +"Kopiert Dateien und Verzeichnisse in einer Arbeitskopie oder im einem Projektarchiv\n" +"Aufruf: copy QUELLE[@REV]... ZIEL\n" +"\n" +" QUELLE und ZIEL können jeweils entweder ein Arbeitskopiepfad (AK) oder eine\n" +" URL sein:\n" +" AK -> AK: Kopieren und zum Hinzufügen einplanen (inklusive Historie)\n" +" AK -> URL: Sofort eine Kopie von AK zur URL übertragen\n" +" URL -> AK: Eine Kopie von URL nach AK auschecken und zum Hinzufügen\n" +" einplanen\n" +" URL -> URL: Kopie vollständig auf dem Server. Wird zum Verzweigen\n" +" und Markieren (branch & tag) verwendet.\n" +" Alle QUELLEn müssen vom selben Typ sein. Werden mehrere Quellen kopiert,\n" +" werden sie als Kindelemente von ZIEL hinzugefügt, welches dann ein\n" +" Verzeichnis sein muss.\n" +"\n" +" WARNUNG: Für Kompatibilität mit älteren Versionen von Subversion,\n" +" werden Kopien, die über zwei Arbeitskopiepfade (WC -> WC) vorgenommen\n" +" wurden, nicht das Projektarchiv kontaktieren. Deswegen könnten sie\n" +" standardmäßig nicht in der Lage sein, Zusammenführungsinformationen\n" +" von der Quelle der Kopie in das Ziel weiterzureichen.\n" + +#: ../svn/svn.c:692 +msgid "" +" WARNING: For compatibility with previous versions of Subversion,\n" +" copies performed using two working copy paths (WC -> WC) will not\n" +" contact the repository. As such, they may not, by default, be able\n" +" to propagate merge tracking information from the source of the copy\n" +" to the destination.\n" +msgstr "" + +#: ../svn/svn.c:702 +msgid "" +"Remove files and directories from version control.\n" +"usage: 1. delete PATH...\n" +" 2. delete URL...\n" +"\n" +msgstr "" + +#: ../svn/svn.c:706 +#, fuzzy +msgid "" +" 1. Each item specified by a PATH is scheduled for deletion upon\n" +" the next commit. Files, and directories that have not been\n" +" committed, are immediately removed from the working copy\n" +" unless the --keep-local option is given.\n" +" PATHs that are, or contain, unversioned or modified items will\n" +" not be removed unless the --force or --keep-local option is given.\n" +"\n" +msgstr "" +"Entfernt Dateien und Verzeichnisse aus der Versionskontrolle.\n" +"Aufruf: 1. delete PFAD...\n" +" 2. delete URL...\n" +"\n" +" 1. Jeder PFAD wird zum Löschen bei der nächsten Übertragung\n" +" markiert. Dateien und Verzeichnisse, die noch nicht übertragen\n" +" wurden, werden sofort aus der Arbeitskopie entfernt, es sei denn,\n" +" die Option --keep-local wurde angegeben.\n" +" PFAD(e), die nicht versioniert oder geändert sind, bzw.\n" +" entsprechende Einträge enthalten, werden nur gelöscht, wenn\n" +" die Optionen --force oder --keep-local angegeben wird.\n" +"\n" +" 2. Jedes mit einer URL angegebene Element wird mittels sofortiger\n" +" Übertragung aus dem Projektarchiv entfernt.\n" + +#: ../svn/svn.c:713 +msgid "" +" 2. Each item specified by a URL is deleted from the repository\n" +" via an immediate commit.\n" +msgstr "" + +#: ../svn/svn.c:719 +msgid "" +"Display local changes or differences between two revisions or paths.\n" +"usage: 1. diff\n" +" 2. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n" +" 3. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] \\\n" +" [PATH...]\n" +" 4. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n" +" 5. diff OLD-URL[@OLDREV] NEW-PATH[@NEWREV]\n" +" 6. diff OLD-PATH[@OLDREV] NEW-URL[@NEWREV]\n" +"\n" +msgstr "" + +#: ../svn/svn.c:728 +msgid "" +" 1. Use just 'svn diff' to display local modifications in a working copy.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:730 +msgid "" +" 2. Display the changes made to TARGETs as they are seen in REV between\n" +" two revisions. TARGETs may be all working copy paths or all URLs.\n" +" If TARGETs are working copy paths, N defaults to BASE and M to the\n" +" working copy; if URLs, N must be specified and M defaults to HEAD.\n" +" The '-c M' option is equivalent to '-r N:M' where N = M-1.\n" +" Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:737 +msgid "" +" 3. Display the differences between OLD-TGT as it was seen in OLDREV and\n" +" NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n" +" OLD-TGT and NEW-TGT and restrict the output to differences for those\n" +" paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV].\n" +" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV default\n" +" to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n" +" If OLDREV or NEWREV are not specified, they default to WORKING for\n" +" working copy targets and to HEAD for URL targets.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:746 +msgid "" +" Either or both OLD-TGT and NEW-TGT may also be paths to unversioned\n" +" targets. Revisions cannot be specified for unversioned targets.\n" +" Both targets must be of the same node kind (file or directory).\n" +" Diffing unversioned targets against URL targets is not supported.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:751 +msgid "" +" 4. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n" +" 5. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-PATH[@NEWREV]'\n" +" 6. Shorthand for 'svn diff --old=OLD-PATH[@OLDREV] --new=NEW-URL[@NEWREV]'\n" +msgstr "" + +#: ../svn/svn.c:761 +msgid "" +"Create an unversioned copy of a tree.\n" +"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n" +" 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n" +"\n" +msgstr "" + +#: ../svn/svn.c:765 +#, fuzzy +msgid "" +" 1. Exports a clean directory tree from the repository specified by\n" +" URL, at revision REV if it is given, otherwise at HEAD, into\n" +" PATH. If PATH is omitted, the last component of the URL is used\n" +" for the local directory name.\n" +"\n" +msgstr "" +"Erzeugt eine nicht versionierte Kopie eines Dateibaumes.\n" +"Aufruf: null-export [-r REV] URL[@PEGREV]\n" +"\n" +" Exportiert einen sauberen Verzeichnisbaum, der durch die URL\n" +" spezifiziert ist. Ohne Angabe von REV wird HEAD exportiert, sonst REV.\n" +"\n" +" PEGREV gibt an, in welcher Revision das Ziel zuerst gesucht wird.\n" + +#: ../svn/svn.c:770 +#, fuzzy +msgid "" +" 2. Exports a clean directory tree from the working copy specified by\n" +" PATH1, at revision REV if it is given, otherwise at WORKING, into\n" +" PATH2. If PATH2 is omitted, the last component of the PATH1 is used\n" +" for the local directory name. If REV is not specified, all local\n" +" changes will be preserved. Files not under version control will\n" +" not be copied.\n" +"\n" +msgstr "" +"Erzeugt eine nicht versionierte Kopie eines Dateibaumes.\n" +"Aufruf: 1. export [-r REV] URL[@PEGREV] [PFAD]\n" +" 2. export [-r REV] PFAD1[@PEGREV] [PFAD2]\n" +"\n" +" 1. Exportiert einen sauberen Verzeichnisbaum, der durch die URL\n" +" spezifiziert ist, aus dem Projektarchiv nach PFAD. Ohne Angabe von REV\n" +" wird HEAD exportiert, sonst REV. Ohne Angabe von PFAD wird der letzte\n" +" Abschnitt der URL als lokaler Verzeichnisname verwendet.\n" +"\n" +" 2. Exportiert einen sauberen Verzeichnisbaum aus PFAD1 heraus in das\n" +" Verzeichnis PFAD2. Ohne Angabe von REV wird WORKING exportiert,\n" +" sonst REV. Ohne Angabe von PFAD2 wird der letzte Abschnitt von PFAD1\n" +" als lokaler Verzeichnisname verwendet. Ohne Angabe von REV werden alle\n" +" lokalen Änderungen beibehalten. Objekte, die sich nicht unter\n" +" Versionskontrolle befinden, werden nicht kopiert.\n" +"\n" +" PEGREV gibt an, in welcher Revision das Ziel zuerst gesucht wird.\n" + +#: ../svn/svn.c:777 ../svnbench/svnbench.c:246 +#, fuzzy +msgid "" +" If specified, PEGREV determines in which revision the target is first\n" +" looked up.\n" +msgstr "" +"Gibt den Inhalt der angegebenen Dateien oder URLs aus.\n" +"Aufruf: cat ZIEL[@REV]...\n" +"\n" +" Falls angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut wird.\n" + +#: ../svn/svn.c:784 ../svnbench/svnbench.c:212 +msgid "" +"Describe the usage of this program or its subcommands.\n" +"usage: help [SUBCOMMAND...]\n" +msgstr "" +"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n" +"Aufruf: help [UNTERBEFEHL...]\n" + +#: ../svn/svn.c:791 +msgid "" +"Commit an unversioned file or tree into the repository.\n" +"usage: import [PATH] URL\n" +"\n" +msgstr "" + +#: ../svn/svn.c:794 +#, fuzzy +msgid "" +" Recursively commit a copy of PATH to URL.\n" +" If PATH is omitted '.' is assumed.\n" +" Parent directories are created as necessary in the repository.\n" +" If PATH is a directory, the contents of the directory are added\n" +" directly under URL.\n" +" Unversionable items such as device files and pipes are ignored\n" +" if --force is specified.\n" +msgstr "" +"Überträgt eine nicht versionierte Datei oder einen Dateibaum in das\n" +"Projektarchiv.\n" +"Aufruf: import [PFAD] URL\n" +"\n" +" Überträgt rekursiv eine Kopie des PFADes zur URL.\n" +" Ohne Angabe von PFAD wird ».« angenommen. Übergeordnete Verzeichnisse\n" +" werden soweit erforderlich im Projektarchiv angelegt.\n" +" Falls PFAD ein Verzeichnis ist, wird dessen Inhalt direkt unterhalb der URL\n" +" hinzugefügt.\n" +" Nichtversionierbare Elemente wie Gerätedateien und Pipes werden ignoriert,\n" +" falls --force angegeben wird.\n" + +#: ../svn/svn.c:806 +msgid "" +"Display information about a local or remote item.\n" +"usage: info [TARGET[@REV]...]\n" +"\n" +msgstr "" + +#: ../svn/svn.c:809 +#, fuzzy +msgid "" +" Print information about each TARGET (default: '.').\n" +" TARGET may be either a working-copy path or a URL. If specified, REV\n" +" determines in which revision the target is first looked up; the default\n" +" is HEAD for a URL or BASE for a WC path.\n" +"\n" +msgstr "" +"Zeigt Informationen über ein lokales oder auf dem Server befindliches\n" +"Objekt an.\n" +"Aufruf: info [ZIEL[@REV]...]\n" +"\n" +" Gibt Informationen über jedes ZIEL aus (Vorgabe: ».«).\n" +" ZIEL kann entweder ein Pfad einer Arbeitskopie oder eine URL sein. Wenn\n" +" angegeben, bestimmt REV, in welcher Revision zuerst nach dem Ziel gesucht\n" +" wird.\n" + +#: ../svn/svn.c:814 +msgid "" +" With --show-item, print only the value of one item of information\n" +" about TARGET.\n" +msgstr "" + +#: ../svn/svn.c:824 ../svn/svn.c:850 +msgid "" +"List directory entries in the repository.\n" +"usage: list [TARGET[@REV]...]\n" +"\n" +msgstr "" + +#: ../svn/svn.c:827 ../svn/svn.c:853 ../svnbench/svnbench.c:255 +msgid "" +" List each TARGET file and the contents of each TARGET directory as\n" +" they exist in the repository. If TARGET is a working copy path, the\n" +" corresponding repository URL will be used. If specified, REV determines\n" +" in which revision the target is first looked up.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:832 ../svn/svn.c:858 ../svnbench/svnbench.c:260 +msgid "" +" The default TARGET is '.', meaning the repository URL of the current\n" +" working directory.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:835 +msgid "" +" Multiple --search patterns may be specified and the output will be\n" +" reduced to those paths whose last segment - i.e. the file or directory\n" +" name - contains a sub-string matching at least one of these patterns\n" +" (Windows only).\n" +"\n" +msgstr "" + +#: ../svn/svn.c:840 ../svn/svn.c:865 +msgid "" +" With --verbose, the following fields will be shown for each item:\n" +"\n" +msgstr "" + +#: ../svn/svn.c:842 ../svn/svn.c:867 ../svnbench/svnbench.c:265 +msgid "" +" Revision number of the last commit\n" +" Author of the last commit\n" +" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n" +" Size (in bytes)\n" +" Date and time of the last commit\n" +msgstr "" + +#: ../svn/svn.c:861 +msgid "" +" Multiple --search patterns may be specified and the output will be\n" +" reduced to those paths whose last segment - i.e. the file or directory\n" +" name - matches at least one of these patterns.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:878 +#, fuzzy +msgid "" +"Lock working copy paths or URLs in the repository, so that\n" +"no other user can commit changes to them.\n" +"usage: lock TARGET...\n" +"\n" +msgstr "" +"Sperrt Arbeitskopiepfade oder URLs im Projektarchiv, so dass kein\n" +"anderer Anwender Änderungen an ihnen übertragen kann.\n" +"Aufruf: lock ZIEL...\n" +"\n" +" Benutze --force, um eine bereits vorhandene Sperre zu stehlen.\n" + +#: ../svn/svn.c:882 +#, fuzzy +msgid " Use --force to steal a lock from another user or working copy.\n" +msgstr "Verzeichnis »%s« ist in einer Arbeitskopie gesperrt" + +#: ../svn/svn.c:885 +msgid "read lock comment from file ARG" +msgstr "Sperrkommentar aus Datei PAR lesen" + +#: ../svn/svn.c:886 +msgid "specify lock comment ARG" +msgstr "PAR als Sperrkommentar verwenden" + +#: ../svn/svn.c:887 +msgid "force validity of lock comment source" +msgstr "" +"Gültigkeit der Quelle für die Sperrmeldung\n" +" erzwingen" + +#: ../svn/svn.c:888 +#, fuzzy +msgid "steal locks" +msgstr "Ungültige Sperre" + +#: ../svn/svn.c:891 +msgid "" +"Show the log messages for a set of revision(s) and/or path(s).\n" +"usage: 1. log [PATH][@REV]\n" +" 2. log URL[@REV] [PATH...]\n" +"\n" +msgstr "" + +#: ../svn/svn.c:895 +msgid "" +" 1. Print the log messages for the URL corresponding to PATH\n" +" (default: '.'). If specified, REV is the revision in which the\n" +" URL is first looked up, and the default revision range is REV:1.\n" +" If REV is not specified, the default revision range is BASE:1,\n" +" since the URL might not exist in the HEAD revision.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:901 +msgid "" +" 2. Print the log messages for the PATHs (default: '.') under URL.\n" +" If specified, REV is the revision in which the URL is first\n" +" looked up, and the default revision range is REV:1; otherwise,\n" +" the URL is looked up in HEAD, and the default revision range is\n" +" HEAD:1.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:907 ../svnbench/svnbench.c:290 +msgid "" +" Multiple '-c' or '-r' options may be specified (but not a\n" +" combination of '-c' and '-r' options), and mixing of forward and\n" +" reverse ranges is allowed.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:911 +msgid "" +" With -v, also print all affected paths with each log message.\n" +" Each changed path is preceded with a symbol describing the change:\n" +" A: The path was added or copied.\n" +" D: The path was deleted.\n" +" R: The path was replaced (deleted and re-added in the same revision).\n" +" M: The path's file and/or property content was modified.\n" +" If an added or replaced path was copied from somewhere else, the copy\n" +" source path and revision are shown in parentheses.\n" +" If a file or directory was moved from one path to another with 'svn move'\n" +" the old path will be listed as deleted and the new path will be listed\n" +" as copied from the old path at a prior revision.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:923 +msgid "" +" With -q, don't print the log message body itself (note that this is\n" +" compatible with -v).\n" +"\n" +msgstr "" + +#: ../svn/svn.c:926 +msgid "" +" Each log message is printed just once, even if more than one of the\n" +" affected paths for that revision were explicitly requested. Logs\n" +" follow copy history by default. Use --stop-on-copy to disable this\n" +" behavior, which can be useful for determining branchpoints.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:931 +msgid "" +" The --depth option is only valid in combination with the --diff option\n" +" and limits the scope of the displayed diff to the specified depth.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:934 +msgid "" +" If the --search option is used, log messages are displayed only if the\n" +" provided search pattern matches any of the author, date, log message\n" +" text (unless --quiet is used), or, if the --verbose option is also\n" +" provided, a changed path.\n" +" The search pattern may include \"glob syntax\" wildcards:\n" +" ? matches any single character\n" +" * matches a sequence of arbitrary characters\n" +" [abc] matches any of the characters listed inside the brackets\n" +" If multiple --search options are provided, a log message is shown if\n" +" it matches any of the provided search patterns. If the --search-and\n" +" option is used, that option's argument is combined with the pattern\n" +" from the previous --search or --search-and option, and a log message\n" +" is shown only if it matches the combined search pattern.\n" +" If --limit is used in combination with --search, --limit restricts the\n" +" number of log messages searched, rather than restricting the output\n" +" to a particular number of matching log messages.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:951 +msgid "" +" Examples:\n" +"\n" +msgstr "" + +#: ../svn/svn.c:953 +msgid "" +" Show the latest 5 log messages for the current working copy\n" +" directory and display paths changed in each commit:\n" +" svn log -l 5 -v\n" +"\n" +msgstr "" + +#: ../svn/svn.c:957 +msgid "" +" Show the log for bar.c as of revision 42:\n" +" svn log bar.c@42\n" +"\n" +msgstr "" + +#: ../svn/svn.c:960 +msgid "" +" Show log messages and diffs for each commit to foo.c:\n" " svn log --diff http://www.example.com/repo/project/foo.c\n" " (Because the above command uses a full URL it does not require\n" " a working copy.)\n" "\n" +msgstr "" + +#: ../svn/svn.c:965 +msgid "" " Show log messages for the children foo.c and bar.c of the directory\n" " '/trunk' as it appeared in revision 50, using the ^/ URL shortcut:\n" " svn log ^/trunk@50 foo.c bar.c\n" "\n" +msgstr "" + +#: ../svn/svn.c:969 +msgid "" " Show the log messages for any incoming changes to foo.c during the\n" " next 'svn update':\n" " svn log -r BASE:HEAD foo.c\n" "\n" +msgstr "" + +#: ../svn/svn.c:973 +msgid "" " Show the log message for the revision in which /branches/foo\n" " was created:\n" " svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo\n" -msgstr "" -"Zeigt die Logmeldungen für eine Menge von Revisionen und/oder Dateien.\n" -"Aufruf: 1. log [PFAD][@REV]\n" -" 2. log URL[@REV] [PFAD...]\n" -"\n" -" 1. Gibt Log-Einträge der zu PFAD gehörenden URL aus. (Vorgabe: ».«)\n" -" Ist REV angegeben, ist das die Revision in der URL zuerst gesucht\n" -" Ist REV angegeben, ist das die Revision in der URL zuerst gesucht\n" -" wird, und der vorgegebene Versionsbereich ist REV:1. Ist REV nicht\n" -" angegeben, so ist der vorgegebene Revisionsbereich BASE:1, da die\n" -" URL möglicherweise in der Revision HEAD nicht existiert.\n" -"\n" -" 2. Gibt Log-Einträge für PFAD(e) unter URL aus, (Vorgabe: ».«)\n" -" Ist REV angegeben, ist das die Revision in der URL zuerst gesucht\n" -" wird, und der vorgegebene Versionsbereich ist REV:1. Andernfalls wird\n" -" URL in HEAD gesucht und der vorgegebene Revisionsbereich ist\n" -" HEAD:1.\n" "\n" -" Mehrere »-c«- oder »-r«-Optionen dürfen angegeben werden (aber keine\n" -" Kombination von »-c« und »-r«) und das Mischen von vor- und\n" -" rückwärtigen Bereichen ist erlaubt.\n" -"\n" -" Mit »-v« werden auch die betroffenen Pfade mit jeder Logmeldung ausgegeben.\n" -" Mit »-q« wird die Logmeldung selbst nicht ausgegeben (Hinweis: Diese Option\n" -" ist kompatibel mit »-v«).\n" -"\n" -" Jede Logmeldung wird nur einmal ausgegeben, selbst wenn mehr als einer\n" -" der betroffenen Pfade explizit angefragt wurde. Logs folgen per Vorgabe\n" -" der Historie von Kopien. Benutzen Sie »--stop-on-copy«, um dieses Verhalten,\n" -" z.B. zum Auffinden von Verzweigungen, zu deaktivieren.\n" -"\n" -" Die Option »--depth« ist nur in Verbindung mit der Option »--diff« gültig\n" -" und begrenzt den Umfang der ausgegebenen Unterschiede auf die\n" -" angegebene Tiefe.\n" -"\n" -" Wenn die Option »--search« verwendet wird, werden Logmeldungen nur\n" -" angezeigt, wenn sie dem Suchmuster in den Feldern Autor, Datum oder\n" -" Meldung (nur ohne »--quiet«), oder, falls »--verbose« angegeben ist,\n" -" zusätzlich mit einem geänderten Pfad.\n" -" Das Suchmuster darf folgende Platzhalter enthalten:\n" -" ? entspricht einem einzelnen beliebigen Zeichen\n" -" * entspricht einer Folge beliebiger Zeichen\n" -" [abc] entspricht einem beliebigem Zeichen der Liste in den Klammern\n" -" Werden mehrere »--search« Optionen angegeben, wird die Logmeldung\n" -" ausgegeben, wenn eine einziges Suchmuster passt. Mit »--search-and«\n" -" wird das angegebene Argument mit dem vorangehenden »--search« oder\n" -" »--search-and« Optionen kombiniert und nur Logmeldungen ausgegeben\n" -" die auf das kombinierte Suchmuster passen.\n" -" Wenn »--limit« in Verbindgung mit »--search« verwendet wird, begrenzt es\n" -" die Anzahl der durchsuchten Logmeldungen, nicht notwendigerweise die\n" -" der ausgegebenen.\n" -"\n" -" Beispiele:\n" -" Ausgabe der letzten 5 Logmeldungen für das Arbeitsverzeichnis in der\n" -" Arbeitkopie, mit Ausgabe der geänderten Pfade: svn log -l 5 -v\n" -"\n" -" Ausgabe des Logs für datei.c mit Revision 42:\n" -" svn log datei.c@42\n" -"\n" -" Ausgabe der Logmeldungen und Unterschiede für jede Übertragung\n" -" von datei.c:\n" -" svn log --diff http://www.example.com/repo/projekt/datei.c\n" -" (Da der Befehl die URL angibt, ist keine Arbeitskopie notwendig.)\n" -"\n" -" Ausgabe der Logmeldungen für die Dateien datei.c and programm.c\n" -" im Verzeichnis »/trunk«, wie es in Revision 50 erschien, mit der\n" -" Kurzform »^/« für die URL:\n" -" svn log ^/trunk@50 datei.c programm.c\n" -"\n" -" Ausgabe der Logmeldungen für Änderungen an datei.c, die bei der\n" -" nächsten Ausführung von »svn update« empfangen werden: svn log -r BASE:HEAD datei.c\n" -"\n" -" Ausgabe der Logmeldung für die Revision die »/branches/zweig» erzeugte:\n" -" svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/zweig\n" - -#: ../svn/svn.c:874 ../svnbench/svnbench.c:286 +msgstr "" + +#: ../svn/svn.c:977 +msgid "" +" If ^/trunk/foo.c was moved to ^/trunk/bar.c' in revision 22, 'svn log -v'\n" +" shows a deletion and a copy in its changed paths list, such as:\n" +" D /trunk/foo.c\n" +" A /trunk/bar.c (from /trunk/foo.c:21)\n" +msgstr "" + +#: ../svn/svn.c:986 ../svnbench/svnbench.c:305 msgid "retrieve revision property ARG" msgstr "Revisionseigenschaft PAR abfragen" -#: ../svn/svn.c:875 ../svnbench/svnbench.c:287 +#: ../svn/svn.c:987 ../svnbench/svnbench.c:306 msgid "the change made in revision ARG" msgstr "die in Revision PAR durchgeführte Änderung" -#: ../svn/svn.c:876 +#: ../svn/svn.c:988 msgid "also print all affected paths" msgstr "gibt auch alle betroffenen Pfade aus" -#: ../svn/svn.c:877 +#: ../svn/svn.c:989 msgid "do not print the log message" msgstr "gibt die Logmeldung nicht aus" #. For this large section, let's keep it unindented for easier #. * viewing/editing. It has been vim-treated with a textwidth=75 and 'gw' #. * (with quotes and newlines removed). -#: ../svn/svn.c:883 +#: ../svn/svn.c:995 msgid "" "Merge changes into a working copy.\n" "usage: 1. merge SOURCE[@REV] [TARGET_WCPATH]\n" @@ -12684,17 +15148,33 @@ msgid "" " 3. merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" " (the '2-URL' merge)\n" "\n" +msgstr "" + +#: ../svn/svn.c:1003 +msgid "" " 1. This form, with one source path and no revision range, is called\n" " a 'complete' merge:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1006 +msgid "" " svn merge SOURCE[@REV] [TARGET_WCPATH]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1008 +msgid "" " The complete merge is used for the 'sync' and 'reintegrate' merges\n" " in the 'feature branch' pattern described below. It finds all the\n" " changes on the source branch that have not already been merged to the\n" " target branch, and merges them into the working copy. Merge tracking\n" " is used to know which changes have already been merged.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1014 +msgid "" " SOURCE specifies the branch from where the changes will be pulled, and\n" " TARGET_WCPATH specifies a working copy of the target branch to which\n" " the changes will be applied. Normally SOURCE and TARGET_WCPATH should\n" @@ -12702,6 +15182,10 @@ msgid "" " subtree, then the subtree path must be included in both SOURCE and\n" " TARGET_WCPATH; this is discouraged, to avoid subtree mergeinfo.)\n" "\n" +msgstr "" + +#: ../svn/svn.c:1021 +msgid "" " SOURCE is usually a URL. The optional '@REV' specifies both the peg\n" " revision of the URL and the latest revision that will be considered\n" " for merging; if REV is not specified, the HEAD revision is assumed. If\n" @@ -12709,28 +15193,61 @@ msgid "" " used, and the default value of 'REV' is the base revision (usually the\n" " revision last updated to).\n" "\n" +msgstr "" + +#: ../svn/svn.c:1028 +msgid "" " TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" " assumed. There are some special cases:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1031 +msgid "" " - If SOURCE is a URL:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1033 +msgid "" " - If the basename of the URL and the basename of '.' are the\n" " same, then the differences are applied to '.'. Otherwise,\n" " if a file with the same basename as that of the URL is found\n" " within '.', then the differences are applied to that file.\n" " In all other cases, the target defaults to '.'.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1039 +#, fuzzy +msgid "" " - If SOURCE is a working copy path:\n" "\n" +msgstr "Kann keinen Arbeitskopiepfad finden" + +#: ../svn/svn.c:1041 +msgid "" " - If the source is a file, then differences are applied to that\n" " file (useful for reverse-merging earlier changes). Otherwise,\n" " if the source is a directory, then the target defaults to '.'.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1045 +msgid "" " In normal usage the working copy should be up to date, at a single\n" " revision, with no local modifications and no switched subtrees.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1048 +msgid "" " - The 'Feature Branch' Merging Pattern -\n" "\n" +msgstr "" + +#: ../svn/svn.c:1050 +msgid "" " In this commonly used work flow, known also as the 'development\n" " branch' pattern, a developer creates a branch and commits a series of\n" " changes that implement a new feature. The developer periodically\n" @@ -12739,16 +15256,29 @@ msgid "" " complete, the developer performs a merge from the feature branch to\n" " the parent branch to re-integrate the changes.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1058 +msgid "" " parent --+----------o------o-o-------------o--\n" " \\ \\ \\ /\n" " \\ merge merge merge\n" " \\ \\ \\ /\n" " feature +--o-o-------o----o-o----o-------\n" "\n" +msgstr "" + +#: ../svn/svn.c:1064 +msgid "" " A merge from the parent branch to the feature branch is called a\n" " 'sync' or 'catch-up' merge, and a merge from the feature branch to the\n" " parent branch is called a 'reintegrate' merge.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1068 +#, fuzzy +msgid "" " - Sync Merge Example -\n" " ............\n" " . .\n" @@ -12759,6 +15289,20 @@ msgid "" " feature +------------------------o-----\n" " r100 r200\n" "\n" +msgstr "" +"PAR (manche Befehle akzeptieren auch einen\n" +" Wertebereich PAR1:PAR2)\n" +" Ein Revisionsparameter kann sein:\n" +" NUMMER Revisionsnummer\n" +" »{«DATUM»}« Revision zum Startdatum\n" +" »HEAD« neueste Revision im Projektarchiv\n" +" »BASE« Basisrevision der Arbeitskopie\n" +" »COMMITTED« letzte übertragene Revision zu\n" +" oder vor BASE\n" +" »PREV« letzte Revision vor COMMITTED" + +#: ../svn/svn.c:1078 +msgid "" " Subversion will locate all the changes on 'trunk' that have not yet\n" " been merged into the 'feature' branch. In this case that is a single\n" " range, r100:200. In the diagram above, L marks the left side (trunk@100)\n" @@ -12767,23 +15311,47 @@ msgid "" " path. In this case, the working copy is a clean checkout of the entire\n" " 'feature' branch.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1086 +msgid "" " To perform this sync merge, have a clean working copy of the feature\n" " branch and run the following command in its top-level directory:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1089 +msgid "" " svn merge ^/trunk\n" "\n" +msgstr "" + +#: ../svn/svn.c:1091 +msgid "" " Note that the merge is now only in your local working copy and still\n" " needs to be committed to the repository so that it can be seen by\n" " others. You can review the changes and you may have to resolve\n" " conflicts before you commit the merge.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1096 +msgid "" " - Reintegrate Merge Example -\n" "\n" +msgstr "" + +#: ../svn/svn.c:1098 +msgid "" " The feature branch was last synced with trunk up to revision X. So the\n" " difference between trunk@X and feature@HEAD contains the complete set\n" " of changes that implement the feature, and no other changes. These\n" " changes are applied to trunk.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1103 +msgid "" " rW rX\n" " trunk ------+--------------------L------------------o\n" " \\ . ^\n" @@ -12791,57 +15359,108 @@ msgid "" " \\ . /\n" " feature +--------------------------------R\n" "\n" +msgstr "" + +#: ../svn/svn.c:1110 +msgid "" " In the diagram above, L marks the left side (trunk@X) and R marks the\n" " right side (feature@HEAD) of the merge. The difference between the\n" " left and right side is merged into trunk, the target.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1114 +msgid "" " To perform the merge, have a clean working copy of trunk and run the\n" " following command in its top-level directory:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1117 +msgid "" " svn merge ^/feature\n" "\n" +msgstr "" + +#: ../svn/svn.c:1119 +msgid "" " To prevent unnecessary merge conflicts, a reintegrate merge requires\n" " that TARGET_WCPATH is not a mixed-revision working copy, has no local\n" " modifications, and has no switched subtrees.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1123 +msgid "" " A reintegrate merge also requires that the source branch is coherently\n" " synced with the target -- in the above example, this means that all\n" " revisions between the branch point W and the last merged revision X\n" " are merged to the feature branch, so that there are no unmerged\n" " revisions in-between.\n" "\n" -"\n" +msgstr "" + +#: ../svn/svn.c:1130 +msgid "" " 2. This form is called a 'cherry-pick' merge:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1132 +msgid "" " svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1134 +msgid "" " A cherry-pick merge is used to merge specific revisions (or revision\n" " ranges) from one branch to another. By default, this uses merge\n" " tracking to automatically skip any revisions that have already been\n" " merged to the target; you can use the --ignore-ancestry option to\n" " disable such skipping.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1140 +msgid "" " SOURCE is usually a URL. The optional '@REV' specifies only the peg\n" " revision of the URL and does not affect the merge range; if REV is not\n" " specified, the HEAD revision is assumed. If SOURCE is a working copy\n" " path, the corresponding URL of the path is used, and the default value\n" " of 'REV' is the base revision (usually the revision last updated to).\n" "\n" +msgstr "" + +#: ../svn/svn.c:1146 ../svn/svn.c:1217 +msgid "" " TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" " assumed. The special cases noted above in the 'complete' merge form\n" " also apply here.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1150 +msgid "" " The revision ranges to be merged are specified by the '-r' and/or '-c'\n" " options. '-r N:M' refers to the difference in the history of the\n" " source branch between revisions N and M. You can use '-c M' to merge\n" " single revisions: '-c M' is equivalent to '-r :M'. Each such\n" " difference is applied to TARGET_WCPATH.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1156 +msgid "" " If the mergeinfo in TARGET_WCPATH indicates that revisions within the\n" " range were already merged, changes made in those revisions are not\n" " merged again. If needed, the range is broken into multiple sub-ranges,\n" " and each sub-range is merged separately.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1161 +msgid "" " A 'reverse range' can be used to undo changes. For example, when\n" " source and target refer to the same branch, a previously committed\n" " revision can be 'undone'. In a reverse range, N is greater than M in\n" @@ -12849,14 +15468,30 @@ msgid "" " is equivalent to '-r M:'. Undoing changes like this is also known\n" " as performing a 'reverse merge'.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1168 +msgid "" " Multiple '-c' and/or '-r' options may be specified and mixing of\n" " forward and reverse ranges is allowed.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1171 +msgid "" " - Cherry-pick Merge Example -\n" "\n" +msgstr "" + +#: ../svn/svn.c:1173 +msgid "" " A bug has been fixed on trunk in revision 50. This fix needs to\n" " be merged from trunk onto the release branch.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1176 +msgid "" " 1.x-release +-----------------------o-----\n" " / ^\n" " / |\n" @@ -12864,33 +15499,72 @@ msgid "" " trunk ------+--------------------------LR-----\n" " r50\n" "\n" +msgstr "" + +#: ../svn/svn.c:1183 +msgid "" " In the above diagram, L marks the left side (trunk@49) and R marks the\n" " right side (trunk@50) of the merge. The difference between the left\n" " and right side is applied to the target working copy path.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1187 +msgid "" " Note that the difference between revision 49 and 50 is exactly those\n" " changes that were committed in revision 50, not including changes\n" " committed in revision 49.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1191 +msgid "" " To perform the merge, have a clean working copy of the release branch\n" " and run the following command in its top-level directory; remember\n" " that the default target is '.':\n" "\n" +msgstr "" + +#: ../svn/svn.c:1195 +msgid "" " svn merge -c50 ^/trunk\n" "\n" +msgstr "" + +#: ../svn/svn.c:1197 +msgid "" " You can also cherry-pick several revisions and/or revision ranges:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1199 +msgid "" " svn merge -c50,54,60 -r65:68 ^/trunk\n" "\n" -"\n" +msgstr "" + +#: ../svn/svn.c:1202 +msgid "" " 3. This form is called a '2-URL merge':\n" "\n" +msgstr "" + +#: ../svn/svn.c:1204 +msgid "" " svn merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1206 +msgid "" " You should use this merge variant only if the other variants do not\n" " apply to your situation, as this variant can be quite complex to\n" " master.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1210 +msgid "" " Two source URLs are specified, identifying two trees on the same\n" " branch or on different branches. The trees are compared and the\n" " difference from SOURCE1@REV1 to SOURCE2@REV2 is applied to the\n" @@ -12898,23 +15572,39 @@ msgid "" " branch may be the same as one or both sources, or different again.\n" " The three branches involved can be completely unrelated.\n" "\n" -" TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" -" assumed. The special cases noted above in the 'complete' merge form\n" -" also apply here.\n" -"\n" +msgstr "" + +#: ../svn/svn.c:1221 +msgid "" " SOURCE1 and/or SOURCE2 can also be specified as a working copy path,\n" " in which case the merge source URL is derived from the working copy.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1224 +msgid "" " - 2-URL Merge Example -\n" "\n" +msgstr "" + +#: ../svn/svn.c:1226 +msgid "" " Two features have been developed on separate branches called 'foo' and\n" " 'bar'. It has since become clear that 'bar' should be combined with\n" " the 'foo' branch for further development before reintegration.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1230 +msgid "" " Although both feature branches originate from trunk, they are not\n" " directly related -- one is not a direct copy of the other. A 2-URL\n" " merge is necessary.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1234 +msgid "" " The 'bar' branch has been synced with trunk up to revision 500.\n" " (If this revision number is not known, it can be located using the\n" " 'svn log' and/or 'svn mergeinfo' commands.)\n" @@ -12922,6 +15612,10 @@ msgid "" " set of changes related to feature 'bar', and no other changes. These\n" " changes are applied to the 'foo' branch.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1241 +msgid "" " foo +-----------------------------------o\n" " / ^\n" " / /\n" @@ -12932,40 +15626,83 @@ msgid "" " \\ . /\n" " bar +-----------------------------------R\n" "\n" +msgstr "" + +#: ../svn/svn.c:1251 +msgid "" " In the diagram above, L marks the left side (trunk@500) and R marks\n" " the right side (bar@HEAD) of the merge. The difference between the\n" " left and right side is applied to the target working copy path, in\n" " this case a working copy of the 'foo' branch.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1256 +msgid "" " To perform the merge, have a clean working copy of the 'foo' branch\n" " and run the following command in its top-level directory:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1259 +msgid "" " svn merge ^/trunk@500 ^/bar\n" "\n" +msgstr "" + +#: ../svn/svn.c:1261 +msgid "" " The exact changes applied by a 2-URL merge can be previewed with svn's\n" " diff command, which is a good idea to verify if you do not have the\n" " luxury of a clean working copy to merge to. In this case:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1265 +msgid "" " svn diff ^/trunk@500 ^/bar@HEAD\n" "\n" -"\n" +msgstr "" + +#: ../svn/svn.c:1268 +msgid "" " The following applies to all types of merges:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1270 +msgid "" " To prevent unnecessary merge conflicts, svn merge requires that\n" " TARGET_WCPATH is not a mixed-revision working copy. Running 'svn update'\n" " before starting a merge ensures that all items in the working copy are\n" " based on the same revision.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1275 +msgid "" " If possible, you should have no local modifications in the merge's target\n" " working copy prior to the merge, to keep things simpler. It will be\n" " easier to revert the merge and to understand the branch's history.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1279 +msgid "" " Switched sub-paths should also be avoided during merging, as they may\n" " cause incomplete merges and create subtree mergeinfo.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1282 +msgid "" " For each merged item a line will be printed with characters reporting the\n" " action taken. These characters have the following meaning:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1285 ../svn/svn.c:2012 +msgid "" " A Added\n" " D Deleted\n" " U Updated\n" @@ -12974,14 +15711,26 @@ msgid "" " E Existed\n" " R Replaced\n" "\n" +msgstr "" + +#: ../svn/svn.c:1293 +msgid "" " Characters in the first column report about the item itself.\n" " Characters in the second column report about properties of the item.\n" " A 'C' in the third column indicates a tree conflict, while a 'C' in\n" " the first and second columns indicate textual conflicts in files\n" " and in property values, respectively.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1299 +msgid "" " - Merge Tracking -\n" "\n" +msgstr "" + +#: ../svn/svn.c:1301 +msgid "" " Subversion uses the svn:mergeinfo property to track merge history. This\n" " property is considered at the start of a merge to determine what to merge\n" " and it is updated at the conclusion of the merge to describe the merge\n" @@ -12991,11 +15740,24 @@ msgid "" " other). This is verified and enforced when using sync merges and\n" " reintegrate merges.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1310 +msgid "" " The --ignore-ancestry option prevents merge tracking and thus ignores\n" " mergeinfo, neither considering it nor recording it.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1313 +#, fuzzy +msgid "" " - Merging from foreign repositories -\n" "\n" +msgstr "-- Zusammenführen (aus fremden Projektarchiv) von r%ld in »%s«:\n" + +#: ../svn/svn.c:1315 +msgid "" " Subversion does support merging from foreign repositories.\n" " While all merge source URLs must point to the same repository, the merge\n" " target working copy may come from a different repository than the source.\n" @@ -13004,398 +15766,21 @@ msgid "" " target. Also, merge-tracking is not supported for merges from foreign\n" " repositories.\n" msgstr "" -"Führt Änderungen aus dem Projektarchiv in einer Arbeitskopie zusammen.\n" -"Aufruf: 1. merge QUELLE[@REV] [ZIEL_AKPfad]\n" -" (»vollständige« Zusammenführung)\n" -" 2. merge [-c M[,N...] | -r N:M ...] QUELLE[@REV] [ZIEL_AKPfad]\n" -" (Zusammenführung einzelner ausgewählter Änderungen)\n" -" 3. merge QUELLE1[@REV1] QUELLE2[@REV2] [ZIEL_AKPfad]\n" -" (Zusammenführung der Unterschiede zweier URLs)\n" -"\n" -" 1. Diese Form, mit einem Quellpfad und keinem Revisionsbereich wird\n" -" »vollständige« Zusammenführung genannt:\n" -"\n" -" svn merge QUELLE[@REV] [ZIEL_AKPfad]\n" -"\n" -" Die vollständige Zusammenführung wird für die Synchronisation und\n" -" die Reintegration von Zweigen (nach dem Muster »Feature Branch«,\n" -" s.u.) verwendet. Sie findet alle Änderungen in einem Quellpfad, die\n" -" noch nicht in das Ziel eingebracht wurden, und führt sie mit\n" -" Arbeitskopie zusammen. Die Zusammenführungsverfolgung wird für die\n" -" Erkennung schon eingebrachter Änderungen verwendet.\n" -"\n" -" QUELLE ist der Zweig von dem die Änderungen geholt werden, und\n" -" ZIEL_AKPfad eine Arbeitskopie des Zielzweigs, auf die die Änderungen\n" -" angewendet werden. Normalerweise sollten QUELLE und ZIEL_AKPfad\n" -" auf das Wurzelverzeichnis eines Zweigs zeigen. (Wenn nur ein\n" -" Unterbaum zusammengeführt werden soll, muss sein Pfad sowohl in\n" -" QUELLE als auch in ZIEL_AKPfad enthalten sein; Dies ist nicht\n" -" empfohlen, um Zusammenführungsinformationen auf Unterbäumen zu\n" -" vermeiden.)\n" -"\n" -" QUELLE ist im Normalfall eine URL. Die optionale Angabe von »@REV«\n" -" gibt sowohl die Fix-Revision zum Auffinden des Pfades als auch die\n" -" letzte Revision an, die für die Zusammenführung in Betracht\n" -" gezogen wird. Ist REV nicht angegeben, wird »HEAD« angenommen. Ist\n" -" QUELLE der Pfad einer Arbeitskopie, wird die damit zusammenhängende\n" -" URL verwendet. Die Basisversion der Arbeitskopie wird dann als REV\n" -" verwendet, dies ist meist die letzte Revision, auf die die\n" -" Arbeitskopie aktualisiert wurde.\n" -"\n" -" ZIEL_AKPfad ist ein Arbeitskopiepfad; Fehlt die Angabe, wird\n" -" allgemein das aktuelle Arbeitsverzeichnis ».« angenommen. Es gibt\n" -" folgende Sonderfälle:\n" -"\n" -" - wenn QUELLE eine URL ist:\n" -"\n" -" - Sind der Basisname der URL und er Basisname von ».« gleich\n" -" so werden die Unterschiede auf ».« angewandt. Andernfalls,\n" -" falls eine Datei mit dem gleichen Basisnamen die jeder der\n" -" URL in ».« vorhanden ist, werden die Unterschiede auf diese\n" -" Datei angewandt. In allen anderen Fällen wird als Ziel ».«\n" -" verwendet.\n" -"\n" -" - wenn QUELLE ein Arbeitskopiepfad ist:\n" -"\n" -" - Wenn QUELLE eine Datei ist, werden die Unterschiede auf\n" -" diese Datei angewandt (Hilfreich beim rückwärtigen\n" -" Zusammenführen früherer Änderungen). Andernfalls, wenn es\n" -" sich um ein Verzeichnis handelt, wird als Ziel ».«\n" -" verwendet.\n" -"\n" -" Im Normalgebrauch ist die Arbeitskopie auf dem neuesten Stand, auf\n" -" einer einzigen Revision, ohne lokale Änderungen und ohne umgestellte\n" -" Unterbäume.\n" -"\n" -" - Muster »Feature Branch« für Zusammenführungen von Codezweigen -\n" -"\n" -" In diesem sehr gebräuchlichen, auch »Entwicklungszweige« genannten\n" -" Arbeitsschema, erzeugt ein Entwickler einen Zweig und überträgt eine\n" -" Zahl von Revisionen für die Umsetzung einer neuen Funktion. Der\n" -" Entwickler führt regelmäßig Änderungen des Übergeordneten Zweiges\n" -" zusammen, um seinen Entwicklungszweig mit diesen Änderungen aktuell\n" -" zu halten. Wenn die neue Funktion fertiggestellt ist, führt der\n" -" Entwickler eine Zusammenführung vom Entwicklungszweig in den\n" -" übergeordneten Zweig zur Reintegration der Änderungen aus.\n" -"\n" -" Haupt- --+----------o------o-o-------------o------\n" -" zweig \\ \\ \\ /\n" -" \\ Zusammenf. Zusammenf. Zusammenf.\n" -" \\ \\ \\ /\n" -" Entwicklungs- +--o-o-------o----o-o----o-----------\n" -" zweig\n" -"\n" -" Eine Zusammenführung vom einem übergeordneten Zweig in einen\n" -" Entwicklungszweig wird als »sync« (Synchronisation) oder »catch-up«\n" -" (Aufholen) bezeichnet. Eine Zusammenführung vom Entwicklungszweig in\n" -" den übergeordneten Zweig dagegen »reintegrate« (Reintegration).\n" -"\n" -" - Beispiel für Zusammenführung zur Synchronisation -\n" -" ............\n" -" . .\n" -" trunk --+------------L--------------R------\n" -" \\ \\\n" -" \\ |\n" -" \\ v\n" -" feature +------------------------o-----\n" -" r100 r200\n" -"\n" -" Subversion wird alle Änderungen in »trunk« ermitteln, die noch nicht\n" -" in den Entwicklungszweig »feature« zusammengeführt wurden. In diesem\n" -" Fall ist es ein einziger Revisionsbereich, r100:200. Im Diagramm oben\n" -" markiert »L« die linke Seite (trunk@100), während »R« die rechte Seite\n" -" (trunk@200) anzeigt. Der Unterschied zwischen »L« und »R« wird auf den\n" -" Zielpfad in einer Arbeitskopie angewandt. In diesem Beispiel ist dies\n" -" eine Arbeitskopie des gesamten Entwicklungszweigs ohne lokale\n" -" Änderungen.\n" -"\n" -" Um die Zusammenführung zur Synchronisation auszuführen, verwenden Sie\n" -" eine Arbeitskopie des Entwicklungszweigs und führen Sie dieses\n" -" Kommando im obersten Verzeichnis aus:\n" -"\n" -" svn merge ^/trunk\n" -"\n" -" Beachten Sie, dass sich die Änderungen dieser Zusammenführung dann\n" -" nur in Ihrer Arbeitskopie befinden und noch in das Projektarchiv\n" -" übertragen werden müssen, damit sie von anderen Benutzern gesehen\n" -" werden können. Sie können die Änderungen überprüfen und müssen\n" -" aufgetretene Konflikte auflösen, bevor Sie die Zusammenführung\n" -" übertragen.\n" -"\n" -" - Beispiel für Zusammenführung zur Reintegration -\n" -"\n" -" Der Entwicklungszweig »feature« wurde zuletzt bis zu Revision »X«\n" -" mit dem Hauptzweig »trunk« synchronisiert. Daher stellt der\n" -" Unterschied zwischen »trunk@X« und »feature@HEAD« die gesamte\n" -" Implementierung der neuen Funktion dar, und keine weiteren Änderungen.\n" -" Diese Änderungen werden nach »trunk« eingebracht.\n" -"\n" -" rW rX\n" -" trunk ------+--------------------L------------------o\n" -" \\ . ^\n" -" \\ ............. /\n" -" \\ . /\n" -" feature +--------------------------------R\n" -"\n" -" Im Diagramm oben markiert »L« die linke Seite (trunk@X), während »R«\n" -" die rechte Seite (feature@HEAD) der Zusammenführung anzeigt. Der\n" -" Unterschied zwischen der linken und der rechten Seite wird auf »trunk«\n" -" als Ziel angewandt.\n" -"\n" -" Um die Zusammenführung zur Reintegration auszuführen, verwenden Sie\n" -" eine Arbeitskopie des Hauptzweigs »trunk« und führen Sie\n" -" dieses Kommando im obersten Verzeichnis aus:\n" -"\n" -" svn merge ^/feature\n" -"\n" -" Um unnötige Konflikte zu vermeiden, erfordern Zusammenführungen zur\n" -" Reintegration eine Arbeitskopie in ZIEL_AKPfad in einer einzelnen\n" -" Revision, ohne lokale Änderungen oder umgestellte Unterbäume.\n" -"\n" -" Eine Zusammenführung zur Reintegration erfordert auch, dass der\n" -" Quellzweig durchgehend mit dem dem Ziel synchronisiert ist -- im\n" -" Beispiel oben bedeutet dies, dass alle Revisionen zwischen dem\n" -" Verzweigungspunkt W und der letzten zusammengeführten Revision X\n" -" in den Entwicklungszweig zusammengeführt wurden, und es keine nicht\n" -" zusammengeführten Revisionen zwischen diesen gibt.\n" -"\n" -"\n" -" 2. Diese Form dient der Zusammenführung einzelner ausgewählter\n" -" Änderungen:\n" -"\n" -" svn merge [-c M[,N...] | -r N:M ...] QUELLE[@REV] [ZIEL_AKPfad]\n" -"\n" -" Diese Form, auch »cherry-pick« bzw. »Rosinen herauspicken« genannt,\n" -" führt bestimmte Revisionen (oder Revisionsbereiche) eines Zweiges in\n" -" einen anderen zusammen. Die Zusammenführungsverfolgung wird verwendet,\n" -" um schon in dieses Ziel zusammenführte Revisionen automatisch zu\n" -" überspringen. Verwenden Sie die Option »--ignore-ancestry«, um diese\n" -" Vorgabe zu deaktivieren.\n" -"\n" -" QUELLE ist im Normalfall eine URL. Die optionale Angabe von »@REV«\n" -" gibt nur Fix-Revision zum Auffinden des Pfades an und beeinflusst\n" -" nicht den Revisionsbereich für die Zusammenführung. Ist REV nicht\n" -" angegeben, wird »HEAD« angenommen. Ist QUELLE ein Arbeitskopie-\n" -" pfad, wird die damit zusammenhängende URL verwendet. Die\n" -" Basisversion der Arbeitskopie wird dann als REV verwendet, dies ist\n" -" meist die letzte Revision, auf die sie aktualisiert wurde.\n" -"\n" -" ZIEL_AKPfad ist ein Arbeitskopiepfad; Fehlt die Angabe, wird allgemein\n" -" das aktuelle Arbeitsverzeichnis ».« angenommen. Die unter der Form\n" -" der vollständigen Zusammenführung erwähnten Sonderfälle finden hier\n" -" ebenfalls Anwendung.\n" -"\n" -" Die zusammenzuführenden Revisionsbereiche werden durch die Optionen\n" -" »-r« und/oder »-c« angegeben. »-r N:M« bezieht sich auf den\n" -" Unterschied in der Versionsgeschichte im Quellzweig zwischen den\n" -" Revisionen N und M. Einzelne Revisionen können mit »-c M«\n" -" zusammengeführt werden, dabei ist »-c M« gleichbedeutend mit\n" -" »-r :M«. Alle so ausgewählten Unterschiede werden nach\n" -" ZIEL_AKPfad zusammengeführt.\n" -"\n" -" Wenn die Zusammenführungsinformationen in ZIEL_AKPfad anzeigen, dass\n" -" die Revisionen im angegebenen Bereich schon zusammengeführt wurden,\n" -" werden Änderungen aus diesen Revisionen nicht erneut zusammengeführt.\n" -" Falls nötig, wird das Revisionsbereich in Unterbereiche aufgeteilt und\n" -" jeder Unterbereich getrennt in das Ziel zusammengeführt.\n" -"\n" -" Eine »rückwärtige Zusammenführung« kann verwendet werden, um\n" -" Änderungen rückgängig zu machen. Wenn z.B. Quelle und Ziel sich auf\n" -" den selben Zweig beziehen, kann eine vorher übertragene Revision\n" -" rückgängig gemacht werden. Dabei wird der Revisionsbereich umgekehrt,\n" -" also mit einem N größer M, bei »-r N:M«, oder durch Verwendung einer\n" -" negativen Zahl »-c -M«, angegeben. »-c -M« ist dabei gleichbedeutend\n" -" mit »-r M:«. Änderungen so rückgängig zu machen ist auch als\n" -" »reverse merge« bzw. »rückwärtige Zusammenführung« bekannt.\n" -"\n" -" Es können mehrere Optionen der Art »-c« und »-r« angegeben werden, die\n" -" gleichzeitige Angabe von normalen und rückwärtigen Revisionsbereichen\n" -" ist erlaubt.\n" -"\n" -" - Beispiel für Zusammenführung einzelner ausgewählter Änderungen -\n" -"\n" -" Ein Programmfehler wurde im Hauptentwicklungszweig »trunk« in Revision\n" -" 50 behoben. Diese Korrektur soll von dort in den Wartungszweig\n" -" »1.x-release« zusammengeführt werden.\n" -"\n" -" 1.x-release +-----------------------o-----\n" -" / ^\n" -" / |\n" -" / |\n" -" trunk ------+--------------------------LR-----\n" -" r50\n" -"\n" -" Im Diagramm oben markiert »L« die linke Seite (trunk@49) und R die\n" -" rechte Seite (trunk@50) der Zusammenführung. Der Unterschied zwischen\n" -" der linken und der rechten Seite wird auf den Zielpfad in der\n" -" Arbeitskopie angewandt.\n" -"\n" -" Beachten Sie, dass der Unterschied zwischen den Revision 49 und 50\n" -" genau der Änderung entspricht, die durch Revision 50 übertragen\n" -" wurde. Änderungen die durch Revision 49 übertragen wurde, sind dagegen\n" -" nicht enthalten.\n" -"\n" -" Um diese Zusammenführung auszuführen, verwenden Sie eine Arbeitskopie\n" -" ohne lokale Änderungen und führen die dieses Kommando deren obersten\n" -" Verzeichnis aus. Das vorgegebene Ziel ist ».«, das aktuelle\n" -" Verzeichnis.\n" -"\n" -" svn merge -c50 ^/trunk\n" -"\n" -" Sie können auch mehrere Revisionen oder Revisionsbereiche auswählen:\n" -"\n" -" svn merge -c50,54,60 -r65:68 ^/trunk\n" -"\n" -"\n" -" 3. Diese Form dient der Zusammenführung der Unterschiede zweier URLs:\n" -"\n" -" svn merge QUELLE1[@REV1] QUELLE2[@REV2] [ZIEL_AKPfad]\n" -"\n" -" Diese Variante sollte nur verwendet werden, denn die vorherigen nicht\n" -" auf die vorliegende Situation zutreffen, da sie unter Umständen\n" -" komplex zu handhaben ist.\n" -"\n" -" Zwei Quell-URLs werden angegeben, die zwei Verzeichnisbäume im selben\n" -" oder in verschiedenen Zweigen identfizieren. Diese werden verglichen,\n" -" und der Unterschied zwischen QUELLE1@REV1 und QUELLE2@REV2 auf die\n" -" Arbeitskopie des Zielzweigs in ZIEL_AKPfad angewandt. Der Zielzweig\n" -" kann dabei einem der beiden Quellen entsprechen, oder kann wieder\n" -" verschieden sein. Die drei involvierten Zweige müssen nicht in einer\n" -" Beziehung zueinander stehen.\n" -"\n" -" ZIEL_AKPfad ist ein Arbeitskopiepfad; Fehlt die Angabe, wird allgemein\n" -" das aktuelle Arbeitsverzeichnis ».« angenommen. Die unter der Form\n" -" der vollständigen Zusammenführung erwähnten Sonderfälle finden hier\n" -" ebenfalls Anwendung.\n" -"\n" -" QUELLE1 und/oder QUELLE2 können auch als ein Pfad in einer\n" -" Arbeitskopie angegeben werden. In diesem Fall wird URL für die\n" -" Zusammenführung aus dieser Arbeitskopie abgeleitet.\n" -"\n" -" - Beispiel für Zusammenführung der Unterschiede zweier URLs -\n" -"\n" -"\n" -" Zwei neue Funktionen wurden in getrennten Entwicklungszweigen »foo«\n" -" und »bar« entwickelt. Danach wurde klar, dass »bar« mit »foo«\n" -" kombiniert werden sollte, vor weiterer Entwicklung und Reintegration\n" -" in den Hauptzweig »trunk«.\n" -"\n" -" Obwohl beide Entwicklungszweige von Hauptzweig »trunk« ausgehen, sind\n" -" sie nicht direkt verwandt - sie sind nicht direkte Kopien voneinander.\n" -" Eine Zusammenführung der Unterschiede zweier URLs ist notwendig.\n" -"\n" -" »bar« wurde zuvor mit »trunk« bis zu dessen Revision 500\n" -" synchronisiert. (Falls diese Revisionsnummer nicht bekannt ist, kann\n" -" sie mit den Befehlen »svn log« und/oder »svn mergeinfo« ermittelt\n" -" werden.)\n" -" Der Unterschied zwischen trunk@500 und bar@HEAD enthält also die\n" -" komplette Menge an Unterschieden, die die in diesem Zweig entwickelte\n" -" Funktion ausmachen, und keine weiteren Unterschiede. Diese Änderungen\n" -" werden jetzt auf den »bar« angewandt.\n" -"\n" -" foo +-----------------------------------o\n" -" / ^\n" -" / /\n" -" / r500 /\n" -" trunk ------+------+-----------------L---------> /\n" -" \\ . /\n" -" \\ ............ /\n" -" \\ . /\n" -" bar +-----------------------------------R\n" -"\n" -" Im Diagramm oben markiert »L« die linke Seite (trunk@500) und R die\n" -" rechte Seite (bar@HEAD) der Zusammenführung. Der Unterschied zwischen\n" -" der linken und der rechten Seite wird auf den Zielpfad in der\n" -" Arbeitskopie angewandt. In diesem Fall ist dies eine Arbeitskopie des\n" -" Entwicklungszweigs »foo«\n" -"\n" -" Um diese Zusammenführung auszuführen, verwenden Sie eine Arbeitskopie\n" -" des Entwicklungszweigs »foo« ohne lokale Änderungen und führen die\n" -" dieses Kommando im obersten Verzeichnis aus:\n" -"\n" -" svn merge ^/trunk@500 ^/bar\n" -"\n" -" Die genauen Änderungen, die durch die Zusammenführung der Unterschiede\n" -" zweier URLs angewandt werden, können mit Hilfe des Kommandos »svn diff«\n" -" im Voraus begutachtet werden. Diese Erfordert dann keine Arbeitskopie.\n" -" In diesem Fall:\n" -"\n" -" svn diff ^/trunk@500 ^/bar@HEAD\n" -"\n" -"\n" -" Folgendes trifft auf alle Zusammenführungen zu:\n" -"\n" -" Zur Vermeidung unnötiger Zusammenführungskonflikte erfordert »svn merge«,\n" -" dass ZIEL_AKPfad keine Arbeitskopie mit verschiedenen Revision ist.\n" -" Führen Sie »svn update« aus, um vor der Zusammenführung sicherzustellen,\n" -" dass sich alle Objekte der Arbeitskopie auf der selben Revision befinden.\n" -"\n" -" Wenn möglich sollten sich vor der Zusammenführung der Einfachheit halber\n" -" im Ziel der Zusammenführung keine lokalen Änderungen befinden. Es wird\n" -" so einfacher, eine Zusammenführung rückgängig zu machen und die\n" -" Geschichte des Zweigs zu verstehen.\n" -"\n" -" Umgestellte Unterbäume sollten ebenfalls bei Zusammenführungen vermieden\n" -" werden, das sie unvollständige Zusammenführungen zur Folge haben können\n" -" und Zusammenführungsinformationen auf Unterbäumen erzeugen.\n" -"\n" -" Für jedes zusammengeführte Objekt wird eine Zeile mit einem Buchstaben\n" -" für die durchgeführte Aktion ausgegeben. Diese haben die folgenden\n" -" Bedeutungen:\n" -"\n" -" A Added - Hinzugefügt\n" -" D Deleted - Gelöscht\n" -" U Updated - Aktualisiert\n" -" C Conflict - Konflikt\n" -" G Merged - Zusammengeführt\n" -" E Existed - Existierend\n" -" R Replaced - Ersetzt\n" -"\n" -" Ein Buchstabe in der ersten Spalte gibt Informationen über das Objekt\n" -" selbst. Buchstaben in der zweiten Spalte betreffen Eigenschaften des\n" -" Objekts. Ein »C« in der dritten Spalte zeigt einen Baumkonflikt an,\n" -" während es in der ersten und zweiten Spalte jeweils einen Konflikt im\n" -" Text bzw. einer Eigenschaft anzeigt.\n" -"\n" -" - Zusammenführungsverfolgung -\n" -"\n" -" Subversion verwendet die Eigenschaft »svn:mergeinfo«, um die Geschichte\n" -" von Zusammenführungen aufzuzeichnen. Diese Eigenschaft wird zu Beginn\n" -" der Zusammenführung ausgewertet, um die zusammenzuführenden Änderungen\n" -" zu erhalten. Sie wird am Ende der Zusammenführung aktualisiert, um die\n" -" vorgenommene Zusammenführung zu beschreiben. Dabei werden Informationen\n" -" zur Zusammenführung nur verwendet, wenn die beiden Quellen sich auf der\n" -" gleichen Linie in der Versionsgeschichte befinden -- d.h. die erste\n" -" Quelle ist ein Vorfahre der zweiten oder umgekehrt (z.B. wenn eine Quelle\n" -" ursprünglich die Kopie der anderen war). Diese Bedingung wird bei\n" -" Zusammenführungen zur Synchronisation und zur Reintegration überprüft und\n" -" durchgesetzt.\n" -"\n" -" Die Option »--ignore-ancestry« verhindert die Zusammenführungsverfolgung\n" -" und ignoriert damit Zusammenführungsinformationen, sie werden weder\n" -" in Betracht gezogen noch aufgezeichnet.\n" -"\n" -" - Zusammenführungen aus einem fremdem Projektarchiv -\n" -"\n" -" Subversion unterstützt Zusammenführungen aus fremdem Projektarchiven.\n" -" Während alle URLs für Quellen der Zusammenführung auf das selbe\n" -" Projektarchiv zeigen müssen, kann sich die Arbeitskopie als Ziel auf ein\n" -" davon verschiedenes Projektarchiv beziehen. Es gibt aber folgende\n" -" Umstände, die es zu beachten gilt: In der Quelle durchgeführte Kopien\n" -" werden in einfache Hinzufügungen im Ziel umgewandelt. Weiterhin wird\n" -" eine Zusammenführungsverfolgung bei Zusammenführungen aus fremdem\n" -" Projektarchiven nicht unterstützt.\n" - -#: ../svn/svn.c:1213 + +#: ../svn/svn.c:1326 msgid "force deletions even if deleted contents don't match" msgstr "Löscht Elemente auch wenn deren Inhalt nicht übereinstimmt" -#: ../svn/svn.c:1217 +#: ../svn/svn.c:1330 msgid "" "Display merge-related information.\n" "usage: 1. mergeinfo SOURCE[@REV] [TARGET[@REV]]\n" " 2. mergeinfo --show-revs=WHICH SOURCE[@REV] [TARGET[@REV]]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1334 +msgid "" " 1. Summarize the history of merging between SOURCE and TARGET. The graph\n" " shows, from left to right:\n" " the youngest common ancestor of the branches;\n" @@ -13403,107 +15788,94 @@ msgid "" " that will be used for the next complete merge;\n" " the repository path and revision number of the tip of each branch.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1341 +msgid "" " 2. Print the revision numbers on SOURCE that have been merged to TARGET\n" " (with --show-revs=merged), or that have not been merged to TARGET\n" " (with --show-revs=eligible). Print only revisions in which there was\n" " at least one change in SOURCE.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1346 +msgid "" " If --revision (-r) is provided, filter the displayed information to\n" " show only that which is associated with the revisions within the\n" " specified range. Revision numbers, dates, and the 'HEAD' keyword are\n" " valid range values.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1351 +msgid "" " SOURCE and TARGET are the source and target branch URLs, respectively.\n" " (If a WC path is given, the corresponding base URL is used.) The default\n" " TARGET is the current working directory ('.'). REV specifies the revision\n" " to be considered the tip of the branch; the default for SOURCE is HEAD,\n" " and the default for TARGET is HEAD for a URL or BASE for a WC path.\n" "\n" -" The depth can be 'empty' or 'infinity'; the default is 'empty'.\n" msgstr "" -"Zeigt relevante Informationen zu Zusammenführungen an.\n" -"Aufruf: 1. mergeinfo QUELLE[@REV] [ZIEL[@REV]]\n" -" 2. mergeinfo --show-revs=WAS QUELLE[@REV] [ZIEL[@REV]]\n" -"\n" -" 1. Fasst die Geschichte der Zusammenführungen zwischen QUELLE\n" -" und ZIEL zusammen. Die Grafik zeigt von links nach rechts:\n" -" den jüngsten gemeinsamen Vorfahren der Zweige; die letzte vollständige Zusammenführung in eine der Richtungen, und\n" -" damit die Basis der nächste vollständigen Zusammenführung;\n" -" den Pfad im Projektarchiv und die Revisionsnummer der Spitzen\n" -" jedes Zweigs.\n" -"\n" -" 2. Zeigt Revisionsnummern an, die von QUELLE, die nach ZIEL\n" -" zusammengeführt wurden (mit »--show-revs=merged«), bzw.\n" -" nicht zusammengeführt wurden (mit »--show-revs=eligible«).\n" -" Gibt nur Revisionen aus, wenn QUELLE mindestens eine\n" -" Änderung hat.\n" -"\n" -" Die Angabe von »--revision« (»-r«) schränkt die Anzeige auf diesen\n" -" Revisionsbereich ein. Revisionsnummern, Datumsangaben und\n" -" das Schlüsselwort »HEAD« sind gültige Angaben.\n" -"\n" -" QUELLE und ZIEL sind jeweils URLs der Quell- und Ziel-Zweige.\n" -" (Wenn ein Arbeitskopiepfad angegeben ist, wird die entsprechende\n" -" Basis-URL verwendet.) Die Vorgabe für ZIEL ist das aktuelle\n" -" Verzeichnis (».«). REV gibt die Revision an, die als Spitze des Zweigs\n" -" angenommen werden soll, die Vorgabe für QUELLE ist »HEAD«.\n" -" Die Vorgabe für ZIEL ist »HEAD« bei URLs und »BASE« bei Pfaden\n" -" in einer Arbeitskopie.\n" -"\n" -" Die Tiefe kann »empty« oder »infinity« sein, Vorgabe ist »empty«.\n" -#: ../svn/svn.c:1249 +#: ../svn/svn.c:1357 +msgid " The depth can be 'empty' or 'infinity'; the default is 'empty'.\n" +msgstr "" + +#: ../svn/svn.c:1363 msgid "" "Create a new directory under version control.\n" "usage: 1. mkdir PATH...\n" " 2. mkdir URL...\n" "\n" +msgstr "" + +#: ../svn/svn.c:1367 +#, fuzzy +msgid "" " Create version controlled directories.\n" "\n" +msgstr "Keine versionierten Elternverzeichnisse" + +#: ../svn/svn.c:1369 +msgid "" " 1. Each directory specified by a working copy PATH is created locally\n" " and scheduled for addition upon the next commit.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1372 +msgid "" " 2. Each directory specified by a URL is created in the repository via\n" " an immediate commit.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1375 +msgid "" " In both cases, all the intermediate directories must already exist,\n" " unless the --parents option is given.\n" msgstr "" -"Erzeugt ein neues Verzeichnis unter Versionskontrolle.\n" -"Aufruf: 1. mkdir PFAD...\n" -" 2. mkdir URL...\n" -"\n" -" Erzeugt Verzeichnisse unter Versionskontrolle.\n" -"\n" -" 1. Jedes durch den PFAD einer Arbeitskopie spezifizierte Verzeichnis wird\n" -" lokal erzeugt und zum Hinzufügen bei der nächsten Übertragung eingeplant.\n" -"\n" -" 2. Jedes durch eine URL spezifizierte Verzeichnis wird mittels einer\n" -" sofortigen Übertragung im Projektarchiv angelegt.\n" -"\n" -" In beiden Fällen müssen alle Zwischenverzeichnisse bereits existieren,\n" -" es sei denn, die Option --parents wurde angegeben.\n" -#: ../svn/svn.c:1266 +#: ../svn/svn.c:1381 msgid "" "Move (rename) an item in a working copy or repository.\n" "usage: move SRC... DST\n" "\n" +msgstr "" + +#: ../svn/svn.c:1384 +#, fuzzy +msgid "" " SRC and DST can both be working copy (WC) paths or URLs:\n" " WC -> WC: move an item in a working copy, as a local change to\n" " be committed later (with or without further changes)\n" " URL -> URL: move an item in the repository directly, immediately\n" " creating a new revision in the repository\n" -" All the SRCs must be of the same type. When moving multiple sources,\n" -" they will be added as children of DST, which must be a directory.\n" -"\n" -" SRC and DST of WC -> WC moves must be committed in the same revision.\n" -" Furthermore, WC -> WC moves will refuse to move a mixed-revision subtree.\n" -" To avoid unnecessary conflicts, it is recommended to run 'svn update'\n" -" to update the subtree to a single revision before moving it.\n" -" The --allow-mixed-revisions option is provided for backward compatibility.\n" +" All the SRCs must be of the same type. If DST is an existing directory,\n" +" the sources will be added as children of DST. When moving multiple\n" +" sources, DST must be an existing directory.\n" "\n" -" The --revision option has no use and is deprecated.\n" msgstr "" "Verschiebt oder benennt ein Objekt in der Arbeitskopie oder im Projektarchiv um.\n" "Aufruf: move QUELLE... ZIEL\n" @@ -13520,19 +15892,40 @@ msgstr "" "\n" " Die Option »--revision« ist funktionslos und veraltet.\n" -#: ../svn/svn.c:1288 +#: ../svn/svn.c:1393 +msgid "" +" SRC and DST of WC -> WC moves must be committed in the same revision.\n" +" Furthermore, WC -> WC moves will refuse to move a mixed-revision subtree.\n" +" To avoid unnecessary conflicts, it is recommended to run 'svn update'\n" +" to update the subtree to a single revision before moving it.\n" +" The --allow-mixed-revisions option is provided for backward compatibility.\n" +msgstr "" + +#: ../svn/svn.c:1404 msgid "" "Apply a patch to a working copy.\n" "usage: patch PATCHFILE [WCPATH]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1407 +msgid "" " Apply a unidiff patch in PATCHFILE to the working copy WCPATH.\n" " If WCPATH is omitted, '.' is assumed.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1410 +msgid "" " A unidiff patch suitable for application to a working copy can be\n" " produced with the 'svn diff' command or third-party diffing tools.\n" " Any non-unidiff content of PATCHFILE is ignored, except for Subversion\n" " property diffs as produced by 'svn diff'.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1415 +msgid "" " Changes listed in the patch will either be applied or rejected.\n" " If a change does not match at its exact line offset, it may be applied\n" " earlier or later in the file if a match is found elsewhere for the\n" @@ -13542,23 +15935,43 @@ msgid "" " If no matching context can be found for a change, the change conflicts\n" " and will be written to a reject file with the extension .svnpatch.rej.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1424 +msgid "" " For each patched file a line will be printed with characters reporting\n" " the action taken. These characters have the following meaning:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1427 +msgid "" " A Added\n" " D Deleted\n" " U Updated\n" " C Conflict\n" " G Merged (with local uncommitted changes)\n" "\n" +msgstr "" + +#: ../svn/svn.c:1433 +msgid "" " Changes applied with an offset or fuzz are reported on lines starting\n" " with the '>' symbol. You should review such changes carefully.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1436 +msgid "" " If the patch removes all content from a file, that file is scheduled\n" " for deletion. If the patch creates a new file, that file is scheduled\n" " for addition. Use 'svn revert' to undo deletions and additions you\n" " do not agree with.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1441 +msgid "" " Hint: If the patch file was created with Subversion, it will contain\n" " the number of a revision N the patch will cleanly apply to\n" " (look for lines like '--- foo/bar.txt (revision N)').\n" @@ -13566,89 +15979,42 @@ msgid "" " 'svn update -r N', apply the patch, and then update back to the\n" " HEAD revision. This way, conflicts can be resolved interactively.\n" msgstr "" -"Wendet einen Patch auf eine Arbeitskopie an.\n" -"Aufruf: patch PATCHDATEI [AKPFAD]\n" -"\n" -" Wendet Unterschiede im Format Unified Diff aus PATCHDATEI\n" -" auf eine Arbeitskopie AKPFAD an. Wird AKPFAD weggelassen\n" -" wird ».« verwendet.\n" -"\n" -" Ein Patch im Unidiff-Format, der auf eine Arbeitskopie anwendbar ist,\n" -" kann mit »svn diff« oder Drittprogrammen erzeugt werden. Inhalte von\n" -" PATCHDATEI, die nicht dem Unidiff Format entsprechen, werden\n" -" ignoriert, abgesehen von solchen, die Änderungen an Eigenschaften\n" -" beschreiben und von »svn diff« erzeugt werden.\n" -"\n" -" Im Patch aufgelistete Änderungen werden entweder angewandt oder\n" -" abgewiesen. Wenn eine Änderung nicht genau auf die angegebene\n" -" Stelle passt, aber mit dem gegebenen Kontext weiter oben oder unten\n" -" in der Datei, kann es dennoch angewandt werden.\n" -" Eine Änderung kann auch mit Unschärfe angewandt werden. Dabei\n" -" werden eine oder mehrere Zeilen des Kontextes bei der Suche nach\n" -" der passenden Stelle für die Änderung ignoriert. Wenn keine solche\n" -" gefunden wurde, steht die Änderung im Konflikt und wird in eine Datei\n" -" für abgewiesene Änderungen mit der Erweiterung ».svnpatch.rej«\n" -" geschrieben.\n" -"\n" -" Für jede so geänderte Datei wird eine Zeile mit Buchstaben ausgegeben,\n" -" die die vorgenommene Änderung mit folgender Bedeutung beschreiben:\n" -"\n" -" A Added - Hinzugefügt\n" -" D Deleted - Gelöscht\n" -" U Updated - Aktualisiert\n" -" C Conflict - Konflikt\n" -" G Merged - Zusammengeführt\n" -"\n" -" Änderungen, die mit Versatz oder Unschärfe angewandt wurden, werden\n" -" mit einem »>« am Zeilenanfang markiert und sollten sorgfältig geprüft werden.\n" -"\n" -" Wenn ein Patch den gesamten Inhalt einer Datei entfernt, wird diese zur\n" -" Löschung eingeplant. Wenn ein Patch eine neue Datei erzeugt, wird diese\n" -" zum Hinzufügen eingeplant. Verwenden Sie »svn revert« um Löschungen\n" -" oder Hinzufügungen rückgängig zu machen, mit denen Sie nicht einverstanden\n" -" sind.\n" -"\n" -" Hinweis: Wenn eine Patch-Datei mit Subversion erzeugt wurde, enthält sie\n" -" die Revisionsnummer N, in der der Patch sauber anwendbar ist.\n" -" (Siehe Zeilen mit »--- verzeichnis/datei.txt (revision N)«).\n" -" Um abgewiesene Änderungen zu vermeiden, aktualisieren Sie zuerst\n" -" auf Revision N mit »svn update -r N«, wenden Sie dann den Patch an\n" -" und aktualisieren Sie dann auf HEAD. Auf diese Weise können\n" -" Konflikte interaktiv aufgelöst werden.\n" - -#: ../svn/svn.c:1336 + +#: ../svn/svn.c:1452 msgid "" "Remove a property from files, dirs, or revisions.\n" "usage: 1. propdel PROPNAME [PATH...]\n" " 2. propdel PROPNAME --revprop -r REV [TARGET]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1456 +msgid "" " 1. Removes versioned props in working copy.\n" " 2. Removes unversioned remote prop on repos revision.\n" " TARGET only determines which repository to access.\n" "\n" -" See 'svn help propset' for descriptions of the svn:* special properties.\n" msgstr "" -"Entfernt eine Eigenschaft von Dateien, Verzeichnissen oder\n" -"Revisionen.\n" -"Aufruf: 1. propdel PROPNAME [PFAD...]\n" -" 2. propdel PROPNAME --revprop -r REV [URL]\n" -"\n" -" 1. Entfernt eine versionierte Eigenschaft aus der Arbeitskopie.\n" -" 2. Entfernt eine nicht versionierte Eigenschaft aus dem Projektarchiv.\n" -"\n" -" Siehe »svn help propset« für Beschreibungen der speziellen »svn:*«-Eigenschaften.\n" -#: ../svn/svn.c:1348 +#: ../svn/svn.c:1460 ../svn/svn.c:1473 ../svn/svn.c:1497 ../svn/svn.c:1517 +msgid " See 'svn help propset' for descriptions of the svn:* special properties.\n" +msgstr "" + +#: ../svn/svn.c:1465 msgid "" "Edit a property with an external editor.\n" "usage: 1. propedit PROPNAME TARGET...\n" " 2. propedit PROPNAME --revprop -r REV [TARGET]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1469 +#, fuzzy +msgid "" " 1. Edits versioned prop in working copy or repository.\n" " 2. Edits unversioned remote prop on repos revision.\n" " TARGET only determines which repository to access.\n" "\n" -" See 'svn help propset' for descriptions of the svn:* special properties.\n" msgstr "" "Ändert eine Eigenschaft mit einem externen Editor.\n" "Aufruf: 1. propedit PROPNAME ZIEL...\n" @@ -13661,108 +16027,101 @@ msgstr "" "\n" " Siehe »svn help propset« für Beschreibungen der speziellen »svn:*«-Eigenschaften.\n" -#: ../svn/svn.c:1360 +#: ../svn/svn.c:1478 msgid "" "Print the value of a property on files, dirs, or revisions.\n" "usage: 1. propget PROPNAME [TARGET[@REV]...]\n" " 2. propget PROPNAME --revprop -r REV [TARGET]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1482 +msgid "" " 1. Prints versioned props. If specified, REV determines in which\n" " revision the target is first looked up.\n" " 2. Prints unversioned remote prop on repos revision.\n" " TARGET only determines which repository to access.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1487 +msgid "" " With --verbose, the target path and the property name are printed on\n" " separate lines before each value, like 'svn proplist --verbose'.\n" " Otherwise, if there is more than one TARGET or a depth other than\n" " 'empty', the target path is printed on the same line before each value.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1492 +msgid "" " By default, an extra newline is printed after the property value so that\n" " the output looks pretty. With a single TARGET, depth 'empty' and without\n" " --show-inherited-props, you can use the --no-newline option to disable this\n" " (useful when redirecting a binary property value to a file, for example).\n" "\n" -" See 'svn help propset' for descriptions of the svn:* special properties.\n" msgstr "" -"Gibt den Eigenschaftswert von Dateien, Verzeichnissen oder Revisionen aus.\n" -"Aufruf: 1. propget PROPNAME [ZIEL[@REV]...]\n" -" 2. propget PROPNAME --revprop -r REV [ZIEL]\n" -"\n" -" 1. Gibt versionierte Eigenschaften in der Arbeitskopie aus.\n" -" REV bestimmt, in welcher Revision zuerst nachgeschaut wird.\n" -" 2. Gibt nicht versionierte Revisionseigenschaft im Projektarchiv aus.\n" -" ZIEL legt nur das Projektarchiv fest, auf das zugegriffen wird.\n" -"\n" -" Mit »--verbose« wird der Zielpfad und der Name der Eigenschaft auf\n" -" separaten Zeilen vor jedem Wert ausgegeben, wie »svn proplist --verbose«\n" -" Andernfalls wird bei mahr als einem ZIEL oder einer von »empty«\n" -" verschiedenen Tiefe die Pfade auf der selben Zeile ausgegeben.\n" -"\n" -" Standardmäßig hängt dieser Unterbefehl eine Leerzeile an das Ende der\n" -" Eigenschaftswerte an, so dass die Ausgabe hübsch aussieht. Verwenden\n" -" Sie bei einem einzigen ZIEL, der Tiefe »empty« und ohne\n" -" --show-inherited-props die Option »--no-newline« um diese Formatierungen\n" -" abzuschalten. (dies ist z.B. nützlich, um einen binären Eigenschaftswert\n" -" in eine Datei umzuleiten)\n" -"\n" -" Siehe »svn help propset« für Beschreibungen der speziellen »svn:*«-Eigenschaften.\n" -#: ../svn/svn.c:1382 ../svn/svn.c:1401 +#: ../svn/svn.c:1501 ../svn/svn.c:1521 msgid "print path, name and value on separate lines" msgstr "Pfad, Name und Wert in getrennten Zeilen ausgeben" -#: ../svn/svn.c:1383 +#: ../svn/svn.c:1502 msgid "(deprecated; use --no-newline)" msgstr "Veraltet; siehe »--no-newline«" -#: ../svn/svn.c:1386 +#: ../svn/svn.c:1505 msgid "" "List all properties on files, dirs, or revisions.\n" "usage: 1. proplist [TARGET[@REV]...]\n" " 2. proplist --revprop -r REV [TARGET]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1509 +msgid "" " 1. Lists versioned props. If specified, REV determines in which\n" " revision the target is first looked up.\n" " 2. Lists unversioned remote props on repos revision.\n" " TARGET only determines which repository to access.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1514 +msgid "" " With --verbose, the property values are printed as well, like 'svn propget\n" " --verbose'. With --quiet, the paths are not printed.\n" "\n" -" See 'svn help propset' for descriptions of the svn:* special properties.\n" msgstr "" -"Listet alle Eigenschaften von Dateien, Verzeichnissen oder\n" -"Revisionen auf.\n" -"Aufruf: 1. proplist [ZIEL[@REV]...]\n" -" 2. proplist --revprop -r REV [ZIEL]\n" -"\n" -" 1. Listet versionierte Eigenschaften in der Arbeitskopie auf.\n" -" REV bestimmt, in welcher Revision zuerst nachgeschaut wird.\n" -" 2. Listet nicht versionierte Revisionseigenschaften im Projektarchiv auf.\n" -" ZIEL legt nur das Projektarchiv fest, auf das zugegriffen wird.\n" -"\n" -" Mit »--verbose« werden auch die Eigenschaftwerte ausgegeben,wie mit \n" -" »svn propget --verbose«. Mit »--quiet« werden Pfade nicht ausgegeben.\n" -"\n" -" Siehe »svn help propset« für Beschreibungen der speziellen »svn:*«-Eigenschaften.\n" -#: ../svn/svn.c:1402 +#: ../svn/svn.c:1522 msgid "don't print the path" msgstr "Pfad nicht ausgeben" -# FIXME: propchange? -#: ../svn/svn.c:1405 +#: ../svn/svn.c:1525 msgid "" "Set the value of a property on files, dirs, or revisions.\n" "usage: 1. propset PROPNAME PROPVAL PATH...\n" " 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1529 +msgid "" " 1. Changes a versioned file or directory property in a working copy.\n" " 2. Changes an unversioned property on a repository revision.\n" " (TARGET only determines which repository to access.)\n" "\n" +msgstr "" + +#: ../svn/svn.c:1533 +msgid "" " The value may be provided with the --file option instead of PROPVAL.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1535 +msgid "" " Property names starting with 'svn:' are reserved. Subversion recognizes\n" " the following special versioned properties on a file:\n" " svn:keywords - Keywords to be expanded. Valid keywords are:\n" @@ -13774,6 +16133,10 @@ msgid "" " Id - A compressed summary of the previous four.\n" " Header - Similar to Id but includes the full URL.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1546 +msgid "" " Custom keywords can be defined with a format string separated from\n" " the keyword name with '='. Valid format substitutions are:\n" " %a - The author of the revision given by %r.\n" @@ -13792,6 +16155,10 @@ msgid "" " Once a custom keyword has been defined for a file, it can be used\n" " within the file like any other keyword: $MyKeyword$\n" "\n" +msgstr "" + +#: ../svn/svn.c:1564 +msgid "" " svn:executable - If present, make the file executable. Use\n" " 'svn propdel svn:executable PATH...' to clear.\n" " svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n" @@ -13804,10 +16171,21 @@ msgid "" " when it is not locked. Use 'svn propdel svn:needs-lock PATH...'\n" " to clear.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1576 +msgid "" " Subversion recognizes the following special versioned properties on a\n" " directory:\n" " svn:ignore - A list of file glob patterns to ignore, one per line.\n" " svn:global-ignores - Like svn:ignore, but inheritable.\n" +" svn:auto-props - Automatically set properties on files when they are\n" +" added or imported. Contains key-value pairs, one per line, in the format:\n" +" PATTERN = PROPNAME=VALUE[;PROPNAME=VALUE ...]\n" +" Example (where a literal ';' is escaped by adding another ';'):\n" +" *.html = svn:eol-style=native;svn:mime-type=text/html;; charset=UTF8\n" +" Applies recursively to all files added or imported under the directory\n" +" it is set on. See also [auto-props] in the client configuration file.\n" " svn:externals - A list of module specifiers, one per line, in the\n" " following format similar to the syntax of 'svn checkout':\n" " [-r REV] URL[@PEG] LOCALPATH\n" @@ -13832,157 +16210,77 @@ msgid "" " 'relative_url relative_path' with peg revision support.\n" " Lines starting with a '#' character are ignored.\n" msgstr "" -"Setzt den Wert einer Eigenschaft von Dateien, Verzeichnissen\n" -"oder Revisionen\n" -"Aufruf: 1. propset NAME WERT PFAD...\n" -" 2. propset NAME --revprop -r REV WERT [ZIEL]\n" -"\n" -" 1. Ändert eine versionierte Datei- oder Verzeichniseigenschaft in der\n" -" Arbeitskopie.\n" -" 2. Ändert eine nicht versionierte Revisionseigenschaft einer Revision\n" -" im Projektarchiv.\n" -" (ZIEL legt nur das Projektarchiv fest, auf das zugegriffen wird.)\n" -"\n" -" Der Wert kann mit der Option »--file« statt WERT angegeben werden.\n" -"\n" -" Namen von Eigenschaften, die mit »svn:« beginnen, sind reserviert.\n" -" Subversion kennt die folgenden speziellen versionieren\n" -" Eigenschaften von Dateien:\n" -" svn:keywords - Schlüsselworte, die expandiert werden sollen.\n" -" Gültige Schlüsselworte sind:\n" -" URL, HeadURL - Die URL für die Head-Version der Datei.\n" -" Author, LastChangedBy - Die letzte Person, die die Datei geändert hat.\n" -" Date, LastChangedDate - Datum/Zeit der letzten Änderung.\n" -" Rev, Revision, - Die letzte Revision, in der die Datei\n" -" LastChangedRevision geändert wurde.\n" -" Id - Eine komprimierte Zusammenfassung der vier\n" -" genannten Schlüsselworte.\n" -" Header - Ähnlich zu Id, enthält aber die volle URL.\n" -"\n" -" Benutzerdefinierte Schlüsselworte können mit ihrem Namen und einer\n" -" Formatangabe, getrennt durch ein »=« definiert werden. Gültige\n" -" Platzhalter sind:\n" -" %a - Der Autor der Revision %r.\n" -" %b - Der Basisname der URL der Datei.\n" -" %d - Das Datum der Revision %r im Kurzformat.\n" -" %D - Das Datum der Revision %r im Langformat.\n" -" %P - Der Pfad der Datei, relativ zur Wurzel des Projektarchivs.\n" -" %r - Die letzte Revision, in der die Datei geändert wurde.\n" -" %R - Die URL der Wurzel des Projektarchivs.\n" -" %u - Die URL der Datei.\n" -" %_ - Ein Leerzeichen (Definitionen von Schlüsselwörtern dürfen\n" -" selbst keine Leerzeichen enthalten).\n" -" %% - Erzeugt ein '%' in der Ausgabe.\n" -" %H - Entspricht %P%_%r%_%d%_%a.\n" -" %I - Entspricht %b%_%r%_%d%_%a.\n" -" Beispiel für ein benutzerdefiniertes Schlüsselwort: MeinSW=%r%_%a%_%P\n" -" Sobald ein benutzerdefiniertes Schlüsselwort für eine Datei gesetzt ist,\n" -" kann es in der Datei wie jedes andere Schlüsselwort verwendet werden:\n" -" $MeinSW$\n" -"\n" -" svn:executable - Falls vorhanden, wird die Datei ausführbar gemacht.\n" -" Verwenden Sie »svn propdel svn:executable PFAD...« zum Entfernen.\n" -" svn:eol-style - Eins aus »native«, »LF«, »CR«, »CRLF«.\n" -" svn:mime-type - Der MIME-Typ der Datei. Verwendet, um festzustellen, ob\n" -" die Datei zusammengeführt werden kann und wie sie von Apache übertragen\n" -" werden soll. Dateien ohne MIME-Typ oder deren MIME-Typ mit »text/«\n" -" beginnt, werden als Text behandelt. Alles andere wird als binär angesehen.\n" -" svn:needs-lock - Wenn vorhanden, soll die Datei gesperrt werden, bevor sie\n" -" verändert wird. Setzt den Schreibschutz der Arbeitsdatei, wenn sie nicht\n" -" gesperrt ist. Verwenden Sie »svn propdel svn:needs-lock PFAD...« zum\n" -" Entfernen.\n" -"\n" -" Subversion kennt die folgenden speziellen versionieren\n" -" Eigenschaften von Verzeichnissen:\n" -" svn:ignore - Eine durch Zeilenumbruch getrennte Liste von zu\n" -" ignorierenden »glob«-Dateimustern.\n" -" svn:global-ignores - Wie svn:ignore, aber vererbbar.\n" -" svn:externals - Eine durch Zeilenumbruch getrennte Liste von\n" -" Modulnamen im folgenden Syntax von »svn checkout«:\n" -" [-r REV] URL[@PEGREV] LOKALER_PFAD\n" -" Beispiel:\n" -" http://example.com/repos/Projekt/modul\n" -" LOKALER_PFAD ist dabei relativ zum Verzeichnis mit dieser Eigenschaft.\n" -" Um den externen Verweis auf eine bekannte Revision festzulegen, geben\n" -" Sie optional REV an:\n" -" -r25 http://example.com/repos/Projekt/modul\n" -" Um ein Element in einem ggf. später gelöschten oder umbenannten Pfad\n" -" eindeutig zu identifizieren, verwenden Sie optional PEGREV:\n" -" -r25 http://example.com/repos/Pfad@42 projekt/modul\n" -" Die URL kann eine vollständige oder relative URL sein, die mit einen der\n" -" folgenden Zeichenketten startet und...\n" -" ../ auf das übergeordnete Verzeichnis des extrahierten Externals\n" -" ^/ auf die Wurzel des Projektarchivs\n" -" / auf die Wurzel des Servers\n" -" // auf das Schema\n" -" ^/../ auf ein benachbartes Projektarchiv unter dem selben SVNParentPath\n" -" verweist.\n" -" Die Verwendung des folgenden Formats ist veraltet aber für die Kompatibilität\n" -" mit Subversion 1.4 und älter weiter unterstützt:\n" -" LOKALER_PFAD [-r PEGREV] URL\n" -" Das mehrdeutige Format »relativer_Pfad relativer_Pfad« wird als\n" -" »relative_URL relativer_Pfad« mit Peg-Revisionsunterstützung gedeutet.\n" -" Zeilen, die mit »#« beginnen, werden ignoriert.\n" - -#: ../svn/svn.c:1485 + +#: ../svn/svn.c:1613 msgid "read property value from file ARG" msgstr "Eigenschaftswert aus Datei PAR lesen" -#: ../svn/svn.c:1488 +#: ../svn/svn.c:1616 msgid "" "Relocate the working copy to point to a different repository root URL.\n" "usage: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n" " 2. relocate TO-URL [PATH]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1620 +msgid "" " Rewrite working copy URL metadata to reflect a syntactic change only.\n" " This is used when a repository's root URL changes (such as a scheme\n" " or hostname change) but your working copy still reflects the same\n" " directory within the same repository.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1625 +msgid "" " 1. FROM-PREFIX and TO-PREFIX are initial substrings of the working\n" " copy's current and new URLs, respectively. (You may specify the\n" " complete old and new URLs if you wish.) Use 'svn info' to determine\n" " the current working copy URL.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1630 +msgid "" " 2. TO-URL is the (complete) new repository URL to use for PATH.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1632 +msgid "" " Examples:\n" " svn relocate http:// svn:// project1 project2\n" " svn relocate http://www.example.com/repo/project \\\n" " svn://svn.example.com/repo/project\n" msgstr "" -"Umplatzierung der Arbeitskopie auf eine andere Wurzel-URL des Projektarchivs\n" -"Aufruf: 1. relocate VON NACH [PFAD...]\n" -" 2. relocate NACH [PFAD]\n" -"\n" -" Schreibt die Metadaten der Arbeitskopie so um, dass sie einer Änderung\n" -" der URL folgen. Dies wird verwendet, wenn sich die Basis-URL eines\n" -" Projektarchivs ändert (z.B. durch eine Schema- oder Hostnamenänderung),\n" -" während Ihre Arbeitskopie immer noch das selbe Verzeichnis im selben\n" -" Projektarchiv widerspiegelt.\n" -"\n" -" 1. VON und NACH sind einleitende Teile der momentanen bzw. neuen URL\n" -" der Arbeitskopie. (Die Angabe der kompletten neuen und alten URLs ist\n" -" erlaubt.) Verwenden Sie »svn info« zur Anzeige der momentanen URL.\n" -"\n" -" 2. NACH ist die vollständige neue URL im Projektarchiv für PFAD.\n" -"\n" -" Beispiele:\n" -" svn relocate http:// svn:// Projekt1 Projekt2\n" -" svn relocate http://www.example.com/repo/Projekt \\\n" -" svn://svn.example.com/repo/Projekt\n" -#: ../svn/svn.c:1511 +#: ../svn/svn.c:1640 +#, fuzzy msgid "" "Resolve conflicts on working copy files or directories.\n" "usage: resolve [PATH...]\n" "\n" +msgstr "" +"Auflösen von Konflikten in Arbeitskopiedateien oder -verzeichnissen.\n" +"Aufruf: resolve --accept=PAR [PFAD...]\n" +"\n" +" Bemerkung: Die Option --accept wird zurzeit benötigt.\n" + +#: ../svn/svn.c:1643 +msgid "" " By default, perform interactive conflict resolution on PATH.\n" " In this mode, the command is recursive by default (depth 'infinity').\n" "\n" +msgstr "" + +#: ../svn/svn.c:1646 +#, fuzzy +msgid "" " The --accept=ARG option prevents interactive prompting and forces\n" " conflicts on PATH to be resolved in the manner specified by ARG.\n" " In this mode, the command is not recursive by default (depth 'empty').\n" +"\n" msgstr "" "Löst Konflikte von Dateien oder Verzeichnissen in der Arbeitskopie auf.\n" "Aufruf: resolve [PFAD...]\n" @@ -13994,70 +16292,327 @@ msgstr "" " die Konfliktlösung von PFAD in der durch PAR angegebenen Weise. Damit\n" " arbeitet das Programm als Vorgabe nicht rekursiv. (Tiefe »empty«)\n" -#: ../svn/svn.c:1521 +#: ../svn/svn.c:1650 +msgid "" +" A conflicted path cannot be committed with 'svn commit' until it\n" +" has been marked as resolved with 'svn resolve'.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1653 +msgid "" +" Subversion knows three types of conflicts:\n" +" Text conflicts, Property conflicts, and Tree conflicts.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1656 +msgid "" +" Text conflicts occur when overlapping changes to file contents were\n" +" made. Text conflicts are usually resolved by editing the conflicted\n" +" file or by using a merge tool (which may be an external program).\n" +" 'svn resolve' provides options which can be used to automatically\n" +" edit files (such as 'mine-full' or 'theirs-conflict'), but these are\n" +" only useful in situations where it is acceptable to discard local or\n" +" incoming changes altogether.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1664 +msgid "" +" Property conflicts are usually resolved by editing the value of the\n" +" conflicted property (either from the interactive prompt, or with\n" +" 'svn propedit'). As with text conflicts, options exist to edit a\n" +" property automatically, discarding some changes in favour of others.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1669 +msgid "" +" Tree conflicts occur when a change to the directory structure was\n" +" made, and when this change cannot be applied to the working copy\n" +" without affecting other changes (text changes, property changes,\n" +" or other changes to the directory structure). Brief information about\n" +" tree conflicts is shown by the 'svn status' and 'svn info' commands.\n" +" In interactive mode, 'svn resolve' will attempt to describe tree conflicts\n" +" in detail, and may offer options to resolve the conflict automatically.\n" +" It is recommended to use these automatic options whenever possible,\n" +" rather than attempting manual tree conflict resolution.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1679 +msgid "" +" If a tree conflict cannot be resolved automatically, it is recommended\n" +" to figure out why the conflict occurred before attempting to resolve it.\n" +" The 'svn log -v' command can be used to inspect structural changes\n" +" made in past revisions, and perhaps even on other branches.\n" +" 'svn help log' describes how these structural changes are presented.\n" +" Once the conflicting \"incoming\" change has been identified with 'svn log'\n" +" the current \"local\" working copy state should be examined and adjusted\n" +" in a way such that the conflict is resolved. This may involve editing\n" +" files manually or with 'svn merge'. It may be necessary to discard some\n" +" local changes with 'svn revert'. Files or directories might have to be\n" +" copied, deleted, or moved.\n" +msgstr "" + +#: ../svn/svn.c:1692 msgid "" "specify automatic conflict resolution source\n" " ('base', 'working', 'mine-conflict',\n" " 'theirs-conflict', 'mine-full', 'theirs-full')" msgstr "" -"Gibt Quelle für automatische Konfliktauflösungsaktion an\n" -" (»base«, »working«, »mine-conflict«,\n" -" »theirs-conflict«, »mine-full«, »theirs-full«)" +"Gibt Quelle für automatische Konfliktauflösungsaktion an\n" +" (»base«, »working«, »mine-conflict«,\n" +" »theirs-conflict«, »mine-full«, »theirs-full«)" + +#: ../svn/svn.c:1699 +#, fuzzy +msgid "" +"Remove 'conflicted' state on working copy files or directories.\n" +"usage: resolved PATH...\n" +"\n" +msgstr "" +"Auflösen von Konflikten in Arbeitskopiedateien oder -verzeichnissen.\n" +"Aufruf: resolve --accept=PAR [PFAD...]\n" +"\n" +" Bemerkung: Die Option --accept wird zurzeit benötigt.\n" + +#: ../svn/svn.c:1702 +#, fuzzy +msgid "" +" Note: this subcommand does not semantically resolve conflicts or\n" +" remove conflict markers; it merely removes the conflict-related\n" +" artifact files and allows PATH to be committed again. It has been\n" +" deprecated in favor of running 'svn resolve --accept working'.\n" +msgstr "" +"Entfernt den Status »konfliktbehaftet« von Dateien oder Verzeichnissen\n" +"in der Arbeitskopie.\n" +"Aufruf: resolved PFAD...\n" +"\n" +" Hinweis: Dieser Unterbefehl löst weder inhaltlich die Konflikte auf, noch\n" +" entfernt er Konfliktmarken. Er löscht hauptsächlich die zum Konflikt\n" +" gehörenden Dateien und ermöglicht es somit, dass das Verzeichnis PFAD wieder\n" +" übertragen werden kann. Dies wird zugunsten von »svn resolve --accept\n" +" working« missbilligt.\n" + +#: ../svn/svn.c:1710 +msgid "" +"Restore pristine working copy state (undo local changes).\n" +"usage: revert PATH...\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1713 +msgid "" +" Revert changes in the working copy at or within PATH, and remove\n" +" conflict markers as well, if any.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1716 +#, fuzzy +msgid "" +" This subcommand does not revert already committed changes.\n" +" For information about undoing already committed changes, search\n" +" the output of 'svn help merge' for 'undo'.\n" +msgstr "" +"Stellt den ursprünglichen Zustand der Arbeitskopie wieder her\n" +"(macht lokalen Änderungen rückgängig).\n" +"Aufruf: revert PFAD...\n" +"\n" +" Macht Änderungen an einer Arbeitskopie in PFAD rückgängig\n" +" und entfernt Konfliktmarkierungen wenn es sie gibt.\n" +"\n" +" Dieser Unterbefehl macht keine schon übertragenen Änderungen\n" +" rückgängig. Für Informationen über das Rückgängigmachen von\n" +" schon übertragenen Änderungen, siehe in »svn help merge« den\n" +" Abschnitt »undo«.\n" + +#: ../svn/svn.c:1723 +msgid "" +"Show shelved changes as a diff.\n" +"usage: shelf-diff NAME [VERSION]\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1726 +msgid "" +" Show the changes in shelf NAME:VERSION (default: latest) as a diff.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1728 ../svn/svn.c:1739 ../svn/svn.c:1752 ../svn/svn.c:1764 +#: ../svn/svn.c:1775 ../svn/svn.c:1790 ../svn/svn.c:1818 ../svn/svn.c:1840 +msgid "" +" The shelving feature is EXPERIMENTAL. This command is likely to change\n" +" in the next release, and there is no promise of backward compatibility.\n" +msgstr "" + +#: ../svn/svn.c:1734 +msgid "" +"Delete a shelf.\n" +"usage: shelf-drop NAME\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1737 +msgid "" +" Delete the shelf named NAME.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1745 +msgid "" +"List shelves.\n" +"usage: shelf-list\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1748 +msgid "" +" List shelves. Include the first line of any log message\n" +" and some details about the contents of the shelf, unless '-q' is\n" +" given.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1759 +msgid "" +"List which shelf affects each path.\n" +"usage: shelf-list-by-paths [PATH...]\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1762 +msgid "" +" List which shelf most recently affects each path below the given PATHs.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1770 +msgid "" +"Show the versions of a shelf.\n" +"usage: shelf-log NAME\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1773 +msgid "" +" Show all versions of shelf NAME.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1782 +msgid "" +"Copy local changes onto a new version of a shelf.\n" +"usage: shelf-save NAME [PATH...]\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1785 +msgid "" +" Save local changes in the given PATHs as a new version of shelf NAME.\n" +" The shelf's log message can be set with -m, -F, etc.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1788 +msgid "" +" The same as 'svn shelve --keep-local'.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1800 +msgid "" +"Move local changes onto a shelf.\n" +"usage: shelve [--keep-local] NAME [PATH...]\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1803 +msgid "" +" Save the local changes in the given PATHs to a shelf named NAME.\n" +" Revert those changes from the WC unless '--keep-local' is given.\n" +" The shelf's log message can be set with -m, -F, etc.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1807 +msgid "" +" 'svn shelve --keep-local' is the same as 'svn shelf-save'.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1809 +msgid "" +" The kinds of change you can shelve are those supported by 'svn diff'\n" +" and 'svn patch'. The following are currently NOT supported:\n" +" copies, moves, mkdir, rmdir,\n" +" 'binary' content, uncommittable states\n" +"\n" +msgstr "" -#: ../svn/svn.c:1528 +#: ../svn/svn.c:1814 msgid "" -"Remove 'conflicted' state on working copy files or directories.\n" -"usage: resolved PATH...\n" +" To bring back shelved changes, use 'svn unshelve NAME'.\n" "\n" -" Note: this subcommand does not semantically resolve conflicts or\n" -" remove conflict markers; it merely removes the conflict-related\n" -" artifact files and allows PATH to be committed again. It has been\n" -" deprecated in favor of running 'svn resolve --accept working'.\n" msgstr "" -"Entfernt den Status »konfliktbehaftet« von Dateien oder Verzeichnissen\n" -"in der Arbeitskopie.\n" -"Aufruf: resolved PFAD...\n" + +#: ../svn/svn.c:1816 +msgid "" +" Shelves are stored in /.svn/shelves/\n" "\n" -" Hinweis: Dieser Unterbefehl löst weder inhaltlich die Konflikte auf, noch\n" -" entfernt er Konfliktmarken. Er löscht hauptsächlich die zum Konflikt\n" -" gehörenden Dateien und ermöglicht es somit, dass das Verzeichnis PFAD wieder\n" -" übertragen werden kann. Dies wird zugunsten von »svn resolve --accept\n" -" working« missbilligt.\n" +msgstr "" -#: ../svn/svn.c:1538 +#: ../svn/svn.c:1827 msgid "" -"Restore pristine working copy state (undo local changes).\n" -"usage: revert PATH...\n" +"Copy shelved changes back into the WC.\n" +"usage: unshelve [--drop] [NAME [VERSION]]\n" "\n" -" Revert changes in the working copy at or within PATH, and remove\n" -" conflict markers as well, if any.\n" +msgstr "" + +#: ../svn/svn.c:1830 +msgid "" +" Apply the shelf named NAME to the working copy.\n" +" NAME defaults to the newest shelf.\n" "\n" -" This subcommand does not revert already committed changes.\n" -" For information about undoing already committed changes, search\n" -" the output of 'svn help merge' for 'undo'.\n" msgstr "" -"Stellt den ursprünglichen Zustand der Arbeitskopie wieder her\n" -"(macht lokalen Änderungen rückgängig).\n" -"Aufruf: revert PFAD...\n" + +#: ../svn/svn.c:1833 +msgid "" +" Any conflict between the change being unshelved and a change\n" +" already in the WC is handled the same way as by 'svn patch',\n" +" creating a 'reject' file.\n" "\n" -" Macht Änderungen an einer Arbeitskopie in PFAD rückgängig\n" -" und entfernt Konfliktmarkierungen wenn es sie gibt.\n" +msgstr "" + +#: ../svn/svn.c:1837 +msgid "" +" With --drop, delete the shelf (like shelf-drop) after successfully\n" +" unshelving with no conflicts.\n" "\n" -" Dieser Unterbefehl macht keine schon übertragenen Änderungen\n" -" rückgängig. Für Informationen über das Rückgängigmachen von\n" -" schon übertragenen Änderungen, siehe in »svn help merge« den\n" -" Abschnitt »undo«.\n" +msgstr "" -#: ../svn/svn.c:1550 +#: ../svn/svn.c:1846 msgid "" "Print the status of working copy files and directories.\n" "usage: status [PATH...]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1849 +msgid "" " With no args, print only locally modified items (no network access).\n" " With -q, print only summary information about locally modified items.\n" " With -u, add working revision and server out-of-date information.\n" " With -v, print full revision information on every item.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1854 +#, fuzzy +msgid "" " The first seven columns in the output are each one character wide:\n" " First column: Says if item was added, deleted, or otherwise changed\n" " ' ' no modifications\n" @@ -14102,45 +16657,6 @@ msgid "" " If the item is a tree conflict victim, an additional line is printed\n" " after the item's status line, explaining the nature of the conflict.\n" "\n" -" The out-of-date information appears in the ninth column (with -u):\n" -" '*' a newer revision exists on the server\n" -" ' ' the working copy is up to date\n" -"\n" -" Remaining fields are variable width and delimited by spaces:\n" -" The working revision (with -u or -v; '-' if the item is copied)\n" -" The last committed revision and last committed author (with -v)\n" -" The working copy path is always the final field, so it can\n" -" include spaces.\n" -"\n" -" The presence of a question mark ('?') where a working revision, last\n" -" committed revision, or last committed author was expected indicates\n" -" that the information is unknown or irrelevant given the state of the\n" -" item (for example, when the item is the result of a copy operation).\n" -" The question mark serves as a visual placeholder to facilitate parsing.\n" -"\n" -" Example output:\n" -" svn status wc\n" -" M wc/bar.c\n" -" A + wc/qax.c\n" -"\n" -" svn status -u wc\n" -" M 965 wc/bar.c\n" -" * 965 wc/foo.c\n" -" A + - wc/qax.c\n" -" Status against revision: 981\n" -"\n" -" svn status --show-updates --verbose wc\n" -" M 965 938 kfogel wc/bar.c\n" -" * 965 922 sussman wc/foo.c\n" -" A + - 687 joe wc/qax.c\n" -" 965 687 joe wc/zig.c\n" -" Status against revision: 981\n" -"\n" -" svn status\n" -" M wc/bar.c\n" -" ! C wc/qaz.c\n" -" > local missing, incoming edit upon update\n" -" D wc/qax.c\n" msgstr "" "Gibt den Status von Dateien und Verzeichnissen in der Arbeitskopie aus.\n" "Aufruf: status [PFAD...]\n" @@ -14237,22 +16753,98 @@ msgstr "" " > lokal fehlend, eingehend editiert bei Aktualisierung\n" " D wc/qax.c\n" -#: ../svn/svn.c:1643 +#: ../svn/svn.c:1898 +msgid "" +" The out-of-date information appears in the ninth column (with -u):\n" +" '*' a newer revision exists on the server\n" +" ' ' the working copy is up to date\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1902 +msgid "" +" Remaining fields are variable width and delimited by spaces:\n" +" The working revision (with -u or -v; '-' if the item is copied)\n" +" The last committed revision and last committed author (with -v)\n" +" The working copy path is always the final field, so it can\n" +" include spaces.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1908 +msgid "" +" The presence of a question mark ('?') where a working revision, last\n" +" committed revision, or last committed author was expected indicates\n" +" that the information is unknown or irrelevant given the state of the\n" +" item (for example, when the item is the result of a copy operation).\n" +" The question mark serves as a visual placeholder to facilitate parsing.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1914 +msgid "" +" Example output:\n" +" svn status wc\n" +" M wc/bar.c\n" +" A + wc/qax.c\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1919 +msgid "" +" svn status -u wc\n" +" M 965 wc/bar.c\n" +" * 965 wc/foo.c\n" +" A + - wc/qax.c\n" +" Status against revision: 981\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1925 +msgid "" +" svn status --show-updates --verbose wc\n" +" M 965 938 kfogel wc/bar.c\n" +" * 965 922 sussman wc/foo.c\n" +" A + - 687 joe wc/qax.c\n" +" 965 687 joe wc/zig.c\n" +" Status against revision: 981\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1932 +msgid "" +" svn status\n" +" M wc/bar.c\n" +" ! C wc/qaz.c\n" +" > local missing, incoming edit upon update\n" +" D wc/qax.c\n" +msgstr "" + +#: ../svn/svn.c:1940 msgid "don't print unversioned items" msgstr "Gibt nicht versioniertes Objekte nicht aus" -#: ../svn/svn.c:1646 +#: ../svn/svn.c:1943 msgid "" "Update the working copy to a different URL within the same repository.\n" "usage: 1. switch URL[@PEGREV] [PATH]\n" " 2. switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1947 +msgid "" " 1. Update the working copy to mirror a new URL within the repository.\n" " This behavior is similar to 'svn update', and is the way to\n" " move a working copy to a branch or tag within the same repository.\n" " If specified, PEGREV determines in which revision the target is first\n" " looked up.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1953 +#, fuzzy +msgid "" " If --force is used, unversioned obstructing paths in the working\n" " copy do not automatically cause a failure if the switch attempts to\n" " add the same path. If the obstructing path is the same type (file\n" @@ -14264,107 +16856,126 @@ msgid "" " modification to the working copy. All properties from the repository\n" " are applied to the obstructing path.\n" "\n" +msgstr "" +"Checkt eine Arbeitskopie aus einem Projektarchiv aus.\n" +"Aufruf: checkout URL[@REV]... [PFAD]\n" +"\n" +" Falls angegeben, legt REV fest, in welcher Revision die URL zuerst\n" +" nachgeschlagen wird.\n" +"\n" +" Ohne Angabe von PFAD wird der Basisname der URL als Ziel verwendet.\n" +" Sind mehrere URLs angegeben, wird jede in ein Unterverzeichnis von\n" +" PFAD ausgecheckt, dessen Name der Basisname der URL ist.\n" +"\n" +" Bei Angabe von --force lassen nicht versionierte, behindernde Objekte\n" +" in der Arbeitskopie den Vorgang nicht automatisch fehlschlagen. Falls\n" +" der behindernde Pfad vom gleichen Typ (Datei oder Verzeichnis) wie der\n" +" entsprechende Pfad im Projektarchiv ist, wird er versioniert, behält\n" +" aber seinen ursprünglichen Inhalt. Das bedeutet, dass nicht versionierte\n" +" Unterverzeichnisse eines behindernden Verzeichnisses ebenfalls versioniert\n" +" werden können. Bei Dateien werden alle Unterschiede im Inhalt wie lokale\n" +" Modifikationen in der Arbeitskopie behandelt. Sämtliche Eigenschaften\n" +" aus dem Projektarchiv werden auf den behindernden Pfad angewendet.\n" +"\n" +" Siehe auch »svn help update« für eine Liste möglicher Buchstaben,\n" +" die die durchgeführte Aktion beschreiben.\n" + +#: ../svn/svn.c:1964 +msgid "" " Use the --set-depth option to set a new working copy depth on the\n" " targets of this operation.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1967 +msgid "" " By default, Subversion will refuse to switch a working copy path to\n" " a new URL with which it shares no common version control ancestry.\n" " Use the '--ignore-ancestry' option to override this sanity check.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1971 +msgid "" " 2. The '--relocate' option is deprecated. This syntax is equivalent to\n" " 'svn relocate FROM-PREFIX TO-PREFIX [PATH]'.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1974 +msgid "" " See also 'svn help update' for a list of possible characters\n" " reporting the action taken.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1977 +msgid "" " Examples:\n" " svn switch ^/branches/1.x-release\n" " svn switch --relocate http:// svn://\n" " svn switch --relocate http://www.example.com/repo/project \\\n" " svn://svn.example.com/repo/project\n" msgstr "" -"Stellt die Arbeitskopie auf eine andere URL.\n" -"Aufruf: 1. switch URL[@PEGREV] [PFAD]\n" -" 2. switch --relocate VON NACH [PFAD...]\n" -"\n" -" 1. Stellt die Arbeitskopie so um, dass sie eine neue URL im Projektarchiv\n" -" widerspiegelt. Dieses Verhalten ist ähnlich zu »svn update« und wird\n" -" verwendet, um eine Arbeitskopie auf einen Zweig oder ein Tag im selben\n" -" Projektarchiv umzustellen. Falls angegeben, spezifiziert PEGREV,\n" -" in welcher Revision zuerst nach dem Ziel gesucht wird.\n" -"\n" -" Falls --force verwendet wird, führen nicht versionierte, behindernde\n" -" Pfade in der Arbeitskopie nicht automatisch zu einem Fehler, falls die\n" -" Umplatzierung versucht, den selben Pfad hinzuzufügen. Falls der\n" -" behindernde Pfad vom selben Typ (Datei oder Verzeichnis) wie der\n" -" entsprechende Pfad im Projektarchiv ist, wird er versioniert aber sein\n" -" Inhalt bleibt wie er ist in der Arbeitskopie. Das bedeutet, dass\n" -" nicht versionierte Objekte eines behindernden Verzeichnisses ebenso\n" -" behindernd sein und versioniert werden könnten. Für Dateien werden alle\n" -" inhaltlichen Unterschiede zwischen der Behinderung und dem Projektarchiv\n" -" wie lokale Änderungen der Arbeitskopie interpretiert. Alle Eigenschaften\n" -" des Projektarchivs werden auf den behindernden Pfad angewandt.\n" -"\n" -" Verwenden Sie die Option --set-depth, um eine neue Arbeitskopietiefe für\n" -" die Ziele dieser Operation zu setzen.\n" -"\n" -" Subversion wird sich im Normalfall weigern, eine Arbeitkopie auf eine neue\n" -" URL umzustellen, mit dem sie keine gemeinsame Vorgeschichte in der\n" -" Versionskontrolle hat. »--ignore-ancestry« übergeht diese Prüfung.\n" -"\n" -" 2. Die Option »--relocate« ist veraltet. Der Syntax ist identisch mit\n" -" »svn relocate VON NACH [PFAD]«.\n" -"\n" -" Siehe auch »svn help update« für eine Liste möglicher Buchstaben,\n" -" die die durchgeführte Aktion beschreiben.\n" -"\n" -" Examples:\n" -" svn switch ^/branches/Version-1.x\n" -" svn switch --relocate http:// svn://\n" -" svn switch --relocate http://www.example.com/repo/Projekt \\\n" -" svn://svn.example.com/repo/Projekt\n" -#: ../svn/svn.c:1688 +#: ../svn/svn.c:1987 msgid "allow switching to a node with no common ancestor" msgstr "Erlaubt Umstellung auf einen Knoten ohne gemeinsamen Vorfahren" -#: ../svn/svn.c:1690 ../svn/svn.c:1750 +#: ../svn/svn.c:1989 ../svn/svn.c:2053 msgid "handle unversioned obstructions as changes" msgstr "Behandelt nicht versionierte Blockierungen als Änderungen" -#: ../svn/svn.c:1694 +#: ../svn/svn.c:1990 +#, fuzzy +msgid "deprecated; use 'svn relocate'" +msgstr "Veraltet; siehe »--no-newline«" + +#: ../svn/svn.c:1994 +#, fuzzy msgid "" "Unlock working copy paths or URLs.\n" "usage: unlock TARGET...\n" "\n" -" Use --force to break the lock.\n" msgstr "" "Hebt Sperren von Arbeitskopiepfaden oder URLs auf.\n" "Aufruf: unlock ZIEL...\n" "\n" " Benutzen Sie --force, um die Freigabe zu erzwingen.\n" -# Parts of the text (--force and --set-depth) are shared with the -# switch help. Keep it consistent. -#: ../svn/svn.c:1701 +#: ../svn/svn.c:1997 +#, fuzzy +msgid " Use --force to break a lock held by another user or working copy.\n" +msgstr "Verzeichnis »%s« ist in einer Arbeitskopie gesperrt" + +#: ../svn/svn.c:2000 +#, fuzzy +msgid "break locks" +msgstr "Lese Sperre" + +#: ../svn/svn.c:2003 msgid "" "Bring changes from the repository into the working copy.\n" "usage: update [PATH...]\n" "\n" +msgstr "" + +#: ../svn/svn.c:2006 +msgid "" " If no revision is given, bring working copy up-to-date with HEAD rev.\n" " Else synchronize working copy to revision given by -r.\n" "\n" +msgstr "" + +#: ../svn/svn.c:2009 +msgid "" " For each updated item a line will be printed with characters reporting\n" " the action taken. These characters have the following meaning:\n" "\n" -" A Added\n" -" D Deleted\n" -" U Updated\n" -" C Conflict\n" -" G Merged\n" -" E Existed\n" -" R Replaced\n" -"\n" +msgstr "" + +#: ../svn/svn.c:2020 +msgid "" " Characters in the first column report about the item itself.\n" " Characters in the second column report about properties of the item.\n" " A 'B' in the third column signifies that the lock for the file has\n" @@ -14373,6 +16984,11 @@ msgid "" " the first and second columns indicate textual conflicts in files\n" " and in property values, respectively.\n" "\n" +msgstr "" + +#: ../svn/svn.c:2028 +#, fuzzy +msgid "" " If --force is used, unversioned obstructing paths in the working\n" " copy do not automatically cause a failure if the update attempts to\n" " add the same path. If the obstructing path is the same type (file\n" @@ -14385,3758 +17001,6589 @@ msgid "" " are applied to the obstructing path. Obstructing paths are reported\n" " in the first column with code 'E'.\n" "\n" +msgstr "" +"Checkt eine Arbeitskopie aus einem Projektarchiv aus.\n" +"Aufruf: checkout URL[@REV]... [PFAD]\n" +"\n" +" Falls angegeben, legt REV fest, in welcher Revision die URL zuerst\n" +" nachgeschlagen wird.\n" +"\n" +" Ohne Angabe von PFAD wird der Basisname der URL als Ziel verwendet.\n" +" Sind mehrere URLs angegeben, wird jede in ein Unterverzeichnis von\n" +" PFAD ausgecheckt, dessen Name der Basisname der URL ist.\n" +"\n" +" Bei Angabe von --force lassen nicht versionierte, behindernde Objekte\n" +" in der Arbeitskopie den Vorgang nicht automatisch fehlschlagen. Falls\n" +" der behindernde Pfad vom gleichen Typ (Datei oder Verzeichnis) wie der\n" +" entsprechende Pfad im Projektarchiv ist, wird er versioniert, behält\n" +" aber seinen ursprünglichen Inhalt. Das bedeutet, dass nicht versionierte\n" +" Unterverzeichnisse eines behindernden Verzeichnisses ebenfalls versioniert\n" +" werden können. Bei Dateien werden alle Unterschiede im Inhalt wie lokale\n" +" Modifikationen in der Arbeitskopie behandelt. Sämtliche Eigenschaften\n" +" aus dem Projektarchiv werden auf den behindernden Pfad angewendet.\n" +"\n" +" Siehe auch »svn help update« für eine Liste möglicher Buchstaben,\n" +" die die durchgeführte Aktion beschreiben.\n" + +#: ../svn/svn.c:2040 +msgid "" " If the specified update target is missing from the working copy but its\n" " immediate parent directory is present, checkout the target into its\n" " parent directory at the specified depth. If --parents is specified,\n" " create any missing parent directories of the target by checking them\n" " out, too, at depth=empty.\n" "\n" +msgstr "" + +#: ../svn/svn.c:2046 +msgid "" " Use the --set-depth option to set a new working copy depth on the\n" " targets of this operation.\n" msgstr "" -"Aktualisiert die Arbeitskopie mit Änderungen aus dem Projektarchiv.\n" -"Aufruf: update [PFAD...]\n" -"\n" -" Ist keine Revision angegeben, wird die Arbeitskopie auf den aktuellen\n" -" Stand der HEAD-Revision gebracht. Ansonsten wird die Arbeitskopie mit der\n" -" durch -r angegebenen Revision synchronisiert.\n" -"\n" -" Für jedes aktualisierte Objekt wird eine Zeile mit einem Buchstaben für die\n" -" durchgeführte Aktion ausgegeben. Diese haben die folgenden Bedeutungen\n" -"\n" -" A Added - Hinzugefügt\n" -" D Deleted - Gelöscht\n" -" U Updated - Aktualisiert\n" -" C Conflict - Konflikt\n" -" G Merged - Zusammengeführt\n" -" E Existed - Existierend\n" -" R Replaced - Ersetzt\n" -"\n" -" Ein Buchstabe in der ersten Spalte symbolisiert eine Aktualisierung der\n" -" Datei, während Aktualisierungen der Dateieigenschaften in der zweiten\n" -" Spalte angezeigt werden.\n" -" Ein »B« in der dritten Spalte zeigt an, dass die Sperre für die Datei\n" -" aufgebrochen oder gestohlen wurde.\n" -" Ein »C« in der vierten Spalte zeigt einen Baumkonflikt an, während es\n" -" in der ersten und zweiten Spalte jeweils einen Konflikt im Text bzw.\n" -" einer Eigenschaft anzeigt.\n" -"\n" -" Falls --force verwendet wird, werden nichtversionierte behindernde Pfade in\n" -" der Arbeitskopie nicht automatisch einen Fehlschlag verursachen, wenn die\n" -" Aktualisierung versucht, den selben Pfad hinzufügen. Ist der behindernde Pfad\n" -" vom selben Typ (Datei oder Verzeichnis) wie der entsprechende Pfad im\n" -" Projektarchiv, wird es versioniert, aber der Inhalt verbleibt wie er ist\n" -" in der Arbeitskopie.\n" -" Das bedeutet, dass nichtversionierte Kinder eines behindernden\n" -" Verzeichnisses ebenso behindert werden und versioniert werden können. Für\n" -" Dateien werden alle inhaltlichen Unterschiede zwischen der Behinderung und\n" -" dem Projektarchiv wie lokale Änderungen in der Arbeitskopie interpretiert.\n" -" Alle Eigenschaften des Projektarchivs werden auf den behindernden Pfad\n" -" angewandt. Behindernde Pfade werden in der ersten Spalte mit »E« angezeigt.\n" -"\n" -" Falls das angegebene Ziel der Aktualisierung in der Arbeitskopie fehlt aber\n" -" dessen unmittelbares Elternverzeichnis vorhanden ist, wird das angegebene\n" -" Ziel in das Elternverzeichnis mit der angegebenen Tiefe ausgecheckt. Falls\n" -" »--parents« angegeben wird, werden alle fehlenden Elternverzeichnisse auch\n" -" ausgecheckt, mit der Tiefe »empty«.\n" -" Verwenden Sie die Option --set-depth, um eine neue Arbeitskopietiefe für\n" -" die Ziele dieser Operation zu setzen. Zurzeit kann die Tiefe eines\n" -" Arbeitskopieverzeichnisses nur erhöht werden (tiefer ineinander geschachtelt);\n" -" eine Verzeichnistiefe kann nicht reduziert werden.\n" - -#: ../svn/svn.c:1753 + +#: ../svn/svn.c:2056 +#, fuzzy msgid "" "Upgrade the metadata storage format for a working copy.\n" "usage: upgrade [WCPATH...]\n" "\n" -" Local modifications are preserved.\n" msgstr "" "Überführt die Metadaten einer Arbeitskopie in ein neues Speicherformat.\n" "Aufruf: upgrade [AKPFAD...]\n" "\n" " Lokale Änderungen bleiben erhalten.\n" -#: ../svn/svn.c:1801 ../svnadmin/svnadmin.c:97 ../svnbench/svnbench.c:338 -#: ../svnfsfs/svnfsfs.c:79 ../svnlook/svnlook.c:387 ../svnrdump/svnrdump.c:66 -#: ../svnsync/svnsync.c:332 -msgid "Caught signal" -msgstr "Abbruchsignal empfangen" +#: ../svn/svn.c:2059 +#, fuzzy +msgid " Local modifications are preserved.\n" +msgstr "Lokale Änderungen in »%s« belassen\n" -#: ../svn/svn.c:1947 ../svnbench/svnbench.c:430 ../svnlook/svnlook.c:2571 +#: ../svn/svn.c:2235 ../svnbench/svnbench.c:474 ../svnlook/svnlook.c:2590 msgid "Non-numeric limit argument given" msgstr "Nicht-numerische Bereichsgrenze angegeben" -#: ../svn/svn.c:1952 ../svnbench/svnbench.c:435 ../svnlook/svnlook.c:2576 +#: ../svn/svn.c:2240 ../svnbench/svnbench.c:479 ../svnlook/svnlook.c:2595 msgid "Argument to --limit must be positive" msgstr "Parameter für --limit muss positiv sein" -#: ../svn/svn.c:1972 ../svn/svn.c:2247 +#: ../svn/svn.c:2260 ../svn/svn.c:2535 msgid "Can't specify -c with --old" msgstr "-c kann nicht mit --old verwendet werden" -#: ../svn/svn.c:2002 ../svnbench/svnbench.c:471 +#: ../svn/svn.c:2290 ../svnbench/svnbench.c:515 #, c-format msgid "Negative number in range (%s) not supported with -c" msgstr "Negative Zahl im Bereich (%s) ist mit -c nicht unterstützt" -#: ../svn/svn.c:2014 ../svnbench/svnbench.c:483 +#: ../svn/svn.c:2302 ../svnbench/svnbench.c:527 #, c-format msgid "Non-numeric change argument (%s) given to -c" msgstr "Nicht-numerischer Parameter (%s) an -c übergeben" -#: ../svn/svn.c:2021 ../svnbench/svnbench.c:490 +#: ../svn/svn.c:2309 ../svnbench/svnbench.c:534 msgid "There is no change 0" msgstr "Es gibt keine Änderung 0" -#: ../svn/svn.c:2062 ../svnadmin/svnadmin.c:2488 ../svnbench/svnbench.c:532 -#: ../svnfsfs/svnfsfs.c:331 ../svnrdump/svnrdump.c:890 -#: ../svnsync/svnsync.c:2113 +#: ../svn/svn.c:2350 ../svnadmin/svnadmin.c:2928 ../svnbench/svnbench.c:576 +#: ../svnfsfs/svnfsfs.c:303 ../svnrdump/svnrdump.c:861 +#: ../svnsync/svnsync.c:2146 #, c-format msgid "Syntax error in revision argument '%s'" msgstr "Syntaxfehler in Revisionsparameter »%s«" -#: ../svn/svn.c:2125 ../svn/svn.c:2142 ../svnbench/svnbench.c:571 +#: ../svn/svn.c:2413 ../svn/svn.c:2430 ../svnbench/svnbench.c:615 #, c-format msgid "Error converting depth from locale to UTF-8" msgstr "Fehler beim Konvertieren der Tiefe aus Locale nach UTF-8" -#: ../svn/svn.c:2132 ../svnbench/svnbench.c:578 +#: ../svn/svn.c:2420 ../svnbench/svnbench.c:622 #, c-format msgid "'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'" msgstr "»%s« ist keine gültige Tiefe; versuchen Sie »empty«, »files«, »immediates« oder »infinity«" -#: ../svn/svn.c:2149 +#: ../svn/svn.c:2437 #, c-format msgid "'%s' is not a valid depth; try 'exclude', 'empty', 'files', 'immediates', or 'infinity'" msgstr "»%s« ist keine gültige Tiefe; versuchen Sie »exclude«, »empty«, »files«, »immediates« oder »infinity«" -#: ../svn/svn.c:2284 +#: ../svn/svn.c:2572 #, c-format msgid "Syntax error in native-eol argument '%s'" msgstr "Syntaxfehler im »native-eol« Parameter »%s«" -#: ../svn/svn.c:2302 +#: ../svn/svn.c:2593 msgid "Changelist names must not be empty" msgstr "Namen von Änderungslisten dürfen nicht leer sein" -#: ../svn/svn.c:2335 -#, c-format -msgid "'%s' is not a valid --accept value" -msgstr "»%s« ist kein gültiger Wert für --accept" +#: ../svn/svn.c:2626 +#, c-format +msgid "'%s' is not a valid --accept value" +msgstr "»%s« ist kein gültiger Wert für --accept" + +#: ../svn/svn.c:2634 +#, c-format +msgid "'%s' is not a valid --show-revs value" +msgstr "»%s« ist kein gültiger Wert für --show-revs" + +#: ../svn/svn.c:2650 +#, c-format +msgid "Invalid strip count '%s'" +msgstr "Ungültige Anzahl der zu entfernenden Komponenten »%s«" + +#: ../svn/svn.c:2656 +msgid "Argument to --strip must be positive" +msgstr "Parameter für --strip muss positiv sein" + +#: ../svn/svn.c:2747 ../svnmucc/svnmucc.c:666 ../svnrdump/svnrdump.c:940 +#: ../svnsync/svnsync.c:2204 +msgid "--non-interactive and --force-interactive are mutually exclusive" +msgstr "--non-interactive und --force-interactive schließen sich gegenseitig aus" + +#: ../svn/svn.c:2800 ../svnbench/svnbench.c:756 +#: ../svndumpfilter/svndumpfilter.c:1428 ../svnlook/svnlook.c:2694 +#, c-format +msgid "Subcommand argument required\n" +msgstr "Unterbefehl benötigt einen Parameter\n" + +#: ../svn/svn.c:2818 ../svnadmin/svnadmin.c:3154 ../svnbench/svnbench.c:774 +#: ../svndumpfilter/svndumpfilter.c:1445 ../svnfsfs/svnfsfs.c:379 +#: ../svnlook/svnlook.c:2711 ../svnrdump/svnrdump.c:984 +#, c-format +msgid "Unknown subcommand: '%s'\n" +msgstr "Unbekannter Unterbefehl: »%s«\n" + +#: ../svn/svn.c:2827 +#, c-format +msgid "Undo is done using either the 'svn revert' or the 'svn merge' command.\n" +msgstr "Undo wird mit den Befehlen »svn revert« bzw. »svn merge« durchgeführt.\n" + +#: ../svn/svn.c:2863 +#, c-format +msgid "" +"Subcommand '%s' doesn't accept option '%s'\n" +"Type 'svn help %s' for usage.\n" +msgstr "" +"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n" +"Geben Sie »svn help %s« für Hilfe ein.\n" + +#: ../svn/svn.c:2878 ../svnbench/svnbench.c:822 +msgid "Multiple revision arguments encountered; can't specify -c twice, or both -c and -r" +msgstr "Mehrere Revisionsparameter gefunden; bitte nicht zweimal -c oder gleichzeitig -r und -c angeben" + +#: ../svn/svn.c:2889 +msgid "--depth and --set-depth are mutually exclusive" +msgstr "--depth und --set-depth schließen sich gegenseitig aus" + +#: ../svn/svn.c:2898 ../svnbench/svnbench.c:833 +msgid "--with-all-revprops and --with-no-revprops are mutually exclusive" +msgstr "--with-all-revprops und --with-no-revprops schließen sich gegenseitig aus" + +#: ../svn/svn.c:2907 ../svnbench/svnbench.c:842 +msgid "--with-revprop and --with-no-revprops are mutually exclusive" +msgstr "--with-revprop und --with-no-revprops schließen sich gegenseitig aus" + +#: ../svn/svn.c:2937 +msgid "--message (-m) and --file (-F) are mutually exclusive" +msgstr "--message (-m) und --file (-F) schließen sich gegenseitig aus" + +#: ../svn/svn.c:2950 ../svnbench/svnbench.c:855 ../svnmucc/svnmucc.c:678 +#: ../svnrdump/svnrdump.c:1043 +#, fuzzy +msgid "--trust-server-cert-failures requires --non-interactive" +msgstr "--trust-other-failure erfordert --non-interactive" + +#: ../svn/svn.c:2958 ../svnbench/svnbench.c:863 ../svnmucc/svnmucc.c:686 +#: ../svnrdump/svnrdump.c:1050 +#, fuzzy +msgid "--password-from-stdin requires --non-interactive" +msgstr "--trust-expired erfordert --non-interactive" + +# TODO: Duplicated message!!!! +#: ../svn/svn.c:2967 +msgid "--diff-cmd and --internal-diff are mutually exclusive" +msgstr "--diff-cmd und --internal-diff schließen sich gegenseitig aus" + +#: ../svn/svn.c:3009 +msgid "--relocate and --depth are mutually exclusive" +msgstr "--relocate und --depth schließen sich gegenseitig aus" + +#: ../svn/svn.c:3016 +msgid "--relocate and --non-recursive (-N) are mutually exclusive" +msgstr "--relocate und --non-recursive (-N) schließen sich gegenseitig aus" + +#: ../svn/svn.c:3139 +msgid "Log message file is a versioned file; use '--force-log' to override" +msgstr "Die Datei für die Logmeldung ist versioniert; geben Sie »--force-log« an, um sie zu verwenden" + +#: ../svn/svn.c:3146 +msgid "Lock comment file is a versioned file; use '--force-log' to override" +msgstr "Die Datei für den Sperrkommentar ist versioniert; geben Sie »--force-log« an, um sie zu verwenden" + +#: ../svn/svn.c:3166 +msgid "The log message is a pathname (was -F intended?); use '--force-log' to override" +msgstr "Die Logmeldung ist ein Pfad (war -F gemeint?); geben Sie »--force-log« an, um sie zu verwenden" + +#: ../svn/svn.c:3173 +msgid "The lock comment is a pathname (was -F intended?); use '--force-log' to override" +msgstr "Der Sperrkommentar ist ein Pfad (war -F gemeint?); geben Sie »--force-log« an, um ihn zu verwenden" + +#: ../svn/svn.c:3196 +msgid "--auto-props and --no-auto-props are mutually exclusive" +msgstr "--auto-props und --no-auto-props schließen sich gegenseitig aus" + +#: ../svn/svn.c:3289 ../svn/svn.c:3296 +#, c-format +msgid "--accept=%s incompatible with --non-interactive" +msgstr "--accept=%s ist mit --non-interactive nicht kompatibel" + +#: ../svn/svn.c:3345 +#, c-format +msgid "Try 'svn help %s' for more information" +msgstr "Versuchen Sie »svn help %s« für weitere Informationen" + +#: ../svn/svn.c:3351 ../svnbench/svnbench.c:1006 +msgid "Please see the 'svn upgrade' command" +msgstr "Siehe Kommando »svn upgrade«" + +#: ../svn/svn.c:3357 ../svnmucc/svnmucc.c:971 ../svnrdump/svnrdump.c:1143 +msgid "Authentication failed and interactive prompting is disabled; see the --force-interactive option" +msgstr "Authentifizierung schlug fehl und interaktives Nachfragen ist deaktiviert; Siehe Option »--force-interactive«" + +#: ../svn/svn.c:3362 +msgid "Reading file from standard input because of -F option; this can interfere with interactive prompting" +msgstr "Einlesen der Datei von der Standardeingabe wegen Option -F; dies kann interaktive Nachfragen stören" + +#: ../svn/svn.c:3373 ../svnbench/svnbench.c:1014 +msgid "Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)" +msgstr "Starten Sie »svn cleanup«, um die Sperren zu entfernen (Aufruf: »svn help cleanup« für Details)" + +#: ../svn/svn.c:3380 +msgid "Another process is blocking the working copy database, or the underlying filesystem does not support file locking; if the working copy is on a network filesystem, make sure file locking has been enabled on the file server" +msgstr "Ein anderer Vorgang blockiert die Datenbank der Arbeitskopie, oder das darunterliegende Dateisystem unterstützt das Sperren von Dateien nicht; falls sich die Arbeitskopie auf einem Netzwerkdateisystem befindet, stellen Sie sicher, dass Dateisperren auf dem Dateiserver aktiviert sind" + +#: ../svn/svn.c:3393 +msgid "When using svn+ssh:// URLs, keep in mind that the --username and --password options are ignored because authentication is performed by SSH, not Subversion" +msgstr "Bei der Verwendung von svn+ssh:// URLs sollte beachtet werden, dass die Optionen »--username« und »--password« ignoriert werden, da die Authentifizierung von SSH und nicht Subversion durchgeführt wird" + +#: ../svn/switch-cmd.c:63 +#, c-format +msgid "'%s' to '%s' is not a valid relocation" +msgstr "Umplatzieren von »%s« nach »%s« ist nicht möglich" + +#: ../svn/switch-cmd.c:173 +#, c-format +msgid "Path '%s' does not share common version control ancestry with the requested switch location. Use --ignore-ancestry to disable this check." +msgstr "Pfad »%s« hat keine gemeinsame Versionskontrollgeschichte mit dem angegebenen Ziel der Umstellung. Verwenden Sie »--ignore-ancestry« um diese Prüfung zu umgehen." + +#: ../svn/switch-cmd.c:183 +msgid "'svn switch' does not support switching a working copy to a different repository" +msgstr "Umstellen einer Arbeitskopie auf ein anderes Projektarchiv wird von »svn switch« nicht unterstützt" + +#: ../svn/unlock-cmd.c:101 +#, fuzzy +msgid "One or more locks could not be released" +msgstr "[Fehlerausgabe konnte nicht gelesen werden.]" + +#: ../svn/update-cmd.c:93 +#, c-format +msgid "Summary of updates:\n" +msgstr "Zusammenfassung der Aktualisierungen:\n" + +#: ../svn/update-cmd.c:97 +#, c-format +msgid " Updated '%s' to r%ld.\n" +msgstr " »%s« auf r%ld aktualisiert.\n" + +#: ../svn/util.c:86 +#, c-format +msgid "Committed revision %ld%s.\n" +msgstr "Revision %ld%s übertragen.\n" + +#: ../svn/util.c:90 +msgid " (the answer to life, the universe, and everything)" +msgstr " (die Antwort auf die Frage nach dem Leben, dem Universum und dem ganzen Rest)" + +#: ../svn/util.c:99 ../svnmucc/svnmucc.c:94 +#, c-format +msgid "" +"\n" +"Warning: %s\n" +msgstr "" +"\n" +"Warnung: %s\n" + +# FIXME: s/whitespace/whitespaceS/? +#: ../svn/util.c:140 +msgid "The SVN_MERGE environment variable is empty or consists solely of whitespace. Expected a shell command.\n" +msgstr "Die Umgebungsvariable SVN_MERGE ist leer oder besteht nur aus Leerzeichen. Erwartete ein Shell-Kommando.\n" + +#: ../svn/util.c:146 +msgid "The environment variable SVN_MERGE and the merge-tool-cmd run-time configuration option were not set.\n" +msgstr "Die Umgebungsvariable SVN_MERGE und die Laufzeitkonfigurationsoption merge-tool-cmd wurden nicht gesetzt.\n" + +#: ../svn/util.c:175 +#, c-format +msgid "The external merge tool '%s' exited with exit code %d." +msgstr "Das externe Werkzeug zum Zusammenführen »%s« wurde mit Fehlercode %d beendet." + +#: ../svn/util.c:218 +msgid "Log message contains a zero byte" +msgstr "Logmeldung enthält ein Null Byte" + +#: ../svn/util.c:278 +#, c-format +msgid " '%s'" +msgstr " »%s«" + +#: ../svn/util.c:282 +msgid "Your commit message was left in a temporary file:" +msgstr "Ihre Logmeldung wurde in einer Temporärdatei abgelegt:" + +#: ../svn/util.c:334 +msgid "--This line, and those below, will be ignored--" +msgstr "-- Diese und die folgenden Zeilen werden ignoriert --" + +#: ../svn/util.c:360 ../svnmucc/svnmucc.c:432 +msgid "Error normalizing log message to internal format" +msgstr "Fehler beim Normalisieren der Logmeldung ins interne Format" + +#: ../svn/util.c:449 ../svnmucc/svnmucc.c:442 +msgid "Cannot invoke editor to get log message when non-interactive" +msgstr "Kann den Editor für Logmeldungen nur im interaktiven Modus aufrufen" + +#: ../svn/util.c:462 +msgid "Could not use external editor to fetch log message; consider setting the $SVN_EDITOR environment variable or using the --message (-m) or --file (-F) options" +msgstr "Konnte keinen externen Editor zur Eingabe der Logmeldung bestimmen. Setzten Sie entweder die $SVN_EDITOR Umgebungsvariable oder verwenden Sie die --message (-m) oder --file (-F) Optionen" + +#: ../svn/util.c:498 +msgid "" +"\n" +"Log message unchanged or not specified\n" +"(a)bort, (c)ontinue, (e)dit:\n" +msgstr "" +"\n" +"Logmeldung unverändert oder nicht angegeben\n" +"(A)bbrechen, Weiterma(c)hen, (E)ditieren:\n" + +#: ../svn/util.c:551 +msgid "Use --force to override this restriction (local modifications may be lost)" +msgstr "Benutzen Sie »--force«, um diese Einschränkung aufzuheben (lokale Änderungen könnten verloren gehen)" + +# CHECKME! Here used beside "dir" and "file". +#: ../svn/util.c:741 ../svn/util.c:774 +msgid "none" +msgstr "nichts" + +#: ../svn/util.c:742 +msgid "file" +msgstr "Datei" + +# dir is no English word! +#: ../svn/util.c:743 +msgid "dir" +msgstr "Verzeichnis" + +#: ../svn/util.c:775 +msgid "update" +msgstr "Aktualisierung" + +#: ../svn/util.c:776 +msgid "switch" +msgstr "Umstellung" + +#: ../svn/util.c:777 +msgid "merge" +msgstr "Zusammenführung" + +#: ../svn/util.c:899 +msgid "(invalid date)" +msgstr "(ungültiges Datum)" + +#: ../svn/util.c:1062 +#, c-format +msgid "svn: warning: '%s' is a binary mime-type but file '%s' looks like text; diff, merge, blame, and other operations will stop working on this file\n" +msgstr "svn: Warnung: »%s« ist ein binärer Mime-Typ, die Datei »%s« sieht aber wie Text aus; Operationen »diff« (Unterschiede anzeigen), »merge« (Unterschiede zusammenführen), »blame« (Annotieren) und andere Operationen werden auf dieser Datei nicht mehr funktionieren\n" + +#: ../svnadmin/svnadmin.c:177 ../svnfsfs/svnfsfs.c:101 +#: ../svnrdump/svnrdump.c:112 +msgid "specify revision number ARG (or X:Y range)" +msgstr "spezifizieren Sie PAR für Revisionsnummer (oder X:Y Bereich)" + +#: ../svnadmin/svnadmin.c:180 ../svnlook/svnlook.c:173 +msgid "specify transaction name ARG" +msgstr "Transaktionsname PAR angeben" + +#: ../svnadmin/svnadmin.c:183 +msgid "dump or hotcopy incrementally" +msgstr "Datenstrom inkrementell ausgeben oder im laufenden Betrieb inkrementell kopieren" -#: ../svn/svn.c:2343 -#, c-format -msgid "'%s' is not a valid --show-revs value" -msgstr "»%s« ist kein gültiger Wert für --show-revs" +#: ../svnadmin/svnadmin.c:186 +msgid "use deltas in dump output" +msgstr "Nutzt Deltas bei der Ausgabe" -#: ../svn/svn.c:2359 -#, c-format -msgid "Invalid strip count '%s'" -msgstr "Ungültige Anzahl der zu entfernenden Komponenten »%s«" +#: ../svnadmin/svnadmin.c:189 +msgid "bypass the repository hook system" +msgstr "Umgeht das Aktionssystem des Projektarchivs" -#: ../svn/svn.c:2365 -msgid "Argument to --strip must be positive" -msgstr "Parameter für --strip muss positiv sein" +#: ../svnadmin/svnadmin.c:192 +msgid "bypass property validation logic" +msgstr "Umgeht die Logik zur Überprüfung von Eigenschaften" -#: ../svn/svn.c:2441 ../svnmucc/svnmucc.c:658 ../svnrdump/svnrdump.c:962 -#: ../svnsync/svnsync.c:2170 -msgid "--non-interactive and --force-interactive are mutually exclusive" -msgstr "--non-interactive und --force-interactive schließen sich gegenseitig aus" +#: ../svnadmin/svnadmin.c:195 +msgid "ignore revision datestamps found in the stream" +msgstr "Ignoriert Datumsangaben der im Datenstrom gefundenen Revisionen" -#: ../svn/svn.c:2494 ../svnbench/svnbench.c:708 -#: ../svndumpfilter/svndumpfilter.c:1456 ../svnlook/svnlook.c:2675 -#, c-format -msgid "Subcommand argument required\n" -msgstr "Unterbefehl benötigt einen Parameter\n" +#: ../svnadmin/svnadmin.c:198 ../svnfsfs/svnfsfs.c:98 +msgid "no progress (only errors to stderr)" +msgstr "keine Fortschrittsanzeige (nur Fehler auf die Standardfehlerausgabe)" -#: ../svn/svn.c:2512 ../svnadmin/svnadmin.c:2689 ../svnbench/svnbench.c:726 -#: ../svndumpfilter/svndumpfilter.c:1474 ../svnfsfs/svnfsfs.c:403 -#: ../svnlook/svnlook.c:2692 ../svnrdump/svnrdump.c:1006 -#, c-format -msgid "Unknown subcommand: '%s'\n" -msgstr "Unbekannter Unterbefehl: »%s«\n" +#: ../svnadmin/svnadmin.c:201 +msgid "ignore any repos UUID found in the stream" +msgstr "Ignoriert jede Projektarchiv-UUID, die im Datenstrom gefunden wird" -#: ../svn/svn.c:2521 -#, c-format -msgid "Undo is done using either the 'svn revert' or the 'svn merge' command.\n" -msgstr "Undo wird mit den Befehlen »svn revert« bzw. »svn merge« durchgeführt.\n" +#: ../svnadmin/svnadmin.c:204 +msgid "set repos UUID to that found in stream, if any" +msgstr "Setzt die UUID des Projektarchivs auf die im Datenstrom gefundene" -#: ../svn/svn.c:2557 -#, c-format +#: ../svnadmin/svnadmin.c:207 msgid "" -"Subcommand '%s' doesn't accept option '%s'\n" -"Type 'svn help %s' for usage.\n" +"type of repository:\n" +" 'fsfs' (default), 'bdb' or 'fsx'\n" +" CAUTION: FSX is for EXPERIMENTAL use only!" msgstr "" -"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n" -"Geben Sie »svn help %s« für Hilfe ein.\n" +"Typ des Projektarchivs:\n" +" 'fsfs' (Vorgabe), 'bdb' or 'fsx'\n" +" ACHTUNG: FSX ist als EXPERIMENTELL eingestuft!" -#: ../svn/svn.c:2572 ../svnbench/svnbench.c:774 -msgid "Multiple revision arguments encountered; can't specify -c twice, or both -c and -r" -msgstr "Mehrere Revisionsparameter gefunden; bitte nicht zweimal -c oder gleichzeitig -r und -c angeben" +#: ../svnadmin/svnadmin.c:212 +msgid "load at specified directory in repository" +msgstr "in das spezifizierte Verzeichnis im Projektarchiv laden" -#: ../svn/svn.c:2583 -msgid "--depth and --set-depth are mutually exclusive" -msgstr "--depth und --set-depth schließen sich gegenseitig aus" +#: ../svnadmin/svnadmin.c:215 +msgid "disable fsync at transaction commit [Berkeley DB]" +msgstr "Deaktiviert »fsync« für jede Übertragungstransaktion [Berkeley DB]" -#: ../svn/svn.c:2592 ../svnbench/svnbench.c:785 -msgid "--with-all-revprops and --with-no-revprops are mutually exclusive" -msgstr "--with-all-revprops und --with-no-revprops schließen sich gegenseitig aus" +#: ../svnadmin/svnadmin.c:218 +msgid "disable automatic log file removal [Berkeley DB]" +msgstr "Deaktiviert das automatische Entfernen von Log-Dateien [Berkeley DB]" -#: ../svn/svn.c:2601 ../svnbench/svnbench.c:794 -msgid "--with-revprop and --with-no-revprops are mutually exclusive" -msgstr "--with-revprop und --with-no-revprops schließen sich gegenseitig aus" +#: ../svnadmin/svnadmin.c:224 +msgid "" +"remove redundant Berkeley DB log files\n" +" from source repository [Berkeley DB]" +msgstr "" +"Entfernt redundante Berkeley-DB-Logdateien\n" +" aus dem Projektarchiv [Berkeley DB]" -#: ../svn/svn.c:2631 -msgid "--message (-m) and --file (-F) are mutually exclusive" -msgstr "--message (-m) und --file (-F) schließen sich gegenseitig aus" +#: ../svnadmin/svnadmin.c:228 +msgid "call pre-commit hook before committing revisions" +msgstr "die Aktion »pre-commit« nach dem Übertragen von Revisionen aufrufen" -#: ../svn/svn.c:2640 ../svnbench/svnbench.c:803 ../svnmucc/svnmucc.c:669 -#: ../svnrdump/svnrdump.c:1064 ../svnsync/svnsync.c:2219 -msgid "--trust-unknown-ca requires --non-interactive" -msgstr "--trust-unknown-ca erfordert --non-interactive" +#: ../svnadmin/svnadmin.c:231 +msgid "call post-commit hook after committing revisions" +msgstr "die Aktion »post-commit« nach dem Übertragen von Revisionen aufrufen" -#: ../svn/svn.c:2644 ../svnbench/svnbench.c:807 ../svnmucc/svnmucc.c:673 -#: ../svnrdump/svnrdump.c:1068 ../svnsync/svnsync.c:2223 -msgid "--trust-cn-mismatch requires --non-interactive" -msgstr "--trust-cn-mismatch erfordert --non-interactive" +#: ../svnadmin/svnadmin.c:234 +msgid "call hook before changing revision property" +msgstr "Aktion vor der Änderung der Revisionseigenschaft aufrufen" -#: ../svn/svn.c:2648 ../svnbench/svnbench.c:811 ../svnmucc/svnmucc.c:677 -#: ../svnrdump/svnrdump.c:1072 ../svnsync/svnsync.c:2227 -msgid "--trust-expired requires --non-interactive" -msgstr "--trust-expired erfordert --non-interactive" +#: ../svnadmin/svnadmin.c:237 +msgid "call hook after changing revision property" +msgstr "Aktion nach der Änderung der Revisionseigenschaft aufrufen" -#: ../svn/svn.c:2652 ../svnbench/svnbench.c:815 ../svnmucc/svnmucc.c:681 -#: ../svnrdump/svnrdump.c:1076 ../svnsync/svnsync.c:2231 -msgid "--trust-not-yet-valid requires --non-interactive" -msgstr "--trust-not-yet-valid erfordert --non-interactive" +#: ../svnadmin/svnadmin.c:240 +msgid "" +"wait instead of exit if the repository is in\n" +" use by another process" +msgstr "" +"Wartet anstatt abzubrechen, wenn das Projektarchiv\n" +" durch einen anderen Prozess belegt ist" -#: ../svn/svn.c:2656 ../svnbench/svnbench.c:819 ../svnmucc/svnmucc.c:685 -#: ../svnrdump/svnrdump.c:1080 ../svnsync/svnsync.c:2235 -msgid "--trust-other-failure requires --non-interactive" -msgstr "--trust-other-failure erfordert --non-interactive" +#: ../svnadmin/svnadmin.c:244 ../svnadmin/svnadmin.c:247 +#: ../svnadmin/svnadmin.c:250 +msgid "deprecated; see --compatible-version" +msgstr "Veraltet; siehe »--compatible-version«" -# TODO: Duplicated message!!!! -#: ../svn/svn.c:2665 -msgid "--diff-cmd and --internal-diff are mutually exclusive" -msgstr "--diff-cmd und --internal-diff schließen sich gegenseitig aus" +#: ../svnadmin/svnadmin.c:253 +msgid "continue verification after detecting a corruption" +msgstr "Setzt die Verifikation nach einer entdeckten Beschädigung fort" -#: ../svn/svn.c:2707 -msgid "--relocate and --depth are mutually exclusive" -msgstr "--relocate und --depth schließen sich gegenseitig aus" +#: ../svnadmin/svnadmin.c:256 ../svnlook/svnlook.c:148 +msgid "" +"size of the extra in-memory cache in MB used to\n" +" minimize redundant operations. Default: 16.\n" +" [used for FSFS repositories only]" +msgstr "" +"Größe des extra Zwischenspeichers im RAM in MB zur\n" +" Minimierung redundanter Operationen. Vorgabe: 16.\n" +" [nur für FSFS-Projektarchive verwendet]" -#: ../svn/svn.c:2714 -msgid "--relocate and --non-recursive (-N) are mutually exclusive" -msgstr "--relocate und --non-recursive (-N) schließen sich gegenseitig aus" +# TODO: combine with message above +#: ../svnadmin/svnadmin.c:261 +msgid "" +"use repository format compatible with Subversion\n" +" version ARG (\"1.5.5\", \"1.7\", etc.)" +msgstr "" +"verwendet ein Format das mit der Subversion-Version PAR\n" +" kompatibel ist (\"1.5.5\", \"1.7\", usw.)" -#: ../svn/svn.c:2833 -msgid "Log message file is a versioned file; use '--force-log' to override" -msgstr "Die Datei für die Logmeldung ist versioniert; geben Sie »--force-log« an, um sie zu verwenden" +#: ../svnadmin/svnadmin.c:264 ../svnadmin/svnadmin.c:399 +msgid "read repository paths from file ARG" +msgstr "Liest Pfade imP rojektarchive aus Datei PAR" -#: ../svn/svn.c:2840 -msgid "Lock comment file is a versioned file; use '--force-log' to override" -msgstr "Die Datei für den Sperrkommentar ist versioniert; geben Sie »--force-log« an, um sie zu verwenden" +#: ../svnadmin/svnadmin.c:267 +msgid "" +"report any names within the same directory or\n" +" svn:mergeinfo property value that differ only\n" +" in character representation, but are otherwise\n" +" identical" +msgstr "" +"listet Namen auf, die im selben Verzeichnis oder\n" +" svn:mergeinfo-Eigenschaft sich nur in ihrer\n" +" Zeichendarstellung unterscheiden aber sonst\n" +" identisch sind" -#: ../svn/svn.c:2860 -msgid "The log message is a pathname (was -F intended?); use '--force-log' to override" -msgstr "Die Logmeldung ist ein Pfad (war -F gemeint?); geben Sie »--force-log« an, um sie zu verwenden" +#: ../svnadmin/svnadmin.c:273 +msgid "" +"verify metadata only (ignored for BDB),\n" +" checking against external corruption in\n" +" Subversion 1.9+ format repositories.\n" +msgstr "" +"verifiziert nur Metadaten (ignoriert für BDB),\n" +" überprüft auf externe Beschädigungen von\n" +" Projektarchiven im Format Subversion 1.9+\n" -#: ../svn/svn.c:2867 -msgid "The lock comment is a pathname (was -F intended?); use '--force-log' to override" -msgstr "Der Sperrkommentar ist ein Pfad (war -F gemeint?); geben Sie »--force-log« an, um ihn zu verwenden" +#: ../svnadmin/svnadmin.c:278 +msgid "" +"disable flushing to disk during the operation\n" +" (faster, but unsafe on power off)" +msgstr "" -#: ../svn/svn.c:2890 -msgid "--auto-props and --no-auto-props are mutually exclusive" -msgstr "--auto-props und --no-auto-props schließen sich gegenseitig aus" +#: ../svnadmin/svnadmin.c:282 +#, fuzzy +msgid "" +"normalize property values found in the dumpstream\n" +" (currently, only translates non-LF line endings)" +msgstr "" +"Entfernt alle im Dateiabzug gefundenen leeren Revisionen\n" +" mit Ausnahme von Revision 0." -#: ../svn/svn.c:2999 ../svn/svn.c:3006 -#, c-format -msgid "--accept=%s incompatible with --non-interactive" -msgstr "--accept=%s ist mit --non-interactive nicht kompatibel" +#: ../svnadmin/svnadmin.c:286 +#, fuzzy +msgid "filter out nodes with given prefix(es) from dump" +msgstr "" +"Knoten mit den angegebenen Präfixen aus dem Datenstrom ausfiltern.\n" +"Aufruf: svndumpfilter exclude PFAD_PRÄFIX ...\n" -#: ../svn/svn.c:3062 -#, c-format -msgid "Try 'svn help %s' for more information" -msgstr "Versuchen Sie »svn help %s« für weitere Informationen" +#: ../svnadmin/svnadmin.c:289 +#, fuzzy +msgid "filter out nodes without given prefix(es) from dump" +msgstr "" +"Knoten, die nicht den angegebenen Präfixen entsprechen, aus dem Datenstrom ausfiltern.\n" +"Aufruf: svndumpfilter include PFAD_PRÄFIX ...\n" -#: ../svn/svn.c:3068 ../svnbench/svnbench.c:968 -msgid "Please see the 'svn upgrade' command" -msgstr "Siehe Kommando »svn upgrade«" +#: ../svnadmin/svnadmin.c:292 +msgid "" +"treat the path prefixes as file glob patterns.\n" +" Glob special characters are '*' '?' '[]' and '\\'.\n" +" Character '/' is not treated specially, so\n" +" pattern /*/foo matches paths /a/foo and /a/b/foo." +msgstr "" -#: ../svn/svn.c:3074 ../svnmucc/svnmucc.c:966 ../svnrdump/svnrdump.c:1156 -msgid "Authentication failed and interactive prompting is disabled; see the --force-interactive option" -msgstr "Authentifizierung schlug fehl und interaktives Nachfragen ist deaktiviert; Siehe Option »--force-interactive«" +#: ../svnadmin/svnadmin.c:307 +msgid "" +"usage: svnadmin crashtest REPOS_PATH\n" +"\n" +msgstr "" -#: ../svn/svn.c:3079 -msgid "Reading file from standard input because of -F option; this can interfere with interactive prompting" -msgstr "Einlesen der Datei von der Standardeingabe wegen Option -F; dies kann interaktive Nachfragen stören" +#: ../svnadmin/svnadmin.c:309 +#, fuzzy +msgid "" +"Open the repository at REPOS_PATH, then abort, thus simulating\n" +"a process that crashes while holding an open repository handle.\n" +msgstr "" +"Aufruf: svnadmin crashtest ARCHIV_PFAD\n" +"\n" +"Öffnet das Projektarchiv in ARCHIV_PFAD und bricht ab. Simuliert\n" +"damit einen Prozess der bei geöffnetem Projektarchiv abstürzt.\n" -#: ../svn/svn.c:3090 ../svnbench/svnbench.c:976 -msgid "Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)" -msgstr "Starten Sie »svn cleanup«, um die Sperren zu entfernen (Aufruf: »svn help cleanup« für Details)" +#: ../svnadmin/svnadmin.c:315 +#, fuzzy +msgid "" +"usage: svnadmin create REPOS_PATH\n" +"\n" +msgstr "" +"Aufruf: svnlook date ARCHIV_PFAD\n" +"\n" +"Gibt das Datum aus.\n" -#: ../svn/svn.c:3097 -msgid "Another process is blocking the working copy database, or the underlying filesystem does not support file locking; if the working copy is on a network filesystem, make sure file locking has been enabled on the file server" -msgstr "Ein anderer Vorgang blockiert die Datenbank der Arbeitskopie, oder das darunterliegende Dateisystem unterstützt das Sperren von Dateien nicht; falls sich die Arbeitskopie auf einem Netzwerkdateisystem befindet, stellen Sie sicher, dass Dateisperren auf dem Dateiserver aktiviert sind" +#: ../svnadmin/svnadmin.c:317 +#, fuzzy +msgid "Create a new, empty repository at REPOS_PATH.\n" +msgstr "" +"Aufruf: svnadmin create ARCHIV_PFAD\n" +"\n" +"Erstellt ein neues, leeres Projektarchiv im ARCHIV_PFAD.\n" -#: ../svn/svn.c:3110 -msgid "When using svn+ssh:// URLs, keep in mind that the --username and --password options are ignored because authentication is performed by SSH, not Subversion" -msgstr "Bei der Verwendung von svn+ssh:// URLs sollte beachtet werden, dass die Optionen »--username« und »--password« ignoriert werden, da die Authentifizierung von SSH und nicht Subversion durchgeführt wird" +#: ../svnadmin/svnadmin.c:326 +msgid "" +"usage: 1. svnadmin delrevprop REPOS_PATH -r REVISION NAME\n" +" 2. svnadmin delrevprop REPOS_PATH -t TXN NAME\n" +"\n" +msgstr "" -#: ../svn/switch-cmd.c:63 -#, c-format -msgid "'%s' to '%s' is not a valid relocation" -msgstr "Umplatzieren von »%s« nach »%s« ist nicht möglich" +#: ../svnadmin/svnadmin.c:329 +msgid "" +"1. Delete the property NAME on revision REVISION.\n" +"\n" +msgstr "" -#: ../svn/switch-cmd.c:170 -#, c-format -msgid "Path '%s' does not share common version control ancestry with the requested switch location. Use --ignore-ancestry to disable this check." -msgstr "Pfad »%s« hat keine gemeinsame Versionskontrollgeschichte mit dem angegebenen Ziel der Umstellung. Verwenden Sie »--ignore-ancestry« um diese Prüfung zu umgehen." +#: ../svnadmin/svnadmin.c:331 ../svnadmin/svnadmin.c:553 +msgid "" +"Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n" +"trigger the revision property-related hooks (for example, if you want\n" +"an email notification sent from your post-revprop-change hook).\n" +"\n" +msgstr "" -#: ../svn/switch-cmd.c:180 -msgid "'svn switch' does not support switching a working copy to a different repository" -msgstr "Umstellen einer Arbeitskopie auf ein anderes Projektarchiv wird von »svn switch« nicht unterstützt" +#: ../svnadmin/svnadmin.c:335 +msgid "" +"NOTE: Revision properties are not versioned, so this command will\n" +"irreversibly destroy the previous value of the property.\n" +"\n" +msgstr "" -#: ../svn/update-cmd.c:93 -#, c-format -msgid "Summary of updates:\n" -msgstr "Zusammenfassung der Aktualisierungen:\n" +#: ../svnadmin/svnadmin.c:338 +msgid "2. Delete the property NAME on transaction TXN.\n" +msgstr "" -#: ../svn/update-cmd.c:97 -#, c-format -msgid " Updated '%s' to r%ld.\n" -msgstr " »%s« auf r%ld aktualisiert.\n" +#: ../svnadmin/svnadmin.c:344 +msgid "" +"usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n" +"\n" +msgstr "" -#: ../svn/util.c:86 -#, c-format -msgid "Committed revision %ld%s.\n" -msgstr "Revision %ld%s übertragen.\n" +#: ../svnadmin/svnadmin.c:346 +#, fuzzy +msgid "" +"Run over the requested revision range, performing predecessor delti-\n" +"fication on the paths changed in those revisions. Deltification in\n" +"essence compresses the repository by only storing the differences or\n" +"delta from the preceding revision. If no revisions are specified,\n" +"this will simply deltify the HEAD revision.\n" +msgstr "" +"Aufruf: svnadmin deltify [-r VON[:BIS]] ARCHIV_PFAD\n" +"\n" +"Führt Vorgängerdeltifizierung auf den geänderten Pfaden innerhalb der\n" +"Revisionsspanne VON:BIS durch. Kurz gefasst komprimiert die Deltifizierung\n" +"das Projektarchiv, indem nur die Unterschiede oder Deltas zur vorigen\n" +"Revision gespeichert werden. Falls keine Revisionen angegeben wurden, wird\n" +"nur die HEAD-Revision deltifiziert.\n" -#: ../svn/util.c:90 -msgid " (the answer to life, the universe, and everything)" -msgstr " (die Antwort auf die Frage nach dem Leben, dem Universum und dem ganzen Rest)" +#: ../svnadmin/svnadmin.c:355 +msgid "" +"usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n" +"\n" +msgstr "" -#: ../svn/util.c:99 -#, c-format +#: ../svnadmin/svnadmin.c:357 +#, fuzzy msgid "" +"Dump the contents of filesystem to stdout in a 'dumpfile'\n" +"portable format, sending feedback to stderr. Dump revisions\n" +"LOWER rev through UPPER rev. If no revisions are given, dump all\n" +"revision trees. If only LOWER is given, dump that one revision tree.\n" +"If --incremental is passed, the first revision dumped will describe\n" +"only the paths changed in that revision; otherwise it will describe\n" +"every path present in the repository as of that revision. (In either\n" +"case, the second and subsequent revisions, if any, describe only paths\n" +"changed in those revisions.)\n" "\n" -"Warning: %s\n" msgstr "" +"Aufruf: svnadmin dump ARCHIV_PFAD [-r VON[:BIS] [--incremental]]\n" "\n" -"Warnung: %s\n" - -# FIXME: s/whitespace/whitespaceS/? -#: ../svn/util.c:140 -msgid "The SVN_MERGE environment variable is empty or consists solely of whitespace. Expected a shell command.\n" -msgstr "Die Umgebungsvariable SVN_MERGE ist leer oder besteht nur aus Leerzeichen. Erwartete ein Shell-Kommando.\n" - -#: ../svn/util.c:146 -msgid "The environment variable SVN_MERGE and the merge-tool-cmd run-time configuration option were not set.\n" -msgstr "Die Umgebungsvariable SVN_MERGE und die Laufzeitkonfigurationsoption merge-tool-cmd wurden nicht gesetzt.\n" - -#: ../svn/util.c:175 -#, c-format -msgid "The external merge tool '%s' exited with exit code %d." -msgstr "Das externe Werkzeug zum Zusammenführen »%s« wurde mit Fehlercode %d beendet." - -#: ../svn/util.c:218 -msgid "Log message contains a zero byte" -msgstr "Logmeldung enthält ein Null Byte" - -#: ../svn/util.c:278 -#, c-format -msgid " '%s'" -msgstr " »%s«" - -#: ../svn/util.c:282 -msgid "Your commit message was left in a temporary file:" -msgstr "Ihre Logmeldung wurde in einer Temporärdatei abgelegt:" +"Gibt einen Abzug des Projektarchivs in einem portablen »Dump«-Format auf die\n" +"Standardausgabe aus. Rückmeldungen gehen auf den Standardfehlerkanal.\n" +"Gibt die Revisionen VON:BIS aus. Ohne Angabe eines Bereichs werden alle\n" +"Revisionen ausgegeben. Falls nur VON angegeben wurde, wird nur diese\n" +"Revision ausgegeben. Bei Angabe von »--incremental«, wird die erste ausgegebene\n" +"Revision nur die in dieser Revision geänderten Pfade enthalten. Andernfalls\n" +"wird jeder Pfad im Projektarchiv dieser Revision ausgegeben. (In jedem Fall\n" +"werden für die zweite und folgende Revisionen, nur in diesen Revisionen\n" +"geänderte Pfade ausgegeben.)\n" -#: ../svn/util.c:334 -msgid "--This line, and those below, will be ignored--" -msgstr "-- Diese und die folgenden Zeilen werden ignoriert --" +#: ../svnadmin/svnadmin.c:367 +msgid "" +"Using --exclude or --include gives results equivalent to authz-based\n" +"path exclusions. In particular, when the source of a copy is\n" +"excluded, the copy is transformed into an add (unlike in 'svndumpfilter').\n" +msgstr "" -#: ../svn/util.c:360 ../svnmucc/svnmucc.c:423 -msgid "Error normalizing log message to internal format" -msgstr "Fehler beim Normalisieren der Logmeldung ins interne Format" +#: ../svnadmin/svnadmin.c:373 ../svnadmin/svnadmin.c:385 +msgid "write to file ARG instead of stdout" +msgstr "" -#: ../svn/util.c:449 ../svnmucc/svnmucc.c:433 -msgid "Cannot invoke editor to get log message when non-interactive" -msgstr "Kann den Editor für Logmeldungen nur im interaktiven Modus aufrufen" +#: ../svnadmin/svnadmin.c:376 +msgid "" +"usage: svnadmin dump-revprops REPOS_PATH [-r LOWER[:UPPER]]\n" +"\n" +msgstr "" -#: ../svn/util.c:462 -msgid "Could not use external editor to fetch log message; consider setting the $SVN_EDITOR environment variable or using the --message (-m) or --file (-F) options" -msgstr "Konnte keinen externen Editor zur Eingabe der Logmeldung bestimmen. Setzten Sie entweder die $SVN_EDITOR Umgebungsvariable oder verwenden Sie die --message (-m) oder --file (-F) Optionen" +#: ../svnadmin/svnadmin.c:378 +msgid "" +"Dump the revision properties of filesystem to stdout in a 'dumpfile'\n" +"portable format, sending feedback to stderr. Dump revisions\n" +"LOWER rev through UPPER rev. If no revisions are given, dump the\n" +"properties for all revisions. If only LOWER is given, dump the\n" +"properties for that one revision.\n" +msgstr "" -#: ../svn/util.c:498 +#: ../svnadmin/svnadmin.c:388 +#, fuzzy msgid "" +"usage: 1. svnadmin freeze REPOS_PATH PROGRAM [ARG...]\n" +" 2. svnadmin freeze -F FILE PROGRAM [ARG...]\n" "\n" -"Log message unchanged or not specified\n" -"(a)bort, (c)ontinue, (e)dit:\n" msgstr "" +"Aufruf: svnadmin freeze ARCHIV_PFAD PROGRAMM [PAR...]\n" "\n" -"Logmeldung unverändert oder nicht angegeben\n" -"(A)bbrechen, Weiterma(c)hen, (E)ditieren:\n" +"Führt PROGRAMM mit den Optionen PAR aus, während ARCHIV_PFAD mit einer Schreibsperre belegt wird.\n" -#: ../svn/util.c:551 -msgid "Use --force to override this restriction (local modifications may be lost)" -msgstr "Benutzen Sie »--force«, um diese Einschränkung aufzuheben (lokale Änderungen könnten verloren gehen)" - -# CHECKME! Here used beside "dir" and "file". -#: ../svn/util.c:740 ../svn/util.c:773 -msgid "none" -msgstr "nichts" - -#: ../svn/util.c:741 -msgid "file" -msgstr "Datei" +#: ../svnadmin/svnadmin.c:391 +msgid "" +"1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n" +" Allows safe use of third-party backup tools on a live repository.\n" +"\n" +msgstr "" -# dir is no English word! -#: ../svn/util.c:742 -msgid "dir" -msgstr "Verzeichnis" +#: ../svnadmin/svnadmin.c:394 +#, fuzzy +msgid "" +"2. Like 1 except all repositories listed in FILE are locked. The file\n" +" format is repository paths separated by newlines. Repositories are\n" +" locked in the same order as they are listed in the file.\n" +msgstr "" +"Aufruf: 1. svnadmin freeze ARCHIV_PFAD PROGRAMM [PAR...]\n" +" 2. svnadmin freeze -F DATEI PROGRAMM [PAR...]\n" +"\n" +"1. Führt PROGRAMM mit den Parametern PAR aus und hält solange eine\n" +" Schreibsperre auf das Projektarchiv ARCHIV_PFAD.\n" +"2. Ebenso, nur werden alle in DATEI aufgelisteten Projektarchive gesperrt.\n" +" Die Datei muss die Pfade zu den Projektarchiven durch Zeilenumbrüche\n" +" getrennt enthalten. Projektarchive werden in der Reihenfolge der Auflistung\n" +" gesperrt.\n" -#: ../svn/util.c:774 -msgid "update" -msgstr "Aktualisierung" +#: ../svnadmin/svnadmin.c:402 +msgid "" +"usage: svnadmin help [SUBCOMMAND...]\n" +"\n" +msgstr "" -#: ../svn/util.c:775 -msgid "switch" -msgstr "Umstellung" +#: ../svnadmin/svnadmin.c:404 ../svnfsfs/svnfsfs.c:119 +#: ../svnlook/svnlook.c:273 ../svnrdump/svnrdump.c:103 +#: ../svnsync/svnsync.c:172 +#, fuzzy +msgid "Describe the usage of this program or its subcommands.\n" +msgstr "" +"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n" +"Aufruf: help [UNTERBEFEHL...]\n" -#: ../svn/util.c:898 -msgid "(invalid date)" -msgstr "(ungültiges Datum)" +#: ../svnadmin/svnadmin.c:409 +#, fuzzy +msgid "" +"usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n" +"\n" +msgstr "" +"Aufruf: svnadmin hotcopy ARCHIV_PFAD ARCHIV_PFAD_NEU\n" +"\n" +"Erstellt eine Kopie des Projektarchivs im laufenden Betrieb.\n" -#: ../svn/util.c:1058 -#, c-format -msgid "svn: warning: '%s' is a binary mime-type but file '%s' looks like text; diff, merge, blame, and other operations will stop working on this file\n" -msgstr "svn: Warnung: »%s« ist ein binärer Mime-Typ, die Datei »%s« sieht aber wie Text aus; Operationen »diff« (Unterschiede anzeigen), »merge« (Unterschiede zusammenführen), »blame« (Annotieren) und andere Operationen werden auf dieser Datei nicht mehr funktionieren\n" +#: ../svnadmin/svnadmin.c:411 +#, fuzzy +msgid "" +"Make a hot copy of a repository.\n" +"If --incremental is passed, data which already exists at the destination\n" +"is not copied again. Incremental mode is implemented for FSFS repositories.\n" +msgstr "" +"Aufruf: svnadmin hotcopy ARCHIV_PFAD NEUER_ARCHIV_PFAD\n" +"\n" +"Erstellt eine Kopie eines Projektarchivs im laufenden Betrieb.\n" +"Wenn »--incremental« angegeben wird, werden im Ziel schon existierende Daten\n" +"nicht erneut kopiert. Die inkrementelle Kopie ist für FSFS-Projektarchive implementiert.\n" -#: ../svnadmin/svnadmin.c:236 ../svnfsfs/svnfsfs.c:141 -#: ../svnrdump/svnrdump.c:132 -msgid "specify revision number ARG (or X:Y range)" -msgstr "spezifizieren Sie PAR für Revisionsnummer (oder X:Y Bereich)" +#: ../svnadmin/svnadmin.c:418 +msgid "" +"usage: svnadmin info REPOS_PATH\n" +"\n" +msgstr "" -#: ../svnadmin/svnadmin.c:239 ../svnlook/svnlook.c:166 -msgid "specify transaction name ARG" -msgstr "Transaktionsname PAR angeben" +#: ../svnadmin/svnadmin.c:420 +#, fuzzy +msgid "Print information about the repository at REPOS_PATH.\n" +msgstr "" +"Aufruf: svnadmin info ARCHIV_PFAD\n" +"\n" +"Gibt Informationen über das Projektarchiv in ARCHIV_PFAD aus.\n" -#: ../svnadmin/svnadmin.c:242 -msgid "dump or hotcopy incrementally" -msgstr "Datenstrom inkrementell ausgeben oder im laufenden Betrieb inkrementell kopieren" +#: ../svnadmin/svnadmin.c:425 +#, fuzzy +msgid "" +"usage: svnadmin list-dblogs REPOS_PATH\n" +"\n" +msgstr "" +"Aufruf: svnadmin list-unused-dblogs ARCHIV_PFAD\n" +"\n" +"Listet ungenutzte Log-Dateien der Berkeley Datenbank auf.\n" +"\n" -#: ../svnadmin/svnadmin.c:245 -msgid "use deltas in dump output" -msgstr "Nutzt Deltas bei der Ausgabe" +#: ../svnadmin/svnadmin.c:427 +msgid "" +"List all Berkeley DB log files.\n" +"\n" +msgstr "" -#: ../svnadmin/svnadmin.c:248 -msgid "bypass the repository hook system" -msgstr "Umgeht das Aktionssystem des Projektarchivs" +#: ../svnadmin/svnadmin.c:429 +#, fuzzy +msgid "" +"WARNING: Modifying or deleting logfiles which are still in use\n" +"will cause your repository to be corrupted.\n" +msgstr "" +"Aufruf: svnadmin list-dblogs ARCHIV_PFAD\n" +"\n" +"Gibt alle Log-Dateien der Berkeley Datenbank aus.\n" +"\n" +"WARNUNG: Ändern oder Löschen von Log-Dateien, die noch\n" +"benutzt werden, wird ihr Projektarchiv beschädigen.\n" -#: ../svnadmin/svnadmin.c:251 -msgid "bypass property validation logic" -msgstr "Umgeht die Logik zur Überprüfung von Eigenschaften" +#: ../svnadmin/svnadmin.c:435 +#, fuzzy +msgid "" +"usage: svnadmin list-unused-dblogs REPOS_PATH\n" +"\n" +msgstr "" +"Aufruf: svnadmin list-unused-dblogs ARCHIV_PFAD\n" +"\n" +"Listet ungenutzte Log-Dateien der Berkeley Datenbank auf.\n" +"\n" -#: ../svnadmin/svnadmin.c:254 -msgid "ignore revision datestamps found in the stream" -msgstr "Ignoriert Datumsangaben der im Datenstrom gefundenen Revisionen" +#: ../svnadmin/svnadmin.c:437 +msgid "List unused Berkeley DB log files.\n" +msgstr "" -#: ../svnadmin/svnadmin.c:257 ../svnfsfs/svnfsfs.c:138 -msgid "no progress (only errors to stderr)" -msgstr "keine Fortschrittsanzeige (nur Fehler auf die Standardfehlerausgabe)" +#: ../svnadmin/svnadmin.c:442 +#, fuzzy +msgid "" +"usage: svnadmin load REPOS_PATH\n" +"\n" +msgstr "" +"Aufruf: svnlook author ARCHIV_PFAD\n" +"\n" +"Gibt den Autor aus.\n" -#: ../svnadmin/svnadmin.c:260 -msgid "ignore any repos UUID found in the stream" -msgstr "Ignoriert jede Projektarchiv-UUID, die im Datenstrom gefunden wird" +#: ../svnadmin/svnadmin.c:444 +#, fuzzy +msgid "" +"Read a 'dumpfile'-formatted stream from stdin, committing\n" +"new revisions into the repository's filesystem. If the repository\n" +"was previously empty, its UUID will, by default, be changed to the\n" +"one specified in the stream. Progress feedback is sent to stdout.\n" +"If --revision is specified, limit the loaded revisions to only those\n" +"in the dump stream whose revision numbers match the specified range.\n" +msgstr "" +"Aufruf: svnadmin load ARCHIV_PFAD\n" +"\n" +"Liest einen Datenstrom im »Dump«-Format von der Standardeingabe in das\n" +"Dateisystem des Projektarchivs ein. Falls das Projektarchiv vorher leer\n" +"war, wird seine UUID standardmäßig in diejenige geändert, die im Daten-\n" +"strom spezifiziert ist. Eine Fortschrittsanzeige wird an die Standard-\n" +"ausgabe gesendet.\n" +"Wenn »--revision« angegeben wird, begrenzt dies die aus der Datei geladenen\n" +"Revisionen auf diesen Bereich.\n" -#: ../svnadmin/svnadmin.c:263 -msgid "set repos UUID to that found in stream, if any" -msgstr "Setzt die UUID des Projektarchivs auf die im Datenstrom gefundene" +#: ../svnadmin/svnadmin.c:457 ../svnadmin/svnadmin.c:470 +msgid "read from file ARG instead of stdin" +msgstr "" -#: ../svnadmin/svnadmin.c:266 +#: ../svnadmin/svnadmin.c:460 msgid "" -"type of repository:\n" -" 'fsfs' (default), 'bdb' or 'fsx'\n" -" CAUTION: FSX is for EXPERIMENTAL use only!" +"usage: svnadmin load-revprops REPOS_PATH\n" +"\n" msgstr "" -"Typ des Projektarchivs:\n" -" 'fsfs' (Vorgabe), 'bdb' or 'fsx'\n" -" ACHTUNG: FSX ist als EXPERIMENTELL eingestuft!" - -#: ../svnadmin/svnadmin.c:271 -msgid "load at specified directory in repository" -msgstr "in das spezifizierte Verzeichnis im Projektarchiv laden" - -#: ../svnadmin/svnadmin.c:274 -msgid "disable fsync at transaction commit [Berkeley DB]" -msgstr "Deaktiviert »fsync« für jede Übertragungstransaktion [Berkeley DB]" - -#: ../svnadmin/svnadmin.c:277 -msgid "disable automatic log file removal [Berkeley DB]" -msgstr "Deaktiviert das automatische Entfernen von Log-Dateien [Berkeley DB]" -#: ../svnadmin/svnadmin.c:283 +#: ../svnadmin/svnadmin.c:462 +#, fuzzy msgid "" -"remove redundant Berkeley DB log files\n" -" from source repository [Berkeley DB]" +"Read a 'dumpfile'-formatted stream from stdin, setting the revision\n" +"properties in the repository's filesystem. Revisions not found in the\n" +"repository will cause an error. Progress feedback is sent to stdout.\n" +"If --revision is specified, limit the loaded revisions to only those\n" +"in the dump stream whose revision numbers match the specified range.\n" msgstr "" -"Entfernt redundante Berkeley-DB-Logdateien\n" -" aus dem Projektarchiv [Berkeley DB]" - -#: ../svnadmin/svnadmin.c:287 -msgid "call pre-commit hook before committing revisions" -msgstr "die Aktion »pre-commit« nach dem Übertragen von Revisionen aufrufen" - -#: ../svnadmin/svnadmin.c:290 -msgid "call post-commit hook after committing revisions" -msgstr "die Aktion »post-commit« nach dem Übertragen von Revisionen aufrufen" - -#: ../svnadmin/svnadmin.c:293 -msgid "call hook before changing revision property" -msgstr "Aktion vor der Änderung der Revisionseigenschaft aufrufen" - -#: ../svnadmin/svnadmin.c:296 -msgid "call hook after changing revision property" -msgstr "Aktion nach der Änderung der Revisionseigenschaft aufrufen" +"Aufruf: svnadmin load ARCHIV_PFAD\n" +"\n" +"Liest einen Datenstrom im »Dump«-Format von der Standardeingabe in das\n" +"Dateisystem des Projektarchivs ein. Falls das Projektarchiv vorher leer\n" +"war, wird seine UUID standardmäßig in diejenige geändert, die im Daten-\n" +"strom spezifiziert ist. Eine Fortschrittsanzeige wird an die Standard-\n" +"ausgabe gesendet.\n" +"Wenn »--revision« angegeben wird, begrenzt dies die aus der Datei geladenen\n" +"Revisionen auf diesen Bereich.\n" -#: ../svnadmin/svnadmin.c:299 +#: ../svnadmin/svnadmin.c:473 msgid "" -"wait instead of exit if the repository is in\n" -" use by another process" +"usage: svnadmin lock REPOS_PATH PATH USERNAME COMMENT-FILE [TOKEN]\n" +"\n" msgstr "" -"Wartet anstatt abzubrechen, wenn das Projektarchiv\n" -" durch einen anderen Prozess belegt ist" -#: ../svnadmin/svnadmin.c:303 ../svnadmin/svnadmin.c:306 -#: ../svnadmin/svnadmin.c:309 -msgid "deprecated; see --compatible-version" -msgstr "Veraltet; siehe »--compatible-version«" +#: ../svnadmin/svnadmin.c:475 +#, fuzzy +msgid "" +"Lock PATH by USERNAME setting comments from COMMENT-FILE.\n" +"If provided, use TOKEN as lock token. Use --bypass-hooks to avoid\n" +"triggering the pre-lock and post-lock hook scripts.\n" +msgstr "" +"Aufruf: svnadmin lock ARCHIV_PFAD PFAD BENUTZER KOMMENTAR-DATEI [MARKE]\n" +"\n" +"Sperrt PFAD als BENUTZER und setzt den Sperrkommentar aus KOMMENTAR-DATEI.\n" +"Falls angegeben, wird MARKE als Sperrmarke verwendet.\n" +"Verwenden Sie »--bypass-hooks« um die Auslösung der Aktionen\n" +"»pre-unlock« und »post-unlock« zu umgehen.\n" -#: ../svnadmin/svnadmin.c:312 -msgid "continue verification after detecting a corruption" -msgstr "Setzt die Verifikation nach einer entdeckten Beschädigung fort" +#: ../svnadmin/svnadmin.c:482 +msgid "" +"usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n" +"\n" +msgstr "" -#: ../svnadmin/svnadmin.c:315 +#: ../svnadmin/svnadmin.c:484 +#, fuzzy msgid "" -"size of the extra in-memory cache in MB used to\n" -" minimize redundant operations. Default: 16.\n" -" [used for FSFS repositories only]" +"Print descriptions of all locks on or under PATH-IN-REPOS (which,\n" +"if not provided, is the root of the repository).\n" msgstr "" -"Größe des extra Zwischenspeichers im RAM in MB zur\n" -" Minimierung redundanter Operationen. Vorgabe: 16.\n" -" [nur für FSFS-Projektarchive verwendet]" +"Aufruf: svnadmin lslocks ARCHIV_PFAD [PFAD-IN-ARCHIV]\n" +"\n" +"Gibt Beschreibungen aller Sperren auf oder unter PFAD-IN-ARCHIV aus (was,\n" +"falls nicht angegeben, die Wurzel des Projektarchivs ist).\n" -# TODO: combine with message above -#: ../svnadmin/svnadmin.c:320 +#: ../svnadmin/svnadmin.c:490 msgid "" -"use repository format compatible with Subversion\n" -" version ARG (\"1.5.5\", \"1.7\", etc.)" +"usage: svnadmin lstxns REPOS_PATH\n" +"\n" msgstr "" -"verwendet ein Format das mit der Subversion-Version PAR\n" -" kompatibel ist (\"1.5.5\", \"1.7\", usw.)" -#: ../svnadmin/svnadmin.c:323 -msgid "read repository paths from file ARG" -msgstr "Liest Pfade imP rojektarchive aus Datei PAR" +#: ../svnadmin/svnadmin.c:492 +msgid "" +"Print the names of uncommitted transactions. With -rN skip the output\n" +"of those that have a base revision more recent than rN. Transactions\n" +"with base revisions much older than HEAD are likely to have been\n" +"abandonded and are candidates to be removed.\n" +msgstr "" -#: ../svnadmin/svnadmin.c:326 +#: ../svnadmin/svnadmin.c:501 msgid "" -"report any names within the same directory or\n" -" svn:mergeinfo property value that differ only\n" -" in character representation, but are otherwise\n" -" identical" +"usage: svnadmin pack REPOS_PATH\n" +"\n" msgstr "" -"listet Namen auf, die im selben Verzeichnis oder\n" -" svn:mergeinfo-Eigenschaft sich nur in ihrer\n" -" Zeichendarstellung unterscheiden aber sonst\n" -" identisch sind" -#: ../svnadmin/svnadmin.c:332 +#: ../svnadmin/svnadmin.c:503 +#, fuzzy msgid "" -"verify metadata only (ignored for BDB),\n" -" checking against external corruption in\n" -" Subversion 1.9+ format repositories.\n" +"Possibly compact the repository into a more efficient storage model.\n" +"This may not apply to all repositories, in which case, exit.\n" msgstr "" -"verifiziert nur Metadaten (ignoriert für BDB),\n" -" überprüft auf externe Beschädigungen von\n" -" Projektarchiven im Format Subversion 1.9+\n" +"Aufruf: svnadmin pack ARCHIV_PFAD\n" +"\n" +"Versucht, das Projektarchiv in ein effizienteres Speichermodell zu\n" +"transformieren. Dies muss nicht bei allen Projektarchiven möglich sein und in problematischen Fällen wird nichts getan.\n" -#: ../svnadmin/svnadmin.c:346 +#: ../svnadmin/svnadmin.c:509 msgid "" -"usage: svnadmin crashtest REPOS_PATH\n" +"usage: svnadmin recover REPOS_PATH\n" "\n" -"Open the repository at REPOS_PATH, then abort, thus simulating\n" -"a process that crashes while holding an open repository handle.\n" msgstr "" -"Aufruf: svnadmin crashtest ARCHIV_PFAD\n" + +#: ../svnadmin/svnadmin.c:511 +#, fuzzy +msgid "" +"Run the recovery procedure on a repository. Do this if you've\n" +"been getting errors indicating that recovery ought to be run.\n" +"Berkeley DB recovery requires exclusive access and will\n" +"exit if the repository is in use by another process.\n" +msgstr "" +"Aufruf: svnadmin recover ARCHIV_PFAD\n" "\n" -"Öffnet das Projektarchiv in ARCHIV_PFAD und bricht ab. Simuliert\n" -"damit einen Prozess der bei geöffnetem Projektarchiv abstürzt.\n" +"Lässt die Berkeley-DB-Rettungsprozedur auf einem Projektarchiv laufen.\n" +"Veranlassen Sie dass, falls Sie Fehlermeldungen erhalten haben, die Sie\n" +"dazu auffordern. Die Berkeley-DB-Wiederherstellung erfordert exklusiven\n" +"Zugriff auf das Projektarchiv. Der Vorgang wird nicht gestartet, falls\n" +"das Projektarchiv von einem anderen Prozess benutzt wird.\n" -#: ../svnadmin/svnadmin.c:352 +#: ../svnadmin/svnadmin.c:519 +#, fuzzy msgid "" -"usage: svnadmin create REPOS_PATH\n" +"usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n" "\n" -"Create a new, empty repository at REPOS_PATH.\n" msgstr "" -"Aufruf: svnadmin create ARCHIV_PFAD\n" +"Aufruf: svnadmin rmlocks ARCHIV_PFAD SPERR_PFAD...\n" "\n" -"Erstellt ein neues, leeres Projektarchiv im ARCHIV_PFAD.\n" +"Entferne vorbehaltslos die Sperren von jedem SPERR_PFAD.\n" -#: ../svnadmin/svnadmin.c:361 -msgid "" -"usage: 1. svnadmin delrevprop REPOS_PATH -r REVISION NAME\n" -" 2. svnadmin delrevprop REPO_PATH -t TXN NAME\n" +#: ../svnadmin/svnadmin.c:521 +#, fuzzy +msgid "Unconditionally remove lock from each LOCKED_PATH.\n" +msgstr "" +"Aufruf: svnadmin rmlocks ARCHIV_PFAD SPERR_PFAD...\n" "\n" -"1. Delete the property NAME on revision REVISION.\n" +"Entferne vorbehaltslos die Sperren von jedem SPERR_PFAD.\n" + +#: ../svnadmin/svnadmin.c:526 +#, fuzzy +msgid "" +"usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n" "\n" -"Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n" -"trigger the revision property-related hooks (for example, if you want\n" -"an email notification sent from your post-revprop-change hook).\n" +msgstr "" +"Aufruf: svnadmin rmtxns ARCHIV_PFAD TXN_NAME...\n" "\n" -"NOTE: Revision properties are not versioned, so this command will\n" -"irreversibly destroy the previous value of the property.\n" +"Löscht die benannte(n) Transaktion(en).\n" + +#: ../svnadmin/svnadmin.c:528 +msgid "Delete the named transaction(s).\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:533 +msgid "" +"usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n" "\n" -"2. Delete the property NAME on transaction TXN.\n" msgstr "" -"Aufruf: 1. svnadmin delrevprop ARCHIV_PFAD -r REV NAME\n" + +#: ../svnadmin/svnadmin.c:535 +#, fuzzy +msgid "" +"Set the log-message on revision REVISION to the contents of FILE. Use\n" +"--bypass-hooks to avoid triggering the revision-property-related hooks\n" +"(for example, if you do not want an email notification sent\n" +"from your post-revprop-change hook, or because the modification of\n" +"revision properties has not been enabled in the pre-revprop-change\n" +"hook).\n" "\n" -"1. Löscht die Eigenschaft NAME der Revision REV.\n" +msgstr "" +"Aufruf: svnadmin setlog ARCHIV_PFAD -r REVISION DATEI\n" "\n" -"Mit »--use-pre-revprop-change-hook«/»--use-post-revprop-change-hook«\n" -"lösen Sie die mit den Revisionseigenschaften zusammenhängenden Aktionen aus\n" -"(z.B. falls Sie E-Mail-Benachrichtigungen durch Ihre »post-revprop-change«-\n" -"Aktion versenden wollen).\n" +"Setzt die Logmeldung der Revision REVISION auf den Inhalt der Datei DATEI.\n" +"Benutzen Sie »--bypass-hooks«, um die mit den Revisionseigenschaften zu-\n" +"sammenhängenden Aktionen nicht auszulösen (z.B. falls Sie keine E-Mail-\n" +"Benachrichtigung durch Ihre »post-revprop-change«-Aktion auslösen wollen\n" +"oder die Änderung von Revisionseigenschaften in der »pre-revprop-change«-\n" +"Aktion nicht gestattet wird).\n" "\n" "ACHTUNG: Revisionseigenschaften sind nicht versioniert. Dieser Befehl\n" -"entfernt also unwiederbringlich die vorherige Eigenschaft.\n" -"\n" -"2. Löscht die Eigenschaft NAME der Transaktion TXN.\n" +"überschreibt also die vorherige Logmeldung endgültig.\n" -#: ../svnadmin/svnadmin.c:374 +#: ../svnadmin/svnadmin.c:542 msgid "" -"usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n" -"\n" -"Run over the requested revision range, performing predecessor delti-\n" -"fication on the paths changed in those revisions. Deltification in\n" -"essence compresses the repository by only storing the differences or\n" -"delta from the preceding revision. If no revisions are specified,\n" -"this will simply deltify the HEAD revision.\n" +"NOTE: Revision properties are not versioned, so this command will\n" +"overwrite the previous log message.\n" msgstr "" -"Aufruf: svnadmin deltify [-r VON[:BIS]] ARCHIV_PFAD\n" -"\n" -"Führt Vorgängerdeltifizierung auf den geänderten Pfaden innerhalb der\n" -"Revisionsspanne VON:BIS durch. Kurz gefasst komprimiert die Deltifizierung\n" -"das Projektarchiv, indem nur die Unterschiede oder Deltas zur vorigen\n" -"Revision gespeichert werden. Falls keine Revisionen angegeben wurden, wird\n" -"nur die HEAD-Revision deltifiziert.\n" -#: ../svnadmin/svnadmin.c:383 +#: ../svnadmin/svnadmin.c:548 msgid "" -"usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n" +"usage: 1. svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n" +" 2. svnadmin setrevprop REPOS_PATH -t TXN NAME FILE\n" "\n" -"Dump the contents of filesystem to stdout in a 'dumpfile'\n" -"portable format, sending feedback to stderr. Dump revisions\n" -"LOWER rev through UPPER rev. If no revisions are given, dump all\n" -"revision trees. If only LOWER is given, dump that one revision tree.\n" -"If --incremental is passed, the first revision dumped will describe\n" -"only the paths changed in that revision; otherwise it will describe\n" -"every path present in the repository as of that revision. (In either\n" -"case, the second and subsequent revisions, if any, describe only paths\n" -"changed in those revisions.)\n" msgstr "" -"Aufruf: svnadmin dump ARCHIV_PFAD [-r VON[:BIS] [--incremental]]\n" -"\n" -"Gibt einen Abzug des Projektarchivs in einem portablen »Dump«-Format auf die\n" -"Standardausgabe aus. Rückmeldungen gehen auf den Standardfehlerkanal.\n" -"Gibt die Revisionen VON:BIS aus. Ohne Angabe eines Bereichs werden alle\n" -"Revisionen ausgegeben. Falls nur VON angegeben wurde, wird nur diese\n" -"Revision ausgegeben. Bei Angabe von »--incremental«, wird die erste ausgegebene\n" -"Revision nur die in dieser Revision geänderten Pfade enthalten. Andernfalls\n" -"wird jeder Pfad im Projektarchiv dieser Revision ausgegeben. (In jedem Fall\n" -"werden für die zweite und folgende Revisionen, nur in diesen Revisionen\n" -"geänderte Pfade ausgegeben.)\n" -#: ../svnadmin/svnadmin.c:396 +#: ../svnadmin/svnadmin.c:551 msgid "" -"usage: 1. svnadmin freeze REPOS_PATH PROGRAM [ARG...]\n" -" 2. svnadmin freeze -F FILE PROGRAM [ARG...]\n" -"\n" -"1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n" +"1. Set the property NAME on revision REVISION to the contents of FILE.\n" "\n" -"2. Like 1 except all repositories listed in FILE are locked. The file\n" -" format is repository paths separated by newlines. Repositories are\n" -" locked in the same order as they are listed in the file.\n" msgstr "" -"Aufruf: 1. svnadmin freeze ARCHIV_PFAD PROGRAMM [PAR...]\n" -" 2. svnadmin freeze -F DATEI PROGRAMM [PAR...]\n" + +#: ../svnadmin/svnadmin.c:557 +msgid "" +"NOTE: Revision properties are not versioned, so this command will\n" +"overwrite the previous value of the property.\n" "\n" -"1. Führt PROGRAMM mit den Parametern PAR aus und hält solange eine\n" -" Schreibsperre auf das Projektarchiv ARCHIV_PFAD.\n" -"2. Ebenso, nur werden alle in DATEI aufgelisteten Projektarchive gesperrt.\n" -" Die Datei muss die Pfade zu den Projektarchiven durch Zeilenumbrüche\n" -" getrennt enthalten. Projektarchive werden in der Reihenfolge der Auflistung\n" -" gesperrt.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:560 +msgid "2. Set the property NAME on transaction TXN to the contents of FILE.\n" +msgstr "" -#: ../svnadmin/svnadmin.c:406 +#: ../svnadmin/svnadmin.c:566 msgid "" -"usage: svnadmin help [SUBCOMMAND...]\n" +"usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n" "\n" -"Describe the usage of this program or its subcommands.\n" msgstr "" -"Aufruf: svnadmin help [UNTERBEFEHL...]\n" -"\n" -"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n" -#: ../svnadmin/svnadmin.c:411 +#: ../svnadmin/svnadmin.c:568 +#, fuzzy msgid "" -"usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n" -"\n" -"Make a hot copy of a repository.\n" -"If --incremental is passed, data which already exists at the destination\n" -"is not copied again. Incremental mode is implemented for FSFS repositories.\n" +"Reset the repository UUID for the repository located at REPOS_PATH. If\n" +"NEW_UUID is provided, use that as the new repository UUID; otherwise,\n" +"generate a brand new UUID for the repository.\n" msgstr "" -"Aufruf: svnadmin hotcopy ARCHIV_PFAD NEUER_ARCHIV_PFAD\n" +"Aufruf: svnadmin setuuid ARCHIV_PFAD [NEUE_UUID]\n" "\n" -"Erstellt eine Kopie eines Projektarchivs im laufenden Betrieb.\n" -"Wenn »--incremental« angegeben wird, werden im Ziel schon existierende Daten\n" -"nicht erneut kopiert. Die inkrementelle Kopie ist für FSFS-Projektarchive implementiert.\n" +"Setzt die Projektarchiv-UUID für das sich unter ARCHIV_PFAD befindliche\n" +"Projektarchiv neu. Falls NEUE_UUID angegeben ist, wird dies als neue\n" +"UUID des Projektarchivs verwendet, andernfalls wird eine brandneue UUID\n" +"für das Projektarchiv erzeugt.\n" -#: ../svnadmin/svnadmin.c:418 +#: ../svnadmin/svnadmin.c:575 msgid "" -"usage: svnadmin info REPOS_PATH\n" +"usage: svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME TOKEN\n" "\n" -"Print information about the repository at REPOS_PATH.\n" msgstr "" -"Aufruf: svnadmin info ARCHIV_PFAD\n" -"\n" -"Gibt Informationen über das Projektarchiv in ARCHIV_PFAD aus.\n" -#: ../svnadmin/svnadmin.c:423 +#: ../svnadmin/svnadmin.c:577 +#, fuzzy msgid "" -"usage: svnadmin list-dblogs REPOS_PATH\n" -"\n" -"List all Berkeley DB log files.\n" -"\n" -"WARNING: Modifying or deleting logfiles which are still in use\n" -"will cause your repository to be corrupted.\n" +"Unlock LOCKED_PATH (as USERNAME) after verifying that the token\n" +"associated with the lock matches TOKEN. Use --bypass-hooks to avoid\n" +"triggering the pre-unlock and post-unlock hook scripts.\n" msgstr "" -"Aufruf: svnadmin list-dblogs ARCHIV_PFAD\n" -"\n" -"Gibt alle Log-Dateien der Berkeley Datenbank aus.\n" +"Aufruf: svnadmin unlock ARCHIV_PFAD SPERR_PFAD BENUTZER MARKE\n" "\n" -"WARNUNG: Ändern oder Löschen von Log-Dateien, die noch\n" -"benutzt werden, wird ihr Projektarchiv beschädigen.\n" +"Entsperrt SPERR_PFAD (als BENUTZER) nach Überprüfung, ob die mit\n" +"der Sperre gesetzte Sperrmarke mit MARKE übereinstimmt. Verwenden\n" +"Sie »--bypass-hooks« um die Auslösung der Aktionen »pre-unlock« und\n" +"»post-unlock« zu umgehen.\n" -#: ../svnadmin/svnadmin.c:430 +#: ../svnadmin/svnadmin.c:584 msgid "" -"usage: svnadmin list-unused-dblogs REPOS_PATH\n" -"\n" -"List unused Berkeley DB log files.\n" +"usage: svnadmin upgrade REPOS_PATH\n" "\n" msgstr "" -"Aufruf: svnadmin list-unused-dblogs ARCHIV_PFAD\n" -"\n" -"Listet ungenutzte Log-Dateien der Berkeley Datenbank auf.\n" -"\n" -#: ../svnadmin/svnadmin.c:435 +#: ../svnadmin/svnadmin.c:586 msgid "" -"usage: svnadmin load REPOS_PATH\n" +"Upgrade the repository located at REPOS_PATH to the latest supported\n" +"schema version.\n" "\n" -"Read a 'dumpfile'-formatted stream from stdin, committing\n" -"new revisions into the repository's filesystem. If the repository\n" -"was previously empty, its UUID will, by default, be changed to the\n" -"one specified in the stream. Progress feedback is sent to stdout.\n" -"If --revision is specified, limit the loaded revisions to only those\n" -"in the dump stream whose revision numbers match the specified range.\n" msgstr "" -"Aufruf: svnadmin load ARCHIV_PFAD\n" -"\n" -"Liest einen Datenstrom im »Dump«-Format von der Standardeingabe in das\n" -"Dateisystem des Projektarchivs ein. Falls das Projektarchiv vorher leer\n" -"war, wird seine UUID standardmäßig in diejenige geändert, die im Daten-\n" -"strom spezifiziert ist. Eine Fortschrittsanzeige wird an die Standard-\n" -"ausgabe gesendet.\n" -"Wenn »--revision« angegeben wird, begrenzt dies die aus der Datei geladenen\n" -"Revisionen auf diesen Bereich.\n" -#: ../svnadmin/svnadmin.c:448 +#: ../svnadmin/svnadmin.c:589 +#, fuzzy msgid "" -"usage: svnadmin lock REPOS_PATH PATH USERNAME COMMENT-FILE [TOKEN]\n" -"\n" -"Lock PATH by USERNAME setting comments from COMMENT-FILE.\n" -"If provided, use TOKEN as lock token. Use --bypass-hooks to avoid\n" -"triggering the pre-lock and post-lock hook scripts.\n" +"This functionality is provided as a convenience for repository\n" +"administrators who wish to make use of new Subversion functionality\n" +"without having to undertake a potentially costly full repository dump\n" +"and load operation. As such, the upgrade performs only the minimum\n" +"amount of work needed to accomplish this while still maintaining the\n" +"integrity of the repository. It does not guarantee the most optimized\n" +"repository state as a dump and subsequent load would.\n" msgstr "" -"Aufruf: svnadmin lock ARCHIV_PFAD PFAD BENUTZER KOMMENTAR-DATEI [MARKE]\n" +"Aufruf: svnadmin upgrade ARCHIV_PFAD\n" "\n" -"Sperrt PFAD als BENUTZER und setzt den Sperrkommentar aus KOMMENTAR-DATEI.\n" -"Falls angegeben, wird MARKE als Sperrmarke verwendet.\n" -"Verwenden Sie »--bypass-hooks« um die Auslösung der Aktionen\n" -"»pre-unlock« und »post-unlock« zu umgehen.\n" +"Aktualisiert das unter ARCHIV_PFAD befindliche Projektarchiv auf die letzte\n" +"unterstützte Schema-Version.\n" +"\n" +"Diese Funktionalität wird als Hilfe für Projektarchiv-Administratoren\n" +"angeboten, die neue Subversion-Funktionalitäten verwenden möchten, ohne\n" +"ein möglicherweise aufwendiges »dump« mit anschließendem »load«\n" +"auszuführen. Die Aktualisierung führt deswegen nur die unbedingt\n" +"notwendigen Schritte aus, um dies zu erreichen, während die Integrität\n" +"des Projektarchivs erhalten bleibt. Es garantiert nicht den optimiertesten\n" +"Zustand des Projektarchivs wie ein »dump« mit anschließendem »load« dies\n" +"bewirken würde.\n" -#: ../svnadmin/svnadmin.c:455 +#: ../svnadmin/svnadmin.c:600 +#, fuzzy msgid "" -"usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n" +"usage: svnadmin verify REPOS_PATH\n" "\n" -"Print descriptions of all locks on or under PATH-IN-REPOS (which,\n" -"if not provided, is the root of the repository).\n" msgstr "" -"Aufruf: svnadmin lslocks ARCHIV_PFAD [PFAD-IN-ARCHIV]\n" +"Aufruf: svnadmin verify ARCHIV_PFAD\n" "\n" -"Gibt Beschreibungen aller Sperren auf oder unter PFAD-IN-ARCHIV aus (was,\n" -"falls nicht angegeben, die Wurzel des Projektarchivs ist).\n" +"Überprüft die im Projektarchiv gespeicherten Daten.\n" -#: ../svnadmin/svnadmin.c:461 -msgid "" -"usage: svnadmin lstxns REPOS_PATH\n" -"\n" -"Print the names of all uncommitted transactions.\n" +#: ../svnadmin/svnadmin.c:602 +#, fuzzy +msgid "Verify the data stored in the repository.\n" msgstr "" -"Aufruf: svnadmin lstxns ARCHIV_PFAD\n" +"Aufruf: svnadmin verify ARCHIV_PFAD\n" "\n" -"Gibt die Namen aller nicht übertragenen Transaktionen aus.\n" +"Überprüft die im Projektarchiv gespeicherten Daten.\n" + +#: ../svnadmin/svnadmin.c:703 +msgid "Invalid revision specifier" +msgstr "Ungültige Revision angegeben" + +#: ../svnadmin/svnadmin.c:707 +#, c-format +msgid "Revisions must not be greater than the youngest revision (%ld)" +msgstr "Revisionen dürfen nicht größer als die Endrevision (%ld) sein" + +#: ../svnadmin/svnadmin.c:734 +#, c-format +msgid "Path '%s' is not a local path" +msgstr "Pfad »%s« ist kein lokaler Pfad" + +#: ../svnadmin/svnadmin.c:763 +msgid "Not enough arguments" +msgstr "Nicht genügend Parameter" -#: ../svnadmin/svnadmin.c:466 +#: ../svnadmin/svnadmin.c:806 +#, c-format msgid "" -"usage: svnadmin pack REPOS_PATH\n" -"\n" -"Possibly compact the repository into a more efficient storage model.\n" -"This may not apply to all repositories, in which case, exit.\n" +"Successfully opened repository '%s'.\n" +"Will now crash to simulate a crashing server process.\n" msgstr "" -"Aufruf: svnadmin pack ARCHIV_PFAD\n" -"\n" -"Versucht, das Projektarchiv in ein effizienteres Speichermodell zu\n" -"transformieren. Dies muss nicht bei allen Projektarchiven möglich sein und in problematischen Fällen wird nichts getan.\n" +"Projektarchive »%s« erfolgreich geöffnet.\n" +"Es folgt ein Abbruch, um den Absturz eines Serverprozesses zu simulieren.\n" + +#: ../svnadmin/svnadmin.c:845 +#, c-format +msgid "%swarning: The \"%s\" repository back-end is deprecated, consider using \"%s\" instead.\n" +msgstr "%sWarnung: Das Dateisystemmodul für Projektarchive »%s« ist veraltet, verwenden Sie stattdessen »%s«.\n" + +#: ../svnadmin/svnadmin.c:886 +msgid "Repositories compatible with 1.0.x must use --fs-type=bdb" +msgstr "Projektarchive, die mit 1.0.x kompatibel sind, müssen --fs-type=bdb verwenden" + +#: ../svnadmin/svnadmin.c:894 +#, c-format +msgid "Repositories compatible with 1.8.x or earlier cannot use --fs-type=%s" +msgstr "Projektarchive, die mit 1.8.x oder älter kompatibel sind, können --fs-type=%s nicht verwenden" + +#: ../svnadmin/svnadmin.c:939 ../svnadmin/svnadmin.c:1339 +#: ../svnadmin/svnadmin.c:1669 +msgid "First revision cannot be higher than second" +msgstr "Die erste Revision darf kann nicht größer als zweite sein" + +#: ../svnadmin/svnadmin.c:948 +#, c-format +msgid "Deltifying revision %ld..." +msgstr "Bilde Deltas für Revision %ld ..." + +#: ../svnadmin/svnadmin.c:952 ../svnadmin/svnadmin.c:1083 +#: ../svnadmin/svnadmin.c:1098 +#, c-format +msgid "done.\n" +msgstr "erledigt.\n" + +#: ../svnadmin/svnadmin.c:1001 +#, fuzzy +msgid "* Error verifying repository metadata.\n" +msgstr "* Überprüfe Metadaten des Projektarchivs ...\n" + +#: ../svnadmin/svnadmin.c:1007 +#, c-format +msgid "* Error verifying revision %ld.\n" +msgstr "* Fehler bei der Verifikation der Revision %ld.\n" + +#: ../svnadmin/svnadmin.c:1064 +msgid "* Verifying repository metadata ...\n" +msgstr "* Überprüfe Metadaten des Projektarchivs ...\n" + +#: ../svnadmin/svnadmin.c:1067 +#, c-format +msgid "* Verifying metadata at revision %ld ...\n" +msgstr "* Überprüfe Metadaten der Revision %ld ...\n" + +#: ../svnadmin/svnadmin.c:1077 +#, c-format +msgid "Packing revisions in shard %s..." +msgstr "Packe Revisionen in Fragment %s ..." + +#: ../svnadmin/svnadmin.c:1092 +#, c-format +msgid "Packing revprops in shard %s..." +msgstr "Packe Revisionseigenschaften in Fragment %s ..." + +#: ../svnadmin/svnadmin.c:1167 +#, c-format +msgid "<<< Skipped original revision %ld\n" +msgstr "<<< Originalrevision %ld übersprungen\n" -#: ../svnadmin/svnadmin.c:472 +#: ../svnadmin/svnadmin.c:1183 msgid "" -"usage: svnadmin recover REPOS_PATH\n" -"\n" -"Run the recovery procedure on a repository. Do this if you've\n" -"been getting errors indicating that recovery ought to be run.\n" -"Berkeley DB recovery requires exclusive access and will\n" -"exit if the repository is in use by another process.\n" +"Repository lock acquired.\n" +"Please wait; recovering the repository may take some time...\n" msgstr "" -"Aufruf: svnadmin recover ARCHIV_PFAD\n" -"\n" -"Lässt die Berkeley-DB-Rettungsprozedur auf einem Projektarchiv laufen.\n" -"Veranlassen Sie dass, falls Sie Fehlermeldungen erhalten haben, die Sie\n" -"dazu auffordern. Die Berkeley-DB-Wiederherstellung erfordert exklusiven\n" -"Zugriff auf das Projektarchiv. Der Vorgang wird nicht gestartet, falls\n" -"das Projektarchiv von einem anderen Prozess benutzt wird.\n" +"Exklusiven Zugriff auf das Projektarchiv erlangt\n" +"Bitte warten, die Wiederherstellung des Projektarchivs kann einige Zeit dauern ...\n" -#: ../svnadmin/svnadmin.c:480 +#: ../svnadmin/svnadmin.c:1190 msgid "" -"usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n" -"\n" -"Unconditionally remove lock from each LOCKED_PATH.\n" +"Repository lock acquired.\n" +"Please wait; upgrading the repository may take some time...\n" msgstr "" -"Aufruf: svnadmin rmlocks ARCHIV_PFAD SPERR_PFAD...\n" -"\n" -"Entferne vorbehaltslos die Sperren von jedem SPERR_PFAD.\n" +"Exklusiven Zugriff auf das Projektarchiv erlangt\n" +"Bitte warten, die Aktualisierung des Projektarchivs kann einige Zeit dauern ...\n" -#: ../svnadmin/svnadmin.c:485 +#: ../svnadmin/svnadmin.c:1201 +#, fuzzy, c-format +msgid "Packed revision properties in shard %s\n" +msgstr "Packe Revisionseigenschaften in Fragment %s ..." + +#: ../svnadmin/svnadmin.c:1212 +#, fuzzy, c-format +msgid "Removed non-packed revision properties in shard %s\n" +msgstr "Entferne nicht gepackte Revisionseigenschaften in Fragment %s ..." + +#: ../svnadmin/svnadmin.c:1220 +#, c-format +msgid "Bumped repository format to %ld\n" +msgstr "Format des Projektarchivs erhöht auf: %ld\n" + +#: ../svnadmin/svnadmin.c:1228 +#, c-format +msgid "* Copied revision %ld.\n" +msgstr "* Revision %ld kopiert.\n" + +#: ../svnadmin/svnadmin.c:1234 +#, c-format +msgid "* Copied revisions from %ld to %ld.\n" +msgstr "* Revisionen von %ld bis %ld kopiert.\n" + +#: ../svnadmin/svnadmin.c:1245 +#, c-format +msgid "svnadmin: Warning - this repository is not sharded. Packing has no effect.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:1252 +#, fuzzy, c-format +msgid "Properties set on revision %ld.\n" +msgstr "Eigenschaften für Revision %ld kopiert.\n" + +#: ../svnadmin/svnadmin.c:1447 +#, c-format +msgid "'--exclude' and '--include' options cannot be used simultaneously" +msgstr "" + +#: ../svnadmin/svnadmin.c:1551 +msgid "No program provided" +msgstr "Kein Programm angegeben" + +#: ../svnadmin/svnadmin.c:1591 msgid "" -"usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n" +"general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" +"Subversion repository administration tool.\n" +"Type 'svnadmin help ' for help on a specific subcommand.\n" +"Type 'svnadmin --version' to see the program version and FS modules.\n" "\n" -"Delete the named transaction(s).\n" +"Available subcommands:\n" msgstr "" -"Aufruf: svnadmin rmtxns ARCHIV_PFAD TXN_NAME...\n" +"Aufruf: svnadmin UNTERBEFEHL ARCHIV_PFAD [Optionen & Parameter ...]\n" +"Werkzeug zum Verwalten von Projektarchiven.\n" +"Geben Sie »svnadmin help « ein, um Hilfe zu einem Unterbefehl\n" +" zu erhalten.\n" +"Geben Sie »svnadmin --version« ein, um die Programmversion und die Datei-\n" +" systemmodule zu sehen.\n" "\n" -"Löscht die benannte(n) Transaktion(en).\n" +"Verfügbare Unterbefehle:\n" -#: ../svnadmin/svnadmin.c:490 +#: ../svnadmin/svnadmin.c:1599 ../svnlook/svnlook.c:2252 +#: ../svnserve/svnserve.c:470 msgid "" -"usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n" -"\n" -"Set the log-message on revision REVISION to the contents of FILE. Use\n" -"--bypass-hooks to avoid triggering the revision-property-related hooks\n" -"(for example, if you do not want an email notification sent\n" -"from your post-revprop-change hook, or because the modification of\n" -"revision properties has not been enabled in the pre-revprop-change\n" -"hook).\n" +"The following repository back-end (FS) modules are available:\n" "\n" -"NOTE: Revision properties are not versioned, so this command will\n" -"overwrite the previous log message.\n" msgstr "" -"Aufruf: svnadmin setlog ARCHIV_PFAD -r REVISION DATEI\n" -"\n" -"Setzt die Logmeldung der Revision REVISION auf den Inhalt der Datei DATEI.\n" -"Benutzen Sie »--bypass-hooks«, um die mit den Revisionseigenschaften zu-\n" -"sammenhängenden Aktionen nicht auszulösen (z.B. falls Sie keine E-Mail-\n" -"Benachrichtigung durch Ihre »post-revprop-change«-Aktion auslösen wollen\n" -"oder die Änderung von Revisionseigenschaften in der »pre-revprop-change«-\n" -"Aktion nicht gestattet wird).\n" +"Die folgenden Dateisystemmodule für Projektarchive stehen zur Verfügung:\n" "\n" -"ACHTUNG: Revisionseigenschaften sind nicht versioniert. Dieser Befehl\n" -"überschreibt also die vorherige Logmeldung endgültig.\n" -#: ../svnadmin/svnadmin.c:502 +#: ../svnadmin/svnadmin.c:1628 +#, c-format +msgid "Invalid revision number (%ld) specified" +msgstr "Ungültige Revisionsnummer (%ld) angegeben" + +#: ../svnadmin/svnadmin.c:1638 +msgid "Non-numeric revision specified" +msgstr "Nicht-numerische Revisionsnummer angegeben" + +#: ../svnadmin/svnadmin.c:1720 ../svnadmin/svnadmin.c:1778 +#, fuzzy +msgid "A property with invalid line ending found in dumpstream; consider using --normalize-props while loading." +msgstr "Ungültiger Eigenschaftswert in Datenstrom gefunden; Versuchen Sie die Quelle zu reparieren oder geben Sie »--bypass-prop-validation« beim Laden an." + +#: ../svnadmin/svnadmin.c:1727 ../svnadmin/svnadmin.c:1785 +msgid "Invalid property value found in dumpstream; consider repairing the source or using --bypass-prop-validation while loading." +msgstr "Ungültiger Eigenschaftswert in Datenstrom gefunden; Versuchen Sie die Quelle zu reparieren oder geben Sie »--bypass-prop-validation« beim Laden an." + +#: ../svnadmin/svnadmin.c:1877 ../svnadmin/svnadmin.c:2776 msgid "" -"usage: 1. svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n" -" 2. svnadmin setrevprop REPOS_PATH -t TXN NAME FILE\n" -"\n" -"1. Set the property NAME on revision REVISION to the contents of FILE.\n" -"\n" -"Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n" -"trigger the revision property-related hooks (for example, if you want\n" -"an email notification sent from your post-revprop-change hook).\n" -"\n" -"NOTE: Revision properties are not versioned, so this command will\n" -"overwrite the previous value of the property.\n" -"\n" -"2. Set the property NAME on transaction TXN to the contents of FILE.\n" +"Failed to get exclusive repository access; perhaps another process\n" +"such as httpd, svnserve or svn has it open?" msgstr "" -"Aufruf: 1. svnadmin setrevprop ARCHIV_PFAD -r REV NAME DATEI\n" -"\n" -"1. Setzt Eigenschaft NAME der Revision REV auf den Inhalt der Datei DATEI.\n" -"\n" -"Mit »--use-pre-revprop-change-hook«/»--use-post-revprop-change-hook«\n" -"lösen Sie die mit den Revisionseigenschaften zusammenhängenden Aktionen aus\n" -"(z.B. falls Sie E-Mail-Benachrichtigungen durch Ihre »post-revprop-change«-\n" -"Aktion versenden wollen).\n" -"\n" -"ACHTUNG: Revisionseigenschaften sind nicht versioniert. Dieser Befehl\n" -"überschreibt also den vorherigen Wert der Eigenschaft.\n" -"\n" -"2. Setzt Eigenschaft NAME der Transaktion TXN auf den Inhalt der Datei DATEI.\n" +"Konnte keinen exklusiven Zugriff auf das Projektarchiv erlangen\n" +"Vielleicht hat noch ein anderer Prozess (httpd, svnserve, svn)\n" +"das Projektarchiv geöffnet?" + +#: ../svnadmin/svnadmin.c:1882 ../svnadmin/svnadmin.c:2781 +#, c-format +msgid "Waiting on repository lock; perhaps another process has it open?\n" +msgstr "Warte auf Freigabe des Projektarchivs; Vielleicht ist es durch einen anderen Prozess geöffnet?\n" -#: ../svnadmin/svnadmin.c:515 +#: ../svnadmin/svnadmin.c:1890 +#, c-format msgid "" -"usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n" "\n" -"Reset the repository UUID for the repository located at REPOS_PATH. If\n" -"NEW_UUID is provided, use that as the new repository UUID; otherwise,\n" -"generate a brand new UUID for the repository.\n" +"Recovery completed.\n" msgstr "" -"Aufruf: svnadmin setuuid ARCHIV_PFAD [NEUE_UUID]\n" "\n" -"Setzt die Projektarchiv-UUID für das sich unter ARCHIV_PFAD befindliche\n" -"Projektarchiv neu. Falls NEUE_UUID angegeben ist, wird dies als neue\n" -"UUID des Projektarchivs verwendet, andernfalls wird eine brandneue UUID\n" -"für das Projektarchiv erzeugt.\n" +"Wiederherstellung vollständig abgeschlossen.\n" + +#: ../svnadmin/svnadmin.c:1897 +#, c-format +msgid "The latest repos revision is %ld.\n" +msgstr "Die neueste Revision des Projektarchivs ist %ld.\n" + +#: ../svnadmin/svnadmin.c:2009 +#, c-format +msgid "Transaction '%s' removed.\n" +msgstr "Transaktion »%s« entfernt.\n" + +#: ../svnadmin/svnadmin.c:2091 ../svnadmin/svnadmin.c:2205 +#: ../svnadmin/svnadmin.c:2826 +#, c-format +msgid "--revision (-r) and --transaction (-t) are mutually exclusive" +msgstr "--revision (-r) und --transaction (-t) schließen sich gegenseitig aus" -#: ../svnadmin/svnadmin.c:522 +#: ../svnadmin/svnadmin.c:2097 ../svnadmin/svnadmin.c:2832 +#, c-format +msgid "Calling hooks is incompatible with --transaction (-t)" +msgstr "Ausführung von Aktionen ist unverträglich mit --transaction (-t)" + +#: ../svnadmin/svnadmin.c:2102 ../svnadmin/svnadmin.c:2147 +#: ../svnadmin/svnadmin.c:2837 +#, c-format +msgid "Missing revision" +msgstr "Fehlende Revision" + +#: ../svnadmin/svnadmin.c:2105 ../svnadmin/svnadmin.c:2150 +#: ../svnadmin/svnadmin.c:2840 +#, c-format +msgid "Only one revision allowed" +msgstr "Nur eine Revision zulässig" + +#: ../svnadmin/svnadmin.c:2268 msgid "" -"usage: svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME TOKEN\n" "\n" -"Unlock LOCKED_PATH (as USERNAME) after verifying that the token\n" -"associated with the lock matches TOKEN. Use --bypass-hooks to avoid\n" -"triggering the pre-unlock and post-unlock hook scripts.\n" +"-----Summary of corrupt revisions-----\n" msgstr "" -"Aufruf: svnadmin unlock ARCHIV_PFAD SPERR_PFAD BENUTZER MARKE\n" "\n" -"Entsperrt SPERR_PFAD (als BENUTZER) nach Überprüfung, ob die mit\n" -"der Sperre gesetzte Sperrmarke mit MARKE übereinstimmt. Verwenden\n" -"Sie »--bypass-hooks« um die Auslösung der Aktionen »pre-unlock« und\n" -"»post-unlock« zu umgehen.\n" +"-----Zusammenfassung beschädigter Revisionen-----\n" + +#: ../svnadmin/svnadmin.c:2320 +#, fuzzy, c-format +msgid "Failed to verify repository '%s'" +msgstr "Projektarchiv »%s« kann nicht geöffnet werden" + +#: ../svnadmin/svnadmin.c:2372 +#, c-format +msgid "UUID: %s\n" +msgstr "UUID: %s\n" + +#: ../svnadmin/svnadmin.c:2375 +#, fuzzy, c-format +msgid "Revisions: %ld\n" +msgstr "Revision: %ld\n" + +#: ../svnadmin/svnadmin.c:2381 +#, c-format +msgid "Repository Format: %d\n" +msgstr "Format des Projektarchivs: %d\n" + +#: ../svnadmin/svnadmin.c:2395 +#, c-format +msgid "Compatible With Version: %d.%d.0\n" +msgstr "Kompatibel mit Version: %d.%d.0\n" + +#: ../svnadmin/svnadmin.c:2414 +#, c-format +msgid "Repository Capability: %s\n" +msgstr "Funktion des Projektarchivs: %s\n" + +#: ../svnadmin/svnadmin.c:2423 +#, c-format +msgid "Filesystem Type: %s\n" +msgstr "Typ des Dateisystems: %s\n" + +#: ../svnadmin/svnadmin.c:2425 +#, c-format +msgid "Filesystem Format: %d\n" +msgstr "Format des Dateisystems: %d\n" + +#: ../svnadmin/svnadmin.c:2432 +#, c-format +msgid "FSFS Sharded: yes\n" +msgstr "FSFS Fragmentiert: ja\n" + +#: ../svnadmin/svnadmin.c:2434 +#, c-format +msgid "FSFS Sharded: no\n" +msgstr "FSFS Fragmentiert: nein\n" + +#: ../svnadmin/svnadmin.c:2437 +#, c-format +msgid "FSFS Shard Size: %d\n" +msgstr "FSFS Fragmentgröße: %d\n" + +#: ../svnadmin/svnadmin.c:2446 +#, c-format +msgid "FSFS Shards Packed: %ld/%ld\n" +msgstr "FSFS Fragmente gepackt: %ld/%ld\n" + +#: ../svnadmin/svnadmin.c:2451 +#, c-format +msgid "FSFS Logical Addressing: yes\n" +msgstr "FSFS Logische Adressierung: ja\n" + +#: ../svnadmin/svnadmin.c:2453 +#, c-format +msgid "FSFS Logical Addressing: no\n" +msgstr "FSFS Logische Adressierung: nein\n" + +#: ../svnadmin/svnadmin.c:2463 +#, fuzzy, c-format +msgid "FSX Shard Size: %d\n" +msgstr "FSFS Fragmentgröße: %d\n" + +#: ../svnadmin/svnadmin.c:2465 +#, fuzzy, c-format +msgid "FSX Shards Packed: %ld/%ld\n" +msgstr "FSFS Fragmente gepackt: %ld/%ld\n" + +# TODO: leicht inkonsistent zu obigen Strings (tritt in svn info-Ausgabe auf) +#: ../svnadmin/svnadmin.c:2476 +#, c-format +msgid "Configuration File: %s\n" +msgstr "Konfigurationsdatei: %s\n" + +#: ../svnadmin/svnadmin.c:2604 ../svnlook/svnlook.c:2315 +#, c-format +msgid "UUID Token: %s\n" +msgstr "UUID-Marke: %s\n" + +#: ../svnadmin/svnadmin.c:2605 ../svnlook/svnlook.c:2316 +#, c-format +msgid "Owner: %s\n" +msgstr "Eigentümer: %s\n" + +#: ../svnadmin/svnadmin.c:2606 ../svnlook/svnlook.c:2317 +#, c-format +msgid "Created: %s\n" +msgstr "Erstellt: %s\n" -#: ../svnadmin/svnadmin.c:529 +#: ../svnadmin/svnadmin.c:2607 ../svnlook/svnlook.c:2318 +#, c-format +msgid "Expires: %s\n" +msgstr "Läuft ab: %s\n" + +#: ../svnadmin/svnadmin.c:2609 +#, c-format msgid "" -"usage: svnadmin upgrade REPOS_PATH\n" -"\n" -"Upgrade the repository located at REPOS_PATH to the latest supported\n" -"schema version.\n" -"\n" -"This functionality is provided as a convenience for repository\n" -"administrators who wish to make use of new Subversion functionality\n" -"without having to undertake a potentially costly full repository dump\n" -"and load operation. As such, the upgrade performs only the minimum\n" -"amount of work needed to accomplish this while still maintaining the\n" -"integrity of the repository. It does not guarantee the most optimized\n" -"repository state as a dump and subsequent load would.\n" -msgstr "" -"Aufruf: svnadmin upgrade ARCHIV_PFAD\n" +"Comment (%i line):\n" +"%s\n" "\n" -"Aktualisiert das unter ARCHIV_PFAD befindliche Projektarchiv auf die letzte\n" -"unterstützte Schema-Version.\n" +msgid_plural "" +"Comment (%i lines):\n" +"%s\n" "\n" -"Diese Funktionalität wird als Hilfe für Projektarchiv-Administratoren\n" -"angeboten, die neue Subversion-Funktionalitäten verwenden möchten, ohne\n" -"ein möglicherweise aufwendiges »dump« mit anschließendem »load«\n" -"auszuführen. Die Aktualisierung führt deswegen nur die unbedingt\n" -"notwendigen Schritte aus, um dies zu erreichen, während die Integrität\n" -"des Projektarchivs erhalten bleibt. Es garantiert nicht den optimiertesten\n" -"Zustand des Projektarchivs wie ein »dump« mit anschließendem »load« dies\n" -"bewirken würde.\n" - -#: ../svnadmin/svnadmin.c:542 -msgid "" -"usage: svnadmin verify REPOS_PATH\n" +msgstr[0] "" +"Kommentar (%i Zeile):\n" +"%s\n" "\n" -"Verify the data stored in the repository.\n" -msgstr "" -"Aufruf: svnadmin verify ARCHIV_PFAD\n" +msgstr[1] "" +"Kommentar (%i Zeilen):\n" +"%s\n" "\n" -"Überprüft die im Projektarchiv gespeicherten Daten.\n" -#: ../svnadmin/svnadmin.c:606 -msgid "Invalid revision specifier" -msgstr "Ungültige Revision angegeben" +#: ../svnadmin/svnadmin.c:2657 +msgid "No paths to unlock provided" +msgstr "Keine Pfade zum Entsperren angegeben" -#: ../svnadmin/svnadmin.c:610 +#: ../svnadmin/svnadmin.c:2675 #, c-format -msgid "Revisions must not be greater than the youngest revision (%ld)" -msgstr "Revisionen dürfen nicht größer als die Endrevision (%ld) sein" +msgid "Path '%s' isn't locked.\n" +msgstr "Pfad »%s« ist nicht gesperrt.\n" -#: ../svnadmin/svnadmin.c:628 +#: ../svnadmin/svnadmin.c:2689 #, c-format -msgid "Path '%s' is not a local path" -msgstr "Pfad »%s« ist kein lokaler Pfad" +msgid "Removed lock on '%s'.\n" +msgstr "Sperre für »%s« entfernt.\n" -#: ../svnadmin/svnadmin.c:657 -msgid "Not enough arguments" -msgstr "Nicht genügend Parameter" +#: ../svnadmin/svnadmin.c:2743 +#, c-format +msgid "'%s' unlocked by user '%s'.\n" +msgstr "»%s« entsperrt durch Benutzer »%s«.\n" -#: ../svnadmin/svnadmin.c:660 -msgid "Too many arguments" -msgstr "Zu viele Parameter" +#: ../svnadmin/svnadmin.c:2791 +msgid "Upgrade of this repository's underlying versioned filesystem is not supported; consider dumping and loading the data elsewhere" +msgstr "Eine Aktualisierung des diesem Projektarchiv zugrundeliegenden versionierten Dateisystems wird nicht unterstützt; versuchen Sie stattdessen »dump« und laden Sie die Daten mit »load« anderswo" + +#: ../svnadmin/svnadmin.c:2798 +msgid "Upgrade of this repository is not supported; consider dumping and loading the data elsewhere" +msgstr "Eine Aktualisierung dieses Projektarchivs wird nicht unterstützt; versuchen Sie stattdessen »dump« und laden Sie die Daten mit »load« anderswo" -#: ../svnadmin/svnadmin.c:696 +#: ../svnadmin/svnadmin.c:2804 #, c-format msgid "" -"Successfully opened repository '%s'.\n" -"Will now crash to simulate a crashing server process.\n" +"\n" +"Upgrade completed.\n" msgstr "" -"Projektarchive »%s« erfolgreich geöffnet.\n" -"Es folgt ein Abbruch, um den Absturz eines Serverprozesses zu simulieren.\n" +"\n" +"Aktualisierung abgeschlossen.\n" -#: ../svnadmin/svnadmin.c:735 +#: ../svnadmin/svnadmin.c:2918 ../svnfsfs/svnfsfs.c:293 +#: ../svnrdump/svnrdump.c:849 +msgid "Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'" +msgstr "Mehrere Revisionsparameter gefunden; Bitte »-r N:M« anstelle »-r N -r M« verwenden" + +#: ../svnadmin/svnadmin.c:3001 #, c-format -msgid "%swarning: The \"%s\" repository back-end is deprecated, consider using \"%s\" instead.\n" -msgstr "%sWarnung: Das Dateisystemmodul für Projektarchive »%s« ist veraltet, verwenden Sie stattdessen »%s«.\n" +msgid "Cannot create pre-1.0-compatible repositories" +msgstr "Kann keine Projektarchive erstellen, die mit Versionen älter als 1.0 kompatibel sind" -#: ../svnadmin/svnadmin.c:776 -msgid "Repositories compatible with 1.0.x must use --fs-type=bdb" -msgstr "Projektarchive, die mit 1.0.x kompatibel sind, müssen --fs-type=bdb verwenden" +#: ../svnadmin/svnadmin.c:3013 +#, c-format +msgid "Cannot guarantee compatibility beyond the current running version (%s)" +msgstr "Kann Kompatibilität für höhere Versionen als die momentan laufende nicht garantieren (%s)" -#: ../svnadmin/svnadmin.c:784 +#: ../svnadmin/svnadmin.c:3137 ../svnfsfs/svnfsfs.c:362 #, c-format -msgid "Repositories compatible with 1.8.x or earlier cannot use --fs-type=%s" -msgstr "Projektarchive, die mit 1.8.x oder älter kompatibel sind, können --fs-type=%s nicht verwenden" +msgid "subcommand argument required\n" +msgstr "Unterbefehl benötigt einen Parameter\n" -#: ../svnadmin/svnadmin.c:829 ../svnadmin/svnadmin.c:1196 -#: ../svnadmin/svnadmin.c:1381 -msgid "First revision cannot be higher than second" -msgstr "Die erste Revision darf kann nicht größer als zweite sein" +#: ../svnadmin/svnadmin.c:3174 ../svnfsfs/svnfsfs.c:397 +msgid "Repository argument required" +msgstr "Projektarchiv Parameter erforderlich" -#: ../svnadmin/svnadmin.c:838 +#: ../svnadmin/svnadmin.c:3182 ../svnfsfs/svnfsfs.c:405 #, c-format -msgid "Deltifying revision %ld..." -msgstr "Bilde Deltas für Revision %ld ..." +msgid "'%s' is a URL when it should be a local path" +msgstr "»%s« ist eine URL obwohl es ein Pfad sein sollte" -#: ../svnadmin/svnadmin.c:842 ../svnadmin/svnadmin.c:955 -#: ../svnadmin/svnadmin.c:970 +#: ../svnadmin/svnadmin.c:3212 #, c-format -msgid "done.\n" -msgstr "erledigt.\n" +msgid "" +"Subcommand '%s' doesn't accept option '%s'\n" +"Type 'svnadmin help %s' for usage.\n" +msgstr "" +"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n" +"Geben Sie »svnadmin help %s« ein, um Hilfe zu erhalten.\n" -#: ../svnadmin/svnadmin.c:900 -#, c-format -msgid "* Error verifying revision %ld.\n" -msgstr "* Fehler bei der Verifikation der Revision %ld.\n" +#: ../svnadmin/svnadmin.c:3243 +msgid "Try 'svnadmin help' for more info" +msgstr "Geben Sie »svnadmin help« für weitere Hilfe ein" -#: ../svnadmin/svnadmin.c:936 -msgid "* Verifying repository metadata ...\n" -msgstr "* Überprüfe Metadaten des Projektarchivs ...\n" +#: ../svnbench/help-cmd.c:49 +msgid "" +"usage: svnbench [options] [args]\n" +"Subversion benchmarking tool.\n" +"Type 'svnbench help ' for help on a specific subcommand.\n" +"Type 'svnbench --version' to see the program version and RA modules\n" +" or 'svnbench --version --quiet' to see just the version number.\n" +"\n" +"Most subcommands take file and/or directory arguments, recursing\n" +"on the directories. If no arguments are supplied to such a\n" +"command, it recurses on the current directory (inclusive) by default.\n" +"\n" +"Available subcommands:\n" +msgstr "" +"Aufruf: svnbench [Optionen] [Parameter]\n" +"Subversion-Werkzeug für Geschwindigkeitsmessung und -analyse.\n" +"Geben Sie »svnbench help « ein, um Hilfe zu einem Unterbefehl\n" +" zu erhalten.\n" +"Geben Sie »svnbench --version« ein, um die Programmversion und die Zugriffsmodule\n" +" oder »svnbench --version --quiet«, um nur die Versionsnummer zu sehen.\n" +"\n" +"Die meisten Unterbefehle akzeptieren Datei- und/oder Verzeichnisparameter,\n" +"wobei die Verzeichnisse rekursiv durchlaufen werden. Wenn keine Parameter\n" +"angegeben werden, durchläuft der Befehl das aktuelle Verzeichnis rekursiv.\n" +"\n" +"Verfügbare Unterbefehle:\n" + +#: ../svnbench/null-blame-cmd.c:156 +#, fuzzy, c-format +msgid "" +"%15s revisions\n" +"%15s deltas\n" +"%15s bytes in deltas\n" +msgstr "" +"%15s Revisionen\n" +"%15s Log-Zeilen\n" +"%15s Änderungen\n" -#: ../svnadmin/svnadmin.c:939 +#: ../svnbench/null-export-cmd.c:352 #, c-format -msgid "* Verifying metadata at revision %ld ...\n" -msgstr "* Überprüfe Metadaten der Revision %ld ...\n" +msgid "" +"%15s directories\n" +"%15s files\n" +"%15s bytes in files\n" +"%15s properties\n" +"%15s bytes in properties\n" +msgstr "" +"%15s Verzeichnisse\n" +"%15s Dateien\n" +"%15s Byte in Dateien\n" +"%15s Eigenschaften\n" +"%15s Byte in Eigenschaften\n" -#: ../svnadmin/svnadmin.c:949 +#: ../svnbench/null-info-cmd.c:273 #, c-format -msgid "Packing revisions in shard %s..." -msgstr "Packe Revisionen in Fragment %s ..." +msgid "Number of status notifications received: %d\n" +msgstr "Zahl der empfangenen Statusmitteilungen: %d\n" -#: ../svnadmin/svnadmin.c:964 +#: ../svnbench/null-list-cmd.c:180 #, c-format -msgid "Packing revprops in shard %s..." -msgstr "Packe Revisionseigenschaften in Fragment %s ..." +msgid "" +"%15s directories\n" +"%15s files\n" +"%15s locks\n" +msgstr "" +"%15s Verzeichnisse\n" +"%15s Dateien\n" +"%15s Sperren\n" -#: ../svnadmin/svnadmin.c:1039 +#: ../svnbench/null-log-cmd.c:190 #, c-format -msgid "<<< Skipped original revision %ld\n" -msgstr "<<< Originalrevision %ld übersprungen\n" +msgid "Only relative paths can be specified after a URL for 'svnbench log', but '%s' is not a relative path" +msgstr "Mit »svnbench log« können nach einer URL nur relative Pfade angegeben werden, »%s« ist aber kein relativer Pfad" -#: ../svnadmin/svnadmin.c:1056 +#: ../svnbench/null-log-cmd.c:226 +#, c-format msgid "" -"Repository lock acquired.\n" -"Please wait; recovering the repository may take some time...\n" +"%15s revisions, %15s merged in %s merges\n" +"%15s msg lines, %15s in merged revisions\n" +"%15s changes, %15s in merged revisions\n" msgstr "" -"Exklusiven Zugriff auf das Projektarchiv erlangt\n" -"Bitte warten, die Wiederherstellung des Projektarchivs kann einige Zeit dauern ...\n" +"%15s Revisionen, %15s zusammengeführt in %s Zusammenführungen\n" +"%15s Log-Zeilen, %15s in zusammengeführten Revisionen\n" +"%15s Änderungen, %15s in zusammengeführten Revisionen\n" -#: ../svnadmin/svnadmin.c:1063 +#: ../svnbench/null-log-cmd.c:238 +#, c-format msgid "" -"Repository lock acquired.\n" -"Please wait; upgrading the repository may take some time...\n" +"%15s revisions\n" +"%15s msg lines\n" +"%15s changes\n" msgstr "" -"Exklusiven Zugriff auf das Projektarchiv erlangt\n" -"Bitte warten, die Aktualisierung des Projektarchivs kann einige Zeit dauern ...\n" +"%15s Revisionen\n" +"%15s Log-Zeilen\n" +"%15s Änderungen\n" -#: ../svnadmin/svnadmin.c:1074 -#, c-format -msgid "Packing revision properties in shard %s..." -msgstr "Packe Revisionseigenschaften in Fragment %s ..." +#: ../svnbench/svnbench.c:115 ../svnrdump/svnrdump.c:124 +msgid "specify a password ARG" +msgstr "Passwort PAR angeben" -#: ../svnadmin/svnadmin.c:1086 -#, c-format -msgid "Removing non-packed revision properties in shard %s..." -msgstr "Entferne nicht gepackte Revisionseigenschaften in Fragment %s ..." +#: ../svnbench/svnbench.c:124 +msgid "use strict semantics" +msgstr "wendet strikte Semantik an" -#: ../svnadmin/svnadmin.c:1094 -#, c-format -msgid "Bumped repository format to %ld\n" -msgstr "Format des Projektarchivs erhöht auf: %ld\n" +#: ../svnbench/svnbench.c:148 +msgid "do no interactive prompting" +msgstr "keine interaktiven Rückfragen ausgeben" -#: ../svnadmin/svnadmin.c:1102 -#, c-format -msgid "* Copied revision %ld.\n" -msgstr "* Revision %ld kopiert.\n" +#: ../svnbench/svnbench.c:173 +msgid "use ARG as search pattern (glob syntax)" +msgstr "PAR als Suchmuster verwenden (mit Platzhaltern)" -#: ../svnadmin/svnadmin.c:1108 -#, c-format -msgid "* Copied revisions from %ld to %ld.\n" -msgstr "* Revisionen von %ld bis %ld kopiert.\n" +#: ../svnbench/svnbench.c:219 +msgid "" +"Fetch all versions of a file in a batch.\n" +"usage: null-blame [-rM:N] TARGET[@REV]...\n" +"\n" +msgstr "" -#: ../svnadmin/svnadmin.c:1257 -msgid "No program provided" -msgstr "Kein Programm angegeben" +#: ../svnbench/svnbench.c:240 +msgid "" +"Create an unversioned copy of a tree.\n" +"usage: null-export [-r REV] URL[@PEGREV]\n" +"\n" +msgstr "" -#: ../svnadmin/svnadmin.c:1295 +#: ../svnbench/svnbench.c:243 +#, fuzzy msgid "" -"general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" -"Subversion repository administration tool.\n" -"Type 'svnadmin help ' for help on a specific subcommand.\n" -"Type 'svnadmin --version' to see the program version and FS modules.\n" +" Exports a clean directory tree from the repository specified by\n" +" URL, at revision REV if it is given, otherwise at HEAD.\n" "\n" -"Available subcommands:\n" msgstr "" -"Aufruf: svnadmin UNTERBEFEHL ARCHIV_PFAD [Optionen & Parameter ...]\n" -"Werkzeug zum Verwalten von Projektarchiven.\n" -"Geben Sie »svnadmin help « ein, um Hilfe zu einem Unterbefehl\n" -" zu erhalten.\n" -"Geben Sie »svnadmin --version« ein, um die Programmversion und die Datei-\n" -" systemmodule zu sehen.\n" +"Erzeugt eine nicht versionierte Kopie eines Dateibaumes.\n" +"Aufruf: null-export [-r REV] URL[@PEGREV]\n" "\n" -"Verfügbare Unterbefehle:\n" +" Exportiert einen sauberen Verzeichnisbaum, der durch die URL\n" +" spezifiziert ist. Ohne Angabe von REV wird HEAD exportiert, sonst REV.\n" +"\n" +" PEGREV gibt an, in welcher Revision das Ziel zuerst gesucht wird.\n" -#: ../svnadmin/svnadmin.c:1303 ../svnlook/svnlook.c:2243 -#: ../svnserve/svnserve.c:429 +#: ../svnbench/svnbench.c:252 msgid "" -"The following repository back-end (FS) modules are available:\n" +"List directory entries in the repository.\n" +"usage: null-list [TARGET[@REV]...]\n" "\n" msgstr "" -"Die folgenden Dateisystemmodule für Projektarchive stehen zur Verfügung:\n" + +#: ../svnbench/svnbench.c:263 +msgid "" +" With --verbose, the following fields will be fetched for each item:\n" "\n" +msgstr "" -#: ../svnadmin/svnadmin.c:1332 -#, c-format -msgid "Invalid revision number (%ld) specified" -msgstr "Ungültige Revisionsnummer (%ld) angegeben" +#: ../svnbench/svnbench.c:274 +msgid "" +"Fetch the log messages for a set of revision(s) and/or path(s).\n" +"usage: 1. null-log [PATH][@REV]\n" +" 2. null-log URL[@REV] [PATH...]\n" +"\n" +msgstr "" -#: ../svnadmin/svnadmin.c:1342 -msgid "Non-numeric revision specified" -msgstr "Nicht-numerische Revisionsnummer angegeben" +#: ../svnbench/svnbench.c:278 +msgid "" +" 1. Fetch the log messages for the URL corresponding to PATH\n" +" (default: '.'). If specified, REV is the revision in which the\n" +" URL is first looked up, and the default revision range is REV:1.\n" +" If REV is not specified, the default revision range is BASE:1,\n" +" since the URL might not exist in the HEAD revision.\n" +"\n" +msgstr "" -#: ../svnadmin/svnadmin.c:1403 -msgid "Invalid property value found in dumpstream; consider repairing the source or using --bypass-prop-validation while loading." -msgstr "Ungültiger Eigenschaftswert in Datenstrom gefunden; Versuchen Sie die Quelle zu reparieren oder geben Sie »--bypass-prop-validation« beim Laden an." +#: ../svnbench/svnbench.c:284 +msgid "" +" 2. Fetch the log messages for the PATHs (default: '.') under URL.\n" +" If specified, REV is the revision in which the URL is first\n" +" looked up, and the default revision range is REV:1; otherwise,\n" +" the URL is looked up in HEAD, and the default revision range is\n" +" HEAD:1.\n" +"\n" +msgstr "" -#: ../svnadmin/svnadmin.c:1469 ../svnadmin/svnadmin.c:2336 +#: ../svnbench/svnbench.c:294 msgid "" -"Failed to get exclusive repository access; perhaps another process\n" -"such as httpd, svnserve or svn has it open?" +" With -v, also print all affected paths with each log message.\n" +" With -q, don't print the log message body itself (note that this is\n" +" compatible with -v).\n" +"\n" msgstr "" -"Konnte keinen exklusiven Zugriff auf das Projektarchiv erlangen\n" -"Vielleicht hat noch ein anderer Prozess (httpd, svnserve, svn)\n" -"das Projektarchiv geöffnet?" -#: ../svnadmin/svnadmin.c:1474 ../svnadmin/svnadmin.c:2341 -#, c-format -msgid "Waiting on repository lock; perhaps another process has it open?\n" -msgstr "Warte auf Freigabe des Projektarchivs; Vielleicht ist es durch einen anderen Prozess geöffnet?\n" +#: ../svnbench/svnbench.c:298 +msgid "" +" Each log message is printed just once, even if more than one of the\n" +" affected paths for that revision were explicitly requested. Logs\n" +" follow copy history by default. Use --stop-on-copy to disable this\n" +" behavior, which can be useful for determining branchpoints.\n" +msgstr "" + +#: ../svnbench/svnbench.c:309 +msgid "" +"Display information about a local or remote item.\n" +"usage: null-info [TARGET[@REV]...]\n" +"\n" +msgstr "" -#: ../svnadmin/svnadmin.c:1482 -#, c-format +#: ../svnbench/svnbench.c:312 +#, fuzzy msgid "" -"\n" -"Recovery completed.\n" +" Print information about each TARGET (default: '.').\n" +" TARGET may be either a working-copy path or URL. If specified, REV\n" +" determines in which revision the target is first looked up.\n" msgstr "" +"Zeigt Informationen über ein lokales oder auf dem Server befindliches\n" +"Objekt an.\n" +"Aufruf: info [ZIEL[@REV]...]\n" "\n" -"Wiederherstellung vollständig abgeschlossen.\n" +" Gibt Informationen über jedes ZIEL aus (Vorgabe: ».«).\n" +" ZIEL kann entweder ein Pfad einer Arbeitskopie oder eine URL sein. Wenn\n" +" angegeben, bestimmt REV, in welcher Revision zuerst nach dem Ziel gesucht\n" +" wird.\n" -#: ../svnadmin/svnadmin.c:1489 +#: ../svnbench/svnbench.c:808 #, c-format -msgid "The latest repos revision is %ld.\n" -msgstr "Die neueste Revision des Projektarchivs ist %ld.\n" +msgid "" +"Subcommand '%s' doesn't accept option '%s'\n" +"Type 'svnbench help %s' for usage.\n" +msgstr "" +"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n" +"Geben Sie »svnbench help %s« für Hilfe ein.\n" -#: ../svnadmin/svnadmin.c:1604 +#: ../svnbench/svnbench.c:1000 #, c-format -msgid "Transaction '%s' removed.\n" -msgstr "Transaktion »%s« entfernt.\n" +msgid "Try 'svnbench help %s' for more information" +msgstr "Versuchen Sie »svnbench help %s« für weitere Informationen" -#: ../svnadmin/svnadmin.c:1686 ../svnadmin/svnadmin.c:1800 -#: ../svnadmin/svnadmin.c:2386 +#: ../svnbench/svnbench.c:1025 #, c-format -msgid "--revision (-r) and --transaction (-t) are mutually exclusive" -msgstr "--revision (-r) und --transaction (-t) schließen sich gegenseitig aus" +msgid "%15.6f seconds taken\n" +msgstr "" -#: ../svnadmin/svnadmin.c:1692 ../svnadmin/svnadmin.c:2392 +#: ../svnbench/svnbench.c:1032 #, c-format -msgid "Calling hooks is incompatible with --transaction (-t)" -msgstr "Ausführung von Aktionen ist unverträglich mit --transaction (-t)" +msgid "%15s bytes transferred over network\n" +msgstr "" -#: ../svnadmin/svnadmin.c:1697 ../svnadmin/svnadmin.c:1742 -#: ../svnadmin/svnadmin.c:2397 -#, c-format -msgid "Missing revision" -msgstr "Fehlende Revision" +#: ../svndumpfilter/svndumpfilter.c:361 +msgid "This is an empty revision for padding." +msgstr "Dies ist eine leere Revision zum Auffüllen" -#: ../svnadmin/svnadmin.c:1700 ../svnadmin/svnadmin.c:1745 -#: ../svnadmin/svnadmin.c:2400 +#: ../svndumpfilter/svndumpfilter.c:413 #, c-format -msgid "Only one revision allowed" -msgstr "Nur eine Revision zulässig" - -#: ../svnadmin/svnadmin.c:1862 -msgid "" -"\n" -"-----Summary of corrupt revisions-----\n" -msgstr "" -"\n" -"-----Zusammenfassung beschädigter Revisionen-----\n" +msgid "Revision %ld committed as %ld.\n" +msgstr "Revision %ld als %ld übertragen.\n" -#: ../svnadmin/svnadmin.c:1954 +#: ../svndumpfilter/svndumpfilter.c:436 #, c-format -msgid "UUID: %s\n" -msgstr "UUID: %s\n" +msgid "Revision %ld skipped.\n" +msgstr "Revision: »%ld« übersprungen\n" -#: ../svnadmin/svnadmin.c:1960 +#: ../svndumpfilter/svndumpfilter.c:533 #, c-format -msgid "Repository Format: %d\n" -msgstr "Format des Projektarchivs: %d\n" +msgid "Invalid copy source path '%s'" +msgstr "Ungültiger Quellpfad einer Kopie: »%s«" -#: ../svnadmin/svnadmin.c:1974 +#: ../svndumpfilter/svndumpfilter.c:571 #, c-format -msgid "Compatible With Version: %d.%d.0\n" -msgstr "Kompatibel mit Version: %d.%d.0\n" +msgid "Missing Node-action for path '%s'" +msgstr "Fehlende Knotenaktion für Pfad »%s«" -#: ../svnadmin/svnadmin.c:1993 +#: ../svndumpfilter/svndumpfilter.c:614 #, c-format -msgid "Repository Capability: %s\n" -msgstr "Funktion des Projektarchivs: %s\n" +msgid "No valid copyfrom revision in filtered stream" +msgstr "Keine gültige Quellrevision im gefilterten Datenstrom" -#: ../svnadmin/svnadmin.c:2002 +#: ../svndumpfilter/svndumpfilter.c:682 #, c-format -msgid "Filesystem Type: %s\n" -msgstr "Typ des Dateisystems: %s\n" +msgid "Missing merge source path '%s'; try with --skip-missing-merge-sources" +msgstr "Fehlender Zusammenführungsquellpfad »%s«; versuchen Sie es mit --skip-missing-merge-sources" -#: ../svnadmin/svnadmin.c:2004 +#: ../svndumpfilter/svndumpfilter.c:704 #, c-format -msgid "Filesystem Format: %d\n" -msgstr "Format des Dateisystems: %d\n" +msgid "No valid revision range 'start' in filtered stream" +msgstr "Kein gültiger Revisionsbereich »start« im gefilterten Datenstrom" -#: ../svnadmin/svnadmin.c:2013 +#: ../svndumpfilter/svndumpfilter.c:711 #, c-format -msgid "FSFS Sharded: yes\n" -msgstr "FSFS Fragmentiert: ja\n" +msgid "No valid revision range 'end' in filtered stream" +msgstr "Kein gültiger Revisionsbereich »end« im gefilterten Datenstrom" -#: ../svnadmin/svnadmin.c:2015 +#: ../svndumpfilter/svndumpfilter.c:759 ../svndumpfilter/svndumpfilter.c:790 #, c-format -msgid "FSFS Sharded: no\n" -msgstr "FSFS Fragmentiert: nein\n" +msgid "Delta property block detected, but deltas are not enabled for node '%s' in original revision %ld" +msgstr "Block mit Deltas für Eigenschaften entdeckt, Deltas sind aber für Knoten »%s« in originaler Revision %ld nicht aktiviert" -#: ../svnadmin/svnadmin.c:2018 -#, c-format -msgid "FSFS Shard Size: %d\n" -msgstr "FSFS Fragmentgröße: %d\n" +#: ../svndumpfilter/svndumpfilter.c:952 +msgid "Do not display filtering statistics." +msgstr "Filterstatistik nicht anzeigen." -#: ../svnadmin/svnadmin.c:2027 -#, c-format -msgid "FSFS Shards Packed: %ld/%ld\n" -msgstr "FSFS Fragmente gepackt: %ld/%ld\n" +#: ../svndumpfilter/svndumpfilter.c:954 +msgid "" +"Treat the path prefixes as file glob patterns.\n" +" Glob special characters are '*' '?' '[]' and '\\'.\n" +" Character '/' is not treated specially, so\n" +" pattern /*/foo matches paths /a/foo and /a/b/foo." +msgstr "" -#: ../svnadmin/svnadmin.c:2032 -#, c-format -msgid "FSFS Logical Addressing: yes\n" -msgstr "FSFS Logische Adressierung: ja\n" +#: ../svndumpfilter/svndumpfilter.c:959 +msgid "Remove revisions emptied by filtering." +msgstr "Durch das Filtern geleerte Revisionen entfernen." -#: ../svnadmin/svnadmin.c:2034 -#, c-format -msgid "FSFS Logical Addressing: no\n" -msgstr "FSFS Logische Adressierung: nein\n" +#: ../svndumpfilter/svndumpfilter.c:961 +msgid "" +"Remove all empty revisions found in dumpstream\n" +" except revision 0." +msgstr "" +"Entfernt alle im Dateiabzug gefundenen leeren Revisionen\n" +" mit Ausnahme von Revision 0." -# TODO: leicht inkonsistent zu obigen Strings (tritt in svn info-Ausgabe auf) -#: ../svnadmin/svnadmin.c:2044 -#, c-format -msgid "Configuration File: %s\n" -msgstr "Konfigurationsdatei: %s\n" +#: ../svndumpfilter/svndumpfilter.c:964 +msgid "Renumber revisions left after filtering." +msgstr "Revisionen nach dem Filtern neu nummerieren." -#: ../svnadmin/svnadmin.c:2168 ../svnlook/svnlook.c:2306 -#, c-format -msgid "UUID Token: %s\n" -msgstr "UUID-Marke: %s\n" +#: ../svndumpfilter/svndumpfilter.c:967 +msgid "Skip missing merge sources." +msgstr "Fehlende Zusammenführungsquellen übersprungen." -#: ../svnadmin/svnadmin.c:2169 ../svnlook/svnlook.c:2307 -#, c-format -msgid "Owner: %s\n" -msgstr "Eigentümer: %s\n" +#: ../svndumpfilter/svndumpfilter.c:969 +msgid "Don't filter revision properties." +msgstr "Revisionseigenschaften nicht filtern." -#: ../svnadmin/svnadmin.c:2170 ../svnlook/svnlook.c:2308 -#, c-format -msgid "Created: %s\n" -msgstr "Erstellt: %s\n" +#: ../svndumpfilter/svndumpfilter.c:971 +msgid "" +"Read additional prefixes, one per line, from\n" +" file ARG." +msgstr "" +"Liest zusätzliche Prefixe, einen je Zeile, aus\n" +" Datei PAR." -#: ../svnadmin/svnadmin.c:2171 ../svnlook/svnlook.c:2309 -#, c-format -msgid "Expires: %s\n" -msgstr "Läuft ab: %s\n" +#: ../svndumpfilter/svndumpfilter.c:983 +msgid "" +"Filter out nodes with given prefixes from dumpstream.\n" +"usage: svndumpfilter exclude PATH_PREFIX...\n" +msgstr "" +"Knoten mit den angegebenen Präfixen aus dem Datenstrom ausfiltern.\n" +"Aufruf: svndumpfilter exclude PFAD_PRÄFIX ...\n" -#: ../svnadmin/svnadmin.c:2173 -#, c-format +#: ../svndumpfilter/svndumpfilter.c:993 msgid "" -"Comment (%i line):\n" -"%s\n" -"\n" -msgid_plural "" -"Comment (%i lines):\n" -"%s\n" -"\n" -msgstr[0] "" -"Kommentar (%i Zeile):\n" -"%s\n" +"Filter out nodes without given prefixes from dumpstream.\n" +"usage: svndumpfilter include PATH_PREFIX...\n" +msgstr "" +"Knoten, die nicht den angegebenen Präfixen entsprechen, aus dem Datenstrom ausfiltern.\n" +"Aufruf: svndumpfilter include PFAD_PRÄFIX ...\n" + +#: ../svndumpfilter/svndumpfilter.c:1003 +msgid "" +"Describe the usage of this program or its subcommands.\n" +"usage: svndumpfilter help [SUBCOMMAND...]\n" +msgstr "" +"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n" +"Aufruf: svndumpfilter help [UNTERBEFEHL...]\n" + +#: ../svndumpfilter/svndumpfilter.c:1078 +msgid "" +"general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n" +"Subversion repository dump filtering tool.\n" +"Type 'svndumpfilter help ' for help on a specific subcommand.\n" +"Type 'svndumpfilter --version' to see the program version.\n" "\n" -msgstr[1] "" -"Kommentar (%i Zeilen):\n" -"%s\n" +"Available subcommands:\n" +msgstr "" +"Aufruf: svndumpfilter UNTERBEFEHL [Optionen & Parameter ...]\n" +"Werkzeug zum Filtern von Dateiabzügen von Projektarchiven.\n" +"Geben Sie »svndumpfilter help « ein, um Hilfe zu einem\n" +" Unterbefehl zu erhalten.\n" +"Geben Sie »svndumpfilter --version« ein, um die Programmversion zu sehen.\n" "\n" +"Verfügbare Unterbefehle:\n" -#: ../svnadmin/svnadmin.c:2221 -msgid "No paths to unlock provided" -msgstr "Keine Pfade zum Entsperren angegeben" - -#: ../svnadmin/svnadmin.c:2239 +#: ../svndumpfilter/svndumpfilter.c:1137 #, c-format -msgid "Path '%s' isn't locked.\n" -msgstr "Pfad »%s« ist nicht gesperrt.\n" +msgid "Excluding (and dropping empty revisions for) prefix patterns:\n" +msgstr "Präfixmuster ausschließen (und leere Revisionen verwerfen):\n" -#: ../svnadmin/svnadmin.c:2251 +#: ../svndumpfilter/svndumpfilter.c:1139 #, c-format -msgid "Removed lock on '%s'.\n" -msgstr "Sperre für »%s« entfernt.\n" +msgid "Excluding prefix patterns:\n" +msgstr "Präfixmuster ausschließen:\n" -#: ../svnadmin/svnadmin.c:2304 +#: ../svndumpfilter/svndumpfilter.c:1142 #, c-format -msgid "'%s' unlocked by user '%s'.\n" -msgstr "»%s« entsperrt durch Benutzer »%s«.\n" - -#: ../svnadmin/svnadmin.c:2351 -msgid "Upgrade of this repository's underlying versioned filesystem is not supported; consider dumping and loading the data elsewhere" -msgstr "Eine Aktualisierung des diesem Projektarchiv zugrundeliegenden versionierten Dateisystems wird nicht unterstützt; versuchen Sie stattdessen »dump« und laden Sie die Daten mit »load« anderswo" +msgid "Including (and dropping empty revisions for) prefix patterns:\n" +msgstr "Präfixmuster einschließen (und leere Revisionen verwerfen):\n" -#: ../svnadmin/svnadmin.c:2358 -msgid "Upgrade of this repository is not supported; consider dumping and loading the data elsewhere" -msgstr "Eine Aktualisierung dieses Projektarchivs wird nicht unterstützt; versuchen Sie stattdessen »dump« und laden Sie die Daten mit »load« anderswo" +#: ../svndumpfilter/svndumpfilter.c:1144 +#, c-format +msgid "Including prefix patterns:\n" +msgstr "Präfixmuster einschließen:\n" -#: ../svnadmin/svnadmin.c:2364 +#: ../svndumpfilter/svndumpfilter.c:1152 #, c-format -msgid "" -"\n" -"Upgrade completed.\n" -msgstr "" -"\n" -"Aktualisierung abgeschlossen.\n" +msgid "Excluding (and dropping empty revisions for) prefixes:\n" +msgstr "Präfixe ausschließen (und leere Revisionen verwerfen):\n" -#: ../svnadmin/svnadmin.c:2478 ../svnfsfs/svnfsfs.c:321 -#: ../svnrdump/svnrdump.c:878 -msgid "Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'" -msgstr "Mehrere Revisionsparameter gefunden; Bitte »-r N:M« anstelle »-r N -r M« verwenden" +#: ../svndumpfilter/svndumpfilter.c:1154 +#, c-format +msgid "Excluding prefixes:\n" +msgstr "Präfixe ausschließen:\n" -#: ../svnadmin/svnadmin.c:2559 +#: ../svndumpfilter/svndumpfilter.c:1157 #, c-format -msgid "Cannot create pre-1.0-compatible repositories" -msgstr "Kann keine Projektarchive erstellen, die mit Versionen älter als 1.0 kompatibel sind" +msgid "Including (and dropping empty revisions for) prefixes:\n" +msgstr "Präfixe einschließen (und leere Revisionen verwerfen):\n" -#: ../svnadmin/svnadmin.c:2571 +#: ../svndumpfilter/svndumpfilter.c:1159 #, c-format -msgid "Cannot guarantee compatibility beyond the current running version (%s)" -msgstr "Kann Kompatibilität für höhere Versionen als die momentan laufende nicht garantieren (%s)" +msgid "Including prefixes:\n" +msgstr "Präfixe einschließen:\n" -#: ../svnadmin/svnadmin.c:2672 ../svnfsfs/svnfsfs.c:386 +#: ../svndumpfilter/svndumpfilter.c:1187 #, c-format -msgid "subcommand argument required\n" -msgstr "Unterbefehl benötigt einen Parameter\n" +msgid "" +"Dropped %d revision.\n" +"\n" +msgid_plural "" +"Dropped %d revisions.\n" +"\n" +msgstr[0] "" +"%d Revision verworfen.\n" +"\n" +msgstr[1] "" +"%d Revisionen verworfen.\n" +"\n" -#: ../svnadmin/svnadmin.c:2709 ../svnfsfs/svnfsfs.c:421 -msgid "Repository argument required" -msgstr "Projektarchiv Parameter erforderlich" +#: ../svndumpfilter/svndumpfilter.c:1195 +msgid "Revisions renumbered as follows:\n" +msgstr "Revisionen folgendermaßen neu nummeriert:\n" -#: ../svnadmin/svnadmin.c:2717 ../svnfsfs/svnfsfs.c:429 +#: ../svndumpfilter/svndumpfilter.c:1222 #, c-format -msgid "'%s' is a URL when it should be a local path" -msgstr "»%s« ist eine URL obwohl es ein Pfad sein sollte" +msgid " %ld => (dropped)\n" +msgstr " %ld => (verworfen)\n" -#: ../svnadmin/svnadmin.c:2747 +#: ../svndumpfilter/svndumpfilter.c:1237 #, c-format -msgid "" -"Subcommand '%s' doesn't accept option '%s'\n" -"Type 'svnadmin help %s' for usage.\n" -msgstr "" -"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n" -"Geben Sie »svnadmin help %s« ein, um Hilfe zu erhalten.\n" +msgid "Dropped %d node:\n" +msgid_plural "Dropped %d nodes:\n" +msgstr[0] "%d Knoten verworfen:\n" +msgstr[1] "%d Knoten verworfen:\n" -#: ../svnadmin/svnadmin.c:2791 -msgid "Try 'svnadmin help' for more info" -msgstr "Geben Sie »svnadmin help« für weitere Hilfe ein" +#: ../svndumpfilter/svndumpfilter.c:1396 +msgid "--drop-empty-revs cannot be used with --drop-all-empty-revs" +msgstr "--drop-empty-revs« kann nicht mit --drop-all-empty-revs verwendet werden" -#: ../svnbench/help-cmd.c:49 +#: ../svndumpfilter/svndumpfilter.c:1507 +#, c-format msgid "" -"usage: svnbench [options] [args]\n" -"Subversion benchmarking tool.\n" -"Type 'svnbench help ' for help on a specific subcommand.\n" -"Type 'svnbench --version' to see the program version and RA modules\n" -" or 'svnbench --version --quiet' to see just the version number.\n" -"\n" -"Most subcommands take file and/or directory arguments, recursing\n" -"on the directories. If no arguments are supplied to such a\n" -"command, it recurses on the current directory (inclusive) by default.\n" "\n" -"Available subcommands:\n" +"Error: no prefixes supplied.\n" msgstr "" -"Aufruf: svnbench [Optionen] [Parameter]\n" -"Subversion-Werkzeug für Geschwindigkeitsmessung und -analyse.\n" -"Geben Sie »svnbench help « ein, um Hilfe zu einem Unterbefehl\n" -" zu erhalten.\n" -"Geben Sie »svnbench --version« ein, um die Programmversion und die Zugriffsmodule\n" -" oder »svnbench --version --quiet«, um nur die Versionsnummer zu sehen.\n" -"\n" -"Die meisten Unterbefehle akzeptieren Datei- und/oder Verzeichnisparameter,\n" -"wobei die Verzeichnisse rekursiv durchlaufen werden. Wenn keine Parameter\n" -"angegeben werden, durchläuft der Befehl das aktuelle Verzeichnis rekursiv.\n" "\n" -"Verfügbare Unterbefehle:\n" +"Fehler: keine Präfixe angegeben.\n" -#: ../svnbench/null-export-cmd.c:334 +#: ../svndumpfilter/svndumpfilter.c:1538 #, c-format msgid "" -"%15s directories\n" -"%15s files\n" -"%15s bytes in files\n" -"%15s properties\n" -"%15s bytes in properties\n" +"Subcommand '%s' doesn't accept option '%s'\n" +"Type 'svndumpfilter help %s' for usage.\n" msgstr "" -"%15s Verzeichnisse\n" -"%15s Dateien\n" -"%15s Byte in Dateien\n" -"%15s Eigenschaften\n" -"%15s Byte in Eigenschaften\n" +"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n" +"Geben Sie »svndumpfilter help %s« für Hilfe ein.\n" -#: ../svnbench/null-info-cmd.c:273 +#: ../svndumpfilter/svndumpfilter.c:1556 +msgid "Try 'svndumpfilter help' for more info" +msgstr "Versuchen Sie »svndumpfilter help« für weitere Informationen" + +#: ../svnfsfs/load-index-cmd.c:54 #, c-format -msgid "Number of status notifications received: %d\n" -msgstr "Zahl der empfangenen Statusmitteilungen: %d\n" +msgid "Unknown item type '%s'" +msgstr "Unbekannter Elementtyp »%s«" + +#: ../svnfsfs/load-index-cmd.c:75 +#, c-format +msgid "%i columns needed, %i provided" +msgstr "%i Spalten benötigt, %i gegeben" -#: ../svnbench/null-list-cmd.c:153 +#: ../svnfsfs/load-index-cmd.c:85 #, c-format +msgid "%s is not a value HEX string" +msgstr "%s ist keine gültige HEX-Zeichenkette" + +#: ../svnfsfs/stats-cmd.c:72 +#, fuzzy, c-format msgid "" -"%15s directories\n" -"%15s files\n" -"%15s locks\n" +"%20s bytes in %12s reps\n" +"%20s bytes in %12s shared reps\n" +"%20s bytes expanded size\n" +"%20s bytes expanded shared size\n" +"%20s bytes with rep-sharing off\n" +"%20s shared references\n" +"%20.3f average delta chain length\n" msgstr "" -"%15s Verzeichnisse\n" -"%15s Dateien\n" -"%15s Sperren\n" +"%20s Byte in %12s Darstellungen\n" +"%20s Byte in %12s geteilten Darstellungen\n" +"%20s Byte erweiterte Größe\n" +"%20s Byte erweiterte geteilte Größe\n" +"%20s Byte mit deaktivierter Teilung von Darstellungen\n" +"%20s geteilte Referenzen\n" -#: ../svnbench/null-log-cmd.c:190 +#: ../svnfsfs/stats-cmd.c:98 #, c-format -msgid "Only relative paths can be specified after a URL for 'svnbench log', but '%s' is not a relative path" -msgstr "Mit »svnbench log« können nach einer URL nur relative Pfade angegeben werden, »%s« ist aber kein relativer Pfad" +msgid "%12s r%-8ld %s\n" +msgstr "%12s r%-8ld %s\n" + +#: ../svnfsfs/stats-cmd.c:124 +#, c-format +msgid " %4s .. < %-4s %19s (%2d%%) bytes in %12s (%2d%%) items\n" +msgstr " %4s .. < %-4s %19s (%2d%%) Byte in %12s (%2d%%) Elementen\n" + +#: ../svnfsfs/stats-cmd.c:247 ../svnfsfs/stats-cmd.c:256 +#, c-format +msgid "%11s %20s (%2d%%) representations\n" +msgstr "%11s %20s (%2d%%) Darstellungen\n" + +#. Total sum can't be zero here. +#: ../svnfsfs/stats-cmd.c:294 ../svnfsfs/stats-cmd.c:304 +#: ../svnfsfs/stats-cmd.c:329 ../svnfsfs/stats-cmd.c:339 +#, c-format +msgid "%11s %20s (%2d%%) bytes\n" +msgstr "%11s %20s (%2d%%) Byte\n" -#: ../svnbench/null-log-cmd.c:222 +#: ../svnfsfs/stats-cmd.c:381 #, c-format msgid "" -"%15s revisions, %15s merged in %s merges\n" -"%15s msg lines, %15s in merged revisions\n" -"%15s changes, %15s in merged revisions\n" +"%20s bytes in %12s revisions\n" +"%20s bytes in %12s changes\n" +"%20s bytes in %12s node revision records\n" +"%20s bytes in %12s representations\n" +"%20s bytes expanded representation size\n" +"%20s bytes with rep-sharing off\n" msgstr "" -"%15s Revisionen, %15s zusammengeführt in %s Zusammenführungen\n" -"%15s Log-Zeilen, %15s in zusammengeführten Revisionen\n" -"%15s Änderungen, %15s in zusammengeführten Revisionen\n" +"%20s Byte in %12s Revisionen\n" +"%20s Byte in %12s Änderungen\n" +"%20s Byte in %12s Knotenrevisionen\n" +"%20s Byte in %12s Darstellungen\n" +"%20s Byte erweiterte Darstellungsgröße\n" +"%20s Byte deaktivierter Teilung von Darstellungen\n" -#: ../svnbench/null-log-cmd.c:234 +#: ../svnfsfs/stats-cmd.c:401 #, c-format msgid "" -"%15s revisions\n" -"%15s msg lines\n" -"%15s changes\n" +"%20s bytes in %12s nodes total\n" +"%20s bytes in %12s directory noderevs\n" +"%20s bytes in %12s file noderevs\n" msgstr "" -"%15s Revisionen\n" -"%15s Log-Zeilen\n" -"%15s Änderungen\n" - -#: ../svnbench/svnbench.c:117 ../svnrdump/svnrdump.c:144 -msgid "specify a password ARG" -msgstr "Passwort PAR angeben" +"%20s Byte in %12s Knoten insgesamt\n" +"%20s Byte in %12s Knotenrevisionen von Verzeichnisen\n" +"%20s Byte in %12s Knotenrevisionen von Dateien\n" -#: ../svnbench/svnbench.c:124 -msgid "use strict semantics" -msgstr "wendet strikte Semantik an" +#: ../svnfsfs/stats-cmd.c:412 +#, fuzzy, c-format +msgid "" +"%20s bytes in %12s representations total\n" +"%20s bytes in %12s directory representations\n" +"%20s bytes in %12s file representations\n" +"%20s bytes in %12s representations of added file nodes\n" +"%20s bytes in %12s directory property representations\n" +"%20s bytes in %12s file property representations\n" +" with %12.3f average delta chain length\n" +"%20s bytes in header & footer overhead\n" +msgstr "" +"%20s Byte in %12s Darstellungen insgesamt\n" +"%20s Byte in %12s Darstellungen von Verzeichnissen\n" +"%20s Byte in %12s Darstellungen von Dateien\n" +"%20s Byte in %12s Darstellungen von hinzugefügten Dateiknoten\n" +"%20s Byte in %12s Darstellungen von Verzeichniseigenschaften\n" +"%20s Byte in %12s Darstellungen von Dateieigenschaften\n" +"%20s Byte in Kopf- und Fußdaten\n" -#: ../svnbench/svnbench.c:154 -msgid "do no interactive prompting" -msgstr "keine interaktiven Rückfragen ausgeben" +#: ../svnfsfs/svnfsfs.c:104 +msgid "" +"size of the extra in-memory cache in MB used to\n" +" minimize redundant operations. Default: 16." +msgstr "" +"Größe des extra Zwischenspeichers im RAM in MB zur\n" +" Minimierung redundanter Operationen. Vorgabe: 16." -#: ../svnbench/svnbench.c:223 +#: ../svnfsfs/svnfsfs.c:117 msgid "" -"Create an unversioned copy of a tree.\n" -"usage: null-export [-r REV] URL[@PEGREV]\n" -"\n" -" Exports a clean directory tree from the repository specified by\n" -" URL, at revision REV if it is given, otherwise at HEAD.\n" +"usage: svnfsfs help [SUBCOMMAND...]\n" "\n" -" If specified, PEGREV determines in which revision the target is first\n" -" looked up.\n" msgstr "" -"Erzeugt eine nicht versionierte Kopie eines Dateibaumes.\n" -"Aufruf: null-export [-r REV] URL[@PEGREV]\n" -"\n" -" Exportiert einen sauberen Verzeichnisbaum, der durch die URL\n" -" spezifiziert ist. Ohne Angabe von REV wird HEAD exportiert, sonst REV.\n" -"\n" -" PEGREV gibt an, in welcher Revision das Ziel zuerst gesucht wird.\n" -# FIXME: "looked up" ist überall leicht unterschiedlich übersetzt -# Ich (Jens) bevorzuge "gesucht" statt "nachgeschlagen" oder "durchsucht", "nachgeschaut" -# FIXME: Standardsätze sollten eigene msgid haben! -#: ../svnbench/svnbench.c:234 +#: ../svnfsfs/svnfsfs.c:124 msgid "" -"List directory entries in the repository.\n" -"usage: null-list [TARGET[@REV]...]\n" -"\n" -" List each TARGET file and the contents of each TARGET directory as\n" -" they exist in the repository. If TARGET is a working copy path, the\n" -" corresponding repository URL will be used. If specified, REV determines\n" -" in which revision the target is first looked up.\n" -"\n" -" The default TARGET is '.', meaning the repository URL of the current\n" -" working directory.\n" -"\n" -" With --verbose, the following fields will be fetched for each item:\n" +"usage: svnfsfs dump-index REPOS_PATH -r REV\n" "\n" -" Revision number of the last commit\n" -" Author of the last commit\n" -" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n" -" Size (in bytes)\n" -" Date and time of the last commit\n" msgstr "" -"Zeigt Verzeichniseinträge im Projektarchiv.\n" -"Aufruf: null-list [ZIEL[@REV]...]\n" -"\n" -" Listet jede ZIEL-Datei und die Inhalte jedes ZIEL-Verzeichnisses, wie\n" -" sie im Projektarchiv existieren, auf. Wenn ZIEL ein Arbeitskopiepfad ist,\n" -" wird die entsprechende URL des Projektarchivs verwendet. REV bestimmt,\n" -" in welcher Revision zuerst nachgeschaut wird.\n" -"\n" -" Die Vorgabe für ZIEL ist ».«, d.h. die URL vom Projektarchiv des\n" -" aktuellen Verzeichnisses.\n" + +#: ../svnfsfs/svnfsfs.c:126 +msgid "" +"Dump the index contents for the revision / pack file containing revision REV\n" +"to console. This is only available for FSFS format 7 (SVN 1.9+) repositories.\n" +"The table produced contains a header in the first line followed by one line\n" +"per index entry, ordered by location in the revision / pack file. Columns:\n" "\n" -" Mit »--verbose« werden die folgenden Felder pro Objekt abgerufen:\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:131 +msgid "" +" * Byte offset (hex) at which the item starts\n" +" * Length (hex) of the item in bytes\n" +" * Item type (string) is one of the following:\n" "\n" -" Revisionsnummer der letzten Übertragung\n" -" Autor der letzten Übertragung\n" -" Falls gesperrt, der Buchstabe »O« (»svn info URL« für Details)\n" -" Größe (in Bytes)\n" -" Datum und Zeit der letzten Übertragung\n" +msgstr "" -#: ../svnbench/svnbench.c:255 +#: ../svnfsfs/svnfsfs.c:135 msgid "" -"Fetch the log messages for a set of revision(s) and/or path(s).\n" -"usage: 1. null-log [PATH][@REV]\n" -" 2. null-log URL[@REV] [PATH...]\n" +" none ... Unused section. File contents shall be NULs.\n" +" frep ... File representation.\n" +" drep ... Directory representation.\n" +" fprop .. File property.\n" +" dprop .. Directory property.\n" +" node ... Node revision.\n" +" chgs ... Changed paths list.\n" +" rep .... Representation of unknown type. Should not be used.\n" +" ??? .... Invalid. Index data is corrupt.\n" "\n" -" 1. Fetch the log messages for the URL corresponding to PATH\n" -" (default: '.'). If specified, REV is the revision in which the\n" -" URL is first looked up, and the default revision range is REV:1.\n" -" If REV is not specified, the default revision range is BASE:1,\n" -" since the URL might not exist in the HEAD revision.\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:145 +msgid "" +" The distinction between frep, drep, fprop and dprop is a mere internal\n" +" classification used for various optimizations and does not affect the\n" +" operational correctness.\n" "\n" -" 2. Fetch the log messages for the PATHs (default: '.') under URL.\n" -" If specified, REV is the revision in which the URL is first\n" -" looked up, and the default revision range is REV:1; otherwise,\n" -" the URL is looked up in HEAD, and the default revision range is\n" -" HEAD:1.\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:149 +msgid "" +" * Revision that the item belongs to (decimal)\n" +" * Item number (decimal) within that revision\n" +" * Modified FNV1a checksum (8 hex digits)\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:156 +msgid "" +"usage: svnfsfs load-index REPOS_PATH\n" "\n" -" Multiple '-c' or '-r' options may be specified (but not a\n" -" combination of '-c' and '-r' options), and mixing of forward and\n" -" reverse ranges is allowed.\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:158 +#, fuzzy +msgid "" +"Read index contents from console. The format is the same as produced by the\n" +"dump-index command, except that checksum as well as header are optional and will\n" +"be ignored. The data must cover the full revision / pack file; the revision\n" +"number is automatically extracted from input stream. No ordering is required.\n" +msgstr "" +"Aufruf: svnfsfs load-index ARCHIV_PFAD\n" "\n" -" With -v, also print all affected paths with each log message.\n" -" With -q, don't print the log message body itself (note that this is\n" -" compatible with -v).\n" +"Liest den Inhalt des Index von der Konsole. Das Format entspricht der Ausgabe\n" +"des Kommandos dump-index, außer dass die Prüfsummen und Kopfdaten optional sind\n" +"und ignoriert werden. Die Daten müssen die vollständige Revisisions- oder Pack-\n" +"datei abdecken; die Revisionsnummer wird automatisch aus dem Eingabestrom\n" +"extrahiert. Keine besondere Reihenfolge erforderlich.\n" + +#: ../svnfsfs/svnfsfs.c:166 +#, fuzzy +msgid "" +"usage: svnfsfs stats REPOS_PATH\n" "\n" -" Each log message is printed just once, even if more than one of the\n" -" affected paths for that revision were explicitly requested. Logs\n" -" follow copy history by default. Use --stop-on-copy to disable this\n" -" behavior, which can be useful for determining branchpoints.\n" msgstr "" -"Ruft die Logmeldungen für eine Menge von Revisionen und/oder Dateien ab.\n" -"Aufruf: 1. null-log [PFAD][@REV]\n" -" 2. null-log URL[@REV] [PFAD...]\n" -"\n" -" 1. Ruft Log-Einträge der zu PFAD gehörenden URL ab. (Vorgabe: ».«)\n" -" Ist REV angegeben, ist das die Revision in der URL zuerst gesucht\n" -" Ist REV angegeben, ist das die Revision in der URL zuerst gesucht\n" -" wird, und der vorgegebene Versionsbereich ist REV:1. Ist REV nicht\n" -" angegeben, so ist der vorgegebene Revisionsbereich BASE:1, da die\n" -" URL möglicherweise in der Revision HEAD nicht existiert.\n" -"\n" -" 2. Ruft Log-Einträge für PFAD(e) unter URL ab, (Vorgabe: ».«)\n" -" Ist REV angegeben, ist das die Revision in der URL zuerst gesucht\n" -" wird, und der vorgegebene Versionsbereich ist REV:1. Andernfalls wird\n" -" URL in HEAD gesucht und der vorgegebene Revisionsbereich ist\n" -" HEAD:1.\n" -"\n" -" Mehrere »-c«- oder »-r«-Optionen dürfen angegeben werden (aber keine\n" -" Kombination von »-c« und »-r«) und das Mischen von vor- und\n" -" rückwärtigen Bereichen ist erlaubt.\n" +"Aufruf: svnfsfs stats ARCHIV_PFAD\n" "\n" -" Mit »-v« werden auch die betroffenen Pfade mit jeder Logmeldung ausgegeben.\n" -" Mit »-q« wird die Logmeldung selbst nicht ausgegeben (Hinweis: Diese Option\n" -" ist kompatibel mit »-v«).\n" +"Gibt Statistiken zu Objektgrößen aus.\n" + +#: ../svnfsfs/svnfsfs.c:168 +#, fuzzy +msgid "Write object size statistics to console.\n" +msgstr "" +"Aufruf: svnfsfs stats ARCHIV_PFAD\n" "\n" -" Jede Logmeldung wird nur einmal ausgegeben, selbst wenn mehr als einer\n" -" der betroffenen Pfade explizit angefragt wurde. Logs folgen per Vorgabe\n" -" der Historie von Kopien. Benutzen Sie »--stop-on-copy«, um dieses Verhalten,\n" -" z.B. zum Auffinden von Verzweigungen, zu deaktivieren.\n" +"Gibt Statistiken zu Objektgrößen aus.\n" + +#: ../svnfsfs/svnfsfs.c:188 +#, c-format +msgid "%s repositories are not supported" +msgstr "Projektarchive vom Typ %s werden nicht unterstützt" -#: ../svnbench/svnbench.c:290 +#: ../svnfsfs/svnfsfs.c:204 msgid "" -"Display information about a local or remote item.\n" -"usage: null-info [TARGET[@REV]...]\n" +"general usage: svnfsfs SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" +"Subversion FSFS repository manipulation tool.\n" +"Type 'svnfsfs help ' for help on a specific subcommand.\n" +"Type 'svnfsfs --version' to see the program version.\n" "\n" -" Print information about each TARGET (default: '.').\n" -" TARGET may be either a working-copy path or URL. If specified, REV\n" -" determines in which revision the target is first looked up.\n" +"Available subcommands:\n" msgstr "" -"Zeigt Informationen über ein lokales oder auf dem Server befindliches\n" -"Objekt an.\n" -"Aufruf: null-info [ZIEL[@REV]...]\n" +"Aufruf: svnfsfs UNTERBEFEHL ARCHIV_PFAD [Optionen & Parameter ...]\n" +"Werkzeug zur Manipulation von FSFS-Projektarchiven\n" +"Geben Sie »svnfsfs help « ein, um Hilfe zu einem Unterbefehl\n" +" zu erhalten.\n" +"Geben Sie »svnfsfs --version« ein, um die Programmversion und die Datei-\n" +" systemmodule zu sehen.\n" "\n" -" Gibt Informationen über jedes ZIEL aus (Vorgabe: ».«).\n" -" ZIEL kann entweder ein Pfad einer Arbeitskopie oder eine URL sein. Wenn\n" -" angegeben, bestimmt REV, in welcher Revision zuerst nach dem Ziel gesucht\n" -" wird.\n" +"Verfügbare Unterbefehle:\n" -#: ../svnbench/svnbench.c:760 +#: ../svnfsfs/svnfsfs.c:435 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" -"Type 'svnbench help %s' for usage.\n" +"Type 'svnfsfs help %s' for usage.\n" msgstr "" "Unterbefehl »%s« akzeptiert die Option »%s« nicht\n" -"Geben Sie »svnbench help %s« für Hilfe ein.\n" - -#: ../svnbench/svnbench.c:962 -#, c-format -msgid "Try 'svnbench help %s' for more information" -msgstr "Versuchen Sie »svnbench help %s« für weitere Informationen" - -#: ../svndumpfilter/svndumpfilter.c:80 -#, c-format -msgid "Can't open stdio file" -msgstr "Kann Standardeingabe nicht öffnen" - -#: ../svndumpfilter/svndumpfilter.c:394 -msgid "This is an empty revision for padding." -msgstr "Dies ist eine leere Revision zum Auffüllen" - -#: ../svndumpfilter/svndumpfilter.c:446 -#, c-format -msgid "Revision %ld committed as %ld.\n" -msgstr "Revision %ld als %ld übertragen.\n" +"Geben Sie »svnfsfs help %s« für Hilfe ein.\n" -#: ../svndumpfilter/svndumpfilter.c:469 -#, c-format -msgid "Revision %ld skipped.\n" -msgstr "Revision: »%ld« übersprungen\n" +#: ../svnfsfs/svnfsfs.c:467 +msgid "Try 'svnfsfs help' for more info" +msgstr "Versuchen Sie »svnfsfs help« für weitere Informationen" -#: ../svndumpfilter/svndumpfilter.c:566 -#, c-format -msgid "Invalid copy source path '%s'" -msgstr "Ungültiger Quellpfad einer Kopie: »%s«" +#: ../svnlook/svnlook.c:118 +msgid "show details for copies" +msgstr "Zeige Details für Kopien" -#: ../svndumpfilter/svndumpfilter.c:604 -#, c-format -msgid "Missing Node-action for path '%s'" -msgstr "Fehlende Knotenaktion für Pfad »%s«" +#: ../svnlook/svnlook.c:121 +msgid "print differences against the copy source" +msgstr "Gibt Unterschiede gegenüber der Quelle der Kopie aus" -#: ../svndumpfilter/svndumpfilter.c:647 -#, c-format -msgid "No valid copyfrom revision in filtered stream" -msgstr "Keine gültige Quellrevision im gefilterten Datenstrom" +#: ../svnlook/svnlook.c:124 +msgid "show full paths instead of indenting them" +msgstr "Zeige vollständige Pfade anstatt sie einzurücken" -#: ../svndumpfilter/svndumpfilter.c:715 -#, c-format -msgid "Missing merge source path '%s'; try with --skip-missing-merge-sources" -msgstr "Fehlender Zusammenführungsquellpfad »%s«; versuchen Sie es mit --skip-missing-merge-sources" +#: ../svnlook/svnlook.c:130 +msgid "maximum number of history entries" +msgstr "Maximale Anzahl von Logeinträgen" -#: ../svndumpfilter/svndumpfilter.c:737 -#, c-format -msgid "No valid revision range 'start' in filtered stream" -msgstr "Kein gültiger Revisionsbereich »start« im gefilterten Datenstrom" +#: ../svnlook/svnlook.c:158 +msgid "operate on single directory only" +msgstr "Nicht rekursiv hinabsteigen" -#: ../svndumpfilter/svndumpfilter.c:744 -#, c-format -msgid "No valid revision range 'end' in filtered stream" -msgstr "Kein gültiger Revisionsbereich »end« im gefilterten Datenstrom" +#: ../svnlook/svnlook.c:161 +msgid "specify revision number ARG" +msgstr "Revisionsnummer PAR angegeben" -#: ../svndumpfilter/svndumpfilter.c:792 ../svndumpfilter/svndumpfilter.c:823 -#, c-format -msgid "Delta property block detected, but deltas are not enabled for node '%s' in original revision %ld" -msgstr "Block mit Deltas für Eigenschaften entdeckt, Deltas sind aber für Knoten »%s« in originaler Revision %ld nicht aktiviert" +#: ../svnlook/svnlook.c:164 +msgid "operate on a revision property (use with -r or -t)" +msgstr "" +"auf einer Revisionseigenschaft arbeiten (mit -r\n" +" oder -t verwenden)" -#: ../svndumpfilter/svndumpfilter.c:985 -msgid "Do not display filtering statistics." -msgstr "Filterstatistik nicht anzeigen." +#: ../svnlook/svnlook.c:167 +msgid "show node revision ids for each path" +msgstr "gibt die IDs der Knotenrevisionen jedes Pfades aus" -#: ../svndumpfilter/svndumpfilter.c:987 -msgid "Treat the path prefixes as file glob patterns." -msgstr "Pfadpräfix als Dateiplatzhalter behandeln." +#: ../svnlook/svnlook.c:170 +msgid "show path's inherited properties" +msgstr "Gibt die geerbten Eigenschaften des Pfades aus" -#: ../svndumpfilter/svndumpfilter.c:989 -msgid "Remove revisions emptied by filtering." -msgstr "Durch das Filtern geleerte Revisionen entfernen." +#: ../svnlook/svnlook.c:176 +msgid "be verbose" +msgstr "ausführliche Meldungen" -#: ../svndumpfilter/svndumpfilter.c:991 +#: ../svnlook/svnlook.c:185 msgid "" -"Remove all empty revisions found in dumpstream\n" -" except revision 0." +"Specify differencing options for external diff or\n" +" internal diff. Default: '-u'. Options are\n" +" separated by spaces. Internal diff takes:\n" +" -u, --unified: Show 3 lines of unified context\n" +" -b, --ignore-space-change: Ignore changes in\n" +" amount of white space\n" +" -w, --ignore-all-space: Ignore all white space\n" +" --ignore-eol-style: Ignore changes in EOL style\n" +" -U ARG, --context ARG: Show ARG lines of context\n" +" -p, --show-c-function: Show C function name" msgstr "" -"Entfernt alle im Dateiabzug gefundenen leeren Revisionen\n" -" mit Ausnahme von Revision 0." - -#: ../svndumpfilter/svndumpfilter.c:994 -msgid "Renumber revisions left after filtering." -msgstr "Revisionen nach dem Filtern neu nummerieren." - -#: ../svndumpfilter/svndumpfilter.c:997 -msgid "Skip missing merge sources." -msgstr "Fehlende Zusammenführungsquellen übersprungen." +"Gibt Optionen für ein externes Vergleichsprogramm oder die interne\n" +" Vergleichsfunktion an. Vorgabe ist »-u«. Optionen sind\n" +" durch Leerzeichen zu trennen. aber sein internes Vergleichsprogramm benutzt\n" +" oder Annotierungen anzeigt, kann PAR einen der\n" +" folgenden Werte annehmen:\n" +" -u (--unified):\n" +" Gibt 3 Zeilen Standardkontext aus.\n" +" -b (--ignore-space-change):\n" +" Ignoriert Änderungen in der Anzahl von\n" +" Leerzeichen.\n" +" -w (--ignore-all-space):\n" +" Ignoriert sämtliche Leerzeichen.\n" +" --ignore-eol-style:\n" +" Ignoriert Änderungen im Zeilenendestil.\n" +" -U PAR, --context PAR: Gibt PAR Zeilen Kontext aus.\n" +" -p (--show-c-function):\n" +" Zeigt C-Funktionsname in Diff-Ausgabe." -#: ../svndumpfilter/svndumpfilter.c:999 -msgid "Don't filter revision properties." -msgstr "Revisionseigenschaften nicht filtern." +#: ../svnlook/svnlook.c:206 ../svnrdump/svnrdump.c:114 +#: ../svnserve/svnserve.c:421 ../svnversion/svnversion.c:146 +msgid "no progress (only errors) to stderr" +msgstr "keine Fortschrittsanzeige (nur Fehler) auf die Standardfehlerausgabe" -#: ../svndumpfilter/svndumpfilter.c:1001 +#: ../svnlook/svnlook.c:218 +#, fuzzy msgid "" -"Read additional prefixes, one per line, from\n" -" file ARG." +"usage: svnlook author REPOS_PATH\n" +"\n" msgstr "" -"Liest zusätzliche Prefixe, einen je Zeile, aus\n" -" Datei PAR." +"Aufruf: svnlook author ARCHIV_PFAD\n" +"\n" +"Gibt den Autor aus.\n" -#: ../svndumpfilter/svndumpfilter.c:1013 -msgid "" -"Filter out nodes with given prefixes from dumpstream.\n" -"usage: svndumpfilter exclude PATH_PREFIX...\n" -msgstr "" -"Knoten mit den angegebenen Präfixen aus dem Datenstrom ausfiltern.\n" -"Aufruf: svndumpfilter exclude PFAD_PRÄFIX ...\n" +#: ../svnlook/svnlook.c:220 +#, fuzzy +msgid "Print the author.\n" +msgstr "Pfad nicht ausgeben" -#: ../svndumpfilter/svndumpfilter.c:1022 +#: ../svnlook/svnlook.c:225 +#, fuzzy msgid "" -"Filter out nodes without given prefixes from dumpstream.\n" -"usage: svndumpfilter include PATH_PREFIX...\n" +"usage: svnlook cat REPOS_PATH FILE_PATH\n" +"\n" msgstr "" -"Knoten, die nicht den angegebenen Präfixen entsprechen, aus dem Datenstrom ausfiltern.\n" -"Aufruf: svndumpfilter include PFAD_PRÄFIX ...\n" +"Aufruf: svnlook author ARCHIV_PFAD\n" +"\n" +"Gibt den Autor aus.\n" -#: ../svndumpfilter/svndumpfilter.c:1031 -msgid "" -"Describe the usage of this program or its subcommands.\n" -"usage: svndumpfilter help [SUBCOMMAND...]\n" +#: ../svnlook/svnlook.c:227 +#, fuzzy +msgid "Print the contents of a file. Leading '/' on FILE_PATH is optional.\n" msgstr "" -"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n" -"Aufruf: svndumpfilter help [UNTERBEFEHL...]\n" +"Aufruf: svnlook cat ARCHIV_PFAD DATEI_PFAD\n" +"\n" +"Gibt den Inhalt einer Datei aus. Ein vorangestellter »/« im DATEI_PFAD ist\n" +"optional.\n" -#: ../svndumpfilter/svndumpfilter.c:1107 +#: ../svnlook/svnlook.c:232 +#, fuzzy msgid "" -"general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n" -"Subversion repository dump filtering tool.\n" -"Type 'svndumpfilter help ' for help on a specific subcommand.\n" -"Type 'svndumpfilter --version' to see the program version.\n" +"usage: svnlook changed REPOS_PATH\n" "\n" -"Available subcommands:\n" msgstr "" -"Aufruf: svndumpfilter UNTERBEFEHL [Optionen & Parameter ...]\n" -"Werkzeug zum Filtern von Dateiabzügen von Projektarchiven.\n" -"Geben Sie »svndumpfilter help « ein, um Hilfe zu einem\n" -" Unterbefehl zu erhalten.\n" -"Geben Sie »svndumpfilter --version« ein, um die Programmversion zu sehen.\n" +"Aufruf: svnlook date ARCHIV_PFAD\n" "\n" -"Verfügbare Unterbefehle:\n" - -#: ../svndumpfilter/svndumpfilter.c:1166 -#, c-format -msgid "Excluding (and dropping empty revisions for) prefix patterns:\n" -msgstr "Präfixmuster ausschließen (und leere Revisionen verwerfen):\n" - -#: ../svndumpfilter/svndumpfilter.c:1168 -#, c-format -msgid "Excluding prefix patterns:\n" -msgstr "Präfixmuster ausschließen:\n" - -#: ../svndumpfilter/svndumpfilter.c:1171 -#, c-format -msgid "Including (and dropping empty revisions for) prefix patterns:\n" -msgstr "Präfixmuster einschließen (und leere Revisionen verwerfen):\n" - -#: ../svndumpfilter/svndumpfilter.c:1173 -#, c-format -msgid "Including prefix patterns:\n" -msgstr "Präfixmuster einschließen:\n" - -#: ../svndumpfilter/svndumpfilter.c:1181 -#, c-format -msgid "Excluding (and dropping empty revisions for) prefixes:\n" -msgstr "Präfixe ausschließen (und leere Revisionen verwerfen):\n" - -#: ../svndumpfilter/svndumpfilter.c:1183 -#, c-format -msgid "Excluding prefixes:\n" -msgstr "Präfixe ausschließen:\n" - -#: ../svndumpfilter/svndumpfilter.c:1186 -#, c-format -msgid "Including (and dropping empty revisions for) prefixes:\n" -msgstr "Präfixe einschließen (und leere Revisionen verwerfen):\n" +"Gibt das Datum aus.\n" -#: ../svndumpfilter/svndumpfilter.c:1188 -#, c-format -msgid "Including prefixes:\n" -msgstr "Präfixe einschließen:\n" +#: ../svnlook/svnlook.c:234 +#, fuzzy +msgid "Print the paths that were changed.\n" +msgstr "" +"Aufruf: svnlook changed ARCHIV_PFAD\n" +"\n" +"Gibt die geänderten Pfade aus.\n" -#: ../svndumpfilter/svndumpfilter.c:1216 -#, c-format +#: ../svnlook/svnlook.c:239 +#, fuzzy msgid "" -"Dropped %d revision.\n" +"usage: svnlook date REPOS_PATH\n" "\n" -msgid_plural "" -"Dropped %d revisions.\n" +msgstr "" +"Aufruf: svnlook date ARCHIV_PFAD\n" "\n" -msgstr[0] "" -"%d Revision verworfen.\n" +"Gibt das Datum aus.\n" + +#: ../svnlook/svnlook.c:241 +msgid "Print the datestamp.\n" +msgstr "" + +#: ../svnlook/svnlook.c:246 +#, fuzzy +msgid "" +"usage: svnlook diff REPOS_PATH\n" "\n" -msgstr[1] "" -"%d Revisionen verworfen.\n" +msgstr "" +"Aufruf: svnlook date ARCHIV_PFAD\n" "\n" +"Gibt das Datum aus.\n" -#: ../svndumpfilter/svndumpfilter.c:1224 -msgid "Revisions renumbered as follows:\n" -msgstr "Revisionen folgendermaßen neu nummeriert:\n" - -#: ../svndumpfilter/svndumpfilter.c:1251 -#, c-format -msgid " %ld => (dropped)\n" -msgstr " %ld => (verworfen)\n" +#: ../svnlook/svnlook.c:248 +#, fuzzy +msgid "Print GNU-style diffs of changed files and properties.\n" +msgstr "" +"Aufruf: svnlook diff ARCHIV_PFAD\n" +"\n" +"Gibt Unterschiede von geänderten Dateien oder Eigenschaften im GNU-Stil aus.\n" -#: ../svndumpfilter/svndumpfilter.c:1266 -#, c-format -msgid "Dropped %d node:\n" -msgid_plural "Dropped %d nodes:\n" -msgstr[0] "%d Knoten verworfen:\n" -msgstr[1] "%d Knoten verworfen:\n" +#: ../svnlook/svnlook.c:255 +#, fuzzy +msgid "" +"usage: svnlook dirs-changed REPOS_PATH\n" +"\n" +msgstr "" +"Aufruf: svnlook date ARCHIV_PFAD\n" +"\n" +"Gibt das Datum aus.\n" -#: ../svndumpfilter/svndumpfilter.c:1424 -msgid "--drop-empty-revs cannot be used with --drop-all-empty-revs" -msgstr "--drop-empty-revs« kann nicht mit --drop-all-empty-revs verwendet werden" +#: ../svnlook/svnlook.c:257 +#, fuzzy +msgid "" +"Print the directories that were themselves changed (property edits)\n" +"or whose file children were changed.\n" +msgstr "" +"Aufruf: svnlook dirs-changed ARCHIV_PFAD\n" +"\n" +"Gibt diejenigen Pfade aus, die (durch Eigenschaftsmodifikationen) selbst\n" +"bzw. deren Dateien geändert wurden.\n" -#: ../svndumpfilter/svndumpfilter.c:1541 -#, c-format +#: ../svnlook/svnlook.c:263 msgid "" +"usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n" "\n" -"Error: no prefixes supplied.\n" msgstr "" + +#: ../svnlook/svnlook.c:265 +#, fuzzy +msgid "" +"Print the size (in bytes) of the file located at PATH_IN_REPOS as\n" +"it is represented in the repository.\n" +msgstr "" +"Aufruf: svnlook filesize ARCHIV_PFAD PFAD_IN_ARCHIV\n" "\n" -"Fehler: keine Präfixe angegeben.\n" +"Gibt die Größe (in Bytes) der in PFAD_IN_ARCHIV befindlichen Datei\n" +"aus, wie sie im Projektarchiv vorliegt.\n" -#: ../svndumpfilter/svndumpfilter.c:1572 -#, c-format +#: ../svnlook/svnlook.c:271 msgid "" -"Subcommand '%s' doesn't accept option '%s'\n" -"Type 'svndumpfilter help %s' for usage.\n" +"usage: svnlook help [SUBCOMMAND...]\n" +"\n" msgstr "" -"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n" -"Geben Sie »svndumpfilter help %s« für Hilfe ein.\n" -#: ../svndumpfilter/svndumpfilter.c:1590 -msgid "Try 'svndumpfilter help' for more info" -msgstr "Versuchen Sie »svndumpfilter help« für weitere Informationen" +#: ../svnlook/svnlook.c:278 +#, fuzzy +msgid "" +"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n" +"\n" +msgstr "" +"Aufruf: svnlook author ARCHIV_PFAD\n" +"\n" +"Gibt den Autor aus.\n" -#: ../svnfsfs/load-index-cmd.c:54 -#, c-format -msgid "Unknown item type '%s'" -msgstr "Unbekannter Elementtyp »%s«" +#: ../svnlook/svnlook.c:280 +#, fuzzy +msgid "" +"Print information about the history of a path in the repository (or\n" +"the root directory if no path is supplied).\n" +msgstr "" +"Aufruf: svnlook history ARCHIV_PFAD [PFAD_IN_PROJ]\n" +"\n" +"Gibt Informationen über die Historie eines Pfades im Projektarchiv aus (oder\n" +"über das Basisverzeichnis, falls kein Pfad angegeben wurde.)\n" -#: ../svnfsfs/load-index-cmd.c:73 -#, c-format -msgid "%i columns needed, %i provided" -msgstr "%i Spalten benötigt, %i gegeben" +#: ../svnlook/svnlook.c:286 +#, fuzzy +msgid "" +"usage: svnlook info REPOS_PATH\n" +"\n" +msgstr "" +"Aufruf: svnlook author ARCHIV_PFAD\n" +"\n" +"Gibt den Autor aus.\n" -#: ../svnfsfs/load-index-cmd.c:83 -#, c-format -msgid "%s is not a value HEX string" -msgstr "%s ist keine gültige HEX-Zeichenkette" +#: ../svnlook/svnlook.c:288 +#, fuzzy +msgid "Print the author, datestamp, log message size, and log message.\n" +msgstr "" +"Aufruf: svnlook info ARCHIV_PFAD\n" +"\n" +"Gibt den Autor, das Datum, die Größe der Logmeldung und die Logmeldung aus.\n" -#: ../svnfsfs/stats-cmd.c:70 -#, c-format +#: ../svnlook/svnlook.c:293 +#, fuzzy msgid "" -"%20s bytes in %12s reps\n" -"%20s bytes in %12s shared reps\n" -"%20s bytes expanded size\n" -"%20s bytes expanded shared size\n" -"%20s bytes with rep-sharing off\n" -"%20s shared references\n" +"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n" +"\n" msgstr "" -"%20s Byte in %12s Darstellungen\n" -"%20s Byte in %12s geteilten Darstellungen\n" -"%20s Byte erweiterte Größe\n" -"%20s Byte erweiterte geteilte Größe\n" -"%20s Byte mit deaktivierter Teilung von Darstellungen\n" -"%20s geteilte Referenzen\n" +"Aufruf: svnlook lock ARCHIV_PFAD PFAD_IN_PROJ\n" +"\n" +"Wenn eine Sperre für einen Pfad im Projektarchiv existiert, beschreibe diese.\n" -#: ../svnfsfs/stats-cmd.c:94 -#, c-format -msgid "%12s r%-8ld %s\n" -msgstr "%12s r%-8ld %s\n" +#: ../svnlook/svnlook.c:295 +#, fuzzy +msgid "If a lock exists on a path in the repository, describe it.\n" +msgstr "" +"Aufruf: svnlook lock ARCHIV_PFAD PFAD_IN_PROJ\n" +"\n" +"Wenn eine Sperre für einen Pfad im Projektarchiv existiert, beschreibe diese.\n" -#: ../svnfsfs/stats-cmd.c:120 -#, c-format -msgid " %4s .. < %-4s %19s (%2d%%) bytes in %12s (%2d%%) items\n" -msgstr " %4s .. < %-4s %19s (%2d%%) Byte in %12s (%2d%%) Elementen\n" +#: ../svnlook/svnlook.c:300 +#, fuzzy +msgid "" +"usage: svnlook log REPOS_PATH\n" +"\n" +msgstr "" +"Aufruf: svnlook log ARCHIV_PFAD\n" +"\n" +"Gibt die Logmeldung aus.\n" -#: ../svnfsfs/stats-cmd.c:239 ../svnfsfs/stats-cmd.c:246 -#, c-format -msgid "%11s %20s (%2d%%) representations\n" -msgstr "%11s %20s (%2d%%) Darstellungen\n" +#: ../svnlook/svnlook.c:302 +#, fuzzy +msgid "Print the log message.\n" +msgstr "gibt die Logmeldung nicht aus" -#: ../svnfsfs/stats-cmd.c:269 ../svnfsfs/stats-cmd.c:276 -#: ../svnfsfs/stats-cmd.c:299 ../svnfsfs/stats-cmd.c:306 -#, c-format -msgid "%11s %20s (%2d%%) bytes\n" -msgstr "%11s %20s (%2d%%) Byte\n" +#: ../svnlook/svnlook.c:307 +#, fuzzy +msgid "" +"usage: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n" +" 2. svnlook propget --revprop REPOS_PATH PROPNAME\n" +"\n" +msgstr "" +"Aufruf: 1. svnlook propget ARCHIV_PFAD PROPNAME PFAD_IN_PROJ\n" +" 2. svnlook propget --revprop ARCHIV_PFAD PROPNAME\n" +"\n" +"Gibt den Rohwert einer Eigenschaft eines Pfades im Projektarchiv aus.\n" +"Mit --revprop wird der Rohwert einer Revisionseigenschaft ausgegeben.\n" -#: ../svnfsfs/stats-cmd.c:347 -#, c-format +#: ../svnlook/svnlook.c:312 +#, fuzzy msgid "" -"%20s bytes in %12s revisions\n" -"%20s bytes in %12s changes\n" -"%20s bytes in %12s node revision records\n" -"%20s bytes in %12s representations\n" -"%20s bytes expanded representation size\n" -"%20s bytes with rep-sharing off\n" +"Print the raw value of a property on a path in the repository.\n" +"With --revprop, print the raw value of a revision property.\n" msgstr "" -"%20s Byte in %12s Revisionen\n" -"%20s Byte in %12s Änderungen\n" -"%20s Byte in %12s Knotenrevisionen\n" -"%20s Byte in %12s Darstellungen\n" -"%20s Byte erweiterte Darstellungsgröße\n" -"%20s Byte deaktivierter Teilung von Darstellungen\n" +"Aufruf: 1. svnlook propget ARCHIV_PFAD PROPNAME PFAD_IN_PROJ\n" +" 2. svnlook propget --revprop ARCHIV_PFAD PROPNAME\n" +"\n" +"Gibt den Rohwert einer Eigenschaft eines Pfades im Projektarchiv aus.\n" +"Mit --revprop wird der Rohwert einer Revisionseigenschaft ausgegeben.\n" -#: ../svnfsfs/stats-cmd.c:367 -#, c-format +#: ../svnlook/svnlook.c:318 +#, fuzzy msgid "" -"%20s bytes in %12s nodes total\n" -"%20s bytes in %12s directory noderevs\n" -"%20s bytes in %12s file noderevs\n" +"usage: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n" +" 2. svnlook proplist --revprop REPOS_PATH\n" +"\n" msgstr "" -"%20s Byte in %12s Knoten insgesamt\n" -"%20s Byte in %12s Knotenrevisionen von Verzeichnisen\n" -"%20s Byte in %12s Knotenrevisionen von Dateien\n" +"Aufruf: 1. svnlook proplist ARCHIV_PFAD PFAD_IN_PROJ\n" +" 2. svnlook proplist --revprop ARCHIV_PFAD\n" +"\n" +"Gibt die Eigenschaften eines Pfades im Projektarchiv aus.\n" +"Mit --revprop werden Revisionseigenschaften ausgegeben.\n" +"Mit -v werden auch die Eigenschaftswerte ausgegeben.\n" -#: ../svnfsfs/stats-cmd.c:378 -#, c-format +#: ../svnlook/svnlook.c:323 +#, fuzzy msgid "" -"%20s bytes in %12s representations total\n" -"%20s bytes in %12s directory representations\n" -"%20s bytes in %12s file representations\n" -"%20s bytes in %12s representations of added file nodes\n" -"%20s bytes in %12s directory property representations\n" -"%20s bytes in %12s file property representations\n" -"%20s bytes in header & footer overhead\n" +"List the properties of a path in the repository, or\n" +"with the --revprop option, revision properties.\n" +"With -v, show the property values too.\n" msgstr "" -"%20s Byte in %12s Darstellungen insgesamt\n" -"%20s Byte in %12s Darstellungen von Verzeichnissen\n" -"%20s Byte in %12s Darstellungen von Dateien\n" -"%20s Byte in %12s Darstellungen von hinzugefügten Dateiknoten\n" -"%20s Byte in %12s Darstellungen von Verzeichniseigenschaften\n" -"%20s Byte in %12s Darstellungen von Dateieigenschaften\n" -"%20s Byte in Kopf- und Fußdaten\n" +"Aufruf: 1. svnlook proplist ARCHIV_PFAD PFAD_IN_PROJ\n" +" 2. svnlook proplist --revprop ARCHIV_PFAD\n" +"\n" +"Gibt die Eigenschaften eines Pfades im Projektarchiv aus.\n" +"Mit --revprop werden Revisionseigenschaften ausgegeben.\n" +"Mit -v werden auch die Eigenschaftswerte ausgegeben.\n" -#: ../svnfsfs/svnfsfs.c:144 +#: ../svnlook/svnlook.c:331 +#, fuzzy msgid "" -"size of the extra in-memory cache in MB used to\n" -" minimize redundant operations. Default: 16." +"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n" +"\n" msgstr "" -"Größe des extra Zwischenspeichers im RAM in MB zur\n" -" Minimierung redundanter Operationen. Vorgabe: 16." +"Aufruf: svnlook author ARCHIV_PFAD\n" +"\n" +"Gibt den Autor aus.\n" -#: ../svnfsfs/svnfsfs.c:157 +#: ../svnlook/svnlook.c:333 +#, fuzzy msgid "" -"usage: svnfsfs help [SUBCOMMAND...]\n" -"\n" -"Describe the usage of this program or its subcommands.\n" +"Print the tree, starting at PATH_IN_REPOS (if supplied, at the root\n" +"of the tree otherwise), optionally showing node revision ids.\n" msgstr "" -"Aufruf: svnfsfs help [UNTERBEFEHL...]\n" +"Aufruf: svnlook tree ARCHIV_PFAD [PFAD_IN_PROJ]\n" "\n" -"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n" +"Gibt den Baum beginnend bei PFAD_IN_PROJ aus (falls angegeben, sonst an der\n" +"Basis des Baumes), wobei optional die IDs der Knotenrevisionen ausgegeben werden.\n" -#: ../svnfsfs/svnfsfs.c:162 +#: ../svnlook/svnlook.c:339 +#, fuzzy msgid "" -"usage: svnfsfs dump-index REPOS_PATH -r REV\n" -"\n" -"Dump the index contents for the revision / pack file containing revision REV\n" -"to console. This is only available for FSFS format 7 (SVN 1.9+) repositories.\n" -"The table produced contains a header in the first line followed by one line\n" -"per index entry, ordered by location in the revision / pack file. Columns:\n" -"\n" -" * Byte offset (hex) at which the item starts\n" -" * Length (hex) of the item in bytes\n" -" * Item type (string) is one of the following:\n" -"\n" -" none ... Unused section. File contents shall be NULs.\n" -" frep ... File representation.\n" -" drep ... Directory representation.\n" -" fprop .. File property.\n" -" dprop .. Directory property.\n" -" node ... Node revision.\n" -" chgs ... Changed paths list.\n" -" rep .... Representation of unknown type. Should not be used.\n" -" ??? .... Invalid. Index data is corrupt.\n" -"\n" -" The distinction between frep, drep, fprop and dprop is a mere internal\n" -" classification used for various optimizations and does not affect the\n" -" operational correctness.\n" +"usage: svnlook uuid REPOS_PATH\n" "\n" -" * Revision that the item belongs to (decimal)\n" -" * Item number (decimal) within that revision\n" -" * Modified FNV1a checksum (8 hex digits)\n" msgstr "" -"Aufruf: svnfsfs dump-index ARCHIV_PFAD -r REV\n" -"\n" -"Gibt den Inhalt des Index der Revisions- oder Pack-Datei der Revision REV\n" -"auf die Konsole aus. Nur verfügbar für Projektarchive im FSFS Format 7\n" -"(SVN 1.9+). Die ausgegebene Tabelle beinhaltet Kopfdaten in der ersten Zeile\n" -"gefolgt von einer Zeile je Indexeintrag, geordnet nach Position in der\n" -"Revisions- / Pack-Datei. Spalten:\n" -"\n" -" * Offset an dem das Element beginnt in Byte (hexadezimal)\n" -" * Länge des Elements in Byte (hexadezimal)\n" -" * Typ des Elements (Text), und zwar einen der Folgenden:\n" -"\n" -" none ... Nicht verwendeter Abschnitt. Dateninhalt sind NUL-Byte.\n" -" frep ... Darstellung einer Datei.\n" -" drep ... Darstellung eines Verzeichnisse.\n" -" fprop .. Eigenschaft einer Datei.\n" -" dprop .. Eigenschaft eines Verzeichnisses.\n" -" node ... Knotenrevision.\n" -" chgs ... Liste geänderter Pfade.\n" -" rep .... Darstellung unbekannten Typs. Sollte nicht verwendet werden.\n" -" ??? .... Ungültig. Indexdaten sind beschädigt.\n" +"Aufruf: svnlook author ARCHIV_PFAD\n" "\n" -" Die Unterscheidung zwischen frep, drep, fprop und dprop ist eine rein\n" -" interne Einordnung für verschiedene Optimierungen und betrifft nicht die\n" -" Korrektheit im normalen Betrieb.\n" +"Gibt den Autor aus.\n" + +#: ../svnlook/svnlook.c:341 +#, fuzzy +msgid "Print the repository's UUID.\n" +msgstr "" +"Aufruf: svnlook uuid ARCHIV_PFAD\n" "\n" -" * Revision zu dem das Element gehört (dezimal)\n" -" * Nummer des Elements in dieser Revision (dezimal)\n" -" * Modifizierte FNV1a-Prüfsumme (8 hexadezimale Stellen)\n" +"Gibt die UUID des Projektarchivs aus.\n" -#: ../svnfsfs/svnfsfs.c:188 +#: ../svnlook/svnlook.c:346 +#, fuzzy msgid "" -"usage: svnfsfs load-index REPOS_PATH\n" +"usage: svnlook youngest REPOS_PATH\n" "\n" -"Read index contents from console. The format is the same as produced by the\n" -"dump-index command, except that checksum as well as header are optional and will\n" -"be ignored. The data must cover the full revision / pack file; the revision\n" -"number is automatically extracted from input stream. No ordering is required.\n" msgstr "" -"Aufruf: svnfsfs load-index ARCHIV_PFAD\n" +"Aufruf: svnlook author ARCHIV_PFAD\n" "\n" -"Liest den Inhalt des Index von der Konsole. Das Format entspricht der Ausgabe\n" -"des Kommandos dump-index, außer dass die Prüfsummen und Kopfdaten optional sind\n" -"und ignoriert werden. Die Daten müssen die vollständige Revisisions- oder Pack-\n" -"datei abdecken; die Revisionsnummer wird automatisch aus dem Eingabestrom\n" -"extrahiert. Keine besondere Reihenfolge erforderlich.\n" +"Gibt den Autor aus.\n" -#: ../svnfsfs/svnfsfs.c:196 -msgid "" -"usage: svnfsfs stats REPOS_PATH\n" -"\n" -"Write object size statistics to console.\n" +#: ../svnlook/svnlook.c:348 +#, fuzzy +msgid "Print the youngest revision number.\n" msgstr "" -"Aufruf: svnfsfs stats ARCHIV_PFAD\n" +"Aufruf: svnlook youngest ARCHIV_PFAD\n" "\n" -"Gibt Statistiken zu Objektgrößen aus.\n" +"Gibt die neueste Revisionsnummer aus.\n" -#: ../svnfsfs/svnfsfs.c:216 +#: ../svnlook/svnlook.c:824 #, c-format -msgid "%s repositories are not supported" -msgstr "Projektarchive vom Typ %s werden nicht unterstützt" +msgid "%sProperty changes on: %s%s" +msgstr "%sEigenschaftsänderungen: %s%s" + +#: ../svnlook/svnlook.c:891 +#, c-format +msgid "Copied: %s (from rev %ld, %s)\n" +msgstr "Kopiert: %s (von Rev %ld, %s)\n" + +#: ../svnlook/svnlook.c:959 +msgid "Added" +msgstr "Hinzugefügt" + +#: ../svnlook/svnlook.c:960 +msgid "Deleted" +msgstr "Gelöscht" + +#: ../svnlook/svnlook.c:961 +msgid "Modified" +msgstr "Geändert" + +#: ../svnlook/svnlook.c:962 +msgid "Index" +msgstr "Index" -#: ../svnfsfs/svnfsfs.c:232 +#: ../svnlook/svnlook.c:973 msgid "" -"general usage: svnfsfs SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" -"Subversion FSFS repository manipulation tool.\n" -"Type 'svnfsfs help ' for help on a specific subcommand.\n" -"Type 'svnfsfs --version' to see the program version.\n" +"(Binary files differ)\n" "\n" -"Available subcommands:\n" msgstr "" -"Aufruf: svnfsfs UNTERBEFEHL ARCHIV_PFAD [Optionen & Parameter ...]\n" -"Werkzeug zur Manipulation von FSFS-Projektarchiven\n" -"Geben Sie »svnfsfs help « ein, um Hilfe zu einem Unterbefehl\n" -" zu erhalten.\n" -"Geben Sie »svnfsfs --version« ein, um die Programmversion und die Datei-\n" -" systemmodule zu sehen.\n" +"(Binärdateien sind unterschiedlich)\n" "\n" -"Verfügbare Unterbefehle:\n" -#: ../svnfsfs/svnfsfs.c:459 +#: ../svnlook/svnlook.c:1242 +msgid "unknown" +msgstr "unbekannt" + +#: ../svnlook/svnlook.c:1299 #, c-format -msgid "" -"Subcommand '%s' doesn't accept option '%s'\n" -"Type 'svnfsfs help %s' for usage.\n" -msgstr "" -"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n" -"Geben Sie »svnfsfs help %s« für Hilfe ein.\n" +msgid "Transaction '%s' is not based on a revision; how odd" +msgstr "Transaktion »%s« ist nicht von einer Revision abgeleitet, wie eigenartig" -#: ../svnfsfs/svnfsfs.c:503 -msgid "Try 'svnfsfs help' for more info" -msgstr "Versuchen Sie »svnfsfs help« für weitere Informationen" +#: ../svnlook/svnlook.c:1442 +#, c-format +msgid "'%s' is a URL, probably should be a path" +msgstr "»%s« ist eine URL, sollte vermutlich ein Pfad sein" -#: ../svnlook/svnlook.c:118 -msgid "show details for copies" -msgstr "Zeige Details für Kopien" +#: ../svnlook/svnlook.c:1465 ../svnlook/svnlook.c:1488 +#, c-format +msgid "Path '%s' is not a file" +msgstr "Pfad »%s« ist keine Datei" -#: ../svnlook/svnlook.c:121 -msgid "print differences against the copy source" -msgstr "Gibt Unterschiede gegenüber der Quelle der Kopie aus" +#: ../svnlook/svnlook.c:1622 +msgid "History item limit reached" +msgstr "Beschränkung für Anzahl der Verlaufselemente erreicht" -#: ../svnlook/svnlook.c:124 -msgid "show full paths instead of indenting them" -msgstr "Zeige vollständige Pfade anstatt sie einzurücken" +#: ../svnlook/svnlook.c:1641 +#, c-format +msgid "" +"REVISION PATH \n" +"-------- ---------\n" +msgstr "" +"REVISION PFAD \n" +"-------- ---------\n" -#: ../svnlook/svnlook.c:130 -msgid "maximum number of history entries" -msgstr "Maximale Anzahl von Logeinträgen" +#: ../svnlook/svnlook.c:1646 +#, c-format +msgid "" +"REVISION PATH\n" +"-------- ----\n" +msgstr "" +"REVISION PFAD\n" +"-------- ----\n" -#: ../svnlook/svnlook.c:151 -msgid "operate on single directory only" -msgstr "Nicht rekursiv hinabsteigen" +#: ../svnlook/svnlook.c:1719 +#, c-format +msgid "Property '%s' not found on revision %ld" +msgstr "Eigenschaft »%s« wurde in Revision %ld nicht gefunden" -#: ../svnlook/svnlook.c:154 -msgid "specify revision number ARG" -msgstr "Revisionsnummer PAR angegeben" +#: ../svnlook/svnlook.c:1723 +#, c-format +msgid "Property '%s' not found on transaction %s" +msgstr "Eigenschaft »%s« wurde in Transaktion %s nicht gefunden" -#: ../svnlook/svnlook.c:157 -msgid "operate on a revision property (use with -r or -t)" -msgstr "" -"auf einer Revisionseigenschaft arbeiten (mit -r\n" -" oder -t verwenden)" +#: ../svnlook/svnlook.c:1732 +#, c-format +msgid "Property '%s' not found on path '%s' or inherited from a parent in revision %ld" +msgstr "Eigenschaft »%s« wurde im Pfad »%s« in Revision %ld nicht gefunden und nicht vom übergeordneten Element geerbt" -#: ../svnlook/svnlook.c:160 -msgid "show node revision ids for each path" -msgstr "gibt die IDs der Knotenrevisionen jedes Pfades aus" +#: ../svnlook/svnlook.c:1738 +#, c-format +msgid "Property '%s' not found on path '%s' in revision %ld" +msgstr "Eigenschaft »%s« wurde im Pfad »%s« in Revision %ld nicht gefunden" -#: ../svnlook/svnlook.c:163 -msgid "show path's inherited properties" -msgstr "Gibt die geerbten Eigenschaften des Pfades aus" +#: ../svnlook/svnlook.c:1746 +#, c-format +msgid "Property '%s' not found on path '%s' or inherited from a parent in transaction %s" +msgstr "Eigenschaft »%s« wurde im Pfad »%s« in Transaktion %s nicht gefunden und nicht vom übergeordneten Element geerbt" -#: ../svnlook/svnlook.c:169 -msgid "be verbose" -msgstr "ausführliche Meldungen" +#: ../svnlook/svnlook.c:1752 +#, c-format +msgid "Property '%s' not found on path '%s' in transaction %s" +msgstr "Eigenschaft »%s« wurde im Pfad »%s« in Transaktion %s nicht gefunden" + +#: ../svnlook/svnlook.c:2089 +msgid "Missing repository path argument" +msgstr "Fehlende Option für Pfad des Projektarchivs" -#: ../svnlook/svnlook.c:178 +#: ../svnlook/svnlook.c:2241 msgid "" -"Specify differencing options for external diff or\n" -" internal diff. Default: '-u'. Options are\n" -" separated by spaces. Internal diff takes:\n" -" -u, --unified: Show 3 lines of unified context\n" -" -b, --ignore-space-change: Ignore changes in\n" -" amount of white space\n" -" -w, --ignore-all-space: Ignore all white space\n" -" --ignore-eol-style: Ignore changes in EOL style\n" -" -U ARG, --context ARG: Show ARG lines of context\n" -" -p, --show-c-function: Show C function name" +"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" +"Subversion repository inspection tool.\n" +"Type 'svnlook help ' for help on a specific subcommand.\n" +"Type 'svnlook --version' to see the program version and FS modules.\n" +"Note: any subcommand which takes the '--revision' and '--transaction'\n" +" options will, if invoked without one of those options, act on\n" +" the repository's youngest revision.\n" +"\n" +"Available subcommands:\n" msgstr "" -"Gibt Optionen für ein externes Vergleichsprogramm oder die interne\n" -" Vergleichsfunktion an. Vorgabe ist »-u«. Optionen sind\n" -" durch Leerzeichen zu trennen. aber sein internes Vergleichsprogramm benutzt\n" -" oder Annotierungen anzeigt, kann PAR einen der\n" -" folgenden Werte annehmen:\n" -" -u (--unified):\n" -" Gibt 3 Zeilen Standardkontext aus.\n" -" -b (--ignore-space-change):\n" -" Ignoriert Änderungen in der Anzahl von\n" -" Leerzeichen.\n" -" -w (--ignore-all-space):\n" -" Ignoriert sämtliche Leerzeichen.\n" -" --ignore-eol-style:\n" -" Ignoriert Änderungen im Zeilenendestil.\n" -" -U PAR, --context PAR: Gibt PAR Zeilen Kontext aus.\n" -" -p (--show-c-function):\n" -" Zeigt C-Funktionsname in Diff-Ausgabe." +"Aufruf: svnlook UNTERBEFEHL ARCHIV_PFAD [Optionen & Parameter ...]\n" +"Werkzeug zur Inspektion von Projektarchiven.\n" +"Geben Sie »svnlook help « ein, um Hilfe zu einem Unterbefehl\n" +" zu erhalten.\n" +"Geben Sie »svnlook --version« ein, um die Programmversion und die verfügbaren\n" +" Dateisystemmodule anzuzeigen.\n" +"Hinweis: Alle Unterbefehle, die die Parameter »--revision« und »--transaction«\n" +" akzeptieren, werden ohne diese Parameter die neueste\n" +" Revision des Projektarchivs verwenden.\n" +"\n" +"Verfügbare Unterbefehle:\n" + +#: ../svnlook/svnlook.c:2320 +#, c-format +msgid "" +"Comment (%i line):\n" +"%s\n" +msgid_plural "" +"Comment (%i lines):\n" +"%s\n" +msgstr[0] "" +"Kommentar (%i Zeile):\n" +"%s\n" +msgstr[1] "" +"Kommentar (%i Zeilen):\n" +"%s\n" + +#: ../svnlook/svnlook.c:2372 +#, c-format +msgid "Missing propname argument" +msgstr "Fehlender PROPNAME Parameter" + +#: ../svnlook/svnlook.c:2373 +#, c-format +msgid "Missing propname and repository path arguments" +msgstr "Eigenschaftsname und Pfad im Projektarchiv nicht angegeben" -#: ../svnlook/svnlook.c:199 ../svnrdump/svnrdump.c:134 -#: ../svnserve/svnserve.c:380 ../svnversion/svnversion.c:146 -msgid "no progress (only errors) to stderr" -msgstr "keine Fortschrittsanzeige (nur Fehler) auf die Standardfehlerausgabe" +#: ../svnlook/svnlook.c:2379 +msgid "Missing propname or repository path argument" +msgstr "Eigenschaftsname oder Pfad im Projektarchiv nicht angegeben" -#: ../svnlook/svnlook.c:211 -msgid "" -"usage: svnlook author REPOS_PATH\n" -"\n" -"Print the author.\n" -msgstr "" -"Aufruf: svnlook author ARCHIV_PFAD\n" -"\n" -"Gibt den Autor aus.\n" +#: ../svnlook/svnlook.c:2533 +msgid "Invalid revision number supplied" +msgstr "Ungültige Revisionsnummer angegeben" -#: ../svnlook/svnlook.c:216 -msgid "" -"usage: svnlook cat REPOS_PATH FILE_PATH\n" -"\n" -"Print the contents of a file. Leading '/' on FILE_PATH is optional.\n" +#: ../svnlook/svnlook.c:2656 +msgid "The '--transaction' (-t) and '--revision' (-r) arguments cannot co-exist" msgstr "" -"Aufruf: svnlook cat ARCHIV_PFAD DATEI_PFAD\n" -"\n" -"Gibt den Inhalt einer Datei aus. Ein vorangestellter »/« im DATEI_PFAD ist\n" -"optional.\n" +"Die Parameter »--transaction« (-t) und »--revision« (-r) können nicht\n" +"gleichzeitig angegeben werden" -#: ../svnlook/svnlook.c:221 -msgid "" -"usage: svnlook changed REPOS_PATH\n" -"\n" -"Print the paths that were changed.\n" -msgstr "" -"Aufruf: svnlook changed ARCHIV_PFAD\n" -"\n" -"Gibt die geänderten Pfade aus.\n" +#: ../svnlook/svnlook.c:2663 +msgid "Cannot use the '--show-inherited-props' option with the '--revprop' option" +msgstr "Die Option »--show-inherited-props« kann nicht zusammen mit der Option »--revprop« verwendet werden" -#: ../svnlook/svnlook.c:226 -msgid "" -"usage: svnlook date REPOS_PATH\n" -"\n" -"Print the datestamp.\n" -msgstr "" -"Aufruf: svnlook date ARCHIV_PFAD\n" -"\n" -"Gibt das Datum aus.\n" +#: ../svnlook/svnlook.c:2720 +#, c-format +msgid "Try 'svnadmin verify' instead.\n" +msgstr "Versuchen Sie stattdessen »svnadmin verify«.\n" -#: ../svnlook/svnlook.c:231 -msgid "" -"usage: svnlook diff REPOS_PATH\n" -"\n" -"Print GNU-style diffs of changed files and properties.\n" -msgstr "" -"Aufruf: svnlook diff ARCHIV_PFAD\n" -"\n" -"Gibt Unterschiede von geänderten Dateien oder Eigenschaften im GNU-Stil aus.\n" +#: ../svnlook/svnlook.c:2753 +#, c-format +msgid "Repository argument required\n" +msgstr "Projektarchiv Parameter erforderlich\n" -#: ../svnlook/svnlook.c:238 -msgid "" -"usage: svnlook dirs-changed REPOS_PATH\n" -"\n" -"Print the directories that were themselves changed (property edits)\n" -"or whose file children were changed.\n" -msgstr "" -"Aufruf: svnlook dirs-changed ARCHIV_PFAD\n" -"\n" -"Gibt diejenigen Pfade aus, die (durch Eigenschaftsmodifikationen) selbst\n" -"bzw. deren Dateien geändert wurden.\n" +#: ../svnlook/svnlook.c:2762 +#, c-format +msgid "'%s' is a URL when it should be a path\n" +msgstr "»%s« ist eine URL obwohl es ein Pfad sein sollte\n" -#: ../svnlook/svnlook.c:244 +#: ../svnlook/svnlook.c:2812 +#, c-format msgid "" -"usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n" -"\n" -"Print the size (in bytes) of the file located at PATH_IN_REPOS as\n" -"it is represented in the repository.\n" +"Subcommand '%s' doesn't accept option '%s'\n" +"Type 'svnlook help %s' for usage.\n" msgstr "" -"Aufruf: svnlook filesize ARCHIV_PFAD PFAD_IN_ARCHIV\n" -"\n" -"Gibt die Größe (in Bytes) der in PFAD_IN_ARCHIV befindlichen Datei\n" -"aus, wie sie im Projektarchiv vorliegt.\n" +"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n" +"Geben Sie »svnlook help %s« ein, um Hilfe zu erhalten.\n" -#: ../svnlook/svnlook.c:250 -msgid "" -"usage: svnlook help [SUBCOMMAND...]\n" -"\n" -"Describe the usage of this program or its subcommands.\n" -msgstr "" -"Aufruf: svnlook help [UNTERBEFEHL...]\n" -"\n" -"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n" +#: ../svnlook/svnlook.c:2843 +msgid "Try 'svnlook help' for more info" +msgstr "Versuchen Sie »svnlook help« für weitere Informationen" -#: ../svnlook/svnlook.c:255 -msgid "" -"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n" -"\n" -"Print information about the history of a path in the repository (or\n" -"the root directory if no path is supplied).\n" -msgstr "" -"Aufruf: svnlook history ARCHIV_PFAD [PFAD_IN_PROJ]\n" -"\n" -"Gibt Informationen über die Historie eines Pfades im Projektarchiv aus (oder\n" -"über das Basisverzeichnis, falls kein Pfad angegeben wurde.)\n" +#: ../svnmucc/svnmucc.c:268 +#, c-format +msgid "Type 'svnmucc --help' for usage.\n" +msgstr "Geben Sie »svnmucc --help« für weitere Hilfe ein.\n" -#: ../svnlook/svnlook.c:261 +#: ../svnmucc/svnmucc.c:276 +#, fuzzy msgid "" -"usage: svnlook info REPOS_PATH\n" +"usage: svnmucc ACTION...\n" +"Subversion multiple URL command client.\n" +"Type 'svnmucc --version' to see the program version and RA modules.\n" "\n" -"Print the author, datestamp, log message size, and log message.\n" -msgstr "" -"Aufruf: svnlook info ARCHIV_PFAD\n" +" Perform one or more Subversion repository URL-based ACTIONs, committing\n" +" the result as a (single) new revision.\n" "\n" -"Gibt den Autor, das Datum, die Größe der Logmeldung und die Logmeldung aus.\n" - -#: ../svnlook/svnlook.c:266 -msgid "" -"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n" +"Actions:\n" +" cp REV SRC-URL DST-URL : copy SRC-URL@REV to DST-URL\n" +" mkdir URL : create new directory URL\n" +" mv SRC-URL DST-URL : move SRC-URL to DST-URL\n" +" rm URL : delete URL\n" +" put SRC-FILE URL : add or modify file URL with contents copied from\n" +" SRC-FILE (use \"-\" to read from standard input)\n" +" propset NAME VALUE URL : set property NAME on URL to VALUE\n" +" propsetf NAME FILE URL : set property NAME on URL to value read from FILE\n" +" propdel NAME URL : delete property NAME from URL\n" "\n" -"If a lock exists on a path in the repository, describe it.\n" +"Valid options:\n" +" -h, -? [--help] : display this text\n" +" -m [--message] ARG : use ARG as a log message\n" +" -F [--file] ARG : read log message from file ARG\n" +" -u [--username] ARG : commit the changes as username ARG\n" +" -p [--password] ARG : use ARG as the password\n" +" --password-from-stdin : read password from stdin\n" +" -U [--root-url] ARG : interpret all action URLs relative to ARG\n" +" -r [--revision] ARG : use revision ARG as baseline for changes\n" +" --with-revprop ARG : set revision property in the following format:\n" +" NAME[=VALUE]\n" +" --non-interactive : do no interactive prompting (default is to\n" +" prompt only if standard input is a terminal)\n" +" --force-interactive : do interactive prompting even if standard\n" +" input is not a terminal\n" +" --trust-server-cert : deprecated;\n" +" same as --trust-server-cert-failures=unknown-ca\n" +" --trust-server-cert-failures ARG\n" +" with --non-interactive, accept SSL server\n" +" certificates with failures; ARG is comma-separated\n" +" list of 'unknown-ca' (Unknown Authority),\n" +" 'cn-mismatch' (Hostname mismatch), 'expired'\n" +" (Expired certificate),'not-yet-valid' (Not yet\n" +" valid certificate) and 'other' (all other not\n" +" separately classified certificate errors).\n" +" -X [--extra-args] ARG : append arguments from file ARG (one per line;\n" +" use \"-\" to read from standard input)\n" +" --config-dir ARG : use ARG to override the config directory\n" +" --config-option ARG : use ARG to override a configuration option\n" +" --no-auth-cache : do not cache authentication tokens\n" +" --version : print version information\n" msgstr "" -"Aufruf: svnlook lock ARCHIV_PFAD PFAD_IN_PROJ\n" +"Aufruf: svnmucc AKTION...\n" +"Subversion Multi-URL-Kommando Client\n" +"Geben Sie »svnmucc --version« ein, um die Programmversion und die\n" +"Zugriffsmodule zu sehen.\n" "\n" -"Wenn eine Sperre für einen Pfad im Projektarchiv existiert, beschreibe diese.\n" - -#: ../svnlook/svnlook.c:271 -msgid "" -"usage: svnlook log REPOS_PATH\n" +" Führt eine oder mehrere AKTIONen auf URLs von Subversion Projektarchiven aus,\n" +" mit Übertragung des Ergebnisses als eine neue Revision.\n" "\n" -"Print the log message.\n" -msgstr "" -"Aufruf: svnlook log ARCHIV_PFAD\n" +"Aktionen:\n" +" cp REV QUELL-URL ZIEL-URL : kopiert QUELL-URL@REV nach ZIEL-URL\n" +" mkdir URL : erzeugt neues Verzeichnis URL\n" +" mv QUELL-URL ZIEL-URL : verschiebt QUELL-URL nach ZIEL-URL\n" +" rm URL : löscht URL\n" +" put QUELL-DATEI URL : legt Inhalt von QUELL-DATEI in URL ab, ggf. als Hinzufügung\n" +" (Die Angabe von \"-\" liest Inhalt aus der Standardeingabe)\n" +" propset NAME WERT URL : setzt Eigenschaft NAME der URL auf WERT\n" +" propsetf NAME DATEI URL : setzt Eigenschaft NAME der URL, liest Wert aus DATEI\n" +" propdel NAME URL : löscht Eigenschaft NAME von URL\n" "\n" -"Gibt die Logmeldung aus.\n" +"Gültige Optionen:\n" +" -h, -? [--help] : zeigt diesen Text an\n" +" -m [--message] PAR : verwendet PAR als Logmeldung\n" +" -F [--file] PAR : liest Logmeldung aus Datei PAR\n" +" -u [--username] PAR : überträgt Änderungen mit Benutzername PAR\n" +" -p [--password] PAR : verwendet PAR als Kennwort\n" +" -U [--root-url] PAR : interpretiert alle URLs für Aktionen relativ zu PAR\n" +" -r [--revision] PAR : verwendet Revision PAR als Basis für Änderungen\n" +" --with-revprop PAR : setzt Revisionseigenschaft im folgenden Format:\n" +" NAME[=WERT]\n" +" --non-interactive : unterdrückt interaktive Nachfragen (Vorgabe ist nur\n" +" nachfragen, wenn Standardeingabe ein Terminal ist)\n" +" --trust-server-cert : veraltet; identisch mit --trust-unknown-ca\n" +" --trust-unknown-ca : mit --non-interactive, akzeptiert SSL Server-\n" +" Zertifikate von unbekannten Zertifizierungsstellen\n" +" --trust-cn-mismatch : mit --non-interactive, akzeptiert SSL Server-\n" +" Zertifikate auch falls der Hostname nicht mit dem\n" +" Common Name Attribut im Zertifikat übereinstimmt\n" +" --trust-expired : mit --non-interactive, akzeptiert SSL Server-\n" +" Zertifikate die abgelaufen sind\n" +" --trust-not-yet-valid : mit --non-interactive, akzeptiert SSL Server-\n" +" Zertifikate die noch nicht gültig sind\n" +" --trust-other-failure : mit --non-interactive, akzeptiert SSL server-\n" +" Zertifikate mit anderen als den vorherigen Fehlern\n" +" -X [--extra-args] PAR : liest weitere Arguments aus Datei PAR (zeilenweise;\n" +" : Die Angabe von \"-\" liest von der Standardeingabe)\n" +" --config-dir PAR : verwendet ARG als Konfigurationsverzeichnis\n" +" --config-option PAR : verwendet ARG als Konfigurationsoption\n" +" --no-auth-cache : speichert Anmeldeinformationen nicht zwischen\n" +" --version : gibt Versionsinformationen aus\n" -#: ../svnlook/svnlook.c:276 -msgid "" -"usage: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n" -" 2. svnlook propget --revprop REPOS_PATH PROPNAME\n" -"\n" -"Print the raw value of a property on a path in the repository.\n" -"With --revprop, print the raw value of a revision property.\n" +#: ../svnmucc/svnmucc.c:358 +msgid "--message (-m), --file (-F), and --with-revprop=svn:log are mutually exclusive" +msgstr "--message (-m), --file (-F), und --with-revprop=svn:log schließen sich gegenseitig aus" + +#: ../svnmucc/svnmucc.c:600 +#, c-format +msgid "Invalid revision number '%s'" +msgstr "Ungültige Revisionsnummer »%s«" + +#: ../svnrdump/load_editor.c:230 ../svnsync/svnsync.c:358 +#, c-format +msgid "Failed to get lock on destination repos, currently held by '%s'\n" msgstr "" -"Aufruf: 1. svnlook propget ARCHIV_PFAD PROPNAME PFAD_IN_PROJ\n" -" 2. svnlook propget --revprop ARCHIV_PFAD PROPNAME\n" -"\n" -"Gibt den Rohwert einer Eigenschaft eines Pfades im Projektarchiv aus.\n" -"Mit --revprop wird der Rohwert einer Revisionseigenschaft ausgegeben.\n" +"Konnte Sperre für Zielprojektarchiv nicht erhalten, die zurzeit von\n" +"»%s« gehalten wird\n" -#: ../svnlook/svnlook.c:285 +#: ../svnrdump/load_editor.c:374 +msgid "Target server does not support atomic revision property edits; consider upgrading it to 1.7." +msgstr "Zielserver unterstützt keine atomaren Änderungen von Revisionseigenschaften; Verwenden Sie dort 1.7" + +#: ../svnrdump/svnrdump.c:87 msgid "" -"usage: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n" -" 2. svnlook proplist --revprop REPOS_PATH\n" +"usage: svnrdump dump URL [-r LOWER[:UPPER]]\n" "\n" -"List the properties of a path in the repository, or\n" -"with the --revprop option, revision properties.\n" -"With -v, show the property values too.\n" msgstr "" -"Aufruf: 1. svnlook proplist ARCHIV_PFAD PFAD_IN_PROJ\n" -" 2. svnlook proplist --revprop ARCHIV_PFAD\n" -"\n" -"Gibt die Eigenschaften eines Pfades im Projektarchiv aus.\n" -"Mit --revprop werden Revisionseigenschaften ausgegeben.\n" -"Mit -v werden auch die Eigenschaftswerte ausgegeben.\n" -#: ../svnlook/svnlook.c:296 +#: ../svnrdump/svnrdump.c:89 +#, fuzzy msgid "" -"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n" -"\n" -"Print the tree, starting at PATH_IN_REPOS (if supplied, at the root\n" -"of the tree otherwise), optionally showing node revision ids.\n" +"Dump revisions LOWER to UPPER of repository at remote URL to stdout\n" +"in a 'dumpfile' portable format. If only LOWER is given, dump that\n" +"one revision.\n" msgstr "" -"Aufruf: svnlook tree ARCHIV_PFAD [PFAD_IN_PROJ]\n" +"Aufruf: svnrdump dump URL [-r VON[:BIS]]\n" "\n" -"Gibt den Baum beginnend bei PFAD_IN_PROJ aus (falls angegeben, sonst an der\n" -"Basis des Baumes), wobei optional die IDs der Knotenrevisionen ausgegeben werden.\n" +"Gibt einen Abzug der Revisionen VON:BIS eines Projektarchivs an der entfernten URL\n" +"in einem portablen »Dump«-Format auf die Standardausgabe aus. Falls nur VON\n" +" angegeben wurde, wird nur diese Revision ausgegeben.\n" -#: ../svnlook/svnlook.c:302 +#: ../svnrdump/svnrdump.c:95 msgid "" -"usage: svnlook uuid REPOS_PATH\n" +"usage: svnrdump load URL\n" "\n" -"Print the repository's UUID.\n" msgstr "" -"Aufruf: svnlook uuid ARCHIV_PFAD\n" + +#: ../svnrdump/svnrdump.c:97 +#, fuzzy +msgid "Load a 'dumpfile' given on stdin to a repository at remote URL.\n" +msgstr "" +"Aufruf: svnrdump load URL\n" "\n" -"Gibt die UUID des Projektarchivs aus.\n" +"Liest einen Datenstrom im »Dump«-Format von der Standardeingabe in ein Projektarchive an entfertner URL.\n" -#: ../svnlook/svnlook.c:307 +#: ../svnrdump/svnrdump.c:101 msgid "" -"usage: svnlook youngest REPOS_PATH\n" +"usage: svnrdump help [SUBCOMMAND...]\n" "\n" -"Print the youngest revision number.\n" msgstr "" -"Aufruf: svnlook youngest ARCHIV_PFAD\n" -"\n" -"Gibt die neueste Revisionsnummer aus.\n" - -#: ../svnlook/svnlook.c:870 -#, c-format -msgid "Copied: %s (from rev %ld, %s)\n" -msgstr "Kopiert: %s (von Rev %ld, %s)\n" -#: ../svnlook/svnlook.c:938 -msgid "Added" -msgstr "Hinzugefügt" +#: ../svnrdump/svnrdump.c:116 +msgid "dump incrementally" +msgstr "Inkrementell ausgeben" -#: ../svnlook/svnlook.c:939 -msgid "Deleted" -msgstr "Gelöscht" +#: ../svnrdump/svnrdump.c:118 +msgid "skip revision property ARG (e.g., \"svn:author\")" +msgstr "Revisionseigenschaft PAR überspringen (z.B. »svn:author«)" -#: ../svnlook/svnlook.c:940 -msgid "Modified" -msgstr "Geändert" +#: ../svnrdump/svnrdump.c:138 ../svnserve/svnserve.c:413 +#: ../svnversion/svnversion.c:142 +msgid "display this help" +msgstr "Hilfe anzeigen" -#: ../svnlook/svnlook.c:941 -msgid "Index" -msgstr "Index" +#: ../svnrdump/svnrdump.c:167 +msgid "Read or write to a dumpfile instead of stdin/stdout" +msgstr "" -#: ../svnlook/svnlook.c:952 +#: ../svnrdump/svnrdump.c:673 msgid "" -"(Binary files differ)\n" +"general usage: svnrdump SUBCOMMAND URL [-r LOWER[:UPPER]]\n" +"Subversion remote repository dump and load tool.\n" +"Type 'svnrdump help ' for help on a specific subcommand.\n" +"Type 'svnrdump --version' to see the program version and RA modules.\n" "\n" +"Available subcommands:\n" msgstr "" -"(Binärdateien sind unterschiedlich)\n" +"Aufruf: svnrdump UNTERBEFEHL URL [-r VON[:BIS]]\n" +"Werkzeug zum Ausgeben und Laden von Projektarchiven über das Netzwerk.\n" +"Geben Sie »svnrdump help « ein, um Hilfe zu einem\n" +"Unterbefehl zu erhalten.\n" +"Geben Sie »svnrdump --version« ein, um die Programmversion und die\n" +"Zugriffsmodule zu sehen.\n" "\n" +"Verfügbare Unterbefehle:\n" -#: ../svnlook/svnlook.c:1232 -msgid "unknown" -msgstr "unbekannt" - -#: ../svnlook/svnlook.c:1289 -#, c-format -msgid "Transaction '%s' is not based on a revision; how odd" -msgstr "Transaktion »%s« ist nicht von einer Revision abgeleitet, wie eigenartig" - -#: ../svnlook/svnlook.c:1432 -#, c-format -msgid "'%s' is a URL, probably should be a path" -msgstr "»%s« ist eine URL, sollte vermutlich ein Pfad sein" +#: ../svnrdump/svnrdump.c:718 ../svnrdump/svnrdump.c:752 +msgid "Unsupported revision specifier used; use only integer values or 'HEAD'" +msgstr "Nicht unterstützte Angabe für Revision; verwenden Sie nur ganze Zahlen oder »HEAD«" -#: ../svnlook/svnlook.c:1455 ../svnlook/svnlook.c:1478 +#: ../svnrdump/svnrdump.c:726 ../svnrdump/svnrdump.c:760 #, c-format -msgid "Path '%s' is not a file" -msgstr "Pfad »%s« ist keine Datei" +msgid "Revision '%ld' does not exist" +msgstr "Revision »%ld« existiert nicht" -#: ../svnlook/svnlook.c:1614 -msgid "History item limit reached" -msgstr "Beschränkung für Anzahl der Verlaufselemente erreicht" +#: ../svnrdump/svnrdump.c:770 +msgid "LOWER revision cannot be greater than UPPER revision; consider reversing your revision range" +msgstr "Revision VON kann nicht größer als Revision BIS sein; Ändern Sie ggf. die Reihenfolge der Angabe" -#: ../svnlook/svnlook.c:1633 +#: ../svnrdump/svnrdump.c:1017 #, c-format msgid "" -"REVISION PATH \n" -"-------- ---------\n" +"Subcommand '%s' doesn't accept option '%s'\n" +"Type 'svnrdump help %s' for usage.\n" msgstr "" -"REVISION PFAD \n" -"-------- ---------\n" +"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n" +"Geben Sie »svnrdump help %s« für Hilfe ein.\n" -#: ../svnlook/svnlook.c:1638 -#, c-format -msgid "" -"REVISION PATH\n" -"-------- ----\n" +#: ../svnrdump/svnrdump.c:1060 +msgid "load subcommand with --password-from-stdin requires -F" msgstr "" -"REVISION PFAD\n" -"-------- ----\n" -#: ../svnlook/svnlook.c:1711 +#: ../svnserve/cyrus_auth.c:122 +msgid "Could not initialize the SASL library" +msgstr "Konnte die SASL-Bibliothek nicht initialisieren" + +#: ../svnserve/cyrus_auth.c:194 #, c-format -msgid "Property '%s' not found on revision %ld" -msgstr "Eigenschaft »%s« wurde in Revision %ld nicht gefunden" +msgid "Initial token is too long" +msgstr "Einleitende Markierung ist zu lang" -#: ../svnlook/svnlook.c:1715 +#: ../svnserve/cyrus_auth.c:226 #, c-format -msgid "Property '%s' not found on transaction %s" -msgstr "Eigenschaft »%s« wurde in Transaktion %s nicht gefunden" +msgid "Step response is too long" +msgstr "Antwort auf Protokollschritt zu lang" -#: ../svnlook/svnlook.c:1724 +#: ../svnserve/cyrus_auth.c:277 #, c-format -msgid "Property '%s' not found on path '%s' or inherited from a parent in revision %ld" -msgstr "Eigenschaft »%s« wurde im Pfad »%s« in Revision %ld nicht gefunden und nicht vom übergeordneten Element geerbt" +msgid "Can't get hostname" +msgstr "Kann den Hostnamen nicht erhalten" + +#: ../svnserve/cyrus_auth.c:335 +msgid "Could not obtain the list of SASL mechanisms" +msgstr "Konnte die Liste der SASL-Mechanismen nicht erhalten" + +#: ../svnserve/cyrus_auth.c:378 +msgid "Couldn't obtain the authenticated username" +msgstr "Kann den angemeldeten Benutzername nicht erhalten" + +#: ../svnserve/serve.c:2223 +msgid "Path is not a string" +msgstr "Pfad ist keine Zeichenkette" + +#: ../svnserve/serve.c:2428 +msgid "Log revprop entry not a string" +msgstr "Log-Revisionseigenschaftseintrag ist keine Zeichenkette" -#: ../svnlook/svnlook.c:1730 +#: ../svnserve/serve.c:2434 #, c-format -msgid "Property '%s' not found on path '%s' in revision %ld" -msgstr "Eigenschaft »%s« wurde im Pfad »%s« in Revision %ld nicht gefunden" +msgid "Unknown revprop word '%s' in log command" +msgstr "Unbekanntes Revisionseigenschaftswort »%s« in Log-Kommando" -#: ../svnlook/svnlook.c:1738 +#: ../svnserve/serve.c:2450 +msgid "Log path entry not a string" +msgstr "Logpfadeintrag ist keine Zeichenkette" + +#: ../svnserve/serve.c:3088 ../svnserve/serve.c:3267 #, c-format -msgid "Property '%s' not found on path '%s' or inherited from a parent in transaction %s" -msgstr "Eigenschaft »%s« wurde im Pfad »%s« in Transaktion %s nicht gefunden und nicht vom übergeordneten Element geerbt" +msgid "No result for '%s'." +msgstr "Kein Ergebnis für »%s«." -#: ../svnlook/svnlook.c:1744 +#: ../svnserve/serve.c:3895 #, c-format -msgid "Property '%s' not found on path '%s' in transaction %s" -msgstr "Eigenschaft »%s« wurde im Pfad »%s« in Transaktion %s nicht gefunden" +msgid "SASL requested but not compiled in; set '%s' to 'false' or recompile svnserve with SASL support" +msgstr "" -#: ../svnlook/svnlook.c:2080 -msgid "Missing repository path argument" -msgstr "Fehlende Option für Pfad des Projektarchivs" +#: ../svnserve/svnserve.c:239 +msgid "daemon mode" +msgstr "Daemonmodus" -#: ../svnlook/svnlook.c:2232 +#: ../svnserve/svnserve.c:240 +msgid "inetd mode" +msgstr "Inetd-Modus" + +#: ../svnserve/svnserve.c:241 +msgid "tunnel mode" +msgstr "Tunnelmodus" + +#: ../svnserve/svnserve.c:242 +msgid "listen-once mode (useful for debugging)" +msgstr "»listen-once«-Modus (nützlich zum Debuggen)" + +#: ../svnserve/svnserve.c:245 +msgid "Windows service mode (Service Control Manager)" +msgstr "Windows-Service-Modus (Service Control Manager)" + +#: ../svnserve/svnserve.c:247 +msgid "root of directory to serve" +msgstr "Basis des bereitzustellenden Verzeichnisses" + +#: ../svnserve/svnserve.c:249 +msgid "force read only, overriding repository config file" +msgstr "" +"Erzwinge Schreibschutz. Setze Einstellung in der\n" +"Projektarchivkonfiguration außer Kraft." + +#: ../svnserve/svnserve.c:251 +msgid "read configuration from file ARG" +msgstr "Konfiguration aus Datei PAR lesen" + +#: ../svnserve/svnserve.c:254 msgid "" -"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" -"Subversion repository inspection tool.\n" -"Type 'svnlook help ' for help on a specific subcommand.\n" -"Type 'svnlook --version' to see the program version and FS modules.\n" -"Note: any subcommand which takes the '--revision' and '--transaction'\n" -" options will, if invoked without one of those options, act on\n" -" the repository's youngest revision.\n" -"\n" -"Available subcommands:\n" +"listen port. The default port is 3690.\n" +" [mode: daemon, service, listen-once]" msgstr "" -"Aufruf: svnlook UNTERBEFEHL ARCHIV_PFAD [Optionen & Parameter ...]\n" -"Werkzeug zur Inspektion von Projektarchiven.\n" -"Geben Sie »svnlook help « ein, um Hilfe zu einem Unterbefehl\n" -" zu erhalten.\n" -"Geben Sie »svnlook --version« ein, um die Programmversion und die verfügbaren\n" -" Dateisystemmodule anzuzeigen.\n" -"Hinweis: Alle Unterbefehle, die die Parameter »--revision« und »--transaction«\n" -" akzeptieren, werden ohne diese Parameter die neueste\n" -" Revision des Projektarchivs verwenden.\n" -"\n" -"Verfügbare Unterbefehle:\n" +"abzuhörender Port. Die Vorgabe ist 3690.\n" +" [Modus: daemon, service, listen-once]" + +#: ../svnserve/svnserve.c:258 +msgid "" +"listen port. The default port is 3690.\n" +" [mode: daemon, listen-once]" +msgstr "" +"abzuhörender Port. Die Vorgabe ist 3690.\n" +" [Modus: daemon, listen-once]" + +#: ../svnserve/svnserve.c:264 +msgid "" +"listen hostname or IP address\n" +" By default svnserve listens on all addresses.\n" +" [mode: daemon, service, listen-once]" +msgstr "" +"abzuhörender Rechnername oder IP-Adresse\n" +" Als Vorgabe hört svnserve auf allen Adressen.\n" +" [Modus: daemon, service, listen-once]" + +#: ../svnserve/svnserve.c:270 +msgid "" +"listen hostname or IP address\n" +" By default svnserve listens on all addresses.\n" +" [mode: daemon, listen-once]" +msgstr "" +"abzuhörender Rechnername oder IP-Adresse\n" +" Als Vorgabe hört svnserve auf allen Adressen.\n" +" [Modus: daemon, listen-once]" + +#: ../svnserve/svnserve.c:277 +msgid "" +"prefer IPv6 when resolving the listen hostname\n" +" [IPv4 is preferred by default. Using IPv4 and IPv6\n" +" at the same time is not supported in daemon mode.\n" +" Use inetd mode or tunnel mode if you need this.]" +msgstr "" +"Bevorzuge IPv6 beim Auflösen des abzuhörenden Rechnernamens\n" +" [IPv4 ist als bevorzugt vorgegeben. Gleichzeitige\n" +" Verwendung von IPv4 und IPv6 ist im Daemon-Modus\n" +" nicht unterstützt. Verwenden Sie bei Bedarf inetd\n" +" oder den Tunnel-Modus." + +#: ../svnserve/svnserve.c:285 +msgid "" +"compression level to use for network transmissions\n" +" [0 .. no compression, 5 .. default, \n" +" 9 .. maximum compression]" +msgstr "" +"Kompressionslevel für Netzwerkübertragungen\n" +" [0 .. keine Kompression, 5 .. Vorgabe, \n" +" 9 .. maximale Kompression]" + +#: ../svnserve/svnserve.c:291 +msgid "" +"size of the extra in-memory cache in MB used to\n" +" minimize redundant operations.\n" +" Default is 16.\n" +" 0 switches to dynamically sized caches.\n" +" [used for FSFS and FSX repositories only]" +msgstr "" +"Größe des extra Zwischenspeichers im RAM in MB zur\n" +" Minimierung redundanter Operationen.\n" +" Vorgabe ist 16.\n" +" 0 wählt Größe automatisch aus.\n" +" [nur für FSFS- und FSX-Projektarchive verwendet]" + +#: ../svnserve/svnserve.c:301 +msgid "" +"enable or disable caching of deltas between older\n" +" revisions.\n" +" Default is yes.\n" +" [used for FSFS and FSX repositories only]" +msgstr "" +"Aktiviert oder deaktiviert die Zwischenspeicherung von\n" +" Deltas zwischen älteren Revisionen.\n" +" Vorgabe ist »yes«.\n" +" [nur für FSFS und FSX-Projektarchive verwendet]" + +#: ../svnserve/svnserve.c:309 +msgid "" +"enable or disable caching of file contents\n" +" Default is yes.\n" +" [used for FSFS and FSX repositories only]" +msgstr "" +"Aktiviert oder deaktiviert die Zwischenspeicherung von Dateiinhalten\n" +" Vorgabe ist »yes«.\n" +" [nur für FSFS und FSX-Projektarchive verwendet]" -#: ../svnlook/svnlook.c:2311 -#, c-format +#: ../svnserve/svnserve.c:315 msgid "" -"Comment (%i line):\n" -"%s\n" -msgid_plural "" -"Comment (%i lines):\n" -"%s\n" -msgstr[0] "" -"Kommentar (%i Zeile):\n" -"%s\n" -msgstr[1] "" -"Kommentar (%i Zeilen):\n" -"%s\n" +"enable or disable caching of revision properties.\n" +" Consult the documentation before activating this.\n" +" Default is no.\n" +" [used for FSFS and FSX repositories only]" +msgstr "" +"Aktiviert oder deaktiviert die Zwischenspeicherung von Revisionseigenschaften.\n" +" Schlagen Sie in der Dokumentation nach, bevor Sie dies aktivieren.\n" +" Vorgabe ist »no«.\n" +" [nur für FSFS und FSX-Projektarchive verwendet]" -#: ../svnlook/svnlook.c:2363 -#, c-format -msgid "Missing propname argument" -msgstr "Fehlender PROPNAME Parameter" +#: ../svnserve/svnserve.c:323 +#, fuzzy +msgid "" +"enable or disable caching of node properties\n" +" Default is yes.\n" +" [used for FSFS repositories only]" +msgstr "" +"Aktiviert oder deaktiviert die Zwischenspeicherung von Dateiinhalten\n" +" Vorgabe ist »yes«.\n" +" [nur für FSFS und FSX-Projektarchive verwendet]" -#: ../svnlook/svnlook.c:2364 -#, c-format -msgid "Missing propname and repository path arguments" -msgstr "Eigenschaftsname und Pfad im Projektarchiv nicht angegeben" +#: ../svnserve/svnserve.c:329 +msgid "" +"Optimize network handling based on the assumption\n" +" that most clients are connected with a bitrate of\n" +" ARG Mbit/s.\n" +" Default is 0 (optimizations disabled)." +msgstr "" +"Optimiert Datendurchsatz basierend auf der Annahme, dass\n" +" die meisten Clients mit einer Bitrate von \n" +" PAR Mbit/s verbunden sind.\n" +" Vorgabe 0 (keine Optimierung)." -#: ../svnlook/svnlook.c:2370 -msgid "Missing propname or repository path argument" -msgstr "Eigenschaftsname oder Pfad im Projektarchiv nicht angegeben" +#: ../svnserve/svnserve.c:337 +msgid "" +"Parse and cache all data found in block instead\n" +" of just the requested item.\n" +" Default is no.\n" +" [used for FSFS repositories in 1.9 format only]" +msgstr "" +"Liest und speichert alle in einem Block gefundenen Daten\n" +"\n" +" statt nur die des angefordertes Elements.\n" +" Vorgabe ist »no«.\n" +" [nur für FSFS-Projektarchive im Format 1.9 verwendet]" -#: ../svnlook/svnlook.c:2523 -msgid "Invalid revision number supplied" -msgstr "Ungültige Revisionsnummer angegeben" +#. ### Making the assumption here that WIN32 never has fork and so +#. * ### this option never exists when --service exists. +#: ../svnserve/svnserve.c:347 +msgid "use threads instead of fork [mode: daemon]" +msgstr "Verwende Threads anstelle von »fork« [Modus: daemon]" -#: ../svnlook/svnlook.c:2637 -msgid "The '--transaction' (-t) and '--revision' (-r) arguments cannot co-exist" +#: ../svnserve/svnserve.c:352 +#, fuzzy +msgid "" +"Minimum number of server threads, even if idle.\n" +" Capped to max-threads; minimum value is 0.\n" +" Default is 1." msgstr "" -"Die Parameter »--transaction« (-t) und »--revision« (-r) können nicht\n" -"gleichzeitig angegeben werden" - -#: ../svnlook/svnlook.c:2644 -msgid "Cannot use the '--show-inherited-props' option with the '--revprop' option" -msgstr "Die Option »--show-inherited-props« kann nicht zusammen mit der Option »--revprop« verwendet werden" +"Mindestanzahl der Serverthreads, selbst wenn inaktiv.\n" +" Auf »max-threads« beschränkt; Mindestwert 0.\n" +" Vorgabe ist 1.\n" +" [nur zusammen mit --threads verwendet]" -#: ../svnlook/svnlook.c:2701 -#, c-format -msgid "Try 'svnadmin verify' instead.\n" -msgstr "Versuchen Sie stattdessen »svnadmin verify«.\n" +#: ../svnserve/svnserve.c:359 +#, fuzzy +msgid "" +"Maximum number of server threads, even if there\n" +" are more connections. Minimum value is 1.\n" +" Default is " +msgstr "" +"Höchstanzahl der Serverthreads, selbst wenn mehr\n" +" Verbindungen anliegen. Mindestwert 1.\n" +" Vorgabe ist 64.\n" +" [nur zusammen mit --threads verwendet]" -#: ../svnlook/svnlook.c:2734 -#, c-format -msgid "Repository argument required\n" -msgstr "Projektarchiv Parameter erforderlich\n" +#: ../svnserve/svnserve.c:367 +msgid "" +"Maximum acceptable size of a client request in MB.\n" +" This implicitly limits the length of paths and\n" +" property values that can be sent to the server.\n" +" Also the peak memory usage for protocol handling\n" +" per server thread or sub-process.\n" +" 0 disables the size check; default is " +msgstr "" -#: ../svnlook/svnlook.c:2743 -#, c-format -msgid "'%s' is a URL when it should be a path\n" -msgstr "»%s« ist eine URL obwohl es ein Pfad sein sollte\n" +#: ../svnserve/svnserve.c:380 +msgid "" +"Maximum acceptable server response size in MB.\n" +" Longer responses get truncated and return an\n" +" error. This limits the server load e.g. when\n" +" checking out at the wrong path level.\n" +" Default is 0 (disabled)." +msgstr "" -#: ../svnlook/svnlook.c:2793 -#, c-format +#: ../svnserve/svnserve.c:390 msgid "" -"Subcommand '%s' doesn't accept option '%s'\n" -"Type 'svnlook help %s' for usage.\n" +"run in foreground (useful for debugging)\n" +" [mode: daemon]" msgstr "" -"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n" -"Geben Sie »svnlook help %s« ein, um Hilfe zu erhalten.\n" +"Im Vordergrund starten (nützlich zum Debuggen)\n" +" [Modus: daemon]" -#: ../svnlook/svnlook.c:2836 -msgid "Try 'svnlook help' for more info" -msgstr "Versuchen Sie »svnlook help« für weitere Informationen" +#: ../svnserve/svnserve.c:394 +msgid "" +"handle one connection at a time in the parent\n" +" process (useful for debugging)" +msgstr "" +"Bearbeitet eingehende Verbindungen einzeln im Eltern-\n" +" prozess (nützlich zum Debuggen)" -#: ../svnmucc/svnmucc.c:258 -#, c-format -msgid "Type 'svnmucc --help' for usage.\n" -msgstr "Geben Sie »svnmucc --help« für weitere Hilfe ein.\n" +#: ../svnserve/svnserve.c:398 +msgid "svnserve log file" +msgstr "Protokolldatei von svnserve" -#: ../svnmucc/svnmucc.c:266 +#: ../svnserve/svnserve.c:401 msgid "" -"usage: svnmucc ACTION...\n" -"Subversion multiple URL command client.\n" -"Type 'svnmucc --version' to see the program version and RA modules.\n" -"\n" -" Perform one or more Subversion repository URL-based ACTIONs, committing\n" -" the result as a (single) new revision.\n" -"\n" -"Actions:\n" -" cp REV SRC-URL DST-URL : copy SRC-URL@REV to DST-URL\n" -" mkdir URL : create new directory URL\n" -" mv SRC-URL DST-URL : move SRC-URL to DST-URL\n" -" rm URL : delete URL\n" -" put SRC-FILE URL : add or modify file URL with contents copied from\n" -" SRC-FILE (use \"-\" to read from standard input)\n" -" propset NAME VALUE URL : set property NAME on URL to VALUE\n" -" propsetf NAME FILE URL : set property NAME on URL to value read from FILE\n" -" propdel NAME URL : delete property NAME from URL\n" -"\n" -"Valid options:\n" -" -h, -? [--help] : display this text\n" -" -m [--message] ARG : use ARG as a log message\n" -" -F [--file] ARG : read log message from file ARG\n" -" -u [--username] ARG : commit the changes as username ARG\n" -" -p [--password] ARG : use ARG as the password\n" -" -U [--root-url] ARG : interpret all action URLs relative to ARG\n" -" -r [--revision] ARG : use revision ARG as baseline for changes\n" -" --with-revprop ARG : set revision property in the following format:\n" -" NAME[=VALUE]\n" -" --non-interactive : do no interactive prompting (default is to\n" -" prompt only if standard input is a terminal)\n" -" --force-interactive : do interactive prompting even if standard\n" -" input is not a terminal\n" -" --trust-server-cert : deprecated; same as --trust-unknown-ca\n" -" --trust-unknown-ca : with --non-interactive, accept SSL server\n" -" certificates from unknown certificate authorities\n" -" --trust-cn-mismatch : with --non-interactive, accept SSL server\n" -" certificates even if the server hostname does not\n" -" match the certificate's common name attribute\n" -" --trust-expired : with --non-interactive, accept expired SSL server\n" -" certificates\n" -" --trust-not-yet-valid : with --non-interactive, accept SSL server\n" -" certificates from the future\n" -" --trust-other-failure : with --non-interactive, accept SSL server\n" -" certificates with failures other than the above\n" -" -X [--extra-args] ARG : append arguments from file ARG (one per line;\n" -" use \"-\" to read from standard input)\n" -" --config-dir ARG : use ARG to override the config directory\n" -" --config-option ARG : use ARG to override a configuration option\n" -" --no-auth-cache : do not cache authentication tokens\n" -" --version : print version information\n" +"write server process ID to file ARG\n" +" [mode: daemon, listen-once, service]" msgstr "" -"Aufruf: svnmucc AKTION...\n" -"Subversion Multi-URL-Kommando Client\n" -"Geben Sie »svnmucc --version« ein, um die Programmversion und die\n" -"Zugriffsmodule zu sehen.\n" -"\n" -" Führt eine oder mehrere AKTIONen auf URLs von Subversion Projektarchiven aus,\n" -" mit Übertragung des Ergebnisses als eine neue Revision.\n" -"\n" -"Aktionen:\n" -" cp REV QUELL-URL ZIEL-URL : kopiert QUELL-URL@REV nach ZIEL-URL\n" -" mkdir URL : erzeugt neues Verzeichnis URL\n" -" mv QUELL-URL ZIEL-URL : verschiebt QUELL-URL nach ZIEL-URL\n" -" rm URL : löscht URL\n" -" put QUELL-DATEI URL : legt Inhalt von QUELL-DATEI in URL ab, ggf. als Hinzufügung\n" -" (Die Angabe von \"-\" liest Inhalt aus der Standardeingabe)\n" -" propset NAME WERT URL : setzt Eigenschaft NAME der URL auf WERT\n" -" propsetf NAME DATEI URL : setzt Eigenschaft NAME der URL, liest Wert aus DATEI\n" -" propdel NAME URL : löscht Eigenschaft NAME von URL\n" -"\n" -"Gültige Optionen:\n" -" -h, -? [--help] : zeigt diesen Text an\n" -" -m [--message] PAR : verwendet PAR als Logmeldung\n" -" -F [--file] PAR : liest Logmeldung aus Datei PAR\n" -" -u [--username] PAR : überträgt Änderungen mit Benutzername PAR\n" -" -p [--password] PAR : verwendet PAR als Kennwort\n" -" -U [--root-url] PAR : interpretiert alle URLs für Aktionen relativ zu PAR\n" -" -r [--revision] PAR : verwendet Revision PAR als Basis für Änderungen\n" -" --with-revprop PAR : setzt Revisionseigenschaft im folgenden Format:\n" -" NAME[=WERT]\n" -" --non-interactive : unterdrückt interaktive Nachfragen (Vorgabe ist nur\n" -" nachfragen, wenn Standardeingabe ein Terminal ist)\n" -" --trust-server-cert : veraltet; identisch mit --trust-unknown-ca\n" -" --trust-unknown-ca : mit --non-interactive, akzeptiert SSL Server-\n" -" Zertifikate von unbekannten Zertifizierungsstellen\n" -" --trust-cn-mismatch : mit --non-interactive, akzeptiert SSL Server-\n" -" Zertifikate auch falls der Hostname nicht mit dem\n" -" Common Name Attribut im Zertifikat übereinstimmt\n" -" --trust-expired : mit --non-interactive, akzeptiert SSL Server-\n" -" Zertifikate die abgelaufen sind\n" -" --trust-not-yet-valid : mit --non-interactive, akzeptiert SSL Server-\n" -" Zertifikate die noch nicht gültig sind\n" -" --trust-other-failure : mit --non-interactive, akzeptiert SSL server-\n" -" Zertifikate mit anderen als den vorherigen Fehlern\n" -" -X [--extra-args] PAR : liest weitere Arguments aus Datei PAR (zeilenweise;\n" -" : Die Angabe von \"-\" liest von der Standardeingabe)\n" -" --config-dir PAR : verwendet ARG als Konfigurationsverzeichnis\n" -" --config-option PAR : verwendet ARG als Konfigurationsoption\n" -" --no-auth-cache : speichert Anmeldeinformationen nicht zwischen\n" -" --version : gibt Versionsinformationen aus\n" +"Schreibe Server-Prozess-ID in Datei PAR\n" +" [Modus: daemon, listen-once, service]" -#: ../svnmucc/svnmucc.c:349 -msgid "--message (-m), --file (-F), and --with-revprop=svn:log are mutually exclusive" -msgstr "--message (-m), --file (-F), und --with-revprop=svn:log schließen sich gegenseitig aus" +#: ../svnserve/svnserve.c:405 +msgid "" +"write server process ID to file ARG\n" +" [mode: daemon, listen-once]" +msgstr "" +"Schreibe Server-Prozess-ID in Datei PAR\n" +" [Modus: daemon, listen-once]" -#: ../svnmucc/svnmucc.c:590 -#, c-format -msgid "Invalid revision number '%s'" -msgstr "Ungültige Revisionsnummer »%s«" +#: ../svnserve/svnserve.c:410 +msgid "" +"tunnel username (default is current uid's name)\n" +" [mode: tunnel]" +msgstr "" +"Tunnel-Benutzername (Vorgabe ist der Name zur aktuellen UID)\n" +" [Modus: tunnel]" -#: ../svnrdump/load_editor.c:231 ../svnsync/svnsync.c:362 -#, c-format -msgid "Failed to get lock on destination repos, currently held by '%s'\n" +#: ../svnserve/svnserve.c:415 +msgid "" +"virtual host mode (look for repo in directory\n" +" of provided hostname)" msgstr "" -"Konnte Sperre für Zielprojektarchiv nicht erhalten, die zurzeit von\n" -"»%s« gehalten wird\n" +"Virtual-Host-Modus (Sucht nach Projektarchiv dem Verzeichnis\n" +" das dem übertragenen Hostnamen entspricht)" -#: ../svnrdump/load_editor.c:375 -msgid "Target server does not support atomic revision property edits; consider upgrading it to 1.7." -msgstr "Zielserver unterstützt keine atomaren Änderungen von Revisionseigenschaften; Verwenden Sie dort 1.7" +#: ../svnserve/svnserve.c:431 +#, c-format +msgid "Type '%s --help' for usage.\n" +msgstr "Geben Sie »%s --help« für weitere Hilfe ein.\n" -#: ../svnrdump/svnrdump.c:113 +#: ../svnserve/svnserve.c:440 msgid "" -"usage: svnrdump dump URL [-r LOWER[:UPPER]]\n" +"usage: svnserve [-d | -i | -t | -X | --service] [options]\n" +"Subversion repository server.\n" +"Type 'svnserve --version' to see the program version.\n" "\n" -"Dump revisions LOWER to UPPER of repository at remote URL to stdout\n" -"in a 'dumpfile' portable format. If only LOWER is given, dump that\n" -"one revision.\n" +"Valid options:\n" msgstr "" -"Aufruf: svnrdump dump URL [-r VON[:BIS]]\n" +"Aufruf: svnserve [-d | -i | -t | -X | --service] [Optionen]\n" +"Subversion Projektarchiv-Server.\n" +"Geben Sie »svnserve --version« ein, um die Programmversion zu sehen.\n" "\n" -"Gibt einen Abzug der Revisionen VON:BIS eines Projektarchivs an der entfernten URL\n" -"in einem portablen »Dump«-Format auf die Standardausgabe aus. Falls nur VON\n" -" angegeben wurde, wird nur diese Revision ausgegeben.\n" +"Gültige Optionen:\n" -#: ../svnrdump/svnrdump.c:119 +#: ../svnserve/svnserve.c:449 msgid "" -"usage: svnrdump load URL\n" +"usage: svnserve [-d | -i | -t | -X] [options]\n" +"Subversion repository server.\n" +"Type 'svnserve --version' to see the program version.\n" "\n" -"Load a 'dumpfile' given on stdin to a repository at remote URL.\n" +"Valid options:\n" msgstr "" -"Aufruf: svnrdump load URL\n" +"Aufruf: svnserve [-d | -i | -t | -X] [Optionen]\n" +"Subversion Projektarchiv-Server.\n" +"Geben Sie »svnserve --version« ein, um die Programmversion zu sehen.\n" "\n" -"Liest einen Datenstrom im »Dump«-Format von der Standardeingabe in ein Projektarchive an entfertner URL.\n" +"Gültige Optionen:\n" -#: ../svnrdump/svnrdump.c:123 +#: ../svnserve/svnserve.c:479 msgid "" -"usage: svnrdump help [SUBCOMMAND...]\n" "\n" -"Describe the usage of this program or its subcommands.\n" +"Cyrus SASL authentication is available.\n" msgstr "" -"Aufruf: svnrdump help [UNTERBEFEHL...]\n" "\n" -"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n" +"Cyrus-SASL-Authentifizierung ist verfügbar.\n" -#: ../svnrdump/svnrdump.c:136 -msgid "dump incrementally" -msgstr "Inkrementell ausgeben" +#: ../svnserve/svnserve.c:565 +#, c-format +msgid "Can't accept client connection" +msgstr "Kann Clientverbindung nicht annehmen" -#: ../svnrdump/svnrdump.c:138 -msgid "skip revision property ARG (e.g., \"svn:author\")" -msgstr "Revisionseigenschaft PAR überspringen (z.B. »svn:author«)" +#: ../svnserve/svnserve.c:842 +#, c-format +msgid "Invalid port '%s'" +msgstr "Ungültiger Port »%s«" -#: ../svnrdump/svnrdump.c:156 ../svnserve/svnserve.c:372 -#: ../svnversion/svnversion.c:142 -msgid "display this help" -msgstr "Hilfe anzeigen" +#: ../svnserve/svnserve.c:878 +#, c-format +msgid "Root path '%s' does not exist or is not a directory" +msgstr "Wurzelpfad »%s« existiert nicht oder ist kein Verzeichnis." -#: ../svnrdump/svnrdump.c:683 -msgid "" -"general usage: svnrdump SUBCOMMAND URL [-r LOWER[:UPPER]]\n" -"Subversion remote repository dump and load tool.\n" -"Type 'svnrdump help ' for help on a specific subcommand.\n" -"Type 'svnrdump --version' to see the program version and RA modules.\n" -"\n" -"Available subcommands:\n" -msgstr "" -"Aufruf: svnrdump UNTERBEFEHL URL [-r VON[:BIS]]\n" -"Werkzeug zum Ausgeben und Laden von Projektarchiven über das Netzwerk.\n" -"Geben Sie »svnrdump help « ein, um Hilfe zu einem\n" -"Unterbefehl zu erhalten.\n" -"Geben Sie »svnrdump --version« ein, um die Programmversion und die\n" -"Zugriffsmodule zu sehen.\n" -"\n" -"Verfügbare Unterbefehle:\n" +#: ../svnserve/svnserve.c:1018 +msgid "You must specify exactly one of -d, -i, -t, --service or -X.\n" +msgstr "Sie müssen genau einen der Parameter -d, -i, -t, --service oder -X angeben.\n" -#: ../svnrdump/svnrdump.c:728 ../svnrdump/svnrdump.c:762 -msgid "Unsupported revision specifier used; use only integer values or 'HEAD'" -msgstr "Nicht unterstützte Angabe für Revision; verwenden Sie nur ganze Zahlen oder »HEAD«" +#: ../svnserve/svnserve.c:1021 +msgid "You must specify exactly one of -d, -i, -t or -X.\n" +msgstr "Sie müssen genau einen der Parameter -d, -i, -t oder -X angeben.\n" -#: ../svnrdump/svnrdump.c:736 ../svnrdump/svnrdump.c:770 -#, c-format -msgid "Revision '%ld' does not exist" -msgstr "Revision »%ld« existiert nicht" +#: ../svnserve/svnserve.c:1032 +msgid "You may only specify one of -T or --single-thread\n" +msgstr "Sie dürfen nur einen der Parameter -T und --single-thread angeben.\n" -#: ../svnrdump/svnrdump.c:780 -msgid "LOWER revision cannot be greater than UPPER revision; consider reversing your revision range" -msgstr "Revision VON kann nicht größer als Revision BIS sein; Ändern Sie ggf. die Reihenfolge der Angabe" +#: ../svnserve/svnserve.c:1079 +msgid "Option --tunnel-user is only valid in tunnel mode" +msgstr "Die Option --tunnel-user ist nur im Tunnelmodus zulässig" -#: ../svnrdump/svnrdump.c:1039 +#: ../svnserve/svnserve.c:1152 #, c-format -msgid "" -"Subcommand '%s' doesn't accept option '%s'\n" -"Type 'svnrdump help %s' for usage.\n" -msgstr "" -"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n" -"Geben Sie »svnrdump help %s« für Hilfe ein.\n" - -#: ../svnserve/cyrus_auth.c:119 -msgid "Could not initialize the SASL library" -msgstr "Konnte die SASL-Bibliothek nicht initialisieren" +msgid "svnserve: The --service flag is only valid if the process is started by the Service Control Manager.\n" +msgstr "svnserve: Die Option --service ist nur gültig, wenn der Prozess durch den Service Control Manager gestartet wurde.\n" -#: ../svnserve/cyrus_auth.c:191 +#: ../svnserve/svnserve.c:1203 #, c-format -msgid "Initial token is too long" -msgstr "Einleitende Markierung ist zu lang" +msgid "Can't get address info" +msgstr "Kann Adressinformation nicht ermitteln" -#: ../svnserve/cyrus_auth.c:222 +#: ../svnserve/svnserve.c:1216 #, c-format -msgid "Step response is too long" -msgstr "Antwort auf Protokollschritt zu lang" +msgid "Can't create server socket" +msgstr "Kann Server-Socket nicht erzeugen" -#: ../svnserve/cyrus_auth.c:272 +#: ../svnserve/svnserve.c:1224 #, c-format -msgid "Can't get hostname" -msgstr "Kann den Hostnamen nicht erhalten" +msgid "Can't set options on server socket" +msgstr "Kann Optionen Server-Socket nicht einstellen" -#: ../svnserve/cyrus_auth.c:329 -msgid "Could not obtain the list of SASL mechanisms" -msgstr "Konnte die Liste der SASL-Mechanismen nicht erhalten" +#: ../svnserve/svnserve.c:1230 +#, c-format +msgid "Can't bind server socket" +msgstr "Kann Server-Socket nicht anbinden" -#: ../svnserve/cyrus_auth.c:372 -msgid "Couldn't obtain the authenticated username" -msgstr "Kann den angemeldeten Benutzername nicht erhalten" +#: ../svnserve/svnserve.c:1236 +#, c-format +msgid "Can't listen on server socket" +msgstr "Kann nicht am Server-Socket hören" -#: ../svnserve/serve.c:2082 -msgid "Path is not a string" -msgstr "Pfad ist keine Zeichenkette" +#: ../svnserve/svnserve.c:1317 +#, c-format +msgid "Can't create thread pool" +msgstr "Kann Thread-Pool nicht erzeugen" -#: ../svnserve/serve.c:2252 -msgid "Log revprop entry not a string" -msgstr "Log-Revisionseigenschaftseintrag ist keine Zeichenkette" +#: ../svnserve/winservice.c:346 +#, c-format +msgid "Failed to create winservice_start_event" +msgstr "Konnte winservice_start_event nicht erzeugen" -#: ../svnserve/serve.c:2258 +#: ../svnserve/winservice.c:357 #, c-format -msgid "Unknown revprop word '%s' in log command" -msgstr "Unbekanntes Revisionseigenschaftswort »%s« in Log-Kommando" +msgid "The service failed to start" +msgstr "Der Dienst konnte nicht gestartet werden" -#: ../svnserve/serve.c:2274 -msgid "Log path entry not a string" -msgstr "Logpfadeintrag ist keine Zeichenkette" +#: ../svnserve/winservice.c:405 +#, c-format +msgid "Failed to connect to Service Control Manager" +msgstr "Konnte nicht mit dem Service Control Manager verbinden" -#: ../svnserve/serve.c:2897 ../svnserve/serve.c:3073 +#: ../svnserve/winservice.c:416 #, c-format -msgid "No result for '%s'." -msgstr "Kein Ergebnis für »%s«." +msgid "The service failed to start; an internal error occurred while starting the service" +msgstr "Der Dienst konnte nicht gestartet werden; ein interner Fehler trat beim Starten des Dienstes auf" -#: ../svnserve/svnserve.c:216 -msgid "daemon mode" -msgstr "Daemonmodus" +#: ../svnsync/svnsync.c:95 +msgid "" +"usage: svnsync initialize DEST_URL SOURCE_URL\n" +"\n" +msgstr "" -#: ../svnserve/svnserve.c:217 -msgid "inetd mode" -msgstr "Inetd-Modus" +#: ../svnsync/svnsync.c:97 +#, fuzzy +msgid "" +"Initialize a destination repository for synchronization from\n" +"another repository.\n" +"\n" +msgstr "Zielprojektarchiv hat mehr Revisionen als Quellprojektarchiv" -#: ../svnserve/svnserve.c:218 -msgid "tunnel mode" -msgstr "Tunnelmodus" +#: ../svnsync/svnsync.c:100 +msgid "" +"If the source URL is not the root of a repository, only the\n" +"specified part of the repository will be synchronized.\n" +"\n" +msgstr "" -#: ../svnserve/svnserve.c:219 -msgid "listen-once mode (useful for debugging)" -msgstr "»listen-once«-Modus (nützlich zum Debuggen)" +#: ../svnsync/svnsync.c:103 +#, fuzzy +msgid "" +"The destination URL must point to the root of a repository which\n" +"has been configured to allow revision property changes. In\n" +"the general case, the destination repository must contain no\n" +"committed revisions. Use --allow-non-empty to override this\n" +"restriction, which will cause svnsync to assume that any revisions\n" +"already present in the destination repository perfectly mirror\n" +"their counterparts in the source repository. (This is useful\n" +"when initializing a copy of a repository as a mirror of that same\n" +"repository, for example.)\n" +"\n" +msgstr "" +"Aufruf: svnsync initialize ZIEL_URL QUELL_URL\n" +"\n" +"Bereitet ein Zielprojektarchiv auf die Synchronisation mit einem\n" +"anderen Projektarchiv vor.\n" +"\n" +"Falls die Quell-URL nicht die Wurzel eines Projektarchivs ist, wird nur\n" +"der angegebene Teil des Projektarchivs synchronisiert.\n" +"\n" +"Die Ziel-URL muss auf die Basis eines Projektarchivs zeigen, das Änderungen an Revisionseigenschaften zulässt. Allgemein sollte das \n" +"Zielprojektarchiv keine übertragenen Revisionen enthalten. Verwenden Sie --allow-non-empty um diese Einschränkung zu umgehen. In diesem\n" +"Fall nimmt svnsync an, dass alle schon im Zielprojektarchiv vorhandenen\n" +"Revisionen ihre jeweiligen Gegenstücke in der Quelle exakt wiedergeben.\n" +"(Dies ist z.B. nützlich, wenn die Kopie eines Projektarchivs als Spiegel dieses Projektarchivs konfiguriert werden soll.)\n" +"\n" +"Übertragungen oder Eigenschaftsänderungen im Zielprojektarchiv\n" +"sollten ausschließlich mit »svnsync« vorgenommen werden.\n" +"Anders ausgedrückt stellt das Zielprojektarchiv einen Spiegel des\n" +"Quellprojektarchivs dar, auf den nur lesend zugegriffen werden darf.\n" + +#: ../svnsync/svnsync.c:113 +msgid "" +"You should not commit to, or make revision property changes in,\n" +"the destination repository by any method other than 'svnsync'.\n" +"In other words, the destination repository should be a read-only\n" +"mirror of the source repository.\n" +msgstr "" + +#: ../svnsync/svnsync.c:122 +msgid "" +"usage: svnsync synchronize DEST_URL [SOURCE_URL]\n" +"\n" +msgstr "" + +#: ../svnsync/svnsync.c:124 +#, fuzzy +msgid "" +"Transfer all pending revisions to the destination from the source\n" +"with which it was initialized.\n" +"\n" +msgstr "" +"Aufruf: svnsync synchronize ZIEL_URL\n" +"\n" +"Überträgt alle laufenden Revisionen von der Quelle, mit der es\n" +"initialisiert wurde, zum Ziel.\n" + +#: ../svnsync/svnsync.c:127 +#, fuzzy +msgid "" +"If SOURCE_URL is provided, use that as the source repository URL,\n" +"ignoring what is recorded in the destination repository as the\n" +"source URL. Specifying SOURCE_URL is recommended in particular\n" +"if untrusted users/administrators may have write access to the\n" +"DEST_URL repository.\n" +msgstr "" +"Aufruf: svnsync synchronize ZIEL_URL [QUELL_URL]\n" +"\n" +"Überträgt alle für das Zielprojektarchiv ausstehenden Revisionen\n" +"aus der Quelle, mit der die Synchronisation vorbereitet wurde.\n" +"\n" +"Falls QUELL_URL angegeben ist, wird dies als Quellprojektarchiv\n" +"verwendet, egal welche Quelle im Zielprojektarchiv konfiguriert wurde.\n" +"Die Angabe von QUELL_URL ist ratsam, falls nicht vertrauenswürdige\n" +"Benutzer oder Administratoren Schreibzugriff auf ZIEL_URL haben.\n" +"\n" + +#: ../svnsync/svnsync.c:136 +msgid "" +"usage:\n" +"\n" +msgstr "" + +#: ../svnsync/svnsync.c:138 +msgid "" +" 1. svnsync copy-revprops DEST_URL [SOURCE_URL]\n" +" 2. svnsync copy-revprops DEST_URL REV[:REV2]\n" +"\n" +msgstr "" + +#: ../svnsync/svnsync.c:141 +msgid "" +"Copy the revision properties in a given range of revisions to the\n" +"destination from the source with which it was initialized. If the\n" +"revision range is not specified, it defaults to all revisions in\n" +"the DEST_URL repository. Note also that the 'HEAD' revision is the\n" +"latest in DEST_URL, not necessarily the latest in SOURCE_URL.\n" +"\n" +msgstr "" + +#: ../svnsync/svnsync.c:147 +#, fuzzy +msgid "" +"If SOURCE_URL is provided, use that as the source repository URL,\n" +"ignoring what is recorded in the destination repository as the\n" +"source URL. Specifying SOURCE_URL is recommended in particular\n" +"if untrusted users/administrators may have write access to the\n" +"DEST_URL repository.\n" +"\n" +msgstr "" +"Aufruf: svnsync synchronize ZIEL_URL [QUELL_URL]\n" +"\n" +"Überträgt alle für das Zielprojektarchiv ausstehenden Revisionen\n" +"aus der Quelle, mit der die Synchronisation vorbereitet wurde.\n" +"\n" +"Falls QUELL_URL angegeben ist, wird dies als Quellprojektarchiv\n" +"verwendet, egal welche Quelle im Zielprojektarchiv konfiguriert wurde.\n" +"Die Angabe von QUELL_URL ist ratsam, falls nicht vertrauenswürdige\n" +"Benutzer oder Administratoren Schreibzugriff auf ZIEL_URL haben.\n" +"\n" -#: ../svnserve/svnserve.c:222 -msgid "Windows service mode (Service Control Manager)" -msgstr "Windows-Service-Modus (Service Control Manager)" +#: ../svnsync/svnsync.c:153 +msgid "" +"Unless you need to trigger the destination repositoy's revprop\n" +"change hooks for all revision properties, it is recommended to use\n" +"the --skip-unchanged option for best performance.\n" +"\n" +msgstr "" -#: ../svnserve/svnserve.c:224 -msgid "root of directory to serve" -msgstr "Basis des bereitzustellenden Verzeichnisses" +#: ../svnsync/svnsync.c:157 +msgid "Form 2 is deprecated syntax, equivalent to specifying \"-rREV[:REV2]\".\n" +msgstr "" -#: ../svnserve/svnserve.c:226 -msgid "force read only, overriding repository config file" +#: ../svnsync/svnsync.c:163 +msgid "" +"usage: svnsync info DEST_URL\n" +"\n" msgstr "" -"Erzwinge Schreibschutz. Setze Einstellung in der\n" -"Projektarchivkonfiguration außer Kraft." -#: ../svnserve/svnserve.c:228 -msgid "read configuration from file ARG" -msgstr "Konfiguration aus Datei PAR lesen" +# CHECKME: s/destination/source/? +#: ../svnsync/svnsync.c:165 +#, fuzzy +msgid "" +"Print information about the synchronization destination repository\n" +"located at DEST_URL.\n" +msgstr "" +"Aufruf: svnsync info ZIEL_URL\n" +"\n" +"Gibt Informationen über das Zielprojektarchiv der Synchronisation aus,\n" +"das sich unter ZIEL_URL befindet.\n" -#: ../svnserve/svnserve.c:231 +#: ../svnsync/svnsync.c:170 msgid "" -"listen port. The default port is 3690.\n" -" [mode: daemon, service, listen-once]" +"usage: svnsync help [SUBCOMMAND...]\n" +"\n" msgstr "" -"abzuhörender Port. Die Vorgabe ist 3690.\n" -" [Modus: daemon, service, listen-once]" -#: ../svnserve/svnserve.c:235 +#: ../svnsync/svnsync.c:181 +msgid "print as little as possible" +msgstr "So wenig wie möglich ausgeben" + +#: ../svnsync/svnsync.c:183 msgid "" -"listen port. The default port is 3690.\n" -" [mode: daemon, listen-once]" +"operate on revision ARG (or range ARG1:ARG2)\n" +" A revision argument can be one of:\n" +" NUMBER revision number\n" +" 'HEAD' latest in repository" msgstr "" -"abzuhörender Port. Die Vorgabe ist 3690.\n" -" [Modus: daemon, listen-once]" +"Auf Revision PAR arbeiten (oder Bereich PAR1:PAR2)\n" +" Ein Revisionsargument kann sein:\n" +" ZAHL Revisionsnummer\n" +" »HEAD« neueste im Projektarchiv" -#: ../svnserve/svnserve.c:241 +#: ../svnsync/svnsync.c:191 +msgid "allow a non-empty destination repository" +msgstr "erlaubt nicht-leeres Zielprojektarchiv" + +#: ../svnsync/svnsync.c:193 +#, fuzzy +msgid "don't copy unchanged revision properties" +msgstr "Revisionseigenschaften nicht filtern." + +#: ../svnsync/svnsync.c:205 msgid "" -"listen hostname or IP address\n" -" By default svnserve listens on all addresses.\n" -" [mode: daemon, service, listen-once]" +"specify a username ARG (deprecated;\n" +" see --source-username and --sync-username)" msgstr "" -"abzuhörender Rechnername oder IP-Adresse\n" -" Als Vorgabe hört svnserve auf allen Adressen.\n" -" [Modus: daemon, service, listen-once]" +"gibt einen Benutzernamen PAR an (veraltet;\n" +" siehe --source-username und --sync-username)" -#: ../svnserve/svnserve.c:247 +#: ../svnsync/svnsync.c:209 msgid "" -"listen hostname or IP address\n" -" By default svnserve listens on all addresses.\n" -" [mode: daemon, listen-once]" +"specify a password ARG (deprecated;\n" +" see --source-password and --sync-password)" msgstr "" -"abzuhörender Rechnername oder IP-Adresse\n" -" Als Vorgabe hört svnserve auf allen Adressen.\n" -" [Modus: daemon, listen-once]" +"gibt ein Passwort PAR an (veraltet;\n" +" siehe --source-password und --sync-password)" -#: ../svnserve/svnserve.c:254 +#: ../svnsync/svnsync.c:213 msgid "" -"prefer IPv6 when resolving the listen hostname\n" -" [IPv4 is preferred by default. Using IPv4 and IPv6\n" -" at the same time is not supported in daemon mode.\n" -" Use inetd mode or tunnel mode if you need this.]" +"deprecated; same as\n" +" --source-trust-server-cert-failures=unknown-ca\n" +" --sync-trust-server-cert-failures=unknown-ca" msgstr "" -"Bevorzuge IPv6 beim Auflösen des abzuhörenden Rechnernamens\n" -" [IPv4 ist als bevorzugt vorgegeben. Gleichzeitige\n" -" Verwendung von IPv4 und IPv6 ist im Daemon-Modus\n" -" nicht unterstützt. Verwenden Sie bei Bedarf inetd\n" -" oder den Tunnel-Modus." -#: ../svnserve/svnserve.c:262 +#: ../svnsync/svnsync.c:219 +#, fuzzy msgid "" -"compression level to use for network transmissions\n" -" [0 .. no compression, 5 .. default, \n" -" 9 .. maximum compression]" +"with --non-interactive, accept SSL\n" +" server certificates with failures.\n" +" ARG is a comma-separated list of:\n" +" - 'unknown-ca' (Unknown Authority)\n" +" - 'cn-mismatch' (Hostname mismatch)\n" +" - 'expired' (Expired certificate)\n" +" - 'not-yet-valid' (Not yet valid certificate)\n" +" - 'other' (all other not separately classified\n" +" certificate errors).\n" +" Applied to the source URL." msgstr "" -"Kompressionslevel für Netzwerkübertragungen\n" -" [0 .. keine Kompression, 5 .. Vorgabe, \n" -" 9 .. maximale Kompression]" +"Gibt Optionen für ein externes Vergleichsprogramm oder die interne\n" +" Vergleichsfunktion an. Vorgabe ist »-u«. Optionen sind\n" +" durch Leerzeichen zu trennen. aber sein internes Vergleichsprogramm benutzt\n" +" oder Annotierungen anzeigt, kann PAR einen der\n" +" folgenden Werte annehmen:\n" +" -u (--unified):\n" +" Gibt 3 Zeilen Standardkontext aus.\n" +" -b (--ignore-space-change):\n" +" Ignoriert Änderungen in der Anzahl von\n" +" Leerzeichen.\n" +" -w (--ignore-all-space):\n" +" Ignoriert sämtliche Leerzeichen.\n" +" --ignore-eol-style:\n" +" Ignoriert Änderungen im Zeilenendestil.\n" +" -U PAR, --context PAR: Gibt PAR Zeilen Kontext aus.\n" +" -p (--show-c-function):\n" +" Zeigt C-Funktionsname in Diff-Ausgabe." -#: ../svnserve/svnserve.c:268 +#: ../svnsync/svnsync.c:239 msgid "" -"size of the extra in-memory cache in MB used to\n" -" minimize redundant operations.\n" -" Default is 16.\n" -" 0 switches to dynamically sized caches.\n" -" [used for FSFS and FSX repositories only]" +"Like\n" +" --source-trust-server-cert-failures,\n" +" but applied to the destination URL." msgstr "" -"Größe des extra Zwischenspeichers im RAM in MB zur\n" -" Minimierung redundanter Operationen.\n" -" Vorgabe ist 16.\n" -" 0 wählt Größe automatisch aus.\n" -" [nur für FSFS- und FSX-Projektarchive verwendet]" -#: ../svnserve/svnserve.c:278 +#: ../svnsync/svnsync.c:245 +msgid "connect to source repository with username ARG" +msgstr "verbindet mit dem Quellprojektarchiv mit dem Benutzernamen PAR" + +#: ../svnsync/svnsync.c:247 +msgid "connect to source repository with password ARG" +msgstr "verbindet mit dem Quellprojektarchiv mit dem Passwort PAR" + +# FIXME: s/sync/synced/, option sync-username +#: ../svnsync/svnsync.c:249 +msgid "connect to sync repository with username ARG" +msgstr "verbindet mit synchronisiertem Projektarchiv mit Benutzernamen PAR" + +#: ../svnsync/svnsync.c:251 +msgid "connect to sync repository with password ARG" +msgstr "verbindet mit synchronisiertem Projektarchiv mit Passwort PAR" + +#: ../svnsync/svnsync.c:263 msgid "" -"enable or disable caching of deltas between older\n" -" revisions.\n" -" Default is yes.\n" -" [used for FSFS and FSX repositories only]" +"convert translatable properties from encoding ARG\n" +" to UTF-8. If not specified, then properties are\n" +" presumed to be encoded in UTF-8." msgstr "" -"Aktiviert oder deaktiviert die Zwischenspeicherung von\n" -" Deltas zwischen älteren Revisionen.\n" -" Vorgabe ist »yes«.\n" -" [nur für FSFS und FSX-Projektarchive verwendet]" +"konvertiert übersetzbare Eigenschaften vom Kodierung PAR\n" +" nach UTF-8. Wenn nicht angegeben, werden die\n" +" Eigenschaften als in UTF-8 kodiert angenommen." -#: ../svnserve/svnserve.c:286 +#: ../svnsync/svnsync.c:269 msgid "" -"enable or disable caching of file contents\n" -" Default is yes.\n" -" [used for FSFS and FSX repositories only]" +"Disable built-in locking. Use of this option can\n" +" corrupt the mirror unless you ensure that no other\n" +" instance of svnsync is running concurrently." msgstr "" -"Aktiviert oder deaktiviert die Zwischenspeicherung von Dateiinhalten\n" -" Vorgabe ist »yes«.\n" -" [nur für FSFS und FSX-Projektarchive verwendet]" +"schaltet eingebauten Sperrmechanismus aus. Die Verwendung dieser Option\n" +" kann Spiegelprojektarchive beschädigen, falls nicht sichergestellt ist,\n" +" dass keine andere Instanz von svnsync gleichzeitig läuft." -#: ../svnserve/svnserve.c:292 +#: ../svnsync/svnsync.c:275 msgid "" -"enable or disable caching of revision properties.\n" -" Consult the documentation before activating this.\n" -" Default is no.\n" -" [used for FSFS and FSX repositories only]" +"Steal locks as necessary. Use, with caution,\n" +" if your mirror repository contains stale locks\n" +" and is not being concurrently accessed by another\n" +" svnsync instance." msgstr "" -"Aktiviert oder deaktiviert die Zwischenspeicherung von Revisionseigenschaften.\n" -" Schlagen Sie in der Dokumentation nach, bevor Sie dies aktivieren.\n" -" Vorgabe ist »no«.\n" -" [nur für FSFS und FSX-Projektarchive verwendet]" +"entfernt Sperren wenn nötig. Zu verwenden, mit Vorsicht,\n" +" wenn das Spiegelprojektarchiv nicht mehr notwendige Sperren enthält\n" +" und nicht gleichzeitig von einer anderen svnsync-Instanz verwendet wird." -#: ../svnserve/svnserve.c:300 +#: ../svnsync/svnsync.c:283 msgid "" -"Optimize network handling based on the assumption\n" -" that most clients are connected with a bitrate of\n" -" ARG Mbit/s.\n" -" Default is 0 (optimizations disabled)." +"size of the extra in-memory cache in MB used to\n" +" minimize operations for local 'file' scheme.\n" msgstr "" -"Optimiert Datendurchsatz basierend auf der Annahme, dass\n" -" die meisten Clients mit einer Bitrate von \n" -" PAR Mbit/s verbunden sind.\n" -" Vorgabe 0 (keine Optimierung)." +"Größe des extra Zwischenspeichers im RAM in MB zur Minimierung\n" +" redundanter Operationen mit dem lokalen »file«-Schema.\n" + +#: ../svnsync/svnsync.c:388 +msgid "Target server does not support atomic revision property edits; consider upgrading it to 1.7 or using an external locking program" +msgstr "Zielserver unterstützt keine atomaren Änderungen von Revisionseigenschaften; Verwenden Sie entweder 1.7 oder ein externes Programm zum Sperren." + +#: ../svnsync/svnsync.c:402 +#, c-format +msgid "Stole lock previously held by '%s'\n" +msgstr "Zuvor von »%s« gehaltene Sperre gestohlen\n" + +#: ../svnsync/svnsync.c:492 +#, c-format +msgid "Session is rooted at '%s' but the repos root is '%s'" +msgstr "Basis der Sitzung ist »%s«, aber die Basis des Projektarchivs ist »%s«" + +#: ../svnsync/svnsync.c:650 +#, c-format +msgid "Copied properties for revision %ld (%s* properties skipped).\n" +msgstr "Kopierte Eigenschaften für Revision %ld (%s* Eigenschaften übergangen).\n" + +#: ../svnsync/svnsync.c:655 +#, c-format +msgid "Copied properties for revision %ld.\n" +msgstr "Eigenschaften für Revision %ld kopiert.\n" + +#: ../svnsync/svnsync.c:671 +#, c-format +msgid "NOTE: Normalized %s* properties to LF line endings (%d rev-props, %d node-props).\n" +msgstr "HINWEIS: %s* Eigenschaften nach LF-Zeilenenden normalisiert (%d Revisionseigenschaften, %d Knoteneigenschaften).\n" + +#: ../svnsync/svnsync.c:810 +msgid "Destination repository already contains revision history; consider using --allow-non-empty if the repository's revisions are known to mirror their respective revisions in the source repository" +msgstr "Das Zielprojektarchiv enthält schon eine Revisionsgeschichte. Sie können es mit »--allow-non-empty« versuchen, falls die Revisionen dieses Projektarchivs denen des Quellprojektarchivs genau entsprechen." + +#: ../svnsync/svnsync.c:819 +#, c-format +msgid "Destination repository is already synchronizing from '%s'" +msgstr "Das Zielprojektarchiv synchronisiert bereits von »%s«" + +#: ../svnsync/svnsync.c:854 +msgid "Destination repository has more revisions than source repository" +msgstr "Zielprojektarchiv hat mehr Revisionen als Quellprojektarchiv" + +#: ../svnsync/svnsync.c:919 ../svnsync/svnsync.c:922 ../svnsync/svnsync.c:1595 +#: ../svnsync/svnsync.c:1602 ../svnsync/svnsync.c:1842 +#: ../svnsync/svnsync.c:1845 ../svnsync/svnsync.c:1889 +#, c-format +msgid "Path '%s' is not a URL" +msgstr "Pfad »%s« ist keine URL" + +#: ../svnsync/svnsync.c:949 +#, c-format +msgid "Committed revision %ld.\n" +msgstr "Revision %ld übertragen.\n" + +#: ../svnsync/svnsync.c:992 +msgid "Destination repository has not been initialized" +msgstr "Zielprojektarchiv wurde noch nicht initialisiert" + +#: ../svnsync/svnsync.c:1367 +#, c-format +msgid "Commit created r%ld but should have created r%ld" +msgstr "Übertragung erzeugte Revision r%ld, sollte aber r%ld erzeugen" + +#: ../svnsync/svnsync.c:1487 +#, c-format +msgid "Revision being currently copied (%ld), last merged revision (%ld), and destination HEAD (%ld) are inconsistent; have you committed to the destination without using svnsync?" +msgstr "Die aktuell kopierte Revision (%ld), zuletzt zusammengeführte Revision (%ld) und Ziel-HEAD (%ld) sind inkonsistent. Haben Sie in das Ziel ohne Verwendung von svnsync übertragen?" + +#: ../svnsync/svnsync.c:1525 +#, c-format +msgid "Destination HEAD (%ld) is not the last merged revision (%ld); have you committed to the destination without using svnsync?" +msgstr "Ziel-HEAD (%ld) ist nicht die zuletzt zusammengeführte Revision (%ld). Haben Sie in das Ziel ohne Verwendung von svnsync übertragen?" + +#: ../svnsync/svnsync.c:1655 ../svnsync/svnsync.c:1660 +#, c-format +msgid "Cannot copy revprops for a revision (%ld) that has not been synchronized yet" +msgstr "Kann keine Revisionseigenschaften für eine Revision (%ld) kopieren, die noch nicht synchronisiert wurde" -#: ../svnserve/svnserve.c:308 -msgid "" -"Parse and cache all data found in block instead\n" -" of just the requested item.\n" -" Default is no.\n" -" [used for FSFS repositories in 1.9 format only]" -msgstr "" -"Liest und speichert alle in einem Block gefundenen Daten\n" -"\n" -" statt nur die des angefordertes Elements.\n" -" Vorgabe ist »no«.\n" -" [nur für FSFS-Projektarchive im Format 1.9 verwendet]" +#: ../svnsync/svnsync.c:1725 ../svnsync/svnsync.c:1745 +#, c-format +msgid "Invalid revision number (%ld)" +msgstr "Ungültige Revisionsnummer (%ld)" -#. ### Making the assumption here that WIN32 never has fork and so -#. * ### this option never exists when --service exists. -#: ../svnserve/svnserve.c:318 -msgid "use threads instead of fork [mode: daemon]" -msgstr "Verwende Threads anstelle von »fork« [Modus: daemon]" +#: ../svnsync/svnsync.c:1795 +msgid "Cannot specify revisions via both command-line arguments and the --revision (-r) option" +msgstr "Revisionen dürfen nicht gleichzeitig durch Argumente in der Kommandozeile und die Option »--revision« (»-r«) angegeben werden" -#: ../svnserve/svnserve.c:321 -msgid "" -"Minimum number of server threads, even if idle.\n" -" Caped to max-threads; minimum value is 0.\n" -" Default is 1.\n" -" [used only with --threads]" -msgstr "" -"Mindestanzahl der Serverthreads, selbst wenn inaktiv.\n" -" Auf »max-threads« beschränkt; Mindestwert 0.\n" -" Vorgabe ist 1.\n" -" [nur zusammen mit --threads verwendet]" +#: ../svnsync/svnsync.c:1803 ../svnsync/svnsync.c:2159 +#, c-format +msgid "Invalid revision range '%s' provided" +msgstr "Ungültiger Revisionsbereich »%s« angegeben" -#: ../svnserve/svnserve.c:330 -msgid "" -"Maximum number of server threads, even if there\n" -" are more connections. Minimum value is 1.\n" -" Default is 64.\n" -" [used only with --threads]" -msgstr "" -"Höchstanzahl der Serverthreads, selbst wenn mehr\n" -" Verbindungen anliegen. Mindestwert 1.\n" -" Vorgabe ist 64.\n" -" [nur zusammen mit --threads verwendet]" +#: ../svnsync/svnsync.c:1902 +#, c-format +msgid "Repository '%s' is not initialized for synchronization" +msgstr "Das Projektarchiv »%s« ist für die Synchronisation nicht initialisiert" -#: ../svnserve/svnserve.c:339 -msgid "" -"Maximum number of server threads, even if there\n" -" are more connections. Minimum value is 1.\n" -" Default is 256.\n" -" [used only with --threads]" -msgstr "" -"Höchstanzahl der Serverthreads, selbst wenn mehr\n" -" Verbindungen anliegen. Mindestwert 1.\n" -" Vorgabe ist 256.\n" -" [nur zusammen mit --threads verwendet]" +#. Print the info. +#: ../svnsync/svnsync.c:1908 +#, c-format +msgid "Source URL: %s\n" +msgstr "Quell-URL: %s\n" -#: ../svnserve/svnserve.c:349 -msgid "" -"run in foreground (useful for debugging)\n" -" [mode: daemon]" -msgstr "" -"Im Vordergrund starten (nützlich zum Debuggen)\n" -" [Modus: daemon]" +#: ../svnsync/svnsync.c:1910 +#, c-format +msgid "Source Repository UUID: %s\n" +msgstr "UUID des Quellprojektarchivs: %s\n" + +#: ../svnsync/svnsync.c:1913 +#, c-format +msgid "Last Merged Revision: %s\n" +msgstr "Letzte zusammengeführte Revision: %s\n" -#: ../svnserve/svnserve.c:353 +#: ../svnsync/svnsync.c:1930 msgid "" -"handle one connection at a time in the parent\n" -" process (useful for debugging)" +"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n" +"Subversion repository replication tool.\n" +"Type 'svnsync help ' for help on a specific subcommand.\n" +"Type 'svnsync --version' to see the program version and RA modules.\n" +"\n" +"Available subcommands:\n" msgstr "" -"Bearbeitet eingehende Verbindungen einzeln im Eltern-\n" -" prozess (nützlich zum Debuggen)" +"Aufruf: svnsync UNTERBEFEHL ZIEL_URL [Optionen & Parameter ...]\n" +"Werkzeug zur Replikation von Subversion-Projektarchiven.\n" +"Geben Sie »svnsync help « ein, um Hilfe zu einem\n" +"Unterbefehl zu erhalten.\n" +"Geben Sie »svnsync --version« ein, um die Programmversion und die\n" +"Zugriffsmodule zu sehen.\n" +"\n" +"Verfügbare Unterbefehle:\n" -#: ../svnserve/svnserve.c:357 -msgid "svnserve log file" -msgstr "Protokolldatei von svnserve" +#: ../svnsync/svnsync.c:2221 +msgid "Cannot use --username or --password with any of --source-username, --source-password, --sync-username, or --sync-password.\n" +msgstr "Man kann nicht --username oder --password mit einem von --source-username, --source-password, --sync-username oder --sync-password verwenden.\n" -#: ../svnserve/svnserve.c:360 -msgid "" -"write server process ID to file ARG\n" -" [mode: daemon, listen-once, service]" -msgstr "" -"Schreibe Server-Prozess-ID in Datei PAR\n" -" [Modus: daemon, listen-once, service]" +# TODO: Duplicated message!!!! +#: ../svnsync/svnsync.c:2244 +msgid "--disable-locking and --steal-lock are mutually exclusive" +msgstr "--disable-locking und --steal-lock schließen sich gegenseitig aus" -#: ../svnserve/svnserve.c:364 -msgid "" -"write server process ID to file ARG\n" -" [mode: daemon, listen-once]" -msgstr "" -"Schreibe Server-Prozess-ID in Datei PAR\n" -" [Modus: daemon, listen-once]" +#: ../svnsync/svnsync.c:2262 +#, fuzzy +msgid "--source-trust-server-cert-failures and --sync-trust-server-cert-failures require --non-interactive" +msgstr "--trust-other-failure erfordert --non-interactive" -#: ../svnserve/svnserve.c:369 +#: ../svnsync/svnsync.c:2331 +#, c-format msgid "" -"tunnel username (default is current uid's name)\n" -" [mode: tunnel]" +"Subcommand '%s' doesn't accept option '%s'\n" +"Type 'svnsync help %s' for usage.\n" msgstr "" -"Tunnel-Benutzername (Vorgabe ist der Name zur aktuellen UID)\n" -" [Modus: tunnel]" +"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n" +"Geben Sie »svnsync help %s« für Hilfe ein.\n" -#: ../svnserve/svnserve.c:374 -msgid "" -"virtual host mode (look for repo in directory\n" -" of provided hostname)" -msgstr "" -"Virtual-Host-Modus (Sucht nach Projektarchiv dem Verzeichnis\n" -" das dem übertragenen Hostnamen entspricht)" +#: ../svnsync/svnsync.c:2395 +msgid "Try 'svnsync help' for more info" +msgstr "Versuchen Sie »svnsync help« für weitere Informationen" -#: ../svnserve/svnserve.c:390 +#: ../svnsync/sync.c:125 #, c-format -msgid "Type '%s --help' for usage.\n" -msgstr "Geben Sie »%s --help« für weitere Hilfe ein.\n" +msgid "Missing colon in svn:mergeinfo property" +msgstr "Fehlender Doppelpunkt in der Eigenschaft svn:mergeinfo" + +#: ../svnversion/svnversion.c:49 +#, c-format +msgid "Type 'svnversion --help' for usage.\n" +msgstr "Geben Sie »svnversion --help« für weitere Hilfe ein.\n" -#: ../svnserve/svnserve.c:399 +#: ../svnversion/svnversion.c:59 +#, c-format msgid "" -"usage: svnserve [-d | -i | -t | -X | --service] [options]\n" -"Subversion repository server.\n" -"Type 'svnserve --version' to see the program version.\n" +"usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n" +"Subversion working copy identification tool.\n" +"Type 'svnversion --version' to see the program version.\n" "\n" -"Valid options:\n" -msgstr "" -"Aufruf: svnserve [-d | -i | -t | -X | --service] [Optionen]\n" -"Subversion Projektarchiv-Server.\n" -"Geben Sie »svnserve --version« ein, um die Programmversion zu sehen.\n" +" Produce a compact version identifier for the working copy path\n" +" WC_PATH. TRAIL_URL is the trailing portion of the URL used to\n" +" determine if WC_PATH itself is switched (detection of switches\n" +" within WC_PATH does not rely on TRAIL_URL). The version identifier\n" +" is written to standard output. For example:\n" "\n" -"Gültige Optionen:\n" - -#: ../svnserve/svnserve.c:408 -msgid "" -"usage: svnserve [-d | -i | -t | -X] [options]\n" -"Subversion repository server.\n" -"Type 'svnserve --version' to see the program version.\n" +" $ svnversion . /repos/svn/trunk\n" +" 4168\n" +"\n" +" The version identifier will be a single number if the working\n" +" copy is single revision, unmodified, not switched and with\n" +" a URL that matches the TRAIL_URL argument. If the working\n" +" copy is unusual the version identifier will be more complex:\n" +"\n" +" 4123:4168 mixed revision working copy\n" +" 4168M modified working copy\n" +" 4123S switched working copy\n" +" 4123P partial working copy, from a sparse checkout\n" +" 4123:4168MS mixed revision, modified, switched working copy\n" +"\n" +" If WC_PATH is an unversioned path, the program will output\n" +" 'Unversioned directory' or 'Unversioned file'. If WC_PATH is\n" +" an added or copied or moved path, the program will output\n" +" 'Uncommitted local addition, copy or move'.\n" +"\n" +" If invoked without arguments WC_PATH will be the current directory.\n" "\n" "Valid options:\n" msgstr "" -"Aufruf: svnserve [-d | -i | -t | -X] [Optionen]\n" -"Subversion Projektarchiv-Server.\n" -"Geben Sie »svnserve --version« ein, um die Programmversion zu sehen.\n" +"Aufruf: svnversion [OPTIONEN] [AK_PFAD [ANGEH_URL]]\n" +"Subversion-Werkzeug zur identifikation von Arbetiskopien.\n" +"Geben Sie »svnversion --version« ein, um die Programmversion zu sehen.\n" "\n" -"Gültige Optionen:\n" - -#: ../svnserve/svnserve.c:438 -msgid "" +" Erzeugt eine kompakte »Versionsnummer« für den Pfad AK_PFAD der\n" +" Arbeitskopie. ANGEH_URL ist der angehängte Teil der URL, welcher\n" +" benutzt wird, um festzustellen, ob AK_PFAD selbst umgestellt wurde\n" +" (die Erkennung von Umstellungen selbst innerhalb von AK_PFAD hängt\n" +" nicht von ANGEH_URL ab). Die Versionsnummer wird auf die\n" +" Standardausgabe ausgegeben. Ein Beispiel:\n" "\n" -"Cyrus SASL authentication is available.\n" -msgstr "" +" $ svnversion . /repos/svn/trunk\n" +" 4168\n" "\n" -"Cyrus-SASL-Authentifizierung ist verfügbar.\n" +" Die Versionsnummer ist eine einfache Zahl, falls die Arbeitskopie\n" +" eine einzelne Revision besitzt, die nicht modifiziert, nicht umgeschaltet\n" +" ist und eine URL hat, welche mit ANGEH_URL übereinstimmt. Falls die\n" +" Arbeitskopie ungewöhnlich ist, ist die Versionsnummer komplexer:\n" +"\n" +" 4123:4168 Arbeitskopie mit verschiedenen Revisionen\n" +" 4168M Arbeitskopie mit Änderungen\n" +" 4123S umgestellte Arbeitskopie\n" +" 4123P partielle Arbeitskopie, teilweise ausgecheckt\n" +" 4123:4168MS geänderte, umgestellte Arbeitskopie aus verschiedenen\n" +" Revisionen\n" +"\n" +" Wenn AK_PFAD nicht unter Versionkontrolle steht, gibt das Programm\n" +" »nicht versioniertes Verzeichnis« bzw. »...Datei« aus. Wenn AK_PFAD\n" +" ein hinzugefügter, kopierter oder verschobener Pfad ist, wird »Nicht\n" +" übertragenes lokal hinzugefügtes, kopiertes oder verschobenes Element«\n" +" ausgegeben.\n" +"\n" +" Bei Aufruf ohne Parameter wird das aktuelle Verzeichnis als AK_PFAD angenommen.\n" +"\n" +"Gültige Optionen:\n" + +#: ../svnversion/svnversion.c:141 +msgid "last changed rather than current revisions" +msgstr "gibt letzte geänderte statt aktueller Revisionen aus" + +#: ../svnversion/svnversion.c:241 +#, c-format +msgid "Unversioned symlink%s" +msgstr "Nicht versionierter symbolischer Link%s" -#: ../svnserve/svnserve.c:524 +#: ../svnversion/svnversion.c:244 #, c-format -msgid "Can't accept client connection" -msgstr "Kann Clientverbindung nicht annehmen" +msgid "Unversioned directory%s" +msgstr "Nicht versioniertes Verzeichnis%s" -#: ../svnserve/svnserve.c:796 +#: ../svnversion/svnversion.c:247 #, c-format -msgid "Invalid port '%s'" -msgstr "Ungültiger Port »%s«" +msgid "Unversioned file%s" +msgstr "Nicht versionierte Datei%s" -#: ../svnserve/svnserve.c:832 +#: ../svnversion/svnversion.c:253 #, c-format -msgid "Root path '%s' does not exist or is not a directory" -msgstr "Wurzelpfad »%s« existiert nicht oder ist kein Verzeichnis." +msgid "'%s' doesn't exist\n" +msgstr "»%s« existiert nicht\n" + +#: ../svnversion/svnversion.c:254 +#, c-format +msgid "'%s' is of unknown type\n" +msgstr "»%s« ist unbekannten Typs\n" + +#. Local uncommitted modifications, no revision info was found. +#: ../svnversion/svnversion.c:268 +#, c-format +msgid "Uncommitted local addition, copy or move%s" +msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes Element%s" + +#~ msgid "Only diffs between a path's text-base and its working files are supported at this time" +#~ msgstr "Derzeit werden nur Vergleiche zwischen der Textbasis und den Arbeitsdateien eines Pfades unterstützt" + +#~ msgid "Invalid link representation" +#~ msgstr "Ungültige Darstellung für symbolischen Link" -#: ../svnserve/svnserve.c:955 -msgid "You must specify exactly one of -d, -i, -t, --service or -X.\n" -msgstr "Sie müssen genau einen der Parameter -d, -i, -t, --service oder -X angeben.\n" +#~ msgid "Invalid revision footer" +#~ msgstr "Ungültige Fußdaten für Revision" -#: ../svnserve/svnserve.c:958 -msgid "You must specify exactly one of -d, -i, -t or -X.\n" -msgstr "Sie müssen genau einen der Parameter -d, -i, -t oder -X angeben.\n" +#~ msgid "Unlock of '%s' failed (%d %s)" +#~ msgstr "Freigabe der Sperre von »%s« gescheitert (%d %s)" -#: ../svnserve/svnserve.c:969 -msgid "You may only specify one of -T or --single-thread\n" -msgstr "Sie dürfen nur einen der Parameter -T und --single-thread angeben.\n" +#~ msgid "Invalid config: illegal character in timeout value" +#~ msgstr "Ungültige Konfiguration: Illegales Zeichen im Timeout-Wert" -#: ../svnserve/svnserve.c:1019 -msgid "Option --tunnel-user is only valid in tunnel mode" -msgstr "Die Option --tunnel-user ist nur im Tunnelmodus zulässig" +#~ msgid "Invalid config: negative timeout value" +#~ msgstr "Ungültige Konfiguration: Negativer Timeout-Wert" -#: ../svnserve/svnserve.c:1088 -#, c-format -msgid "svnserve: The --service flag is only valid if the process is started by the Service Control Manager.\n" -msgstr "svnserve: Die Option --service ist nur gültig, wenn der Prozess durch den Service Control Manager gestartet wurde.\n" +#~ msgid "Malformed XML: %s" +#~ msgstr "Fehlerhaftes XML: %s" -#: ../svnserve/svnserve.c:1139 -#, c-format -msgid "Can't get address info" -msgstr "Kann Adressinformation nicht ermitteln" +#~ msgid "Repository '%s' failed to verify" +#~ msgstr "Überprüfung des Projektarchivs »%s« fehlgeschlagen" -#: ../svnserve/svnserve.c:1152 -#, c-format -msgid "Can't create server socket" -msgstr "Kann Server-Socket nicht erzeugen" +#~ msgid "Memory for processing UTF-8 data could not be allocated." +#~ msgstr "Speicher für die Verarbeitung von UTF-8 Daten konnte nicht zugewiesen werden." -#: ../svnserve/svnserve.c:1160 -#, c-format -msgid "Can't set options on server socket" -msgstr "Kann Optionen Server-Socket nicht einstellen" +#~ msgid "UTF-8 string is too long to be processed." +#~ msgstr "UTF-8 Zeichenkette ist für die Verarbeitung zu lang." -#: ../svnserve/svnserve.c:1166 -#, c-format -msgid "Can't bind server socket" -msgstr "Kann Server-Socket nicht anbinden" +#~ msgid "Invalid UTF-8 string" +#~ msgstr "Ungültige UTF-8 Zeichenkette" -#: ../svnserve/svnserve.c:1172 -#, c-format -msgid "Can't listen on server socket" -msgstr "Kann nicht am Server-Socket hören" +#~ msgid "Unassigned Unicode code point found in UTF-8 string." +#~ msgstr "Nicht zugewiesener Unicode-Codepunkt in UTF-8 Zeichenkette gefunden." -#: ../svnserve/svnserve.c:1253 -#, c-format -msgid "Can't create thread pool" -msgstr "Kann Thread-Pool nicht erzeugen" +#~ msgid "Invalid options for UTF-8 processing chosen." +#~ msgstr "Ungültige Optionen für die Verarbeitung von UTF-8 ausgewählt." -#: ../svnserve/svnserve.c:1316 -#, c-format -msgid "Can't push task" -msgstr "Kann Abarbeitung einer Anfrage nicht initiieren" +#~ msgid "An unknown error occured while processing UTF-8 data." +#~ msgstr "Ein unbekannter Fehler trat bei der Verarbeitung von UTF-8 Daten auf." -#: ../svnserve/winservice.c:346 -#, c-format -msgid "Failed to create winservice_start_event" -msgstr "Konnte winservice_start_event nicht erzeugen" +#~ msgid "Error parsing tree conflict skel" +#~ msgstr "Fehler beim Einlesen des Baumkonfliktskeletons" -#: ../svnserve/winservice.c:357 -#, c-format -msgid "The service failed to start" -msgstr "Der Dienst konnte nicht gestartet werden" +#~ msgid "The working copy at '%s' is format 22 with WORKING nodes; use a format 22 client to diff/revert before using this client" +#~ msgstr "Die Arbeitskopie in »%s« hat das Format 22 mit »WORKING«-Knoten; Verwenden Sie zuerst einen Client mit Format 22 um sie zurückzusetzen oder Unterschiede zu speichern, bevor Sie diesen Client verwenden" -#: ../svnserve/winservice.c:405 -#, c-format -msgid "Failed to connect to Service Control Manager" -msgstr "Konnte nicht mit dem Service Control Manager verbinden" +#~ msgid "The working copy at '%s' is format 26 with conflicts; use a format 26 client to resolve before using this client" +#~ msgstr "Die Arbeitskopie in »%s« hat das Format 26 mit Konflikten; Verwenden Sie zuerst einen Client mit Format 26 um diese aufzulösen, bevor Sie diesen Client verwenden" -#: ../svnserve/winservice.c:416 -#, c-format -msgid "The service failed to start; an internal error occurred while starting the service" -msgstr "Der Dienst konnte nicht gestartet werden; ein interner Fehler trat beim Starten des Dienstes auf" +#~ msgid "Cannot apply update because move source '%s' is a switched subtree" +#~ msgstr "Kann Aktualisierung nicht anwenden, da die Quelle der Verschiebung »%s« ein umgestellter Unterbaum ist" -#: ../svnsync/svnsync.c:101 -msgid "" -"usage: svnsync initialize DEST_URL SOURCE_URL\n" -"\n" -"Initialize a destination repository for synchronization from\n" -"another repository.\n" -"\n" -"If the source URL is not the root of a repository, only the\n" -"specified part of the repository will be synchronized.\n" -"\n" -"The destination URL must point to the root of a repository which\n" -"has been configured to allow revision property changes. In\n" -"the general case, the destination repository must contain no\n" -"committed revisions. Use --allow-non-empty to override this\n" -"restriction, which will cause svnsync to assume that any revisions\n" -"already present in the destination repository perfectly mirror\n" -"their counterparts in the source repository. (This is useful\n" -"when initializing a copy of a repository as a mirror of that same\n" -"repository, for example.)\n" -"\n" -"You should not commit to, or make revision property changes in,\n" -"the destination repository by any method other than 'svnsync'.\n" -"In other words, the destination repository should be a read-only\n" -"mirror of the source repository.\n" -msgstr "" -"Aufruf: svnsync initialize ZIEL_URL QUELL_URL\n" -"\n" -"Bereitet ein Zielprojektarchiv auf die Synchronisation mit einem\n" -"anderen Projektarchiv vor.\n" -"\n" -"Falls die Quell-URL nicht die Wurzel eines Projektarchivs ist, wird nur\n" -"der angegebene Teil des Projektarchivs synchronisiert.\n" -"\n" -"Die Ziel-URL muss auf die Basis eines Projektarchivs zeigen, das Änderungen an Revisionseigenschaften zulässt. Allgemein sollte das \n" -"Zielprojektarchiv keine übertragenen Revisionen enthalten. Verwenden Sie --allow-non-empty um diese Einschränkung zu umgehen. In diesem\n" -"Fall nimmt svnsync an, dass alle schon im Zielprojektarchiv vorhandenen\n" -"Revisionen ihre jeweiligen Gegenstücke in der Quelle exakt wiedergeben.\n" -"(Dies ist z.B. nützlich, wenn die Kopie eines Projektarchivs als Spiegel dieses Projektarchivs konfiguriert werden soll.)\n" -"\n" -"Übertragungen oder Eigenschaftsänderungen im Zielprojektarchiv\n" -"sollten ausschließlich mit »svnsync« vorgenommen werden.\n" -"Anders ausgedrückt stellt das Zielprojektarchiv einen Spiegel des\n" -"Quellprojektarchivs dar, auf den nur lesend zugegriffen werden darf.\n" +#~ msgid "accept merged version of file [working]" +#~ msgstr "Akzeptiert die zusammengeführte Version der Datei [working]" -#: ../svnsync/svnsync.c:127 -msgid "" -"usage: svnsync synchronize DEST_URL [SOURCE_URL]\n" -"\n" -"Transfer all pending revisions to the destination from the source\n" -"with which it was initialized.\n" -"\n" -"If SOURCE_URL is provided, use that as the source repository URL,\n" -"ignoring what is recorded in the destination repository as the\n" -"source URL. Specifying SOURCE_URL is recommended in particular\n" -"if untrusted users/administrators may have write access to the\n" -"DEST_URL repository.\n" -msgstr "" -"Aufruf: svnsync synchronize ZIEL_URL [QUELL_URL]\n" -"\n" -"Überträgt alle für das Zielprojektarchiv ausstehenden Revisionen\n" -"aus der Quelle, mit der die Synchronisation vorbereitet wurde.\n" -"\n" -"Falls QUELL_URL angegeben ist, wird dies als Quellprojektarchiv\n" -"verwendet, egal welche Quelle im Zielprojektarchiv konfiguriert wurde.\n" -"Die Angabe von QUELL_URL ist ratsam, falls nicht vertrauenswürdige\n" -"Benutzer oder Administratoren Schreibzugriff auf ZIEL_URL haben.\n" -"\n" +#~ msgid "accept my version for all conflicts (same) [mine-conflict]" +#~ msgstr "Akzeptiert eigene Version für alle Konflikte (ebenso) [mine-conflict]" -#: ../svnsync/svnsync.c:140 -msgid "" -"usage:\n" -"\n" -" 1. svnsync copy-revprops DEST_URL [SOURCE_URL]\n" -" 2. svnsync copy-revprops DEST_URL REV[:REV2]\n" -"\n" -"Copy the revision properties in a given range of revisions to the\n" -"destination from the source with which it was initialized. If the\n" -"revision range is not specified, it defaults to all revisions in\n" -"the DEST_URL repository. Note also that the 'HEAD' revision is the\n" -"latest in DEST_URL, not necessarily the latest in SOURCE_URL.\n" -"\n" -"If SOURCE_URL is provided, use that as the source repository URL,\n" -"ignoring what is recorded in the destination repository as the\n" -"source URL. Specifying SOURCE_URL is recommended in particular\n" -"if untrusted users/administrators may have write access to the\n" -"DEST_URL repository.\n" -"\n" -"Form 2 is deprecated syntax, equivalent to specifying \"-rREV[:REV2]\".\n" -msgstr "" -"Aufruf:\n" -"\n" -" 1. svnsync copy-revprops ZIEL_URL [QUELL_URL]\n" -" 2. svnsync copy-revprops ZIEL_URL PAR1[:PAR2]\n" -"\n" -"Kopiert Revisionseigenschaften eines angegebenen Bereichs\n" -"von Revisionen in ein Zielprojektarchiv, aus der Quelle mit der\n" -"dieses für die Synchronisierung vorbereitet wurde. Wenn der\n" -"Revisionsbereich nicht angegeben wurde, werden alle im\n" -"Revisionen im Projektarchiv ZIEL_URL übertragen.\n" -"Beachten Sie, dass die Revision »HEAD« die neueste Revision\n" -"in ZIEL_URL bezeichnet, nicht notwendigerweise die neueste in\n" -"QUELL_URL.\n" -"\n" -"Falls QUELL_URL angegeben ist, wird dies als Quellprojektarchiv\n" -"verwendet, egal welche Quelle im Zielprojektarchiv konfiguriert wurde.\n" -"Die Angabe von QUELL_URL ist ratsam, falls nicht vertrauenswürdige\n" -"Benutzer oder Administratoren Schreibzugriff auf ZIEL_URL haben.\n" -"\n" -"Die Angabe des Revisionsbereichs in der zweiten Form ist veraltet\n" -"und ist gleichbedeutend mit der Angabe der Option »-r PAR1[:PAR2]«\n" +#~ msgid "my side of conflict" +#~ msgstr "eigene Seite des Konflikts" -# CHECKME: s/destination/source/? -#: ../svnsync/svnsync.c:161 -msgid "" -"usage: svnsync info DEST_URL\n" -"\n" -"Print information about the synchronization destination repository\n" -"located at DEST_URL.\n" -msgstr "" -"Aufruf: svnsync info ZIEL_URL\n" -"\n" -"Gibt Informationen über das Zielprojektarchiv der Synchronisation aus,\n" -"das sich unter ZIEL_URL befindet.\n" +#~ msgid "accept their version for all conflicts (same) [theirs-conflict]" +#~ msgstr "Akzeptiert fremde Version für alle Konflikte (ebenso) [theirs-conflict]" -#: ../svnsync/svnsync.c:167 -msgid "" -"usage: svnsync help [SUBCOMMAND...]\n" -"\n" -"Describe the usage of this program or its subcommands.\n" -msgstr "" -"Aufruf: svnsync help [UNTERBEFEHL...]\n" -"\n" -"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n" +#~ msgid "their side of conflict" +#~ msgstr "fremde Seite des Konflikts" -#: ../svnsync/svnsync.c:177 -msgid "print as little as possible" -msgstr "So wenig wie möglich ausgeben" +#~ msgid "accept my version of entire file (even non-conflicts) [mine-full]" +#~ msgstr "Akzeptiert eigene Version für ganze Datei (alles, nicht nur Konflikte) [mine-full]" -#: ../svnsync/svnsync.c:179 -msgid "" -"operate on revision ARG (or range ARG1:ARG2)\n" -" A revision argument can be one of:\n" -" NUMBER revision number\n" -" 'HEAD' latest in repository" -msgstr "" -"Auf Revision PAR arbeiten (oder Bereich PAR1:PAR2)\n" -" Ein Revisionsargument kann sein:\n" -" ZAHL Revisionsnummer\n" -" »HEAD« neueste im Projektarchiv" +#~ msgid "accept their version of entire file (same) [theirs-full]" +#~ msgstr "Akzeptiert fremde Version für ganze Datei (ebenso) [theirs-full]" -#: ../svnsync/svnsync.c:187 -msgid "allow a non-empty destination repository" -msgstr "erlaubt nicht-leeres Zielprojektarchiv" +#~ msgid "their version" +#~ msgstr "fremde Version" -#: ../svnsync/svnsync.c:199 -msgid "" -"specify a username ARG (deprecated;\n" -" see --source-username and --sync-username)" -msgstr "" -"gibt einen Benutzernamen PAR an (veraltet;\n" -" siehe --source-username und --sync-username)" +#~ msgid "mark the conflict to be resolved later [postpone]" +#~ msgstr "Markiert den Konflikt für eine spätere Auflösung [postpone]" -#: ../svnsync/svnsync.c:203 -msgid "" -"specify a password ARG (deprecated;\n" -" see --source-password and --sync-password)" -msgstr "" -"gibt ein Passwort PAR an (veraltet;\n" -" siehe --source-password und --sync-password)" +#~ msgid "accept my version of entire property (even non-conflicts) [mine-full]" +#~ msgstr "Akzeptiert eigene Version für ganze Eigenschaft (alles, nicht nur Konflikte) [mine-full]" -#: ../svnsync/svnsync.c:231 -msgid "connect to source repository with username ARG" -msgstr "verbindet mit dem Quellprojektarchiv mit dem Benutzernamen PAR" +#~ msgid "help" +#~ msgstr "Hilfe" -#: ../svnsync/svnsync.c:233 -msgid "connect to source repository with password ARG" -msgstr "verbindet mit dem Quellprojektarchiv mit dem Passwort PAR" +#~ msgid "resolve the conflict later [postpone]" +#~ msgstr "Löst den Konflikt später auf [postpone]" -# FIXME: s/sync/synced/, option sync-username -#: ../svnsync/svnsync.c:235 -msgid "connect to sync repository with username ARG" -msgstr "verbindet mit synchronisiertem Projektarchiv mit Benutzernamen PAR" +#~ msgid "allow updating moved-away children with 'svn resolve' [mine-conflict]" +#~ msgstr "Erlaubt die Aktualisierung von verschobenen Kindelementen mit »svn resolve« [mine-conflict]" -#: ../svnsync/svnsync.c:237 -msgid "connect to sync repository with password ARG" -msgstr "verbindet mit synchronisiertem Projektarchiv mit Passwort PAR" +#~ msgid " (%s) %s" +#~ msgstr " (%s) %s" -#: ../svnsync/svnsync.c:249 -msgid "" -"convert translatable properties from encoding ARG\n" -" to UTF-8. If not specified, then properties are\n" -" presumed to be encoded in UTF-8." -msgstr "" -"konvertiert übersetzbare Eigenschaften vom Kodierung PAR\n" -" nach UTF-8. Wenn nicht angegeben, werden die\n" -" Eigenschaften als in UTF-8 kodiert angenommen." +#~ msgid "" +#~ "with --non-interactive, accept SSL server\n" +#~ " certificates from unknown certificate authorities" +#~ msgstr "" +#~ "mit --non-interactive, akzeptiert SSL Server-Zertifikate\n" +#~ " von unbekannten Zertifizierungsstellen" -#: ../svnsync/svnsync.c:255 -msgid "" -"Disable built-in locking. Use of this option can\n" -" corrupt the mirror unless you ensure that no other\n" -" instance of svnsync is running concurrently." -msgstr "" -"schaltet eingebauten Sperrmechanismus aus. Die Verwendung dieser Option\n" -" kann Spiegelprojektarchive beschädigen, falls nicht sichergestellt ist,\n" -" dass keine andere Instanz von svnsync gleichzeitig läuft." +#~ msgid "" +#~ "with --non-interactive, accept SSL server\n" +#~ " certificates even if the server hostname does not\n" +#~ " match the certificate's common name attribute" +#~ msgstr "" +#~ "mit --non-interactive, akzeptiert SSL Server-Zertifikate\n" +#~ " auch falls der Hostname nicht mit dem Common\n" +#~ " Name Attribut im Zertifikat übereinstimmt" -#: ../svnsync/svnsync.c:261 -msgid "" -"Steal locks as necessary. Use, with caution,\n" -" if your mirror repository contains stale locks\n" -" and is not being concurrently accessed by another\n" -" svnsync instance." -msgstr "" -"entfernt Sperren wenn nötig. Zu verwenden, mit Vorsicht,\n" -" wenn das Spiegelprojektarchiv nicht mehr notwendige Sperren enthält\n" -" und nicht gleichzeitig von einer anderen svnsync-Instanz verwendet wird." +#~ msgid "" +#~ "with --non-interactive, accept expired SSL server\n" +#~ " certificates" +#~ msgstr "" +#~ "mit --non-interactive, akzeptiert SSL Server-Zertifikate\n" +#~ " die abgelaufen sind" -#: ../svnsync/svnsync.c:269 -msgid "" -"size of the extra in-memory cache in MB used to\n" -" minimize operations for local 'file' scheme.\n" -msgstr "" -"Größe des extra Zwischenspeichers im RAM in MB zur Minimierung\n" -" redundanter Operationen mit dem lokalen »file«-Schema.\n" +#~ msgid "" +#~ "with --non-interactive, accept SSL server\n" +#~ " certificates from the future" +#~ msgstr "" +#~ "mit --non-interactive, akzeptiert SSL Server-Zertifikate\n" +#~ " die noch nicht gültig sind" -#: ../svnsync/svnsync.c:392 -msgid "Target server does not support atomic revision property edits; consider upgrading it to 1.7 or using an external locking program" -msgstr "Zielserver unterstützt keine atomaren Änderungen von Revisionseigenschaften; Verwenden Sie entweder 1.7 oder ein externes Programm zum Sperren." +#~ msgid "" +#~ "with --non-interactive, accept SSL server\n" +#~ " certificates with failures other than the above" +#~ msgstr "" +#~ "mit --non-interactive, akzeptiert SSL Server-Zertifikate\n" +#~ " mit anderen als den vorherigen Fehlern" -#: ../svnsync/svnsync.c:406 -#, c-format -msgid "Stole lock previously held by '%s'\n" -msgstr "Zuvor von »%s« gehaltene Sperre gestohlen\n" +#~ msgid "retrieve target's inherited properties" +#~ msgstr "Geerbte Eigenschaften des Ziels abfragen" + +#~ msgid "print only the item identified by ARG" +#~ msgstr "Gibt nur das mit PAR angegebene Element aus" + +#~ msgid "" +#~ "Show when each line of a file was last (or\n" +#~ "next) changed.\n" +#~ "usage: blame [-rM:N] TARGET[@REV]...\n" +#~ "\n" +#~ " Annotate each line of a file with the revision number and author of the\n" +#~ " last change (or optionally the next change) to that line.\n" +#~ "\n" +#~ " With no revision range (same as -r0:REV), or with '-r M:N' where M < N,\n" +#~ " annotate each line that is present in revision N of the file, with\n" +#~ " the last revision at or before rN that changed or added the line,\n" +#~ " looking back no further than rM.\n" +#~ "\n" +#~ " With a reverse revision range '-r M:N' where M > N,\n" +#~ " annotate each line that is present in revision N of the file, with\n" +#~ " the next revision after rN that changed or deleted the line,\n" +#~ " looking forward no further than rM.\n" +#~ "\n" +#~ " If specified, REV determines in which revision the target is first\n" +#~ " looked up.\n" +#~ "\n" +#~ " Write the annotated result to standard output.\n" +#~ msgstr "" +#~ "Gibt für jede Zeile einer Datei die letzte (oder\n" +#~ "nächste) Änderung aus.\n" +#~ "Aufruf: blame [-rM:N] ZIEL[@REV]...\n" +#~ "\n" +#~ " Kommentiert jede Zeile einer Datei mit Revisionsnummer und Autor der\n" +#~ " letzten Änderung (optional der nächsten Änderung) dieser Zeile.\n" +#~ "\n" +#~ " Kommentiert ohne angegebenen Revisionsbereich (dann wie -r0:REV),\n" +#~ " oder mit »-r M:N« mit M < N, jede in Revision N vorhandene Zeile der Datei\n" +#~ " mit der letzten Revision rN oder davor die diese Zeile änderte oder hinzufügte,\n" +#~ " und blick dabei nicht weiter als rM zurück.\n" +#~ "\n" +#~ " Kommentiert mit einem umgekehrten Revisionsbereich »-rM:N« mit M > N,\n" +#~ " jede in Revision N vorhandene Zeile der Datei mit der nächsten Revision nach rN\n" +#~ " die diese Zeile ändert oder entfernt, und blick dabei nicht weiter als rM.\n" +#~ "\n" +#~ " Falls angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut wird.\n" +#~ "\n" +#~ " Gibt das kommentierte Ergebnis auf der Standardausgabe aus.\n" -#: ../svnsync/svnsync.c:495 -#, c-format -msgid "Session is rooted at '%s' but the repos root is '%s'" -msgstr "Basis der Sitzung ist »%s«, aber die Basis des Projektarchivs ist »%s«" +#~ msgid "" +#~ "Recursively clean up the working copy, removing write locks, resuming\n" +#~ "unfinished operations, etc.\n" +#~ "usage: cleanup [WCPATH...]\n" +#~ "\n" +#~ " By default, finish any unfinished business in the working copy at WCPATH,\n" +#~ " and remove write locks (shown as 'L' by the 'svn status' command) from\n" +#~ " the working copy. Usually, this is only necessary if a Subversion client\n" +#~ " has crashed while using the working copy, leaving it in an unusable state.\n" +#~ "\n" +#~ " WARNING: There is no mechanism that will protect write locks still\n" +#~ " being used by other Subversion clients. Running this command\n" +#~ " while another client is using the working copy can corrupt\n" +#~ " the working copy beyond repair!\n" +#~ "\n" +#~ " If the --remove-unversioned option or the --remove-ignored option\n" +#~ " is given, remove any unversioned or ignored items within WCPATH.\n" +#~ " To prevent accidental working copy corruption, unversioned or ignored\n" +#~ " items can only be removed if the working copy is not already locked\n" +#~ " for writing by another Subversion client.\n" +#~ " Note that the 'svn status' command shows unversioned items as '?',\n" +#~ " and ignored items as 'I' if the --no-ignore option is given to it.\n" +#~ msgstr "" +#~ "Räumt eine Arbeitskopie rekursiv auf, entfernt Schreibsperren, führt nicht\n" +#~ "beendete Operationen zu Ende usw.\n" +#~ "Aufruf: cleanup [AKPFAD...]\n" +#~ "\n" +#~ " Ohne weitere Parameter führt der Aufruf unterbrochene Operationen in\n" +#~ " AKPFAD zu Ende und entfernt Schreibsperren (mit »L« in »svn status«\n" +#~ " angezeigt). Dies ist allgemein nur notwendig, nachdem ein Subversion-\n" +#~ " Client abgestürzt ist, während dieser auf die Arbeitskopie zugriff, und so\n" +#~ " die Arbeitskopie in einem nicht verwendbaren Zustand hinterließ.\n" +#~ "\n" +#~ " WARNUNG: Es gibt keinen Mechanismus, der noch verwendete Schreib-\n" +#~ " sperren anderer Subversion-Clients schützt. Die Ausführung dieses\n" +#~ " Kommandos während des Zugriffs eines anderen Clients auf die\n" +#~ " Arbeitskopie kann diese irreparabel beschädigen!\n" +#~ "\n" +#~ " Wenn die Optionen --remove-unversioned oder --remove-ignored gegeben\n" +#~ " sind, werden nicht versionierte bzw. ignorierte Objekte in AKPFAD entfernt.\n" +#~ " Um unbeabsichtigte Beschädigungen der Arbeitskopie zu vermeiden,\n" +#~ " können nicht versionierte bzw. ignorierte Objekte nur entfernt werden, wenn\n" +#~ " die Arbeitskopie nicht schon von einem anderen Subversion-Client zum\n" +#~ " Schreiben gesperrt wurde.\n" +#~ " »svn status« zeigt nicht versionierte Objekte als »?« an, sowie ignorierte\n" +#~ " Objekte mit »I«, wenn die Option --no-ignore verwendet wird.\n" -#: ../svnsync/svnsync.c:637 -#, c-format -msgid "Copied properties for revision %ld (%s* properties skipped).\n" -msgstr "Kopierte Eigenschaften für Revision %ld (%s* Eigenschaften übergangen).\n" +#~ msgid "" +#~ "Send changes from your working copy to the repository.\n" +#~ "usage: commit [PATH...]\n" +#~ "\n" +#~ " A log message must be provided, but it can be empty. If it is not\n" +#~ " given by a --message or --file option, an editor will be started.\n" +#~ " If any targets are (or contain) locked items, those will be\n" +#~ " unlocked after a successful commit.\n" +#~ "\n" +#~ " If --include-externals is given, also commit file and directory\n" +#~ " externals reached by recursion. Do not commit externals with a\n" +#~ " fixed revision.\n" +#~ msgstr "" +#~ "Überträgt Änderungen Ihrer Arbeitskopie ins Projektarchiv.\n" +#~ "Aufruf: commit [PFAD...]\n" +#~ "\n" +#~ " Eine Logmeldung muss angegeben werden; diese kann jedoch leer sein.\n" +#~ " Wird sie nicht mittels einer --message- oder --file-Option übergeben, wird\n" +#~ " ein Editor gestartet.\n" +#~ " Falls Objekte gesperrt sind oder gesperrte Objekte enthalten, werden diese\n" +#~ " nach einer erfolgreichen Übertragung entsperrt.\n" +#~ "\n" +#~ " Wenn --include-externals angegeben wird, werden auch Dateien und\n" +#~ " Verzeichnisse in externen Verweisen übertragen, die durch Rekursion\n" +#~ " erreicht werden. Übertragen Sie keine externen Verweise mit einer\n" +#~ " festgelegten Revision.\n" -#: ../svnsync/svnsync.c:642 -#, c-format -msgid "Copied properties for revision %ld.\n" -msgstr "Eigenschaften für Revision %ld kopiert.\n" +#~ msgid "" +#~ "Display local changes or differences between two revisions or paths.\n" +#~ "usage: 1. diff\n" +#~ " 2. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n" +#~ " 3. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] \\\n" +#~ " [PATH...]\n" +#~ " 4. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n" +#~ " 5. diff OLD-URL[@OLDREV] NEW-PATH[@NEWREV]\n" +#~ " 6. diff OLD-PATH[@OLDREV] NEW-URL[@NEWREV]\n" +#~ "\n" +#~ " 1. Use just 'svn diff' to display local modifications in a working copy.\n" +#~ "\n" +#~ " 2. Display the changes made to TARGETs as they are seen in REV between\n" +#~ " two revisions. TARGETs may be all working copy paths or all URLs.\n" +#~ " If TARGETs are working copy paths, N defaults to BASE and M to the\n" +#~ " working copy; if URLs, N must be specified and M defaults to HEAD.\n" +#~ " The '-c M' option is equivalent to '-r N:M' where N = M-1.\n" +#~ " Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n" +#~ "\n" +#~ " 3. Display the differences between OLD-TGT as it was seen in OLDREV and\n" +#~ " NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n" +#~ " OLD-TGT and NEW-TGT and restrict the output to differences for those\n" +#~ " paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV].\n" +#~ " NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV default\n" +#~ " to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n" +#~ " If OLDREV or NEWREV are not specified, they default to WORKING for\n" +#~ " working copy targets and to HEAD for URL targets.\n" +#~ "\n" +#~ " Either or both OLD-TGT and NEW-TGT may also be paths to unversioned\n" +#~ " targets. Revisions cannot be specified for unversioned targets.\n" +#~ " Both targets must be of the same node kind (file or directory).\n" +#~ " Diffing unversioned targets against URL targets is not supported.\n" +#~ "\n" +#~ " 4. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n" +#~ " 5. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-PATH[@NEWREV]'\n" +#~ " 6. Shorthand for 'svn diff --old=OLD-PATH[@OLDREV] --new=NEW-URL[@NEWREV]'\n" +#~ msgstr "" +#~ "Zeigt lokale Änderungen oder Unterschiede zwischen zwei Revisionen oder Pfaden an.\n" +#~ "Aufruf: 1. diff\n" +#~ " 2. diff [-c M | -r N[:M]] [ZIEL[@REV]...]\n" +#~ " 3. diff [-r N[:M]] --old=ZIEL-ALT[@REVALT] [--new=ZIEL-NEU[@NEWREV]] \\\n" +#~ " [PFAD...]\n" +#~ " 4. diff URL-ALT[@REVALT] URL-NEU[@REVNEU]\n" +#~ " 5. diff URL-ALT[@REVALT] NEW-PATH[@REVNEU]\n" +#~ " 6. diff PFAD-ALT[@REVALT] URL-NEU[@REVNEU]\n" +#~ "\n" +#~ " 1. Verwenden Sie nur »svn diff«, um lokale Änderungen einer Arbeitskopie anzuzeigen.\n" +#~ "\n" +#~ " 2. Zeigt die Änderungen an ZIELen, wie sie in REV zwischen zwei Revisionen\n" +#~ " sichtbar sind. ZIELe können alle Arbeitskopien oder URLs sein.\n" +#~ "\n" +#~ " Falls ZIELe Arbeitskopiepfade sind, wird standardmäßig BASE für N und\n" +#~ " die Version der Arbeitskopie für M verwendet; bei URLs muss N angegeben\n" +#~ " werden und M entspricht HEAD.\n" +#~ " Die Option »-c M« ist äquivalent zu »-r N:M«, wobei N = M-1 gilt.\n" +#~ " Die Verwendung von »-c -M« macht es andersherum: »-r M:N« mit N = M-1.\n" +#~ "\n" +#~ " 3. Zeigt die Unterschiede zwischen ZIEL-ALT in REVALT und ZIEL-NEU in REVNEU.\n" +#~ " Wenn PFADe angegeben werden, sind diese relativ zu ZIEL-ALT und ZIEL-NEU,\n" +#~ " und die Ausgabe ist auf Unterschiede zwischen diesen Pfaden beschränkt.\n" +#~ " ZIEL-ALT und ZIEL-NEU können Pfade der Arbeitskopie oder der Art URL[@REV]\n" +#~ " sein. ZIEL-NEU entspricht ZIEL-ALT, falls es nicht angegeben wurde.\n" +#~ " -r N setzt REVALT auf N, -r N:M setzt REVALT auf N und REVNEU auf M.\n" +#~ " Wenn REVALT oder REVNEU nicht angegeben sind, wird für Ziele in Arbeitskopien\n" +#~ " »WORKING« und für solche in ULRs »HEAD« angenommen.\n" +#~ "\n" +#~ " ZIEL-ALT, ZIEL-NEU oder beide dürfen auch Pfade von nicht versionieren Zielen sein.\n" +#~ " Revisionen können aber für solche Ziele nicht angegeben werden. Beide Ziele\n" +#~ " müssen vom selben Knotentyp sein (Datei bzw. Verzeichnis). Die Anzeige von\n" +#~ " Unterschieden zwischen nicht versionierten Zielen und URL-Zielen wird nicht\n" +#~ " unterstützt.\n" +#~ "\n" +#~ " 4. Kurzform für »svn diff --old=URL-ALT[@REVALT] --new=URL-NEU[@REVNEU]«\n" +#~ " 5. Kurzform für »svn diff --old=URL-ALT[@REVALT] --new=URL-NEU[@REVNEU]«\n" +#~ " 6. Kurzform für »svn diff --old=URL-ALT[@REVALT] --new=URL-NEU[@REVNEU]«\n" -#: ../svnsync/svnsync.c:658 -#, c-format -msgid "NOTE: Normalized %s* properties to LF line endings (%d rev-props, %d node-props).\n" -msgstr "HINWEIS: %s* Eigenschaften nach LF-Zeilenenden normalisiert (%d Revisionseigenschaften, %d Knoteneigenschaften).\n" +#~ msgid "" +#~ "Display information about a local or remote item.\n" +#~ "usage: info [TARGET[@REV]...]\n" +#~ "\n" +#~ " Print information about each TARGET (default: '.').\n" +#~ " TARGET may be either a working-copy path or URL. If specified, REV\n" +#~ " determines in which revision the target is first looked up.\n" +#~ "\n" +#~ " With --show-item, print only the value of one item of information\n" +#~ " about TARGET. One of the following items can be selected:\n" +#~ " kind the kind of TARGET\n" +#~ " url the URL of TARGET in the repository\n" +#~ " relative-url the repository-relative URL\n" +#~ " repos-root-url the repository root URL\n" +#~ " repos-uuid the repository UUID\n" +#~ " revision the revision of TARGET (defaults to BASE\n" +#~ " for working copy paths and HEAD for URLs)\n" +#~ " last-changed-revision the most recent revision in which TARGET\n" +#~ " was changed\n" +#~ " last-changed-date the date of the last-changed revision\n" +#~ " last-changed-author the author of the last-changed revision\n" +#~ " wc-root the root of TARGET's working copy" +#~ msgstr "" +#~ "Gibt Informationen über ein lokales oder entferntes Element aus.\n" +#~ "Aufruf: info [ZIEL[@REV]...]\n" +#~ "\n" +#~ " Gibt Informationen über jedes ZIEL aus (Vorgabe: ».«).\n" +#~ " ZIEL kann entweder ein Pfad in einer Arbeitskopie oder eine URL sein. Falls\n" +#~ " angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut wird.\n" +#~ "\n" +#~ " Gibt mit »--show-item« nur den Wert eines Informationsfeldes von ZIEL aus.\n" +#~ " Eines dieser Felder kann gewählt werden:\n" +#~ " kind Art des ZIELs\n" +#~ " url URL des ZIELs im Projektarchiv\n" +#~ " relative-url URL relativ zum Projektarchiv\n" +#~ " repos-root-url Wurzel-URL des Projektarchivs\n" +#~ " repos-uuid UUID des Projektarchivs\n" +#~ " revision Die Revision von ZIEL (Immer BASE für\n" +#~ " Pfade in der Arbeitskopie und HEAD für eine URL)\n" +#~ " last-changed-revision Letzte Revision in der ZIEL geändert wurde\n" +#~ " last-changed-date Datum der Revision mit der letzten Änderung\n" +#~ " last-changed-author Autor der Revision mit der letzten Änderung\n" +#~ " wc-root Wurzel der Arbeitskopie, die ZIEL enthält" -#: ../svnsync/svnsync.c:790 -msgid "Destination repository already contains revision history; consider using --allow-non-empty if the repository's revisions are known to mirror their respective revisions in the source repository" -msgstr "Das Zielprojektarchiv enthält schon eine Revisionsgeschichte. Sie können es mit »--allow-non-empty« versuchen, falls die Revisionen dieses Projektarchivs denen des Quellprojektarchivs genau entsprechen." +# FIXME: "looked up" ist überall leicht unterschiedlich übersetzt +# Ich (Jens) bevorzuge "gesucht" statt "nachgeschlagen" oder "durchsucht", "nachgeschaut" +# FIXME: Standardsätze sollten eigene msgid haben! +#~ msgid "" +#~ "List directory entries in the repository.\n" +#~ "usage: list [TARGET[@REV]...]\n" +#~ "\n" +#~ " List each TARGET file and the contents of each TARGET directory as\n" +#~ " they exist in the repository. If TARGET is a working copy path, the\n" +#~ " corresponding repository URL will be used. If specified, REV determines\n" +#~ " in which revision the target is first looked up.\n" +#~ "\n" +#~ " The default TARGET is '.', meaning the repository URL of the current\n" +#~ " working directory.\n" +#~ "\n" +#~ " With --verbose, the following fields will be shown for each item:\n" +#~ "\n" +#~ " Revision number of the last commit\n" +#~ " Author of the last commit\n" +#~ " If locked, the letter 'O'. (Use 'svn info URL' to see details)\n" +#~ " Size (in bytes)\n" +#~ " Date and time of the last commit\n" +#~ msgstr "" +#~ "Zeigt Verzeichniseinträge im Projektarchiv.\n" +#~ "Aufruf: list [ZIEL[@REV]...]\n" +#~ "\n" +#~ " Listet jede ZIEL-Datei und die Inhalte jedes ZIEL-Verzeichnisses, wie\n" +#~ " sie im Projektarchiv existieren, auf. Wenn ZIEL ein Arbeitskopiepfad ist,\n" +#~ " wird die entsprechende URL des Projektarchivs verwendet. REV bestimmt,\n" +#~ " in welcher Revision zuerst nachgeschaut wird.\n" +#~ "\n" +#~ " Die Vorgabe für ZIEL ist ».«, d.h. die URL vom Projektarchiv des\n" +#~ " aktuellen Verzeichnisses.\n" +#~ "\n" +#~ " Mit »--verbose« werden die folgenden Felder pro Objekt angezeigt:\n" +#~ "\n" +#~ " Revisionsnummer der letzten Übertragung\n" +#~ " Autor der letzten Übertragung\n" +#~ " Falls gesperrt, der Buchstabe »O« (»svn info URL« für Details)\n" +#~ " Größe (in Bytes)\n" +#~ " Datum und Zeit der letzten Übertragung\n" -#: ../svnsync/svnsync.c:799 -#, c-format -msgid "Destination repository is already synchronizing from '%s'" -msgstr "Das Zielprojektarchiv synchronisiert bereits von »%s«" +#~ msgid "" +#~ "Show the log messages for a set of revision(s) and/or path(s).\n" +#~ "usage: 1. log [PATH][@REV]\n" +#~ " 2. log URL[@REV] [PATH...]\n" +#~ "\n" +#~ " 1. Print the log messages for the URL corresponding to PATH\n" +#~ " (default: '.'). If specified, REV is the revision in which the\n" +#~ " URL is first looked up, and the default revision range is REV:1.\n" +#~ " If REV is not specified, the default revision range is BASE:1,\n" +#~ " since the URL might not exist in the HEAD revision.\n" +#~ "\n" +#~ " 2. Print the log messages for the PATHs (default: '.') under URL.\n" +#~ " If specified, REV is the revision in which the URL is first\n" +#~ " looked up, and the default revision range is REV:1; otherwise,\n" +#~ " the URL is looked up in HEAD, and the default revision range is\n" +#~ " HEAD:1.\n" +#~ "\n" +#~ " Multiple '-c' or '-r' options may be specified (but not a\n" +#~ " combination of '-c' and '-r' options), and mixing of forward and\n" +#~ " reverse ranges is allowed.\n" +#~ "\n" +#~ " With -v, also print all affected paths with each log message.\n" +#~ " With -q, don't print the log message body itself (note that this is\n" +#~ " compatible with -v).\n" +#~ "\n" +#~ " Each log message is printed just once, even if more than one of the\n" +#~ " affected paths for that revision were explicitly requested. Logs\n" +#~ " follow copy history by default. Use --stop-on-copy to disable this\n" +#~ " behavior, which can be useful for determining branchpoints.\n" +#~ "\n" +#~ " The --depth option is only valid in combination with the --diff option\n" +#~ " and limits the scope of the displayed diff to the specified depth.\n" +#~ "\n" +#~ " If the --search option is used, log messages are displayed only if the\n" +#~ " provided search pattern matches any of the author, date, log message\n" +#~ " text (unless --quiet is used), or, if the --verbose option is also\n" +#~ " provided, a changed path.\n" +#~ " The search pattern may include \"glob syntax\" wildcards:\n" +#~ " ? matches any single character\n" +#~ " * matches a sequence of arbitrary characters\n" +#~ " [abc] matches any of the characters listed inside the brackets\n" +#~ " If multiple --search options are provided, a log message is shown if\n" +#~ " it matches any of the provided search patterns. If the --search-and\n" +#~ " option is used, that option's argument is combined with the pattern\n" +#~ " from the previous --search or --search-and option, and a log message\n" +#~ " is shown only if it matches the combined search pattern.\n" +#~ " If --limit is used in combination with --search, --limit restricts the\n" +#~ " number of log messages searched, rather than restricting the output\n" +#~ " to a particular number of matching log messages.\n" +#~ "\n" +#~ " Examples:\n" +#~ "\n" +#~ " Show the latest 5 log messages for the current working copy\n" +#~ " directory and display paths changed in each commit:\n" +#~ " svn log -l 5 -v\n" +#~ "\n" +#~ " Show the log for bar.c as of revision 42:\n" +#~ " svn log bar.c@42\n" +#~ "\n" +#~ " Show log messages and diffs for each commit to foo.c:\n" +#~ " svn log --diff http://www.example.com/repo/project/foo.c\n" +#~ " (Because the above command uses a full URL it does not require\n" +#~ " a working copy.)\n" +#~ "\n" +#~ " Show log messages for the children foo.c and bar.c of the directory\n" +#~ " '/trunk' as it appeared in revision 50, using the ^/ URL shortcut:\n" +#~ " svn log ^/trunk@50 foo.c bar.c\n" +#~ "\n" +#~ " Show the log messages for any incoming changes to foo.c during the\n" +#~ " next 'svn update':\n" +#~ " svn log -r BASE:HEAD foo.c\n" +#~ "\n" +#~ " Show the log message for the revision in which /branches/foo\n" +#~ " was created:\n" +#~ " svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo\n" +#~ msgstr "" +#~ "Zeigt die Logmeldungen für eine Menge von Revisionen und/oder Dateien.\n" +#~ "Aufruf: 1. log [PFAD][@REV]\n" +#~ " 2. log URL[@REV] [PFAD...]\n" +#~ "\n" +#~ " 1. Gibt Log-Einträge der zu PFAD gehörenden URL aus. (Vorgabe: ».«)\n" +#~ " Ist REV angegeben, ist das die Revision in der URL zuerst gesucht\n" +#~ " Ist REV angegeben, ist das die Revision in der URL zuerst gesucht\n" +#~ " wird, und der vorgegebene Versionsbereich ist REV:1. Ist REV nicht\n" +#~ " angegeben, so ist der vorgegebene Revisionsbereich BASE:1, da die\n" +#~ " URL möglicherweise in der Revision HEAD nicht existiert.\n" +#~ "\n" +#~ " 2. Gibt Log-Einträge für PFAD(e) unter URL aus, (Vorgabe: ».«)\n" +#~ " Ist REV angegeben, ist das die Revision in der URL zuerst gesucht\n" +#~ " wird, und der vorgegebene Versionsbereich ist REV:1. Andernfalls wird\n" +#~ " URL in HEAD gesucht und der vorgegebene Revisionsbereich ist\n" +#~ " HEAD:1.\n" +#~ "\n" +#~ " Mehrere »-c«- oder »-r«-Optionen dürfen angegeben werden (aber keine\n" +#~ " Kombination von »-c« und »-r«) und das Mischen von vor- und\n" +#~ " rückwärtigen Bereichen ist erlaubt.\n" +#~ "\n" +#~ " Mit »-v« werden auch die betroffenen Pfade mit jeder Logmeldung ausgegeben.\n" +#~ " Mit »-q« wird die Logmeldung selbst nicht ausgegeben (Hinweis: Diese Option\n" +#~ " ist kompatibel mit »-v«).\n" +#~ "\n" +#~ " Jede Logmeldung wird nur einmal ausgegeben, selbst wenn mehr als einer\n" +#~ " der betroffenen Pfade explizit angefragt wurde. Logs folgen per Vorgabe\n" +#~ " der Historie von Kopien. Benutzen Sie »--stop-on-copy«, um dieses Verhalten,\n" +#~ " z.B. zum Auffinden von Verzweigungen, zu deaktivieren.\n" +#~ "\n" +#~ " Die Option »--depth« ist nur in Verbindung mit der Option »--diff« gültig\n" +#~ " und begrenzt den Umfang der ausgegebenen Unterschiede auf die\n" +#~ " angegebene Tiefe.\n" +#~ "\n" +#~ " Wenn die Option »--search« verwendet wird, werden Logmeldungen nur\n" +#~ " angezeigt, wenn sie dem Suchmuster in den Feldern Autor, Datum oder\n" +#~ " Meldung (nur ohne »--quiet«), oder, falls »--verbose« angegeben ist,\n" +#~ " zusätzlich mit einem geänderten Pfad.\n" +#~ " Das Suchmuster darf folgende Platzhalter enthalten:\n" +#~ " ? entspricht einem einzelnen beliebigen Zeichen\n" +#~ " * entspricht einer Folge beliebiger Zeichen\n" +#~ " [abc] entspricht einem beliebigem Zeichen der Liste in den Klammern\n" +#~ " Werden mehrere »--search« Optionen angegeben, wird die Logmeldung\n" +#~ " ausgegeben, wenn eine einziges Suchmuster passt. Mit »--search-and«\n" +#~ " wird das angegebene Argument mit dem vorangehenden »--search« oder\n" +#~ " »--search-and« Optionen kombiniert und nur Logmeldungen ausgegeben\n" +#~ " die auf das kombinierte Suchmuster passen.\n" +#~ " Wenn »--limit« in Verbindgung mit »--search« verwendet wird, begrenzt es\n" +#~ " die Anzahl der durchsuchten Logmeldungen, nicht notwendigerweise die\n" +#~ " der ausgegebenen.\n" +#~ "\n" +#~ " Beispiele:\n" +#~ " Ausgabe der letzten 5 Logmeldungen für das Arbeitsverzeichnis in der\n" +#~ " Arbeitkopie, mit Ausgabe der geänderten Pfade: svn log -l 5 -v\n" +#~ "\n" +#~ " Ausgabe des Logs für datei.c mit Revision 42:\n" +#~ " svn log datei.c@42\n" +#~ "\n" +#~ " Ausgabe der Logmeldungen und Unterschiede für jede Übertragung\n" +#~ " von datei.c:\n" +#~ " svn log --diff http://www.example.com/repo/projekt/datei.c\n" +#~ " (Da der Befehl die URL angibt, ist keine Arbeitskopie notwendig.)\n" +#~ "\n" +#~ " Ausgabe der Logmeldungen für die Dateien datei.c and programm.c\n" +#~ " im Verzeichnis »/trunk«, wie es in Revision 50 erschien, mit der\n" +#~ " Kurzform »^/« für die URL:\n" +#~ " svn log ^/trunk@50 datei.c programm.c\n" +#~ "\n" +#~ " Ausgabe der Logmeldungen für Änderungen an datei.c, die bei der\n" +#~ " nächsten Ausführung von »svn update« empfangen werden: svn log -r BASE:HEAD datei.c\n" +#~ "\n" +#~ " Ausgabe der Logmeldung für die Revision die »/branches/zweig» erzeugte:\n" +#~ " svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/zweig\n" -#: ../svnsync/svnsync.c:834 -msgid "Destination repository has more revisions than source repository" -msgstr "Zielprojektarchiv hat mehr Revisionen als Quellprojektarchiv" +#~ msgid "" +#~ "Merge changes into a working copy.\n" +#~ "usage: 1. merge SOURCE[@REV] [TARGET_WCPATH]\n" +#~ " (the 'complete' merge)\n" +#~ " 2. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n" +#~ " (the 'cherry-pick' merge)\n" +#~ " 3. merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" +#~ " (the '2-URL' merge)\n" +#~ "\n" +#~ " 1. This form, with one source path and no revision range, is called\n" +#~ " a 'complete' merge:\n" +#~ "\n" +#~ " svn merge SOURCE[@REV] [TARGET_WCPATH]\n" +#~ "\n" +#~ " The complete merge is used for the 'sync' and 'reintegrate' merges\n" +#~ " in the 'feature branch' pattern described below. It finds all the\n" +#~ " changes on the source branch that have not already been merged to the\n" +#~ " target branch, and merges them into the working copy. Merge tracking\n" +#~ " is used to know which changes have already been merged.\n" +#~ "\n" +#~ " SOURCE specifies the branch from where the changes will be pulled, and\n" +#~ " TARGET_WCPATH specifies a working copy of the target branch to which\n" +#~ " the changes will be applied. Normally SOURCE and TARGET_WCPATH should\n" +#~ " each correspond to the root of a branch. (If you want to merge only a\n" +#~ " subtree, then the subtree path must be included in both SOURCE and\n" +#~ " TARGET_WCPATH; this is discouraged, to avoid subtree mergeinfo.)\n" +#~ "\n" +#~ " SOURCE is usually a URL. The optional '@REV' specifies both the peg\n" +#~ " revision of the URL and the latest revision that will be considered\n" +#~ " for merging; if REV is not specified, the HEAD revision is assumed. If\n" +#~ " SOURCE is a working copy path, the corresponding URL of the path is\n" +#~ " used, and the default value of 'REV' is the base revision (usually the\n" +#~ " revision last updated to).\n" +#~ "\n" +#~ " TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" +#~ " assumed. There are some special cases:\n" +#~ "\n" +#~ " - If SOURCE is a URL:\n" +#~ "\n" +#~ " - If the basename of the URL and the basename of '.' are the\n" +#~ " same, then the differences are applied to '.'. Otherwise,\n" +#~ " if a file with the same basename as that of the URL is found\n" +#~ " within '.', then the differences are applied to that file.\n" +#~ " In all other cases, the target defaults to '.'.\n" +#~ "\n" +#~ " - If SOURCE is a working copy path:\n" +#~ "\n" +#~ " - If the source is a file, then differences are applied to that\n" +#~ " file (useful for reverse-merging earlier changes). Otherwise,\n" +#~ " if the source is a directory, then the target defaults to '.'.\n" +#~ "\n" +#~ " In normal usage the working copy should be up to date, at a single\n" +#~ " revision, with no local modifications and no switched subtrees.\n" +#~ "\n" +#~ " - The 'Feature Branch' Merging Pattern -\n" +#~ "\n" +#~ " In this commonly used work flow, known also as the 'development\n" +#~ " branch' pattern, a developer creates a branch and commits a series of\n" +#~ " changes that implement a new feature. The developer periodically\n" +#~ " merges all the latest changes from the parent branch so as to keep the\n" +#~ " development branch up to date with those changes. When the feature is\n" +#~ " complete, the developer performs a merge from the feature branch to\n" +#~ " the parent branch to re-integrate the changes.\n" +#~ "\n" +#~ " parent --+----------o------o-o-------------o--\n" +#~ " \\ \\ \\ /\n" +#~ " \\ merge merge merge\n" +#~ " \\ \\ \\ /\n" +#~ " feature +--o-o-------o----o-o----o-------\n" +#~ "\n" +#~ " A merge from the parent branch to the feature branch is called a\n" +#~ " 'sync' or 'catch-up' merge, and a merge from the feature branch to the\n" +#~ " parent branch is called a 'reintegrate' merge.\n" +#~ "\n" +#~ " - Sync Merge Example -\n" +#~ " ............\n" +#~ " . .\n" +#~ " trunk --+------------L--------------R------\n" +#~ " \\ \\\n" +#~ " \\ |\n" +#~ " \\ v\n" +#~ " feature +------------------------o-----\n" +#~ " r100 r200\n" +#~ "\n" +#~ " Subversion will locate all the changes on 'trunk' that have not yet\n" +#~ " been merged into the 'feature' branch. In this case that is a single\n" +#~ " range, r100:200. In the diagram above, L marks the left side (trunk@100)\n" +#~ " and R marks the right side (trunk@200) of the merge source. The\n" +#~ " difference between L and R will be applied to the target working copy\n" +#~ " path. In this case, the working copy is a clean checkout of the entire\n" +#~ " 'feature' branch.\n" +#~ "\n" +#~ " To perform this sync merge, have a clean working copy of the feature\n" +#~ " branch and run the following command in its top-level directory:\n" +#~ "\n" +#~ " svn merge ^/trunk\n" +#~ "\n" +#~ " Note that the merge is now only in your local working copy and still\n" +#~ " needs to be committed to the repository so that it can be seen by\n" +#~ " others. You can review the changes and you may have to resolve\n" +#~ " conflicts before you commit the merge.\n" +#~ "\n" +#~ " - Reintegrate Merge Example -\n" +#~ "\n" +#~ " The feature branch was last synced with trunk up to revision X. So the\n" +#~ " difference between trunk@X and feature@HEAD contains the complete set\n" +#~ " of changes that implement the feature, and no other changes. These\n" +#~ " changes are applied to trunk.\n" +#~ "\n" +#~ " rW rX\n" +#~ " trunk ------+--------------------L------------------o\n" +#~ " \\ . ^\n" +#~ " \\ ............. /\n" +#~ " \\ . /\n" +#~ " feature +--------------------------------R\n" +#~ "\n" +#~ " In the diagram above, L marks the left side (trunk@X) and R marks the\n" +#~ " right side (feature@HEAD) of the merge. The difference between the\n" +#~ " left and right side is merged into trunk, the target.\n" +#~ "\n" +#~ " To perform the merge, have a clean working copy of trunk and run the\n" +#~ " following command in its top-level directory:\n" +#~ "\n" +#~ " svn merge ^/feature\n" +#~ "\n" +#~ " To prevent unnecessary merge conflicts, a reintegrate merge requires\n" +#~ " that TARGET_WCPATH is not a mixed-revision working copy, has no local\n" +#~ " modifications, and has no switched subtrees.\n" +#~ "\n" +#~ " A reintegrate merge also requires that the source branch is coherently\n" +#~ " synced with the target -- in the above example, this means that all\n" +#~ " revisions between the branch point W and the last merged revision X\n" +#~ " are merged to the feature branch, so that there are no unmerged\n" +#~ " revisions in-between.\n" +#~ "\n" +#~ "\n" +#~ " 2. This form is called a 'cherry-pick' merge:\n" +#~ "\n" +#~ " svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n" +#~ "\n" +#~ " A cherry-pick merge is used to merge specific revisions (or revision\n" +#~ " ranges) from one branch to another. By default, this uses merge\n" +#~ " tracking to automatically skip any revisions that have already been\n" +#~ " merged to the target; you can use the --ignore-ancestry option to\n" +#~ " disable such skipping.\n" +#~ "\n" +#~ " SOURCE is usually a URL. The optional '@REV' specifies only the peg\n" +#~ " revision of the URL and does not affect the merge range; if REV is not\n" +#~ " specified, the HEAD revision is assumed. If SOURCE is a working copy\n" +#~ " path, the corresponding URL of the path is used, and the default value\n" +#~ " of 'REV' is the base revision (usually the revision last updated to).\n" +#~ "\n" +#~ " TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" +#~ " assumed. The special cases noted above in the 'complete' merge form\n" +#~ " also apply here.\n" +#~ "\n" +#~ " The revision ranges to be merged are specified by the '-r' and/or '-c'\n" +#~ " options. '-r N:M' refers to the difference in the history of the\n" +#~ " source branch between revisions N and M. You can use '-c M' to merge\n" +#~ " single revisions: '-c M' is equivalent to '-r :M'. Each such\n" +#~ " difference is applied to TARGET_WCPATH.\n" +#~ "\n" +#~ " If the mergeinfo in TARGET_WCPATH indicates that revisions within the\n" +#~ " range were already merged, changes made in those revisions are not\n" +#~ " merged again. If needed, the range is broken into multiple sub-ranges,\n" +#~ " and each sub-range is merged separately.\n" +#~ "\n" +#~ " A 'reverse range' can be used to undo changes. For example, when\n" +#~ " source and target refer to the same branch, a previously committed\n" +#~ " revision can be 'undone'. In a reverse range, N is greater than M in\n" +#~ " '-r N:M', or the '-c' option is used with a negative number: '-c -M'\n" +#~ " is equivalent to '-r M:'. Undoing changes like this is also known\n" +#~ " as performing a 'reverse merge'.\n" +#~ "\n" +#~ " Multiple '-c' and/or '-r' options may be specified and mixing of\n" +#~ " forward and reverse ranges is allowed.\n" +#~ "\n" +#~ " - Cherry-pick Merge Example -\n" +#~ "\n" +#~ " A bug has been fixed on trunk in revision 50. This fix needs to\n" +#~ " be merged from trunk onto the release branch.\n" +#~ "\n" +#~ " 1.x-release +-----------------------o-----\n" +#~ " / ^\n" +#~ " / |\n" +#~ " / |\n" +#~ " trunk ------+--------------------------LR-----\n" +#~ " r50\n" +#~ "\n" +#~ " In the above diagram, L marks the left side (trunk@49) and R marks the\n" +#~ " right side (trunk@50) of the merge. The difference between the left\n" +#~ " and right side is applied to the target working copy path.\n" +#~ "\n" +#~ " Note that the difference between revision 49 and 50 is exactly those\n" +#~ " changes that were committed in revision 50, not including changes\n" +#~ " committed in revision 49.\n" +#~ "\n" +#~ " To perform the merge, have a clean working copy of the release branch\n" +#~ " and run the following command in its top-level directory; remember\n" +#~ " that the default target is '.':\n" +#~ "\n" +#~ " svn merge -c50 ^/trunk\n" +#~ "\n" +#~ " You can also cherry-pick several revisions and/or revision ranges:\n" +#~ "\n" +#~ " svn merge -c50,54,60 -r65:68 ^/trunk\n" +#~ "\n" +#~ "\n" +#~ " 3. This form is called a '2-URL merge':\n" +#~ "\n" +#~ " svn merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" +#~ "\n" +#~ " You should use this merge variant only if the other variants do not\n" +#~ " apply to your situation, as this variant can be quite complex to\n" +#~ " master.\n" +#~ "\n" +#~ " Two source URLs are specified, identifying two trees on the same\n" +#~ " branch or on different branches. The trees are compared and the\n" +#~ " difference from SOURCE1@REV1 to SOURCE2@REV2 is applied to the\n" +#~ " working copy of the target branch at TARGET_WCPATH. The target\n" +#~ " branch may be the same as one or both sources, or different again.\n" +#~ " The three branches involved can be completely unrelated.\n" +#~ "\n" +#~ " TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" +#~ " assumed. The special cases noted above in the 'complete' merge form\n" +#~ " also apply here.\n" +#~ "\n" +#~ " SOURCE1 and/or SOURCE2 can also be specified as a working copy path,\n" +#~ " in which case the merge source URL is derived from the working copy.\n" +#~ "\n" +#~ " - 2-URL Merge Example -\n" +#~ "\n" +#~ " Two features have been developed on separate branches called 'foo' and\n" +#~ " 'bar'. It has since become clear that 'bar' should be combined with\n" +#~ " the 'foo' branch for further development before reintegration.\n" +#~ "\n" +#~ " Although both feature branches originate from trunk, they are not\n" +#~ " directly related -- one is not a direct copy of the other. A 2-URL\n" +#~ " merge is necessary.\n" +#~ "\n" +#~ " The 'bar' branch has been synced with trunk up to revision 500.\n" +#~ " (If this revision number is not known, it can be located using the\n" +#~ " 'svn log' and/or 'svn mergeinfo' commands.)\n" +#~ " The difference between trunk@500 and bar@HEAD contains the complete\n" +#~ " set of changes related to feature 'bar', and no other changes. These\n" +#~ " changes are applied to the 'foo' branch.\n" +#~ "\n" +#~ " foo +-----------------------------------o\n" +#~ " / ^\n" +#~ " / /\n" +#~ " / r500 /\n" +#~ " trunk ------+------+-----------------L---------> /\n" +#~ " \\ . /\n" +#~ " \\ ............ /\n" +#~ " \\ . /\n" +#~ " bar +-----------------------------------R\n" +#~ "\n" +#~ " In the diagram above, L marks the left side (trunk@500) and R marks\n" +#~ " the right side (bar@HEAD) of the merge. The difference between the\n" +#~ " left and right side is applied to the target working copy path, in\n" +#~ " this case a working copy of the 'foo' branch.\n" +#~ "\n" +#~ " To perform the merge, have a clean working copy of the 'foo' branch\n" +#~ " and run the following command in its top-level directory:\n" +#~ "\n" +#~ " svn merge ^/trunk@500 ^/bar\n" +#~ "\n" +#~ " The exact changes applied by a 2-URL merge can be previewed with svn's\n" +#~ " diff command, which is a good idea to verify if you do not have the\n" +#~ " luxury of a clean working copy to merge to. In this case:\n" +#~ "\n" +#~ " svn diff ^/trunk@500 ^/bar@HEAD\n" +#~ "\n" +#~ "\n" +#~ " The following applies to all types of merges:\n" +#~ "\n" +#~ " To prevent unnecessary merge conflicts, svn merge requires that\n" +#~ " TARGET_WCPATH is not a mixed-revision working copy. Running 'svn update'\n" +#~ " before starting a merge ensures that all items in the working copy are\n" +#~ " based on the same revision.\n" +#~ "\n" +#~ " If possible, you should have no local modifications in the merge's target\n" +#~ " working copy prior to the merge, to keep things simpler. It will be\n" +#~ " easier to revert the merge and to understand the branch's history.\n" +#~ "\n" +#~ " Switched sub-paths should also be avoided during merging, as they may\n" +#~ " cause incomplete merges and create subtree mergeinfo.\n" +#~ "\n" +#~ " For each merged item a line will be printed with characters reporting the\n" +#~ " action taken. These characters have the following meaning:\n" +#~ "\n" +#~ " A Added\n" +#~ " D Deleted\n" +#~ " U Updated\n" +#~ " C Conflict\n" +#~ " G Merged\n" +#~ " E Existed\n" +#~ " R Replaced\n" +#~ "\n" +#~ " Characters in the first column report about the item itself.\n" +#~ " Characters in the second column report about properties of the item.\n" +#~ " A 'C' in the third column indicates a tree conflict, while a 'C' in\n" +#~ " the first and second columns indicate textual conflicts in files\n" +#~ " and in property values, respectively.\n" +#~ "\n" +#~ " - Merge Tracking -\n" +#~ "\n" +#~ " Subversion uses the svn:mergeinfo property to track merge history. This\n" +#~ " property is considered at the start of a merge to determine what to merge\n" +#~ " and it is updated at the conclusion of the merge to describe the merge\n" +#~ " that took place. Mergeinfo is used only if the two sources are on the\n" +#~ " same line of history -- if the first source is an ancestor of the second,\n" +#~ " or vice-versa (i.e. if one has originally been created by copying the\n" +#~ " other). This is verified and enforced when using sync merges and\n" +#~ " reintegrate merges.\n" +#~ "\n" +#~ " The --ignore-ancestry option prevents merge tracking and thus ignores\n" +#~ " mergeinfo, neither considering it nor recording it.\n" +#~ "\n" +#~ " - Merging from foreign repositories -\n" +#~ "\n" +#~ " Subversion does support merging from foreign repositories.\n" +#~ " While all merge source URLs must point to the same repository, the merge\n" +#~ " target working copy may come from a different repository than the source.\n" +#~ " However, there are some caveats. Most notably, copies made in the\n" +#~ " merge source will be transformed into plain additions in the merge\n" +#~ " target. Also, merge-tracking is not supported for merges from foreign\n" +#~ " repositories.\n" +#~ msgstr "" +#~ "Führt Änderungen aus dem Projektarchiv in einer Arbeitskopie zusammen.\n" +#~ "Aufruf: 1. merge QUELLE[@REV] [ZIEL_AKPfad]\n" +#~ " (»vollständige« Zusammenführung)\n" +#~ " 2. merge [-c M[,N...] | -r N:M ...] QUELLE[@REV] [ZIEL_AKPfad]\n" +#~ " (Zusammenführung einzelner ausgewählter Änderungen)\n" +#~ " 3. merge QUELLE1[@REV1] QUELLE2[@REV2] [ZIEL_AKPfad]\n" +#~ " (Zusammenführung der Unterschiede zweier URLs)\n" +#~ "\n" +#~ " 1. Diese Form, mit einem Quellpfad und keinem Revisionsbereich wird\n" +#~ " »vollständige« Zusammenführung genannt:\n" +#~ "\n" +#~ " svn merge QUELLE[@REV] [ZIEL_AKPfad]\n" +#~ "\n" +#~ " Die vollständige Zusammenführung wird für die Synchronisation und\n" +#~ " die Reintegration von Zweigen (nach dem Muster »Feature Branch«,\n" +#~ " s.u.) verwendet. Sie findet alle Änderungen in einem Quellpfad, die\n" +#~ " noch nicht in das Ziel eingebracht wurden, und führt sie mit\n" +#~ " Arbeitskopie zusammen. Die Zusammenführungsverfolgung wird für die\n" +#~ " Erkennung schon eingebrachter Änderungen verwendet.\n" +#~ "\n" +#~ " QUELLE ist der Zweig von dem die Änderungen geholt werden, und\n" +#~ " ZIEL_AKPfad eine Arbeitskopie des Zielzweigs, auf die die Änderungen\n" +#~ " angewendet werden. Normalerweise sollten QUELLE und ZIEL_AKPfad\n" +#~ " auf das Wurzelverzeichnis eines Zweigs zeigen. (Wenn nur ein\n" +#~ " Unterbaum zusammengeführt werden soll, muss sein Pfad sowohl in\n" +#~ " QUELLE als auch in ZIEL_AKPfad enthalten sein; Dies ist nicht\n" +#~ " empfohlen, um Zusammenführungsinformationen auf Unterbäumen zu\n" +#~ " vermeiden.)\n" +#~ "\n" +#~ " QUELLE ist im Normalfall eine URL. Die optionale Angabe von »@REV«\n" +#~ " gibt sowohl die Fix-Revision zum Auffinden des Pfades als auch die\n" +#~ " letzte Revision an, die für die Zusammenführung in Betracht\n" +#~ " gezogen wird. Ist REV nicht angegeben, wird »HEAD« angenommen. Ist\n" +#~ " QUELLE der Pfad einer Arbeitskopie, wird die damit zusammenhängende\n" +#~ " URL verwendet. Die Basisversion der Arbeitskopie wird dann als REV\n" +#~ " verwendet, dies ist meist die letzte Revision, auf die die\n" +#~ " Arbeitskopie aktualisiert wurde.\n" +#~ "\n" +#~ " ZIEL_AKPfad ist ein Arbeitskopiepfad; Fehlt die Angabe, wird\n" +#~ " allgemein das aktuelle Arbeitsverzeichnis ».« angenommen. Es gibt\n" +#~ " folgende Sonderfälle:\n" +#~ "\n" +#~ " - wenn QUELLE eine URL ist:\n" +#~ "\n" +#~ " - Sind der Basisname der URL und er Basisname von ».« gleich\n" +#~ " so werden die Unterschiede auf ».« angewandt. Andernfalls,\n" +#~ " falls eine Datei mit dem gleichen Basisnamen die jeder der\n" +#~ " URL in ».« vorhanden ist, werden die Unterschiede auf diese\n" +#~ " Datei angewandt. In allen anderen Fällen wird als Ziel ».«\n" +#~ " verwendet.\n" +#~ "\n" +#~ " - wenn QUELLE ein Arbeitskopiepfad ist:\n" +#~ "\n" +#~ " - Wenn QUELLE eine Datei ist, werden die Unterschiede auf\n" +#~ " diese Datei angewandt (Hilfreich beim rückwärtigen\n" +#~ " Zusammenführen früherer Änderungen). Andernfalls, wenn es\n" +#~ " sich um ein Verzeichnis handelt, wird als Ziel ».«\n" +#~ " verwendet.\n" +#~ "\n" +#~ " Im Normalgebrauch ist die Arbeitskopie auf dem neuesten Stand, auf\n" +#~ " einer einzigen Revision, ohne lokale Änderungen und ohne umgestellte\n" +#~ " Unterbäume.\n" +#~ "\n" +#~ " - Muster »Feature Branch« für Zusammenführungen von Codezweigen -\n" +#~ "\n" +#~ " In diesem sehr gebräuchlichen, auch »Entwicklungszweige« genannten\n" +#~ " Arbeitsschema, erzeugt ein Entwickler einen Zweig und überträgt eine\n" +#~ " Zahl von Revisionen für die Umsetzung einer neuen Funktion. Der\n" +#~ " Entwickler führt regelmäßig Änderungen des Übergeordneten Zweiges\n" +#~ " zusammen, um seinen Entwicklungszweig mit diesen Änderungen aktuell\n" +#~ " zu halten. Wenn die neue Funktion fertiggestellt ist, führt der\n" +#~ " Entwickler eine Zusammenführung vom Entwicklungszweig in den\n" +#~ " übergeordneten Zweig zur Reintegration der Änderungen aus.\n" +#~ "\n" +#~ " Haupt- --+----------o------o-o-------------o------\n" +#~ " zweig \\ \\ \\ /\n" +#~ " \\ Zusammenf. Zusammenf. Zusammenf.\n" +#~ " \\ \\ \\ /\n" +#~ " Entwicklungs- +--o-o-------o----o-o----o-----------\n" +#~ " zweig\n" +#~ "\n" +#~ " Eine Zusammenführung vom einem übergeordneten Zweig in einen\n" +#~ " Entwicklungszweig wird als »sync« (Synchronisation) oder »catch-up«\n" +#~ " (Aufholen) bezeichnet. Eine Zusammenführung vom Entwicklungszweig in\n" +#~ " den übergeordneten Zweig dagegen »reintegrate« (Reintegration).\n" +#~ "\n" +#~ " - Beispiel für Zusammenführung zur Synchronisation -\n" +#~ " ............\n" +#~ " . .\n" +#~ " trunk --+------------L--------------R------\n" +#~ " \\ \\\n" +#~ " \\ |\n" +#~ " \\ v\n" +#~ " feature +------------------------o-----\n" +#~ " r100 r200\n" +#~ "\n" +#~ " Subversion wird alle Änderungen in »trunk« ermitteln, die noch nicht\n" +#~ " in den Entwicklungszweig »feature« zusammengeführt wurden. In diesem\n" +#~ " Fall ist es ein einziger Revisionsbereich, r100:200. Im Diagramm oben\n" +#~ " markiert »L« die linke Seite (trunk@100), während »R« die rechte Seite\n" +#~ " (trunk@200) anzeigt. Der Unterschied zwischen »L« und »R« wird auf den\n" +#~ " Zielpfad in einer Arbeitskopie angewandt. In diesem Beispiel ist dies\n" +#~ " eine Arbeitskopie des gesamten Entwicklungszweigs ohne lokale\n" +#~ " Änderungen.\n" +#~ "\n" +#~ " Um die Zusammenführung zur Synchronisation auszuführen, verwenden Sie\n" +#~ " eine Arbeitskopie des Entwicklungszweigs und führen Sie dieses\n" +#~ " Kommando im obersten Verzeichnis aus:\n" +#~ "\n" +#~ " svn merge ^/trunk\n" +#~ "\n" +#~ " Beachten Sie, dass sich die Änderungen dieser Zusammenführung dann\n" +#~ " nur in Ihrer Arbeitskopie befinden und noch in das Projektarchiv\n" +#~ " übertragen werden müssen, damit sie von anderen Benutzern gesehen\n" +#~ " werden können. Sie können die Änderungen überprüfen und müssen\n" +#~ " aufgetretene Konflikte auflösen, bevor Sie die Zusammenführung\n" +#~ " übertragen.\n" +#~ "\n" +#~ " - Beispiel für Zusammenführung zur Reintegration -\n" +#~ "\n" +#~ " Der Entwicklungszweig »feature« wurde zuletzt bis zu Revision »X«\n" +#~ " mit dem Hauptzweig »trunk« synchronisiert. Daher stellt der\n" +#~ " Unterschied zwischen »trunk@X« und »feature@HEAD« die gesamte\n" +#~ " Implementierung der neuen Funktion dar, und keine weiteren Änderungen.\n" +#~ " Diese Änderungen werden nach »trunk« eingebracht.\n" +#~ "\n" +#~ " rW rX\n" +#~ " trunk ------+--------------------L------------------o\n" +#~ " \\ . ^\n" +#~ " \\ ............. /\n" +#~ " \\ . /\n" +#~ " feature +--------------------------------R\n" +#~ "\n" +#~ " Im Diagramm oben markiert »L« die linke Seite (trunk@X), während »R«\n" +#~ " die rechte Seite (feature@HEAD) der Zusammenführung anzeigt. Der\n" +#~ " Unterschied zwischen der linken und der rechten Seite wird auf »trunk«\n" +#~ " als Ziel angewandt.\n" +#~ "\n" +#~ " Um die Zusammenführung zur Reintegration auszuführen, verwenden Sie\n" +#~ " eine Arbeitskopie des Hauptzweigs »trunk« und führen Sie\n" +#~ " dieses Kommando im obersten Verzeichnis aus:\n" +#~ "\n" +#~ " svn merge ^/feature\n" +#~ "\n" +#~ " Um unnötige Konflikte zu vermeiden, erfordern Zusammenführungen zur\n" +#~ " Reintegration eine Arbeitskopie in ZIEL_AKPfad in einer einzelnen\n" +#~ " Revision, ohne lokale Änderungen oder umgestellte Unterbäume.\n" +#~ "\n" +#~ " Eine Zusammenführung zur Reintegration erfordert auch, dass der\n" +#~ " Quellzweig durchgehend mit dem dem Ziel synchronisiert ist -- im\n" +#~ " Beispiel oben bedeutet dies, dass alle Revisionen zwischen dem\n" +#~ " Verzweigungspunkt W und der letzten zusammengeführten Revision X\n" +#~ " in den Entwicklungszweig zusammengeführt wurden, und es keine nicht\n" +#~ " zusammengeführten Revisionen zwischen diesen gibt.\n" +#~ "\n" +#~ "\n" +#~ " 2. Diese Form dient der Zusammenführung einzelner ausgewählter\n" +#~ " Änderungen:\n" +#~ "\n" +#~ " svn merge [-c M[,N...] | -r N:M ...] QUELLE[@REV] [ZIEL_AKPfad]\n" +#~ "\n" +#~ " Diese Form, auch »cherry-pick« bzw. »Rosinen herauspicken« genannt,\n" +#~ " führt bestimmte Revisionen (oder Revisionsbereiche) eines Zweiges in\n" +#~ " einen anderen zusammen. Die Zusammenführungsverfolgung wird verwendet,\n" +#~ " um schon in dieses Ziel zusammenführte Revisionen automatisch zu\n" +#~ " überspringen. Verwenden Sie die Option »--ignore-ancestry«, um diese\n" +#~ " Vorgabe zu deaktivieren.\n" +#~ "\n" +#~ " QUELLE ist im Normalfall eine URL. Die optionale Angabe von »@REV«\n" +#~ " gibt nur Fix-Revision zum Auffinden des Pfades an und beeinflusst\n" +#~ " nicht den Revisionsbereich für die Zusammenführung. Ist REV nicht\n" +#~ " angegeben, wird »HEAD« angenommen. Ist QUELLE ein Arbeitskopie-\n" +#~ " pfad, wird die damit zusammenhängende URL verwendet. Die\n" +#~ " Basisversion der Arbeitskopie wird dann als REV verwendet, dies ist\n" +#~ " meist die letzte Revision, auf die sie aktualisiert wurde.\n" +#~ "\n" +#~ " ZIEL_AKPfad ist ein Arbeitskopiepfad; Fehlt die Angabe, wird allgemein\n" +#~ " das aktuelle Arbeitsverzeichnis ».« angenommen. Die unter der Form\n" +#~ " der vollständigen Zusammenführung erwähnten Sonderfälle finden hier\n" +#~ " ebenfalls Anwendung.\n" +#~ "\n" +#~ " Die zusammenzuführenden Revisionsbereiche werden durch die Optionen\n" +#~ " »-r« und/oder »-c« angegeben. »-r N:M« bezieht sich auf den\n" +#~ " Unterschied in der Versionsgeschichte im Quellzweig zwischen den\n" +#~ " Revisionen N und M. Einzelne Revisionen können mit »-c M«\n" +#~ " zusammengeführt werden, dabei ist »-c M« gleichbedeutend mit\n" +#~ " »-r :M«. Alle so ausgewählten Unterschiede werden nach\n" +#~ " ZIEL_AKPfad zusammengeführt.\n" +#~ "\n" +#~ " Wenn die Zusammenführungsinformationen in ZIEL_AKPfad anzeigen, dass\n" +#~ " die Revisionen im angegebenen Bereich schon zusammengeführt wurden,\n" +#~ " werden Änderungen aus diesen Revisionen nicht erneut zusammengeführt.\n" +#~ " Falls nötig, wird das Revisionsbereich in Unterbereiche aufgeteilt und\n" +#~ " jeder Unterbereich getrennt in das Ziel zusammengeführt.\n" +#~ "\n" +#~ " Eine »rückwärtige Zusammenführung« kann verwendet werden, um\n" +#~ " Änderungen rückgängig zu machen. Wenn z.B. Quelle und Ziel sich auf\n" +#~ " den selben Zweig beziehen, kann eine vorher übertragene Revision\n" +#~ " rückgängig gemacht werden. Dabei wird der Revisionsbereich umgekehrt,\n" +#~ " also mit einem N größer M, bei »-r N:M«, oder durch Verwendung einer\n" +#~ " negativen Zahl »-c -M«, angegeben. »-c -M« ist dabei gleichbedeutend\n" +#~ " mit »-r M:«. Änderungen so rückgängig zu machen ist auch als\n" +#~ " »reverse merge« bzw. »rückwärtige Zusammenführung« bekannt.\n" +#~ "\n" +#~ " Es können mehrere Optionen der Art »-c« und »-r« angegeben werden, die\n" +#~ " gleichzeitige Angabe von normalen und rückwärtigen Revisionsbereichen\n" +#~ " ist erlaubt.\n" +#~ "\n" +#~ " - Beispiel für Zusammenführung einzelner ausgewählter Änderungen -\n" +#~ "\n" +#~ " Ein Programmfehler wurde im Hauptentwicklungszweig »trunk« in Revision\n" +#~ " 50 behoben. Diese Korrektur soll von dort in den Wartungszweig\n" +#~ " »1.x-release« zusammengeführt werden.\n" +#~ "\n" +#~ " 1.x-release +-----------------------o-----\n" +#~ " / ^\n" +#~ " / |\n" +#~ " / |\n" +#~ " trunk ------+--------------------------LR-----\n" +#~ " r50\n" +#~ "\n" +#~ " Im Diagramm oben markiert »L« die linke Seite (trunk@49) und R die\n" +#~ " rechte Seite (trunk@50) der Zusammenführung. Der Unterschied zwischen\n" +#~ " der linken und der rechten Seite wird auf den Zielpfad in der\n" +#~ " Arbeitskopie angewandt.\n" +#~ "\n" +#~ " Beachten Sie, dass der Unterschied zwischen den Revision 49 und 50\n" +#~ " genau der Änderung entspricht, die durch Revision 50 übertragen\n" +#~ " wurde. Änderungen die durch Revision 49 übertragen wurde, sind dagegen\n" +#~ " nicht enthalten.\n" +#~ "\n" +#~ " Um diese Zusammenführung auszuführen, verwenden Sie eine Arbeitskopie\n" +#~ " ohne lokale Änderungen und führen die dieses Kommando deren obersten\n" +#~ " Verzeichnis aus. Das vorgegebene Ziel ist ».«, das aktuelle\n" +#~ " Verzeichnis.\n" +#~ "\n" +#~ " svn merge -c50 ^/trunk\n" +#~ "\n" +#~ " Sie können auch mehrere Revisionen oder Revisionsbereiche auswählen:\n" +#~ "\n" +#~ " svn merge -c50,54,60 -r65:68 ^/trunk\n" +#~ "\n" +#~ "\n" +#~ " 3. Diese Form dient der Zusammenführung der Unterschiede zweier URLs:\n" +#~ "\n" +#~ " svn merge QUELLE1[@REV1] QUELLE2[@REV2] [ZIEL_AKPfad]\n" +#~ "\n" +#~ " Diese Variante sollte nur verwendet werden, denn die vorherigen nicht\n" +#~ " auf die vorliegende Situation zutreffen, da sie unter Umständen\n" +#~ " komplex zu handhaben ist.\n" +#~ "\n" +#~ " Zwei Quell-URLs werden angegeben, die zwei Verzeichnisbäume im selben\n" +#~ " oder in verschiedenen Zweigen identfizieren. Diese werden verglichen,\n" +#~ " und der Unterschied zwischen QUELLE1@REV1 und QUELLE2@REV2 auf die\n" +#~ " Arbeitskopie des Zielzweigs in ZIEL_AKPfad angewandt. Der Zielzweig\n" +#~ " kann dabei einem der beiden Quellen entsprechen, oder kann wieder\n" +#~ " verschieden sein. Die drei involvierten Zweige müssen nicht in einer\n" +#~ " Beziehung zueinander stehen.\n" +#~ "\n" +#~ " ZIEL_AKPfad ist ein Arbeitskopiepfad; Fehlt die Angabe, wird allgemein\n" +#~ " das aktuelle Arbeitsverzeichnis ».« angenommen. Die unter der Form\n" +#~ " der vollständigen Zusammenführung erwähnten Sonderfälle finden hier\n" +#~ " ebenfalls Anwendung.\n" +#~ "\n" +#~ " QUELLE1 und/oder QUELLE2 können auch als ein Pfad in einer\n" +#~ " Arbeitskopie angegeben werden. In diesem Fall wird URL für die\n" +#~ " Zusammenführung aus dieser Arbeitskopie abgeleitet.\n" +#~ "\n" +#~ " - Beispiel für Zusammenführung der Unterschiede zweier URLs -\n" +#~ "\n" +#~ "\n" +#~ " Zwei neue Funktionen wurden in getrennten Entwicklungszweigen »foo«\n" +#~ " und »bar« entwickelt. Danach wurde klar, dass »bar« mit »foo«\n" +#~ " kombiniert werden sollte, vor weiterer Entwicklung und Reintegration\n" +#~ " in den Hauptzweig »trunk«.\n" +#~ "\n" +#~ " Obwohl beide Entwicklungszweige von Hauptzweig »trunk« ausgehen, sind\n" +#~ " sie nicht direkt verwandt - sie sind nicht direkte Kopien voneinander.\n" +#~ " Eine Zusammenführung der Unterschiede zweier URLs ist notwendig.\n" +#~ "\n" +#~ " »bar« wurde zuvor mit »trunk« bis zu dessen Revision 500\n" +#~ " synchronisiert. (Falls diese Revisionsnummer nicht bekannt ist, kann\n" +#~ " sie mit den Befehlen »svn log« und/oder »svn mergeinfo« ermittelt\n" +#~ " werden.)\n" +#~ " Der Unterschied zwischen trunk@500 und bar@HEAD enthält also die\n" +#~ " komplette Menge an Unterschieden, die die in diesem Zweig entwickelte\n" +#~ " Funktion ausmachen, und keine weiteren Unterschiede. Diese Änderungen\n" +#~ " werden jetzt auf den »bar« angewandt.\n" +#~ "\n" +#~ " foo +-----------------------------------o\n" +#~ " / ^\n" +#~ " / /\n" +#~ " / r500 /\n" +#~ " trunk ------+------+-----------------L---------> /\n" +#~ " \\ . /\n" +#~ " \\ ............ /\n" +#~ " \\ . /\n" +#~ " bar +-----------------------------------R\n" +#~ "\n" +#~ " Im Diagramm oben markiert »L« die linke Seite (trunk@500) und R die\n" +#~ " rechte Seite (bar@HEAD) der Zusammenführung. Der Unterschied zwischen\n" +#~ " der linken und der rechten Seite wird auf den Zielpfad in der\n" +#~ " Arbeitskopie angewandt. In diesem Fall ist dies eine Arbeitskopie des\n" +#~ " Entwicklungszweigs »foo«\n" +#~ "\n" +#~ " Um diese Zusammenführung auszuführen, verwenden Sie eine Arbeitskopie\n" +#~ " des Entwicklungszweigs »foo« ohne lokale Änderungen und führen die\n" +#~ " dieses Kommando im obersten Verzeichnis aus:\n" +#~ "\n" +#~ " svn merge ^/trunk@500 ^/bar\n" +#~ "\n" +#~ " Die genauen Änderungen, die durch die Zusammenführung der Unterschiede\n" +#~ " zweier URLs angewandt werden, können mit Hilfe des Kommandos »svn diff«\n" +#~ " im Voraus begutachtet werden. Diese Erfordert dann keine Arbeitskopie.\n" +#~ " In diesem Fall:\n" +#~ "\n" +#~ " svn diff ^/trunk@500 ^/bar@HEAD\n" +#~ "\n" +#~ "\n" +#~ " Folgendes trifft auf alle Zusammenführungen zu:\n" +#~ "\n" +#~ " Zur Vermeidung unnötiger Zusammenführungskonflikte erfordert »svn merge«,\n" +#~ " dass ZIEL_AKPfad keine Arbeitskopie mit verschiedenen Revision ist.\n" +#~ " Führen Sie »svn update« aus, um vor der Zusammenführung sicherzustellen,\n" +#~ " dass sich alle Objekte der Arbeitskopie auf der selben Revision befinden.\n" +#~ "\n" +#~ " Wenn möglich sollten sich vor der Zusammenführung der Einfachheit halber\n" +#~ " im Ziel der Zusammenführung keine lokalen Änderungen befinden. Es wird\n" +#~ " so einfacher, eine Zusammenführung rückgängig zu machen und die\n" +#~ " Geschichte des Zweigs zu verstehen.\n" +#~ "\n" +#~ " Umgestellte Unterbäume sollten ebenfalls bei Zusammenführungen vermieden\n" +#~ " werden, das sie unvollständige Zusammenführungen zur Folge haben können\n" +#~ " und Zusammenführungsinformationen auf Unterbäumen erzeugen.\n" +#~ "\n" +#~ " Für jedes zusammengeführte Objekt wird eine Zeile mit einem Buchstaben\n" +#~ " für die durchgeführte Aktion ausgegeben. Diese haben die folgenden\n" +#~ " Bedeutungen:\n" +#~ "\n" +#~ " A Added - Hinzugefügt\n" +#~ " D Deleted - Gelöscht\n" +#~ " U Updated - Aktualisiert\n" +#~ " C Conflict - Konflikt\n" +#~ " G Merged - Zusammengeführt\n" +#~ " E Existed - Existierend\n" +#~ " R Replaced - Ersetzt\n" +#~ "\n" +#~ " Ein Buchstabe in der ersten Spalte gibt Informationen über das Objekt\n" +#~ " selbst. Buchstaben in der zweiten Spalte betreffen Eigenschaften des\n" +#~ " Objekts. Ein »C« in der dritten Spalte zeigt einen Baumkonflikt an,\n" +#~ " während es in der ersten und zweiten Spalte jeweils einen Konflikt im\n" +#~ " Text bzw. einer Eigenschaft anzeigt.\n" +#~ "\n" +#~ " - Zusammenführungsverfolgung -\n" +#~ "\n" +#~ " Subversion verwendet die Eigenschaft »svn:mergeinfo«, um die Geschichte\n" +#~ " von Zusammenführungen aufzuzeichnen. Diese Eigenschaft wird zu Beginn\n" +#~ " der Zusammenführung ausgewertet, um die zusammenzuführenden Änderungen\n" +#~ " zu erhalten. Sie wird am Ende der Zusammenführung aktualisiert, um die\n" +#~ " vorgenommene Zusammenführung zu beschreiben. Dabei werden Informationen\n" +#~ " zur Zusammenführung nur verwendet, wenn die beiden Quellen sich auf der\n" +#~ " gleichen Linie in der Versionsgeschichte befinden -- d.h. die erste\n" +#~ " Quelle ist ein Vorfahre der zweiten oder umgekehrt (z.B. wenn eine Quelle\n" +#~ " ursprünglich die Kopie der anderen war). Diese Bedingung wird bei\n" +#~ " Zusammenführungen zur Synchronisation und zur Reintegration überprüft und\n" +#~ " durchgesetzt.\n" +#~ "\n" +#~ " Die Option »--ignore-ancestry« verhindert die Zusammenführungsverfolgung\n" +#~ " und ignoriert damit Zusammenführungsinformationen, sie werden weder\n" +#~ " in Betracht gezogen noch aufgezeichnet.\n" +#~ "\n" +#~ " - Zusammenführungen aus einem fremdem Projektarchiv -\n" +#~ "\n" +#~ " Subversion unterstützt Zusammenführungen aus fremdem Projektarchiven.\n" +#~ " Während alle URLs für Quellen der Zusammenführung auf das selbe\n" +#~ " Projektarchiv zeigen müssen, kann sich die Arbeitskopie als Ziel auf ein\n" +#~ " davon verschiedenes Projektarchiv beziehen. Es gibt aber folgende\n" +#~ " Umstände, die es zu beachten gilt: In der Quelle durchgeführte Kopien\n" +#~ " werden in einfache Hinzufügungen im Ziel umgewandelt. Weiterhin wird\n" +#~ " eine Zusammenführungsverfolgung bei Zusammenführungen aus fremdem\n" +#~ " Projektarchiven nicht unterstützt.\n" -#: ../svnsync/svnsync.c:899 ../svnsync/svnsync.c:902 ../svnsync/svnsync.c:1574 -#: ../svnsync/svnsync.c:1581 ../svnsync/svnsync.c:1820 -#: ../svnsync/svnsync.c:1823 ../svnsync/svnsync.c:1867 -#, c-format -msgid "Path '%s' is not a URL" -msgstr "Pfad »%s« ist keine URL" +#~ msgid "" +#~ "Display merge-related information.\n" +#~ "usage: 1. mergeinfo SOURCE[@REV] [TARGET[@REV]]\n" +#~ " 2. mergeinfo --show-revs=WHICH SOURCE[@REV] [TARGET[@REV]]\n" +#~ "\n" +#~ " 1. Summarize the history of merging between SOURCE and TARGET. The graph\n" +#~ " shows, from left to right:\n" +#~ " the youngest common ancestor of the branches;\n" +#~ " the latest full merge in either direction, and thus the common base\n" +#~ " that will be used for the next complete merge;\n" +#~ " the repository path and revision number of the tip of each branch.\n" +#~ "\n" +#~ " 2. Print the revision numbers on SOURCE that have been merged to TARGET\n" +#~ " (with --show-revs=merged), or that have not been merged to TARGET\n" +#~ " (with --show-revs=eligible). Print only revisions in which there was\n" +#~ " at least one change in SOURCE.\n" +#~ "\n" +#~ " If --revision (-r) is provided, filter the displayed information to\n" +#~ " show only that which is associated with the revisions within the\n" +#~ " specified range. Revision numbers, dates, and the 'HEAD' keyword are\n" +#~ " valid range values.\n" +#~ "\n" +#~ " SOURCE and TARGET are the source and target branch URLs, respectively.\n" +#~ " (If a WC path is given, the corresponding base URL is used.) The default\n" +#~ " TARGET is the current working directory ('.'). REV specifies the revision\n" +#~ " to be considered the tip of the branch; the default for SOURCE is HEAD,\n" +#~ " and the default for TARGET is HEAD for a URL or BASE for a WC path.\n" +#~ "\n" +#~ " The depth can be 'empty' or 'infinity'; the default is 'empty'.\n" +#~ msgstr "" +#~ "Zeigt relevante Informationen zu Zusammenführungen an.\n" +#~ "Aufruf: 1. mergeinfo QUELLE[@REV] [ZIEL[@REV]]\n" +#~ " 2. mergeinfo --show-revs=WAS QUELLE[@REV] [ZIEL[@REV]]\n" +#~ "\n" +#~ " 1. Fasst die Geschichte der Zusammenführungen zwischen QUELLE\n" +#~ " und ZIEL zusammen. Die Grafik zeigt von links nach rechts:\n" +#~ " den jüngsten gemeinsamen Vorfahren der Zweige; die letzte vollständige Zusammenführung in eine der Richtungen, und\n" +#~ " damit die Basis der nächste vollständigen Zusammenführung;\n" +#~ " den Pfad im Projektarchiv und die Revisionsnummer der Spitzen\n" +#~ " jedes Zweigs.\n" +#~ "\n" +#~ " 2. Zeigt Revisionsnummern an, die von QUELLE, die nach ZIEL\n" +#~ " zusammengeführt wurden (mit »--show-revs=merged«), bzw.\n" +#~ " nicht zusammengeführt wurden (mit »--show-revs=eligible«).\n" +#~ " Gibt nur Revisionen aus, wenn QUELLE mindestens eine\n" +#~ " Änderung hat.\n" +#~ "\n" +#~ " Die Angabe von »--revision« (»-r«) schränkt die Anzeige auf diesen\n" +#~ " Revisionsbereich ein. Revisionsnummern, Datumsangaben und\n" +#~ " das Schlüsselwort »HEAD« sind gültige Angaben.\n" +#~ "\n" +#~ " QUELLE und ZIEL sind jeweils URLs der Quell- und Ziel-Zweige.\n" +#~ " (Wenn ein Arbeitskopiepfad angegeben ist, wird die entsprechende\n" +#~ " Basis-URL verwendet.) Die Vorgabe für ZIEL ist das aktuelle\n" +#~ " Verzeichnis (».«). REV gibt die Revision an, die als Spitze des Zweigs\n" +#~ " angenommen werden soll, die Vorgabe für QUELLE ist »HEAD«.\n" +#~ " Die Vorgabe für ZIEL ist »HEAD« bei URLs und »BASE« bei Pfaden\n" +#~ " in einer Arbeitskopie.\n" +#~ "\n" +#~ " Die Tiefe kann »empty« oder »infinity« sein, Vorgabe ist »empty«.\n" -#: ../svnsync/svnsync.c:929 -#, c-format -msgid "Committed revision %ld.\n" -msgstr "Revision %ld übertragen.\n" +#~ msgid "" +#~ "Create a new directory under version control.\n" +#~ "usage: 1. mkdir PATH...\n" +#~ " 2. mkdir URL...\n" +#~ "\n" +#~ " Create version controlled directories.\n" +#~ "\n" +#~ " 1. Each directory specified by a working copy PATH is created locally\n" +#~ " and scheduled for addition upon the next commit.\n" +#~ "\n" +#~ " 2. Each directory specified by a URL is created in the repository via\n" +#~ " an immediate commit.\n" +#~ "\n" +#~ " In both cases, all the intermediate directories must already exist,\n" +#~ " unless the --parents option is given.\n" +#~ msgstr "" +#~ "Erzeugt ein neues Verzeichnis unter Versionskontrolle.\n" +#~ "Aufruf: 1. mkdir PFAD...\n" +#~ " 2. mkdir URL...\n" +#~ "\n" +#~ " Erzeugt Verzeichnisse unter Versionskontrolle.\n" +#~ "\n" +#~ " 1. Jedes durch den PFAD einer Arbeitskopie spezifizierte Verzeichnis wird\n" +#~ " lokal erzeugt und zum Hinzufügen bei der nächsten Übertragung eingeplant.\n" +#~ "\n" +#~ " 2. Jedes durch eine URL spezifizierte Verzeichnis wird mittels einer\n" +#~ " sofortigen Übertragung im Projektarchiv angelegt.\n" +#~ "\n" +#~ " In beiden Fällen müssen alle Zwischenverzeichnisse bereits existieren,\n" +#~ " es sei denn, die Option --parents wurde angegeben.\n" -#: ../svnsync/svnsync.c:972 -msgid "Destination repository has not been initialized" -msgstr "Zielprojektarchiv wurde noch nicht initialisiert" +#~ msgid "" +#~ "Apply a patch to a working copy.\n" +#~ "usage: patch PATCHFILE [WCPATH]\n" +#~ "\n" +#~ " Apply a unidiff patch in PATCHFILE to the working copy WCPATH.\n" +#~ " If WCPATH is omitted, '.' is assumed.\n" +#~ "\n" +#~ " A unidiff patch suitable for application to a working copy can be\n" +#~ " produced with the 'svn diff' command or third-party diffing tools.\n" +#~ " Any non-unidiff content of PATCHFILE is ignored, except for Subversion\n" +#~ " property diffs as produced by 'svn diff'.\n" +#~ "\n" +#~ " Changes listed in the patch will either be applied or rejected.\n" +#~ " If a change does not match at its exact line offset, it may be applied\n" +#~ " earlier or later in the file if a match is found elsewhere for the\n" +#~ " surrounding lines of context provided by the patch.\n" +#~ " A change may also be applied with fuzz, which means that one\n" +#~ " or more lines of context are ignored when matching the change.\n" +#~ " If no matching context can be found for a change, the change conflicts\n" +#~ " and will be written to a reject file with the extension .svnpatch.rej.\n" +#~ "\n" +#~ " For each patched file a line will be printed with characters reporting\n" +#~ " the action taken. These characters have the following meaning:\n" +#~ "\n" +#~ " A Added\n" +#~ " D Deleted\n" +#~ " U Updated\n" +#~ " C Conflict\n" +#~ " G Merged (with local uncommitted changes)\n" +#~ "\n" +#~ " Changes applied with an offset or fuzz are reported on lines starting\n" +#~ " with the '>' symbol. You should review such changes carefully.\n" +#~ "\n" +#~ " If the patch removes all content from a file, that file is scheduled\n" +#~ " for deletion. If the patch creates a new file, that file is scheduled\n" +#~ " for addition. Use 'svn revert' to undo deletions and additions you\n" +#~ " do not agree with.\n" +#~ "\n" +#~ " Hint: If the patch file was created with Subversion, it will contain\n" +#~ " the number of a revision N the patch will cleanly apply to\n" +#~ " (look for lines like '--- foo/bar.txt (revision N)').\n" +#~ " To avoid rejects, first update to the revision N using\n" +#~ " 'svn update -r N', apply the patch, and then update back to the\n" +#~ " HEAD revision. This way, conflicts can be resolved interactively.\n" +#~ msgstr "" +#~ "Wendet einen Patch auf eine Arbeitskopie an.\n" +#~ "Aufruf: patch PATCHDATEI [AKPFAD]\n" +#~ "\n" +#~ " Wendet Unterschiede im Format Unified Diff aus PATCHDATEI\n" +#~ " auf eine Arbeitskopie AKPFAD an. Wird AKPFAD weggelassen\n" +#~ " wird ».« verwendet.\n" +#~ "\n" +#~ " Ein Patch im Unidiff-Format, der auf eine Arbeitskopie anwendbar ist,\n" +#~ " kann mit »svn diff« oder Drittprogrammen erzeugt werden. Inhalte von\n" +#~ " PATCHDATEI, die nicht dem Unidiff Format entsprechen, werden\n" +#~ " ignoriert, abgesehen von solchen, die Änderungen an Eigenschaften\n" +#~ " beschreiben und von »svn diff« erzeugt werden.\n" +#~ "\n" +#~ " Im Patch aufgelistete Änderungen werden entweder angewandt oder\n" +#~ " abgewiesen. Wenn eine Änderung nicht genau auf die angegebene\n" +#~ " Stelle passt, aber mit dem gegebenen Kontext weiter oben oder unten\n" +#~ " in der Datei, kann es dennoch angewandt werden.\n" +#~ " Eine Änderung kann auch mit Unschärfe angewandt werden. Dabei\n" +#~ " werden eine oder mehrere Zeilen des Kontextes bei der Suche nach\n" +#~ " der passenden Stelle für die Änderung ignoriert. Wenn keine solche\n" +#~ " gefunden wurde, steht die Änderung im Konflikt und wird in eine Datei\n" +#~ " für abgewiesene Änderungen mit der Erweiterung ».svnpatch.rej«\n" +#~ " geschrieben.\n" +#~ "\n" +#~ " Für jede so geänderte Datei wird eine Zeile mit Buchstaben ausgegeben,\n" +#~ " die die vorgenommene Änderung mit folgender Bedeutung beschreiben:\n" +#~ "\n" +#~ " A Added - Hinzugefügt\n" +#~ " D Deleted - Gelöscht\n" +#~ " U Updated - Aktualisiert\n" +#~ " C Conflict - Konflikt\n" +#~ " G Merged - Zusammengeführt\n" +#~ "\n" +#~ " Änderungen, die mit Versatz oder Unschärfe angewandt wurden, werden\n" +#~ " mit einem »>« am Zeilenanfang markiert und sollten sorgfältig geprüft werden.\n" +#~ "\n" +#~ " Wenn ein Patch den gesamten Inhalt einer Datei entfernt, wird diese zur\n" +#~ " Löschung eingeplant. Wenn ein Patch eine neue Datei erzeugt, wird diese\n" +#~ " zum Hinzufügen eingeplant. Verwenden Sie »svn revert« um Löschungen\n" +#~ " oder Hinzufügungen rückgängig zu machen, mit denen Sie nicht einverstanden\n" +#~ " sind.\n" +#~ "\n" +#~ " Hinweis: Wenn eine Patch-Datei mit Subversion erzeugt wurde, enthält sie\n" +#~ " die Revisionsnummer N, in der der Patch sauber anwendbar ist.\n" +#~ " (Siehe Zeilen mit »--- verzeichnis/datei.txt (revision N)«).\n" +#~ " Um abgewiesene Änderungen zu vermeiden, aktualisieren Sie zuerst\n" +#~ " auf Revision N mit »svn update -r N«, wenden Sie dann den Patch an\n" +#~ " und aktualisieren Sie dann auf HEAD. Auf diese Weise können\n" +#~ " Konflikte interaktiv aufgelöst werden.\n" -#: ../svnsync/svnsync.c:1347 -#, c-format -msgid "Commit created r%ld but should have created r%ld" -msgstr "Übertragung erzeugte Revision r%ld, sollte aber r%ld erzeugen" +#~ msgid "" +#~ "Remove a property from files, dirs, or revisions.\n" +#~ "usage: 1. propdel PROPNAME [PATH...]\n" +#~ " 2. propdel PROPNAME --revprop -r REV [TARGET]\n" +#~ "\n" +#~ " 1. Removes versioned props in working copy.\n" +#~ " 2. Removes unversioned remote prop on repos revision.\n" +#~ " TARGET only determines which repository to access.\n" +#~ "\n" +#~ " See 'svn help propset' for descriptions of the svn:* special properties.\n" +#~ msgstr "" +#~ "Entfernt eine Eigenschaft von Dateien, Verzeichnissen oder\n" +#~ "Revisionen.\n" +#~ "Aufruf: 1. propdel PROPNAME [PFAD...]\n" +#~ " 2. propdel PROPNAME --revprop -r REV [URL]\n" +#~ "\n" +#~ " 1. Entfernt eine versionierte Eigenschaft aus der Arbeitskopie.\n" +#~ " 2. Entfernt eine nicht versionierte Eigenschaft aus dem Projektarchiv.\n" +#~ "\n" +#~ " Siehe »svn help propset« für Beschreibungen der speziellen »svn:*«-Eigenschaften.\n" -#: ../svnsync/svnsync.c:1467 -#, c-format -msgid "Revision being currently copied (%ld), last merged revision (%ld), and destination HEAD (%ld) are inconsistent; have you committed to the destination without using svnsync?" -msgstr "Die aktuell kopierte Revision (%ld), zuletzt zusammengeführte Revision (%ld) und Ziel-HEAD (%ld) sind inkonsistent. Haben Sie in das Ziel ohne Verwendung von svnsync übertragen?" +#~ msgid "" +#~ "Print the value of a property on files, dirs, or revisions.\n" +#~ "usage: 1. propget PROPNAME [TARGET[@REV]...]\n" +#~ " 2. propget PROPNAME --revprop -r REV [TARGET]\n" +#~ "\n" +#~ " 1. Prints versioned props. If specified, REV determines in which\n" +#~ " revision the target is first looked up.\n" +#~ " 2. Prints unversioned remote prop on repos revision.\n" +#~ " TARGET only determines which repository to access.\n" +#~ "\n" +#~ " With --verbose, the target path and the property name are printed on\n" +#~ " separate lines before each value, like 'svn proplist --verbose'.\n" +#~ " Otherwise, if there is more than one TARGET or a depth other than\n" +#~ " 'empty', the target path is printed on the same line before each value.\n" +#~ "\n" +#~ " By default, an extra newline is printed after the property value so that\n" +#~ " the output looks pretty. With a single TARGET, depth 'empty' and without\n" +#~ " --show-inherited-props, you can use the --no-newline option to disable this\n" +#~ " (useful when redirecting a binary property value to a file, for example).\n" +#~ "\n" +#~ " See 'svn help propset' for descriptions of the svn:* special properties.\n" +#~ msgstr "" +#~ "Gibt den Eigenschaftswert von Dateien, Verzeichnissen oder Revisionen aus.\n" +#~ "Aufruf: 1. propget PROPNAME [ZIEL[@REV]...]\n" +#~ " 2. propget PROPNAME --revprop -r REV [ZIEL]\n" +#~ "\n" +#~ " 1. Gibt versionierte Eigenschaften in der Arbeitskopie aus.\n" +#~ " REV bestimmt, in welcher Revision zuerst nachgeschaut wird.\n" +#~ " 2. Gibt nicht versionierte Revisionseigenschaft im Projektarchiv aus.\n" +#~ " ZIEL legt nur das Projektarchiv fest, auf das zugegriffen wird.\n" +#~ "\n" +#~ " Mit »--verbose« wird der Zielpfad und der Name der Eigenschaft auf\n" +#~ " separaten Zeilen vor jedem Wert ausgegeben, wie »svn proplist --verbose«\n" +#~ " Andernfalls wird bei mahr als einem ZIEL oder einer von »empty«\n" +#~ " verschiedenen Tiefe die Pfade auf der selben Zeile ausgegeben.\n" +#~ "\n" +#~ " Standardmäßig hängt dieser Unterbefehl eine Leerzeile an das Ende der\n" +#~ " Eigenschaftswerte an, so dass die Ausgabe hübsch aussieht. Verwenden\n" +#~ " Sie bei einem einzigen ZIEL, der Tiefe »empty« und ohne\n" +#~ " --show-inherited-props die Option »--no-newline« um diese Formatierungen\n" +#~ " abzuschalten. (dies ist z.B. nützlich, um einen binären Eigenschaftswert\n" +#~ " in eine Datei umzuleiten)\n" +#~ "\n" +#~ " Siehe »svn help propset« für Beschreibungen der speziellen »svn:*«-Eigenschaften.\n" -#: ../svnsync/svnsync.c:1504 -#, c-format -msgid "Destination HEAD (%ld) is not the last merged revision (%ld); have you committed to the destination without using svnsync?" -msgstr "Ziel-HEAD (%ld) ist nicht die zuletzt zusammengeführte Revision (%ld). Haben Sie in das Ziel ohne Verwendung von svnsync übertragen?" +#~ msgid "" +#~ "List all properties on files, dirs, or revisions.\n" +#~ "usage: 1. proplist [TARGET[@REV]...]\n" +#~ " 2. proplist --revprop -r REV [TARGET]\n" +#~ "\n" +#~ " 1. Lists versioned props. If specified, REV determines in which\n" +#~ " revision the target is first looked up.\n" +#~ " 2. Lists unversioned remote props on repos revision.\n" +#~ " TARGET only determines which repository to access.\n" +#~ "\n" +#~ " With --verbose, the property values are printed as well, like 'svn propget\n" +#~ " --verbose'. With --quiet, the paths are not printed.\n" +#~ "\n" +#~ " See 'svn help propset' for descriptions of the svn:* special properties.\n" +#~ msgstr "" +#~ "Listet alle Eigenschaften von Dateien, Verzeichnissen oder\n" +#~ "Revisionen auf.\n" +#~ "Aufruf: 1. proplist [ZIEL[@REV]...]\n" +#~ " 2. proplist --revprop -r REV [ZIEL]\n" +#~ "\n" +#~ " 1. Listet versionierte Eigenschaften in der Arbeitskopie auf.\n" +#~ " REV bestimmt, in welcher Revision zuerst nachgeschaut wird.\n" +#~ " 2. Listet nicht versionierte Revisionseigenschaften im Projektarchiv auf.\n" +#~ " ZIEL legt nur das Projektarchiv fest, auf das zugegriffen wird.\n" +#~ "\n" +#~ " Mit »--verbose« werden auch die Eigenschaftwerte ausgegeben,wie mit \n" +#~ " »svn propget --verbose«. Mit »--quiet« werden Pfade nicht ausgegeben.\n" +#~ "\n" +#~ " Siehe »svn help propset« für Beschreibungen der speziellen »svn:*«-Eigenschaften.\n" -#: ../svnsync/svnsync.c:1634 ../svnsync/svnsync.c:1639 -#, c-format -msgid "Cannot copy revprops for a revision (%ld) that has not been synchronized yet" -msgstr "Kann keine Revisionseigenschaften für eine Revision (%ld) kopieren, die noch nicht synchronisiert wurde" +# FIXME: propchange? +#~ msgid "" +#~ "Set the value of a property on files, dirs, or revisions.\n" +#~ "usage: 1. propset PROPNAME PROPVAL PATH...\n" +#~ " 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n" +#~ "\n" +#~ " 1. Changes a versioned file or directory property in a working copy.\n" +#~ " 2. Changes an unversioned property on a repository revision.\n" +#~ " (TARGET only determines which repository to access.)\n" +#~ "\n" +#~ " The value may be provided with the --file option instead of PROPVAL.\n" +#~ "\n" +#~ " Property names starting with 'svn:' are reserved. Subversion recognizes\n" +#~ " the following special versioned properties on a file:\n" +#~ " svn:keywords - Keywords to be expanded. Valid keywords are:\n" +#~ " URL, HeadURL - The URL for the head version of the file.\n" +#~ " Author, LastChangedBy - The last person to modify the file.\n" +#~ " Date, LastChangedDate - The date/time the file was last modified.\n" +#~ " Rev, Revision, - The last revision the file changed.\n" +#~ " LastChangedRevision\n" +#~ " Id - A compressed summary of the previous four.\n" +#~ " Header - Similar to Id but includes the full URL.\n" +#~ "\n" +#~ " Custom keywords can be defined with a format string separated from\n" +#~ " the keyword name with '='. Valid format substitutions are:\n" +#~ " %a - The author of the revision given by %r.\n" +#~ " %b - The basename of the URL of the file.\n" +#~ " %d - Short format of the date of the revision given by %r.\n" +#~ " %D - Long format of the date of the revision given by %r.\n" +#~ " %P - The file's path, relative to the repository root.\n" +#~ " %r - The number of the revision which last changed the file.\n" +#~ " %R - The URL to the root of the repository.\n" +#~ " %u - The URL of the file.\n" +#~ " %_ - A space (keyword definitions cannot contain a literal space).\n" +#~ " %% - A literal '%'.\n" +#~ " %H - Equivalent to %P%_%r%_%d%_%a.\n" +#~ " %I - Equivalent to %b%_%r%_%d%_%a.\n" +#~ " Example custom keyword definition: MyKeyword=%r%_%a%_%P\n" +#~ " Once a custom keyword has been defined for a file, it can be used\n" +#~ " within the file like any other keyword: $MyKeyword$\n" +#~ "\n" +#~ " svn:executable - If present, make the file executable. Use\n" +#~ " 'svn propdel svn:executable PATH...' to clear.\n" +#~ " svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n" +#~ " svn:mime-type - The mimetype of the file. Used to determine\n" +#~ " whether to merge the file, and how to serve it from Apache.\n" +#~ " A mimetype beginning with 'text/' (or an absent mimetype) is\n" +#~ " treated as text. Anything else is treated as binary.\n" +#~ " svn:needs-lock - If present, indicates that the file should be locked\n" +#~ " before it is modified. Makes the working copy file read-only\n" +#~ " when it is not locked. Use 'svn propdel svn:needs-lock PATH...'\n" +#~ " to clear.\n" +#~ "\n" +#~ " Subversion recognizes the following special versioned properties on a\n" +#~ " directory:\n" +#~ " svn:ignore - A list of file glob patterns to ignore, one per line.\n" +#~ " svn:global-ignores - Like svn:ignore, but inheritable.\n" +#~ " svn:externals - A list of module specifiers, one per line, in the\n" +#~ " following format similar to the syntax of 'svn checkout':\n" +#~ " [-r REV] URL[@PEG] LOCALPATH\n" +#~ " Example:\n" +#~ " http://example.com/repos/zig foo/bar\n" +#~ " The LOCALPATH is relative to the directory having this property.\n" +#~ " To pin the external to a known revision, specify the optional REV:\n" +#~ " -r25 http://example.com/repos/zig foo/bar\n" +#~ " To unambiguously identify an element at a path which may have been\n" +#~ " subsequently deleted or renamed, specify the optional PEG revision:\n" +#~ " -r25 http://example.com/repos/zig@42 foo/bar\n" +#~ " The URL may be a full URL or a relative URL starting with one of:\n" +#~ " ../ to the parent directory of the extracted external\n" +#~ " ^/ to the repository root\n" +#~ " / to the server root\n" +#~ " // to the URL scheme\n" +#~ " ^/../ to a sibling repository beneath the same SVNParentPath location\n" +#~ " Use of the following format is discouraged but is supported for\n" +#~ " interoperability with Subversion 1.4 and earlier clients:\n" +#~ " LOCALPATH [-r PEG] URL\n" +#~ " The ambiguous format 'relative_path relative_path' is taken as\n" +#~ " 'relative_url relative_path' with peg revision support.\n" +#~ " Lines starting with a '#' character are ignored.\n" +#~ msgstr "" +#~ "Setzt den Wert einer Eigenschaft von Dateien, Verzeichnissen\n" +#~ "oder Revisionen\n" +#~ "Aufruf: 1. propset NAME WERT PFAD...\n" +#~ " 2. propset NAME --revprop -r REV WERT [ZIEL]\n" +#~ "\n" +#~ " 1. Ändert eine versionierte Datei- oder Verzeichniseigenschaft in der\n" +#~ " Arbeitskopie.\n" +#~ " 2. Ändert eine nicht versionierte Revisionseigenschaft einer Revision\n" +#~ " im Projektarchiv.\n" +#~ " (ZIEL legt nur das Projektarchiv fest, auf das zugegriffen wird.)\n" +#~ "\n" +#~ " Der Wert kann mit der Option »--file« statt WERT angegeben werden.\n" +#~ "\n" +#~ " Namen von Eigenschaften, die mit »svn:« beginnen, sind reserviert.\n" +#~ " Subversion kennt die folgenden speziellen versionieren\n" +#~ " Eigenschaften von Dateien:\n" +#~ " svn:keywords - Schlüsselworte, die expandiert werden sollen.\n" +#~ " Gültige Schlüsselworte sind:\n" +#~ " URL, HeadURL - Die URL für die Head-Version der Datei.\n" +#~ " Author, LastChangedBy - Die letzte Person, die die Datei geändert hat.\n" +#~ " Date, LastChangedDate - Datum/Zeit der letzten Änderung.\n" +#~ " Rev, Revision, - Die letzte Revision, in der die Datei\n" +#~ " LastChangedRevision geändert wurde.\n" +#~ " Id - Eine komprimierte Zusammenfassung der vier\n" +#~ " genannten Schlüsselworte.\n" +#~ " Header - Ähnlich zu Id, enthält aber die volle URL.\n" +#~ "\n" +#~ " Benutzerdefinierte Schlüsselworte können mit ihrem Namen und einer\n" +#~ " Formatangabe, getrennt durch ein »=« definiert werden. Gültige\n" +#~ " Platzhalter sind:\n" +#~ " %a - Der Autor der Revision %r.\n" +#~ " %b - Der Basisname der URL der Datei.\n" +#~ " %d - Das Datum der Revision %r im Kurzformat.\n" +#~ " %D - Das Datum der Revision %r im Langformat.\n" +#~ " %P - Der Pfad der Datei, relativ zur Wurzel des Projektarchivs.\n" +#~ " %r - Die letzte Revision, in der die Datei geändert wurde.\n" +#~ " %R - Die URL der Wurzel des Projektarchivs.\n" +#~ " %u - Die URL der Datei.\n" +#~ " %_ - Ein Leerzeichen (Definitionen von Schlüsselwörtern dürfen\n" +#~ " selbst keine Leerzeichen enthalten).\n" +#~ " %% - Erzeugt ein '%' in der Ausgabe.\n" +#~ " %H - Entspricht %P%_%r%_%d%_%a.\n" +#~ " %I - Entspricht %b%_%r%_%d%_%a.\n" +#~ " Beispiel für ein benutzerdefiniertes Schlüsselwort: MeinSW=%r%_%a%_%P\n" +#~ " Sobald ein benutzerdefiniertes Schlüsselwort für eine Datei gesetzt ist,\n" +#~ " kann es in der Datei wie jedes andere Schlüsselwort verwendet werden:\n" +#~ " $MeinSW$\n" +#~ "\n" +#~ " svn:executable - Falls vorhanden, wird die Datei ausführbar gemacht.\n" +#~ " Verwenden Sie »svn propdel svn:executable PFAD...« zum Entfernen.\n" +#~ " svn:eol-style - Eins aus »native«, »LF«, »CR«, »CRLF«.\n" +#~ " svn:mime-type - Der MIME-Typ der Datei. Verwendet, um festzustellen, ob\n" +#~ " die Datei zusammengeführt werden kann und wie sie von Apache übertragen\n" +#~ " werden soll. Dateien ohne MIME-Typ oder deren MIME-Typ mit »text/«\n" +#~ " beginnt, werden als Text behandelt. Alles andere wird als binär angesehen.\n" +#~ " svn:needs-lock - Wenn vorhanden, soll die Datei gesperrt werden, bevor sie\n" +#~ " verändert wird. Setzt den Schreibschutz der Arbeitsdatei, wenn sie nicht\n" +#~ " gesperrt ist. Verwenden Sie »svn propdel svn:needs-lock PFAD...« zum\n" +#~ " Entfernen.\n" +#~ "\n" +#~ " Subversion kennt die folgenden speziellen versionieren\n" +#~ " Eigenschaften von Verzeichnissen:\n" +#~ " svn:ignore - Eine durch Zeilenumbruch getrennte Liste von zu\n" +#~ " ignorierenden »glob«-Dateimustern.\n" +#~ " svn:global-ignores - Wie svn:ignore, aber vererbbar.\n" +#~ " svn:externals - Eine durch Zeilenumbruch getrennte Liste von\n" +#~ " Modulnamen im folgenden Syntax von »svn checkout«:\n" +#~ " [-r REV] URL[@PEGREV] LOKALER_PFAD\n" +#~ " Beispiel:\n" +#~ " http://example.com/repos/Projekt/modul\n" +#~ " LOKALER_PFAD ist dabei relativ zum Verzeichnis mit dieser Eigenschaft.\n" +#~ " Um den externen Verweis auf eine bekannte Revision festzulegen, geben\n" +#~ " Sie optional REV an:\n" +#~ " -r25 http://example.com/repos/Projekt/modul\n" +#~ " Um ein Element in einem ggf. später gelöschten oder umbenannten Pfad\n" +#~ " eindeutig zu identifizieren, verwenden Sie optional PEGREV:\n" +#~ " -r25 http://example.com/repos/Pfad@42 projekt/modul\n" +#~ " Die URL kann eine vollständige oder relative URL sein, die mit einen der\n" +#~ " folgenden Zeichenketten startet und...\n" +#~ " ../ auf das übergeordnete Verzeichnis des extrahierten Externals\n" +#~ " ^/ auf die Wurzel des Projektarchivs\n" +#~ " / auf die Wurzel des Servers\n" +#~ " // auf das Schema\n" +#~ " ^/../ auf ein benachbartes Projektarchiv unter dem selben SVNParentPath\n" +#~ " verweist.\n" +#~ " Die Verwendung des folgenden Formats ist veraltet aber für die Kompatibilität\n" +#~ " mit Subversion 1.4 und älter weiter unterstützt:\n" +#~ " LOKALER_PFAD [-r PEGREV] URL\n" +#~ " Das mehrdeutige Format »relativer_Pfad relativer_Pfad« wird als\n" +#~ " »relative_URL relativer_Pfad« mit Peg-Revisionsunterstützung gedeutet.\n" +#~ " Zeilen, die mit »#« beginnen, werden ignoriert.\n" -#: ../svnsync/svnsync.c:1703 ../svnsync/svnsync.c:1723 -#, c-format -msgid "Invalid revision number (%ld)" -msgstr "Ungültige Revisionsnummer (%ld)" +#~ msgid "" +#~ "Relocate the working copy to point to a different repository root URL.\n" +#~ "usage: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n" +#~ " 2. relocate TO-URL [PATH]\n" +#~ "\n" +#~ " Rewrite working copy URL metadata to reflect a syntactic change only.\n" +#~ " This is used when a repository's root URL changes (such as a scheme\n" +#~ " or hostname change) but your working copy still reflects the same\n" +#~ " directory within the same repository.\n" +#~ "\n" +#~ " 1. FROM-PREFIX and TO-PREFIX are initial substrings of the working\n" +#~ " copy's current and new URLs, respectively. (You may specify the\n" +#~ " complete old and new URLs if you wish.) Use 'svn info' to determine\n" +#~ " the current working copy URL.\n" +#~ "\n" +#~ " 2. TO-URL is the (complete) new repository URL to use for PATH.\n" +#~ "\n" +#~ " Examples:\n" +#~ " svn relocate http:// svn:// project1 project2\n" +#~ " svn relocate http://www.example.com/repo/project \\\n" +#~ " svn://svn.example.com/repo/project\n" +#~ msgstr "" +#~ "Umplatzierung der Arbeitskopie auf eine andere Wurzel-URL des Projektarchivs\n" +#~ "Aufruf: 1. relocate VON NACH [PFAD...]\n" +#~ " 2. relocate NACH [PFAD]\n" +#~ "\n" +#~ " Schreibt die Metadaten der Arbeitskopie so um, dass sie einer Änderung\n" +#~ " der URL folgen. Dies wird verwendet, wenn sich die Basis-URL eines\n" +#~ " Projektarchivs ändert (z.B. durch eine Schema- oder Hostnamenänderung),\n" +#~ " während Ihre Arbeitskopie immer noch das selbe Verzeichnis im selben\n" +#~ " Projektarchiv widerspiegelt.\n" +#~ "\n" +#~ " 1. VON und NACH sind einleitende Teile der momentanen bzw. neuen URL\n" +#~ " der Arbeitskopie. (Die Angabe der kompletten neuen und alten URLs ist\n" +#~ " erlaubt.) Verwenden Sie »svn info« zur Anzeige der momentanen URL.\n" +#~ "\n" +#~ " 2. NACH ist die vollständige neue URL im Projektarchiv für PFAD.\n" +#~ "\n" +#~ " Beispiele:\n" +#~ " svn relocate http:// svn:// Projekt1 Projekt2\n" +#~ " svn relocate http://www.example.com/repo/Projekt \\\n" +#~ " svn://svn.example.com/repo/Projekt\n" -#: ../svnsync/svnsync.c:1773 -msgid "Cannot specify revisions via both command-line arguments and the --revision (-r) option" -msgstr "Revisionen dürfen nicht gleichzeitig durch Argumente in der Kommandozeile und die Option »--revision« (»-r«) angegeben werden" +#~ msgid "" +#~ "Update the working copy to a different URL within the same repository.\n" +#~ "usage: 1. switch URL[@PEGREV] [PATH]\n" +#~ " 2. switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n" +#~ "\n" +#~ " 1. Update the working copy to mirror a new URL within the repository.\n" +#~ " This behavior is similar to 'svn update', and is the way to\n" +#~ " move a working copy to a branch or tag within the same repository.\n" +#~ " If specified, PEGREV determines in which revision the target is first\n" +#~ " looked up.\n" +#~ "\n" +#~ " If --force is used, unversioned obstructing paths in the working\n" +#~ " copy do not automatically cause a failure if the switch attempts to\n" +#~ " add the same path. If the obstructing path is the same type (file\n" +#~ " or directory) as the corresponding path in the repository it becomes\n" +#~ " versioned but its contents are left 'as-is' in the working copy.\n" +#~ " This means that an obstructing directory's unversioned children may\n" +#~ " also obstruct and become versioned. For files, any content differences\n" +#~ " between the obstruction and the repository are treated like a local\n" +#~ " modification to the working copy. All properties from the repository\n" +#~ " are applied to the obstructing path.\n" +#~ "\n" +#~ " Use the --set-depth option to set a new working copy depth on the\n" +#~ " targets of this operation.\n" +#~ "\n" +#~ " By default, Subversion will refuse to switch a working copy path to\n" +#~ " a new URL with which it shares no common version control ancestry.\n" +#~ " Use the '--ignore-ancestry' option to override this sanity check.\n" +#~ "\n" +#~ " 2. The '--relocate' option is deprecated. This syntax is equivalent to\n" +#~ " 'svn relocate FROM-PREFIX TO-PREFIX [PATH]'.\n" +#~ "\n" +#~ " See also 'svn help update' for a list of possible characters\n" +#~ " reporting the action taken.\n" +#~ "\n" +#~ " Examples:\n" +#~ " svn switch ^/branches/1.x-release\n" +#~ " svn switch --relocate http:// svn://\n" +#~ " svn switch --relocate http://www.example.com/repo/project \\\n" +#~ " svn://svn.example.com/repo/project\n" +#~ msgstr "" +#~ "Stellt die Arbeitskopie auf eine andere URL.\n" +#~ "Aufruf: 1. switch URL[@PEGREV] [PFAD]\n" +#~ " 2. switch --relocate VON NACH [PFAD...]\n" +#~ "\n" +#~ " 1. Stellt die Arbeitskopie so um, dass sie eine neue URL im Projektarchiv\n" +#~ " widerspiegelt. Dieses Verhalten ist ähnlich zu »svn update« und wird\n" +#~ " verwendet, um eine Arbeitskopie auf einen Zweig oder ein Tag im selben\n" +#~ " Projektarchiv umzustellen. Falls angegeben, spezifiziert PEGREV,\n" +#~ " in welcher Revision zuerst nach dem Ziel gesucht wird.\n" +#~ "\n" +#~ " Falls --force verwendet wird, führen nicht versionierte, behindernde\n" +#~ " Pfade in der Arbeitskopie nicht automatisch zu einem Fehler, falls die\n" +#~ " Umplatzierung versucht, den selben Pfad hinzuzufügen. Falls der\n" +#~ " behindernde Pfad vom selben Typ (Datei oder Verzeichnis) wie der\n" +#~ " entsprechende Pfad im Projektarchiv ist, wird er versioniert aber sein\n" +#~ " Inhalt bleibt wie er ist in der Arbeitskopie. Das bedeutet, dass\n" +#~ " nicht versionierte Objekte eines behindernden Verzeichnisses ebenso\n" +#~ " behindernd sein und versioniert werden könnten. Für Dateien werden alle\n" +#~ " inhaltlichen Unterschiede zwischen der Behinderung und dem Projektarchiv\n" +#~ " wie lokale Änderungen der Arbeitskopie interpretiert. Alle Eigenschaften\n" +#~ " des Projektarchivs werden auf den behindernden Pfad angewandt.\n" +#~ "\n" +#~ " Verwenden Sie die Option --set-depth, um eine neue Arbeitskopietiefe für\n" +#~ " die Ziele dieser Operation zu setzen.\n" +#~ "\n" +#~ " Subversion wird sich im Normalfall weigern, eine Arbeitkopie auf eine neue\n" +#~ " URL umzustellen, mit dem sie keine gemeinsame Vorgeschichte in der\n" +#~ " Versionskontrolle hat. »--ignore-ancestry« übergeht diese Prüfung.\n" +#~ "\n" +#~ " 2. Die Option »--relocate« ist veraltet. Der Syntax ist identisch mit\n" +#~ " »svn relocate VON NACH [PFAD]«.\n" +#~ "\n" +#~ " Siehe auch »svn help update« für eine Liste möglicher Buchstaben,\n" +#~ " die die durchgeführte Aktion beschreiben.\n" +#~ "\n" +#~ " Examples:\n" +#~ " svn switch ^/branches/Version-1.x\n" +#~ " svn switch --relocate http:// svn://\n" +#~ " svn switch --relocate http://www.example.com/repo/Projekt \\\n" +#~ " svn://svn.example.com/repo/Projekt\n" -#: ../svnsync/svnsync.c:1781 ../svnsync/svnsync.c:2126 -#, c-format -msgid "Invalid revision range '%s' provided" -msgstr "Ungültiger Revisionsbereich »%s« angegeben" +# Parts of the text (--force and --set-depth) are shared with the +# switch help. Keep it consistent. +#~ msgid "" +#~ "Bring changes from the repository into the working copy.\n" +#~ "usage: update [PATH...]\n" +#~ "\n" +#~ " If no revision is given, bring working copy up-to-date with HEAD rev.\n" +#~ " Else synchronize working copy to revision given by -r.\n" +#~ "\n" +#~ " For each updated item a line will be printed with characters reporting\n" +#~ " the action taken. These characters have the following meaning:\n" +#~ "\n" +#~ " A Added\n" +#~ " D Deleted\n" +#~ " U Updated\n" +#~ " C Conflict\n" +#~ " G Merged\n" +#~ " E Existed\n" +#~ " R Replaced\n" +#~ "\n" +#~ " Characters in the first column report about the item itself.\n" +#~ " Characters in the second column report about properties of the item.\n" +#~ " A 'B' in the third column signifies that the lock for the file has\n" +#~ " been broken or stolen.\n" +#~ " A 'C' in the fourth column indicates a tree conflict, while a 'C' in\n" +#~ " the first and second columns indicate textual conflicts in files\n" +#~ " and in property values, respectively.\n" +#~ "\n" +#~ " If --force is used, unversioned obstructing paths in the working\n" +#~ " copy do not automatically cause a failure if the update attempts to\n" +#~ " add the same path. If the obstructing path is the same type (file\n" +#~ " or directory) as the corresponding path in the repository it becomes\n" +#~ " versioned but its contents are left 'as-is' in the working copy.\n" +#~ " This means that an obstructing directory's unversioned children may\n" +#~ " also obstruct and become versioned. For files, any content differences\n" +#~ " between the obstruction and the repository are treated like a local\n" +#~ " modification to the working copy. All properties from the repository\n" +#~ " are applied to the obstructing path. Obstructing paths are reported\n" +#~ " in the first column with code 'E'.\n" +#~ "\n" +#~ " If the specified update target is missing from the working copy but its\n" +#~ " immediate parent directory is present, checkout the target into its\n" +#~ " parent directory at the specified depth. If --parents is specified,\n" +#~ " create any missing parent directories of the target by checking them\n" +#~ " out, too, at depth=empty.\n" +#~ "\n" +#~ " Use the --set-depth option to set a new working copy depth on the\n" +#~ " targets of this operation.\n" +#~ msgstr "" +#~ "Aktualisiert die Arbeitskopie mit Änderungen aus dem Projektarchiv.\n" +#~ "Aufruf: update [PFAD...]\n" +#~ "\n" +#~ " Ist keine Revision angegeben, wird die Arbeitskopie auf den aktuellen\n" +#~ " Stand der HEAD-Revision gebracht. Ansonsten wird die Arbeitskopie mit der\n" +#~ " durch -r angegebenen Revision synchronisiert.\n" +#~ "\n" +#~ " Für jedes aktualisierte Objekt wird eine Zeile mit einem Buchstaben für die\n" +#~ " durchgeführte Aktion ausgegeben. Diese haben die folgenden Bedeutungen\n" +#~ "\n" +#~ " A Added - Hinzugefügt\n" +#~ " D Deleted - Gelöscht\n" +#~ " U Updated - Aktualisiert\n" +#~ " C Conflict - Konflikt\n" +#~ " G Merged - Zusammengeführt\n" +#~ " E Existed - Existierend\n" +#~ " R Replaced - Ersetzt\n" +#~ "\n" +#~ " Ein Buchstabe in der ersten Spalte symbolisiert eine Aktualisierung der\n" +#~ " Datei, während Aktualisierungen der Dateieigenschaften in der zweiten\n" +#~ " Spalte angezeigt werden.\n" +#~ " Ein »B« in der dritten Spalte zeigt an, dass die Sperre für die Datei\n" +#~ " aufgebrochen oder gestohlen wurde.\n" +#~ " Ein »C« in der vierten Spalte zeigt einen Baumkonflikt an, während es\n" +#~ " in der ersten und zweiten Spalte jeweils einen Konflikt im Text bzw.\n" +#~ " einer Eigenschaft anzeigt.\n" +#~ "\n" +#~ " Falls --force verwendet wird, werden nichtversionierte behindernde Pfade in\n" +#~ " der Arbeitskopie nicht automatisch einen Fehlschlag verursachen, wenn die\n" +#~ " Aktualisierung versucht, den selben Pfad hinzufügen. Ist der behindernde Pfad\n" +#~ " vom selben Typ (Datei oder Verzeichnis) wie der entsprechende Pfad im\n" +#~ " Projektarchiv, wird es versioniert, aber der Inhalt verbleibt wie er ist\n" +#~ " in der Arbeitskopie.\n" +#~ " Das bedeutet, dass nichtversionierte Kinder eines behindernden\n" +#~ " Verzeichnisses ebenso behindert werden und versioniert werden können. Für\n" +#~ " Dateien werden alle inhaltlichen Unterschiede zwischen der Behinderung und\n" +#~ " dem Projektarchiv wie lokale Änderungen in der Arbeitskopie interpretiert.\n" +#~ " Alle Eigenschaften des Projektarchivs werden auf den behindernden Pfad\n" +#~ " angewandt. Behindernde Pfade werden in der ersten Spalte mit »E« angezeigt.\n" +#~ "\n" +#~ " Falls das angegebene Ziel der Aktualisierung in der Arbeitskopie fehlt aber\n" +#~ " dessen unmittelbares Elternverzeichnis vorhanden ist, wird das angegebene\n" +#~ " Ziel in das Elternverzeichnis mit der angegebenen Tiefe ausgecheckt. Falls\n" +#~ " »--parents« angegeben wird, werden alle fehlenden Elternverzeichnisse auch\n" +#~ " ausgecheckt, mit der Tiefe »empty«.\n" +#~ " Verwenden Sie die Option --set-depth, um eine neue Arbeitskopietiefe für\n" +#~ " die Ziele dieser Operation zu setzen. Zurzeit kann die Tiefe eines\n" +#~ " Arbeitskopieverzeichnisses nur erhöht werden (tiefer ineinander geschachtelt);\n" +#~ " eine Verzeichnistiefe kann nicht reduziert werden.\n" -#: ../svnsync/svnsync.c:1880 -#, c-format -msgid "Repository '%s' is not initialized for synchronization" -msgstr "Das Projektarchiv »%s« ist für die Synchronisation nicht initialisiert" +#~ msgid "--trust-unknown-ca requires --non-interactive" +#~ msgstr "--trust-unknown-ca erfordert --non-interactive" -#. Print the info. -#: ../svnsync/svnsync.c:1886 -#, c-format -msgid "Source URL: %s\n" -msgstr "Quell-URL: %s\n" +#~ msgid "--trust-cn-mismatch requires --non-interactive" +#~ msgstr "--trust-cn-mismatch erfordert --non-interactive" -#: ../svnsync/svnsync.c:1888 -#, c-format -msgid "Source Repository UUID: %s\n" -msgstr "UUID des Quellprojektarchivs: %s\n" +#~ msgid "--trust-not-yet-valid requires --non-interactive" +#~ msgstr "--trust-not-yet-valid erfordert --non-interactive" -#: ../svnsync/svnsync.c:1891 -#, c-format -msgid "Last Merged Revision: %s\n" -msgstr "Letzte zusammengeführte Revision: %s\n" +#~ msgid "" +#~ "usage: 1. svnadmin delrevprop REPOS_PATH -r REVISION NAME\n" +#~ " 2. svnadmin delrevprop REPO_PATH -t TXN NAME\n" +#~ "\n" +#~ "1. Delete the property NAME on revision REVISION.\n" +#~ "\n" +#~ "Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n" +#~ "trigger the revision property-related hooks (for example, if you want\n" +#~ "an email notification sent from your post-revprop-change hook).\n" +#~ "\n" +#~ "NOTE: Revision properties are not versioned, so this command will\n" +#~ "irreversibly destroy the previous value of the property.\n" +#~ "\n" +#~ "2. Delete the property NAME on transaction TXN.\n" +#~ msgstr "" +#~ "Aufruf: 1. svnadmin delrevprop ARCHIV_PFAD -r REV NAME\n" +#~ "\n" +#~ "1. Löscht die Eigenschaft NAME der Revision REV.\n" +#~ "\n" +#~ "Mit »--use-pre-revprop-change-hook«/»--use-post-revprop-change-hook«\n" +#~ "lösen Sie die mit den Revisionseigenschaften zusammenhängenden Aktionen aus\n" +#~ "(z.B. falls Sie E-Mail-Benachrichtigungen durch Ihre »post-revprop-change«-\n" +#~ "Aktion versenden wollen).\n" +#~ "\n" +#~ "ACHTUNG: Revisionseigenschaften sind nicht versioniert. Dieser Befehl\n" +#~ "entfernt also unwiederbringlich die vorherige Eigenschaft.\n" +#~ "\n" +#~ "2. Löscht die Eigenschaft NAME der Transaktion TXN.\n" -#: ../svnsync/svnsync.c:1908 -msgid "" -"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n" -"Subversion repository replication tool.\n" -"Type 'svnsync help ' for help on a specific subcommand.\n" -"Type 'svnsync --version' to see the program version and RA modules.\n" -"\n" -"Available subcommands:\n" -msgstr "" -"Aufruf: svnsync UNTERBEFEHL ZIEL_URL [Optionen & Parameter ...]\n" -"Werkzeug zur Replikation von Subversion-Projektarchiven.\n" -"Geben Sie »svnsync help « ein, um Hilfe zu einem\n" -"Unterbefehl zu erhalten.\n" -"Geben Sie »svnsync --version« ein, um die Programmversion und die\n" -"Zugriffsmodule zu sehen.\n" -"\n" -"Verfügbare Unterbefehle:\n" +#~ msgid "" +#~ "usage: svnadmin help [SUBCOMMAND...]\n" +#~ "\n" +#~ "Describe the usage of this program or its subcommands.\n" +#~ msgstr "" +#~ "Aufruf: svnadmin help [UNTERBEFEHL...]\n" +#~ "\n" +#~ "Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n" -#: ../svnsync/svnsync.c:2187 -msgid "Cannot use --username or --password with any of --source-username, --source-password, --sync-username, or --sync-password.\n" -msgstr "Man kann nicht --username oder --password mit einem von --source-username, --source-password, --sync-username oder --sync-password verwenden.\n" +#~ msgid "" +#~ "usage: svnadmin lstxns REPOS_PATH\n" +#~ "\n" +#~ "Print the names of all uncommitted transactions.\n" +#~ msgstr "" +#~ "Aufruf: svnadmin lstxns ARCHIV_PFAD\n" +#~ "\n" +#~ "Gibt die Namen aller nicht übertragenen Transaktionen aus.\n" -# TODO: Duplicated message!!!! -#: ../svnsync/svnsync.c:2210 -msgid "--disable-locking and --steal-lock are mutually exclusive" -msgstr "--disable-locking und --steal-lock schließen sich gegenseitig aus" +#~ msgid "" +#~ "usage: 1. svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n" +#~ " 2. svnadmin setrevprop REPOS_PATH -t TXN NAME FILE\n" +#~ "\n" +#~ "1. Set the property NAME on revision REVISION to the contents of FILE.\n" +#~ "\n" +#~ "Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n" +#~ "trigger the revision property-related hooks (for example, if you want\n" +#~ "an email notification sent from your post-revprop-change hook).\n" +#~ "\n" +#~ "NOTE: Revision properties are not versioned, so this command will\n" +#~ "overwrite the previous value of the property.\n" +#~ "\n" +#~ "2. Set the property NAME on transaction TXN to the contents of FILE.\n" +#~ msgstr "" +#~ "Aufruf: 1. svnadmin setrevprop ARCHIV_PFAD -r REV NAME DATEI\n" +#~ "\n" +#~ "1. Setzt Eigenschaft NAME der Revision REV auf den Inhalt der Datei DATEI.\n" +#~ "\n" +#~ "Mit »--use-pre-revprop-change-hook«/»--use-post-revprop-change-hook«\n" +#~ "lösen Sie die mit den Revisionseigenschaften zusammenhängenden Aktionen aus\n" +#~ "(z.B. falls Sie E-Mail-Benachrichtigungen durch Ihre »post-revprop-change«-\n" +#~ "Aktion versenden wollen).\n" +#~ "\n" +#~ "ACHTUNG: Revisionseigenschaften sind nicht versioniert. Dieser Befehl\n" +#~ "überschreibt also den vorherigen Wert der Eigenschaft.\n" +#~ "\n" +#~ "2. Setzt Eigenschaft NAME der Transaktion TXN auf den Inhalt der Datei DATEI.\n" -#: ../svnsync/svnsync.c:2299 -#, c-format -msgid "" -"Subcommand '%s' doesn't accept option '%s'\n" -"Type 'svnsync help %s' for usage.\n" -msgstr "" -"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n" -"Geben Sie »svnsync help %s« für Hilfe ein.\n" +# FIXME: "looked up" ist überall leicht unterschiedlich übersetzt +# Ich (Jens) bevorzuge "gesucht" statt "nachgeschlagen" oder "durchsucht", "nachgeschaut" +# FIXME: Standardsätze sollten eigene msgid haben! +#~ msgid "" +#~ "List directory entries in the repository.\n" +#~ "usage: null-list [TARGET[@REV]...]\n" +#~ "\n" +#~ " List each TARGET file and the contents of each TARGET directory as\n" +#~ " they exist in the repository. If TARGET is a working copy path, the\n" +#~ " corresponding repository URL will be used. If specified, REV determines\n" +#~ " in which revision the target is first looked up.\n" +#~ "\n" +#~ " The default TARGET is '.', meaning the repository URL of the current\n" +#~ " working directory.\n" +#~ "\n" +#~ " With --verbose, the following fields will be fetched for each item:\n" +#~ "\n" +#~ " Revision number of the last commit\n" +#~ " Author of the last commit\n" +#~ " If locked, the letter 'O'. (Use 'svn info URL' to see details)\n" +#~ " Size (in bytes)\n" +#~ " Date and time of the last commit\n" +#~ msgstr "" +#~ "Zeigt Verzeichniseinträge im Projektarchiv.\n" +#~ "Aufruf: null-list [ZIEL[@REV]...]\n" +#~ "\n" +#~ " Listet jede ZIEL-Datei und die Inhalte jedes ZIEL-Verzeichnisses, wie\n" +#~ " sie im Projektarchiv existieren, auf. Wenn ZIEL ein Arbeitskopiepfad ist,\n" +#~ " wird die entsprechende URL des Projektarchivs verwendet. REV bestimmt,\n" +#~ " in welcher Revision zuerst nachgeschaut wird.\n" +#~ "\n" +#~ " Die Vorgabe für ZIEL ist ».«, d.h. die URL vom Projektarchiv des\n" +#~ " aktuellen Verzeichnisses.\n" +#~ "\n" +#~ " Mit »--verbose« werden die folgenden Felder pro Objekt abgerufen:\n" +#~ "\n" +#~ " Revisionsnummer der letzten Übertragung\n" +#~ " Autor der letzten Übertragung\n" +#~ " Falls gesperrt, der Buchstabe »O« (»svn info URL« für Details)\n" +#~ " Größe (in Bytes)\n" +#~ " Datum und Zeit der letzten Übertragung\n" -#: ../svnsync/svnsync.c:2389 -msgid "Try 'svnsync help' for more info" -msgstr "Versuchen Sie »svnsync help« für weitere Informationen" +#~ msgid "" +#~ "Fetch the log messages for a set of revision(s) and/or path(s).\n" +#~ "usage: 1. null-log [PATH][@REV]\n" +#~ " 2. null-log URL[@REV] [PATH...]\n" +#~ "\n" +#~ " 1. Fetch the log messages for the URL corresponding to PATH\n" +#~ " (default: '.'). If specified, REV is the revision in which the\n" +#~ " URL is first looked up, and the default revision range is REV:1.\n" +#~ " If REV is not specified, the default revision range is BASE:1,\n" +#~ " since the URL might not exist in the HEAD revision.\n" +#~ "\n" +#~ " 2. Fetch the log messages for the PATHs (default: '.') under URL.\n" +#~ " If specified, REV is the revision in which the URL is first\n" +#~ " looked up, and the default revision range is REV:1; otherwise,\n" +#~ " the URL is looked up in HEAD, and the default revision range is\n" +#~ " HEAD:1.\n" +#~ "\n" +#~ " Multiple '-c' or '-r' options may be specified (but not a\n" +#~ " combination of '-c' and '-r' options), and mixing of forward and\n" +#~ " reverse ranges is allowed.\n" +#~ "\n" +#~ " With -v, also print all affected paths with each log message.\n" +#~ " With -q, don't print the log message body itself (note that this is\n" +#~ " compatible with -v).\n" +#~ "\n" +#~ " Each log message is printed just once, even if more than one of the\n" +#~ " affected paths for that revision were explicitly requested. Logs\n" +#~ " follow copy history by default. Use --stop-on-copy to disable this\n" +#~ " behavior, which can be useful for determining branchpoints.\n" +#~ msgstr "" +#~ "Ruft die Logmeldungen für eine Menge von Revisionen und/oder Dateien ab.\n" +#~ "Aufruf: 1. null-log [PFAD][@REV]\n" +#~ " 2. null-log URL[@REV] [PFAD...]\n" +#~ "\n" +#~ " 1. Ruft Log-Einträge der zu PFAD gehörenden URL ab. (Vorgabe: ».«)\n" +#~ " Ist REV angegeben, ist das die Revision in der URL zuerst gesucht\n" +#~ " Ist REV angegeben, ist das die Revision in der URL zuerst gesucht\n" +#~ " wird, und der vorgegebene Versionsbereich ist REV:1. Ist REV nicht\n" +#~ " angegeben, so ist der vorgegebene Revisionsbereich BASE:1, da die\n" +#~ " URL möglicherweise in der Revision HEAD nicht existiert.\n" +#~ "\n" +#~ " 2. Ruft Log-Einträge für PFAD(e) unter URL ab, (Vorgabe: ».«)\n" +#~ " Ist REV angegeben, ist das die Revision in der URL zuerst gesucht\n" +#~ " wird, und der vorgegebene Versionsbereich ist REV:1. Andernfalls wird\n" +#~ " URL in HEAD gesucht und der vorgegebene Revisionsbereich ist\n" +#~ " HEAD:1.\n" +#~ "\n" +#~ " Mehrere »-c«- oder »-r«-Optionen dürfen angegeben werden (aber keine\n" +#~ " Kombination von »-c« und »-r«) und das Mischen von vor- und\n" +#~ " rückwärtigen Bereichen ist erlaubt.\n" +#~ "\n" +#~ " Mit »-v« werden auch die betroffenen Pfade mit jeder Logmeldung ausgegeben.\n" +#~ " Mit »-q« wird die Logmeldung selbst nicht ausgegeben (Hinweis: Diese Option\n" +#~ " ist kompatibel mit »-v«).\n" +#~ "\n" +#~ " Jede Logmeldung wird nur einmal ausgegeben, selbst wenn mehr als einer\n" +#~ " der betroffenen Pfade explizit angefragt wurde. Logs folgen per Vorgabe\n" +#~ " der Historie von Kopien. Benutzen Sie »--stop-on-copy«, um dieses Verhalten,\n" +#~ " z.B. zum Auffinden von Verzweigungen, zu deaktivieren.\n" -#: ../svnsync/sync.c:125 -#, c-format -msgid "Missing colon in svn:mergeinfo property" -msgstr "Fehlender Doppelpunkt in der Eigenschaft svn:mergeinfo" +#~ msgid "" +#~ "Display information about a local or remote item.\n" +#~ "usage: null-info [TARGET[@REV]...]\n" +#~ "\n" +#~ " Print information about each TARGET (default: '.').\n" +#~ " TARGET may be either a working-copy path or URL. If specified, REV\n" +#~ " determines in which revision the target is first looked up.\n" +#~ msgstr "" +#~ "Zeigt Informationen über ein lokales oder auf dem Server befindliches\n" +#~ "Objekt an.\n" +#~ "Aufruf: null-info [ZIEL[@REV]...]\n" +#~ "\n" +#~ " Gibt Informationen über jedes ZIEL aus (Vorgabe: ».«).\n" +#~ " ZIEL kann entweder ein Pfad einer Arbeitskopie oder eine URL sein. Wenn\n" +#~ " angegeben, bestimmt REV, in welcher Revision zuerst nach dem Ziel gesucht\n" +#~ " wird.\n" -#: ../svnversion/svnversion.c:49 -#, c-format -msgid "Type 'svnversion --help' for usage.\n" -msgstr "Geben Sie »svnversion --help« für weitere Hilfe ein.\n" +#~ msgid "Can't open stdio file" +#~ msgstr "Kann Standardeingabe nicht öffnen" -#: ../svnversion/svnversion.c:59 -#, c-format -msgid "" -"usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n" -"Subversion working copy identification tool.\n" -"Type 'svnversion --version' to see the program version.\n" -"\n" -" Produce a compact version identifier for the working copy path\n" -" WC_PATH. TRAIL_URL is the trailing portion of the URL used to\n" -" determine if WC_PATH itself is switched (detection of switches\n" -" within WC_PATH does not rely on TRAIL_URL). The version identifier\n" -" is written to standard output. For example:\n" -"\n" -" $ svnversion . /repos/svn/trunk\n" -" 4168\n" -"\n" -" The version identifier will be a single number if the working\n" -" copy is single revision, unmodified, not switched and with\n" -" a URL that matches the TRAIL_URL argument. If the working\n" -" copy is unusual the version identifier will be more complex:\n" -"\n" -" 4123:4168 mixed revision working copy\n" -" 4168M modified working copy\n" -" 4123S switched working copy\n" -" 4123P partial working copy, from a sparse checkout\n" -" 4123:4168MS mixed revision, modified, switched working copy\n" -"\n" -" If WC_PATH is an unversioned path, the program will output\n" -" 'Unversioned directory' or 'Unversioned file'. If WC_PATH is\n" -" an added or copied or moved path, the program will output\n" -" 'Uncommitted local addition, copy or move'.\n" -"\n" -" If invoked without arguments WC_PATH will be the current directory.\n" -"\n" -"Valid options:\n" -msgstr "" -"Aufruf: svnversion [OPTIONEN] [AK_PFAD [ANGEH_URL]]\n" -"Subversion-Werkzeug zur identifikation von Arbetiskopien.\n" -"Geben Sie »svnversion --version« ein, um die Programmversion zu sehen.\n" -"\n" -" Erzeugt eine kompakte »Versionsnummer« für den Pfad AK_PFAD der\n" -" Arbeitskopie. ANGEH_URL ist der angehängte Teil der URL, welcher\n" -" benutzt wird, um festzustellen, ob AK_PFAD selbst umgestellt wurde\n" -" (die Erkennung von Umstellungen selbst innerhalb von AK_PFAD hängt\n" -" nicht von ANGEH_URL ab). Die Versionsnummer wird auf die\n" -" Standardausgabe ausgegeben. Ein Beispiel:\n" -"\n" -" $ svnversion . /repos/svn/trunk\n" -" 4168\n" -"\n" -" Die Versionsnummer ist eine einfache Zahl, falls die Arbeitskopie\n" -" eine einzelne Revision besitzt, die nicht modifiziert, nicht umgeschaltet\n" -" ist und eine URL hat, welche mit ANGEH_URL übereinstimmt. Falls die\n" -" Arbeitskopie ungewöhnlich ist, ist die Versionsnummer komplexer:\n" -"\n" -" 4123:4168 Arbeitskopie mit verschiedenen Revisionen\n" -" 4168M Arbeitskopie mit Änderungen\n" -" 4123S umgestellte Arbeitskopie\n" -" 4123P partielle Arbeitskopie, teilweise ausgecheckt\n" -" 4123:4168MS geänderte, umgestellte Arbeitskopie aus verschiedenen\n" -" Revisionen\n" -"\n" -" Wenn AK_PFAD nicht unter Versionkontrolle steht, gibt das Programm\n" -" »nicht versioniertes Verzeichnis« bzw. »...Datei« aus. Wenn AK_PFAD\n" -" ein hinzugefügter, kopierter oder verschobener Pfad ist, wird »Nicht\n" -" übertragenes lokal hinzugefügtes, kopiertes oder verschobenes Element«\n" -" ausgegeben.\n" -"\n" -" Bei Aufruf ohne Parameter wird das aktuelle Verzeichnis als AK_PFAD angenommen.\n" -"\n" -"Gültige Optionen:\n" +#~ msgid "Treat the path prefixes as file glob patterns." +#~ msgstr "Pfadpräfix als Dateiplatzhalter behandeln." -#: ../svnversion/svnversion.c:141 -msgid "last changed rather than current revisions" -msgstr "gibt letzte geänderte statt aktueller Revisionen aus" +#~ msgid "" +#~ "usage: svnfsfs help [SUBCOMMAND...]\n" +#~ "\n" +#~ "Describe the usage of this program or its subcommands.\n" +#~ msgstr "" +#~ "Aufruf: svnfsfs help [UNTERBEFEHL...]\n" +#~ "\n" +#~ "Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n" -#: ../svnversion/svnversion.c:241 -#, c-format -msgid "Unversioned symlink%s" -msgstr "Nicht versionierter symbolischer Link%s" +#~ msgid "" +#~ "usage: svnfsfs dump-index REPOS_PATH -r REV\n" +#~ "\n" +#~ "Dump the index contents for the revision / pack file containing revision REV\n" +#~ "to console. This is only available for FSFS format 7 (SVN 1.9+) repositories.\n" +#~ "The table produced contains a header in the first line followed by one line\n" +#~ "per index entry, ordered by location in the revision / pack file. Columns:\n" +#~ "\n" +#~ " * Byte offset (hex) at which the item starts\n" +#~ " * Length (hex) of the item in bytes\n" +#~ " * Item type (string) is one of the following:\n" +#~ "\n" +#~ " none ... Unused section. File contents shall be NULs.\n" +#~ " frep ... File representation.\n" +#~ " drep ... Directory representation.\n" +#~ " fprop .. File property.\n" +#~ " dprop .. Directory property.\n" +#~ " node ... Node revision.\n" +#~ " chgs ... Changed paths list.\n" +#~ " rep .... Representation of unknown type. Should not be used.\n" +#~ " ??? .... Invalid. Index data is corrupt.\n" +#~ "\n" +#~ " The distinction between frep, drep, fprop and dprop is a mere internal\n" +#~ " classification used for various optimizations and does not affect the\n" +#~ " operational correctness.\n" +#~ "\n" +#~ " * Revision that the item belongs to (decimal)\n" +#~ " * Item number (decimal) within that revision\n" +#~ " * Modified FNV1a checksum (8 hex digits)\n" +#~ msgstr "" +#~ "Aufruf: svnfsfs dump-index ARCHIV_PFAD -r REV\n" +#~ "\n" +#~ "Gibt den Inhalt des Index der Revisions- oder Pack-Datei der Revision REV\n" +#~ "auf die Konsole aus. Nur verfügbar für Projektarchive im FSFS Format 7\n" +#~ "(SVN 1.9+). Die ausgegebene Tabelle beinhaltet Kopfdaten in der ersten Zeile\n" +#~ "gefolgt von einer Zeile je Indexeintrag, geordnet nach Position in der\n" +#~ "Revisions- / Pack-Datei. Spalten:\n" +#~ "\n" +#~ " * Offset an dem das Element beginnt in Byte (hexadezimal)\n" +#~ " * Länge des Elements in Byte (hexadezimal)\n" +#~ " * Typ des Elements (Text), und zwar einen der Folgenden:\n" +#~ "\n" +#~ " none ... Nicht verwendeter Abschnitt. Dateninhalt sind NUL-Byte.\n" +#~ " frep ... Darstellung einer Datei.\n" +#~ " drep ... Darstellung eines Verzeichnisse.\n" +#~ " fprop .. Eigenschaft einer Datei.\n" +#~ " dprop .. Eigenschaft eines Verzeichnisses.\n" +#~ " node ... Knotenrevision.\n" +#~ " chgs ... Liste geänderter Pfade.\n" +#~ " rep .... Darstellung unbekannten Typs. Sollte nicht verwendet werden.\n" +#~ " ??? .... Ungültig. Indexdaten sind beschädigt.\n" +#~ "\n" +#~ " Die Unterscheidung zwischen frep, drep, fprop und dprop ist eine rein\n" +#~ " interne Einordnung für verschiedene Optimierungen und betrifft nicht die\n" +#~ " Korrektheit im normalen Betrieb.\n" +#~ "\n" +#~ " * Revision zu dem das Element gehört (dezimal)\n" +#~ " * Nummer des Elements in dieser Revision (dezimal)\n" +#~ " * Modifizierte FNV1a-Prüfsumme (8 hexadezimale Stellen)\n" -#: ../svnversion/svnversion.c:244 -#, c-format -msgid "Unversioned directory%s" -msgstr "Nicht versioniertes Verzeichnis%s" +#~ msgid "" +#~ "usage: svnlook help [SUBCOMMAND...]\n" +#~ "\n" +#~ "Describe the usage of this program or its subcommands.\n" +#~ msgstr "" +#~ "Aufruf: svnlook help [UNTERBEFEHL...]\n" +#~ "\n" +#~ "Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n" -#: ../svnversion/svnversion.c:247 -#, c-format -msgid "Unversioned file%s" -msgstr "Nicht versionierte Datei%s" +#~ msgid "" +#~ "usage: svnrdump help [SUBCOMMAND...]\n" +#~ "\n" +#~ "Describe the usage of this program or its subcommands.\n" +#~ msgstr "" +#~ "Aufruf: svnrdump help [UNTERBEFEHL...]\n" +#~ "\n" +#~ "Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n" -#: ../svnversion/svnversion.c:253 -#, c-format -msgid "'%s' doesn't exist\n" -msgstr "»%s« existiert nicht\n" +#~ msgid "" +#~ "Maximum number of server threads, even if there\n" +#~ " are more connections. Minimum value is 1.\n" +#~ " Default is 256.\n" +#~ " [used only with --threads]" +#~ msgstr "" +#~ "Höchstanzahl der Serverthreads, selbst wenn mehr\n" +#~ " Verbindungen anliegen. Mindestwert 1.\n" +#~ " Vorgabe ist 256.\n" +#~ " [nur zusammen mit --threads verwendet]" -#: ../svnversion/svnversion.c:254 -#, c-format -msgid "'%s' is of unknown type\n" -msgstr "»%s« ist unbekannten Typs\n" +#~ msgid "" +#~ "usage:\n" +#~ "\n" +#~ " 1. svnsync copy-revprops DEST_URL [SOURCE_URL]\n" +#~ " 2. svnsync copy-revprops DEST_URL REV[:REV2]\n" +#~ "\n" +#~ "Copy the revision properties in a given range of revisions to the\n" +#~ "destination from the source with which it was initialized. If the\n" +#~ "revision range is not specified, it defaults to all revisions in\n" +#~ "the DEST_URL repository. Note also that the 'HEAD' revision is the\n" +#~ "latest in DEST_URL, not necessarily the latest in SOURCE_URL.\n" +#~ "\n" +#~ "If SOURCE_URL is provided, use that as the source repository URL,\n" +#~ "ignoring what is recorded in the destination repository as the\n" +#~ "source URL. Specifying SOURCE_URL is recommended in particular\n" +#~ "if untrusted users/administrators may have write access to the\n" +#~ "DEST_URL repository.\n" +#~ "\n" +#~ "Form 2 is deprecated syntax, equivalent to specifying \"-rREV[:REV2]\".\n" +#~ msgstr "" +#~ "Aufruf:\n" +#~ "\n" +#~ " 1. svnsync copy-revprops ZIEL_URL [QUELL_URL]\n" +#~ " 2. svnsync copy-revprops ZIEL_URL PAR1[:PAR2]\n" +#~ "\n" +#~ "Kopiert Revisionseigenschaften eines angegebenen Bereichs\n" +#~ "von Revisionen in ein Zielprojektarchiv, aus der Quelle mit der\n" +#~ "dieses für die Synchronisierung vorbereitet wurde. Wenn der\n" +#~ "Revisionsbereich nicht angegeben wurde, werden alle im\n" +#~ "Revisionen im Projektarchiv ZIEL_URL übertragen.\n" +#~ "Beachten Sie, dass die Revision »HEAD« die neueste Revision\n" +#~ "in ZIEL_URL bezeichnet, nicht notwendigerweise die neueste in\n" +#~ "QUELL_URL.\n" +#~ "\n" +#~ "Falls QUELL_URL angegeben ist, wird dies als Quellprojektarchiv\n" +#~ "verwendet, egal welche Quelle im Zielprojektarchiv konfiguriert wurde.\n" +#~ "Die Angabe von QUELL_URL ist ratsam, falls nicht vertrauenswürdige\n" +#~ "Benutzer oder Administratoren Schreibzugriff auf ZIEL_URL haben.\n" +#~ "\n" +#~ "Die Angabe des Revisionsbereichs in der zweiten Form ist veraltet\n" +#~ "und ist gleichbedeutend mit der Angabe der Option »-r PAR1[:PAR2]«\n" -#. Local uncommitted modifications, no revision info was found. -#: ../svnversion/svnversion.c:268 -#, c-format -msgid "Uncommitted local addition, copy or move%s" -msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes Element%s" +#~ msgid "" +#~ "usage: svnsync help [SUBCOMMAND...]\n" +#~ "\n" +#~ "Describe the usage of this program or its subcommands.\n" +#~ msgstr "" +#~ "Aufruf: svnsync help [UNTERBEFEHL...]\n" +#~ "\n" +#~ "Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n" #~ msgid "Path '/%s' already exists" #~ msgstr "Pfad »/%s« existiert bereits" @@ -18147,9 +23594,6 @@ msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes El #~ msgid "Can't write to '%s'" #~ msgstr "Kann nicht nach »%s« schreiben" -#~ msgid "Repository '%s' not found in the database" -#~ msgstr "Projektverzeichnis »%s« nicht in der Datenbank gefunden" - #~ msgid "(To set the '%s' property, re-run with '--force'.)" #~ msgstr "(Verwenden Sie »--force« um das Setzen der Eigenschaft »%s« zu erzwingen)" @@ -18173,23 +23617,6 @@ msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes El #~ "\n" #~ " Falls angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut wird.\n" -#~ msgid "" -#~ "Display information about a local or remote item.\n" -#~ "usage: info [TARGET[@REV]...]\n" -#~ "\n" -#~ " Print information about each TARGET (default: '.').\n" -#~ " TARGET may be either a working-copy path or URL. If specified, REV\n" -#~ " determines in which revision the target is first looked up.\n" -#~ msgstr "" -#~ "Zeigt Informationen über ein lokales oder auf dem Server befindliches\n" -#~ "Objekt an.\n" -#~ "Aufruf: info [ZIEL[@REV]...]\n" -#~ "\n" -#~ " Gibt Informationen über jedes ZIEL aus (Vorgabe: ».«).\n" -#~ " ZIEL kann entweder ein Pfad einer Arbeitskopie oder eine URL sein. Wenn\n" -#~ " angegeben, bestimmt REV, in welcher Revision zuerst nach dem Ziel gesucht\n" -#~ " wird.\n" - #~ msgid "don't print an extra newline" #~ msgstr "Keinen zusätzlichen Zeilenumbruch ausgeben" @@ -18211,9 +23638,6 @@ msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes El #~ msgid "No pathname preceding ':'" #~ msgstr "Vor »:« steht kein Pfadname" -#~ msgid "Cannot auto-resolve tree-conflict on '%s'" -#~ msgstr "Kann Baumkonflikt in »%s« nicht automatisch auflösen" - #~ msgid "" #~ "Print the youngest revision number of a target's repository.\n" #~ "usage: youngest [TARGET]\n" @@ -18412,9 +23836,6 @@ msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes El #~ msgid "Error retrieving REPORT" #~ msgstr "Fehler beim Holen von REPORT" -#~ msgid "XML parsing failed" -#~ msgstr "XML-Parser schlug fehl" - #~ msgid "XML parsing failed: (%d %s)" #~ msgstr "XML-Parser schlug fehl: (%d %s)" @@ -18621,9 +24042,6 @@ msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes El #~ msgid "prefer local change" #~ msgstr "Bevorzugt lokale Änderungen " -#~ msgid "prefer incoming change" -#~ msgstr "Bevorzugt empfangene Änderungen " - #~ msgid "break the move, change move destination into a copy" #~ msgstr "Teilt die Verschiebung auf, wandelt Ziel der Verschiebung in eine Kopie um" @@ -18656,15 +24074,6 @@ msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes El #~ " Hinweis: Dieser Unterbefehl erfordert keinen Netzwerkzugriff und löst\n" #~ " Konfliktzustände auf.\n" -#~ msgid "" -#~ "usage: svnadmin freeze REPOS_PATH PROGRAM [ARG...]\n" -#~ "\n" -#~ "Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n" -#~ msgstr "" -#~ "Aufruf: svnadmin freeze ARCHIV_PFAD PROGRAMM [PAR...]\n" -#~ "\n" -#~ "Führt PROGRAMM mit den Optionen PAR aus, während ARCHIV_PFAD mit einer Schreibsperre belegt wird.\n" - #~ msgid "Path '%s' has no URL" #~ msgstr "Pfad »%s« hat keine URL" @@ -18969,11 +24378,6 @@ msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes El #~ msgid "Got close-file element without preceding add-file or open-file" #~ msgstr "Fand Element »close-file« ohne vorhergehendes »add-file« oder »open-file«" -# FIXME: inkonsistent zu obigen Meldungen: open_directory statt opening a directory -# (Wird Bezug zu Elementen in Dump hergestellt oder nicht?) -#~ msgid "Got close-directory element without ever opening a directory" -#~ msgstr "Fand Element »close-directory« ohne vorhergehendes Öffnen eines Verzeichnisses" - #~ msgid "Got cdata content for a prop delete" #~ msgstr "Fand cdata-Inhalt für eine Eigenschaftslöschung" @@ -19103,9 +24507,6 @@ msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes El #~ msgid "NULL mergeinfo\n" #~ msgstr "Zusammenführungsinformationen sind NULL\n" -#~ msgid "empty mergeinfo\n" -#~ msgstr "Zusammenführungsinformationen sind leer\n" - #~ msgid "Schema format %d not recognized" #~ msgstr "Schema-Format %d wird nicht erkannt" @@ -19468,17 +24869,6 @@ msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes El #~ " URL -> URL: Vollständig serverseitiges Verschieben.\n" #~ " Alle QUELLEn müssen vom selben Typ sein.\n" -#~ msgid "" -#~ "Resolve conflicts on working copy files or directories.\n" -#~ "usage: resolve --accept=ARG [PATH...]\n" -#~ "\n" -#~ " Note: the --accept option is currently required.\n" -#~ msgstr "" -#~ "Auflösen von Konflikten in Arbeitskopiedateien oder -verzeichnissen.\n" -#~ "Aufruf: resolve --accept=PAR [PFAD...]\n" -#~ "\n" -#~ " Bemerkung: Die Option --accept wird zurzeit benötigt.\n" - #~ msgid "--reintegrate cannot be used with --ignore-ancestry or --record-only" #~ msgstr "--reintegrate kann nicht mit --ignore-ancestry oder --record-only verwendet werden" @@ -19512,15 +24902,6 @@ msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes El #~ " earlier than 1.7" #~ msgstr "Ein mit Subversion-Versionen vor 1.7 kompatibles Format verwenden" -#~ msgid "" -#~ "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n" -#~ "\n" -#~ "Makes a hot copy of a repository.\n" -#~ msgstr "" -#~ "Aufruf: svnadmin hotcopy ARCHIV_PFAD ARCHIV_PFAD_NEU\n" -#~ "\n" -#~ "Erstellt eine Kopie des Projektarchivs im laufenden Betrieb.\n" - #~ msgid "Exactly one property name and one file argument required" #~ msgstr "Genau ein Eigenschaftsname und ein Dateiparameter erforderlich" @@ -19600,9 +24981,6 @@ msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes El #~ msgid "UUID mismatch: existing file '%s' was checked out from a different repository" #~ msgstr "UUID-Fehler: Existierende Datei »%s« wurde aus einem anderen Projektarchiv ausgecheckt" -#~ msgid "Error comparing '%s' and '%s'" -#~ msgstr "Fehler beim Vergleichen von »%s« und »%s«" - #~ msgid "Revision type requires a working copy path, not a URL" #~ msgstr "Revisionstyp erfordert einen Arbeitskopiepfad, keine URL" @@ -19775,9 +25153,6 @@ msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes El #~ msgid "No delimiter after 'victim_path' in tree conflict description" #~ msgstr "Kein Trenner nach »victim_path« in Baumkonfliktbeschreibung" -#~ msgid "Shallowing of working copy depths is not yet supported" -#~ msgstr "Das Verringern der Arbeitskopietiefen wird nicht unterstützt" - #~ msgid "Bad action in tree conflict description" #~ msgstr "Fehlerhafter Wert von »action« in Baumkonfliktbeschreibung" @@ -19806,9 +25181,6 @@ msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes El #~ " Erwartet: %s\n" #~ " Tatsächlich: %s\n" -#~ msgid "Invalid 'operation' field in tree conflict description" -#~ msgstr "Ungültiges Feld »operation« in Baumkonfliktbeschreibung" - #~ msgid "Entry '%s' has invalid depth" #~ msgstr "Eintrag »%s« hat eine ungültige Tiefe" @@ -19992,17 +25364,6 @@ msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes El #~ " »%s« wurde lokal gelöscht.\n" #~ " Eventuell wurde das Objekt umbenannt?\n" -#~ msgid "" -#~ "usage: svnsync synchronize DEST_URL\n" -#~ "\n" -#~ "Transfer all pending revisions to the destination from the source\n" -#~ "with which it was initialized.\n" -#~ msgstr "" -#~ "Aufruf: svnsync synchronize ZIEL_URL\n" -#~ "\n" -#~ "Überträgt alle laufenden Revisionen von der Quelle, mit der es\n" -#~ "initialisiert wurde, zum Ziel.\n" - #~ msgid "Won't delete locally modified directory '%s'" #~ msgstr "Werde lokal verändertes Verzeichnis »%s« nicht löschen" diff --git a/subversion/po/subversion.pot b/subversion/po/subversion.pot index 40099cf..d073736 100644 --- a/subversion/po/subversion.pot +++ b/subversion/po/subversion.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: dev@subversion.apache.org\n" -"POT-Creation-Date: 2019-07-19 10:42+0000\n" +"POT-Creation-Date: 2019-10-25 09:30+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -135,7 +135,7 @@ msgstr "" msgid "Bogus UUID" msgstr "" -#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1041 +#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1046 msgid "Invalid configuration value" msgstr "" @@ -221,8 +221,8 @@ msgstr "" #. is errno on POSIX #: ../include/svn_error_codes.h:306 ../libsvn_subr/cmdline.c:435 -#: ../libsvn_subr/cmdline.c:466 ../libsvn_subr/cmdline.c:489 ../svn/util.c:571 -#: ../svnlook/svnlook.c:2000 +#: ../libsvn_subr/cmdline.c:466 ../libsvn_subr/cmdline.c:489 ../svn/util.c:573 +#: ../svnlook/svnlook.c:2034 #, c-format msgid "Write error" msgstr "" @@ -596,7 +596,7 @@ msgstr "" msgid "Path is already locked" msgstr "" -#: ../include/svn_error_codes.h:731 ../include/svn_error_codes.h:978 +#: ../include/svn_error_codes.h:731 ../include/svn_error_codes.h:983 msgid "Path is not locked" msgstr "" @@ -620,7 +620,7 @@ msgstr "" msgid "Lock has expired" msgstr "" -#: ../include/svn_error_codes.h:761 ../include/svn_error_codes.h:965 +#: ../include/svn_error_codes.h:761 ../include/svn_error_codes.h:970 msgid "Item is out of date" msgstr "" @@ -720,743 +720,751 @@ msgstr "" msgid "Content checksums supposedly match but content does not." msgstr "" -#: ../include/svn_error_codes.h:895 +#: ../include/svn_error_codes.h:894 +msgid "Unrecognized filesystem I/O control code" +msgstr "" + +#: ../include/svn_error_codes.h:900 msgid "The repository is locked, perhaps for db recovery" msgstr "" -#: ../include/svn_error_codes.h:899 +#: ../include/svn_error_codes.h:904 msgid "A repository hook failed" msgstr "" -#: ../include/svn_error_codes.h:903 +#: ../include/svn_error_codes.h:908 msgid "Incorrect arguments supplied" msgstr "" -#: ../include/svn_error_codes.h:907 +#: ../include/svn_error_codes.h:912 msgid "A report cannot be generated because no data was supplied" msgstr "" -#: ../include/svn_error_codes.h:911 +#: ../include/svn_error_codes.h:916 msgid "Bogus revision report" msgstr "" -#: ../include/svn_error_codes.h:920 +#: ../include/svn_error_codes.h:925 msgid "Unsupported repository version" msgstr "" -#: ../include/svn_error_codes.h:924 +#: ../include/svn_error_codes.h:929 msgid "Disabled repository feature" msgstr "" -#: ../include/svn_error_codes.h:928 +#: ../include/svn_error_codes.h:933 msgid "Error running post-commit hook" msgstr "" -#: ../include/svn_error_codes.h:933 +#: ../include/svn_error_codes.h:938 msgid "Error running post-lock hook" msgstr "" -#: ../include/svn_error_codes.h:938 +#: ../include/svn_error_codes.h:943 msgid "Error running post-unlock hook" msgstr "" -#: ../include/svn_error_codes.h:943 +#: ../include/svn_error_codes.h:948 msgid "Repository upgrade is not supported" msgstr "" -#: ../include/svn_error_codes.h:949 +#: ../include/svn_error_codes.h:954 msgid "Bad URL passed to RA layer" msgstr "" -#: ../include/svn_error_codes.h:953 +#: ../include/svn_error_codes.h:958 msgid "Authorization failed" msgstr "" -#: ../include/svn_error_codes.h:957 +#: ../include/svn_error_codes.h:962 msgid "Unknown authorization method" msgstr "" -#: ../include/svn_error_codes.h:961 +#: ../include/svn_error_codes.h:966 msgid "Repository access method not implemented" msgstr "" -#: ../include/svn_error_codes.h:969 +#: ../include/svn_error_codes.h:974 msgid "Repository has no UUID" msgstr "" -#: ../include/svn_error_codes.h:973 +#: ../include/svn_error_codes.h:978 msgid "Unsupported RA plugin ABI version" msgstr "" -#: ../include/svn_error_codes.h:983 +#: ../include/svn_error_codes.h:988 msgid "Server can only replay from the root of a repository" msgstr "" -#: ../include/svn_error_codes.h:988 +#: ../include/svn_error_codes.h:993 msgid "Repository UUID does not match expected UUID" msgstr "" -#: ../include/svn_error_codes.h:993 +#: ../include/svn_error_codes.h:998 msgid "Repository root URL does not match expected root URL" msgstr "" -#: ../include/svn_error_codes.h:998 +#: ../include/svn_error_codes.h:1003 msgid "Session URL does not match expected session URL" msgstr "" -#: ../include/svn_error_codes.h:1003 ../libsvn_ra_svn/client.c:506 +#: ../include/svn_error_codes.h:1008 ../libsvn_ra_svn/client.c:506 #, c-format msgid "Can't create tunnel" msgstr "" -#: ../include/svn_error_codes.h:1008 +#: ../include/svn_error_codes.h:1013 msgid "Can't create session" msgstr "" -#: ../include/svn_error_codes.h:1014 +#: ../include/svn_error_codes.h:1019 msgid "RA layer failed to init socket layer" msgstr "" -#: ../include/svn_error_codes.h:1018 +#: ../include/svn_error_codes.h:1023 msgid "RA layer failed to create HTTP request" msgstr "" -#: ../include/svn_error_codes.h:1022 +#: ../include/svn_error_codes.h:1027 msgid "RA layer request failed" msgstr "" -#: ../include/svn_error_codes.h:1026 +#: ../include/svn_error_codes.h:1031 msgid "RA layer didn't receive requested OPTIONS info" msgstr "" -#: ../include/svn_error_codes.h:1030 +#: ../include/svn_error_codes.h:1035 msgid "RA layer failed to fetch properties" msgstr "" -#: ../include/svn_error_codes.h:1034 +#: ../include/svn_error_codes.h:1039 msgid "RA layer file already exists" msgstr "" -#: ../include/svn_error_codes.h:1048 +#: ../include/svn_error_codes.h:1053 msgid "HTTP Path Not Found" msgstr "" -#: ../include/svn_error_codes.h:1052 +#: ../include/svn_error_codes.h:1057 msgid "Failed to execute WebDAV PROPPATCH" msgstr "" #. If condition COND is not met, return a "malformed network data" error. #. -#: ../include/svn_error_codes.h:1057 ../include/svn_error_codes.h:1560 +#: ../include/svn_error_codes.h:1062 ../include/svn_error_codes.h:1570 #: ../libsvn_ra_svn/marshal.c:1459 ../libsvn_ra_svn/marshal.c:1716 #: ../libsvn_ra_svn/marshal.c:1745 ../libsvn_ra_svn/marshal.c:3000 msgid "Malformed network data" msgstr "" -#: ../include/svn_error_codes.h:1062 +#: ../include/svn_error_codes.h:1067 msgid "Unable to extract data from response header" msgstr "" -#: ../include/svn_error_codes.h:1067 +#: ../include/svn_error_codes.h:1072 msgid "Repository has been moved" msgstr "" -#: ../include/svn_error_codes.h:1072 ../libsvn_ra_serf/util.c:940 +#: ../include/svn_error_codes.h:1077 ../libsvn_ra_serf/util.c:940 msgid "Connection timed out" msgstr "" -#: ../include/svn_error_codes.h:1077 +#: ../include/svn_error_codes.h:1082 msgid "URL access forbidden for unknown reason" msgstr "" -#: ../include/svn_error_codes.h:1082 +#: ../include/svn_error_codes.h:1087 msgid "The server state conflicts with the requested preconditions" msgstr "" -#: ../include/svn_error_codes.h:1087 +#: ../include/svn_error_codes.h:1092 msgid "The URL doesn't allow the requested method" msgstr "" -#: ../include/svn_error_codes.h:1093 ../include/svn_error_codes.h:1564 +#: ../include/svn_error_codes.h:1098 ../include/svn_error_codes.h:1574 msgid "Couldn't find a repository" msgstr "" -#: ../include/svn_error_codes.h:1097 +#: ../include/svn_error_codes.h:1102 msgid "Couldn't open a repository" msgstr "" -#: ../include/svn_error_codes.h:1103 +#: ../include/svn_error_codes.h:1108 msgid "Svndiff data has invalid header" msgstr "" -#: ../include/svn_error_codes.h:1107 +#: ../include/svn_error_codes.h:1112 msgid "Svndiff data contains corrupt window" msgstr "" -#: ../include/svn_error_codes.h:1111 +#: ../include/svn_error_codes.h:1116 msgid "Svndiff data contains backward-sliding source view" msgstr "" -#: ../include/svn_error_codes.h:1115 +#: ../include/svn_error_codes.h:1120 msgid "Svndiff data contains invalid instruction" msgstr "" -#: ../include/svn_error_codes.h:1119 +#: ../include/svn_error_codes.h:1124 msgid "Svndiff data ends unexpectedly" msgstr "" -#: ../include/svn_error_codes.h:1123 +#: ../include/svn_error_codes.h:1128 msgid "Svndiff compressed data is invalid" msgstr "" -#: ../include/svn_error_codes.h:1129 +#: ../include/svn_error_codes.h:1134 msgid "Apache has no path to an SVN filesystem" msgstr "" -#: ../include/svn_error_codes.h:1133 +#: ../include/svn_error_codes.h:1138 msgid "Apache got a malformed URI" msgstr "" -#: ../include/svn_error_codes.h:1137 +#: ../include/svn_error_codes.h:1142 msgid "Activity not found" msgstr "" -#: ../include/svn_error_codes.h:1141 +#: ../include/svn_error_codes.h:1146 msgid "Baseline incorrect" msgstr "" -#: ../include/svn_error_codes.h:1145 +#: ../include/svn_error_codes.h:1150 msgid "Input/output error" msgstr "" -#: ../include/svn_error_codes.h:1151 +#: ../include/svn_error_codes.h:1156 msgid "A path under version control is needed for this operation" msgstr "" -#: ../include/svn_error_codes.h:1155 +#: ../include/svn_error_codes.h:1160 msgid "Repository access is needed for this operation" msgstr "" -#: ../include/svn_error_codes.h:1159 +#: ../include/svn_error_codes.h:1164 msgid "Bogus revision information given" msgstr "" -#: ../include/svn_error_codes.h:1163 +#: ../include/svn_error_codes.h:1168 msgid "Attempting to commit to a URL more than once" msgstr "" -#: ../include/svn_error_codes.h:1167 +#: ../include/svn_error_codes.h:1172 msgid "Operation does not apply to binary file" msgstr "" -#: ../include/svn_error_codes.h:1173 +#: ../include/svn_error_codes.h:1178 msgid "Format of an svn:externals property was invalid" msgstr "" -#: ../include/svn_error_codes.h:1177 +#: ../include/svn_error_codes.h:1182 msgid "Attempting restricted operation for modified resource" msgstr "" -#: ../include/svn_error_codes.h:1181 +#: ../include/svn_error_codes.h:1186 msgid "Operation does not apply to directory" msgstr "" -#: ../include/svn_error_codes.h:1185 ../svnadmin/svnadmin.c:1747 +#: ../include/svn_error_codes.h:1190 ../svnadmin/svnadmin.c:1827 #, c-format msgid "Revision range is not allowed" msgstr "" -#: ../include/svn_error_codes.h:1189 +#: ../include/svn_error_codes.h:1194 msgid "Inter-repository relocation not allowed" msgstr "" -#: ../include/svn_error_codes.h:1193 +#: ../include/svn_error_codes.h:1198 msgid "Author name cannot contain a newline" msgstr "" -#: ../include/svn_error_codes.h:1197 +#: ../include/svn_error_codes.h:1202 msgid "Bad property name" msgstr "" -#: ../include/svn_error_codes.h:1202 +#: ../include/svn_error_codes.h:1207 msgid "Two versioned resources are unrelated" msgstr "" -#: ../include/svn_error_codes.h:1207 +#: ../include/svn_error_codes.h:1212 msgid "Path has no lock token" msgstr "" -#: ../include/svn_error_codes.h:1212 +#: ../include/svn_error_codes.h:1217 msgid "Operation does not support multiple sources" msgstr "" -#: ../include/svn_error_codes.h:1217 +#: ../include/svn_error_codes.h:1222 msgid "No versioned parent directories" msgstr "" -#: ../include/svn_error_codes.h:1222 ../include/svn_error_codes.h:1242 +#: ../include/svn_error_codes.h:1227 ../include/svn_error_codes.h:1247 msgid "Working copy and merge source not ready for reintegration" msgstr "" -#: ../include/svn_error_codes.h:1227 +#: ../include/svn_error_codes.h:1232 msgid "A file external cannot overwrite an existing versioned item" msgstr "" -#: ../include/svn_error_codes.h:1232 +#: ../include/svn_error_codes.h:1237 msgid "Invalid path component strip count specified" msgstr "" -#: ../include/svn_error_codes.h:1237 +#: ../include/svn_error_codes.h:1242 msgid "Detected a cycle while processing the operation" msgstr "" -#: ../include/svn_error_codes.h:1247 +#: ../include/svn_error_codes.h:1252 msgid "Invalid mergeinfo detected in merge target" msgstr "" -#: ../include/svn_error_codes.h:1252 +#: ../include/svn_error_codes.h:1257 msgid "Can't perform this operation without a valid lock token" msgstr "" -#: ../include/svn_error_codes.h:1257 +#: ../include/svn_error_codes.h:1262 msgid "The operation is forbidden by the server" msgstr "" -#: ../include/svn_error_codes.h:1262 +#: ../include/svn_error_codes.h:1267 msgid "The conflict resolution option is not applicable" msgstr "" -#: ../include/svn_error_codes.h:1268 +#: ../include/svn_error_codes.h:1273 msgid "A problem occurred; see other errors for details" msgstr "" -#: ../include/svn_error_codes.h:1272 +#: ../include/svn_error_codes.h:1277 msgid "Failure loading plugin" msgstr "" -#: ../include/svn_error_codes.h:1276 +#: ../include/svn_error_codes.h:1281 msgid "Malformed file" msgstr "" -#: ../include/svn_error_codes.h:1280 +#: ../include/svn_error_codes.h:1285 msgid "Incomplete data" msgstr "" -#: ../include/svn_error_codes.h:1284 +#: ../include/svn_error_codes.h:1289 msgid "Incorrect parameters given" msgstr "" -#: ../include/svn_error_codes.h:1288 +#: ../include/svn_error_codes.h:1293 msgid "Tried a versioning operation on an unversioned resource" msgstr "" -#: ../include/svn_error_codes.h:1292 +#: ../include/svn_error_codes.h:1297 msgid "Test failed" msgstr "" -#: ../include/svn_error_codes.h:1296 +#: ../include/svn_error_codes.h:1301 msgid "Trying to use an unsupported feature" msgstr "" -#: ../include/svn_error_codes.h:1300 +#: ../include/svn_error_codes.h:1305 msgid "Unexpected or unknown property kind" msgstr "" -#: ../include/svn_error_codes.h:1304 +#: ../include/svn_error_codes.h:1309 msgid "Illegal target for the requested operation" msgstr "" -#: ../include/svn_error_codes.h:1308 +#: ../include/svn_error_codes.h:1313 msgid "MD5 checksum is missing" msgstr "" -#: ../include/svn_error_codes.h:1312 +#: ../include/svn_error_codes.h:1317 msgid "Directory needs to be empty but is not" msgstr "" -#: ../include/svn_error_codes.h:1316 +#: ../include/svn_error_codes.h:1321 msgid "Error calling external program" msgstr "" -#: ../include/svn_error_codes.h:1320 +#: ../include/svn_error_codes.h:1325 msgid "Python exception has been set with the error" msgstr "" -#: ../include/svn_error_codes.h:1324 +#: ../include/svn_error_codes.h:1329 msgid "A checksum mismatch occurred" msgstr "" -#: ../include/svn_error_codes.h:1328 +#: ../include/svn_error_codes.h:1333 msgid "The operation was interrupted" msgstr "" -#: ../include/svn_error_codes.h:1332 +#: ../include/svn_error_codes.h:1337 msgid "The specified diff option is not supported" msgstr "" -#: ../include/svn_error_codes.h:1336 +#: ../include/svn_error_codes.h:1341 msgid "Property not found" msgstr "" -#: ../include/svn_error_codes.h:1340 +#: ../include/svn_error_codes.h:1345 msgid "No auth file path available" msgstr "" -#: ../include/svn_error_codes.h:1345 +#: ../include/svn_error_codes.h:1350 msgid "Incompatible library version" msgstr "" -#: ../include/svn_error_codes.h:1350 +#: ../include/svn_error_codes.h:1355 msgid "Mergeinfo parse error" msgstr "" -#: ../include/svn_error_codes.h:1355 +#: ../include/svn_error_codes.h:1360 msgid "Cease invocation of this API" msgstr "" -#: ../include/svn_error_codes.h:1360 +#: ../include/svn_error_codes.h:1365 msgid "Error parsing revision number" msgstr "" -#: ../include/svn_error_codes.h:1365 +#: ../include/svn_error_codes.h:1370 msgid "Iteration terminated before completion" msgstr "" -#: ../include/svn_error_codes.h:1370 +#: ../include/svn_error_codes.h:1375 msgid "Unknown changelist" msgstr "" -#: ../include/svn_error_codes.h:1375 +#: ../include/svn_error_codes.h:1380 msgid "Reserved directory name in command line arguments" msgstr "" -#: ../include/svn_error_codes.h:1380 +#: ../include/svn_error_codes.h:1385 msgid "Inquiry about unknown capability" msgstr "" -#: ../include/svn_error_codes.h:1385 +#: ../include/svn_error_codes.h:1390 msgid "Test skipped" msgstr "" -#: ../include/svn_error_codes.h:1390 +#: ../include/svn_error_codes.h:1395 msgid "APR memcache library not available" msgstr "" -#: ../include/svn_error_codes.h:1395 +#: ../include/svn_error_codes.h:1400 msgid "Couldn't perform atomic initialization" msgstr "" -#: ../include/svn_error_codes.h:1400 +#: ../include/svn_error_codes.h:1405 msgid "SQLite error" msgstr "" -#: ../include/svn_error_codes.h:1405 +#: ../include/svn_error_codes.h:1410 msgid "Attempted to write to readonly SQLite db" msgstr "" -#: ../include/svn_error_codes.h:1412 +#: ../include/svn_error_codes.h:1417 msgid "Unsupported schema found in SQLite db" msgstr "" -#: ../include/svn_error_codes.h:1417 +#: ../include/svn_error_codes.h:1422 msgid "The SQLite db is busy" msgstr "" -#: ../include/svn_error_codes.h:1422 +#: ../include/svn_error_codes.h:1427 msgid "" "SQLite busy at transaction rollback; resetting all busy SQLite statements to " "allow rollback" msgstr "" -#: ../include/svn_error_codes.h:1428 +#: ../include/svn_error_codes.h:1433 msgid "Constraint error in SQLite db" msgstr "" -#: ../include/svn_error_codes.h:1433 +#: ../include/svn_error_codes.h:1438 msgid "Too many memcached servers configured" msgstr "" -#: ../include/svn_error_codes.h:1438 +#: ../include/svn_error_codes.h:1443 msgid "Failed to parse version number string" msgstr "" -#: ../include/svn_error_codes.h:1443 +#: ../include/svn_error_codes.h:1448 msgid "Atomic data storage is corrupt" msgstr "" -#: ../include/svn_error_codes.h:1448 +#: ../include/svn_error_codes.h:1453 msgid "utf8proc library error" msgstr "" -#: ../include/svn_error_codes.h:1453 +#: ../include/svn_error_codes.h:1458 msgid "Bad arguments to SQL operators GLOB or LIKE" msgstr "" -#: ../include/svn_error_codes.h:1458 +#: ../include/svn_error_codes.h:1463 msgid "Packed data stream is corrupt" msgstr "" -#: ../include/svn_error_codes.h:1463 +#: ../include/svn_error_codes.h:1468 msgid "Additional errors:" msgstr "" -#: ../include/svn_error_codes.h:1468 +#: ../include/svn_error_codes.h:1473 msgid "Parser error: invalid input" msgstr "" -#: ../include/svn_error_codes.h:1473 +#: ../include/svn_error_codes.h:1478 msgid "SQLite transaction rollback failed" msgstr "" -#: ../include/svn_error_codes.h:1478 +#: ../include/svn_error_codes.h:1483 msgid "LZ4 compression failed" msgstr "" -#: ../include/svn_error_codes.h:1483 +#: ../include/svn_error_codes.h:1488 msgid "LZ4 decompression failed" msgstr "" -#: ../include/svn_error_codes.h:1489 +#: ../include/svn_error_codes.h:1493 +msgid "Could not canonicalize path or URI" +msgstr "" + +#: ../include/svn_error_codes.h:1499 msgid "Error parsing arguments" msgstr "" -#: ../include/svn_error_codes.h:1493 +#: ../include/svn_error_codes.h:1503 msgid "Not enough arguments provided" msgstr "" -#: ../include/svn_error_codes.h:1497 +#: ../include/svn_error_codes.h:1507 msgid "Mutually exclusive arguments specified" msgstr "" -#: ../include/svn_error_codes.h:1501 +#: ../include/svn_error_codes.h:1511 msgid "Attempted command in administrative dir" msgstr "" -#: ../include/svn_error_codes.h:1505 +#: ../include/svn_error_codes.h:1515 msgid "The log message file is under version control" msgstr "" -#: ../include/svn_error_codes.h:1509 +#: ../include/svn_error_codes.h:1519 msgid "The log message is a pathname" msgstr "" -#: ../include/svn_error_codes.h:1513 +#: ../include/svn_error_codes.h:1523 msgid "Committing in directory scheduled for addition" msgstr "" -#: ../include/svn_error_codes.h:1517 +#: ../include/svn_error_codes.h:1527 msgid "No external editor available" msgstr "" -#: ../include/svn_error_codes.h:1521 +#: ../include/svn_error_codes.h:1531 msgid "Something is wrong with the log message's contents" msgstr "" -#: ../include/svn_error_codes.h:1525 +#: ../include/svn_error_codes.h:1535 msgid "A log message was given where none was necessary" msgstr "" -#: ../include/svn_error_codes.h:1529 +#: ../include/svn_error_codes.h:1539 msgid "No external merge tool available" msgstr "" -#: ../include/svn_error_codes.h:1533 +#: ../include/svn_error_codes.h:1543 msgid "Failed processing one or more externals definitions" msgstr "" -#: ../include/svn_error_codes.h:1538 +#: ../include/svn_error_codes.h:1548 msgid "Repository verification failed" msgstr "" -#: ../include/svn_error_codes.h:1544 +#: ../include/svn_error_codes.h:1554 msgid "Special code for wrapping server errors to report to client" msgstr "" -#: ../include/svn_error_codes.h:1548 +#: ../include/svn_error_codes.h:1558 msgid "Unknown svn protocol command" msgstr "" -#: ../include/svn_error_codes.h:1552 +#: ../include/svn_error_codes.h:1562 msgid "Network connection closed unexpectedly" msgstr "" -#: ../include/svn_error_codes.h:1556 +#: ../include/svn_error_codes.h:1566 msgid "Network read/write error" msgstr "" -#: ../include/svn_error_codes.h:1568 +#: ../include/svn_error_codes.h:1578 msgid "Client/server version mismatch" msgstr "" -#: ../include/svn_error_codes.h:1573 +#: ../include/svn_error_codes.h:1583 msgid "Cannot negotiate authentication mechanism" msgstr "" -#: ../include/svn_error_codes.h:1578 +#: ../include/svn_error_codes.h:1588 msgid "Editor drive was aborted" msgstr "" -#: ../include/svn_error_codes.h:1583 +#: ../include/svn_error_codes.h:1593 msgid "Client request too long" msgstr "" -#: ../include/svn_error_codes.h:1588 +#: ../include/svn_error_codes.h:1598 msgid "Server response too long" msgstr "" -#: ../include/svn_error_codes.h:1596 +#: ../include/svn_error_codes.h:1606 msgid "Credential data unavailable" msgstr "" -#: ../include/svn_error_codes.h:1600 +#: ../include/svn_error_codes.h:1610 msgid "No authentication provider available" msgstr "" -#: ../include/svn_error_codes.h:1604 +#: ../include/svn_error_codes.h:1614 msgid "All authentication providers exhausted" msgstr "" -#: ../include/svn_error_codes.h:1608 +#: ../include/svn_error_codes.h:1618 msgid "Credentials not saved" msgstr "" -#: ../include/svn_error_codes.h:1613 ../libsvn_subr/gpg_agent.c:512 +#: ../include/svn_error_codes.h:1623 ../libsvn_subr/gpg_agent.c:512 msgid "Authentication failed" msgstr "" -#: ../include/svn_error_codes.h:1619 +#: ../include/svn_error_codes.h:1629 msgid "Read access denied for root of edit" msgstr "" -#: ../include/svn_error_codes.h:1624 +#: ../include/svn_error_codes.h:1634 msgid "Item is not readable" msgstr "" -#: ../include/svn_error_codes.h:1629 +#: ../include/svn_error_codes.h:1639 msgid "Item is partially readable" msgstr "" -#: ../include/svn_error_codes.h:1633 +#: ../include/svn_error_codes.h:1643 msgid "Invalid authz configuration" msgstr "" -#: ../include/svn_error_codes.h:1638 +#: ../include/svn_error_codes.h:1648 msgid "Item is not writable" msgstr "" -#: ../include/svn_error_codes.h:1645 +#: ../include/svn_error_codes.h:1655 msgid "Diff data source modified unexpectedly" msgstr "" -#: ../include/svn_error_codes.h:1650 +#: ../include/svn_error_codes.h:1660 msgid "Diff data unexpected" msgstr "" -#: ../include/svn_error_codes.h:1657 +#: ../include/svn_error_codes.h:1667 msgid "Initialization of SSPI library failed" msgstr "" -#: ../include/svn_error_codes.h:1663 +#: ../include/svn_error_codes.h:1673 msgid "Server SSL certificate untrusted" msgstr "" -#: ../include/svn_error_codes.h:1668 +#: ../include/svn_error_codes.h:1678 msgid "Initialization of the GSSAPI context failed" msgstr "" -#: ../include/svn_error_codes.h:1673 +#: ../include/svn_error_codes.h:1683 msgid "While handling serf response:" msgstr "" -#: ../include/svn_error_codes.h:1678 +#: ../include/svn_error_codes.h:1688 msgid "Can't read from stream" msgstr "" -#: ../include/svn_error_codes.h:1684 +#: ../include/svn_error_codes.h:1694 msgid "Assertion failure" msgstr "" -#: ../include/svn_error_codes.h:1688 +#: ../include/svn_error_codes.h:1698 msgid "No non-tracing links found in the error chain" msgstr "" -#: ../include/svn_error_codes.h:1696 +#: ../include/svn_error_codes.h:1706 msgid "Unexpected end of ASN1 data" msgstr "" -#: ../include/svn_error_codes.h:1700 +#: ../include/svn_error_codes.h:1710 msgid "Unexpected ASN1 tag" msgstr "" -#: ../include/svn_error_codes.h:1704 +#: ../include/svn_error_codes.h:1714 msgid "Invalid ASN1 length" msgstr "" -#: ../include/svn_error_codes.h:1708 +#: ../include/svn_error_codes.h:1718 msgid "ASN1 length mismatch" msgstr "" -#: ../include/svn_error_codes.h:1712 +#: ../include/svn_error_codes.h:1722 msgid "Invalid ASN1 data" msgstr "" -#: ../include/svn_error_codes.h:1716 +#: ../include/svn_error_codes.h:1726 msgid "Unavailable X509 feature" msgstr "" -#: ../include/svn_error_codes.h:1720 +#: ../include/svn_error_codes.h:1730 msgid "Invalid PEM certificate" msgstr "" -#: ../include/svn_error_codes.h:1724 +#: ../include/svn_error_codes.h:1734 msgid "Invalid certificate format" msgstr "" -#: ../include/svn_error_codes.h:1728 +#: ../include/svn_error_codes.h:1738 msgid "Invalid certificate version" msgstr "" -#: ../include/svn_error_codes.h:1732 +#: ../include/svn_error_codes.h:1742 msgid "Invalid certificate serial number" msgstr "" -#: ../include/svn_error_codes.h:1736 +#: ../include/svn_error_codes.h:1746 msgid "Found invalid algorithm in certificate" msgstr "" -#: ../include/svn_error_codes.h:1740 +#: ../include/svn_error_codes.h:1750 msgid "Found invalid name in certificate" msgstr "" -#: ../include/svn_error_codes.h:1744 +#: ../include/svn_error_codes.h:1754 msgid "Found invalid date in certificate" msgstr "" -#: ../include/svn_error_codes.h:1748 +#: ../include/svn_error_codes.h:1758 msgid "Found invalid public key in certificate" msgstr "" -#: ../include/svn_error_codes.h:1752 +#: ../include/svn_error_codes.h:1762 msgid "Found invalid signature in certificate" msgstr "" -#: ../include/svn_error_codes.h:1756 +#: ../include/svn_error_codes.h:1766 msgid "Found invalid extensions in certificate" msgstr "" -#: ../include/svn_error_codes.h:1760 +#: ../include/svn_error_codes.h:1770 msgid "Unknown certificate version" msgstr "" -#: ../include/svn_error_codes.h:1764 +#: ../include/svn_error_codes.h:1774 msgid "Certificate uses unknown public key algorithm" msgstr "" -#: ../include/svn_error_codes.h:1768 +#: ../include/svn_error_codes.h:1778 msgid "Certificate signature mismatch" msgstr "" -#: ../include/svn_error_codes.h:1772 +#: ../include/svn_error_codes.h:1782 msgid "Certficate verification failed" msgstr "" @@ -1465,7 +1473,7 @@ msgid "GNOME Keyring is locked and we are non-interactive" msgstr "" #: ../libsvn_client/add.c:609 ../libsvn_client/cmdline.c:365 -#: ../libsvn_subr/opt.c:941 +#: ../libsvn_subr/opt.c:970 #, c-format msgid "'%s' ends in a reserved name" msgstr "" @@ -1495,29 +1503,29 @@ msgid "Unsupported node kind for path '%s'" msgstr "" #: ../libsvn_client/add.c:908 ../libsvn_client/changelist.c:65 -#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3098 -#: ../libsvn_client/export.c:1392 ../libsvn_client/import.c:861 -#: ../libsvn_client/patch.c:3745 ../libsvn_client/relocate.c:155 -#: ../libsvn_client/resolved.c:120 ../libsvn_client/revert.c:149 -#: ../libsvn_client/shelve.c:196 ../libsvn_client/status.c:368 -#: ../libsvn_client/switch.c:471 ../libsvn_client/update.c:749 -#: ../libsvn_client/upgrade.c:111 ../svn/util.c:990 ../svnbench/util.c:76 +#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3252 +#: ../libsvn_client/export.c:1389 ../libsvn_client/import.c:861 +#: ../libsvn_client/patch.c:3750 ../libsvn_client/relocate.c:155 +#: ../libsvn_client/resolved.c:120 ../libsvn_client/revert.c:152 +#: ../libsvn_client/status.c:444 ../libsvn_client/switch.c:471 +#: ../libsvn_client/update.c:749 ../libsvn_client/upgrade.c:111 +#: ../svn/shelf-cmd.c:1023 ../svn/util.c:992 ../svnbench/util.c:76 #, c-format msgid "'%s' is not a local path" msgstr "" -#: ../libsvn_client/add.c:949 ../libsvn_client/copy_foreign.c:491 -#: ../libsvn_wc/adm_ops.c:479 ../libsvn_wc/copy.c:786 +#: ../libsvn_client/add.c:949 ../libsvn_wc/adm_ops.c:479 +#: ../libsvn_wc/copy.c:786 #, c-format msgid "'%s' is already under version control" msgstr "" -#: ../libsvn_client/add.c:1082 ../libsvn_client/add.c:1109 +#: ../libsvn_client/add.c:1083 ../libsvn_client/add.c:1110 #, c-format msgid "There is no valid URI above '%s'" msgstr "" -#: ../libsvn_client/blame.c:457 ../libsvn_client/blame.c:764 +#: ../libsvn_client/blame.c:457 ../libsvn_client/blame.c:769 #, c-format msgid "Cannot calculate blame information for binary file '%s'" msgstr "" @@ -1556,7 +1564,7 @@ msgstr "" msgid "Target changelist name must not be empty" msgstr "" -#: ../libsvn_client/checkout.c:133 ../libsvn_client/export.c:1449 +#: ../libsvn_client/checkout.c:133 ../libsvn_client/export.c:1446 #: ../svnbench/null-export-cmd.c:293 #, c-format msgid "URL '%s' doesn't exist" @@ -1593,7 +1601,7 @@ msgid "" "current directory" msgstr "" -#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:2303 +#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:2294 msgid "Commit failed (details follow):" msgstr "" @@ -1609,25 +1617,25 @@ msgstr "" msgid "Error bumping revisions post-commit (details follow):" msgstr "" -#: ../libsvn_client/commit.c:554 -#, c-format -msgid "'%s' is a URL, but URLs cannot be commit targets" -msgstr "" - -#: ../libsvn_client/commit.c:656 +#: ../libsvn_client/commit.c:544 msgid "" "Commit can only commit to a single repository at a time.\n" "Are all targets part of the same working copy?" msgstr "" -#: ../libsvn_client/commit.c:722 +#: ../libsvn_client/commit.c:677 +#, c-format +msgid "'%s' is a URL, but URLs cannot be commit targets" +msgstr "" + +#: ../libsvn_client/commit.c:817 #, c-format msgid "" "Cannot commit '%s' because it was moved from '%s' which is not part of the " "commit; both sides of the move must be committed together" msgstr "" -#: ../libsvn_client/commit.c:777 +#: ../libsvn_client/commit.c:872 #, c-format msgid "" "Cannot commit '%s' because it was moved to '%s' which is not part of the " @@ -1691,29 +1699,29 @@ msgid "" "yet its child '%s' is part of the commit" msgstr "" -#: ../libsvn_client/commit_util.c:1421 +#: ../libsvn_client/commit_util.c:1444 #, c-format msgid "Cannot commit both '%s' and '%s' as they refer to the same URL" msgstr "" -#: ../libsvn_client/commit_util.c:1576 +#: ../libsvn_client/commit_util.c:1598 #, c-format msgid "Commit item '%s' has copy flag but no copyfrom URL" msgstr "" -#: ../libsvn_client/commit_util.c:1581 +#: ../libsvn_client/commit_util.c:1603 #, c-format msgid "Commit item '%s' has copy flag but an invalid revision" msgstr "" -#: ../libsvn_client/commit_util.c:2056 +#: ../libsvn_client/commit_util.c:2076 msgid "Standard properties can't be set explicitly as revision properties" msgstr "" #: ../libsvn_client/conflicts.c:734 ../libsvn_client/conflicts.c:1100 -#: ../libsvn_client/conflicts.c:1693 ../libsvn_client/conflicts.c:4630 -#: ../libsvn_client/conflicts.c:5129 ../libsvn_client/conflicts.c:5151 -#: ../libsvn_client/conflicts.c:5203 ../libsvn_client/conflicts.c:5676 +#: ../libsvn_client/conflicts.c:1693 ../libsvn_client/conflicts.c:4982 +#: ../libsvn_client/conflicts.c:5356 ../libsvn_client/conflicts.c:5378 +#: ../libsvn_client/conflicts.c:5430 ../libsvn_client/conflicts.c:5903 msgid "unknown author" msgstr "" @@ -1889,471 +1897,471 @@ msgid "" "'%s'." msgstr "" -#: ../libsvn_client/conflicts.c:2764 +#: ../libsvn_client/conflicts.c:3116 msgid "An item containing uncommitted changes was found in the working copy." msgstr "" -#: ../libsvn_client/conflicts.c:2768 +#: ../libsvn_client/conflicts.c:3120 msgid "An item which already occupies this path was found in the working copy." msgstr "" -#: ../libsvn_client/conflicts.c:2772 +#: ../libsvn_client/conflicts.c:3124 msgid "A deleted item was found in the working copy." msgstr "" -#: ../libsvn_client/conflicts.c:2777 +#: ../libsvn_client/conflicts.c:3129 msgid "No such file or directory was found in the working copy." msgstr "" #. ### display deleted revision -#: ../libsvn_client/conflicts.c:2782 +#: ../libsvn_client/conflicts.c:3134 msgid "" "No such file or directory was found in the merge target working copy.\n" "The item may have been deleted or moved away in the repository's history." msgstr "" -#: ../libsvn_client/conflicts.c:2789 +#: ../libsvn_client/conflicts.c:3141 msgid "An unversioned item was found in the working copy." msgstr "" -#: ../libsvn_client/conflicts.c:2794 +#: ../libsvn_client/conflicts.c:3146 msgid "" "An item scheduled to be added to the repository in the next commit was found " "in the working copy." msgstr "" -#: ../libsvn_client/conflicts.c:2799 +#: ../libsvn_client/conflicts.c:3151 msgid "" "The item in the working copy had been moved away at the time this conflict " "was recorded." msgstr "" -#: ../libsvn_client/conflicts.c:2803 +#: ../libsvn_client/conflicts.c:3155 msgid "" "An item had been moved here in the working copy at the time this conflict " "was recorded." msgstr "" -#: ../libsvn_client/conflicts.c:2831 +#: ../libsvn_client/conflicts.c:3183 #, c-format msgid "" "%s\n" "And then moved away to '^/%s' by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:2896 +#: ../libsvn_client/conflicts.c:3248 msgid "No such file or directory was found in the merge target working copy.\n" msgstr "" -#: ../libsvn_client/conflicts.c:2905 +#: ../libsvn_client/conflicts.c:3257 #, c-format msgid "%sThe file was moved to '^/%s' in r%ld by %s." msgstr "" -#: ../libsvn_client/conflicts.c:2911 +#: ../libsvn_client/conflicts.c:3263 #, c-format msgid "%sThe directory was moved to '^/%s' in r%ld by %s." msgstr "" -#: ../libsvn_client/conflicts.c:2918 +#: ../libsvn_client/conflicts.c:3270 #, c-format msgid "%sThe item was moved to '^/%s' in r%ld by %s." msgstr "" -#: ../libsvn_client/conflicts.c:2934 +#: ../libsvn_client/conflicts.c:3286 #, c-format msgid "%sThe file '^/%s' was moved to '^/%s' in r%ld by %s." msgstr "" -#: ../libsvn_client/conflicts.c:2942 +#: ../libsvn_client/conflicts.c:3294 #, c-format msgid "%sThe directory '^/%s' was moved to '^/%s' in r%ld by %s." msgstr "" -#: ../libsvn_client/conflicts.c:2950 +#: ../libsvn_client/conflicts.c:3302 #, c-format msgid "%sThe item '^/%s' was moved to '^/%s' in r%ld by %s." msgstr "" -#: ../libsvn_client/conflicts.c:2964 +#: ../libsvn_client/conflicts.c:3316 #, c-format msgid "" "No such file or directory was found in the merge target working copy.\n" "'^/%s' was deleted in r%ld by %s." msgstr "" -#: ../libsvn_client/conflicts.c:2988 +#: ../libsvn_client/conflicts.c:3340 msgid "An update operation tried to edit a file." msgstr "" -#: ../libsvn_client/conflicts.c:2990 +#: ../libsvn_client/conflicts.c:3342 msgid "An update operation tried to add a file." msgstr "" -#: ../libsvn_client/conflicts.c:2992 +#: ../libsvn_client/conflicts.c:3344 msgid "An update operation tried to delete or move a file." msgstr "" -#: ../libsvn_client/conflicts.c:2995 +#: ../libsvn_client/conflicts.c:3347 msgid "An update operation tried to replace a file." msgstr "" -#: ../libsvn_client/conflicts.c:3003 +#: ../libsvn_client/conflicts.c:3355 msgid "A switch operation tried to edit a file." msgstr "" -#: ../libsvn_client/conflicts.c:3005 +#: ../libsvn_client/conflicts.c:3357 msgid "A switch operation tried to add a file." msgstr "" -#: ../libsvn_client/conflicts.c:3007 +#: ../libsvn_client/conflicts.c:3359 msgid "A switch operation tried to delete or move a file." msgstr "" -#: ../libsvn_client/conflicts.c:3010 +#: ../libsvn_client/conflicts.c:3362 msgid "A switch operation tried to replace a file." msgstr "" -#: ../libsvn_client/conflicts.c:3018 +#: ../libsvn_client/conflicts.c:3370 msgid "A merge operation tried to edit a file." msgstr "" -#: ../libsvn_client/conflicts.c:3020 +#: ../libsvn_client/conflicts.c:3372 msgid "A merge operation tried to add a file." msgstr "" -#: ../libsvn_client/conflicts.c:3022 +#: ../libsvn_client/conflicts.c:3374 msgid "A merge operation tried to delete or move a file." msgstr "" -#: ../libsvn_client/conflicts.c:3025 +#: ../libsvn_client/conflicts.c:3377 msgid "A merge operation tried to replace a file." msgstr "" -#: ../libsvn_client/conflicts.c:3035 +#: ../libsvn_client/conflicts.c:3387 msgid "An update operation tried to change a directory." msgstr "" -#: ../libsvn_client/conflicts.c:3037 +#: ../libsvn_client/conflicts.c:3389 msgid "An update operation tried to add a directory." msgstr "" -#: ../libsvn_client/conflicts.c:3039 +#: ../libsvn_client/conflicts.c:3391 msgid "An update operation tried to delete or move a directory." msgstr "" -#: ../libsvn_client/conflicts.c:3042 +#: ../libsvn_client/conflicts.c:3394 msgid "An update operation tried to replace a directory." msgstr "" -#: ../libsvn_client/conflicts.c:3050 +#: ../libsvn_client/conflicts.c:3402 msgid "A switch operation tried to edit a directory." msgstr "" -#: ../libsvn_client/conflicts.c:3052 +#: ../libsvn_client/conflicts.c:3404 msgid "A switch operation tried to add a directory." msgstr "" -#: ../libsvn_client/conflicts.c:3054 +#: ../libsvn_client/conflicts.c:3406 msgid "A switch operation tried to delete or move a directory." msgstr "" -#: ../libsvn_client/conflicts.c:3057 +#: ../libsvn_client/conflicts.c:3409 msgid "A switch operation tried to replace a directory." msgstr "" -#: ../libsvn_client/conflicts.c:3065 +#: ../libsvn_client/conflicts.c:3417 msgid "A merge operation tried to edit a directory." msgstr "" -#: ../libsvn_client/conflicts.c:3067 +#: ../libsvn_client/conflicts.c:3419 msgid "A merge operation tried to add a directory." msgstr "" -#: ../libsvn_client/conflicts.c:3069 +#: ../libsvn_client/conflicts.c:3421 msgid "A merge operation tried to delete or move a directory." msgstr "" -#: ../libsvn_client/conflicts.c:3072 +#: ../libsvn_client/conflicts.c:3424 msgid "A merge operation tried to replace a directory." msgstr "" -#: ../libsvn_client/conflicts.c:3083 +#: ../libsvn_client/conflicts.c:3435 msgid "An update operation tried to edit an item." msgstr "" -#: ../libsvn_client/conflicts.c:3085 +#: ../libsvn_client/conflicts.c:3437 msgid "An update operation tried to add an item." msgstr "" -#: ../libsvn_client/conflicts.c:3087 +#: ../libsvn_client/conflicts.c:3439 msgid "An update operation tried to delete or move an item." msgstr "" -#: ../libsvn_client/conflicts.c:3090 +#: ../libsvn_client/conflicts.c:3442 msgid "An update operation tried to replace an item." msgstr "" -#: ../libsvn_client/conflicts.c:3098 +#: ../libsvn_client/conflicts.c:3450 msgid "A switch operation tried to edit an item." msgstr "" -#: ../libsvn_client/conflicts.c:3100 +#: ../libsvn_client/conflicts.c:3452 msgid "A switch operation tried to add an item." msgstr "" -#: ../libsvn_client/conflicts.c:3102 +#: ../libsvn_client/conflicts.c:3454 msgid "A switch operation tried to delete or move an item." msgstr "" -#: ../libsvn_client/conflicts.c:3105 +#: ../libsvn_client/conflicts.c:3457 msgid "A switch operation tried to replace an item." msgstr "" -#: ../libsvn_client/conflicts.c:3113 +#: ../libsvn_client/conflicts.c:3465 msgid "A merge operation tried to edit an item." msgstr "" -#: ../libsvn_client/conflicts.c:3115 +#: ../libsvn_client/conflicts.c:3467 msgid "A merge operation tried to add an item." msgstr "" -#: ../libsvn_client/conflicts.c:3117 +#: ../libsvn_client/conflicts.c:3469 msgid "A merge operation tried to delete or move an item." msgstr "" -#: ../libsvn_client/conflicts.c:3120 +#: ../libsvn_client/conflicts.c:3472 msgid "A merge operation tried to replace an item." msgstr "" -#: ../libsvn_client/conflicts.c:3136 ../svn/cl-conflicts.c:212 +#: ../libsvn_client/conflicts.c:3488 ../svn/cl-conflicts.c:212 msgid "upon update" msgstr "" -#: ../libsvn_client/conflicts.c:3137 ../svn/cl-conflicts.c:213 +#: ../libsvn_client/conflicts.c:3489 ../svn/cl-conflicts.c:213 msgid "upon switch" msgstr "" -#: ../libsvn_client/conflicts.c:3138 ../svn/cl-conflicts.c:214 +#: ../libsvn_client/conflicts.c:3490 ../svn/cl-conflicts.c:214 msgid "upon merge" msgstr "" -#: ../libsvn_client/conflicts.c:3139 ../svn/cl-conflicts.c:215 +#: ../libsvn_client/conflicts.c:3491 ../svn/cl-conflicts.c:215 msgid "upon none" msgstr "" -#: ../libsvn_client/conflicts.c:3158 ../svn/cl-conflicts.c:127 +#: ../libsvn_client/conflicts.c:3510 ../svn/cl-conflicts.c:127 #: ../svn/cl-conflicts.c:234 msgid "local edit" msgstr "" -#: ../libsvn_client/conflicts.c:3161 ../svn/cl-conflicts.c:140 +#: ../libsvn_client/conflicts.c:3513 ../svn/cl-conflicts.c:140 #: ../svn/cl-conflicts.c:237 msgid "local add" msgstr "" -#: ../libsvn_client/conflicts.c:3164 ../svn/cl-conflicts.c:131 +#: ../libsvn_client/conflicts.c:3516 ../svn/cl-conflicts.c:131 #: ../svn/cl-conflicts.c:240 msgid "local delete" msgstr "" -#: ../libsvn_client/conflicts.c:3167 ../svn/cl-conflicts.c:129 +#: ../libsvn_client/conflicts.c:3519 ../svn/cl-conflicts.c:129 #: ../svn/cl-conflicts.c:243 msgid "local obstruction" msgstr "" -#: ../libsvn_client/conflicts.c:3171 ../svn/cl-conflicts.c:247 +#: ../libsvn_client/conflicts.c:3523 ../svn/cl-conflicts.c:247 #, c-format msgid "local %s" msgstr "" -#: ../libsvn_client/conflicts.c:3180 ../svn/cl-conflicts.c:192 +#: ../libsvn_client/conflicts.c:3532 ../svn/cl-conflicts.c:192 #: ../svn/cl-conflicts.c:256 msgid "incoming edit" msgstr "" -#: ../libsvn_client/conflicts.c:3183 ../svn/cl-conflicts.c:194 +#: ../libsvn_client/conflicts.c:3535 ../svn/cl-conflicts.c:194 #: ../svn/cl-conflicts.c:259 msgid "incoming add" msgstr "" -#: ../libsvn_client/conflicts.c:3186 ../svn/cl-conflicts.c:262 +#: ../libsvn_client/conflicts.c:3538 ../svn/cl-conflicts.c:262 msgid "incoming delete" msgstr "" -#: ../libsvn_client/conflicts.c:3190 ../svn/cl-conflicts.c:266 +#: ../libsvn_client/conflicts.c:3542 ../svn/cl-conflicts.c:266 #, c-format msgid "incoming %s" msgstr "" -#: ../libsvn_client/conflicts.c:3198 ../svn/cl-conflicts.c:273 +#: ../libsvn_client/conflicts.c:3550 ../svn/cl-conflicts.c:273 #: ../svn/cl-conflicts.c:326 #, c-format msgid "%s, %s %s" msgstr "" -#: ../libsvn_client/conflicts.c:3257 +#: ../libsvn_client/conflicts.c:3609 #, c-format msgid "incoming %s %s" msgstr "" -#: ../libsvn_client/conflicts.c:3360 +#: ../libsvn_client/conflicts.c:3712 #, c-format msgid "" "Directory updated from r%ld to r%ld was replaced with a file by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3371 ../libsvn_client/conflicts.c:3451 -#: ../libsvn_client/conflicts.c:3705 ../libsvn_client/conflicts.c:3792 -#: ../libsvn_client/conflicts.c:4092 ../libsvn_client/conflicts.c:4160 +#: ../libsvn_client/conflicts.c:3723 ../libsvn_client/conflicts.c:3803 +#: ../libsvn_client/conflicts.c:4057 ../libsvn_client/conflicts.c:4144 +#: ../libsvn_client/conflicts.c:4444 ../libsvn_client/conflicts.c:4512 #, c-format msgid "" "%s\n" "The replaced directory was moved to '^/%s'." msgstr "" -#: ../libsvn_client/conflicts.c:3386 +#: ../libsvn_client/conflicts.c:3738 #, c-format msgid "" "File updated from r%ld to r%ld was replaced with a file from another line of " "history by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3398 ../libsvn_client/conflicts.c:3477 -#: ../libsvn_client/conflicts.c:3734 ../libsvn_client/conflicts.c:3820 -#: ../libsvn_client/conflicts.c:4121 ../libsvn_client/conflicts.c:4188 +#: ../libsvn_client/conflicts.c:3750 ../libsvn_client/conflicts.c:3829 +#: ../libsvn_client/conflicts.c:4086 ../libsvn_client/conflicts.c:4172 +#: ../libsvn_client/conflicts.c:4473 ../libsvn_client/conflicts.c:4540 #, c-format msgid "" "%s\n" "The replaced file was moved to '^/%s'." msgstr "" -#: ../libsvn_client/conflicts.c:3412 +#: ../libsvn_client/conflicts.c:3764 #, c-format msgid "Item updated from r%ld to r%ld was replaced with a file by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3422 ../libsvn_client/conflicts.c:3501 -#: ../libsvn_client/conflicts.c:3761 ../libsvn_client/conflicts.c:3847 -#: ../libsvn_client/conflicts.c:4215 +#: ../libsvn_client/conflicts.c:3774 ../libsvn_client/conflicts.c:3853 +#: ../libsvn_client/conflicts.c:4113 ../libsvn_client/conflicts.c:4199 +#: ../libsvn_client/conflicts.c:4567 #, c-format msgid "" "%s\n" "The replaced item was moved to '^/%s'." msgstr "" -#: ../libsvn_client/conflicts.c:3439 +#: ../libsvn_client/conflicts.c:3791 #, c-format msgid "" "Directory updated from r%ld to r%ld was replaced with a directory from " "another line of history by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3466 +#: ../libsvn_client/conflicts.c:3818 #, c-format msgid "" "File updated from r%ld to r%ld was replaced with a directory by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3491 +#: ../libsvn_client/conflicts.c:3843 #, c-format msgid "Item updated from r%ld to r%ld was replaced by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3524 +#: ../libsvn_client/conflicts.c:3876 #, c-format msgid "Directory updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3536 +#: ../libsvn_client/conflicts.c:3888 #, c-format msgid "Directory updated from r%ld to r%ld was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3552 +#: ../libsvn_client/conflicts.c:3904 #, c-format msgid "File updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3563 +#: ../libsvn_client/conflicts.c:3915 #, c-format msgid "File updated from r%ld to r%ld was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3577 +#: ../libsvn_client/conflicts.c:3929 #, c-format msgid "Item updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3588 +#: ../libsvn_client/conflicts.c:3940 #, c-format msgid "Item updated from r%ld to r%ld was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3608 +#: ../libsvn_client/conflicts.c:3960 #, c-format msgid "" "Directory updated backwards from r%ld to r%ld was a file before the " "replacement made by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3615 +#: ../libsvn_client/conflicts.c:3967 #, c-format msgid "" "File updated backwards from r%ld to r%ld was a file from another line of " "history before the replacement made by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3622 +#: ../libsvn_client/conflicts.c:3974 #, c-format msgid "" "Item updated backwards from r%ld to r%ld was replaced with a file by %s in r" "%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3631 +#: ../libsvn_client/conflicts.c:3983 #, c-format msgid "" "Directory updated backwards from r%ld to r%ld was a directory from another " "line of history before the replacement made by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3639 +#: ../libsvn_client/conflicts.c:3991 #, c-format msgid "" "File updated backwards from r%ld to r%ld was a directory before the " "replacement made by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3645 +#: ../libsvn_client/conflicts.c:3997 #, c-format msgid "" "Item updated backwards from r%ld to r%ld was replaced with a directory by %s " "in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3654 +#: ../libsvn_client/conflicts.c:4006 #, c-format msgid "" "Directory updated backwards from r%ld to r%ld did not exist before it was " "added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3661 +#: ../libsvn_client/conflicts.c:4013 #, c-format msgid "" "File updated backwards from r%ld to r%ld did not exist before it was added " "by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3667 +#: ../libsvn_client/conflicts.c:4019 #, c-format msgid "" "Item updated backwards from r%ld to r%ld did not exist before it was added " "by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3692 +#: ../libsvn_client/conflicts.c:4044 #, c-format msgid "" "Directory switched from\n" @@ -2363,7 +2371,7 @@ msgid "" "was replaced with a file by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3720 +#: ../libsvn_client/conflicts.c:4072 #, c-format msgid "" "File switched from\n" @@ -2373,7 +2381,7 @@ msgid "" "was replaced with a file from another line of history by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3748 ../libsvn_client/conflicts.c:3991 +#: ../libsvn_client/conflicts.c:4100 ../libsvn_client/conflicts.c:4343 #, c-format msgid "" "Item switched from\n" @@ -2383,7 +2391,7 @@ msgid "" "was replaced with a file by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3778 +#: ../libsvn_client/conflicts.c:4130 #, c-format msgid "" "Directory switched from\n" @@ -2393,7 +2401,7 @@ msgid "" "was replaced with a directory from another line of history by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3807 +#: ../libsvn_client/conflicts.c:4159 #, c-format msgid "" "File switched from\n" @@ -2403,7 +2411,7 @@ msgid "" "was replaced with a directory by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3834 ../libsvn_client/conflicts.c:4021 +#: ../libsvn_client/conflicts.c:4186 ../libsvn_client/conflicts.c:4373 #, c-format msgid "" "Item switched from\n" @@ -2413,7 +2421,7 @@ msgid "" "was replaced with a directory by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3870 +#: ../libsvn_client/conflicts.c:4222 #, c-format msgid "" "Directory switched from\n" @@ -2423,7 +2431,7 @@ msgid "" "was moved to '^/%s' by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3884 +#: ../libsvn_client/conflicts.c:4236 #, c-format msgid "" "Directory switched from\n" @@ -2433,7 +2441,7 @@ msgid "" "was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3902 +#: ../libsvn_client/conflicts.c:4254 #, c-format msgid "" "File switched from\n" @@ -2443,7 +2451,7 @@ msgid "" "was moved to '^/%s' by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3916 +#: ../libsvn_client/conflicts.c:4268 #, c-format msgid "" "File switched from\n" @@ -2453,7 +2461,7 @@ msgid "" "was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3933 +#: ../libsvn_client/conflicts.c:4285 #, c-format msgid "" "Item switched from\n" @@ -2463,7 +2471,7 @@ msgid "" "was moved to '^/%s' by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3947 +#: ../libsvn_client/conflicts.c:4299 #, c-format msgid "" "Item switched from\n" @@ -2473,7 +2481,7 @@ msgid "" "was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3972 ../libsvn_client/conflicts.c:4012 +#: ../libsvn_client/conflicts.c:4324 ../libsvn_client/conflicts.c:4364 #, c-format msgid "" "Directory switched from\n" @@ -2483,7 +2491,7 @@ msgid "" "was a file before the replacement made by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:3982 +#: ../libsvn_client/conflicts.c:4334 #, c-format msgid "" "File switched from\n" @@ -2494,7 +2502,7 @@ msgid "" "r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4002 +#: ../libsvn_client/conflicts.c:4354 #, c-format msgid "" "Directory switched from\n" @@ -2505,7 +2513,7 @@ msgid "" "%s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4032 +#: ../libsvn_client/conflicts.c:4384 #, c-format msgid "" "Directory switched from\n" @@ -2515,7 +2523,7 @@ msgid "" "did not exist before it was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4042 +#: ../libsvn_client/conflicts.c:4394 #, c-format msgid "" "File switched from\n" @@ -2525,7 +2533,7 @@ msgid "" "did not exist before it was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4051 +#: ../libsvn_client/conflicts.c:4403 #, c-format msgid "" "Item switched from\n" @@ -2535,7 +2543,7 @@ msgid "" "did not exist before it was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4079 +#: ../libsvn_client/conflicts.c:4431 #, c-format msgid "" "Directory merged from\n" @@ -2545,7 +2553,7 @@ msgid "" "was replaced with a file by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4107 +#: ../libsvn_client/conflicts.c:4459 #, c-format msgid "" "File merged from\n" @@ -2555,7 +2563,7 @@ msgid "" "was replaced with a file from another line of history by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4133 +#: ../libsvn_client/conflicts.c:4485 #, c-format msgid "" "Item merged from\n" @@ -2565,7 +2573,7 @@ msgid "" "was replaced with a file by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4146 +#: ../libsvn_client/conflicts.c:4498 #, c-format msgid "" "Directory merged from\n" @@ -2575,7 +2583,7 @@ msgid "" "was replaced with a directory from another line of history by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4175 +#: ../libsvn_client/conflicts.c:4527 #, c-format msgid "" "File merged from\n" @@ -2585,7 +2593,7 @@ msgid "" "was replaced with a directory by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4202 +#: ../libsvn_client/conflicts.c:4554 #, c-format msgid "" "Item merged from\n" @@ -2595,7 +2603,7 @@ msgid "" "was replaced with a directory by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4238 +#: ../libsvn_client/conflicts.c:4590 #, c-format msgid "" "Directory merged from\n" @@ -2605,7 +2613,7 @@ msgid "" "was moved to '^/%s' by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4252 +#: ../libsvn_client/conflicts.c:4604 #, c-format msgid "" "Directory merged from\n" @@ -2615,7 +2623,7 @@ msgid "" "was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4270 +#: ../libsvn_client/conflicts.c:4622 #, c-format msgid "" "File merged from\n" @@ -2625,7 +2633,7 @@ msgid "" "was moved to '^/%s' by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4284 +#: ../libsvn_client/conflicts.c:4636 #, c-format msgid "" "File merged from\n" @@ -2635,7 +2643,7 @@ msgid "" "was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4301 +#: ../libsvn_client/conflicts.c:4653 #, c-format msgid "" "Item merged from\n" @@ -2645,7 +2653,7 @@ msgid "" "was moved to '^/%s' by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4315 +#: ../libsvn_client/conflicts.c:4667 #, c-format msgid "" "Item merged from\n" @@ -2655,7 +2663,7 @@ msgid "" "was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4340 ../libsvn_client/conflicts.c:4379 +#: ../libsvn_client/conflicts.c:4692 ../libsvn_client/conflicts.c:4731 #, c-format msgid "" "Directory reverse-merged from\n" @@ -2663,7 +2671,7 @@ msgid "" "to ^/%s@%ld was a file before the replacement made by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4349 +#: ../libsvn_client/conflicts.c:4701 #, c-format msgid "" "File reverse-merged from\n" @@ -2674,7 +2682,7 @@ msgid "" "r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4358 +#: ../libsvn_client/conflicts.c:4710 #, c-format msgid "" "Item reverse-merged from\n" @@ -2684,7 +2692,7 @@ msgid "" "was replaced with a file by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4369 +#: ../libsvn_client/conflicts.c:4721 #, c-format msgid "" "Directory reverse-merged from\n" @@ -2693,7 +2701,7 @@ msgid "" "replacement made by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4387 +#: ../libsvn_client/conflicts.c:4739 #, c-format msgid "" "Item reverse-merged from\n" @@ -2703,7 +2711,7 @@ msgid "" "was replaced with a directory by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4398 +#: ../libsvn_client/conflicts.c:4750 #, c-format msgid "" "Directory reverse-merged from\n" @@ -2711,7 +2719,7 @@ msgid "" "to ^/%s@%ld did not exist before it was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4407 +#: ../libsvn_client/conflicts.c:4759 #, c-format msgid "" "File reverse-merged from\n" @@ -2721,7 +2729,7 @@ msgid "" "did not exist before it was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:4416 +#: ../libsvn_client/conflicts.c:4768 #, c-format msgid "" "Item reverse-merged from\n" @@ -2731,62 +2739,62 @@ msgid "" "did not exist before it was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5265 +#: ../libsvn_client/conflicts.c:5492 #, c-format msgid "" "A new directory appeared during update to r%ld; it was added by %s in r%ld " "and later deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5272 +#: ../libsvn_client/conflicts.c:5499 #, c-format msgid "" "A new directory appeared during update to r%ld; it was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5277 +#: ../libsvn_client/conflicts.c:5504 #, c-format msgid "" "A new directory appeared during update to r%ld; it was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5287 +#: ../libsvn_client/conflicts.c:5514 #, c-format msgid "" "A new file appeared during update to r%ld; it was added by %s in r%ld and " "later deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5294 +#: ../libsvn_client/conflicts.c:5521 #, c-format msgid "A new file appeared during update to r%ld; it was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5299 +#: ../libsvn_client/conflicts.c:5526 #, c-format msgid "" "A new file appeared during update to r%ld; it was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5308 +#: ../libsvn_client/conflicts.c:5535 #, c-format msgid "" "A new item appeared during update to r%ld; it was added by %s in r%ld and " "later deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5315 +#: ../libsvn_client/conflicts.c:5542 #, c-format msgid "A new item appeared during update to r%ld; it was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5320 +#: ../libsvn_client/conflicts.c:5547 #, c-format msgid "" "A new item appeared during update to r%ld; it was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5339 +#: ../libsvn_client/conflicts.c:5566 #, c-format msgid "" "A new directory appeared during switch to\n" @@ -2794,7 +2802,7 @@ msgid "" "It was added by %s in r%ld and later deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5347 +#: ../libsvn_client/conflicts.c:5574 #, c-format msgid "" "A new directory appeared during switch to\n" @@ -2802,7 +2810,7 @@ msgid "" "It was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5353 +#: ../libsvn_client/conflicts.c:5580 #, c-format msgid "" "A new directory appeared during switch to\n" @@ -2810,7 +2818,7 @@ msgid "" "It was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5364 +#: ../libsvn_client/conflicts.c:5591 #, c-format msgid "" "A new file appeared during switch to\n" @@ -2818,7 +2826,7 @@ msgid "" "It was added by %s in r%ld and later deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5372 +#: ../libsvn_client/conflicts.c:5599 #, c-format msgid "" "A new file appeared during switch to\n" @@ -2826,7 +2834,7 @@ msgid "" "It was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5379 +#: ../libsvn_client/conflicts.c:5606 #, c-format msgid "" "A new file appeared during switch to\n" @@ -2834,7 +2842,7 @@ msgid "" "It was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5390 +#: ../libsvn_client/conflicts.c:5617 #, c-format msgid "" "A new item appeared during switch to\n" @@ -2842,7 +2850,7 @@ msgid "" "It was added by %s in r%ld and later deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5398 +#: ../libsvn_client/conflicts.c:5625 #, c-format msgid "" "A new item appeared during switch to\n" @@ -2850,7 +2858,7 @@ msgid "" "It was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5405 +#: ../libsvn_client/conflicts.c:5632 #, c-format msgid "" "A new item appeared during switch to\n" @@ -2858,7 +2866,7 @@ msgid "" "It was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5426 +#: ../libsvn_client/conflicts.c:5653 #, c-format msgid "" "A new directory appeared during merge of\n" @@ -2866,7 +2874,7 @@ msgid "" "It was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5432 +#: ../libsvn_client/conflicts.c:5659 #, c-format msgid "" "A new directory appeared during merge of\n" @@ -2874,7 +2882,7 @@ msgid "" "It was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5442 +#: ../libsvn_client/conflicts.c:5669 #, c-format msgid "" "A new file appeared during merge of\n" @@ -2882,7 +2890,7 @@ msgid "" "It was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5448 +#: ../libsvn_client/conflicts.c:5675 #, c-format msgid "" "A new file appeared during merge of\n" @@ -2890,7 +2898,7 @@ msgid "" "It was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5457 +#: ../libsvn_client/conflicts.c:5684 #, c-format msgid "" "A new item appeared during merge of\n" @@ -2898,7 +2906,7 @@ msgid "" "It was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5463 +#: ../libsvn_client/conflicts.c:5690 #, c-format msgid "" "A new item appeared during merge of\n" @@ -2906,7 +2914,7 @@ msgid "" "It was added by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5483 +#: ../libsvn_client/conflicts.c:5710 #, c-format msgid "" "A new directory appeared during reverse-merge of\n" @@ -2914,7 +2922,7 @@ msgid "" "It was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5490 +#: ../libsvn_client/conflicts.c:5717 #, c-format msgid "" "A new directory appeared during reverse-merge of\n" @@ -2922,7 +2930,7 @@ msgid "" "It was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5502 +#: ../libsvn_client/conflicts.c:5729 #, c-format msgid "" "A new file appeared during reverse-merge of\n" @@ -2930,7 +2938,7 @@ msgid "" "It was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5509 +#: ../libsvn_client/conflicts.c:5736 #, c-format msgid "" "A new file appeared during reverse-merge of\n" @@ -2938,7 +2946,7 @@ msgid "" "It was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5519 +#: ../libsvn_client/conflicts.c:5746 #, c-format msgid "" "A new item appeared during reverse-merge of\n" @@ -2946,7 +2954,7 @@ msgid "" "It was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5526 +#: ../libsvn_client/conflicts.c:5753 #, c-format msgid "" "A new item appeared during reverse-merge of\n" @@ -2954,48 +2962,48 @@ msgid "" "It was deleted by %s in r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5840 +#: ../libsvn_client/conflicts.c:6067 #, c-format msgid "" "Changes destined for a directory arrived via the following revisions during " "update from r%ld to r%ld." msgstr "" -#: ../libsvn_client/conflicts.c:5846 +#: ../libsvn_client/conflicts.c:6073 #, c-format msgid "" "Changes destined for a file arrived via the following revisions during " "update from r%ld to r%ld" msgstr "" -#: ../libsvn_client/conflicts.c:5851 +#: ../libsvn_client/conflicts.c:6078 #, c-format msgid "" "Changes from the following revisions arrived during update from r%ld to r%ld" msgstr "" -#: ../libsvn_client/conflicts.c:5859 +#: ../libsvn_client/conflicts.c:6086 #, c-format msgid "" "Changes destined for a directory arrived via the following revisions during " "backwards update from r%ld to r%ld" msgstr "" -#: ../libsvn_client/conflicts.c:5866 +#: ../libsvn_client/conflicts.c:6093 #, c-format msgid "" "Changes destined for a file arrived via the following revisions during " "backwards update from r%ld to r%ld" msgstr "" -#: ../libsvn_client/conflicts.c:5872 +#: ../libsvn_client/conflicts.c:6099 #, c-format msgid "" "Changes from the following revisions arrived during backwards update from r" "%ld to r%ld" msgstr "" -#: ../libsvn_client/conflicts.c:5886 ../libsvn_client/conflicts.c:5893 +#: ../libsvn_client/conflicts.c:6113 ../libsvn_client/conflicts.c:6120 #, c-format msgid "" "Changes destined for a directory arrived via the following revisions during " @@ -3003,52 +3011,56 @@ msgid "" "'^/%s@r%ld'" msgstr "" -#: ../libsvn_client/conflicts.c:5899 +#: ../libsvn_client/conflicts.c:6126 #, c-format msgid "" "Changes from the following revisions arrived during switch to\n" "'^/%s@r%ld'" msgstr "" -#: ../libsvn_client/conflicts.c:5917 +#: ../libsvn_client/conflicts.c:6144 msgid " (no revisions found)" msgstr "" -#: ../libsvn_client/conflicts.c:5945 ../libsvn_client/conflicts.c:5959 -#: ../libsvn_client/conflicts.c:5965 +#: ../libsvn_client/conflicts.c:6172 ../libsvn_client/conflicts.c:6189 +#: ../libsvn_client/conflicts.c:6195 #, c-format msgid "%s r%ld by %s%s" msgstr "" -#: ../libsvn_client/conflicts.c:5955 +#: ../libsvn_client/conflicts.c:6182 #, c-format msgid "" "%s\n" +" [%d revision omitted for brevity],\n" +msgid_plural "" +"%s\n" " [%d revisions omitted for brevity],\n" -msgstr "" +msgstr[0] "" +msgstr[1] "" -#: ../libsvn_client/conflicts.c:6024 +#: ../libsvn_client/conflicts.c:6254 #, c-format msgid "" "Changes destined for a directory arrived during merge of\n" "'^/%s:%ld'." msgstr "" -#: ../libsvn_client/conflicts.c:6031 +#: ../libsvn_client/conflicts.c:6261 #, c-format msgid "" "Changes destined for a file arrived during merge of\n" "'^/%s:%ld'." msgstr "" -#: ../libsvn_client/conflicts.c:6037 +#: ../libsvn_client/conflicts.c:6267 #, c-format msgid "" "Changes arrived during merge of\n" "'^/%s:%ld'." msgstr "" -#: ../libsvn_client/conflicts.c:6049 +#: ../libsvn_client/conflicts.c:6279 #, c-format msgid "" "Changes destined for a directory arrived via the following revisions during " @@ -3056,7 +3068,7 @@ msgid "" "'^/%s:%ld-%ld'" msgstr "" -#: ../libsvn_client/conflicts.c:6056 +#: ../libsvn_client/conflicts.c:6286 #, c-format msgid "" "Changes destined for a file arrived via the following revisions during merge " @@ -3064,35 +3076,35 @@ msgid "" "'^/%s:%ld-%ld'" msgstr "" -#: ../libsvn_client/conflicts.c:6062 +#: ../libsvn_client/conflicts.c:6292 #, c-format msgid "" "Changes from the following revisions arrived during merge of\n" "'^/%s:%ld-%ld'" msgstr "" -#: ../libsvn_client/conflicts.c:6074 +#: ../libsvn_client/conflicts.c:6304 #, c-format msgid "" "Changes destined for a directory arrived during reverse-merge of\n" "'^/%s:%ld'." msgstr "" -#: ../libsvn_client/conflicts.c:6081 +#: ../libsvn_client/conflicts.c:6311 #, c-format msgid "" "Changes destined for a file arrived during reverse-merge of\n" "'^/%s:%ld'." msgstr "" -#: ../libsvn_client/conflicts.c:6087 +#: ../libsvn_client/conflicts.c:6317 #, c-format msgid "" "Changes arrived during reverse-merge of\n" "'^/%s:%ld'." msgstr "" -#: ../libsvn_client/conflicts.c:6099 +#: ../libsvn_client/conflicts.c:6329 #, c-format msgid "" "Changes destined for a directory arrived via the following revisions during " @@ -3100,7 +3112,7 @@ msgid "" "'^/%s:%ld-%ld'" msgstr "" -#: ../libsvn_client/conflicts.c:6107 +#: ../libsvn_client/conflicts.c:6337 #, c-format msgid "" "Changes destined for a file arrived via the following revisions during " @@ -3108,425 +3120,481 @@ msgid "" "'^/%s:%ld-%ld'" msgstr "" -#: ../libsvn_client/conflicts.c:6115 +#: ../libsvn_client/conflicts.c:6345 #, c-format msgid "" "Changes from the following revisions arrived during reverse-merge of\n" "'^/%s:%ld-%ld'" msgstr "" -#: ../libsvn_client/conflicts.c:6304 +#: ../libsvn_client/conflicts.c:6534 #, c-format msgid "" "Tree conflict on '%s' can only be resolved to the current working copy state" msgstr "" -#: ../libsvn_client/conflicts.c:6488 ../libsvn_client/conflicts.c:6494 +#: ../libsvn_client/conflicts.c:6718 ../libsvn_client/conflicts.c:6724 #, c-format msgid "" "Cannot resolve tree conflict on '%s' (expected a base node but found none)" msgstr "" -#: ../libsvn_client/conflicts.c:6499 ../libsvn_client/conflicts.c:6525 -#: ../libsvn_client/conflicts.c:6552 ../libsvn_client/conflicts.c:6575 +#: ../libsvn_client/conflicts.c:6729 ../libsvn_client/conflicts.c:6755 +#: ../libsvn_client/conflicts.c:6782 ../libsvn_client/conflicts.c:6805 +#: ../libsvn_client/conflicts.c:12519 #, c-format msgid "Unexpected option id '%d'" msgstr "" -#: ../libsvn_client/conflicts.c:6508 ../libsvn_client/conflicts.c:6517 +#: ../libsvn_client/conflicts.c:6738 ../libsvn_client/conflicts.c:6747 #, c-format msgid "" "Cannot resolve tree conflict on '%s' (expected base node kind '%s', but " "found '%s')" msgstr "" -#: ../libsvn_client/conflicts.c:6533 ../libsvn_client/conflicts.c:6543 +#: ../libsvn_client/conflicts.c:6763 ../libsvn_client/conflicts.c:6773 #, c-format msgid "" "Cannot resolve tree conflict on '%s' (expected base node from '^/%s@%ld', " "but found '^/%s@%ld')" msgstr "" -#: ../libsvn_client/conflicts.c:6561 ../libsvn_client/conflicts.c:6569 +#: ../libsvn_client/conflicts.c:6791 ../libsvn_client/conflicts.c:6799 #, c-format msgid "" "Cannot resolve tree conflict on '%s' (expected an added item, but the item " "is not added)" msgstr "" -#: ../libsvn_client/conflicts.c:6752 ../libsvn_client/conflicts.c:8629 +#: ../libsvn_client/conflicts.c:6983 ../libsvn_client/conflicts.c:8796 #, c-format msgid "If needed, a backup copy of '%s' can be found at '%s'" msgstr "" -#: ../libsvn_client/conflicts.c:7615 +#: ../libsvn_client/conflicts.c:7845 #, c-format msgid "" "Conflict resolution option '%d' requires details for tree conflict at '%s' " "to be fetched from the repository" msgstr "" -#: ../libsvn_client/conflicts.c:7639 +#: ../libsvn_client/conflicts.c:7869 #, c-format msgid "Could not determine when '%s' was added the repository" msgstr "" -#: ../libsvn_client/conflicts.c:7654 +#: ../libsvn_client/conflicts.c:7884 #, c-format msgid "Could not determine when '%s' was deleted from the repository" msgstr "" -#: ../libsvn_client/conflicts.c:7969 +#: ../libsvn_client/conflicts.c:8105 #, c-format msgid "" "Could not determine the revision in which '^/%s' was added to the " "repository.\n" msgstr "" -#: ../libsvn_client/conflicts.c:8065 +#: ../libsvn_client/conflicts.c:8201 #, c-format msgid "" "Cannot resolve tree conflict on '%s' (expected a copied item, but the item " "is not a copy)" msgstr "" -#: ../libsvn_client/conflicts.c:8076 +#: ../libsvn_client/conflicts.c:8212 #, c-format msgid "" "Cannot resolve tree conflict on '%s' (expected an item copied from a " "revision smaller than r%ld, but the item was copied from r%ld)" msgstr "" -#: ../libsvn_client/conflicts.c:8088 +#: ../libsvn_client/conflicts.c:8224 #, c-format msgid "" "Cannot resolve tree conflict on '%s' (expected an item copied from a " "revision larger than r%ld, but the item was copied from r%ld)" msgstr "" -#: ../libsvn_client/conflicts.c:8107 +#: ../libsvn_client/conflicts.c:8243 #, c-format msgid "" "Cannot resolve tree conflict on '%s' (expected an item copied from '^/%s' or " "from '^/%s' but the item was copied from '^/%s@%ld')" msgstr "" -#: ../libsvn_client/conflicts.c:8129 +#: ../libsvn_client/conflicts.c:8265 #, c-format msgid "" "Cannot resolve tree conflict on '%s' (expected an item copied from '^/%s', " "but the item was copied from '^/%s@%ld')" msgstr "" -#: ../libsvn_client/conflicts.c:8178 +#: ../libsvn_client/conflicts.c:8314 #, c-format msgid "" "Conflict resolution option '%d' requires details for tree conflict at '%s' " "to be fetched from the repository." msgstr "" -#: ../libsvn_client/conflicts.c:8188 +#: ../libsvn_client/conflicts.c:8324 #, c-format msgid "" "Could not find the revision in which '%s' was deleted from the repository" msgstr "" -#: ../libsvn_client/conflicts.c:8213 +#: ../libsvn_client/conflicts.c:8349 #, c-format msgid "" "Cannot resolve tree conflict on '%s' (expected node kind '%s' but found '%s')" msgstr "" -#: ../libsvn_client/conflicts.c:8380 ../libsvn_client/conflicts.c:8676 +#: ../libsvn_client/conflicts.c:8519 ../libsvn_client/conflicts.c:8851 +#: ../libsvn_client/conflicts.c:9049 ../libsvn_client/conflicts.c:9197 +#: ../libsvn_client/conflicts.c:9358 ../libsvn_client/conflicts.c:11149 +#: ../libsvn_client/conflicts.c:11359 #, c-format msgid "" "The specified conflict resolution option requires details for tree conflict " "at '%s' to be fetched from the repository first." msgstr "" -#: ../libsvn_client/conflicts.c:8387 +#: ../libsvn_client/conflicts.c:8526 ../libsvn_client/conflicts.c:8858 +#: ../libsvn_client/conflicts.c:9057 ../libsvn_client/conflicts.c:9205 +#: ../libsvn_client/conflicts.c:11156 ../libsvn_client/conflicts.c:11366 #, c-format msgid "Invalid operation code '%d' recorded for conflict at '%s'" msgstr "" -#: ../libsvn_client/conflicts.c:8737 +#: ../libsvn_client/conflicts.c:9419 #, c-format msgid "" "Cannot resolve tree conflict on '%s' (expected a copied item at '%s', but " "the item is not a copy)" msgstr "" -#: ../libsvn_client/conflicts.c:8750 +#: ../libsvn_client/conflicts.c:9432 #, c-format msgid "" "Cannot resolve tree conflict on '%s' (could not determine origin of '%s')" msgstr "" -#: ../libsvn_client/conflicts.c:9106 ../libsvn_client/conflicts.c:9189 -#: ../libsvn_client/conflicts.c:10366 +#: ../libsvn_client/conflicts.c:9621 +#, c-format +msgid "Corresponding working copy node not found for '%s'" +msgstr "" + +#: ../libsvn_client/conflicts.c:9943 ../libsvn_client/conflicts.c:10026 +#: ../libsvn_client/conflicts.c:12596 msgid "Postpone" msgstr "" -#: ../libsvn_client/conflicts.c:9107 ../libsvn_client/conflicts.c:9190 -#: ../libsvn_client/conflicts.c:10367 +#: ../libsvn_client/conflicts.c:9944 ../libsvn_client/conflicts.c:10027 +#: ../libsvn_client/conflicts.c:12597 msgid "skip this conflict and leave it unresolved" msgstr "" -#: ../libsvn_client/conflicts.c:9116 ../libsvn_client/conflicts.c:9137 -#: ../libsvn_client/conflicts.c:9195 +#: ../libsvn_client/conflicts.c:9953 ../libsvn_client/conflicts.c:9974 +#: ../libsvn_client/conflicts.c:10032 msgid "Accept base" msgstr "" -#: ../libsvn_client/conflicts.c:9117 +#: ../libsvn_client/conflicts.c:9954 msgid "discard local and incoming changes for this binary file" msgstr "" -#: ../libsvn_client/conflicts.c:9122 ../libsvn_client/conflicts.c:9143 -#: ../libsvn_client/conflicts.c:9201 +#: ../libsvn_client/conflicts.c:9959 ../libsvn_client/conflicts.c:9980 +#: ../libsvn_client/conflicts.c:10038 msgid "Accept incoming" msgstr "" -#: ../libsvn_client/conflicts.c:9123 +#: ../libsvn_client/conflicts.c:9960 msgid "accept incoming version of binary file" msgstr "" -#: ../libsvn_client/conflicts.c:9128 ../libsvn_client/conflicts.c:9167 -#: ../libsvn_client/conflicts.c:9207 ../libsvn_client/conflicts.c:9264 +#: ../libsvn_client/conflicts.c:9965 ../libsvn_client/conflicts.c:10004 +#: ../libsvn_client/conflicts.c:10044 ../libsvn_client/conflicts.c:10101 msgid "Mark as resolved" msgstr "" -#: ../libsvn_client/conflicts.c:9129 +#: ../libsvn_client/conflicts.c:9966 msgid "accept binary file as it appears in the working copy" msgstr "" -#: ../libsvn_client/conflicts.c:9138 +#: ../libsvn_client/conflicts.c:9975 msgid "discard local and incoming changes for this file" msgstr "" -#: ../libsvn_client/conflicts.c:9144 +#: ../libsvn_client/conflicts.c:9981 msgid "accept incoming version of entire file" msgstr "" -#: ../libsvn_client/conflicts.c:9149 +#: ../libsvn_client/conflicts.c:9986 msgid "Reject incoming" msgstr "" -#: ../libsvn_client/conflicts.c:9150 +#: ../libsvn_client/conflicts.c:9987 msgid "reject all incoming changes for this file" msgstr "" -#: ../libsvn_client/conflicts.c:9155 ../libsvn_client/conflicts.c:9213 +#: ../libsvn_client/conflicts.c:9992 ../libsvn_client/conflicts.c:10050 msgid "Accept incoming for conflicts" msgstr "" -#: ../libsvn_client/conflicts.c:9156 -msgid "accept changes only where they conflict" +#: ../libsvn_client/conflicts.c:9993 ../libsvn_client/conflicts.c:10051 +msgid "accept incoming changes only where they conflict" msgstr "" -#: ../libsvn_client/conflicts.c:9161 ../libsvn_client/conflicts.c:9219 +#: ../libsvn_client/conflicts.c:9998 ../libsvn_client/conflicts.c:10056 msgid "Reject conflicts" msgstr "" -#: ../libsvn_client/conflicts.c:9162 ../libsvn_client/conflicts.c:9220 -msgid "reject changes which conflict and accept the rest" +#: ../libsvn_client/conflicts.c:9999 +msgid "reject incoming changes which conflict and accept the rest" msgstr "" -#: ../libsvn_client/conflicts.c:9168 +#: ../libsvn_client/conflicts.c:10005 msgid "accept the file as it appears in the working copy" msgstr "" -#: ../libsvn_client/conflicts.c:9196 +#: ../libsvn_client/conflicts.c:10033 msgid "discard local and incoming changes for this property" msgstr "" -#: ../libsvn_client/conflicts.c:9202 +#: ../libsvn_client/conflicts.c:10039 msgid "accept incoming version of entire property value" msgstr "" -#: ../libsvn_client/conflicts.c:9208 +#: ../libsvn_client/conflicts.c:10045 msgid "accept working copy version of entire property value" msgstr "" -#: ../libsvn_client/conflicts.c:9214 -msgid "accept incoming changes only where they conflict" +#: ../libsvn_client/conflicts.c:10057 +msgid "reject changes which conflict and accept the rest" msgstr "" -#: ../libsvn_client/conflicts.c:9225 +#: ../libsvn_client/conflicts.c:10062 msgid "Accept merged" msgstr "" -#: ../libsvn_client/conflicts.c:9226 +#: ../libsvn_client/conflicts.c:10063 msgid "accept merged version of property value" msgstr "" -#: ../libsvn_client/conflicts.c:9265 +#: ../libsvn_client/conflicts.c:10102 msgid "accept current working copy state" msgstr "" -#: ../libsvn_client/conflicts.c:9292 +#: ../libsvn_client/conflicts.c:10129 msgid "Update move destination" msgstr "" -#: ../libsvn_client/conflicts.c:9293 +#: ../libsvn_client/conflicts.c:10130 msgid "apply incoming changes to move destination" msgstr "" -#: ../libsvn_client/conflicts.c:9327 +#: ../libsvn_client/conflicts.c:10164 msgid "Update any moved-away children" msgstr "" -#: ../libsvn_client/conflicts.c:9328 +#: ../libsvn_client/conflicts.c:10165 msgid "prepare for updating moved-away children, if any" msgstr "" -#: ../libsvn_client/conflicts.c:9373 +#: ../libsvn_client/conflicts.c:10210 #, c-format msgid "ignore and do not add '^/%s@%ld' here" msgstr "" -#: ../libsvn_client/conflicts.c:9381 +#: ../libsvn_client/conflicts.c:10218 #, c-format msgid "replace '^/%s@%ld' with the locally added file" msgstr "" -#: ../libsvn_client/conflicts.c:9386 +#: ../libsvn_client/conflicts.c:10223 #, c-format msgid "replace '^/%s@%ld' with the locally added directory" msgstr "" -#: ../libsvn_client/conflicts.c:9392 +#: ../libsvn_client/conflicts.c:10229 #, c-format msgid "replace '^/%s@%ld' with the locally added item" msgstr "" -#: ../libsvn_client/conflicts.c:9397 +#: ../libsvn_client/conflicts.c:10234 #, c-format msgid "unexpected operation code '%d'" msgstr "" -#: ../libsvn_client/conflicts.c:9401 +#: ../libsvn_client/conflicts.c:10238 msgid "Ignore incoming addition" msgstr "" -#: ../libsvn_client/conflicts.c:9448 ../libsvn_client/conflicts.c:9578 +#: ../libsvn_client/conflicts.c:10285 ../libsvn_client/conflicts.c:10415 #, c-format msgid "merge '^/%s@%ld' into '%s'" msgstr "" -#: ../libsvn_client/conflicts.c:9456 ../libsvn_client/conflicts.c:9587 +#: ../libsvn_client/conflicts.c:10293 ../libsvn_client/conflicts.c:10424 #, c-format msgid "merge local '%s' and '^/%s@%ld'" msgstr "" -#: ../libsvn_client/conflicts.c:9466 +#: ../libsvn_client/conflicts.c:10303 msgid "Merge the files" msgstr "" -#: ../libsvn_client/conflicts.c:9515 +#: ../libsvn_client/conflicts.c:10352 #, c-format msgid "delete '%s', copy '^/%s@%ld' here, and merge the files" msgstr "" -#: ../libsvn_client/conflicts.c:9525 ../libsvn_client/conflicts.c:9709 +#: ../libsvn_client/conflicts.c:10362 ../libsvn_client/conflicts.c:10546 msgid "Replace and merge" msgstr "" -#: ../libsvn_client/conflicts.c:9596 +#: ../libsvn_client/conflicts.c:10433 msgid "Merge the directories" msgstr "" -#: ../libsvn_client/conflicts.c:9643 +#: ../libsvn_client/conflicts.c:10480 #, c-format msgid "delete '%s' and copy '^/%s@%ld' here" msgstr "" -#: ../libsvn_client/conflicts.c:9652 +#: ../libsvn_client/conflicts.c:10489 msgid "Delete my directory and replace it with incoming directory" msgstr "" -#: ../libsvn_client/conflicts.c:9699 +#: ../libsvn_client/conflicts.c:10536 #, c-format msgid "delete '%s', copy '^/%s@%ld' here, and merge the directories" msgstr "" -#: ../libsvn_client/conflicts.c:9779 +#: ../libsvn_client/conflicts.c:10616 #, c-format msgid "ignore the deletion of '^/%s@%ld'" msgstr "" -#: ../libsvn_client/conflicts.c:9784 +#: ../libsvn_client/conflicts.c:10621 msgid "Ignore incoming deletion" msgstr "" -#: ../libsvn_client/conflicts.c:9837 +#: ../libsvn_client/conflicts.c:10675 #, c-format msgid "accept the deletion of '%s'" msgstr "" -#: ../libsvn_client/conflicts.c:9844 +#: ../libsvn_client/conflicts.c:10682 msgid "Accept incoming deletion" msgstr "" -#: ../libsvn_client/conflicts.c:9883 +#: ../libsvn_client/conflicts.c:10742 ../libsvn_client/conflicts.c:10755 #, c-format msgid "move '%s' to '%s' and merge" msgstr "" -#: ../libsvn_client/conflicts.c:9893 +#: ../libsvn_client/conflicts.c:10767 #, c-format msgid "move and merge local changes from '%s' into '%s'" msgstr "" -#: ../libsvn_client/conflicts.c:9957 ../libsvn_client/conflicts.c:10017 +#: ../libsvn_client/conflicts.c:10840 ../libsvn_client/conflicts.c:10908 +#: ../libsvn_client/conflicts.c:11798 ../libsvn_client/conflicts.c:11901 msgid "Move and merge" msgstr "" -#: ../libsvn_client/conflicts.c:10101 +#: ../libsvn_client/conflicts.c:10972 #, c-format msgid "apply changes to move destination '%s'" msgstr "" -#: ../libsvn_client/conflicts.c:10110 +#: ../libsvn_client/conflicts.c:10985 ../libsvn_client/conflicts.c:10993 msgid "Apply to move destination" msgstr "" -#: ../libsvn_client/conflicts.c:10143 ../libsvn_client/conflicts.c:10272 +#: ../libsvn_client/conflicts.c:11056 ../libsvn_client/conflicts.c:12443 +#, c-format +msgid "apply changes to '%s'" +msgstr "" + +#: ../libsvn_client/conflicts.c:11069 ../libsvn_client/conflicts.c:11077 +msgid "Apply to corresponding local location" +msgstr "" + +#: ../libsvn_client/conflicts.c:11650 ../libsvn_client/conflicts.c:11884 +#, c-format +msgid "apply changes to '%s' and revert addition of '%s'" +msgstr "" + +#: ../libsvn_client/conflicts.c:11664 +#, c-format +msgid "override incoming move and merge incoming changes from '%s' to '%s'" +msgstr "" + +#: ../libsvn_client/conflicts.c:11715 +#, c-format +msgid "accept incoming move and merge local changes from '%s' to '%s'" +msgstr "" + +#: ../libsvn_client/conflicts.c:11787 ../libsvn_client/conflicts.c:11893 +msgid "Merge to corresponding local location" +msgstr "" + +#: ../libsvn_client/conflicts.c:11986 ../libsvn_client/conflicts.c:12006 +#: ../libsvn_client/conflicts.c:12296 ../libsvn_client/conflicts.c:12324 #, c-format msgid "" "Getting a list of possible move targets requires details for tree conflict " "at '%s' to be fetched from the repository first" msgstr "" -#: ../libsvn_client/conflicts.c:10196 ../libsvn_client/conflicts.c:10320 +#: ../libsvn_client/conflicts.c:12051 ../libsvn_client/conflicts.c:12458 +#: ../libsvn_client/conflicts.c:12492 ../libsvn_client/conflicts.c:12543 +#, c-format +msgid "Index '%d' is out of bounds of the possible move target list for '%s'" +msgstr "" + +#: ../libsvn_client/conflicts.c:12079 +#, c-format +msgid "" +"Repository path '%s' not found in list of possible move targets for '%s'" +msgstr "" + +#: ../libsvn_client/conflicts.c:12127 ../libsvn_client/conflicts.c:12153 +#: ../libsvn_client/conflicts.c:12418 ../libsvn_client/conflicts.c:12483 +#: ../libsvn_client/conflicts.c:12530 #, c-format msgid "" "Setting a move target requires details for tree conflict at '%s' to be " "fetched from the repository first" msgstr "" -#: ../libsvn_client/conflicts.c:10205 ../libsvn_client/conflicts.c:10333 +#: ../libsvn_client/conflicts.c:12246 #, c-format -msgid "Index '%d' is out of bounds of the possible move target list for '%s'" +msgid "" +"Getting a list of possible move siblings requires details for tree conflict " +"at '%s' to be fetched from the repository first" msgstr "" -#: ../libsvn_client/conflicts.c:10243 +#: ../libsvn_client/conflicts.c:12429 #, c-format -msgid "" -"Repository path '%s' not found in list of possible move targets for '%s'" +msgid "Index '%d' is out of bounds of the possible move sibling list for '%s'" msgstr "" -#: ../libsvn_client/conflicts.c:10550 ../libsvn_client/conflicts.c:10599 -#: ../libsvn_client/conflicts.c:10652 +#: ../libsvn_client/conflicts.c:12787 ../libsvn_client/conflicts.c:12836 +#: ../libsvn_client/conflicts.c:12889 #, c-format msgid "Inapplicable conflict resolution option given for conflicted path '%s'" msgstr "" -#: ../libsvn_client/conflicts.c:10872 +#: ../libsvn_client/conflicts.c:13109 #, c-format msgid "Property '%s' is not in conflict." msgstr "" -#: ../libsvn_client/conflicts.c:11262 ../libsvn_wc/conflicts.c:3292 +#: ../libsvn_client/conflicts.c:13507 ../libsvn_wc/conflicts.c:3327 #, c-format msgid "Unable to resolve pending conflict on '%s'" msgstr "" @@ -3569,10 +3637,10 @@ msgstr "" msgid "Path '%s' exists, but is excluded" msgstr "" -#: ../libsvn_client/copy.c:991 ../libsvn_client/copy.c:1715 -#: ../libsvn_client/copy.c:2090 ../libsvn_client/copy.c:2737 -#: ../libsvn_client/import.c:911 ../libsvn_client/mtcc.c:456 -#: ../libsvn_client/mtcc.c:473 ../libsvn_ra_serf/util.c:1920 +#: ../libsvn_client/copy.c:991 ../libsvn_client/copy.c:1708 +#: ../libsvn_client/copy.c:2081 ../libsvn_client/import.c:911 +#: ../libsvn_client/mtcc.c:456 ../libsvn_client/mtcc.c:473 +#: ../libsvn_ra_serf/util.c:1918 #, c-format msgid "Path '%s' already exists" msgstr "" @@ -3588,103 +3656,76 @@ msgid "Directory '%s' is not under version control" msgstr "" #: ../libsvn_client/copy.c:1073 ../libsvn_client/copy.c:1082 -#: ../libsvn_client/copy.c:1092 ../libsvn_client/copy.c:2763 +#: ../libsvn_client/copy.c:1092 #, c-format msgid "Path '%s' is not a directory" msgstr "" -#: ../libsvn_client/copy.c:1131 ../libsvn_client/merge.c:10252 -#: ../svnlook/svnlook.c:1411 +#: ../libsvn_client/copy.c:1130 ../libsvn_client/merge.c:10270 +#: ../svnlook/svnlook.c:1445 #, c-format msgid "Path '%s' does not exist" msgstr "" -#: ../libsvn_client/copy.c:1315 ../libsvn_client/copy.c:1356 +#: ../libsvn_client/copy.c:1308 ../libsvn_client/copy.c:1349 #, c-format msgid "Path '%s' already exists, but is not a directory" msgstr "" -#: ../libsvn_client/copy.c:1493 +#: ../libsvn_client/copy.c:1486 msgid "Source and destination URLs appear not to point to the same repository." msgstr "" -#: ../libsvn_client/copy.c:1705 ../libsvn_client/prop_commands.c:167 +#: ../libsvn_client/copy.c:1698 ../libsvn_client/prop_commands.c:167 #, c-format msgid "Path '%s' does not exist in revision %ld" msgstr "" -#: ../libsvn_client/copy.c:2721 ../libsvn_client/mtcc.c:550 +#: ../libsvn_client/copy.c:2927 ../libsvn_client/mtcc.c:550 #, c-format msgid "Path '%s' not found in revision %ld" msgstr "" -#: ../libsvn_client/copy.c:2726 +#: ../libsvn_client/copy.c:2932 #, c-format msgid "Path '%s' not found in head revision" msgstr "" -#: ../libsvn_client/copy.c:2871 +#: ../libsvn_client/copy.c:3040 msgid "Cannot mix repository and working copy sources" msgstr "" -#: ../libsvn_client/copy.c:2924 +#: ../libsvn_client/copy.c:3093 #, c-format msgid "Cannot copy path '%s' into its own child '%s'" msgstr "" -#: ../libsvn_client/copy.c:2960 +#: ../libsvn_client/copy.c:3129 #, c-format msgid "" "Cannot move the external at '%s'; please edit the svn:externals property on " "'%s'." msgstr "" -#: ../libsvn_client/copy.c:2975 +#: ../libsvn_client/copy.c:3144 msgid "Moves between the working copy and the repository are not supported" msgstr "" -#: ../libsvn_client/copy.c:2990 +#: ../libsvn_client/copy.c:3159 #, c-format msgid "Cannot move URL '%s' into itself" msgstr "" -#: ../libsvn_client/copy.c:2991 +#: ../libsvn_client/copy.c:3160 #, c-format msgid "Cannot move path '%s' into itself" msgstr "" -#: ../libsvn_client/copy.c:3058 +#: ../libsvn_client/copy.c:3227 #, c-format msgid "'%s' does not have a URL associated with it" msgstr "" -#: ../libsvn_client/copy_foreign.c:131 ../libsvn_client/copy_foreign.c:283 -#: ../libsvn_client/externals.c:1023 ../libsvn_client/externals.c:1234 -#: ../libsvn_wc/update_editor.c:1119 -#, c-format -msgid "Path '%s' is not in the working copy" -msgstr "" - -#: ../libsvn_client/copy_foreign.c:373 ../libsvn_client/export.c:814 -#: ../libsvn_client/repos_diff.c:1002 ../libsvn_fs_fs/dag.c:1107 -#: ../libsvn_fs_x/dag.c:904 ../libsvn_ra_serf/commit.c:2229 -#: ../libsvn_ra_svn/client.c:1506 ../libsvn_wc/diff_editor.c:2109 -#: ../libsvn_wc/diff_editor.c:2195 ../libsvn_wc/externals.c:711 -#: ../libsvn_wc/update_editor.c:4228 -#, c-format -msgid "Checksum mismatch for '%s'" -msgstr "" - -#: ../libsvn_client/copy_foreign.c:481 -#, c-format -msgid "'%s' is not a valid location inside a repository" -msgstr "" - -#: ../libsvn_client/copy_foreign.c:512 -#, c-format -msgid "Can't add '%s', because no parent directory is found" -msgstr "" - #: ../libsvn_client/delete.c:76 #, c-format msgid "'%s' is in the way of the resource actually under version control" @@ -3702,104 +3743,104 @@ msgid "" "property on '%s'" msgstr "" -#: ../libsvn_client/delete.c:358 +#: ../libsvn_client/delete.c:359 #, c-format msgid "URL '%s' not within a repository" msgstr "" -#: ../libsvn_client/delete.c:365 +#: ../libsvn_client/delete.c:366 #, c-format msgid "URL '%s' does not exist" msgstr "" -#: ../libsvn_client/deprecated.c:884 ../svn/move-cmd.c:65 +#: ../libsvn_client/deprecated.c:939 ../svn/move-cmd.c:65 msgid "Cannot specify revisions (except HEAD) with move operations" msgstr "" -#: ../libsvn_client/deprecated.c:1667 +#: ../libsvn_client/deprecated.c:1805 msgid "No commits in repository" msgstr "" -#: ../libsvn_client/deprecated.c:3052 ../libsvn_wc/deprecated.c:4202 +#: ../libsvn_client/deprecated.c:3206 ../libsvn_wc/deprecated.c:4228 msgid "Non-recursive relocation not supported" msgstr "" -#: ../libsvn_client/diff.c:66 +#: ../libsvn_client/diff.c:69 #, c-format msgid "Path '%s' must be an immediate child of the directory '%s'" msgstr "" -#: ../libsvn_client/diff.c:241 +#: ../libsvn_client/diff.c:292 #, c-format msgid "%s\t(revision %ld)" msgstr "" -#: ../libsvn_client/diff.c:243 +#: ../libsvn_client/diff.c:294 #, c-format msgid "%s\t(nonexistent)" msgstr "" #. SVN_INVALID_REVNUM -#: ../libsvn_client/diff.c:245 +#: ../libsvn_client/diff.c:296 #, c-format msgid "%s\t(working copy)" msgstr "" -#: ../libsvn_client/diff.c:934 +#: ../libsvn_client/diff.c:978 #, c-format msgid "Cannot display: file marked as a binary type.%s" msgstr "" -#: ../libsvn_client/diff.c:1471 ../libsvn_client/merge.c:7301 -#: ../libsvn_client/merge.c:10654 +#: ../libsvn_client/diff.c:1474 ../libsvn_client/merge.c:7344 +#: ../libsvn_client/merge.c:10672 msgid "Not all required revisions are specified" msgstr "" -#: ../libsvn_client/diff.c:1485 +#: ../libsvn_client/diff.c:1488 msgid "" "At least one revision must be something other than BASE or WORKING when " "diffing a URL" msgstr "" -#: ../libsvn_client/diff.c:1522 +#: ../libsvn_client/diff.c:1525 #, c-format msgid "Diff target '%s' was not found in the repository at revision '%ld'" msgstr "" -#: ../libsvn_client/diff.c:1527 +#: ../libsvn_client/diff.c:1530 #, c-format msgid "" "Diff target '%s' was not found in the repository at revision '%ld' or '%ld'" msgstr "" -#: ../libsvn_client/diff.c:1703 +#: ../libsvn_client/diff.c:1717 #, c-format msgid "" "Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'" msgstr "" -#: ../libsvn_client/diff.c:1708 +#: ../libsvn_client/diff.c:1722 #, c-format msgid "" "Diff targets '%s' and '%s' were not found in the repository at revisions " "'%ld' and '%ld'" msgstr "" -#: ../libsvn_client/diff.c:1807 -msgid "Sorry, svn_client_diff6 was called in a way that is not yet supported" +#: ../libsvn_client/diff.c:1821 +msgid "Sorry, svn_client_diff7 was called in a way that is not yet supported" msgstr "" -#: ../libsvn_client/diff.c:1847 +#: ../libsvn_client/diff.c:1863 msgid "" -"Only diffs between a path's text-base and its working files are supported at " -"this time" +"A non-URL diff at this time must be either from a path's base to the same " +"path's working version or between the working versions of two paths" msgstr "" -#: ../libsvn_client/diff.c:2551 ../libsvn_client/diff.c:2638 +#: ../libsvn_client/diff.c:2794 ../libsvn_client/diff.c:2857 msgid "Cannot ignore properties and show only properties at the same time" msgstr "" -#: ../libsvn_client/diff_local.c:789 ../libsvn_wc/props.c:1675 +#: ../libsvn_client/diff_local.c:733 ../libsvn_wc/props.c:1675 #, c-format msgid "'%s' is not a file or directory" msgstr "" @@ -3813,7 +3854,7 @@ msgstr "" msgid "Destination directory exists, and will not be overwritten unless forced" msgstr "" -#: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1529 +#: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1526 #: ../libsvn_wc/adm_crawler.c:1270 ../libsvn_wc/copy.c:651 #: ../libsvn_wc/crop.c:239 ../libsvn_wc/crop.c:342 ../libsvn_wc/info.c:377 #: ../libsvn_wc/node.c:529 ../libsvn_wc/props.c:202 ../libsvn_wc/status.c:2728 @@ -3834,14 +3875,14 @@ msgstr "" msgid "The node '%s' was not found." msgstr "" -#: ../libsvn_client/export.c:285 ../libsvn_client/export.c:1182 -#: ../libsvn_client/export.c:1237 +#: ../libsvn_client/export.c:285 ../libsvn_client/export.c:1181 +#: ../libsvn_client/export.c:1235 #, c-format msgid "Destination file '%s' exists, and will not be overwritten unless forced" msgstr "" -#: ../libsvn_client/export.c:291 ../libsvn_client/export.c:1187 -#: ../libsvn_client/export.c:1242 +#: ../libsvn_client/export.c:291 ../libsvn_client/export.c:1186 +#: ../libsvn_client/export.c:1240 #, c-format msgid "Destination '%s' exists. Cannot overwrite directory with non-directory" msgstr "" @@ -3858,6 +3899,16 @@ msgstr "" msgid "'%s' already exists" msgstr "" +#: ../libsvn_client/export.c:814 ../libsvn_client/repos_diff.c:997 +#: ../libsvn_client/wc_editor.c:538 ../libsvn_fs_fs/dag.c:1107 +#: ../libsvn_fs_x/dag.c:904 ../libsvn_ra_serf/commit.c:2229 +#: ../libsvn_ra_svn/client.c:1506 ../libsvn_wc/diff_editor.c:2109 +#: ../libsvn_wc/diff_editor.c:2195 ../libsvn_wc/externals.c:711 +#: ../libsvn_wc/update_editor.c:4239 +#, c-format +msgid "Checksum mismatch for '%s'" +msgstr "" + #: ../libsvn_client/externals.c:202 ../libsvn_client/externals.c:259 #, c-format msgid "" @@ -3899,6 +3950,12 @@ msgid "" "Unsupported external: URL of file external '%s' is not in repository '%s'" msgstr "" +#: ../libsvn_client/externals.c:1023 ../libsvn_client/externals.c:1234 +#: ../libsvn_client/wc_editor.c:121 ../libsvn_wc/update_editor.c:1119 +#, c-format +msgid "Path '%s' is not in the working copy" +msgstr "" + #: ../libsvn_client/externals.c:1099 #, c-format msgid "Traversal of '%s' found no ambient depth" @@ -3918,8 +3975,8 @@ msgstr "" msgid "New entry name required when importing a file" msgstr "" -#: ../libsvn_client/import.c:787 ../libsvn_client/patch.c:3752 -#: ../libsvn_client/patch.c:3764 ../libsvn_wc/delete.c:93 +#: ../libsvn_client/import.c:787 ../libsvn_client/patch.c:3757 +#: ../libsvn_client/patch.c:3769 ../libsvn_wc/delete.c:93 #: ../libsvn_wc/lock.c:121 ../libsvn_wc/wc_db_wcroot.c:78 #, c-format msgid "'%s' does not exist" @@ -3930,7 +3987,7 @@ msgstr "" msgid "'%s' is a reserved name and cannot be imported" msgstr "" -#: ../libsvn_client/info.c:398 ../libsvn_client/list.c:389 +#: ../libsvn_client/info.c:399 ../libsvn_client/list.c:389 #: ../svnbench/null-info-cmd.c:148 #, c-format msgid "URL '%s' non-existent in revision %ld" @@ -3992,12 +4049,12 @@ msgstr "" msgid "Missing required revision specification" msgstr "" -#: ../libsvn_client/merge.c:416 +#: ../libsvn_client/merge.c:436 #, c-format msgid "URL '%s' of '%s' is not in repository '%s'" msgstr "" -#: ../libsvn_client/merge.c:453 +#: ../libsvn_client/merge.c:473 #, c-format msgid "'%s' must be from the same repository as '%s'" msgstr "" @@ -4005,28 +4062,28 @@ msgstr "" #. xgettext: the '.working', '.merge-left.r%ld' and #. '.merge-right.r%ld' strings are used to tag onto a file #. name in case of a merge conflict -#: ../libsvn_client/merge.c:2111 +#: ../libsvn_client/merge.c:2108 #, c-format msgid ".working%s%s" msgstr "" -#: ../libsvn_client/merge.c:2114 +#: ../libsvn_client/merge.c:2111 #, c-format msgid ".merge-left.r%ld%s%s" msgstr "" -#: ../libsvn_client/merge.c:2118 +#: ../libsvn_client/merge.c:2115 #, c-format msgid ".merge-right.r%ld%s%s" msgstr "" -#: ../libsvn_client/merge.c:4816 +#: ../libsvn_client/merge.c:4859 msgid "" "Cannot reverse-merge a range from a path's own future history; try updating " "first" msgstr "" -#: ../libsvn_client/merge.c:5537 +#: ../libsvn_client/merge.c:5580 #, c-format msgid "" "One or more conflicts were produced while merging r%ld:%ld into\n" @@ -4035,87 +4092,87 @@ msgid "" "unmerged revisions" msgstr "" -#: ../libsvn_client/merge.c:6353 +#: ../libsvn_client/merge.c:6396 #, c-format msgid "Invalid mergeinfo detected on '%s', merge tracking not possible" msgstr "" -#: ../libsvn_client/merge.c:6504 +#: ../libsvn_client/merge.c:6547 msgid "" "Merge tracking not allowed with missing subtrees; try restoring these items " "first:\n" msgstr "" -#: ../libsvn_client/merge.c:7505 +#: ../libsvn_client/merge.c:7548 #, c-format msgid "" "Invalid mergeinfo detected on merge target '%s', merge tracking not possible" msgstr "" -#: ../libsvn_client/merge.c:9823 +#: ../libsvn_client/merge.c:9856 msgid "Use of two URLs is not compatible with mergeinfo modification" msgstr "" -#: ../libsvn_client/merge.c:9830 ../libsvn_client/merge.c:10166 +#: ../libsvn_client/merge.c:9863 ../libsvn_client/merge.c:10184 msgid "" "Merge from foreign repository is not compatible with mergeinfo modification" msgstr "" -#: ../libsvn_client/merge.c:10259 ../libsvn_client/merge.c:10402 +#: ../libsvn_client/merge.c:10277 ../libsvn_client/merge.c:10420 #, c-format msgid "Merge target '%s' does not exist in the working copy" msgstr "" -#: ../libsvn_client/merge.c:10282 +#: ../libsvn_client/merge.c:10300 msgid "Cannot determine revision of working copy" msgstr "" -#: ../libsvn_client/merge.c:10288 +#: ../libsvn_client/merge.c:10306 #, c-format msgid "" "Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first" msgstr "" -#: ../libsvn_client/merge.c:10303 +#: ../libsvn_client/merge.c:10321 msgid "Cannot merge into a working copy with a switched subtree" msgstr "" -#: ../libsvn_client/merge.c:10319 +#: ../libsvn_client/merge.c:10337 msgid "Cannot merge into a working copy that has local modifications" msgstr "" -#: ../libsvn_client/merge.c:10339 ../svn/merge-cmd.c:56 +#: ../libsvn_client/merge.c:10357 ../svn/merge-cmd.c:56 #, c-format msgid "" "Invalid merge source '%s'; a working copy path can only be used with a " "repository revision (a number, a date, or head)" msgstr "" -#: ../libsvn_client/merge.c:10657 ../svn/merge-cmd.c:123 +#: ../libsvn_client/merge.c:10675 ../svn/merge-cmd.c:123 msgid "Merge sources must both be either paths or URLs" msgstr "" -#: ../libsvn_client/merge.c:11427 ../libsvn_client/merge.c:11589 -#: ../libsvn_client/merge.c:12507 +#: ../libsvn_client/merge.c:11445 ../libsvn_client/merge.c:11607 +#: ../libsvn_client/merge.c:12525 #, c-format msgid "'%s@%ld' must be ancestrally related to '%s@%ld'" msgstr "" -#: ../libsvn_client/merge.c:11539 +#: ../libsvn_client/merge.c:11557 #, c-format msgid "" "Neither the reintegrate source nor target can be the root of the repository" msgstr "" -#: ../libsvn_client/merge.c:11549 +#: ../libsvn_client/merge.c:11567 msgid "Reintegrate merge not possible" msgstr "" -#: ../libsvn_client/merge.c:11619 +#: ../libsvn_client/merge.c:11637 msgid " Missing ranges: " msgstr "" -#: ../libsvn_client/merge.c:11622 +#: ../libsvn_client/merge.c:11640 #, c-format msgid "" "Reintegrate can only be used if revisions %ld through %ld were previously " @@ -4123,37 +4180,37 @@ msgid "" "%s" msgstr "" -#: ../libsvn_client/merge.c:11681 +#: ../libsvn_client/merge.c:11699 #, c-format msgid "" "Can't reintegrate into '%s' because it is locally added and therefore not " "related to the merge source" msgstr "" -#: ../libsvn_client/merge.c:11969 +#: ../libsvn_client/merge.c:11987 msgid "Cannot merge automatically while ignoring mergeinfo" msgstr "" -#: ../libsvn_client/merge.c:12637 +#: ../libsvn_client/merge.c:12655 #, c-format msgid "" "Can't perform automatic merge into '%s' because it is locally added and " "therefore not related to the merge source" msgstr "" -#: ../libsvn_client/merge.c:12736 +#: ../libsvn_client/merge.c:12754 msgid "" "The required merge is reintegrate-like, and the record-only option cannot be " "used with this kind of merge" msgstr "" -#: ../libsvn_client/merge.c:12742 +#: ../libsvn_client/merge.c:12760 msgid "" "The required merge is reintegrate-like, and the depth option cannot be used " "with this kind of merge" msgstr "" -#: ../libsvn_client/merge.c:12748 +#: ../libsvn_client/merge.c:12766 msgid "" "The required merge is reintegrate-like, and the force_delete option cannot " "be used with this kind of merge" @@ -4177,7 +4234,7 @@ msgstr "" msgid "No origin found for node at '%s'" msgstr "" -#: ../libsvn_client/mtcc.c:359 ../libsvn_repos/commit.c:430 +#: ../libsvn_client/mtcc.c:359 ../libsvn_repos/commit.c:431 #, c-format msgid "No such revision %ld (HEAD is %ld)" msgstr "" @@ -4282,20 +4339,22 @@ msgstr "" #: ../libsvn_client/patch.c:346 #, c-format -msgid "Cannot strip %u components from '%s'" -msgstr "" +msgid "Cannot strip %u component from '%s'" +msgid_plural "Cannot strip %u components from '%s'" +msgstr[0] "" +msgstr[1] "" -#: ../libsvn_client/patch.c:1296 ../libsvn_client/patch.c:1342 +#: ../libsvn_client/patch.c:1301 ../libsvn_client/patch.c:1347 #, c-format msgid "" "Invalid patch: specifies contradicting mode changes and %s changes (for '%s')" msgstr "" -#: ../libsvn_client/patch.c:3741 +#: ../libsvn_client/patch.c:3746 msgid "strip count must be positive" msgstr "" -#: ../libsvn_client/patch.c:3757 ../libsvn_fs_base/tree.c:4112 +#: ../libsvn_client/patch.c:3762 ../libsvn_fs_base/tree.c:4112 #: ../libsvn_fs_base/tree.c:4117 ../libsvn_fs_fs/tree.c:3270 #: ../libsvn_fs_fs/tree.c:3276 ../libsvn_fs_x/tree.c:2188 #: ../libsvn_fs_x/tree.c:2194 ../libsvn_ra/compat.c:677 @@ -4304,7 +4363,7 @@ msgstr "" msgid "'%s' is not a file" msgstr "" -#: ../libsvn_client/patch.c:3769 ../libsvn_wc/util.c:59 +#: ../libsvn_client/patch.c:3774 ../libsvn_wc/util.c:59 #, c-format msgid "'%s' is not a directory" msgstr "" @@ -4399,7 +4458,7 @@ msgstr "" msgid "The repository at '%s' has uuid '%s', but the WC has '%s'" msgstr "" -#: ../libsvn_client/repos_diff.c:935 ../libsvn_wc/externals.c:629 +#: ../libsvn_client/repos_diff.c:930 ../libsvn_wc/externals.c:629 #, c-format msgid "Base checksum mismatch for '%s'" msgstr "" @@ -4419,23 +4478,33 @@ msgstr "" msgid "Unrecognized revision type requested for '%s'" msgstr "" -#: ../libsvn_client/shelve.c:56 +#: ../libsvn_client/shelf.c:58 msgid "Shelf name cannot be the empty string" msgstr "" -#: ../libsvn_client/shelve.c:84 +#: ../libsvn_client/shelf.c:86 #, c-format msgid "Shelve: Bad encoded name '%s'" msgstr "" -#: ../libsvn_client/status.c:422 ../libsvn_client/status.c:601 +#: ../libsvn_client/shelf.c:591 +#, c-format +msgid "Shelf '%s' not found" +msgstr "" + +#: ../libsvn_client/shelf.c:1226 +#, c-format +msgid "Shelf '%s' version %d not found" +msgstr "" + +#: ../libsvn_client/status.c:498 ../libsvn_client/status.c:680 #: ../libsvn_wc/lock.c:564 ../libsvn_wc/lock.c:856 ../libsvn_wc/lock.c:1542 -#: ../libsvn_wc/wc_db.c:13629 ../libsvn_wc/wc_db_wcroot.c:722 +#: ../libsvn_wc/wc_db.c:13629 ../libsvn_wc/wc_db_wcroot.c:727 #, c-format msgid "'%s' is not a working copy" msgstr "" -#: ../libsvn_client/status.c:469 +#: ../libsvn_client/status.c:545 #, c-format msgid "Entry '%s' has no URL" msgstr "" @@ -4456,7 +4525,7 @@ msgid "Directory '%s' has no URL" msgstr "" #: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:236 -#: ../libsvn_ra_local/ra_plugin.c:326 ../libsvn_wc/update_editor.c:4921 +#: ../libsvn_ra_local/ra_plugin.c:326 ../libsvn_wc/update_editor.c:4932 #, c-format msgid "" "'%s'\n" @@ -4473,7 +4542,7 @@ msgstr "" msgid "None of the targets are working copies" msgstr "" -#: ../libsvn_client/util.c:342 +#: ../libsvn_client/util.c:343 #, c-format msgid "Cannot mix repository and working copy targets" msgstr "" @@ -4609,15 +4678,15 @@ msgstr "" msgid "Failed to delete mmap '%s'" msgstr "" -#: ../libsvn_diff/parse-diff.c:368 +#: ../libsvn_diff/parse-diff.c:373 msgid "Unexpected data in base85 section" msgstr "" -#: ../libsvn_diff/parse-diff.c:437 +#: ../libsvn_diff/parse-diff.c:442 msgid "Base85 data expands to longer than declared filesize" msgstr "" -#: ../libsvn_diff/parse-diff.c:441 +#: ../libsvn_diff/parse-diff.c:446 msgid "Base85 data expands to smaller than declared filesize" msgstr "" @@ -5324,138 +5393,138 @@ msgstr "" msgid "Berkeley DB error for filesystem '%s' while closing environment:\n" msgstr "" -#: ../libsvn_fs_base/fs.c:614 +#: ../libsvn_fs_base/fs.c:615 #, c-format msgid "Berkeley DB error for filesystem '%s' while creating environment:\n" msgstr "" -#: ../libsvn_fs_base/fs.c:620 +#: ../libsvn_fs_base/fs.c:621 #, c-format msgid "Berkeley DB error for filesystem '%s' while opening environment:\n" msgstr "" -#: ../libsvn_fs_base/fs.c:635 +#: ../libsvn_fs_base/fs.c:636 msgid "creating 'nodes' table" msgstr "" -#: ../libsvn_fs_base/fs.c:636 +#: ../libsvn_fs_base/fs.c:637 msgid "opening 'nodes' table" msgstr "" -#: ../libsvn_fs_base/fs.c:641 +#: ../libsvn_fs_base/fs.c:642 msgid "creating 'revisions' table" msgstr "" -#: ../libsvn_fs_base/fs.c:642 +#: ../libsvn_fs_base/fs.c:643 msgid "opening 'revisions' table" msgstr "" -#: ../libsvn_fs_base/fs.c:647 +#: ../libsvn_fs_base/fs.c:648 msgid "creating 'transactions' table" msgstr "" -#: ../libsvn_fs_base/fs.c:648 +#: ../libsvn_fs_base/fs.c:649 msgid "opening 'transactions' table" msgstr "" -#: ../libsvn_fs_base/fs.c:653 +#: ../libsvn_fs_base/fs.c:654 msgid "creating 'copies' table" msgstr "" -#: ../libsvn_fs_base/fs.c:654 +#: ../libsvn_fs_base/fs.c:655 msgid "opening 'copies' table" msgstr "" -#: ../libsvn_fs_base/fs.c:659 +#: ../libsvn_fs_base/fs.c:660 msgid "creating 'changes' table" msgstr "" -#: ../libsvn_fs_base/fs.c:660 +#: ../libsvn_fs_base/fs.c:661 msgid "opening 'changes' table" msgstr "" -#: ../libsvn_fs_base/fs.c:665 +#: ../libsvn_fs_base/fs.c:666 msgid "creating 'representations' table" msgstr "" -#: ../libsvn_fs_base/fs.c:666 +#: ../libsvn_fs_base/fs.c:667 msgid "opening 'representations' table" msgstr "" -#: ../libsvn_fs_base/fs.c:671 +#: ../libsvn_fs_base/fs.c:672 msgid "creating 'strings' table" msgstr "" -#: ../libsvn_fs_base/fs.c:672 +#: ../libsvn_fs_base/fs.c:673 msgid "opening 'strings' table" msgstr "" -#: ../libsvn_fs_base/fs.c:677 +#: ../libsvn_fs_base/fs.c:678 msgid "creating 'uuids' table" msgstr "" -#: ../libsvn_fs_base/fs.c:678 +#: ../libsvn_fs_base/fs.c:679 msgid "opening 'uuids' table" msgstr "" -#: ../libsvn_fs_base/fs.c:683 +#: ../libsvn_fs_base/fs.c:684 msgid "creating 'locks' table" msgstr "" -#: ../libsvn_fs_base/fs.c:684 +#: ../libsvn_fs_base/fs.c:685 msgid "opening 'locks' table" msgstr "" -#: ../libsvn_fs_base/fs.c:689 +#: ../libsvn_fs_base/fs.c:690 msgid "creating 'lock-tokens' table" msgstr "" -#: ../libsvn_fs_base/fs.c:690 +#: ../libsvn_fs_base/fs.c:691 msgid "opening 'lock-tokens' table" msgstr "" -#: ../libsvn_fs_base/fs.c:698 +#: ../libsvn_fs_base/fs.c:699 msgid "creating 'node-origins' table" msgstr "" -#: ../libsvn_fs_base/fs.c:699 +#: ../libsvn_fs_base/fs.c:700 msgid "opening 'node-origins' table" msgstr "" -#: ../libsvn_fs_base/fs.c:708 +#: ../libsvn_fs_base/fs.c:709 msgid "creating 'miscellaneous' table" msgstr "" -#: ../libsvn_fs_base/fs.c:709 +#: ../libsvn_fs_base/fs.c:710 msgid "opening 'miscellaneous' table" msgstr "" -#: ../libsvn_fs_base/fs.c:718 +#: ../libsvn_fs_base/fs.c:719 msgid "creating 'checksum-reps' table" msgstr "" -#: ../libsvn_fs_base/fs.c:719 +#: ../libsvn_fs_base/fs.c:720 msgid "opening 'checksum-reps' table" msgstr "" -#: ../libsvn_fs_base/fs.c:810 +#: ../libsvn_fs_base/fs.c:811 #, c-format msgid "" "The '%s' feature requires version %d of the filesystem schema; filesystem " "'%s' uses only version %d" msgstr "" -#: ../libsvn_fs_base/fs.c:829 +#: ../libsvn_fs_base/fs.c:830 #, c-format msgid "Expected FS format '%d'; found format '%d'" msgstr "" -#: ../libsvn_fs_base/fs.c:1319 +#: ../libsvn_fs_base/fs.c:1320 #, c-format msgid "BDB repositories do not support incremental hotcopy" msgstr "" -#: ../libsvn_fs_base/fs.c:1423 +#: ../libsvn_fs_base/fs.c:1424 msgid "" "Error copying logfile; the DB_LOG_AUTOREMOVE feature\n" "may be interfering with the hotcopy algorithm. If\n" @@ -5463,7 +5532,7 @@ msgid "" "in DB_CONFIG" msgstr "" -#: ../libsvn_fs_base/fs.c:1442 +#: ../libsvn_fs_base/fs.c:1443 msgid "" "Error running catastrophic recovery on hotcopy; the\n" "DB_LOG_AUTOREMOVE feature may be interfering with the\n" @@ -5471,11 +5540,11 @@ msgid "" "this feature in DB_CONFIG" msgstr "" -#: ../libsvn_fs_base/fs.c:1487 +#: ../libsvn_fs_base/fs.c:1488 msgid "Module for working with a Berkeley DB repository." msgstr "" -#: ../libsvn_fs_base/fs.c:1537 +#: ../libsvn_fs_base/fs.c:1539 #, c-format msgid "Unsupported FS loader version (%d) for bdb" msgstr "" @@ -5633,7 +5702,7 @@ msgid "Unexpected immutable node at '%s'" msgstr "" #: ../libsvn_fs_base/tree.c:2075 ../libsvn_fs_fs/tree.c:1748 -#: ../libsvn_fs_x/tree.c:638 ../libsvn_repos/commit.c:1303 +#: ../libsvn_fs_x/tree.c:638 ../libsvn_repos/commit.c:1307 #, c-format msgid "Conflict at '%s'" msgstr "" @@ -5781,21 +5850,21 @@ msgstr "" msgid "Attempted to update ancestry of non-mutable node" msgstr "" -#: ../libsvn_fs_fs/fs.c:100 +#: ../libsvn_fs_fs/fs.c:101 #, c-format msgid "Can't fetch FSFS shared data" msgstr "" -#: ../libsvn_fs_fs/fs.c:129 +#: ../libsvn_fs_fs/fs.c:130 #, c-format msgid "Can't store FSFS shared data" msgstr "" -#: ../libsvn_fs_fs/fs.c:562 +#: ../libsvn_fs_fs/fs.c:625 msgid "Module for working with a plain file (FSFS) repository." msgstr "" -#: ../libsvn_fs_fs/fs.c:624 +#: ../libsvn_fs_fs/fs.c:688 #, c-format msgid "Unsupported FS loader version (%d) for fsfs" msgstr "" @@ -5885,31 +5954,31 @@ msgid "" msgstr "" #: ../libsvn_fs_fs/hotcopy.c:107 ../libsvn_fs_x/hotcopy.c:108 -#: ../libsvn_subr/io.c:293 +#: ../libsvn_subr/io.c:310 #, c-format msgid "Error converting entry in directory '%s' to UTF-8" msgstr "" #: ../libsvn_fs_fs/hotcopy.c:147 ../libsvn_fs_x/hotcopy.c:148 -#: ../libsvn_subr/io.c:1089 +#: ../libsvn_subr/io.c:1131 #, c-format msgid "Source '%s' is not a directory" msgstr "" #: ../libsvn_fs_fs/hotcopy.c:153 ../libsvn_fs_x/hotcopy.c:154 -#: ../libsvn_subr/io.c:1095 +#: ../libsvn_subr/io.c:1137 #, c-format msgid "Destination '%s' is not a directory" msgstr "" #: ../libsvn_fs_fs/hotcopy.c:226 ../libsvn_fs_x/hotcopy.c:228 -#: ../libsvn_subr/io.c:1172 ../libsvn_subr/io.c:2947 +#: ../libsvn_subr/io.c:1214 ../libsvn_subr/io.c:3127 #, c-format msgid "Can't read directory '%s'" msgstr "" #: ../libsvn_fs_fs/hotcopy.c:231 ../libsvn_fs_x/hotcopy.c:233 -#: ../libsvn_subr/io.c:1177 ../libsvn_subr/io.c:2952 ../libsvn_subr/io.c:4747 +#: ../libsvn_subr/io.c:1219 ../libsvn_subr/io.c:3132 ../libsvn_subr/io.c:4953 #, c-format msgid "Error closing directory '%s'" msgstr "" @@ -6363,12 +6432,12 @@ msgstr "" msgid "Revprop pack file for r%ld is corrupt" msgstr "" -#: ../libsvn_fs_fs/revprops.c:758 ../libsvn_fs_x/revprops.c:1009 +#: ../libsvn_fs_fs/revprops.c:816 ../libsvn_fs_x/revprops.c:1009 #, c-format msgid "Could not read revprops for revision %ld" msgstr "" -#: ../libsvn_fs_fs/revprops.c:993 +#: ../libsvn_fs_fs/revprops.c:1051 #, c-format msgid "Packed file '%s' misses a tag" msgstr "" @@ -6408,7 +6477,7 @@ msgid "" msgstr "" #: ../libsvn_fs_fs/transaction.c:358 ../libsvn_fs_x/transaction.c:640 -#: ../libsvn_subr/io.c:2424 +#: ../libsvn_subr/io.c:2595 #, c-format msgid "Can't get exclusive lock on file '%s'" msgstr "" @@ -6595,14 +6664,11 @@ msgstr "" #: ../libsvn_fs_fs/verify.c:682 #, c-format msgid "" -"p2l index entry for revision r%ld at offset %s contains invalid item type %d" +"p2l index entry for revision r%ld at offset %s contains invalid item type %u" msgstr "" #: ../libsvn_fs_fs/verify.c:696 -#, c-format -msgid "" -"p2l index entry for changes in revision r%ld is item %ld of type %d at " -"offset %s" +msgid "p2l index entry for changes in revision r%ld is item %" msgstr "" #: ../libsvn_fs_util/fs-util.c:164 @@ -6682,11 +6748,11 @@ msgstr "" msgid "Can't store FSX shared data" msgstr "" -#: ../libsvn_fs_x/fs.c:601 +#: ../libsvn_fs_x/fs.c:602 msgid "Module for working with an experimental (FSX) repository." msgstr "" -#: ../libsvn_fs_x/fs.c:664 +#: ../libsvn_fs_x/fs.c:666 #, c-format msgid "Unsupported FS loader version (%d) for fsx" msgstr "" @@ -6918,12 +6984,12 @@ msgid "URL '%s' is not a child of the session's repository root URL '%s'" msgstr "" #: ../libsvn_ra_local/ra_plugin.c:1285 ../libsvn_ra_local/ra_plugin.c:1740 -#: ../libsvn_ra_serf/util.c:1864 ../svnserve/serve.c:3567 +#: ../libsvn_ra_serf/util.c:1862 ../svnserve/serve.c:3646 #, c-format msgid "'%s' path not found" msgstr "" -#: ../libsvn_ra_local/ra_plugin.c:1692 ../libsvn_ra_serf/options.c:759 +#: ../libsvn_ra_local/ra_plugin.c:1692 ../libsvn_ra_serf/options.c:774 #: ../libsvn_ra_svn/client.c:3093 #, c-format msgid "Don't know anything about capability '%s'" @@ -6947,7 +7013,7 @@ msgstr "" msgid "Error parsing Location header value" msgstr "" -#: ../libsvn_ra_serf/commit.c:487 ../libsvn_repos/commit.c:551 +#: ../libsvn_ra_serf/commit.c:487 ../libsvn_repos/commit.c:554 #, c-format msgid "Path '%s' not present" msgstr "" @@ -6999,7 +7065,7 @@ msgstr "" msgid "Got unrecognized encoding '%s'" msgstr "" -#: ../libsvn_ra_serf/list.c:126 ../libsvn_ra_serf/log.c:172 +#: ../libsvn_ra_serf/list.c:113 ../libsvn_ra_serf/log.c:172 #, c-format msgid "Unsupported encoding '%s'" msgstr "" @@ -7066,36 +7132,41 @@ msgstr "" msgid "While handling the '%s' path:" msgstr "" -#: ../libsvn_ra_serf/options.c:473 +#: ../libsvn_ra_serf/options.c:413 +#, c-format +msgid "The server at '%s' does not support the HTTP/DAV protocol" +msgstr "" + +#: ../libsvn_ra_serf/options.c:491 msgid "The OPTIONS response did not include the youngest revision" msgstr "" -#: ../libsvn_ra_serf/options.c:514 +#: ../libsvn_ra_serf/options.c:532 msgid "" "The OPTIONS response did not include the requested activity-collection-set " "value" msgstr "" -#: ../libsvn_ra_serf/options.c:556 +#: ../libsvn_ra_serf/options.c:574 msgid "Location header not set on redirect response" msgstr "" -#: ../libsvn_ra_serf/options.c:586 ../libsvn_ra_serf/util.c:1855 +#: ../libsvn_ra_serf/options.c:601 ../libsvn_ra_serf/util.c:1853 #, c-format msgid "Repository moved permanently to '%s'" msgstr "" -#: ../libsvn_ra_serf/options.c:587 ../libsvn_ra_serf/util.c:1856 +#: ../libsvn_ra_serf/options.c:602 ../libsvn_ra_serf/util.c:1854 #, c-format msgid "Repository moved temporarily to '%s'" msgstr "" -#: ../libsvn_ra_serf/options.c:742 +#: ../libsvn_ra_serf/options.c:757 #, c-format msgid "Don't know how to handle '%s' for capability '%s'" msgstr "" -#: ../libsvn_ra_serf/options.c:766 +#: ../libsvn_ra_serf/options.c:781 #, c-format msgid "Attempt to fetch capability '%s' resulted in '%s'" msgstr "" @@ -7252,58 +7323,58 @@ msgstr "" msgid "Error running context" msgstr "" -#: ../libsvn_ra_serf/util.c:1233 +#: ../libsvn_ra_serf/util.c:1231 msgid "" "No more credentials or we tried too many times.\n" "Authentication failed" msgstr "" -#: ../libsvn_ra_serf/util.c:1255 +#: ../libsvn_ra_serf/util.c:1253 msgid "Proxy authentication failed" msgstr "" -#: ../libsvn_ra_serf/util.c:1310 +#: ../libsvn_ra_serf/util.c:1308 #, c-format msgid "%s request on '%s' failed" msgstr "" -#: ../libsvn_ra_serf/util.c:1386 +#: ../libsvn_ra_serf/util.c:1384 #, c-format msgid "Premature EOF seen from server (http status=%d)" msgstr "" -#: ../libsvn_ra_serf/util.c:1754 +#: ../libsvn_ra_serf/util.c:1752 msgid "" "The PROPFIND response did not include the requested version-controlled-" "configuration value" msgstr "" -#: ../libsvn_ra_serf/util.c:1860 +#: ../libsvn_ra_serf/util.c:1858 #, c-format msgid "Access to '%s' forbidden" msgstr "" -#: ../libsvn_ra_serf/util.c:1867 +#: ../libsvn_ra_serf/util.c:1865 #, c-format msgid "HTTP method is not allowed on '%s'" msgstr "" -#: ../libsvn_ra_serf/util.c:1871 +#: ../libsvn_ra_serf/util.c:1869 #, c-format msgid "'%s' conflicts" msgstr "" -#: ../libsvn_ra_serf/util.c:1874 +#: ../libsvn_ra_serf/util.c:1872 #, c-format msgid "Precondition on '%s' failed" msgstr "" -#: ../libsvn_ra_serf/util.c:1877 +#: ../libsvn_ra_serf/util.c:1875 #, c-format msgid "'%s': no lock token available" msgstr "" -#: ../libsvn_ra_serf/util.c:1881 +#: ../libsvn_ra_serf/util.c:1879 #, c-format msgid "" "DAV request failed: 411 Content length required. The server or an " @@ -7311,37 +7382,37 @@ msgid "" "chunked-requests' to 'auto' or 'no' in your client configuration." msgstr "" -#: ../libsvn_ra_serf/util.c:1887 +#: ../libsvn_ra_serf/util.c:1885 #, c-format msgid "Unexpected server error %d '%s' on '%s'" msgstr "" -#: ../libsvn_ra_serf/util.c:1891 +#: ../libsvn_ra_serf/util.c:1889 #, c-format msgid "The requested feature is not supported by '%s'" msgstr "" -#: ../libsvn_ra_serf/util.c:1897 +#: ../libsvn_ra_serf/util.c:1895 #, c-format msgid "Unexpected HTTP status %d '%s' on '%s'" msgstr "" -#: ../libsvn_ra_serf/util.c:1916 +#: ../libsvn_ra_serf/util.c:1914 #, c-format msgid "Path '%s' unexpectedly created" msgstr "" -#: ../libsvn_ra_serf/util.c:1925 +#: ../libsvn_ra_serf/util.c:1923 #, c-format msgid "The HTTP method '%s' is not allowed on '%s'" msgstr "" -#: ../libsvn_ra_serf/util.c:1930 +#: ../libsvn_ra_serf/util.c:1928 #, c-format msgid "Unexpected HTTP status %d '%s' on '%s' request to '%s'" msgstr "" -#: ../libsvn_ra_serf/util.c:2033 +#: ../libsvn_ra_serf/util.c:2031 #, c-format msgid "Illegal URL '%s'" msgstr "" @@ -7724,171 +7795,176 @@ msgstr "" msgid "Can't write to connection" msgstr "" -#: ../libsvn_repos/authz_parse.c:290 +#: ../libsvn_repos/authz_parse.c:318 #, c-format msgid "Section appears more than once in the global groups file: [%s]" msgstr "" -#: ../libsvn_repos/authz_parse.c:296 +#: ../libsvn_repos/authz_parse.c:324 #, c-format msgid "Section appears more than once in the authz file: [%s]" msgstr "" -#: ../libsvn_repos/authz_parse.c:325 +#: ../libsvn_repos/authz_parse.c:353 #, c-format msgid "Section is not valid in the global group file: [%s]" msgstr "" -#: ../libsvn_repos/authz_parse.c:326 +#: ../libsvn_repos/authz_parse.c:354 #, c-format msgid "Section is not valid in the authz file: [%s]" msgstr "" -#: ../libsvn_repos/authz_parse.c:347 +#: ../libsvn_repos/authz_parse.c:375 #, c-format msgid "Global group name '%s' may not begin with '%c'" msgstr "" -#: ../libsvn_repos/authz_parse.c:352 +#: ../libsvn_repos/authz_parse.c:380 #, c-format msgid "Group name '%s' may not begin with '%c'" msgstr "" -#: ../libsvn_repos/authz_parse.c:363 +#: ../libsvn_repos/authz_parse.c:391 #, c-format msgid "Can't override definition of global group '%s'" msgstr "" -#: ../libsvn_repos/authz_parse.c:368 +#: ../libsvn_repos/authz_parse.c:396 #, c-format msgid "Can't override definition of group '%s'" msgstr "" -#: ../libsvn_repos/authz_parse.c:491 +#: ../libsvn_repos/authz_parse.c:519 msgid "Found empty name in authz rule path" msgstr "" -#: ../libsvn_repos/authz_parse.c:492 ../libsvn_repos/authz_parse.c:507 +#: ../libsvn_repos/authz_parse.c:520 ../libsvn_repos/authz_parse.c:535 #, c-format msgid "Non-canonical path '%s' in authz rule [%s]" msgstr "" -#: ../libsvn_repos/authz_parse.c:504 +#: ../libsvn_repos/authz_parse.c:532 msgid "Found '.' in authz rule path" msgstr "" -#: ../libsvn_repos/authz_parse.c:506 +#: ../libsvn_repos/authz_parse.c:534 msgid "Found '..' in authz rule path" msgstr "" -#: ../libsvn_repos/authz_parse.c:666 +#: ../libsvn_repos/authz_parse.c:694 #, c-format msgid "Section [%s] describes the same rule as section [%s]" msgstr "" -#: ../libsvn_repos/authz_parse.c:705 ../libsvn_repos/authz_parse.c:735 +#: ../libsvn_repos/authz_parse.c:733 ../libsvn_repos/authz_parse.c:763 #, c-format msgid "Empty repository name in authz rule [%s]" msgstr "" -#: ../libsvn_repos/authz_parse.c:714 +#: ../libsvn_repos/authz_parse.c:742 #, c-format msgid "Invalid type token '%s' in authz rule [%s]" msgstr "" -#: ../libsvn_repos/authz_parse.c:792 +#: ../libsvn_repos/authz_parse.c:820 #, c-format msgid "Alias name '%s' may not begin with '%c'" msgstr "" -#: ../libsvn_repos/authz_parse.c:801 +#: ../libsvn_repos/authz_parse.c:829 #, c-format msgid "Can't override definition of alias '%s'" msgstr "" -#: ../libsvn_repos/authz_parse.c:842 +#: ../libsvn_repos/authz_parse.c:870 #, c-format msgid "" "Access entry '%s' has more than one inversion; double negatives are not " "permitted" msgstr "" -#: ../libsvn_repos/authz_parse.c:851 +#: ../libsvn_repos/authz_parse.c:879 #, c-format msgid "Access entry '%s' is not valid; it must be a single '*'" msgstr "" -#: ../libsvn_repos/authz_parse.c:858 +#: ../libsvn_repos/authz_parse.c:886 #, c-format msgid "Access entry '~*' will never match" msgstr "" -#: ../libsvn_repos/authz_parse.c:882 +#: ../libsvn_repos/authz_parse.c:910 #, c-format msgid "Access entry token '%s' is not valid; should be '%s' or '%s'" msgstr "" -#: ../libsvn_repos/authz_parse.c:909 +#: ../libsvn_repos/authz_parse.c:937 #, c-format msgid "The access mode '%c' in access entry '%s' of rule [%s] is not valid" msgstr "" -#: ../libsvn_repos/authz_parse.c:919 +#: ../libsvn_repos/authz_parse.c:947 #, c-format msgid "Write-only access entry '%s' of rule [%s] is not valid" msgstr "" -#: ../libsvn_repos/authz_parse.c:1057 +#: ../libsvn_repos/authz_parse.c:1085 #, c-format msgid "Recursive definition of group '%s'" msgstr "" -#: ../libsvn_repos/authz_parse.c:1068 ../libsvn_repos/authz_parse.c:1127 +#: ../libsvn_repos/authz_parse.c:1096 ../libsvn_repos/authz_parse.c:1155 #, c-format msgid "Alias '%s' was never defined" msgstr "" -#: ../libsvn_repos/authz_parse.c:1090 +#: ../libsvn_repos/authz_parse.c:1118 #, c-format msgid "Undefined group '%s'" msgstr "" -#: ../libsvn_repos/authz_parse.c:1184 +#: ../libsvn_repos/authz_parse.c:1212 #, c-format msgid "Access entry refers to undefined group '%s'" msgstr "" +#: ../libsvn_repos/authz_parse.c:1222 +#, c-format +msgid "Ignoring access entry for empty group '%s'" +msgstr "" + #: ../libsvn_repos/commit.c:172 #, c-format msgid "'%s' is out of date" msgstr "" -#: ../libsvn_repos/commit.c:321 +#: ../libsvn_repos/commit.c:322 #, c-format msgid "Got source path but no source revision for '%s'" msgstr "" -#: ../libsvn_repos/commit.c:353 +#: ../libsvn_repos/commit.c:354 #, c-format msgid "Source url '%s' is from different repository" msgstr "" -#: ../libsvn_repos/commit.c:689 +#: ../libsvn_repos/commit.c:693 #, c-format msgid "" "Checksum mismatch for resulting fulltext\n" "(%s)" msgstr "" -#: ../libsvn_repos/commit.c:739 +#: ../libsvn_repos/commit.c:743 msgid "(no error)" msgstr "" -#: ../libsvn_repos/commit.c:770 ../libsvn_repos/commit.c:776 +#: ../libsvn_repos/commit.c:774 ../libsvn_repos/commit.c:780 msgid "post-commit hook failed with no error message." msgstr "" -#: ../libsvn_repos/commit.c:779 +#: ../libsvn_repos/commit.c:783 #, c-format msgid "" "post commit FS processing had error:\n" @@ -7896,19 +7972,19 @@ msgid "" "%s" msgstr "" -#: ../libsvn_repos/commit.c:780 ../libsvn_repos/commit.c:789 +#: ../libsvn_repos/commit.c:784 ../libsvn_repos/commit.c:793 msgid "(no error message)" msgstr "" -#: ../libsvn_repos/commit.c:787 +#: ../libsvn_repos/commit.c:791 #, c-format msgid "" "post commit FS processing had error:\n" "%s" msgstr "" -#: ../libsvn_repos/commit.c:1314 ../libsvn_repos/fs-wrap.c:120 -#: ../libsvn_repos/load-fs-vtable.c:1129 +#: ../libsvn_repos/commit.c:1318 ../libsvn_repos/fs-wrap.c:120 +#: ../libsvn_repos/load-fs-vtable.c:1134 msgid "Commit succeeded, but post-commit hook failed" msgstr "" @@ -7916,31 +7992,31 @@ msgstr "" msgid "Unable to open root of edit" msgstr "" -#: ../libsvn_repos/delta.c:236 +#: ../libsvn_repos/delta.c:244 msgid "Invalid target path" msgstr "" -#: ../libsvn_repos/delta.c:240 +#: ../libsvn_repos/delta.c:248 msgid "Delta depth 'exclude' not supported" msgstr "" -#: ../libsvn_repos/delta.c:266 +#: ../libsvn_repos/delta.c:274 msgid "" "Invalid editor anchoring; at least one of the input paths is not a directory " "and there was no source entry" msgstr "" -#: ../libsvn_repos/deprecated.c:715 ../svnadmin/svnadmin.c:988 +#: ../libsvn_repos/deprecated.c:715 ../svnadmin/svnadmin.c:1068 #, c-format msgid "* Dumped revision %ld.\n" msgstr "" -#: ../libsvn_repos/deprecated.c:721 ../svnadmin/svnadmin.c:994 +#: ../libsvn_repos/deprecated.c:721 ../svnadmin/svnadmin.c:1074 #, c-format msgid "* Verified revision %ld.\n" msgstr "" -#: ../libsvn_repos/deprecated.c:729 ../svnadmin/svnadmin.c:1042 +#: ../libsvn_repos/deprecated.c:729 ../svnadmin/svnadmin.c:1122 #, c-format msgid "" "\n" @@ -7948,7 +8024,7 @@ msgid "" "\n" msgstr "" -#: ../libsvn_repos/deprecated.c:735 ../svnadmin/svnadmin.c:1048 +#: ../libsvn_repos/deprecated.c:735 ../svnadmin/svnadmin.c:1128 #, c-format msgid "" "\n" @@ -7956,142 +8032,142 @@ msgid "" "\n" msgstr "" -#: ../libsvn_repos/deprecated.c:748 ../svnadmin/svnadmin.c:1061 +#: ../libsvn_repos/deprecated.c:748 ../svnadmin/svnadmin.c:1141 #, c-format msgid " * editing path : %s ..." msgstr "" -#: ../libsvn_repos/deprecated.c:754 ../svnadmin/svnadmin.c:1067 +#: ../libsvn_repos/deprecated.c:754 ../svnadmin/svnadmin.c:1147 #, c-format msgid " * deleting path : %s ..." msgstr "" -#: ../libsvn_repos/deprecated.c:760 ../svnadmin/svnadmin.c:1073 +#: ../libsvn_repos/deprecated.c:760 ../svnadmin/svnadmin.c:1153 #, c-format msgid " * adding path : %s ..." msgstr "" -#: ../libsvn_repos/deprecated.c:766 ../svnadmin/svnadmin.c:1079 +#: ../libsvn_repos/deprecated.c:766 ../svnadmin/svnadmin.c:1159 #, c-format msgid " * replacing path : %s ..." msgstr "" -#: ../libsvn_repos/deprecated.c:776 ../svnadmin/svnadmin.c:1088 +#: ../libsvn_repos/deprecated.c:776 ../svnadmin/svnadmin.c:1168 msgid " done.\n" msgstr "" -#: ../libsvn_repos/deprecated.c:786 ../svnadmin/svnadmin.c:1097 +#: ../libsvn_repos/deprecated.c:786 ../svnadmin/svnadmin.c:1177 #, c-format msgid "<<< Started new transaction, based on original revision %ld\n" msgstr "" -#: ../libsvn_repos/deprecated.c:793 ../svnadmin/svnadmin.c:1110 +#: ../libsvn_repos/deprecated.c:793 ../svnadmin/svnadmin.c:1190 #, c-format msgid " removing '\\r' from %s ..." msgstr "" -#: ../libsvn_repos/dump.c:795 +#: ../libsvn_repos/dump.c:825 #, c-format msgid "Path '%s' not found in r%ld." msgstr "" -#: ../libsvn_repos/dump.c:800 +#: ../libsvn_repos/dump.c:830 #, c-format msgid "Unexpected node kind %d for '%s' at r%ld. Expected kind was %d." msgstr "" -#: ../libsvn_repos/dump.c:838 +#: ../libsvn_repos/dump.c:868 #, c-format msgid "Path '%s' exists in r%ld." msgstr "" -#: ../libsvn_repos/dump.c:868 +#: ../libsvn_repos/dump.c:898 #, c-format msgid "" "Mergeinfo referencing revision(s) prior to the oldest dumped revision (r" "%ld). Loading this dump may result in invalid mergeinfo." msgstr "" -#: ../libsvn_repos/dump.c:976 +#: ../libsvn_repos/dump.c:1006 #, c-format msgid "Duplicate representation of path '%s' in %s property of '%s'" msgstr "" -#: ../libsvn_repos/dump.c:1122 +#: ../libsvn_repos/dump.c:1152 #, c-format msgid "E%06d: While validating fspath '%s': %s" msgstr "" -#: ../libsvn_repos/dump.c:1161 +#: ../libsvn_repos/dump.c:1196 #, c-format msgid "Change invalid path '%s' in r%ld" msgstr "" -#: ../libsvn_repos/dump.c:1185 +#: ../libsvn_repos/dump.c:1220 #, c-format msgid "Deleting invalid path '%s' in r%ld" msgstr "" -#: ../libsvn_repos/dump.c:1204 +#: ../libsvn_repos/dump.c:1239 #, c-format msgid "Replacing non-existent path '%s' in r%ld" msgstr "" -#: ../libsvn_repos/dump.c:1245 +#: ../libsvn_repos/dump.c:1280 #, c-format msgid "Adding already existing path '%s' in r%ld" msgstr "" -#: ../libsvn_repos/dump.c:1268 +#: ../libsvn_repos/dump.c:1303 #, c-format msgid "Copying from invalid path to '%s' in r%ld" msgstr "" -#: ../libsvn_repos/dump.c:1280 +#: ../libsvn_repos/dump.c:1315 #, c-format msgid "" "Referencing data in revision %ld, which is older than the oldest dumped " "revision (r%ld). Loading this dump into an empty repository will fail." msgstr "" -#: ../libsvn_repos/dump.c:2051 ../libsvn_repos/dump.c:2481 +#: ../libsvn_repos/dump.c:2074 ../libsvn_repos/dump.c:2501 #, c-format msgid "Start revision %ld is greater than end revision %ld" msgstr "" -#: ../libsvn_repos/dump.c:2056 ../libsvn_repos/dump.c:2486 +#: ../libsvn_repos/dump.c:2079 ../libsvn_repos/dump.c:2506 #, c-format msgid "End revision %ld is invalid (youngest revision is %ld)" msgstr "" -#: ../libsvn_repos/dump.c:2184 +#: ../libsvn_repos/dump.c:2204 msgid "" "The range of revisions dumped contained references to copy sources outside " "that range." msgstr "" -#: ../libsvn_repos/dump.c:2196 +#: ../libsvn_repos/dump.c:2216 msgid "" "The range of revisions dumped contained mergeinfo which reference revisions " "outside that range." msgstr "" -#: ../libsvn_repos/dump.c:2250 +#: ../libsvn_repos/dump.c:2270 #, c-format msgid "Node '%s' is not a directory." msgstr "" -#: ../libsvn_repos/dump.c:2258 +#: ../libsvn_repos/dump.c:2278 #, c-format msgid "Node '%s' is not a file." msgstr "" -#: ../libsvn_repos/dump.c:2263 +#: ../libsvn_repos/dump.c:2283 #, c-format msgid "Unexpected node kind %d for '%s'" msgstr "" -#: ../libsvn_repos/dump.c:2310 +#: ../libsvn_repos/dump.c:2330 #, c-format msgid "Duplicate representation of path '%s'" msgstr "" @@ -8226,37 +8302,37 @@ msgid "" "ask the administrator to create a pre-revprop-change hook" msgstr "" -#: ../libsvn_repos/list.c:314 ../libsvn_subr/io.c:3056 +#: ../libsvn_repos/list.c:314 ../libsvn_subr/io.c:3236 #, c-format msgid "Path '%s' not found" msgstr "" -#: ../libsvn_repos/load-fs-vtable.c:594 ../svnrdump/load_editor.c:637 +#: ../libsvn_repos/load-fs-vtable.c:599 ../svnrdump/load_editor.c:492 #, c-format msgid "Relative source revision %ld is not available in current repository" msgstr "" -#: ../libsvn_repos/load-fs-vtable.c:608 +#: ../libsvn_repos/load-fs-vtable.c:613 #, c-format msgid "" "Copy source checksum mismatch on copy from '%s'@%ld\n" "to '%s' in rev based on r%ld" msgstr "" -#: ../libsvn_repos/load-fs-vtable.c:664 +#: ../libsvn_repos/load-fs-vtable.c:669 msgid "Malformed dumpstream: Revision 0 must not contain node records" msgstr "" -#: ../libsvn_repos/load-fs-vtable.c:680 +#: ../libsvn_repos/load-fs-vtable.c:685 #, c-format msgid "Unrecognized node-action on node '%s'" msgstr "" -#: ../libsvn_repos/load-fs-vtable.c:849 ../svnrdump/load_editor.c:772 +#: ../libsvn_repos/load-fs-vtable.c:854 ../svnrdump/load_editor.c:627 msgid "Invalid svn:mergeinfo value" msgstr "" -#: ../libsvn_repos/load-fs-vtable.c:858 +#: ../libsvn_repos/load-fs-vtable.c:863 msgid "Invalid svn:mergeinfo value; leaving unchanged" msgstr "" @@ -8286,21 +8362,21 @@ msgstr "" msgid "Unexpected EOF writing contents" msgstr "" -#: ../libsvn_repos/load.c:374 +#: ../libsvn_repos/load.c:398 ../libsvn_repos/load.c:412 #, c-format msgid "Malformed dumpfile header '%s'" msgstr "" -#: ../libsvn_repos/load.c:381 +#: ../libsvn_repos/load.c:419 #, c-format msgid "Unsupported dumpfile version: %d" msgstr "" -#: ../libsvn_repos/load.c:654 +#: ../libsvn_repos/load.c:688 msgid "Unrecognized record type in stream" msgstr "" -#: ../libsvn_repos/load.c:761 +#: ../libsvn_repos/load.c:795 msgid "Sum of subblock sizes larger than total block content length" msgstr "" @@ -8309,12 +8385,12 @@ msgstr "" msgid "'%s' not found in filesystem" msgstr "" -#: ../libsvn_repos/replay.c:541 ../libsvn_repos/replay.c:1301 +#: ../libsvn_repos/replay.c:538 ../libsvn_repos/replay.c:1296 #, c-format msgid "Filesystem path '%s' is neither a file nor a directory" msgstr "" -#: ../libsvn_repos/replay.c:556 +#: ../libsvn_repos/replay.c:553 msgid "Root directory already exists." msgstr "" @@ -8897,46 +8973,81 @@ msgstr "" msgid "Can't expand time" msgstr "" -#: ../libsvn_subr/deprecated.c:365 ../libsvn_subr/opt.c:302 +#: ../libsvn_subr/deprecated.c:365 ../libsvn_subr/deprecated.c:605 +#: ../libsvn_subr/opt.c:274 msgid "" "\n" "Valid options:\n" msgstr "" -#: ../libsvn_subr/deprecated.c:441 ../libsvn_subr/opt.c:426 -#, c-format +#: ../libsvn_subr/deprecated.c:545 ../libsvn_subr/opt.c:174 +msgid " ARG" +msgstr "" + +#: ../libsvn_subr/deprecated.c:627 ../libsvn_subr/opt.c:307 +msgid "" +"\n" +"Global options:\n" +msgstr "" + +#: ../libsvn_subr/deprecated.c:769 ../libsvn_subr/deprecated.c:803 +#: ../libsvn_subr/opt.c:444 +#, c-format msgid "" "\"%s\": unknown command.\n" "\n" msgstr "" -#: ../libsvn_subr/deprecated.c:619 ../libsvn_subr/opt.c:1241 -#: ../svnrdump/svnrdump.c:597 +#: ../libsvn_subr/deprecated.c:931 ../libsvn_subr/deprecated.c:1031 +#: ../libsvn_subr/opt.c:1267 ../svnrdump/svnrdump.c:607 #, c-format msgid "Type '%s help' for usage.\n" msgstr "" -#: ../libsvn_subr/deprecated.c:1047 +#: ../libsvn_subr/deprecated.c:1459 #, c-format msgid "'%s' is neither a file nor a directory name" msgstr "" -#: ../libsvn_subr/dirent_uri.c:1634 +#: ../libsvn_subr/dirent_uri.c:315 +msgid "An empty URI can not be canonicalized" +msgstr "" + +#: ../libsvn_subr/dirent_uri.c:332 +msgid "A URI can not start with '/'" +msgstr "" + +#: ../libsvn_subr/dirent_uri.c:1667 #, c-format msgid "Couldn't determine absolute path of '%s'" msgstr "" -#: ../libsvn_subr/dirent_uri.c:2348 +#: ../libsvn_subr/dirent_uri.c:1705 +#, c-format +msgid "Could not canonicalize URI '%s' (the result '%s' is not canonical)" +msgstr "" + +#: ../libsvn_subr/dirent_uri.c:1742 +#, c-format +msgid "Could not canonicalize relpath '%s' (the result '%s' is not canonical)" +msgstr "" + +#: ../libsvn_subr/dirent_uri.c:1810 +#, c-format +msgid "Could not canonicalize dirent '%s' (the result '%s' is not canonical)" +msgstr "" + +#: ../libsvn_subr/dirent_uri.c:2485 #, c-format msgid "Local URL '%s' does not contain 'file://' prefix" msgstr "" -#: ../libsvn_subr/dirent_uri.c:2432 +#: ../libsvn_subr/dirent_uri.c:2569 #, c-format msgid "Local URL '%s' contains only a hostname, no path" msgstr "" -#: ../libsvn_subr/dirent_uri.c:2446 +#: ../libsvn_subr/dirent_uri.c:2583 #, c-format msgid "Local URL '%s' contains unsupported hostname" msgstr "" @@ -9022,248 +9133,254 @@ msgstr "" msgid "Cannot serialize negative length" msgstr "" -#: ../libsvn_subr/io.c:359 +#: ../libsvn_subr/io.c:370 #, c-format msgid "Can't check path '%s'" msgstr "" -#: ../libsvn_subr/io.c:604 ../libsvn_subr/io.c:5301 +#: ../libsvn_subr/io.c:646 ../libsvn_subr/io.c:5507 #, c-format msgid "Can't open '%s'" msgstr "" -#: ../libsvn_subr/io.c:630 ../libsvn_subr/io.c:716 +#: ../libsvn_subr/io.c:672 ../libsvn_subr/io.c:758 #, c-format msgid "Unable to make name for '%s'" msgstr "" -#: ../libsvn_subr/io.c:703 +#: ../libsvn_subr/io.c:745 #, c-format msgid "Can't create symbolic link '%s'" msgstr "" -#: ../libsvn_subr/io.c:720 ../libsvn_subr/io.c:755 ../libsvn_subr/io.c:783 -#: ../libsvn_subr/io.c:2024 +#: ../libsvn_subr/io.c:762 ../libsvn_subr/io.c:797 ../libsvn_subr/io.c:825 +#: ../libsvn_subr/io.c:2069 msgid "Symbolic links are not supported on this platform" msgstr "" -#: ../libsvn_subr/io.c:743 ../libsvn_subr/io.c:1983 ../libsvn_subr/io.c:2003 +#: ../libsvn_subr/io.c:785 ../libsvn_subr/io.c:2028 ../libsvn_subr/io.c:2048 #, c-format msgid "Can't read contents of link" msgstr "" -#: ../libsvn_subr/io.c:803 +#: ../libsvn_subr/io.c:845 #, c-format msgid "Can't find a temporary directory" msgstr "" -#: ../libsvn_subr/io.c:921 +#: ../libsvn_subr/io.c:963 #, c-format msgid "Can't copy '%s' to '%s'" msgstr "" -#: ../libsvn_subr/io.c:964 ../libsvn_subr/io.c:986 ../libsvn_subr/io.c:1032 -#: ../libsvn_subr/io.c:5434 +#: ../libsvn_subr/io.c:1006 ../libsvn_subr/io.c:1028 ../libsvn_subr/io.c:1074 +#: ../libsvn_subr/io.c:5640 #, c-format msgid "Can't set permissions on '%s'" msgstr "" -#: ../libsvn_subr/io.c:982 ../libsvn_subr/io.c:2394 ../libsvn_subr/io.c:2454 -#: ../libsvn_subr/io.c:2543 ../libsvn_subr/io.c:5339 +#: ../libsvn_subr/io.c:1024 ../libsvn_subr/io.c:2565 ../libsvn_subr/io.c:2625 +#: ../libsvn_subr/io.c:2714 ../libsvn_subr/io.c:5545 #, c-format msgid "Can't get file name" msgstr "" -#: ../libsvn_subr/io.c:1055 +#: ../libsvn_subr/io.c:1097 #, c-format msgid "Can't append '%s' to '%s'" msgstr "" -#: ../libsvn_subr/io.c:1101 +#: ../libsvn_subr/io.c:1143 #, c-format msgid "Destination '%s' already exists" msgstr "" -#: ../libsvn_subr/io.c:1210 +#: ../libsvn_subr/io.c:1252 #, c-format msgid "Can't make directory '%s'" msgstr "" -#: ../libsvn_subr/io.c:1314 +#: ../libsvn_subr/io.c:1356 #, c-format msgid "Can't set access time of '%s'" msgstr "" -#: ../libsvn_subr/io.c:1655 ../libsvn_subr/io.c:1764 +#: ../libsvn_subr/io.c:1697 ../libsvn_subr/io.c:1806 #, c-format msgid "Can't change perms of file '%s'" msgstr "" -#: ../libsvn_subr/io.c:1659 ../libsvn_subr/io.c:1770 +#: ../libsvn_subr/io.c:1701 ../libsvn_subr/io.c:1812 #, c-format msgid "Can't change perms of directory '%s'" msgstr "" -#: ../libsvn_subr/io.c:1930 +#: ../libsvn_subr/io.c:1972 #, c-format msgid "Can't get attributes of file '%s'" msgstr "" -#: ../libsvn_subr/io.c:1938 +#: ../libsvn_subr/io.c:1980 #, c-format msgid "Can't set attributes of file '%s'" msgstr "" -#: ../libsvn_subr/io.c:2075 ../libsvn_subr/io.c:2761 +#: ../libsvn_subr/io.c:2158 ../libsvn_subr/io.c:2198 ../libsvn_subr/io.c:2208 +#: ../libsvn_subr/io.c:4466 +#, c-format +msgid "Can't stat '%s'" +msgstr "" + +#: ../libsvn_subr/io.c:2246 ../libsvn_subr/io.c:2941 #, c-format msgid "Can't remove file '%s'" msgstr "" -#: ../libsvn_subr/io.c:2145 ../libsvn_subr/io.c:4370 +#: ../libsvn_subr/io.c:2316 ../libsvn_subr/io.c:4576 #, c-format msgid "Can't move '%s' to '%s'" msgstr "" -#: ../libsvn_subr/io.c:2191 +#: ../libsvn_subr/io.c:2362 #, c-format msgid "Can't set file '%s' read-only" msgstr "" -#: ../libsvn_subr/io.c:2195 +#: ../libsvn_subr/io.c:2366 #, c-format msgid "Can't set file '%s' read-write" msgstr "" -#: ../libsvn_subr/io.c:2202 +#: ../libsvn_subr/io.c:2373 #, c-format msgid "Can't set directory '%s' read-only" msgstr "" -#: ../libsvn_subr/io.c:2206 +#: ../libsvn_subr/io.c:2377 #, c-format msgid "Can't set directory '%s' read-write" msgstr "" -#: ../libsvn_subr/io.c:2286 ../libsvn_subr/io.c:2320 +#: ../libsvn_subr/io.c:2457 ../libsvn_subr/io.c:2491 #, c-format msgid "Error getting UID of process" msgstr "" -#: ../libsvn_subr/io.c:2420 +#: ../libsvn_subr/io.c:2591 #, c-format msgid "Can't get shared lock on file '%s'" msgstr "" -#: ../libsvn_subr/io.c:2459 +#: ../libsvn_subr/io.c:2630 #, c-format msgid "Can't unlock file '%s'" msgstr "" -#: ../libsvn_subr/io.c:2561 ../libsvn_subr/io.c:2583 +#: ../libsvn_subr/io.c:2732 ../libsvn_subr/io.c:2754 #, c-format msgid "Can't flush file '%s' to disk" msgstr "" -#: ../libsvn_subr/io.c:2675 ../libsvn_subr/prompt.c:197 +#: ../libsvn_subr/io.c:2855 ../libsvn_subr/prompt.c:197 #, c-format msgid "Can't open stdin" msgstr "" -#: ../libsvn_subr/io.c:2695 +#: ../libsvn_subr/io.c:2875 msgid "Reading from stdin is disallowed" msgstr "" -#: ../libsvn_subr/io.c:2854 +#: ../libsvn_subr/io.c:3034 #, c-format msgid "Can't remove '%s'" msgstr "" -#: ../libsvn_subr/io.c:3017 +#: ../libsvn_subr/io.c:3197 #, c-format msgid "Path '%s' not found, case obstructed by '%s'" msgstr "" -#: ../libsvn_subr/io.c:3130 +#: ../libsvn_subr/io.c:3310 #, c-format msgid "Can't create process '%s' attributes" msgstr "" -#: ../libsvn_subr/io.c:3137 +#: ../libsvn_subr/io.c:3317 #, c-format msgid "Can't set process '%s' cmdtype" msgstr "" -#: ../libsvn_subr/io.c:3153 +#: ../libsvn_subr/io.c:3333 #, c-format msgid "Can't set process '%s' directory" msgstr "" -#: ../libsvn_subr/io.c:3167 +#: ../libsvn_subr/io.c:3347 #, c-format msgid "Can't set process '%s' child input" msgstr "" -#: ../libsvn_subr/io.c:3175 +#: ../libsvn_subr/io.c:3355 #, c-format msgid "Can't set process '%s' child outfile" msgstr "" -#: ../libsvn_subr/io.c:3183 +#: ../libsvn_subr/io.c:3363 #, c-format msgid "Can't set process '%s' child errfile" msgstr "" -#: ../libsvn_subr/io.c:3197 +#: ../libsvn_subr/io.c:3377 #, c-format msgid "Can't set process '%s' stdio pipes" msgstr "" -#: ../libsvn_subr/io.c:3205 +#: ../libsvn_subr/io.c:3385 #, c-format msgid "Can't set process '%s' child errfile for error handler" msgstr "" -#: ../libsvn_subr/io.c:3212 +#: ../libsvn_subr/io.c:3392 #, c-format msgid "Can't set process '%s' error handler" msgstr "" -#: ../libsvn_subr/io.c:3235 +#: ../libsvn_subr/io.c:3415 #, c-format msgid "Can't start process '%s'" msgstr "" -#: ../libsvn_subr/io.c:3259 +#: ../libsvn_subr/io.c:3439 #, c-format msgid "Error waiting for process '%s'" msgstr "" -#: ../libsvn_subr/io.c:3268 +#: ../libsvn_subr/io.c:3448 #, c-format msgid "Process '%s' failed (signal %d, core dumped)" msgstr "" -#: ../libsvn_subr/io.c:3273 +#: ../libsvn_subr/io.c:3453 #, c-format msgid "Process '%s' failed (signal %d)" msgstr "" -#: ../libsvn_subr/io.c:3279 +#: ../libsvn_subr/io.c:3459 #, c-format msgid "Process '%s' failed (exitwhy %d, exitcode %d)" msgstr "" -#: ../libsvn_subr/io.c:3287 +#: ../libsvn_subr/io.c:3467 #, c-format msgid "Process '%s' returned error exitcode %d" msgstr "" -#: ../libsvn_subr/io.c:3394 +#: ../libsvn_subr/io.c:3574 #, c-format msgid "'%s' returned %d" msgstr "" -#: ../libsvn_subr/io.c:3515 +#: ../libsvn_subr/io.c:3695 #, c-format msgid "" "Error running '%s': exitcode was %d, args were:\n" @@ -9273,188 +9390,183 @@ msgid "" "%s" msgstr "" -#: ../libsvn_subr/io.c:3656 +#: ../libsvn_subr/io.c:3836 #, c-format msgid "Can't detect MIME type of non-file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3751 +#: ../libsvn_subr/io.c:3931 #, c-format msgid "Can't open file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3791 +#: ../libsvn_subr/io.c:3971 #, c-format msgid "Can't close file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3792 +#: ../libsvn_subr/io.c:3972 #, c-format msgid "Can't close stream" msgstr "" -#: ../libsvn_subr/io.c:3801 ../libsvn_subr/io.c:3863 ../libsvn_subr/io.c:3888 -#: ../libsvn_subr/io.c:3978 +#: ../libsvn_subr/io.c:3981 ../libsvn_subr/io.c:4043 ../libsvn_subr/io.c:4068 +#: ../libsvn_subr/io.c:4158 #, c-format msgid "Can't read file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3802 ../libsvn_subr/io.c:3864 ../libsvn_subr/io.c:3889 -#: ../libsvn_subr/io.c:3979 +#: ../libsvn_subr/io.c:3982 ../libsvn_subr/io.c:4044 ../libsvn_subr/io.c:4069 +#: ../libsvn_subr/io.c:4159 #, c-format msgid "Can't read stream" msgstr "" -#: ../libsvn_subr/io.c:3811 +#: ../libsvn_subr/io.c:3991 #, c-format msgid "Can't write file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3812 +#: ../libsvn_subr/io.c:3992 #, c-format msgid "Can't write stream" msgstr "" -#: ../libsvn_subr/io.c:3826 +#: ../libsvn_subr/io.c:4006 #, c-format msgid "Can't get attribute information from file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3827 +#: ../libsvn_subr/io.c:4007 #, c-format msgid "Can't get attribute information from stream" msgstr "" -#: ../libsvn_subr/io.c:3900 +#: ../libsvn_subr/io.c:4080 #, c-format msgid "Can't set position pointer in file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3901 +#: ../libsvn_subr/io.c:4081 #, c-format msgid "Can't set position pointer in stream" msgstr "" -#: ../libsvn_subr/io.c:3988 +#: ../libsvn_subr/io.c:4168 #, c-format msgid "Can't seek in file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3989 +#: ../libsvn_subr/io.c:4169 #, c-format msgid "Can't seek in stream" msgstr "" -#: ../libsvn_subr/io.c:4006 ../libsvn_subr/io.c:4062 +#: ../libsvn_subr/io.c:4186 ../libsvn_subr/io.c:4242 #, c-format msgid "Can't write to file '%s'" msgstr "" -#: ../libsvn_subr/io.c:4007 ../libsvn_subr/io.c:4063 +#: ../libsvn_subr/io.c:4187 ../libsvn_subr/io.c:4243 #, c-format msgid "Can't write to stream" msgstr "" -#: ../libsvn_subr/io.c:4017 ../libsvn_subr/io.c:4174 +#: ../libsvn_subr/io.c:4197 ../libsvn_subr/io.c:4354 #, c-format msgid "Can't flush file '%s'" msgstr "" -#: ../libsvn_subr/io.c:4018 ../libsvn_subr/io.c:4175 +#: ../libsvn_subr/io.c:4198 ../libsvn_subr/io.c:4355 #, c-format msgid "Can't flush stream" msgstr "" -#: ../libsvn_subr/io.c:4139 +#: ../libsvn_subr/io.c:4319 #, c-format msgid "Can't write '%s' atomically" msgstr "" -#: ../libsvn_subr/io.c:4179 +#: ../libsvn_subr/io.c:4359 #, c-format msgid "Can't truncate file '%s'" msgstr "" -#: ../libsvn_subr/io.c:4180 +#: ../libsvn_subr/io.c:4360 #, c-format msgid "Can't truncate stream" msgstr "" -#: ../libsvn_subr/io.c:4260 +#: ../libsvn_subr/io.c:4440 #, c-format msgid "Can't read length line in file '%s'" msgstr "" -#: ../libsvn_subr/io.c:4264 +#: ../libsvn_subr/io.c:4444 msgid "Can't read length line in stream" msgstr "" -#: ../libsvn_subr/io.c:4286 -#, c-format -msgid "Can't stat '%s'" -msgstr "" - -#: ../libsvn_subr/io.c:4464 +#: ../libsvn_subr/io.c:4670 #, c-format msgid "Can't create directory '%s'" msgstr "" -#: ../libsvn_subr/io.c:4476 ../libsvn_subr/io.c:4490 +#: ../libsvn_subr/io.c:4682 ../libsvn_subr/io.c:4696 #, c-format msgid "Can't hide directory '%s'" msgstr "" -#: ../libsvn_subr/io.c:4551 ../libsvn_subr/io.c:4683 +#: ../libsvn_subr/io.c:4757 ../libsvn_subr/io.c:4889 #, c-format msgid "Can't open directory '%s'" msgstr "" -#: ../libsvn_subr/io.c:4595 +#: ../libsvn_subr/io.c:4801 #, c-format msgid "Can't remove directory '%s'" msgstr "" -#: ../libsvn_subr/io.c:4613 +#: ../libsvn_subr/io.c:4819 #, c-format msgid "Can't read directory" msgstr "" -#: ../libsvn_subr/io.c:4633 +#: ../libsvn_subr/io.c:4839 #, c-format msgid "Error closing directory" msgstr "" -#: ../libsvn_subr/io.c:4702 +#: ../libsvn_subr/io.c:4908 #, c-format msgid "Can't read directory entry in '%s'" msgstr "" -#: ../libsvn_subr/io.c:4828 +#: ../libsvn_subr/io.c:5034 #, c-format msgid "Can't check directory '%s'" msgstr "" -#: ../libsvn_subr/io.c:4890 +#: ../libsvn_subr/io.c:5096 #, c-format msgid "Reading '%s'" msgstr "" -#: ../libsvn_subr/io.c:4909 +#: ../libsvn_subr/io.c:5115 #, c-format msgid "First line of '%s' contains non-digit" msgstr "" -#: ../libsvn_subr/io.c:5224 +#: ../libsvn_subr/io.c:5430 #, c-format msgid "Can't create temporary file from template '%s'" msgstr "" -#: ../libsvn_subr/io.c:5311 +#: ../libsvn_subr/io.c:5517 #, c-format msgid "Can't set aside '%s'" msgstr "" -#: ../libsvn_subr/io.c:5323 ../libsvn_subr/stream.c:2231 +#: ../libsvn_subr/io.c:5529 ../libsvn_subr/stream.c:2231 #, c-format msgid "Unable to make name in '%s'" msgstr "" @@ -9543,47 +9655,61 @@ msgstr "" msgid "Can't get module file name" msgstr "" -#: ../libsvn_subr/opt.c:189 -msgid " ARG" +#: ../libsvn_subr/opt.c:291 +msgid "" +"\n" +"Experimental options:\n" msgstr "" -#: ../libsvn_subr/opt.c:324 +#: ../libsvn_subr/opt.c:330 msgid "" "\n" -"Global options:\n" +"(Use '-v' to show global and experimental options.)\n" +msgstr "" + +#: ../libsvn_subr/opt.c:360 +msgid "" +"\n" +"Experimental subcommands:\n" +msgstr "" + +#: ../libsvn_subr/opt.c:374 +msgid "" +"\n" +"(Use '-v' to show experimental subcommands.)\n" msgstr "" -#: ../libsvn_subr/opt.c:827 +#: ../libsvn_subr/opt.c:856 #, c-format msgid "Syntax error parsing peg revision '%s'; did you mean '%s@'?" msgstr "" -#: ../libsvn_subr/opt.c:833 +#: ../libsvn_subr/opt.c:862 #, c-format msgid "Syntax error parsing peg revision '%s'" msgstr "" -#: ../libsvn_subr/opt.c:970 +#: ../libsvn_subr/opt.c:999 msgid "Revision property pair is empty" msgstr "" -#: ../libsvn_subr/opt.c:990 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:337 +#: ../libsvn_subr/opt.c:1019 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:337 #: ../svn/propset-cmd.c:68 #, c-format msgid "'%s' is not a valid Subversion property name" msgstr "" -#: ../libsvn_subr/opt.c:1066 +#: ../libsvn_subr/opt.c:1095 #, c-format msgid "URL '%s' contains a '..' element" msgstr "" -#: ../libsvn_subr/opt.c:1099 +#: ../libsvn_subr/opt.c:1128 #, c-format msgid "Error resolving case of '%s'" msgstr "" -#: ../libsvn_subr/opt.c:1121 +#: ../libsvn_subr/opt.c:1150 #, c-format msgid "" "%s, version %s\n" @@ -9591,27 +9717,27 @@ msgid "" "\n" msgstr "" -#: ../libsvn_subr/opt.c:1138 +#: ../libsvn_subr/opt.c:1167 msgid "" "System information:\n" "\n" msgstr "" -#: ../libsvn_subr/opt.c:1139 +#: ../libsvn_subr/opt.c:1168 #, c-format msgid "* running on %s\n" msgstr "" -#: ../libsvn_subr/opt.c:1143 +#: ../libsvn_subr/opt.c:1172 #, c-format msgid " - %s\n" msgstr "" -#: ../libsvn_subr/opt.c:1153 +#: ../libsvn_subr/opt.c:1182 msgid "* linked dependencies:\n" msgstr "" -#: ../libsvn_subr/opt.c:1178 +#: ../libsvn_subr/opt.c:1207 msgid "* loaded shared libraries:\n" msgstr "" @@ -9861,19 +9987,19 @@ msgstr "" msgid "Can't read special file: File '%s' not found" msgstr "" -#: ../libsvn_subr/sysinfo.c:1239 +#: ../libsvn_subr/sysinfo.c:1472 msgid "Intel" msgstr "" -#: ../libsvn_subr/sysinfo.c:1240 +#: ../libsvn_subr/sysinfo.c:1473 msgid "Intel 64-bit" msgstr "" -#: ../libsvn_subr/sysinfo.c:1241 +#: ../libsvn_subr/sysinfo.c:1474 msgid "PowerPC" msgstr "" -#: ../libsvn_subr/sysinfo.c:1242 +#: ../libsvn_subr/sysinfo.c:1475 msgid "PowerPC 64-bit" msgstr "" @@ -10108,17 +10234,17 @@ msgid "" "URL '%s' (uuid: '%s') doesn't match existing URL '%s' (uuid: '%s') in '%s'" msgstr "" -#: ../libsvn_wc/adm_ops.c:313 ../libsvn_wc/update_editor.c:5334 +#: ../libsvn_wc/adm_ops.c:313 ../libsvn_wc/update_editor.c:5345 #, c-format msgid "Can't find parent directory's node while trying to add '%s'" msgstr "" -#: ../libsvn_wc/adm_ops.c:322 ../libsvn_wc/update_editor.c:5328 +#: ../libsvn_wc/adm_ops.c:322 ../libsvn_wc/update_editor.c:5339 #, c-format msgid "Can't add '%s' to a parent directory scheduled for deletion" msgstr "" -#: ../libsvn_wc/adm_ops.c:329 ../libsvn_wc/update_editor.c:5341 +#: ../libsvn_wc/adm_ops.c:329 ../libsvn_wc/update_editor.c:5352 #, c-format msgid "Can't schedule an addition of '%s' below a not-directory node" msgstr "" @@ -10158,87 +10284,87 @@ msgstr "" msgid "Not a conflict skel" msgstr "" -#: ../libsvn_wc/conflicts.c:608 ../libsvn_wc/conflicts.c:705 +#: ../libsvn_wc/conflicts.c:624 ../libsvn_wc/conflicts.c:721 msgid "Not a completed conflict skel" msgstr "" -#: ../libsvn_wc/conflicts.c:786 ../libsvn_wc/conflicts.c:859 -#: ../libsvn_wc/conflicts.c:949 +#: ../libsvn_wc/conflicts.c:802 ../libsvn_wc/conflicts.c:875 +#: ../libsvn_wc/conflicts.c:966 msgid "Conflict not set" msgstr "" -#: ../libsvn_wc/conflicts.c:1316 ../libsvn_wc/conflicts.c:1991 -#: ../libsvn_wc/conflicts.c:2036 +#: ../libsvn_wc/conflicts.c:1350 ../libsvn_wc/conflicts.c:2025 +#: ../libsvn_wc/conflicts.c:2070 msgid "Conflict callback violated API: returned no results" msgstr "" -#: ../libsvn_wc/conflicts.c:1359 +#: ../libsvn_wc/conflicts.c:1393 msgid "Conflict callback violated API: returned no merged file" msgstr "" -#: ../libsvn_wc/conflicts.c:1646 +#: ../libsvn_wc/conflicts.c:1680 #, c-format msgid "" "Conflict on '%s' cannot be resolved to 'theirs-conflict' or 'mine-conflict' " "because a merged version of the file cannot be created." msgstr "" -#: ../libsvn_wc/conflicts.c:1691 +#: ../libsvn_wc/conflicts.c:1725 #, c-format msgid "" "Conflict on '%s' could not be resolved because the chosen version of the " "file is not available." msgstr "" -#: ../libsvn_wc/conflicts.c:2506 +#: ../libsvn_wc/conflicts.c:2540 msgid "Invalid 'conflict_result' argument" msgstr "" -#: ../libsvn_wc/conflicts.c:2768 ../libsvn_wc/conflicts.c:2813 +#: ../libsvn_wc/conflicts.c:2803 ../libsvn_wc/conflicts.c:2848 #, c-format msgid "" "Tree conflict can only be resolved to 'working' or 'mine-conflict' state; " "'%s' not resolved" msgstr "" -#: ../libsvn_wc/conflicts.c:2840 +#: ../libsvn_wc/conflicts.c:2875 #, c-format msgid "" "Tree conflict can only be resolved to 'working' state; '%s' is no longer " "moved" msgstr "" -#: ../libsvn_wc/conflicts.c:2858 +#: ../libsvn_wc/conflicts.c:2893 #, c-format msgid "" "Tree conflict can only be resolved to 'working' state; '%s' not resolved" msgstr "" -#: ../libsvn_wc/conflicts.c:3035 +#: ../libsvn_wc/conflicts.c:3070 msgid "No conflict-callback and no pre-defined conflict-choice provided" msgstr "" -#: ../libsvn_wc/conflicts.c:3304 +#: ../libsvn_wc/conflicts.c:3339 #, c-format msgid "Unable to resolve conflicts on '%s'" msgstr "" -#: ../libsvn_wc/conflicts.c:3495 ../libsvn_wc/conflicts.c:3581 -#: ../libsvn_wc/conflicts.c:3660 ../libsvn_wc/conflicts.c:3746 -#: ../libsvn_wc/conflicts.c:3813 +#: ../libsvn_wc/conflicts.c:3530 ../libsvn_wc/conflicts.c:3616 +#: ../libsvn_wc/conflicts.c:3695 ../libsvn_wc/conflicts.c:3781 +#: ../libsvn_wc/conflicts.c:3848 #, c-format msgid "Unexpected conflict operation '%s' on '%s'" msgstr "" -#: ../libsvn_wc/conflicts.c:3503 ../libsvn_wc/conflicts.c:3588 -#: ../libsvn_wc/conflicts.c:3666 ../libsvn_wc/conflicts.c:3752 -#: ../libsvn_wc/conflicts.c:3819 +#: ../libsvn_wc/conflicts.c:3538 ../libsvn_wc/conflicts.c:3623 +#: ../libsvn_wc/conflicts.c:3701 ../libsvn_wc/conflicts.c:3787 +#: ../libsvn_wc/conflicts.c:3854 #, c-format msgid "Unexpected conflict reason '%s' on '%s'" msgstr "" -#: ../libsvn_wc/conflicts.c:3594 ../libsvn_wc/conflicts.c:3672 -#: ../libsvn_wc/conflicts.c:3758 ../libsvn_wc/conflicts.c:3825 +#: ../libsvn_wc/conflicts.c:3629 ../libsvn_wc/conflicts.c:3707 +#: ../libsvn_wc/conflicts.c:3793 ../libsvn_wc/conflicts.c:3860 #, c-format msgid "Unexpected conflict action '%s' on '%s'" msgstr "" @@ -10374,7 +10500,7 @@ msgstr "" msgid "File '%s' has local modifications" msgstr "" -#: ../libsvn_wc/deprecated.c:2393 +#: ../libsvn_wc/deprecated.c:2419 #, c-format msgid "Unexpectedly found '%s': path is marked 'missing'" msgstr "" @@ -10807,15 +10933,17 @@ msgstr "" #. scratch_ #: ../libsvn_wc/props.c:2239 #, c-format -msgid " (%d more duplicate targets found)" -msgstr "" +msgid " (%d more duplicate target found)" +msgid_plural " (%d more duplicate targets found)" +msgstr[0] "" +msgstr[1] "" -#: ../libsvn_wc/props.c:2244 +#: ../libsvn_wc/props.c:2246 #, c-format msgid "Invalid %s property on '%s': target '%s' appears more than once%s" msgstr "" -#: ../libsvn_wc/props.c:2275 +#: ../libsvn_wc/props.c:2277 #, c-format msgid "Cannot set non-inheritable mergeinfo on a non-directory ('%s')" msgstr "" @@ -10890,35 +11018,35 @@ msgstr "" msgid "'%s' is not valid as filename in directory '%s'" msgstr "" -#: ../libsvn_wc/update_editor.c:1507 +#: ../libsvn_wc/update_editor.c:1511 #, c-format msgid "Unexpected attempt to add a node at path '%s'" msgstr "" -#: ../libsvn_wc/update_editor.c:1518 +#: ../libsvn_wc/update_editor.c:1522 #, c-format msgid "Unexpected attempt to edit, delete, or replace a node at path '%s'" msgstr "" -#: ../libsvn_wc/update_editor.c:1899 +#: ../libsvn_wc/update_editor.c:1904 #, c-format msgid "" "Failed to add directory '%s': object of the same name as the administrative " "directory" msgstr "" -#: ../libsvn_wc/update_editor.c:2572 +#: ../libsvn_wc/update_editor.c:2580 msgid "Couldn't do property merge" msgstr "" -#: ../libsvn_wc/update_editor.c:3111 +#: ../libsvn_wc/update_editor.c:3119 #, c-format msgid "" "Failed to add file '%s': object of the same name as the administrative " "directory" msgstr "" -#: ../libsvn_wc/update_editor.c:3650 +#: ../libsvn_wc/update_editor.c:3661 #, c-format msgid "" "Checksum mismatch for '%s':\n" @@ -10926,22 +11054,22 @@ msgid "" " recorded: %s\n" msgstr "" -#: ../libsvn_wc/update_editor.c:5309 +#: ../libsvn_wc/update_editor.c:5320 #, c-format msgid "Node '%s' exists." msgstr "" -#: ../libsvn_wc/update_editor.c:5369 +#: ../libsvn_wc/update_editor.c:5380 #, c-format msgid "Copyfrom-url '%s' has different repository root than '%s'" msgstr "" -#: ../libsvn_wc/update_editor.c:5581 +#: ../libsvn_wc/update_editor.c:5592 #, c-format msgid "'%s' is not an unmodified copied directory" msgstr "" -#: ../libsvn_wc/update_editor.c:5592 +#: ../libsvn_wc/update_editor.c:5603 #, c-format msgid "Copyfrom '%s' doesn't match original location of '%s'" msgstr "" @@ -11253,52 +11381,52 @@ msgstr "" msgid "'%s' is not deleted" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:459 ../libsvn_wc/wc_db_update_move.c:483 +#: ../libsvn_wc/wc_db_update_move.c:464 ../libsvn_wc/wc_db_update_move.c:488 #, c-format msgid "'%s' already in conflict" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:1621 +#: ../libsvn_wc/wc_db_update_move.c:1627 msgid ".working" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:2184 +#: ../libsvn_wc/wc_db_update_move.c:2190 #, c-format msgid "" "Cannot apply update because '%s' is a switched path (please switch it back " "to its original URL and try again)" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:2193 +#: ../libsvn_wc/wc_db_update_move.c:2199 #, c-format msgid "" "Cannot apply update because '%s' is a mixed-revision working copy (please " "update and try again)" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:2246 +#: ../libsvn_wc/wc_db_update_move.c:2252 #, c-format msgid "The node '%s' has not been moved away" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:2710 +#: ../libsvn_wc/wc_db_update_move.c:2716 #, c-format msgid "" "Cannot merge local changes from '%s' because '%s' already contains other " "local changes (please commit or revert these other changes and try again)" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:4084 +#: ../libsvn_wc/wc_db_update_move.c:4090 #, c-format msgid "'%s' is not in conflict" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:4097 +#: ../libsvn_wc/wc_db_update_move.c:4103 #, c-format msgid "'%s' is not a valid tree-conflict victim" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:4110 +#: ../libsvn_wc/wc_db_update_move.c:4116 #, c-format msgid "'%s' is already a moved away tree-conflict" msgstr "" @@ -11346,27 +11474,27 @@ msgstr "" msgid "The symlink at '%s' points nowhere" msgstr "" -#: ../libsvn_wc/wc_db_wcroot.c:757 +#: ../libsvn_wc/wc_db_wcroot.c:762 #, c-format msgid "Missing a row in WCROOT for '%s'." msgstr "" -#: ../libsvn_wc/wc_db_wcroot.c:811 +#: ../libsvn_wc/wc_db_wcroot.c:816 #, c-format msgid "The working copy at '%s' is corrupt." msgstr "" -#: ../libsvn_wc/wc_db_wcroot.c:827 +#: ../libsvn_wc/wc_db_wcroot.c:832 #, c-format msgid "The working copy database at '%s' is missing." msgstr "" -#: ../libsvn_wc/wc_db_wcroot.c:836 +#: ../libsvn_wc/wc_db_wcroot.c:841 #, c-format msgid "The working copy database at '%s' is corrupt." msgstr "" -#: ../libsvn_wc/wc_db_wcroot.c:994 +#: ../libsvn_wc/wc_db_wcroot.c:1000 #, c-format msgid "'%s' is not a working copy root" msgstr "" @@ -11504,40 +11632,46 @@ msgstr "" msgid "Credentials cache in '%s' is empty\n" msgstr "" -#: ../svn/auth-cmd.c:450 ../svn/auth-cmd.c:473 +#: ../svn/auth-cmd.c:450 ../svn/auth-cmd.c:476 #, c-format msgid "Credentials cache in '%s' contains no matching credentials" msgstr "" #: ../svn/auth-cmd.c:458 #, c-format -msgid "Credentials cache in '%s' contains %d credentials\n" -msgstr "" +msgid "Credentials cache in '%s' contains %d credential\n" +msgid_plural "Credentials cache in '%s' contains %d credentials\n" +msgstr[0] "" +msgstr[1] "" -#: ../svn/auth-cmd.c:462 +#: ../svn/auth-cmd.c:464 #, c-format -msgid "Credentials cache in '%s' contains %d matching credentials\n" -msgstr "" +msgid "Credentials cache in '%s' contains %d matching credential\n" +msgid_plural "Credentials cache in '%s' contains %d matching credentials\n" +msgstr[0] "" +msgstr[1] "" -#: ../svn/auth-cmd.c:477 +#: ../svn/auth-cmd.c:481 #, c-format -msgid "Deleted %d matching credentials from '%s'\n" -msgstr "" +msgid "Deleted %d matching credential from '%s'\n" +msgid_plural "Deleted %d matching credentials from '%s'\n" +msgstr[0] "" +msgstr[1] "" -#: ../svn/blame-cmd.c:314 ../svn/list-cmd.c:310 +#: ../svn/blame-cmd.c:311 msgid "'verbose' option invalid in XML mode" msgstr "" -#: ../svn/blame-cmd.c:326 ../svn/list-cmd.c:322 ../svn/status-cmd.c:315 +#: ../svn/blame-cmd.c:323 ../svn/status-cmd.c:315 msgid "'incremental' option only valid in XML mode" msgstr "" -#: ../svn/blame-cmd.c:389 +#: ../svn/blame-cmd.c:387 #, c-format msgid "Skipping binary file (use --force to treat as text): '%s'\n" msgstr "" -#: ../svn/blame-cmd.c:426 ../svnbench/null-blame-cmd.c:272 +#: ../svn/blame-cmd.c:424 ../svnbench/null-blame-cmd.c:272 msgid "Could not perform blame on all targets because some targets don't exist" msgstr "" @@ -11569,7 +11703,7 @@ msgstr "" msgid "'%s' does not appear to be a URL" msgstr "" -#: ../svn/checkout-cmd.c:181 ../svn/export-cmd.c:130 ../svn/list-cmd.c:451 +#: ../svn/checkout-cmd.c:181 ../svn/export-cmd.c:130 ../svn/list-cmd.c:508 #: ../svn/switch-cmd.c:191 ../svn/update-cmd.c:181 msgid "Failure occurred processing one or more externals definitions" msgstr "" @@ -11803,200 +11937,200 @@ msgstr "" #. Translators: keep long_desc below 70 characters (wrap with a left #. margin of 9 spaces if needed) -#: ../svn/conflict-callbacks.c:452 +#: ../svn/conflict-callbacks.c:463 msgid "Quit resolution" msgstr "" -#: ../svn/conflict-callbacks.c:452 +#: ../svn/conflict-callbacks.c:463 msgid "postpone all remaining conflicts" msgstr "" #. Translators: keep long_desc below 70 characters (wrap with a left #. margin of 9 spaces if needed) -#: ../svn/conflict-callbacks.c:463 +#: ../svn/conflict-callbacks.c:474 msgid "Edit file" msgstr "" -#: ../svn/conflict-callbacks.c:463 +#: ../svn/conflict-callbacks.c:474 msgid "change merged file in an editor" msgstr "" -#: ../svn/conflict-callbacks.c:466 +#: ../svn/conflict-callbacks.c:477 msgid "Show diff" msgstr "" -#: ../svn/conflict-callbacks.c:466 +#: ../svn/conflict-callbacks.c:477 msgid "show all changes made to merged file" msgstr "" #. Translators: keep long_desc below 70 characters (wrap with a left #. margin of 9 spaces if needed) -#: ../svn/conflict-callbacks.c:468 ../svn/conflict-callbacks.c:490 +#: ../svn/conflict-callbacks.c:479 ../svn/conflict-callbacks.c:501 msgid "Display conflict" msgstr "" -#: ../svn/conflict-callbacks.c:468 +#: ../svn/conflict-callbacks.c:479 msgid "show all conflicts (ignoring merged version)" msgstr "" -#: ../svn/conflict-callbacks.c:471 +#: ../svn/conflict-callbacks.c:482 msgid "Merge" msgstr "" -#: ../svn/conflict-callbacks.c:471 +#: ../svn/conflict-callbacks.c:482 msgid "use merge tool to resolve conflict" msgstr "" -#: ../svn/conflict-callbacks.c:473 +#: ../svn/conflict-callbacks.c:484 msgid "Launch tool" msgstr "" -#: ../svn/conflict-callbacks.c:473 +#: ../svn/conflict-callbacks.c:484 msgid "launch external merge tool to resolve conflict" msgstr "" -#: ../svn/conflict-callbacks.c:477 +#: ../svn/conflict-callbacks.c:488 msgid "Internal merge tool" msgstr "" -#: ../svn/conflict-callbacks.c:477 +#: ../svn/conflict-callbacks.c:488 msgid "use built-in merge tool to resolve conflict" msgstr "" -#: ../svn/conflict-callbacks.c:480 +#: ../svn/conflict-callbacks.c:491 msgid "Show all options" msgstr "" -#: ../svn/conflict-callbacks.c:480 +#: ../svn/conflict-callbacks.c:491 msgid "show this list (also 'h', '?')" msgstr "" -#: ../svn/conflict-callbacks.c:490 +#: ../svn/conflict-callbacks.c:501 msgid "show conflicts in this property" msgstr "" -#: ../svn/conflict-callbacks.c:492 +#: ../svn/conflict-callbacks.c:503 msgid "Edit property" msgstr "" -#: ../svn/conflict-callbacks.c:492 +#: ../svn/conflict-callbacks.c:503 msgid "change merged property value in an editor" msgstr "" -#: ../svn/conflict-callbacks.c:496 ../svn/conflict-callbacks.c:514 +#: ../svn/conflict-callbacks.c:507 ../svn/conflict-callbacks.c:525 msgid "Help" msgstr "" -#: ../svn/conflict-callbacks.c:496 ../svn/conflict-callbacks.c:514 +#: ../svn/conflict-callbacks.c:507 ../svn/conflict-callbacks.c:525 msgid "show this help (also '?')" msgstr "" #. Translators: keep long_desc below 70 characters (wrap with a left #. margin of 9 spaces if needed) -#: ../svn/conflict-callbacks.c:506 +#: ../svn/conflict-callbacks.c:517 msgid "Set repository move destination path" msgstr "" -#: ../svn/conflict-callbacks.c:507 +#: ../svn/conflict-callbacks.c:518 msgid "pick repository move target from list of possible targets" msgstr "" -#: ../svn/conflict-callbacks.c:510 +#: ../svn/conflict-callbacks.c:521 msgid "Set working copy move destination path" msgstr "" -#: ../svn/conflict-callbacks.c:511 +#: ../svn/conflict-callbacks.c:522 msgid "pick working copy move target from list of possible targets" msgstr "" -#: ../svn/conflict-callbacks.c:613 +#: ../svn/conflict-callbacks.c:624 msgid "Select:" msgstr "" -#: ../svn/conflict-callbacks.c:699 +#: ../svn/conflict-callbacks.c:710 msgid "" "Words in square brackets are the corresponding --accept option arguments.\n" msgstr "" -#: ../svn/conflict-callbacks.c:744 +#: ../svn/conflict-callbacks.c:755 #, c-format msgid "" "Unrecognized option.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:909 +#: ../svn/conflict-callbacks.c:920 #, c-format msgid "Merge conflict discovered in binary file '%s'.\n" msgstr "" -#: ../svn/conflict-callbacks.c:914 +#: ../svn/conflict-callbacks.c:925 #, c-format msgid "Merge conflict discovered in file '%s'.\n" msgstr "" -#: ../svn/conflict-callbacks.c:997 +#: ../svn/conflict-callbacks.c:1008 #, c-format msgid "" "Invalid option; cannot display conflicts for a binary file.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:1005 +#: ../svn/conflict-callbacks.c:1016 #, c-format msgid "" "Invalid option; original files not available.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:1021 +#: ../svn/conflict-callbacks.c:1032 #, c-format msgid "" "Invalid option; there's no merged version to diff.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:1047 +#: ../svn/conflict-callbacks.c:1058 #, c-format msgid "" "Invalid option; there's no base path to merge.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:1140 +#: ../svn/conflict-callbacks.c:1151 #, c-format msgid "" "Invalid option.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:1169 +#: ../svn/conflict-callbacks.c:1180 #, c-format msgid "" "Invalid option; cannot choose based on conflicts in a binary file.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:1183 +#: ../svn/conflict-callbacks.c:1194 #, c-format msgid "" "Invalid option; use diff/edit/merge/launch before choosing 'mark resolved'.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:1296 +#: ../svn/conflict-callbacks.c:1307 #, c-format msgid "Conflict for property '%s' discovered on '%s'.\n" msgstr "" -#: ../svn/conflict-callbacks.c:1365 +#: ../svn/conflict-callbacks.c:1376 #, c-format msgid "" "Invalid option; please edit the property first.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:1625 +#: ../svn/conflict-callbacks.c:1635 #, c-format msgid "" "Possible working copy destinations for moved-away '%s' are:\n" @@ -12004,7 +12138,7 @@ msgid "" "Specify the correct move target path by number: " msgstr "" -#: ../svn/conflict-callbacks.c:1634 +#: ../svn/conflict-callbacks.c:1644 #, c-format msgid "" "Possible repository destinations for moved-away '%s' are:\n" @@ -12012,19 +12146,19 @@ msgid "" "Specify the correct move target path by number: " msgstr "" -#: ../svn/conflict-callbacks.c:1716 +#: ../svn/conflict-callbacks.c:1789 #, c-format msgid "" "Tree conflict on '%s':\n" "%s\n" msgstr "" -#: ../svn/conflict-callbacks.c:1736 +#: ../svn/conflict-callbacks.c:1809 #, c-format msgid "Applying recommended resolution '%s':\n" msgstr "" -#: ../svn/conflict-callbacks.c:1761 +#: ../svn/conflict-callbacks.c:1834 #, c-format msgid "" "\n" @@ -12033,19 +12167,19 @@ msgid "" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:1776 +#: ../svn/conflict-callbacks.c:1849 #, c-format msgid "" "Ambiguous move destinations exist in the repository; try the 'd' option\n" msgstr "" -#: ../svn/conflict-callbacks.c:1781 +#: ../svn/conflict-callbacks.c:1854 #, c-format msgid "" "Ambiguous move destinations exist in the working copy; try the 'w' option\n" msgstr "" -#: ../svn/copy-cmd.c:123 ../svn/export-cmd.c:94 ../svn/util.c:963 +#: ../svn/copy-cmd.c:123 ../svn/export-cmd.c:94 ../svn/util.c:965 #, c-format msgid "'%s': a peg revision is not allowed here" msgstr "" @@ -12056,29 +12190,29 @@ msgid "" "Local, non-commit operations do not take a log message or revision properties" msgstr "" -#: ../svn/diff-cmd.c:227 +#: ../svn/diff-cmd.c:242 msgid "'--xml' option only valid with '--summarize' option" msgstr "" -#: ../svn/diff-cmd.c:240 ../svn/diff-cmd.c:244 ../svn/diff-cmd.c:248 -#: ../svn/diff-cmd.c:252 ../svn/diff-cmd.c:256 ../svn/diff-cmd.c:260 -#: ../svn/diff-cmd.c:264 ../svn/diff-cmd.c:268 +#: ../svn/diff-cmd.c:255 ../svn/diff-cmd.c:259 ../svn/diff-cmd.c:263 +#: ../svn/diff-cmd.c:267 ../svn/diff-cmd.c:271 ../svn/diff-cmd.c:275 +#: ../svn/diff-cmd.c:279 ../svn/diff-cmd.c:283 #, c-format msgid "'%s' not valid with '--summarize' option" msgstr "" -#: ../svn/diff-cmd.c:355 +#: ../svn/diff-cmd.c:370 msgid "'--new' option only valid with '--old' option" msgstr "" -#: ../svn/diff-cmd.c:373 +#: ../svn/diff-cmd.c:388 msgid "" "'svn diff [-r N[:M]] [TARGET[@REV]...]' does not support mixed target types. " "Try using the --old and --new options or one of the shorthand invocations " "listed in 'svn help diff'." msgstr "" -#: ../svn/diff-cmd.c:430 +#: ../svn/diff-cmd.c:445 #, c-format msgid "Path '%s' not relative to base URLs" msgstr "" @@ -12180,8 +12314,8 @@ msgid "" "For additional information, see http://subversion.apache.org/\n" msgstr "" -#: ../svn/help-cmd.c:71 ../svnbench/help-cmd.c:66 ../svnrdump/svnrdump.c:610 -#: ../svnsync/svnsync.c:1933 +#: ../svn/help-cmd.c:71 ../svnbench/help-cmd.c:66 ../svnrdump/svnrdump.c:620 +#: ../svnsync/svnsync.c:1938 msgid "" "The following repository access (RA) modules are available:\n" "\n" @@ -12223,236 +12357,254 @@ msgstr "" msgid "Invalid URL '%s'" msgstr "" -#: ../svn/info-cmd.c:210 +#: ../svn/info-cmd.c:219 +#, c-format +msgid "" +"svn-viewspec.py format 1 does not support the 'not-present' state found at " +"'%s'" +msgstr "" + +#: ../svn/info-cmd.c:228 +#, c-format +msgid "" +"svn-viewspec.py format 1 does not support the 'switched' state found at '%s'" +msgstr "" + +#: ../svn/info-cmd.c:471 #, c-format msgid "'%s' is not a valid value for --show-item" msgstr "" -#: ../svn/info-cmd.c:218 +#: ../svn/info-cmd.c:479 #, c-format msgid "'%s' is not a valid value for --show-item; did you mean '%s'?" msgstr "" -#: ../svn/info-cmd.c:228 +#: ../svn/info-cmd.c:489 #, c-format msgid "'%s' is not a valid value for --show-item; did you mean '%s' or '%s'?" msgstr "" -#: ../svn/info-cmd.c:239 +#: ../svn/info-cmd.c:500 #, c-format msgid "" "'%s' is not a valid value for --show-item; did you mean '%s', '%s' or '%s'?" msgstr "" -#: ../svn/info-cmd.c:260 +#: ../svn/info-cmd.c:524 msgid "Resource is not under version control." msgstr "" -#: ../svn/info-cmd.c:436 ../svnadmin/svnadmin.c:2305 -#: ../svnadmin/svnadmin.c:2541 +#: ../svn/info-cmd.c:716 ../svnadmin/svnadmin.c:2385 +#: ../svnadmin/svnadmin.c:2621 #, c-format msgid "Path: %s\n" msgstr "" -#: ../svn/info-cmd.c:443 +#: ../svn/info-cmd.c:723 #, c-format msgid "Name: %s\n" msgstr "" -#: ../svn/info-cmd.c:447 +#: ../svn/info-cmd.c:727 #, c-format msgid "Working Copy Root Path: %s\n" msgstr "" -#: ../svn/info-cmd.c:453 +#: ../svn/info-cmd.c:733 #, c-format msgid "URL: %s\n" msgstr "" -#: ../svn/info-cmd.c:456 +#: ../svn/info-cmd.c:736 #, c-format msgid "Relative URL: %s\n" msgstr "" -#: ../svn/info-cmd.c:460 +#: ../svn/info-cmd.c:740 #, c-format msgid "Repository Root: %s\n" msgstr "" -#: ../svn/info-cmd.c:464 +#: ../svn/info-cmd.c:744 #, c-format msgid "Repository UUID: %s\n" msgstr "" -#: ../svn/info-cmd.c:468 +#: ../svn/info-cmd.c:748 #, c-format msgid "Revision: %ld\n" msgstr "" -#: ../svn/info-cmd.c:473 +#: ../svn/info-cmd.c:753 #, c-format msgid "Node Kind: file\n" msgstr "" -#: ../svn/info-cmd.c:477 +#: ../svn/info-cmd.c:757 #, c-format msgid "Node Kind: directory\n" msgstr "" -#: ../svn/info-cmd.c:481 +#: ../svn/info-cmd.c:761 #, c-format msgid "Node Kind: none\n" msgstr "" -#: ../svn/info-cmd.c:486 +#: ../svn/info-cmd.c:766 #, c-format msgid "Node Kind: unknown\n" msgstr "" -#: ../svn/info-cmd.c:495 +#: ../svn/info-cmd.c:776 +#, c-format +msgid "Size in Repository: %s\n" +msgstr "" + +#: ../svn/info-cmd.c:785 #, c-format msgid "Schedule: normal\n" msgstr "" -#: ../svn/info-cmd.c:499 +#: ../svn/info-cmd.c:789 #, c-format msgid "Schedule: add\n" msgstr "" -#: ../svn/info-cmd.c:503 +#: ../svn/info-cmd.c:793 #, c-format msgid "Schedule: delete\n" msgstr "" -#: ../svn/info-cmd.c:507 +#: ../svn/info-cmd.c:797 #, c-format msgid "Schedule: replace\n" msgstr "" -#: ../svn/info-cmd.c:523 +#: ../svn/info-cmd.c:813 #, c-format msgid "Depth: empty\n" msgstr "" -#: ../svn/info-cmd.c:527 +#: ../svn/info-cmd.c:817 #, c-format msgid "Depth: files\n" msgstr "" -#: ../svn/info-cmd.c:531 +#: ../svn/info-cmd.c:821 #, c-format msgid "Depth: immediates\n" msgstr "" -#: ../svn/info-cmd.c:535 +#: ../svn/info-cmd.c:825 #, c-format msgid "Depth: exclude\n" msgstr "" #. Other depths should never happen here. -#: ../svn/info-cmd.c:546 +#: ../svn/info-cmd.c:836 #, c-format msgid "Depth: INVALID\n" msgstr "" -#: ../svn/info-cmd.c:550 +#: ../svn/info-cmd.c:840 #, c-format msgid "Copied From URL: %s\n" msgstr "" -#: ../svn/info-cmd.c:554 +#: ../svn/info-cmd.c:844 #, c-format msgid "Copied From Rev: %ld\n" msgstr "" -#: ../svn/info-cmd.c:557 +#: ../svn/info-cmd.c:847 #, c-format msgid "Moved From: %s\n" msgstr "" -#: ../svn/info-cmd.c:564 +#: ../svn/info-cmd.c:854 #, c-format msgid "Moved To: %s\n" msgstr "" -#: ../svn/info-cmd.c:572 +#: ../svn/info-cmd.c:862 #, c-format msgid "Last Changed Author: %s\n" msgstr "" -#: ../svn/info-cmd.c:576 +#: ../svn/info-cmd.c:866 #, c-format msgid "Last Changed Rev: %ld\n" msgstr "" -#: ../svn/info-cmd.c:581 +#: ../svn/info-cmd.c:871 msgid "Last Changed Date" msgstr "" -#: ../svn/info-cmd.c:587 +#: ../svn/info-cmd.c:877 msgid "Text Last Updated" msgstr "" -#: ../svn/info-cmd.c:590 +#: ../svn/info-cmd.c:880 #, c-format msgid "Checksum: %s\n" msgstr "" -#: ../svn/info-cmd.c:624 +#: ../svn/info-cmd.c:914 #, c-format msgid "Conflict Previous Base File: %s\n" msgstr "" -#: ../svn/info-cmd.c:632 +#: ../svn/info-cmd.c:922 #, c-format msgid "Conflict Previous Working File: %s\n" msgstr "" -#: ../svn/info-cmd.c:640 +#: ../svn/info-cmd.c:930 #, c-format msgid "Conflict Current Base File: %s\n" msgstr "" -#: ../svn/info-cmd.c:676 +#: ../svn/info-cmd.c:966 msgid "Tree conflict" msgstr "" -#: ../svn/info-cmd.c:680 +#: ../svn/info-cmd.c:970 #, c-format msgid "Conflicted Properties: %s\n" msgstr "" -#: ../svn/info-cmd.c:706 +#: ../svn/info-cmd.c:996 msgid "Conflict Details" msgstr "" -#: ../svn/info-cmd.c:727 +#: ../svn/info-cmd.c:1017 msgid "Source left" msgstr "" -#: ../svn/info-cmd.c:736 +#: ../svn/info-cmd.c:1026 msgid "Source right" msgstr "" -#: ../svn/info-cmd.c:745 +#: ../svn/info-cmd.c:1035 #, c-format msgid "Lock Token: %s\n" msgstr "" -#: ../svn/info-cmd.c:749 +#: ../svn/info-cmd.c:1039 #, c-format msgid "Lock Owner: %s\n" msgstr "" -#: ../svn/info-cmd.c:754 +#: ../svn/info-cmd.c:1044 msgid "Lock Created" msgstr "" -#: ../svn/info-cmd.c:758 +#: ../svn/info-cmd.c:1048 msgid "Lock Expires" msgstr "" -#: ../svn/info-cmd.c:766 +#: ../svn/info-cmd.c:1056 #, c-format msgid "" "Lock Comment (%i line):\n" @@ -12463,55 +12615,68 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../svn/info-cmd.c:775 +#: ../svn/info-cmd.c:1065 #, c-format msgid "Changelist: %s\n" msgstr "" -#: ../svn/info-cmd.c:933 +#: ../svn/info-cmd.c:1171 +#, c-format +msgid "can't show in-repository size of working copy file '%s'" +msgstr "" + +#: ../svn/info-cmd.c:1275 msgid "--show-item is not valid in --xml mode" msgstr "" -#: ../svn/info-cmd.c:937 +#: ../svn/info-cmd.c:1279 msgid "--no-newline is not valid in --xml mode" msgstr "" -#: ../svn/info-cmd.c:952 ../svn/info-cmd.c:972 +#: ../svn/info-cmd.c:1283 ../svn/list-cmd.c:356 +msgid "--human-readable is not valid in --xml mode" +msgstr "" + +#: ../svn/info-cmd.c:1298 ../svn/info-cmd.c:1318 ../svn/list-cmd.c:369 msgid "--incremental is only valid in --xml mode" msgstr "" -#: ../svn/info-cmd.c:959 +#: ../svn/info-cmd.c:1305 msgid "" "--no-newline is only available for single-target, non-recursive info " "operations" msgstr "" -#: ../svn/info-cmd.c:976 +#: ../svn/info-cmd.c:1322 msgid "--no-newline' is only valid with --show-item" msgstr "" -#: ../svn/info-cmd.c:1049 ../svnbench/null-info-cmd.c:283 +#: ../svn/info-cmd.c:1395 ../svnbench/null-info-cmd.c:283 msgid "Could not display info for all targets because some targets don't exist" msgstr "" -#: ../svn/list-cmd.c:79 +#: ../svn/list-cmd.c:95 msgid "%b %d %H:%M" msgstr "" -#: ../svn/list-cmd.c:81 +#: ../svn/list-cmd.c:97 msgid "%b %d %Y" msgstr "" -#: ../svn/list-cmd.c:107 +#: ../svn/list-cmd.c:123 #, c-format msgid "Listing external '%s' defined on '%s':\n" msgstr "" -#: ../svn/list-cmd.c:393 ../svnbench/null-list-cmd.c:148 +#: ../svn/list-cmd.c:352 +msgid "--verbose is not valid in --xml mode" +msgstr "" + +#: ../svn/list-cmd.c:450 ../svnbench/null-list-cmd.c:148 msgid "'search-and' option is not supported" msgstr "" -#: ../svn/list-cmd.c:460 ../svnbench/null-list-cmd.c:193 +#: ../svn/list-cmd.c:517 ../svnbench/null-list-cmd.c:193 msgid "Could not list all targets because some targets don't exist" msgstr "" @@ -12523,93 +12688,93 @@ msgstr "" msgid "One or more locks could not be obtained" msgstr "" -#: ../svn/log-cmd.c:110 +#: ../svn/log-cmd.c:111 ../svn/svn.c:1180 ../svn/svn.c:1252 ../svn/svn.c:1318 msgid "\n" msgstr "" -#: ../svn/log-cmd.c:340 +#: ../svn/log-cmd.c:341 msgid "(no author)" msgstr "" -#: ../svn/log-cmd.c:346 +#: ../svn/log-cmd.c:347 msgid "(no date)" msgstr "" -#: ../svn/log-cmd.c:376 +#: ../svn/log-cmd.c:377 #, c-format msgid " | %d line" msgid_plural " | %d lines" msgstr[0] "" msgstr[1] "" -#: ../svn/log-cmd.c:393 +#: ../svn/log-cmd.c:394 #, c-format msgid "Changed paths:\n" msgstr "" -#: ../svn/log-cmd.c:413 +#: ../svn/log-cmd.c:414 #, c-format msgid " (from %s:%ld)" msgstr "" -#: ../svn/log-cmd.c:431 +#: ../svn/log-cmd.c:432 #, c-format msgid "Reverse merged via:" msgstr "" -#: ../svn/log-cmd.c:433 +#: ../svn/log-cmd.c:434 #, c-format msgid "Merged via:" msgstr "" -#: ../svn/log-cmd.c:716 +#: ../svn/log-cmd.c:717 msgid "'with-all-revprops' option only valid in XML mode" msgstr "" -#: ../svn/log-cmd.c:720 +#: ../svn/log-cmd.c:721 msgid "'with-no-revprops' option only valid in XML mode" msgstr "" -#: ../svn/log-cmd.c:724 +#: ../svn/log-cmd.c:725 msgid "'with-revprop' option only valid in XML mode" msgstr "" -#: ../svn/log-cmd.c:731 +#: ../svn/log-cmd.c:732 msgid "'diff' option is not supported in XML mode" msgstr "" -#: ../svn/log-cmd.c:737 +#: ../svn/log-cmd.c:738 msgid "'quiet' and 'diff' options are mutually exclusive" msgstr "" -#: ../svn/log-cmd.c:741 +#: ../svn/log-cmd.c:742 msgid "'diff-cmd' option requires 'diff' option" msgstr "" -#: ../svn/log-cmd.c:745 +#: ../svn/log-cmd.c:746 msgid "'internal-diff' option requires 'diff' option" msgstr "" -#: ../svn/log-cmd.c:749 +#: ../svn/log-cmd.c:750 msgid "'extensions' option requires 'diff' option" msgstr "" -#: ../svn/log-cmd.c:754 +#: ../svn/log-cmd.c:755 msgid "'depth' option requires 'diff' option" msgstr "" -#: ../svn/log-cmd.c:770 ../svnbench/null-log-cmd.c:158 +#: ../svn/log-cmd.c:771 ../svnbench/null-log-cmd.c:158 msgid "-c and -r are mutually exclusive" msgstr "" -#: ../svn/log-cmd.c:802 +#: ../svn/log-cmd.c:803 #, c-format msgid "" "Only relative paths can be specified after a URL for 'svn log', but '%s' is " "not a relative path" msgstr "" -#: ../svn/log-cmd.c:849 +#: ../svn/log-cmd.c:850 #, c-format msgid "cannot assign with 'with-revprop' option (drop the '=')" msgstr "" @@ -12637,9 +12802,9 @@ msgid "Second revision required" msgstr "" #: ../svn/merge-cmd.c:368 ../svn/merge-cmd.c:395 ../svn/mergeinfo-cmd.c:361 -#: ../svnadmin/svnadmin.c:2509 ../svnlook/svnlook.c:2052 -#: ../svnlook/svnlook.c:2246 ../svnlook/svnlook.c:2350 -#: ../svnlook/svnlook.c:2385 +#: ../svnadmin/svnadmin.c:2589 ../svnlook/svnlook.c:2086 +#: ../svnlook/svnlook.c:2280 ../svnlook/svnlook.c:2384 +#: ../svnlook/svnlook.c:2419 msgid "Too many arguments given" msgstr "" @@ -13086,7 +13251,7 @@ msgstr "" msgid "Transmitting file data " msgstr "" -#: ../svn/notify.c:968 ../svnadmin/svnadmin.c:2486 ../svnbench/notify.c:749 +#: ../svn/notify.c:968 ../svnadmin/svnadmin.c:2566 ../svnbench/notify.c:749 #, c-format msgid "'%s' locked by user '%s'.\n" msgstr "" @@ -13287,7 +13452,7 @@ msgid "Error writing to stream" msgstr "" #: ../svn/propget-cmd.c:187 ../svn/proplist-cmd.c:156 ../svn/proplist-cmd.c:160 -#: ../svnlook/svnlook.c:1743 ../svnlook/svnlook.c:1898 +#: ../svnlook/svnlook.c:1777 ../svnlook/svnlook.c:1932 #, c-format msgid "" "Inherited properties on '%s',\n" @@ -13295,8 +13460,8 @@ msgid "" msgstr "" #. Not a --revprop -#: ../svn/propget-cmd.c:197 ../svn/proplist-cmd.c:175 ../svnlook/svnlook.c:1778 -#: ../svnlook/svnlook.c:1933 +#: ../svn/propget-cmd.c:197 ../svn/proplist-cmd.c:175 ../svnlook/svnlook.c:1812 +#: ../svnlook/svnlook.c:1967 #, c-format msgid "Properties on '%s':\n" msgstr "" @@ -13429,37 +13594,155 @@ msgstr "" msgid "invalid 'accept' ARG" msgstr "" -#: ../svn/revert-cmd.c:80 +#: ../svn/revert-cmd.c:81 msgid "Try 'svn revert --depth infinity' instead?" msgstr "" -#: ../svn/shelve-cmd.c:112 +#: ../svn/shelf-cmd.c:56 #, c-format -msgid "Could not run external command '%s'" +msgid "Shelf '%s': no versions found" +msgstr "" + +#: ../svn/shelf-cmd.c:144 +msgid "All targets must be in the same WC" msgstr "" -#: ../svn/shelve-cmd.c:143 +#: ../svn/shelf-cmd.c:164 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "" +msgstr[1] "" + +#: ../svn/shelf-cmd.c:169 +#, c-format +msgid "%d hour ago" +msgid_plural "%d hours ago" +msgstr[0] "" +msgstr[1] "" + +#: ../svn/shelf-cmd.c:174 +#, c-format +msgid "%d minute ago" +msgid_plural "%d minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: ../svn/shelf-cmd.c:233 #, c-format -msgid "%-30s %6d mins old %10ld bytes %4d paths changed\n" +msgid "version %d" msgstr "" -#: ../svn/shelve-cmd.c:147 +#: ../svn/shelf-cmd.c:236 +#, c-format +msgid "version %d of %d" +msgid_plural "version %d of %d" +msgstr[0] "" +msgstr[1] "" + +#: ../svn/shelf-cmd.c:242 +#, c-format +msgid "%d path changed" +msgid_plural "%d paths changed" +msgstr[0] "" +msgstr[1] "" + +#: ../svn/shelf-cmd.c:258 #, c-format msgid " %.50s\n" msgstr "" -#: ../svn/shelve-cmd.c:189 -msgid "No shelved changes found" +#: ../svn/shelf-cmd.c:351 +msgid "No shelves found" +msgstr "" + +#: ../svn/shelf-cmd.c:467 +#, c-format +msgid "--- Save a new version of '%s' in WC root '%s'\n" +msgstr "" + +#: ../svn/shelf-cmd.c:468 +#, c-format +msgid "--- Shelve '%s' in WC root '%s'\n" +msgstr "" + +#: ../svn/shelf-cmd.c:483 +#, c-format +msgid "--- Saving...\n" +msgstr "" + +#: ../svn/shelf-cmd.c:484 +#, c-format +msgid "--- Shelving...\n" +msgstr "" + +#: ../svn/shelf-cmd.c:496 +#, c-format +msgid "%d path could not be shelved" +msgid_plural "%d paths could not be shelved" +msgstr[0] "" +msgstr[1] "" + +#: ../svn/shelf-cmd.c:506 +#, c-format +msgid "No local modifications could be saved" +msgstr "" + +#: ../svn/shelf-cmd.c:507 +#, c-format +msgid "No local modifications could be shelved" +msgstr "" + +#: ../svn/shelf-cmd.c:611 +#, c-format +msgid "Shelved path '%s' already has status '%c' in the working copy" +msgstr "" + +#: ../svn/shelf-cmd.c:664 +#, c-format +msgid "--- Unshelve '%s' in WC root '%s'\n" +msgstr "" + +#: ../svn/shelf-cmd.c:672 +msgid "" +"Cannot unshelve/restore, as at least one shelved path would conflict with a " +"local modification or other status in the working copy" +msgstr "" + +#: ../svn/shelf-cmd.c:690 +#, c-format +msgid "restored '%s' version %d and deleted %d newer version\n" +msgid_plural "restored '%s' version %d and deleted %d newer versions\n" +msgstr[0] "" +msgstr[1] "" + +#: ../svn/shelf-cmd.c:696 +#, c-format +msgid "restored '%s' version %d (the newest version)\n" +msgstr "" + +#: ../svn/shelf-cmd.c:797 +#, c-format +msgid "deleted '%s'\n" +msgstr "" + +#: ../svn/shelf-cmd.c:897 +#, c-format +msgid "saved '%s' version %d\n" msgstr "" -#: ../svn/shelve-cmd.c:285 +#: ../svn/shelf-cmd.c:901 #, c-format -msgid "No changes were shelved" +msgid "shelved '%s' version %d\n" msgstr "" -#: ../svn/shelve-cmd.c:327 +#: ../svn/shelf-cmd.c:932 #, c-format -msgid "unshelving the youngest change, '%s'\n" +msgid "unshelving the youngest shelf, '%s'\n" +msgstr "" + +#: ../svn/shelf-cmd.c:942 ../svn/shelf-cmd.c:1127 ../svnadmin/svnadmin.c:783 +msgid "Too many arguments" msgstr "" #: ../svn/status-cmd.c:97 @@ -13511,12 +13794,12 @@ msgstr "" msgid "force validity of log message source" msgstr "" -#: ../svn/svn.c:164 ../svn/svn.c:165 ../svnadmin/svnadmin.c:168 -#: ../svnadmin/svnadmin.c:171 ../svnbench/svnbench.c:83 -#: ../svnbench/svnbench.c:84 ../svndumpfilter/svndumpfilter.c:946 -#: ../svndumpfilter/svndumpfilter.c:949 ../svnfsfs/svnfsfs.c:89 +#: ../svn/svn.c:164 ../svn/svn.c:165 ../svnadmin/svnadmin.c:171 +#: ../svnadmin/svnadmin.c:174 ../svnbench/svnbench.c:83 +#: ../svnbench/svnbench.c:84 ../svndumpfilter/svndumpfilter.c:945 +#: ../svndumpfilter/svndumpfilter.c:948 ../svnfsfs/svnfsfs.c:89 #: ../svnfsfs/svnfsfs.c:92 ../svnlook/svnlook.c:115 ../svnlook/svnlook.c:127 -#: ../svnsync/svnsync.c:284 ../svnsync/svnsync.c:286 +#: ../svnsync/svnsync.c:289 ../svnsync/svnsync.c:291 msgid "show help on a subcommand" msgstr "" @@ -13532,11 +13815,15 @@ msgstr "" msgid "descend recursively, same as --depth=infinity" msgstr "" -#: ../svn/svn.c:169 ../svnbench/svnbench.c:87 -msgid "obsolete; try --depth=files or --depth=immediates" +#: ../svn/svn.c:169 +msgid "obsolete" +msgstr "" + +#: ../svn/svn.c:170 +msgid "show human-readable output" msgstr "" -#: ../svn/svn.c:171 ../svnbench/svnbench.c:89 +#: ../svn/svn.c:172 ../svnbench/svnbench.c:89 msgid "" "the change made by revision ARG (like -r ARG-1:ARG)\n" " If ARG is negative this is like -r ARG:ARG-1\n" @@ -13545,7 +13832,7 @@ msgid "" " ARG1:ARG2, where ARG1 is inclusive" msgstr "" -#: ../svn/svn.c:179 ../svnbench/svnbench.c:97 +#: ../svn/svn.c:180 ../svnbench/svnbench.c:97 msgid "" "ARG (some commands also take ARG1:ARG2 range)\n" " A revision argument can be one of:\n" @@ -13558,49 +13845,49 @@ msgid "" " 'PREV' revision just before COMMITTED" msgstr "" -#: ../svn/svn.c:194 +#: ../svn/svn.c:195 msgid "read log message from file ARG" msgstr "" -#: ../svn/svn.c:196 +#: ../svn/svn.c:197 msgid "give output suitable for concatenation" msgstr "" -#: ../svn/svn.c:198 +#: ../svn/svn.c:199 msgid "treat value as being in charset encoding ARG" msgstr "" -#: ../svn/svn.c:199 ../svnadmin/svnadmin.c:174 ../svnbench/svnbench.c:112 -#: ../svndumpfilter/svndumpfilter.c:952 ../svnfsfs/svnfsfs.c:95 -#: ../svnlook/svnlook.c:179 ../svnrdump/svnrdump.c:134 -#: ../svnserve/svnserve.c:419 ../svnsync/svnsync.c:282 +#: ../svn/svn.c:200 ../svnadmin/svnadmin.c:177 ../svnbench/svnbench.c:112 +#: ../svndumpfilter/svndumpfilter.c:951 ../svnfsfs/svnfsfs.c:95 +#: ../svnlook/svnlook.c:179 ../svnrdump/svnrdump.c:142 +#: ../svnserve/svnserve.c:419 ../svnsync/svnsync.c:287 #: ../svnversion/svnversion.c:144 msgid "show program version information" msgstr "" -#: ../svn/svn.c:200 ../svnbench/svnbench.c:113 +#: ../svn/svn.c:201 ../svnbench/svnbench.c:113 msgid "print extra information" msgstr "" -#: ../svn/svn.c:201 +#: ../svn/svn.c:202 msgid "display update information" msgstr "" -#: ../svn/svn.c:202 ../svnbench/svnbench.c:114 ../svnrdump/svnrdump.c:116 +#: ../svn/svn.c:203 ../svnbench/svnbench.c:114 ../svnrdump/svnrdump.c:124 msgid "specify a username ARG" msgstr "" -#: ../svn/svn.c:204 +#: ../svn/svn.c:205 msgid "" "specify a password ARG (caution: on many operating\n" " systems, other users will be able to see this)" msgstr "" -#: ../svn/svn.c:209 ../svnbench/svnbench.c:117 ../svnrdump/svnrdump.c:120 +#: ../svn/svn.c:210 ../svnbench/svnbench.c:117 ../svnrdump/svnrdump.c:128 msgid "read password from stdin" msgstr "" -#: ../svn/svn.c:211 +#: ../svn/svn.c:212 msgid "" "Specify differencing options for external diff or\n" " internal diff or blame. Default: '-u'. Options " @@ -13620,52 +13907,52 @@ msgid "" " -p, --show-c-function: Show C function name" msgstr "" -#: ../svn/svn.c:231 ../svnbench/svnbench.c:119 +#: ../svn/svn.c:232 ../svnbench/svnbench.c:119 msgid "pass contents of file ARG as additional args" msgstr "" -#: ../svn/svn.c:233 ../svnbench/svnbench.c:121 +#: ../svn/svn.c:234 ../svnbench/svnbench.c:121 msgid "" "limit operation by depth ARG ('empty', 'files',\n" " 'immediates', or 'infinity')" msgstr "" -#: ../svn/svn.c:237 +#: ../svn/svn.c:238 msgid "" "set new working copy depth to ARG ('exclude',\n" " 'empty', 'files', 'immediates', or 'infinity')" msgstr "" -#: ../svn/svn.c:240 ../svnlook/svnlook.c:182 +#: ../svn/svn.c:241 ../svnlook/svnlook.c:182 msgid "output in XML" msgstr "" -#: ../svn/svn.c:241 +#: ../svn/svn.c:242 msgid "DEPRECATED" msgstr "" -#: ../svn/svn.c:243 ../svnbench/svnbench.c:126 +#: ../svn/svn.c:244 ../svnbench/svnbench.c:126 msgid "do not cross copies while traversing history" msgstr "" -#: ../svn/svn.c:245 +#: ../svn/svn.c:246 msgid "" "disregard default and svn:ignore and\n" " svn:global-ignores property ignores" msgstr "" -#: ../svn/svn.c:249 ../svnbench/svnbench.c:128 ../svnrdump/svnrdump.c:130 -#: ../svnsync/svnsync.c:198 +#: ../svn/svn.c:250 ../svnbench/svnbench.c:128 ../svnrdump/svnrdump.c:138 +#: ../svnsync/svnsync.c:203 msgid "do not cache authentication tokens" msgstr "" -#: ../svn/svn.c:251 ../svnbench/svnbench.c:130 ../svnrdump/svnrdump.c:144 +#: ../svn/svn.c:252 ../svnbench/svnbench.c:130 ../svnrdump/svnrdump.c:152 msgid "" "deprecated; same as\n" " --trust-server-cert-failures=unknown-ca" msgstr "" -#: ../svn/svn.c:255 ../svnbench/svnbench.c:134 ../svnrdump/svnrdump.c:148 +#: ../svn/svn.c:256 ../svnbench/svnbench.c:134 ../svnrdump/svnrdump.c:156 msgid "" "with --non-interactive, accept SSL server\n" " certificates with failures; ARG is comma-" @@ -13678,65 +13965,65 @@ msgid "" " separately classified certificate errors)." msgstr "" -#: ../svn/svn.c:269 ../svnrdump/svnrdump.c:122 ../svnsync/svnsync.c:190 +#: ../svn/svn.c:270 ../svnrdump/svnrdump.c:130 ../svnsync/svnsync.c:195 msgid "" "do no interactive prompting (default is to prompt\n" " only if standard input is a terminal device)" msgstr "" -#: ../svn/svn.c:273 ../svnrdump/svnrdump.c:126 ../svnsync/svnsync.c:194 +#: ../svn/svn.c:274 ../svnrdump/svnrdump.c:134 ../svnsync/svnsync.c:199 msgid "" "do interactive prompting even if standard input\n" " is not a terminal device" msgstr "" -#: ../svn/svn.c:277 +#: ../svn/svn.c:278 msgid "try operation but make no changes" msgstr "" -#: ../svn/svn.c:279 +#: ../svn/svn.c:280 msgid "disable merge tracking; diff nodes as if related" msgstr "" -#: ../svn/svn.c:281 +#: ../svn/svn.c:282 msgid "ignore externals definitions" msgstr "" -#: ../svn/svn.c:282 +#: ../svn/svn.c:283 msgid "use ARG as merge command" msgstr "" -#: ../svn/svn.c:283 +#: ../svn/svn.c:284 msgid "use ARG as external editor" msgstr "" -#: ../svn/svn.c:285 +#: ../svn/svn.c:286 msgid "merge only mergeinfo differences" msgstr "" -#: ../svn/svn.c:286 +#: ../svn/svn.c:287 msgid "use ARG as the older target" msgstr "" -#: ../svn/svn.c:287 +#: ../svn/svn.c:288 msgid "use ARG as the newer target" msgstr "" -#: ../svn/svn.c:289 +#: ../svn/svn.c:290 msgid "operate on a revision property (use with -r)" msgstr "" -#: ../svn/svn.c:290 +#: ../svn/svn.c:291 msgid "relocate via URL-rewriting" msgstr "" -#: ../svn/svn.c:292 ../svnadmin/svnadmin.c:221 ../svnbench/svnbench.c:150 -#: ../svnrdump/svnrdump.c:114 ../svnsync/svnsync.c:248 +#: ../svn/svn.c:293 ../svnadmin/svnadmin.c:224 ../svnbench/svnbench.c:150 +#: ../svnrdump/svnrdump.c:122 ../svnsync/svnsync.c:253 msgid "read user configuration files from directory ARG" msgstr "" -#: ../svn/svn.c:294 ../svnbench/svnbench.c:152 ../svnrdump/svnrdump.c:136 -#: ../svnsync/svnsync.c:250 +#: ../svn/svn.c:295 ../svnbench/svnbench.c:152 ../svnrdump/svnrdump.c:144 +#: ../svnsync/svnsync.c:255 msgid "" "set user configuration option in the format:\n" " FILE:SECTION:OPTION=[VALUE]\n" @@ -13744,15 +14031,15 @@ msgid "" " servers:global:http-library=serf" msgstr "" -#: ../svn/svn.c:301 +#: ../svn/svn.c:302 msgid "enable automatic properties" msgstr "" -#: ../svn/svn.c:302 +#: ../svn/svn.c:303 msgid "disable automatic properties" msgstr "" -#: ../svn/svn.c:304 +#: ../svn/svn.c:305 msgid "" "use a different EOL marker than the standard\n" " system marker for files with the svn:eol-style\n" @@ -13760,55 +14047,55 @@ msgid "" " ARG may be one of 'LF', 'CR', 'CRLF'" msgstr "" -#: ../svn/svn.c:311 ../svnbench/svnbench.c:159 +#: ../svn/svn.c:312 ../svnbench/svnbench.c:159 msgid "maximum number of log entries" msgstr "" -#: ../svn/svn.c:312 +#: ../svn/svn.c:313 msgid "don't unlock the targets" msgstr "" -#: ../svn/svn.c:313 +#: ../svn/svn.c:314 msgid "remove changelist association" msgstr "" -#: ../svn/svn.c:315 +#: ../svn/svn.c:316 msgid "operate only on members of changelist ARG" msgstr "" -#: ../svn/svn.c:317 +#: ../svn/svn.c:318 msgid "don't delete changelists after commit" msgstr "" -#: ../svn/svn.c:318 +#: ../svn/svn.c:319 msgid "keep path in working copy" msgstr "" -#: ../svn/svn.c:320 ../svnbench/svnbench.c:161 +#: ../svn/svn.c:321 ../svnbench/svnbench.c:161 msgid "retrieve all revision properties" msgstr "" -#: ../svn/svn.c:322 ../svnbench/svnbench.c:163 +#: ../svn/svn.c:323 ../svnbench/svnbench.c:163 msgid "retrieve no revision properties" msgstr "" -#: ../svn/svn.c:324 ../svnbench/svnbench.c:165 +#: ../svn/svn.c:325 ../svnbench/svnbench.c:165 msgid "" "set revision property ARG in new revision\n" " using the name[=value] format" msgstr "" -#: ../svn/svn.c:327 +#: ../svn/svn.c:328 msgid "make intermediate directories" msgstr "" -#: ../svn/svn.c:329 ../svnbench/svnbench.c:169 +#: ../svn/svn.c:330 ../svnbench/svnbench.c:169 msgid "" "use/display additional information from merge\n" " history" msgstr "" -#: ../svn/svn.c:333 +#: ../svn/svn.c:334 msgid "" "specify automatic conflict resolution action\n" " ('postpone', 'working', 'base', 'mine-" @@ -13818,17 +14105,17 @@ msgid "" " 'p', 'mc', 'tc', 'mf', 'tf', 'e', 'l', 'r')" msgstr "" -#: ../svn/svn.c:344 +#: ../svn/svn.c:345 msgid "" "specify which collection of revisions to display\n" " ('merged', 'eligible')" msgstr "" -#: ../svn/svn.c:348 +#: ../svn/svn.c:349 msgid "deprecated" msgstr "" -#: ../svn/svn.c:350 +#: ../svn/svn.c:351 msgid "" "number of leading path components to strip from\n" " paths parsed from the patch file. --strip 0\n" @@ -13842,89 +14129,89 @@ msgid "" "component." msgstr "" -#: ../svn/svn.c:366 +#: ../svn/svn.c:367 msgid "don't expand keywords" msgstr "" -#: ../svn/svn.c:368 +#: ../svn/svn.c:369 msgid "apply the unidiff in reverse" msgstr "" -#: ../svn/svn.c:370 +#: ../svn/svn.c:371 msgid "ignore whitespace during pattern matching" msgstr "" -#: ../svn/svn.c:371 +#: ../svn/svn.c:372 msgid "produce diff output" msgstr "" #. maps to show_diff #. diff options -#: ../svn/svn.c:373 ../svnlook/svnlook.c:139 +#: ../svn/svn.c:374 ../svnlook/svnlook.c:139 msgid "use ARG as diff command" msgstr "" -#: ../svn/svn.c:375 +#: ../svn/svn.c:376 msgid "override diff-cmd specified in config file" msgstr "" -#: ../svn/svn.c:377 ../svnlook/svnlook.c:133 +#: ../svn/svn.c:378 ../svnlook/svnlook.c:133 msgid "do not print differences for added files" msgstr "" -#: ../svn/svn.c:379 ../svnlook/svnlook.c:136 +#: ../svn/svn.c:380 ../svnlook/svnlook.c:136 msgid "do not print differences for deleted files" msgstr "" -#: ../svn/svn.c:381 +#: ../svn/svn.c:382 msgid "don't diff copied or moved files with their source" msgstr "" -#: ../svn/svn.c:383 +#: ../svn/svn.c:384 msgid "diff unrelated nodes as delete and add" msgstr "" -#: ../svn/svn.c:384 +#: ../svn/svn.c:385 msgid "show a summary of the results" msgstr "" -#: ../svn/svn.c:386 +#: ../svn/svn.c:387 msgid "use git's extended diff format" msgstr "" -#: ../svn/svn.c:388 ../svnlook/svnlook.c:142 +#: ../svn/svn.c:389 ../svnlook/svnlook.c:142 msgid "ignore properties during the operation" msgstr "" -#: ../svn/svn.c:390 ../svnlook/svnlook.c:145 +#: ../svn/svn.c:391 ../svnlook/svnlook.c:145 msgid "show only properties during the operation" msgstr "" -#: ../svn/svn.c:392 +#: ../svn/svn.c:393 msgid "" "generate diff suitable for generic third-party\n" " patch tools; currently the same as\n" " --show-copies-as-adds --ignore-properties" msgstr "" -#: ../svn/svn.c:400 +#: ../svn/svn.c:401 msgid "" "Allow operation on mixed-revision working copy.\n" " Use of this option is not recommended!\n" " Please run 'svn update' instead." msgstr "" -#: ../svn/svn.c:406 +#: ../svn/svn.c:407 msgid "" "also operate on externals defined by\n" " svn:externals properties" msgstr "" -#: ../svn/svn.c:410 +#: ../svn/svn.c:411 msgid "retrieve properties set on parents of the target" msgstr "" -#: ../svn/svn.c:412 +#: ../svn/svn.c:413 msgid "" "use ARG as search pattern (glob syntax, case-\n" " and accent-insensitive, may require quotation " @@ -13932,37 +14219,41 @@ msgid "" " to prevent shell expansion)" msgstr "" -#: ../svn/svn.c:418 +#: ../svn/svn.c:419 msgid "combine ARG with the previous search pattern" msgstr "" -#: ../svn/svn.c:420 +#: ../svn/svn.c:421 msgid "show revision log message, author and date" msgstr "" -#: ../svn/svn.c:422 +#: ../svn/svn.c:423 msgid "remove unversioned items" msgstr "" -#: ../svn/svn.c:423 +#: ../svn/svn.c:424 msgid "remove ignored items" msgstr "" -#: ../svn/svn.c:424 ../svnlook/svnlook.c:155 ../svnversion/svnversion.c:140 +#: ../svn/svn.c:426 +msgid "reverting an added item will remove it from disk" +msgstr "" + +#: ../svn/svn.c:427 ../svnlook/svnlook.c:155 ../svnversion/svnversion.c:140 msgid "do not output the trailing newline" msgstr "" -#: ../svn/svn.c:425 +#: ../svn/svn.c:428 msgid "show cached passwords" msgstr "" -#: ../svn/svn.c:427 +#: ../svn/svn.c:430 msgid "" "pin externals with no explicit revision to their\n" " current revision (recommended when tagging)" msgstr "" -#: ../svn/svn.c:431 +#: ../svn/svn.c:434 msgid "" "print only the item identified by ARG:\n" " 'kind' node kind of TARGET\n" @@ -13974,6 +14265,8 @@ msgid "" " 'repos-root-url'\n" " root URL of repository\n" " 'repos-uuid' UUID of repository\n" +" 'repos-size' for files, the size of TARGET\n" +" in the repository\n" " 'revision' specified or implied revision\n" " 'last-changed-revision'\n" " last change of TARGET at or " @@ -13985,10 +14278,13 @@ msgid "" " 'last-changed-author'\n" " author of 'last-changed-" "revision'\n" -" 'wc-root' root of TARGET's working copy" +" 'wc-root' root of TARGET's working copy\n" +" 'schedule' " +"'normal','add','delete','replace'\n" +" 'depth' checkout depth of TARGET in WC" msgstr "" -#: ../svn/svn.c:466 +#: ../svn/svn.c:477 msgid "" "Local additions are merged with incoming additions\n" " instead of causing a tree conflict. Use of " @@ -13998,39 +14294,93 @@ msgid "" " resolve tree conflicts instead." msgstr "" -#: ../svn/svn.c:475 +#: ../svn/svn.c:486 msgid "remove unreferenced pristines from .svn directory" msgstr "" -#: ../svn/svn.c:477 -msgid "list shelved patches" +#: ../svn/svn.c:489 +msgid "drop shelf after successful unshelve" +msgstr "" + +#: ../svn/svn.c:492 +msgid "" +"print the working copy layout, formatted according\n" +" to ARG: 'classic' or 'svn11'" msgstr "" -#: ../svn/svn.c:478 -msgid "do not delete the shelved patch" +#: ../svn/svn.c:544 +msgid "" +"Put new files and directories under version control.\n" +"usage: add PATH...\n" +"\n" msgstr "" -#: ../svn/svn.c:479 -msgid "delete the shelved patch" +#: ../svn/svn.c:547 +msgid "" +" Schedule unversioned PATHs for addition, so they will become versioned " +"and\n" +" be added to the repository in the next commit. Recurse into directories " +"by\n" +" default (see the --depth option).\n" +"\n" msgstr "" -#: ../svn/svn.c:529 +#: ../svn/svn.c:551 msgid "" -"Put files and directories under version control, scheduling\n" -"them for addition to repository. They will be added in next commit.\n" -"usage: add PATH...\n" +" The 'svn add' command is only necessary for files and directories that " +"are\n" +" not yet under version control. Unversioned files and directories can be\n" +" identified with 'svn status' (see 'svn help status').\n" +"\n" +msgstr "" + +#: ../svn/svn.c:555 +msgid "" +" The effects of 'svn add' can be undone with 'svn revert' before the " +"addition\n" +" has been committed. Once committed, a path can be removed from version\n" +" control with 'svn delete', and in some circumstances by running a " +"reverse-\n" +" merge (see 'svn help merge' for details).\n" +"\n" +msgstr "" + +#: ../svn/svn.c:560 +msgid "" +" With --force, add all the unversioned paths found in PATHs and ignore the\n" +" rest; otherwise, error out if any specified paths are already versioned.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:563 +msgid "" +" The selection of items to add may be influenced by the 'ignores' feature.\n" +" Properties may be attached to the items as configured by the 'auto-props'\n" +" feature.\n" msgstr "" -#: ../svn/svn.c:534 +#: ../svn/svn.c:569 msgid "add intermediate parents" msgstr "" -#: ../svn/svn.c:537 +#: ../svn/svn.c:570 ../svn/svn.c:718 +msgid "obsolete; same as --depth=empty" +msgstr "" + +#: ../svn/svn.c:571 +msgid "ignore already versioned paths" +msgstr "" + +#: ../svn/svn.c:574 msgid "" "Manage cached authentication credentials.\n" "usage: 1. svn auth [PATTERN ...]\n" -"usage: 2. svn auth --remove PATTERN [PATTERN ...]\n" +" 2. svn auth --remove PATTERN [PATTERN ...]\n" "\n" +msgstr "" + +#: ../svn/svn.c:578 +msgid "" " With no arguments, list all cached authentication credentials.\n" " Authentication credentials include usernames, passwords,\n" " SSL certificates, and SSL client-certificate passphrases.\n" @@ -14039,6 +14389,10 @@ msgid "" " or more patterns. With the --remove option, remove cached authentication\n" " credentials matching one or more patterns.\n" "\n" +msgstr "" + +#: ../svn/svn.c:585 +msgid "" " If more than one pattern is specified credentials are considered only if " "they\n" " match all specified patterns. Patterns are matched case-sensitively and " @@ -14052,64 +14406,99 @@ msgid "" " expand them.\n" msgstr "" -#: ../svn/svn.c:558 +#: ../svn/svn.c:596 msgid "remove matching authentication credentials" msgstr "" -#: ../svn/svn.c:563 +#: ../svn/svn.c:601 msgid "" "Show when each line of a file was last (or\n" "next) changed.\n" "usage: blame [-rM:N] TARGET[@REV]...\n" "\n" +msgstr "" + +#: ../svn/svn.c:605 +msgid "" " Annotate each line of a file with the revision number and author of the\n" " last change (or optionally the next change) to that line.\n" "\n" +msgstr "" + +#: ../svn/svn.c:608 ../svnbench/svnbench.c:222 +msgid "" " With no revision range (same as -r0:REV), or with '-r M:N' where M < N,\n" " annotate each line that is present in revision N of the file, with\n" " the last revision at or before rN that changed or added the line,\n" " looking back no further than rM.\n" "\n" +msgstr "" + +#: ../svn/svn.c:613 ../svnbench/svnbench.c:227 +msgid "" " With a reverse revision range '-r M:N' where M > N,\n" " annotate each line that is present in revision N of the file, with\n" " the next revision after rN that changed or deleted the line,\n" " looking forward no further than rM.\n" "\n" +msgstr "" + +#: ../svn/svn.c:618 ../svnbench/svnbench.c:232 +msgid "" " If specified, REV determines in which revision the target is first\n" " looked up.\n" "\n" -" Write the annotated result to standard output.\n" msgstr "" -#: ../svn/svn.c:587 +#: ../svn/svn.c:621 ../svnbench/svnbench.c:235 +msgid " Write the annotated result to standard output.\n" +msgstr "" + +#: ../svn/svn.c:626 msgid "" "Output the content of specified files or URLs.\n" "usage: cat TARGET[@REV]...\n" "\n" +msgstr "" + +#: ../svn/svn.c:629 +msgid "" " If specified, REV determines in which revision the target is first\n" " looked up.\n" msgstr "" -#: ../svn/svn.c:595 +#: ../svn/svn.c:635 msgid "" "Associate (or dissociate) changelist CLNAME with the named files.\n" "usage: 1. changelist CLNAME PATH...\n" " 2. changelist --remove PATH...\n" msgstr "" -#: ../svn/svn.c:601 +#: ../svn/svn.c:642 msgid "" "Check out a working copy from a repository.\n" "usage: checkout URL[@REV]... [PATH]\n" "\n" +msgstr "" + +#: ../svn/svn.c:645 +msgid "" " If specified, REV determines in which revision the URL is first\n" " looked up.\n" "\n" +msgstr "" + +#: ../svn/svn.c:648 +msgid "" " If PATH is omitted, the basename of the URL will be used as\n" " the destination. If multiple URLs are given each will be checked\n" " out into a sub-directory of PATH, with the name of the sub-directory\n" " being the basename of the URL.\n" "\n" +msgstr "" + +#: ../svn/svn.c:653 +msgid "" " If --force is used, unversioned obstructing paths in the working\n" " copy destination do not automatically cause the check out to fail.\n" " If the obstructing path is the same type (file or directory) as the\n" @@ -14121,12 +14510,21 @@ msgid "" " to the working copy. All properties from the repository are applied\n" " to the obstructing path.\n" "\n" +msgstr "" + +#: ../svn/svn.c:664 +msgid "" " See also 'svn help update' for a list of possible characters\n" " reporting the action taken.\n" msgstr "" -#: ../svn/svn.c:628 -msgid "" +#: ../svn/svn.c:668 ../svn/svn.c:801 ../svn/svn.c:825 ../svn/svn.c:849 +#: ../svn/svn.c:1378 ../svn/svn.c:1922 ../svn/svn.c:1986 +msgid "obsolete; same as --depth=files" +msgstr "" + +#: ../svn/svn.c:671 +msgid "" "Either recover from an interrupted operation that left the working copy " "locked,\n" "or remove unwanted files.\n" @@ -14135,6 +14533,10 @@ msgid "" " cleanup --remove-ignored [WCPATH...]\n" " 3. cleanup --vacuum-pristines [WCPATH...]\n" "\n" +msgstr "" + +#: ../svn/svn.c:678 +msgid "" " 1. When none of the options --remove-unversioned, --remove-ignored, and\n" " --vacuum-pristines is specified, remove all write locks (shown as 'L' " "by\n" @@ -14143,47 +14545,75 @@ msgid "" "copy,\n" " leaving it in an unusable state.\n" "\n" +msgstr "" + +#: ../svn/svn.c:684 +msgid "" " WARNING: There is no mechanism that will protect write locks still\n" " being used by other Subversion clients. Running this command\n" " without any options while another client is using the working\n" " copy can corrupt the working copy beyond repair!\n" "\n" +msgstr "" + +#: ../svn/svn.c:689 +msgid "" " 2. If the --remove-unversioned option or the --remove-ignored option\n" " is given, remove any unversioned or ignored items within WCPATH.\n" " Note that the 'svn status' command shows unversioned items as '?',\n" " and ignored items as 'I' if the --no-ignore option is given to it.\n" "\n" +msgstr "" + +#: ../svn/svn.c:694 +msgid "" " 3. If the --vacuum-pristines option is given, remove pristine copies of\n" " files which are stored inside the .svn directory and which are no " "longer\n" " referenced by any file in the working copy.\n" msgstr "" -#: ../svn/svn.c:656 +#: ../svn/svn.c:700 msgid "deprecated and ignored" msgstr "" -#: ../svn/svn.c:659 +#: ../svn/svn.c:703 msgid "" "Send changes from your working copy to the repository.\n" "usage: commit [PATH...]\n" "\n" +msgstr "" + +#: ../svn/svn.c:706 +msgid "" " A log message must be provided, but it can be empty. If it is not\n" " given by a --message or --file option, an editor will be started.\n" "\n" +msgstr "" + +#: ../svn/svn.c:709 +msgid "" " If any targets are (or contain) locked items, those will be\n" " unlocked after a successful commit, unless --no-unlock is given.\n" "\n" +msgstr "" + +#: ../svn/svn.c:712 +msgid "" " If --include-externals is given, also commit file and directory\n" " externals reached by recursion. Do not commit externals with a\n" " fixed revision.\n" msgstr "" -#: ../svn/svn.c:675 +#: ../svn/svn.c:721 msgid "" "Copy files and directories in a working copy or repository.\n" "usage: copy SRC[@REV]... DST\n" "\n" +msgstr "" + +#: ../svn/svn.c:724 +msgid "" " SRC and DST can each be either a working copy (WC) path or URL:\n" " WC -> WC: copy and schedule for addition (with history)\n" " WC -> URL: immediately commit a copy of WC to URL\n" @@ -14193,6 +14623,10 @@ msgid "" " the sources will be added as children of DST. When copying multiple\n" " sources, DST must be an existing directory.\n" "\n" +msgstr "" + +#: ../svn/svn.c:733 +msgid "" " WARNING: For compatibility with previous versions of Subversion,\n" " copies performed using two working copy paths (WC -> WC) will not\n" " contact the repository. As such, they may not, by default, be able\n" @@ -14200,12 +14634,16 @@ msgid "" " to the destination.\n" msgstr "" -#: ../svn/svn.c:696 +#: ../svn/svn.c:743 msgid "" "Remove files and directories from version control.\n" "usage: 1. delete PATH...\n" " 2. delete URL...\n" "\n" +msgstr "" + +#: ../svn/svn.c:747 +msgid "" " 1. Each item specified by a PATH is scheduled for deletion upon\n" " the next commit. Files, and directories that have not been\n" " committed, are immediately removed from the working copy\n" @@ -14213,11 +14651,15 @@ msgid "" " PATHs that are, or contain, unversioned or modified items will\n" " not be removed unless the --force or --keep-local option is given.\n" "\n" +msgstr "" + +#: ../svn/svn.c:754 +msgid "" " 2. Each item specified by a URL is deleted from the repository\n" " via an immediate commit.\n" msgstr "" -#: ../svn/svn.c:712 +#: ../svn/svn.c:760 msgid "" "Display local changes or differences between two revisions or paths.\n" "usage: 1. diff\n" @@ -14229,8 +14671,16 @@ msgid "" " 5. diff OLD-URL[@OLDREV] NEW-PATH[@NEWREV]\n" " 6. diff OLD-PATH[@OLDREV] NEW-URL[@NEWREV]\n" "\n" +msgstr "" + +#: ../svn/svn.c:769 +msgid "" " 1. Use just 'svn diff' to display local modifications in a working copy.\n" "\n" +msgstr "" + +#: ../svn/svn.c:771 +msgid "" " 2. Display the changes made to TARGETs as they are seen in REV between\n" " two revisions. TARGETs may be all working copy paths or all URLs.\n" " If TARGETs are working copy paths, N defaults to BASE and M to the\n" @@ -14238,6 +14688,10 @@ msgid "" " The '-c M' option is equivalent to '-r N:M' where N = M-1.\n" " Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n" "\n" +msgstr "" + +#: ../svn/svn.c:778 +msgid "" " 3. Display the differences between OLD-TGT as it was seen in OLDREV and\n" " NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n" " OLD-TGT and NEW-TGT and restrict the output to differences for those\n" @@ -14248,11 +14702,19 @@ msgid "" " If OLDREV or NEWREV are not specified, they default to WORKING for\n" " working copy targets and to HEAD for URL targets.\n" "\n" +msgstr "" + +#: ../svn/svn.c:787 +msgid "" " Either or both OLD-TGT and NEW-TGT may also be paths to unversioned\n" " targets. Revisions cannot be specified for unversioned targets.\n" " Both targets must be of the same node kind (file or directory).\n" " Diffing unversioned targets against URL targets is not supported.\n" "\n" +msgstr "" + +#: ../svn/svn.c:792 +msgid "" " 4. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n" " 5. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-" "PATH[@NEWREV]'\n" @@ -14260,17 +14722,25 @@ msgid "" "URL[@NEWREV]'\n" msgstr "" -#: ../svn/svn.c:753 +#: ../svn/svn.c:804 msgid "" "Create an unversioned copy of a tree.\n" "usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n" " 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n" "\n" +msgstr "" + +#: ../svn/svn.c:808 +msgid "" " 1. Exports a clean directory tree from the repository specified by\n" " URL, at revision REV if it is given, otherwise at HEAD, into\n" " PATH. If PATH is omitted, the last component of the URL is used\n" " for the local directory name.\n" "\n" +msgstr "" + +#: ../svn/svn.c:813 +msgid "" " 2. Exports a clean directory tree from the working copy specified by\n" " PATH1, at revision REV if it is given, otherwise at WORKING, into\n" " PATH2. If PATH2 is omitted, the last component of the PATH1 is used\n" @@ -14278,21 +14748,33 @@ msgid "" " changes will be preserved. Files not under version control will\n" " not be copied.\n" "\n" +msgstr "" + +#: ../svn/svn.c:820 ../svnbench/svnbench.c:246 +msgid "" " If specified, PEGREV determines in which revision the target is first\n" " looked up.\n" msgstr "" -#: ../svn/svn.c:775 ../svnbench/svnbench.c:212 +#: ../svn/svn.c:828 ../svnbench/svnbench.c:212 msgid "" "Describe the usage of this program or its subcommands.\n" "usage: help [SUBCOMMAND...]\n" msgstr "" -#: ../svn/svn.c:781 +#: ../svn/svn.c:832 +msgid "also show experimental subcommands and options" +msgstr "" + +#: ../svn/svn.c:836 msgid "" "Commit an unversioned file or tree into the repository.\n" "usage: import [PATH] URL\n" "\n" +msgstr "" + +#: ../svn/svn.c:839 +msgid "" " Recursively commit a copy of PATH to URL.\n" " If PATH is omitted '.' is assumed.\n" " Parent directories are created as necessary in the repository.\n" @@ -14302,66 +14784,91 @@ msgid "" " if --force is specified.\n" msgstr "" -#: ../svn/svn.c:795 +#: ../svn/svn.c:852 msgid "" "Display information about a local or remote item.\n" "usage: info [TARGET[@REV]...]\n" "\n" +msgstr "" + +#: ../svn/svn.c:855 +msgid "" " Print information about each TARGET (default: '.').\n" " TARGET may be either a working-copy path or a URL. If specified, REV\n" " determines in which revision the target is first looked up; the default\n" " is HEAD for a URL or BASE for a WC path.\n" "\n" +msgstr "" + +#: ../svn/svn.c:860 +msgid "" " With --show-item, print only the value of one item of information\n" " about TARGET.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:863 +msgid "" +" EXPERIMENTAL:\n" +" With --x-viewspec, print the working copy layout.\n" msgstr "" -#: ../svn/svn.c:812 +#: ../svn/svn.c:869 +msgid "" +"show file sizes with base-2 unit suffixes\n" +" (Byte, Kilobyte, Megabyte, Gigabyte, Terabyte\n" +" and Petabyte), limiting the number of digits\n" +" to three or less" +msgstr "" + +#: ../svn/svn.c:880 msgid "" "List directory entries in the repository.\n" "usage: list [TARGET[@REV]...]\n" "\n" +msgstr "" + +#: ../svn/svn.c:883 ../svnbench/svnbench.c:255 +msgid "" " List each TARGET file and the contents of each TARGET directory as\n" " they exist in the repository. If TARGET is a working copy path, the\n" " corresponding repository URL will be used. If specified, REV determines\n" " in which revision the target is first looked up.\n" "\n" +msgstr "" + +#: ../svn/svn.c:888 ../svnbench/svnbench.c:260 +msgid "" " The default TARGET is '.', meaning the repository URL of the current\n" " working directory.\n" "\n" +msgstr "" + +#: ../svn/svn.c:893 +msgid "" " Multiple --search patterns may be specified and the output will be\n" " reduced to those paths whose last segment - i.e. the file or directory\n" " name - contains a sub-string matching at least one of these patterns\n" " (Windows only).\n" "\n" -" With --verbose, the following fields will be shown for each item:\n" -"\n" -" Revision number of the last commit\n" -" Author of the last commit\n" -" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n" -" Size (in bytes)\n" -" Date and time of the last commit\n" msgstr "" -#: ../svn/svn.c:837 +#: ../svn/svn.c:900 msgid "" -"List directory entries in the repository.\n" -"usage: list [TARGET[@REV]...]\n" -"\n" -" List each TARGET file and the contents of each TARGET directory as\n" -" they exist in the repository. If TARGET is a working copy path, the\n" -" corresponding repository URL will be used. If specified, REV determines\n" -" in which revision the target is first looked up.\n" -"\n" -" The default TARGET is '.', meaning the repository URL of the current\n" -" working directory.\n" -"\n" " Multiple --search patterns may be specified and the output will be\n" " reduced to those paths whose last segment - i.e. the file or directory\n" " name - matches at least one of these patterns.\n" "\n" +msgstr "" + +#: ../svn/svn.c:906 +msgid "" " With --verbose, the following fields will be shown for each item:\n" "\n" +msgstr "" + +#: ../svn/svn.c:908 ../svnbench/svnbench.c:265 +msgid "" " Revision number of the last commit\n" " Author of the last commit\n" " If locked, the letter 'O'. (Use 'svn info URL' to see details)\n" @@ -14369,53 +14876,80 @@ msgid "" " Date and time of the last commit\n" msgstr "" -#: ../svn/svn.c:864 +#: ../svn/svn.c:916 +msgid "" +"with --verbose, show file sizes with base-2\n" +" unit suffixes (Byte, Kilobyte, Megabyte,\n" +" Gigabyte, Terabyte and Petabyte), limiting\n" +" the number of digits to three or less" +msgstr "" + +#: ../svn/svn.c:925 msgid "" "Lock working copy paths or URLs in the repository, so that\n" "no other user can commit changes to them.\n" "usage: lock TARGET...\n" "\n" -" Use --force to steal a lock from another user or working copy.\n" msgstr "" -#: ../svn/svn.c:870 +#: ../svn/svn.c:929 +msgid " Use --force to steal a lock from another user or working copy.\n" +msgstr "" + +#: ../svn/svn.c:932 msgid "read lock comment from file ARG" msgstr "" -#: ../svn/svn.c:871 +#: ../svn/svn.c:933 msgid "specify lock comment ARG" msgstr "" -#: ../svn/svn.c:872 +#: ../svn/svn.c:934 msgid "force validity of lock comment source" msgstr "" -#: ../svn/svn.c:873 +#: ../svn/svn.c:935 msgid "steal locks" msgstr "" -#: ../svn/svn.c:876 +#: ../svn/svn.c:938 msgid "" "Show the log messages for a set of revision(s) and/or path(s).\n" "usage: 1. log [PATH][@REV]\n" " 2. log URL[@REV] [PATH...]\n" "\n" +msgstr "" + +#: ../svn/svn.c:942 +msgid "" " 1. Print the log messages for the URL corresponding to PATH\n" " (default: '.'). If specified, REV is the revision in which the\n" " URL is first looked up, and the default revision range is REV:1.\n" " If REV is not specified, the default revision range is BASE:1,\n" " since the URL might not exist in the HEAD revision.\n" "\n" +msgstr "" + +#: ../svn/svn.c:948 +msgid "" " 2. Print the log messages for the PATHs (default: '.') under URL.\n" " If specified, REV is the revision in which the URL is first\n" " looked up, and the default revision range is REV:1; otherwise,\n" " the URL is looked up in HEAD, and the default revision range is\n" " HEAD:1.\n" "\n" +msgstr "" + +#: ../svn/svn.c:954 ../svnbench/svnbench.c:290 +msgid "" " Multiple '-c' or '-r' options may be specified (but not a\n" " combination of '-c' and '-r' options), and mixing of forward and\n" " reverse ranges is allowed.\n" "\n" +msgstr "" + +#: ../svn/svn.c:958 +msgid "" " With -v, also print all affected paths with each log message.\n" " Each changed path is preceded with a symbol describing the change:\n" " A: The path was added or copied.\n" @@ -14428,17 +14962,33 @@ msgid "" " the old path will be listed as deleted and the new path will be listed\n" " as copied from the old path at a prior revision.\n" "\n" +msgstr "" + +#: ../svn/svn.c:970 +msgid "" " With -q, don't print the log message body itself (note that this is\n" " compatible with -v).\n" "\n" +msgstr "" + +#: ../svn/svn.c:973 +msgid "" " Each log message is printed just once, even if more than one of the\n" " affected paths for that revision were explicitly requested. Logs\n" " follow copy history by default. Use --stop-on-copy to disable this\n" " behavior, which can be useful for determining branchpoints.\n" "\n" +msgstr "" + +#: ../svn/svn.c:978 +msgid "" " The --depth option is only valid in combination with the --diff option\n" " and limits the scope of the displayed diff to the specified depth.\n" "\n" +msgstr "" + +#: ../svn/svn.c:981 +msgid "" " If the --search option is used, log messages are displayed only if the\n" " provided search pattern matches any of the author, date, log message\n" " text (unless --quiet is used), or, if the --verbose option is also\n" @@ -14456,32 +15006,72 @@ msgid "" " number of log messages searched, rather than restricting the output\n" " to a particular number of matching log messages.\n" "\n" +msgstr "" + +#: ../svn/svn.c:998 +msgid "" " Examples:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1000 +msgid "" " Show the latest 5 log messages for the current working copy\n" " directory and display paths changed in each commit:\n" " svn log -l 5 -v\n" "\n" +msgstr "" + +#: ../svn/svn.c:1004 +msgid "" " Show the log for bar.c as of revision 42:\n" " svn log bar.c@42\n" "\n" +msgstr "" + +#: ../svn/svn.c:1007 +msgid "" " Show log messages and diffs for each commit to foo.c:\n" " svn log --diff http://www.example.com/repo/project/foo.c\n" " (Because the above command uses a full URL it does not require\n" " a working copy.)\n" "\n" +msgstr "" + +#: ../svn/svn.c:1012 +msgid "" " Show log messages for the children foo.c and bar.c of the directory\n" " '/trunk' as it appeared in revision 50, using the ^/ URL shortcut:\n" " svn log ^/trunk@50 foo.c bar.c\n" "\n" +msgstr "" + +#: ../svn/svn.c:1016 +msgid "" " Show the log messages for any incoming changes to foo.c during the\n" " next 'svn update':\n" " svn log -r BASE:HEAD foo.c\n" "\n" +msgstr "" + +#: ../svn/svn.c:1020 +msgid "" " Show the log message for the revision in which /branches/foo\n" " was created:\n" " svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo\n" "\n" +msgstr "" + +#: ../svn/svn.c:1024 +msgid "" +" Show all log messages for commits between the tags ^/tags/2.0 and\n" +" ^/tags/3.0; assuming that tag 2.0 was created in revision 100:\n" +" svn log -rHEAD:100 ^/tags/3.0\n" +"\n" +msgstr "" + +#: ../svn/svn.c:1028 +msgid "" " If ^/trunk/foo.c was moved to ^/trunk/bar.c' in revision 22, 'svn log -" "v'\n" " shows a deletion and a copy in its changed paths list, such as:\n" @@ -14489,26 +15079,26 @@ msgid "" " A /trunk/bar.c (from /trunk/foo.c:21)\n" msgstr "" -#: ../svn/svn.c:970 ../svnbench/svnbench.c:300 +#: ../svn/svn.c:1037 ../svnbench/svnbench.c:305 msgid "retrieve revision property ARG" msgstr "" -#: ../svn/svn.c:971 ../svnbench/svnbench.c:301 +#: ../svn/svn.c:1038 ../svnbench/svnbench.c:306 msgid "the change made in revision ARG" msgstr "" -#: ../svn/svn.c:972 +#: ../svn/svn.c:1039 msgid "also print all affected paths" msgstr "" -#: ../svn/svn.c:973 +#: ../svn/svn.c:1040 msgid "do not print the log message" msgstr "" #. For this large section, let's keep it unindented for easier #. * viewing/editing. It has been vim-treated with a textwidth=75 and 'gw' #. * (with quotes and newlines removed). -#: ../svn/svn.c:979 +#: ../svn/svn.c:1046 msgid "" "Merge changes into a working copy.\n" "usage: 1. merge SOURCE[@REV] [TARGET_WCPATH]\n" @@ -14518,17 +15108,33 @@ msgid "" " 3. merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" " (the '2-URL' merge)\n" "\n" +msgstr "" + +#: ../svn/svn.c:1054 +msgid "" " 1. This form, with one source path and no revision range, is called\n" " a 'complete' merge:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1057 +msgid "" " svn merge SOURCE[@REV] [TARGET_WCPATH]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1059 +msgid "" " The complete merge is used for the 'sync' and 'reintegrate' merges\n" " in the 'feature branch' pattern described below. It finds all the\n" " changes on the source branch that have not already been merged to the\n" " target branch, and merges them into the working copy. Merge tracking\n" " is used to know which changes have already been merged.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1065 +msgid "" " SOURCE specifies the branch from where the changes will be pulled, and\n" " TARGET_WCPATH specifies a working copy of the target branch to which\n" " the changes will be applied. Normally SOURCE and TARGET_WCPATH should\n" @@ -14536,6 +15142,10 @@ msgid "" " subtree, then the subtree path must be included in both SOURCE and\n" " TARGET_WCPATH; this is discouraged, to avoid subtree mergeinfo.)\n" "\n" +msgstr "" + +#: ../svn/svn.c:1072 +msgid "" " SOURCE is usually a URL. The optional '@REV' specifies both the peg\n" " revision of the URL and the latest revision that will be considered\n" " for merging; if REV is not specified, the HEAD revision is assumed. If\n" @@ -14543,28 +15153,60 @@ msgid "" " used, and the default value of 'REV' is the base revision (usually the\n" " revision last updated to).\n" "\n" +msgstr "" + +#: ../svn/svn.c:1079 +msgid "" " TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" " assumed. There are some special cases:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1082 +msgid "" " - If SOURCE is a URL:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1084 +msgid "" " - If the basename of the URL and the basename of '.' are the\n" " same, then the differences are applied to '.'. Otherwise,\n" " if a file with the same basename as that of the URL is found\n" " within '.', then the differences are applied to that file.\n" " In all other cases, the target defaults to '.'.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1090 +msgid "" " - If SOURCE is a working copy path:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1092 +msgid "" " - If the source is a file, then differences are applied to that\n" " file (useful for reverse-merging earlier changes). Otherwise,\n" " if the source is a directory, then the target defaults to '.'.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1096 +msgid "" " In normal usage the working copy should be up to date, at a single\n" " revision, with no local modifications and no switched subtrees.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1099 +msgid "" " - The 'Feature Branch' Merging Pattern -\n" "\n" +msgstr "" + +#: ../svn/svn.c:1101 +msgid "" " In this commonly used work flow, known also as the 'development\n" " branch' pattern, a developer creates a branch and commits a series of\n" " changes that implement a new feature. The developer periodically\n" @@ -14573,16 +15215,28 @@ msgid "" " complete, the developer performs a merge from the feature branch to\n" " the parent branch to re-integrate the changes.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1109 +msgid "" " parent --+----------o------o-o-------------o--\n" " \\ \\ \\ /\n" " \\ merge merge merge\n" " \\ \\ \\ /\n" " feature +--o-o-------o----o-o----o-------\n" "\n" +msgstr "" + +#: ../svn/svn.c:1115 +msgid "" " A merge from the parent branch to the feature branch is called a\n" " 'sync' or 'catch-up' merge, and a merge from the feature branch to the\n" " parent branch is called a 'reintegrate' merge.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1119 +msgid "" " - Sync Merge Example -\n" " ............\n" " . .\n" @@ -14593,6 +15247,10 @@ msgid "" " feature +------------------------o-----\n" " r100 r200\n" "\n" +msgstr "" + +#: ../svn/svn.c:1129 +msgid "" " Subversion will locate all the changes on 'trunk' that have not yet\n" " been merged into the 'feature' branch. In this case that is a single\n" " range, r100:200. In the diagram above, L marks the left side " @@ -14602,23 +15260,47 @@ msgid "" " path. In this case, the working copy is a clean checkout of the entire\n" " 'feature' branch.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1137 +msgid "" " To perform this sync merge, have a clean working copy of the feature\n" " branch and run the following command in its top-level directory:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1140 +msgid "" " svn merge ^/trunk\n" "\n" +msgstr "" + +#: ../svn/svn.c:1142 +msgid "" " Note that the merge is now only in your local working copy and still\n" " needs to be committed to the repository so that it can be seen by\n" " others. You can review the changes and you may have to resolve\n" " conflicts before you commit the merge.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1147 +msgid "" " - Reintegrate Merge Example -\n" "\n" +msgstr "" + +#: ../svn/svn.c:1149 +msgid "" " The feature branch was last synced with trunk up to revision X. So the\n" " difference between trunk@X and feature@HEAD contains the complete set\n" " of changes that implement the feature, and no other changes. These\n" " changes are applied to trunk.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1154 +msgid "" " rW rX\n" " trunk ------+--------------------L------------------o\n" " \\ . ^\n" @@ -14626,57 +15308,108 @@ msgid "" " \\ . /\n" " feature +--------------------------------R\n" "\n" +msgstr "" + +#: ../svn/svn.c:1161 +msgid "" " In the diagram above, L marks the left side (trunk@X) and R marks the\n" " right side (feature@HEAD) of the merge. The difference between the\n" " left and right side is merged into trunk, the target.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1165 +msgid "" " To perform the merge, have a clean working copy of trunk and run the\n" " following command in its top-level directory:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1168 +msgid "" " svn merge ^/feature\n" "\n" +msgstr "" + +#: ../svn/svn.c:1170 +msgid "" " To prevent unnecessary merge conflicts, a reintegrate merge requires\n" " that TARGET_WCPATH is not a mixed-revision working copy, has no local\n" " modifications, and has no switched subtrees.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1174 +msgid "" " A reintegrate merge also requires that the source branch is coherently\n" " synced with the target -- in the above example, this means that all\n" " revisions between the branch point W and the last merged revision X\n" " are merged to the feature branch, so that there are no unmerged\n" " revisions in-between.\n" "\n" -"\n" +msgstr "" + +#: ../svn/svn.c:1181 +msgid "" " 2. This form is called a 'cherry-pick' merge:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1183 +msgid "" " svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1185 +msgid "" " A cherry-pick merge is used to merge specific revisions (or revision\n" " ranges) from one branch to another. By default, this uses merge\n" " tracking to automatically skip any revisions that have already been\n" " merged to the target; you can use the --ignore-ancestry option to\n" " disable such skipping.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1191 +msgid "" " SOURCE is usually a URL. The optional '@REV' specifies only the peg\n" " revision of the URL and does not affect the merge range; if REV is not\n" " specified, the HEAD revision is assumed. If SOURCE is a working copy\n" " path, the corresponding URL of the path is used, and the default value\n" " of 'REV' is the base revision (usually the revision last updated to).\n" "\n" +msgstr "" + +#: ../svn/svn.c:1197 ../svn/svn.c:1268 +msgid "" " TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" " assumed. The special cases noted above in the 'complete' merge form\n" " also apply here.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1201 +msgid "" " The revision ranges to be merged are specified by the '-r' and/or '-c'\n" " options. '-r N:M' refers to the difference in the history of the\n" " source branch between revisions N and M. You can use '-c M' to merge\n" " single revisions: '-c M' is equivalent to '-r :M'. Each such\n" " difference is applied to TARGET_WCPATH.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1207 +msgid "" " If the mergeinfo in TARGET_WCPATH indicates that revisions within the\n" " range were already merged, changes made in those revisions are not\n" " merged again. If needed, the range is broken into multiple sub-ranges,\n" " and each sub-range is merged separately.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1212 +msgid "" " A 'reverse range' can be used to undo changes. For example, when\n" " source and target refer to the same branch, a previously committed\n" " revision can be 'undone'. In a reverse range, N is greater than M in\n" @@ -14684,14 +15417,30 @@ msgid "" " is equivalent to '-r M:'. Undoing changes like this is also known\n" " as performing a 'reverse merge'.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1219 +msgid "" " Multiple '-c' and/or '-r' options may be specified and mixing of\n" " forward and reverse ranges is allowed.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1222 +msgid "" " - Cherry-pick Merge Example -\n" "\n" +msgstr "" + +#: ../svn/svn.c:1224 +msgid "" " A bug has been fixed on trunk in revision 50. This fix needs to\n" " be merged from trunk onto the release branch.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1227 +msgid "" " 1.x-release +-----------------------o-----\n" " / ^\n" " / |\n" @@ -14699,33 +15448,72 @@ msgid "" " trunk ------+--------------------------LR-----\n" " r50\n" "\n" +msgstr "" + +#: ../svn/svn.c:1234 +msgid "" " In the above diagram, L marks the left side (trunk@49) and R marks the\n" " right side (trunk@50) of the merge. The difference between the left\n" " and right side is applied to the target working copy path.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1238 +msgid "" " Note that the difference between revision 49 and 50 is exactly those\n" " changes that were committed in revision 50, not including changes\n" " committed in revision 49.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1242 +msgid "" " To perform the merge, have a clean working copy of the release branch\n" " and run the following command in its top-level directory; remember\n" " that the default target is '.':\n" "\n" +msgstr "" + +#: ../svn/svn.c:1246 +msgid "" " svn merge -c50 ^/trunk\n" "\n" +msgstr "" + +#: ../svn/svn.c:1248 +msgid "" " You can also cherry-pick several revisions and/or revision ranges:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1250 +msgid "" " svn merge -c50,54,60 -r65:68 ^/trunk\n" "\n" -"\n" +msgstr "" + +#: ../svn/svn.c:1253 +msgid "" " 3. This form is called a '2-URL merge':\n" "\n" +msgstr "" + +#: ../svn/svn.c:1255 +msgid "" " svn merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1257 +msgid "" " You should use this merge variant only if the other variants do not\n" " apply to your situation, as this variant can be quite complex to\n" " master.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1261 +msgid "" " Two source URLs are specified, identifying two trees on the same\n" " branch or on different branches. The trees are compared and the\n" " difference from SOURCE1@REV1 to SOURCE2@REV2 is applied to the\n" @@ -14733,23 +15521,39 @@ msgid "" " branch may be the same as one or both sources, or different again.\n" " The three branches involved can be completely unrelated.\n" "\n" -" TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" -" assumed. The special cases noted above in the 'complete' merge form\n" -" also apply here.\n" -"\n" +msgstr "" + +#: ../svn/svn.c:1272 +msgid "" " SOURCE1 and/or SOURCE2 can also be specified as a working copy path,\n" " in which case the merge source URL is derived from the working copy.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1275 +msgid "" " - 2-URL Merge Example -\n" "\n" +msgstr "" + +#: ../svn/svn.c:1277 +msgid "" " Two features have been developed on separate branches called 'foo' and\n" " 'bar'. It has since become clear that 'bar' should be combined with\n" " the 'foo' branch for further development before reintegration.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1281 +msgid "" " Although both feature branches originate from trunk, they are not\n" " directly related -- one is not a direct copy of the other. A 2-URL\n" " merge is necessary.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1285 +msgid "" " The 'bar' branch has been synced with trunk up to revision 500.\n" " (If this revision number is not known, it can be located using the\n" " 'svn log' and/or 'svn mergeinfo' commands.)\n" @@ -14757,6 +15561,10 @@ msgid "" " set of changes related to feature 'bar', and no other changes. These\n" " changes are applied to the 'foo' branch.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1292 +msgid "" " foo +-----------------------------------o\n" " / ^\n" " / /\n" @@ -14767,40 +15575,83 @@ msgid "" " \\ . /\n" " bar +-----------------------------------R\n" "\n" +msgstr "" + +#: ../svn/svn.c:1302 +msgid "" " In the diagram above, L marks the left side (trunk@500) and R marks\n" " the right side (bar@HEAD) of the merge. The difference between the\n" " left and right side is applied to the target working copy path, in\n" " this case a working copy of the 'foo' branch.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1307 +msgid "" " To perform the merge, have a clean working copy of the 'foo' branch\n" " and run the following command in its top-level directory:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1310 +msgid "" " svn merge ^/trunk@500 ^/bar\n" "\n" +msgstr "" + +#: ../svn/svn.c:1312 +msgid "" " The exact changes applied by a 2-URL merge can be previewed with svn's\n" " diff command, which is a good idea to verify if you do not have the\n" " luxury of a clean working copy to merge to. In this case:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1316 +msgid "" " svn diff ^/trunk@500 ^/bar@HEAD\n" "\n" -"\n" +msgstr "" + +#: ../svn/svn.c:1319 +msgid "" " The following applies to all types of merges:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1321 +msgid "" " To prevent unnecessary merge conflicts, svn merge requires that\n" " TARGET_WCPATH is not a mixed-revision working copy. Running 'svn update'\n" " before starting a merge ensures that all items in the working copy are\n" " based on the same revision.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1326 +msgid "" " If possible, you should have no local modifications in the merge's target\n" " working copy prior to the merge, to keep things simpler. It will be\n" " easier to revert the merge and to understand the branch's history.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1330 +msgid "" " Switched sub-paths should also be avoided during merging, as they may\n" " cause incomplete merges and create subtree mergeinfo.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1333 +msgid "" " For each merged item a line will be printed with characters reporting the\n" " action taken. These characters have the following meaning:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1336 ../svn/svn.c:1944 +msgid "" " A Added\n" " D Deleted\n" " U Updated\n" @@ -14809,14 +15660,26 @@ msgid "" " E Existed\n" " R Replaced\n" "\n" +msgstr "" + +#: ../svn/svn.c:1344 +msgid "" " Characters in the first column report about the item itself.\n" " Characters in the second column report about properties of the item.\n" " A 'C' in the third column indicates a tree conflict, while a 'C' in\n" " the first and second columns indicate textual conflicts in files\n" " and in property values, respectively.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1350 +msgid "" " - Merge Tracking -\n" "\n" +msgstr "" + +#: ../svn/svn.c:1352 +msgid "" " Subversion uses the svn:mergeinfo property to track merge history. This\n" " property is considered at the start of a merge to determine what to merge\n" " and it is updated at the conclusion of the merge to describe the merge\n" @@ -14826,11 +15689,23 @@ msgid "" " other). This is verified and enforced when using sync merges and\n" " reintegrate merges.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1361 +msgid "" " The --ignore-ancestry option prevents merge tracking and thus ignores\n" " mergeinfo, neither considering it nor recording it.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1364 +msgid "" " - Merging from foreign repositories -\n" "\n" +msgstr "" + +#: ../svn/svn.c:1366 +msgid "" " Subversion does support merging from foreign repositories.\n" " While all merge source URLs must point to the same repository, the merge\n" " target working copy may come from a different repository than the source.\n" @@ -14840,16 +15715,20 @@ msgid "" " repositories.\n" msgstr "" -#: ../svn/svn.c:1309 +#: ../svn/svn.c:1377 msgid "force deletions even if deleted contents don't match" msgstr "" -#: ../svn/svn.c:1313 +#: ../svn/svn.c:1382 msgid "" "Display merge-related information.\n" "usage: 1. mergeinfo SOURCE[@REV] [TARGET[@REV]]\n" " 2. mergeinfo --show-revs=WHICH SOURCE[@REV] [TARGET[@REV]]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1386 +msgid "" " 1. Summarize the history of merging between SOURCE and TARGET. The graph\n" " shows, from left to right:\n" " the youngest common ancestor of the branches;\n" @@ -14857,48 +15736,83 @@ msgid "" " that will be used for the next complete merge;\n" " the repository path and revision number of the tip of each branch.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1393 +msgid "" " 2. Print the revision numbers on SOURCE that have been merged to TARGET\n" " (with --show-revs=merged), or that have not been merged to TARGET\n" " (with --show-revs=eligible). Print only revisions in which there was\n" " at least one change in SOURCE.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1398 +msgid "" " If --revision (-r) is provided, filter the displayed information to\n" " show only that which is associated with the revisions within the\n" " specified range. Revision numbers, dates, and the 'HEAD' keyword are\n" " valid range values.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1403 +msgid "" " SOURCE and TARGET are the source and target branch URLs, respectively.\n" " (If a WC path is given, the corresponding base URL is used.) The default\n" " TARGET is the current working directory ('.'). REV specifies the revision\n" " to be considered the tip of the branch; the default for SOURCE is HEAD,\n" " and the default for TARGET is HEAD for a URL or BASE for a WC path.\n" "\n" -" The depth can be 'empty' or 'infinity'; the default is 'empty'.\n" msgstr "" -#: ../svn/svn.c:1345 +#: ../svn/svn.c:1409 +msgid " The depth can be 'empty' or 'infinity'; the default is 'empty'.\n" +msgstr "" + +#: ../svn/svn.c:1415 msgid "" "Create a new directory under version control.\n" "usage: 1. mkdir PATH...\n" " 2. mkdir URL...\n" "\n" +msgstr "" + +#: ../svn/svn.c:1419 +msgid "" " Create version controlled directories.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1421 +msgid "" " 1. Each directory specified by a working copy PATH is created locally\n" " and scheduled for addition upon the next commit.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1424 +msgid "" " 2. Each directory specified by a URL is created in the repository via\n" " an immediate commit.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1427 +msgid "" " In both cases, all the intermediate directories must already exist,\n" " unless the --parents option is given.\n" msgstr "" -#: ../svn/svn.c:1362 +#: ../svn/svn.c:1433 msgid "" "Move (rename) an item in a working copy or repository.\n" "usage: move SRC... DST\n" "\n" +msgstr "" + +#: ../svn/svn.c:1436 +msgid "" " SRC and DST can both be working copy (WC) paths or URLs:\n" " WC -> WC: move an item in a working copy, as a local change to\n" " be committed later (with or without further changes)\n" @@ -14908,6 +15822,10 @@ msgid "" " the sources will be added as children of DST. When moving multiple\n" " sources, DST must be an existing directory.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1445 +msgid "" " SRC and DST of WC -> WC moves must be committed in the same revision.\n" " Furthermore, WC -> WC moves will refuse to move a mixed-revision subtree.\n" " To avoid unnecessary conflicts, it is recommended to run 'svn update'\n" @@ -14916,19 +15834,31 @@ msgid "" "compatibility.\n" msgstr "" -#: ../svn/svn.c:1384 +#: ../svn/svn.c:1456 msgid "" "Apply a patch to a working copy.\n" "usage: patch PATCHFILE [WCPATH]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1459 +msgid "" " Apply a unidiff patch in PATCHFILE to the working copy WCPATH.\n" " If WCPATH is omitted, '.' is assumed.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1462 +msgid "" " A unidiff patch suitable for application to a working copy can be\n" " produced with the 'svn diff' command or third-party diffing tools.\n" " Any non-unidiff content of PATCHFILE is ignored, except for Subversion\n" " property diffs as produced by 'svn diff'.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1467 +msgid "" " Changes listed in the patch will either be applied or rejected.\n" " If a change does not match at its exact line offset, it may be applied\n" " earlier or later in the file if a match is found elsewhere for the\n" @@ -14938,23 +15868,43 @@ msgid "" " If no matching context can be found for a change, the change conflicts\n" " and will be written to a reject file with the extension .svnpatch.rej.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1476 +msgid "" " For each patched file a line will be printed with characters reporting\n" " the action taken. These characters have the following meaning:\n" "\n" +msgstr "" + +#: ../svn/svn.c:1479 +msgid "" " A Added\n" " D Deleted\n" " U Updated\n" " C Conflict\n" " G Merged (with local uncommitted changes)\n" "\n" +msgstr "" + +#: ../svn/svn.c:1485 +msgid "" " Changes applied with an offset or fuzz are reported on lines starting\n" " with the '>' symbol. You should review such changes carefully.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1488 +msgid "" " If the patch removes all content from a file, that file is scheduled\n" " for deletion. If the patch creates a new file, that file is scheduled\n" " for addition. Use 'svn revert' to undo deletions and additions you\n" " do not agree with.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1493 +msgid "" " Hint: If the patch file was created with Subversion, it will contain\n" " the number of a revision N the patch will cleanly apply to\n" " (look for lines like '--- foo/bar.txt (revision N)').\n" @@ -14963,99 +15913,140 @@ msgid "" " HEAD revision. This way, conflicts can be resolved interactively.\n" msgstr "" -#: ../svn/svn.c:1432 +#: ../svn/svn.c:1504 msgid "" "Remove a property from files, dirs, or revisions.\n" "usage: 1. propdel PROPNAME [PATH...]\n" " 2. propdel PROPNAME --revprop -r REV [TARGET]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1508 +msgid "" " 1. Removes versioned props in working copy.\n" " 2. Removes unversioned remote prop on repos revision.\n" " TARGET only determines which repository to access.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1512 ../svn/svn.c:1525 ../svn/svn.c:1549 ../svn/svn.c:1569 +msgid "" " See 'svn help propset' for descriptions of the svn:* special properties.\n" msgstr "" -#: ../svn/svn.c:1444 +#: ../svn/svn.c:1517 msgid "" "Edit a property with an external editor.\n" "usage: 1. propedit PROPNAME TARGET...\n" " 2. propedit PROPNAME --revprop -r REV [TARGET]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1521 +msgid "" " 1. Edits versioned prop in working copy or repository.\n" " 2. Edits unversioned remote prop on repos revision.\n" " TARGET only determines which repository to access.\n" "\n" -" See 'svn help propset' for descriptions of the svn:* special properties.\n" msgstr "" -#: ../svn/svn.c:1456 +#: ../svn/svn.c:1530 msgid "" "Print the value of a property on files, dirs, or revisions.\n" "usage: 1. propget PROPNAME [TARGET[@REV]...]\n" " 2. propget PROPNAME --revprop -r REV [TARGET]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1534 +msgid "" " 1. Prints versioned props. If specified, REV determines in which\n" " revision the target is first looked up.\n" " 2. Prints unversioned remote prop on repos revision.\n" " TARGET only determines which repository to access.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1539 +msgid "" " With --verbose, the target path and the property name are printed on\n" " separate lines before each value, like 'svn proplist --verbose'.\n" " Otherwise, if there is more than one TARGET or a depth other than\n" " 'empty', the target path is printed on the same line before each value.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1544 +msgid "" " By default, an extra newline is printed after the property value so that\n" " the output looks pretty. With a single TARGET, depth 'empty' and without\n" " --show-inherited-props, you can use the --no-newline option to disable " "this\n" " (useful when redirecting a binary property value to a file, for example).\n" "\n" -" See 'svn help propset' for descriptions of the svn:* special properties.\n" msgstr "" -#: ../svn/svn.c:1478 ../svn/svn.c:1497 +#: ../svn/svn.c:1553 ../svn/svn.c:1573 msgid "print path, name and value on separate lines" msgstr "" -#: ../svn/svn.c:1479 +#: ../svn/svn.c:1554 msgid "(deprecated; use --no-newline)" msgstr "" -#: ../svn/svn.c:1482 +#: ../svn/svn.c:1557 msgid "" "List all properties on files, dirs, or revisions.\n" "usage: 1. proplist [TARGET[@REV]...]\n" " 2. proplist --revprop -r REV [TARGET]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1561 +msgid "" " 1. Lists versioned props. If specified, REV determines in which\n" " revision the target is first looked up.\n" " 2. Lists unversioned remote props on repos revision.\n" " TARGET only determines which repository to access.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1566 +msgid "" " With --verbose, the property values are printed as well, like 'svn " "propget\n" " --verbose'. With --quiet, the paths are not printed.\n" "\n" -" See 'svn help propset' for descriptions of the svn:* special properties.\n" msgstr "" -#: ../svn/svn.c:1498 +#: ../svn/svn.c:1574 msgid "don't print the path" msgstr "" -#: ../svn/svn.c:1501 +#: ../svn/svn.c:1577 msgid "" "Set the value of a property on files, dirs, or revisions.\n" "usage: 1. propset PROPNAME PROPVAL PATH...\n" " 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1581 +msgid "" " 1. Changes a versioned file or directory property in a working copy.\n" " 2. Changes an unversioned property on a repository revision.\n" " (TARGET only determines which repository to access.)\n" "\n" +msgstr "" + +#: ../svn/svn.c:1585 +msgid "" " The value may be provided with the --file option instead of PROPVAL.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1587 +msgid "" " Property names starting with 'svn:' are reserved. Subversion recognizes\n" " the following special versioned properties on a file:\n" " svn:keywords - Keywords to be expanded. Valid keywords are:\n" @@ -15067,6 +16058,10 @@ msgid "" " Id - A compressed summary of the previous four.\n" " Header - Similar to Id but includes the full URL.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1598 +msgid "" " Custom keywords can be defined with a format string separated from\n" " the keyword name with '='. Valid format substitutions are:\n" " %a - The author of the revision given by %r.\n" @@ -15086,6 +16081,10 @@ msgid "" " Once a custom keyword has been defined for a file, it can be used\n" " within the file like any other keyword: $MyKeyword$\n" "\n" +msgstr "" + +#: ../svn/svn.c:1616 +msgid "" " svn:executable - If present, make the file executable. Use\n" " 'svn propdel svn:executable PATH...' to clear.\n" " svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n" @@ -15098,6 +16097,10 @@ msgid "" " when it is not locked. Use 'svn propdel svn:needs-lock PATH...'\n" " to clear.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1628 +msgid "" " Subversion recognizes the following special versioned properties on a\n" " directory:\n" " svn:ignore - A list of file glob patterns to ignore, one per " @@ -15141,52 +16144,88 @@ msgid "" " Lines starting with a '#' character are ignored.\n" msgstr "" -#: ../svn/svn.c:1588 +#: ../svn/svn.c:1665 msgid "read property value from file ARG" msgstr "" -#: ../svn/svn.c:1591 +#: ../svn/svn.c:1668 msgid "" "Relocate the working copy to point to a different repository root URL.\n" "usage: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n" " 2. relocate TO-URL [PATH]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1672 +msgid "" " Rewrite working copy URL metadata to reflect a syntactic change only.\n" " This is used when a repository's root URL changes (such as a scheme\n" " or hostname change) but your working copy still reflects the same\n" " directory within the same repository.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1677 +msgid "" " 1. FROM-PREFIX and TO-PREFIX are initial substrings of the working\n" " copy's current and new URLs, respectively. (You may specify the\n" " complete old and new URLs if you wish.) Use 'svn info' to determine\n" " the current working copy URL.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1682 +msgid "" " 2. TO-URL is the (complete) new repository URL to use for PATH.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1684 +msgid "" " Examples:\n" " svn relocate http:// svn:// project1 project2\n" " svn relocate http://www.example.com/repo/project \\\n" " svn://svn.example.com/repo/project\n" msgstr "" -#: ../svn/svn.c:1614 +#: ../svn/svn.c:1692 msgid "" "Resolve conflicts on working copy files or directories.\n" "usage: resolve [PATH...]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1695 +msgid "" " By default, perform interactive conflict resolution on PATH.\n" " In this mode, the command is recursive by default (depth 'infinity').\n" "\n" +msgstr "" + +#: ../svn/svn.c:1698 +msgid "" " The --accept=ARG option prevents interactive prompting and forces\n" " conflicts on PATH to be resolved in the manner specified by ARG.\n" " In this mode, the command is not recursive by default (depth 'empty').\n" "\n" +msgstr "" + +#: ../svn/svn.c:1702 +msgid "" " A conflicted path cannot be committed with 'svn commit' until it\n" " has been marked as resolved with 'svn resolve'.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1705 +msgid "" " Subversion knows three types of conflicts:\n" " Text conflicts, Property conflicts, and Tree conflicts.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1708 +msgid "" " Text conflicts occur when overlapping changes to file contents were\n" " made. Text conflicts are usually resolved by editing the conflicted\n" " file or by using a merge tool (which may be an external program).\n" @@ -15195,11 +16234,19 @@ msgid "" " only useful in situations where it is acceptable to discard local or\n" " incoming changes altogether.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1716 +msgid "" " Property conflicts are usually resolved by editing the value of the\n" " conflicted property (either from the interactive prompt, or with\n" " 'svn propedit'). As with text conflicts, options exist to edit a\n" " property automatically, discarding some changes in favour of others.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1721 +msgid "" " Tree conflicts occur when a change to the directory structure was\n" " made, and when this change cannot be applied to the working copy\n" " without affecting other changes (text changes, property changes,\n" @@ -15211,6 +16258,10 @@ msgid "" " It is recommended to use these automatic options whenever possible,\n" " rather than attempting manual tree conflict resolution.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1731 +msgid "" " If a tree conflict cannot be resolved automatically, it is recommended\n" " to figure out why the conflict occurred before attempting to resolve it.\n" " The 'svn log -v' command can be used to inspect structural changes\n" @@ -15225,47 +16276,67 @@ msgid "" " copied, deleted, or moved.\n" msgstr "" -#: ../svn/svn.c:1665 +#: ../svn/svn.c:1744 msgid "" "specify automatic conflict resolution source\n" " ('base', 'working', 'mine-conflict',\n" " 'theirs-conflict', 'mine-full', 'theirs-full')" msgstr "" -#: ../svn/svn.c:1672 +#: ../svn/svn.c:1751 msgid "" "Remove 'conflicted' state on working copy files or directories.\n" "usage: resolved PATH...\n" "\n" +msgstr "" + +#: ../svn/svn.c:1754 +msgid "" " Note: this subcommand does not semantically resolve conflicts or\n" " remove conflict markers; it merely removes the conflict-related\n" " artifact files and allows PATH to be committed again. It has been\n" " deprecated in favor of running 'svn resolve --accept working'.\n" msgstr "" -#: ../svn/svn.c:1682 +#: ../svn/svn.c:1762 msgid "" "Restore pristine working copy state (undo local changes).\n" "usage: revert PATH...\n" "\n" +msgstr "" + +#: ../svn/svn.c:1765 +msgid "" " Revert changes in the working copy at or within PATH, and remove\n" " conflict markers as well, if any.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1768 +msgid "" " This subcommand does not revert already committed changes.\n" " For information about undoing already committed changes, search\n" " the output of 'svn help merge' for 'undo'.\n" msgstr "" -#: ../svn/svn.c:1694 +#: ../svn/svn.c:1776 msgid "" "Print the status of working copy files and directories.\n" "usage: status [PATH...]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1779 +msgid "" " With no args, print only locally modified items (no network access).\n" " With -q, print only summary information about locally modified items.\n" " With -u, add working revision and server out-of-date information.\n" " With -v, print full revision information on every item.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1784 +msgid "" " The first seven columns in the output are each one character wide:\n" " First column: Says if item was added, deleted, or otherwise changed\n" " ' ' no modifications\n" @@ -15313,33 +16384,57 @@ msgid "" " If the item is a tree conflict victim, an additional line is printed\n" " after the item's status line, explaining the nature of the conflict.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1828 +msgid "" " The out-of-date information appears in the ninth column (with -u):\n" " '*' a newer revision exists on the server\n" " ' ' the working copy is up to date\n" "\n" +msgstr "" + +#: ../svn/svn.c:1832 +msgid "" " Remaining fields are variable width and delimited by spaces:\n" " The working revision (with -u or -v; '-' if the item is copied)\n" " The last committed revision and last committed author (with -v)\n" " The working copy path is always the final field, so it can\n" " include spaces.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1838 +msgid "" " The presence of a question mark ('?') where a working revision, last\n" " committed revision, or last committed author was expected indicates\n" " that the information is unknown or irrelevant given the state of the\n" " item (for example, when the item is the result of a copy operation).\n" " The question mark serves as a visual placeholder to facilitate parsing.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1844 +msgid "" " Example output:\n" " svn status wc\n" " M wc/bar.c\n" " A + wc/qax.c\n" "\n" +msgstr "" + +#: ../svn/svn.c:1849 +msgid "" " svn status -u wc\n" " M 965 wc/bar.c\n" " * 965 wc/foo.c\n" " A + - wc/qax.c\n" " Status against revision: 981\n" "\n" +msgstr "" + +#: ../svn/svn.c:1855 +msgid "" " svn status --show-updates --verbose wc\n" " M 965 938 kfogel wc/bar.c\n" " * 965 922 sussman wc/foo.c\n" @@ -15347,6 +16442,10 @@ msgid "" " 965 687 joe wc/zig.c\n" " Status against revision: 981\n" "\n" +msgstr "" + +#: ../svn/svn.c:1862 +msgid "" " svn status\n" " M wc/bar.c\n" " ! C wc/qaz.c\n" @@ -15354,22 +16453,34 @@ msgid "" " D wc/qax.c\n" msgstr "" -#: ../svn/svn.c:1787 -msgid "don't print unversioned items" +#: ../svn/svn.c:1870 +msgid "don't print unversioned items" +msgstr "" + +#: ../svn/svn.c:1871 +msgid "obsolete; same as --depth=immediates" msgstr "" -#: ../svn/svn.c:1790 +#: ../svn/svn.c:1874 msgid "" "Update the working copy to a different URL within the same repository.\n" "usage: 1. switch URL[@PEGREV] [PATH]\n" " 2. switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1878 +msgid "" " 1. Update the working copy to mirror a new URL within the repository.\n" " This behavior is similar to 'svn update', and is the way to\n" " move a working copy to a branch or tag within the same repository.\n" " If specified, PEGREV determines in which revision the target is first\n" " looked up.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1884 +msgid "" " If --force is used, unversioned obstructing paths in the working\n" " copy do not automatically cause a failure if the switch attempts to\n" " add the same path. If the obstructing path is the same type (file\n" @@ -15382,19 +16493,39 @@ msgid "" " modification to the working copy. All properties from the repository\n" " are applied to the obstructing path.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1895 +msgid "" " Use the --set-depth option to set a new working copy depth on the\n" " targets of this operation.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1898 +msgid "" " By default, Subversion will refuse to switch a working copy path to\n" " a new URL with which it shares no common version control ancestry.\n" " Use the '--ignore-ancestry' option to override this sanity check.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1902 +msgid "" " 2. The '--relocate' option is deprecated. This syntax is equivalent to\n" " 'svn relocate FROM-PREFIX TO-PREFIX [PATH]'.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1905 +msgid "" " See also 'svn help update' for a list of possible characters\n" " reporting the action taken.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1908 +msgid "" " Examples:\n" " svn switch ^/branches/1.x-release\n" " svn switch --relocate http:// svn://\n" @@ -15402,49 +16533,56 @@ msgid "" " svn://svn.example.com/repo/project\n" msgstr "" -#: ../svn/svn.c:1833 +#: ../svn/svn.c:1918 msgid "allow switching to a node with no common ancestor" msgstr "" -#: ../svn/svn.c:1835 ../svn/svn.c:1897 +#: ../svn/svn.c:1920 ../svn/svn.c:1985 msgid "handle unversioned obstructions as changes" msgstr "" -#: ../svn/svn.c:1836 +#: ../svn/svn.c:1921 msgid "deprecated; use 'svn relocate'" msgstr "" -#: ../svn/svn.c:1840 +#: ../svn/svn.c:1926 msgid "" "Unlock working copy paths or URLs.\n" "usage: unlock TARGET...\n" "\n" -" Use --force to break a lock held by another user or working copy.\n" msgstr "" -#: ../svn/svn.c:1845 +#: ../svn/svn.c:1929 +msgid " Use --force to break a lock held by another user or working copy.\n" +msgstr "" + +#: ../svn/svn.c:1932 msgid "break locks" msgstr "" -#: ../svn/svn.c:1848 +#: ../svn/svn.c:1935 msgid "" "Bring changes from the repository into the working copy.\n" "usage: update [PATH...]\n" "\n" +msgstr "" + +#: ../svn/svn.c:1938 +msgid "" " If no revision is given, bring working copy up-to-date with HEAD rev.\n" " Else synchronize working copy to revision given by -r.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1941 +msgid "" " For each updated item a line will be printed with characters reporting\n" " the action taken. These characters have the following meaning:\n" "\n" -" A Added\n" -" D Deleted\n" -" U Updated\n" -" C Conflict\n" -" G Merged\n" -" E Existed\n" -" R Replaced\n" -"\n" +msgstr "" + +#: ../svn/svn.c:1952 +msgid "" " Characters in the first column report about the item itself.\n" " Characters in the second column report about properties of the item.\n" " A 'B' in the third column signifies that the lock for the file has\n" @@ -15453,6 +16591,10 @@ msgid "" " the first and second columns indicate textual conflicts in files\n" " and in property values, respectively.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1960 +msgid "" " If --force is used, unversioned obstructing paths in the working\n" " copy do not automatically cause a failure if the update attempts to\n" " add the same path. If the obstructing path is the same type (file\n" @@ -15465,297 +16607,468 @@ msgid "" " are applied to the obstructing path. Obstructing paths are reported\n" " in the first column with code 'E'.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1972 +msgid "" " If the specified update target is missing from the working copy but its\n" " immediate parent directory is present, checkout the target into its\n" " parent directory at the specified depth. If --parents is specified,\n" " create any missing parent directories of the target by checking them\n" " out, too, at depth=empty.\n" "\n" +msgstr "" + +#: ../svn/svn.c:1978 +msgid "" " Use the --set-depth option to set a new working copy depth on the\n" " targets of this operation.\n" msgstr "" -#: ../svn/svn.c:1900 +#: ../svn/svn.c:1989 msgid "" "Upgrade the metadata storage format for a working copy.\n" "usage: upgrade [WCPATH...]\n" "\n" -" Local modifications are preserved.\n" msgstr "" -#: ../svn/svn.c:1907 +#: ../svn/svn.c:1992 +msgid " Local modifications are preserved.\n" +msgstr "" + +#: ../svn/svn.c:1997 +msgid "" +"Show shelved changes as a diff.\n" +"usage: x-shelf-diff SHELF [VERSION]\n" +"\n" +msgstr "" + +#: ../svn/svn.c:2000 +msgid "" +" Show the changes in SHELF:VERSION (default: latest) as a diff.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:2002 +msgid "" +" See also: 'svn diff --cl=svn:shelf:SHELF' which supports most options of\n" +" 'svn diff'.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:2005 ../svn/svn.c:2018 ../svn/svn.c:2031 ../svn/svn.c:2043 +#: ../svn/svn.c:2055 ../svn/svn.c:2070 ../svn/svn.c:2104 ../svn/svn.c:2137 msgid "" -"Put a local change aside, as if putting it on a shelf.\n" -"usage: 1. x-shelve [--keep-local] NAME [PATH...]\n" -" 2. x-shelve --delete NAME\n" -" 3. x-shelve --list\n" +" The shelving feature is EXPERIMENTAL. This command is likely to change\n" +" in the next release, and there is no promise of backward compatibility.\n" +msgstr "" + +#: ../svn/svn.c:2012 +msgid "" +"Delete a shelf.\n" +"usage: x-shelf-drop SHELF [PATH ...]\n" +"\n" +msgstr "" + +#: ../svn/svn.c:2015 +msgid "" +" Delete the shelves named SHELF from the working copies containing PATH\n" +" (default PATH is '.')\n" "\n" -" 1. Save the local change in the given PATHs to a patch file, and\n" -" revert that change from the WC unless '--keep-local' is given.\n" -" If a log message is given with '-m' or '-F', include it at the\n" -" beginning of the patch file.\n" +msgstr "" + +#: ../svn/svn.c:2024 +msgid "" +"List shelves.\n" +"usage: x-shelf-list [PATH ...]\n" "\n" -" 2. Delete the shelved change NAME.\n" -" (A backup is kept, named with a '.bak' extension.)\n" +msgstr "" + +#: ../svn/svn.c:2027 +msgid "" +" List shelves for each working copy containing PATH (default is '.')\n" +" Include the first line of any log message and some details about the\n" +" contents of the shelf, unless '-q' is given.\n" "\n" -" 3. List shelved changes. Include the first line of any log message\n" -" and some details about the contents of the change, unless '-q' is\n" -" given.\n" +msgstr "" + +#: ../svn/svn.c:2038 +msgid "" +"List which shelf affects each path.\n" +"usage: x-shelf-list-by-paths [PATH...]\n" "\n" -" The kinds of change you can shelve are those supported by 'svn diff'\n" -" and 'svn patch'. The following are currently NOT supported:\n" -" mergeinfo changes, copies, moves, mkdir, rmdir,\n" -" 'binary' content, uncommittable states\n" +msgstr "" + +#: ../svn/svn.c:2041 +msgid "" +" List which shelf most recently affects each path below the given PATHs.\n" "\n" -" To bring back a shelved change, use 'svn x-unshelve NAME'.\n" +msgstr "" + +#: ../svn/svn.c:2049 +msgid "" +"Show the versions of a shelf.\n" +"usage: x-shelf-log SHELF [PATH...]\n" "\n" -" Shelved changes are stored in /.svn/shelves/\n" +msgstr "" + +#: ../svn/svn.c:2052 +msgid "" +" Show all versions of SHELF for each working copy containing PATH (the\n" +" default PATH is '.').\n" +"\n" +msgstr "" + +#: ../svn/svn.c:2062 +msgid "" +"Copy local changes onto a new version of a shelf.\n" +"usage: x-shelf-save SHELF [PATH...]\n" "\n" -" The shelving feature is EXPERIMENTAL. This command is likely to change\n" -" in the next release, and there is no promise of backward compatibility.\n" msgstr "" -#: ../svn/svn.c:1943 +#: ../svn/svn.c:2065 msgid "" -"Bring a shelved change back to a local change in the WC.\n" -"usage: 1. x-unshelve [--keep-shelved] [NAME]\n" -" 2. x-unshelve --list\n" +" Save local changes in the given PATHs as a new version of SHELF.\n" +" The shelf's log message can be set with -m, -F, etc.\n" "\n" -" 1. Apply the shelved change NAME to the working copy.\n" -" Delete the patch unless the '--keep-shelved' option is given.\n" -" (A backup is kept, named with a '.bak' extension.)\n" -" NAME defaults to the most recent shelved change.\n" +msgstr "" + +#: ../svn/svn.c:2068 +msgid "" +" The same as 'svn shelve --keep-local'.\n" "\n" -" 2. List shelved changes. Include the first line of any log message\n" -" and some details about the contents of the change, unless '-q' is\n" -" given.\n" +msgstr "" + +#: ../svn/svn.c:2080 +msgid "" +"Move local changes onto a shelf.\n" +"usage: x-shelve [--keep-local] SHELF [PATH...]\n" "\n" -" Any conflict between the change being unshelved and a change\n" -" already in the WC is handled the same way as by 'svn patch',\n" -" creating a 'reject' file.\n" +msgstr "" + +#: ../svn/svn.c:2083 +msgid "" +" Save the local changes in the given PATHs to a new or existing SHELF.\n" +" Revert those changes from the WC unless '--keep-local' is given.\n" +" The shelf's log message can be set with -m, -F, etc.\n" "\n" -" The shelving feature is EXPERIMENTAL. This command is likely to change\n" -" in the next release, and there is no promise of backward compatibility.\n" msgstr "" -#: ../svn/svn.c:1966 +#: ../svn/svn.c:2087 msgid "" -"List shelved changes.\n" -"usage: x-shelves\n" +" 'svn shelve --keep-local' is the same as 'svn shelf-save'.\n" "\n" -" The shelving feature is EXPERIMENTAL. This command is likely to change\n" +msgstr "" + +#: ../svn/svn.c:2089 +msgid "" +" The kinds of change you can shelve are committable changes to files and\n" +" properties, except the following kinds which are not yet supported:\n" +" * copies and moves\n" +" * mkdir and rmdir\n" +" Uncommittable states such as conflicts, unversioned and missing cannot\n" +" be shelved.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:2096 +msgid "" +" To bring back shelved changes, use 'svn unshelve SHELF'.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:2098 +msgid "" +" Shelves are currently stored under /.svn/experimental/shelves/ .\n" +" (In Subversion 1.10, shelves were stored under /.svn/shelves/ as\n" +" patch files. To recover a shelf created by 1.10, either use a 1.10\n" +" client to find and unshelve it, or find the patch file and use any\n" +" 1.10 or later 'svn patch' to apply it.)\n" +"\n" +msgstr "" + +#: ../svn/svn.c:2113 +msgid "" +"Copy shelved changes back into the WC.\n" +"usage: x-unshelve [--drop] [SHELF [VERSION]]\n" +"\n" +msgstr "" + +#: ../svn/svn.c:2116 +msgid "" +" Apply the changes stored in SHELF to the working copy.\n" +" SHELF defaults to the newest shelf.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:2119 +msgid "" +" Apply the newest version of the shelf, by default. If VERSION is\n" +" specified, apply that version and discard all versions newer than that.\n" +" In any case, retain the unshelved version and versions older than that\n" +" (unless --drop is specified).\n" +"\n" +msgstr "" + +#: ../svn/svn.c:2124 +msgid "" +" With --drop, delete the entire shelf (like 'svn shelf-drop') after\n" +" successfully unshelving with no conflicts.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:2127 +msgid "" +" The working files involved should be in a clean, unmodified state\n" +" before using this command. To roll back to an older version of the\n" +" shelf, first ensure any current working changes are removed, such as\n" +" by shelving or reverting them, and then unshelve the desired version.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:2132 +msgid "" +" Unshelve normally refuses to apply any changes if any path involved is\n" +" already modified (or has any other abnormal status) in the WC. With\n" +" --force, it does not check and may error out and/or produce partial or\n" +" unexpected results.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:2143 +msgid "" +"Copy local modifications from one WC to another.\n" +"usage: x-wc-copy-mods SRC_WC_PATH DST_WC_PATH\n" +"\n" +msgstr "" + +#: ../svn/svn.c:2146 +msgid "" +" The source and destination WC paths may be in the same WC or in different " +"WCs.\n" +"\n" +msgstr "" + +#: ../svn/svn.c:2149 +msgid "" +" This feature is EXPERIMENTAL. This command is likely to change\n" " in the next release, and there is no promise of backward compatibility.\n" msgstr "" -#: ../svn/svn.c:2146 ../svnbench/svnbench.c:468 ../svnlook/svnlook.c:2556 +#: ../svn/svn.c:2230 +#, c-format +msgid "'%s' is not a valid --x-viewspec value" +msgstr "" + +#: ../svn/svn.c:2343 ../svnbench/svnbench.c:474 ../svnlook/svnlook.c:2590 msgid "Non-numeric limit argument given" msgstr "" -#: ../svn/svn.c:2151 ../svnbench/svnbench.c:473 ../svnlook/svnlook.c:2561 +#: ../svn/svn.c:2348 ../svnbench/svnbench.c:479 ../svnlook/svnlook.c:2595 msgid "Argument to --limit must be positive" msgstr "" -#: ../svn/svn.c:2171 ../svn/svn.c:2449 +#: ../svn/svn.c:2368 ../svn/svn.c:2646 msgid "Can't specify -c with --old" msgstr "" -#: ../svn/svn.c:2201 ../svnbench/svnbench.c:509 +#: ../svn/svn.c:2398 ../svnbench/svnbench.c:515 #, c-format msgid "Negative number in range (%s) not supported with -c" msgstr "" -#: ../svn/svn.c:2213 ../svnbench/svnbench.c:521 +#: ../svn/svn.c:2410 ../svnbench/svnbench.c:527 #, c-format msgid "Non-numeric change argument (%s) given to -c" msgstr "" -#: ../svn/svn.c:2220 ../svnbench/svnbench.c:528 +#: ../svn/svn.c:2417 ../svnbench/svnbench.c:534 msgid "There is no change 0" msgstr "" -#: ../svn/svn.c:2261 ../svnadmin/svnadmin.c:2866 ../svnbench/svnbench.c:570 -#: ../svnfsfs/svnfsfs.c:291 ../svnrdump/svnrdump.c:855 -#: ../svnsync/svnsync.c:2141 +#: ../svn/svn.c:2458 ../svnadmin/svnadmin.c:3008 ../svnbench/svnbench.c:576 +#: ../svnfsfs/svnfsfs.c:303 ../svnrdump/svnrdump.c:865 +#: ../svnsync/svnsync.c:2146 #, c-format msgid "Syntax error in revision argument '%s'" msgstr "" -#: ../svn/svn.c:2327 ../svn/svn.c:2344 ../svnbench/svnbench.c:609 +#: ../svn/svn.c:2524 ../svn/svn.c:2541 ../svnbench/svnbench.c:615 #, c-format msgid "Error converting depth from locale to UTF-8" msgstr "" -#: ../svn/svn.c:2334 ../svnbench/svnbench.c:616 +#: ../svn/svn.c:2531 ../svnbench/svnbench.c:622 #, c-format msgid "" "'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'" msgstr "" -#: ../svn/svn.c:2351 +#: ../svn/svn.c:2548 #, c-format msgid "" "'%s' is not a valid depth; try 'exclude', 'empty', 'files', 'immediates', or " "'infinity'" msgstr "" -#: ../svn/svn.c:2486 +#: ../svn/svn.c:2684 #, c-format msgid "Syntax error in native-eol argument '%s'" msgstr "" -#: ../svn/svn.c:2505 +#: ../svn/svn.c:2705 msgid "Changelist names must not be empty" msgstr "" -#: ../svn/svn.c:2539 +#: ../svn/svn.c:2738 #, c-format msgid "'%s' is not a valid --accept value" msgstr "" -#: ../svn/svn.c:2547 +#: ../svn/svn.c:2746 #, c-format msgid "'%s' is not a valid --show-revs value" msgstr "" -#: ../svn/svn.c:2563 +#: ../svn/svn.c:2762 #, c-format msgid "Invalid strip count '%s'" msgstr "" -#: ../svn/svn.c:2569 +#: ../svn/svn.c:2768 msgid "Argument to --strip must be positive" msgstr "" -#: ../svn/svn.c:2660 ../svnmucc/svnmucc.c:666 ../svnrdump/svnrdump.c:934 -#: ../svnsync/svnsync.c:2199 +#: ../svn/svn.c:2867 ../svnmucc/svnmucc.c:666 ../svnrdump/svnrdump.c:944 +#: ../svnsync/svnsync.c:2204 msgid "--non-interactive and --force-interactive are mutually exclusive" msgstr "" -#: ../svn/svn.c:2713 ../svnbench/svnbench.c:750 -#: ../svndumpfilter/svndumpfilter.c:1427 ../svnlook/svnlook.c:2660 +#: ../svn/svn.c:2920 ../svnbench/svnbench.c:756 +#: ../svndumpfilter/svndumpfilter.c:1429 ../svnlook/svnlook.c:2694 #, c-format msgid "Subcommand argument required\n" msgstr "" -#: ../svn/svn.c:2731 ../svnadmin/svnadmin.c:3092 ../svnbench/svnbench.c:768 -#: ../svndumpfilter/svndumpfilter.c:1444 ../svnfsfs/svnfsfs.c:367 -#: ../svnlook/svnlook.c:2677 ../svnrdump/svnrdump.c:978 +#: ../svn/svn.c:2938 ../svnadmin/svnadmin.c:3234 ../svnbench/svnbench.c:774 +#: ../svndumpfilter/svndumpfilter.c:1446 ../svnfsfs/svnfsfs.c:379 +#: ../svnlook/svnlook.c:2711 ../svnrdump/svnrdump.c:988 #, c-format msgid "Unknown subcommand: '%s'\n" msgstr "" -#: ../svn/svn.c:2740 +#: ../svn/svn.c:2947 #, c-format msgid "" "Undo is done using either the 'svn revert' or the 'svn merge' command.\n" msgstr "" -#: ../svn/svn.c:2776 +#: ../svn/svn.c:2983 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svn help %s' for usage.\n" msgstr "" -#: ../svn/svn.c:2791 ../svnbench/svnbench.c:816 +#: ../svn/svn.c:2998 ../svnbench/svnbench.c:822 msgid "" "Multiple revision arguments encountered; can't specify -c twice, or both -c " "and -r" msgstr "" -#: ../svn/svn.c:2802 +#: ../svn/svn.c:3009 msgid "--depth and --set-depth are mutually exclusive" msgstr "" -#: ../svn/svn.c:2811 ../svnbench/svnbench.c:827 +#: ../svn/svn.c:3018 ../svnbench/svnbench.c:833 msgid "--with-all-revprops and --with-no-revprops are mutually exclusive" msgstr "" -#: ../svn/svn.c:2820 ../svnbench/svnbench.c:836 +#: ../svn/svn.c:3027 ../svnbench/svnbench.c:842 msgid "--with-revprop and --with-no-revprops are mutually exclusive" msgstr "" -#: ../svn/svn.c:2850 +#: ../svn/svn.c:3057 msgid "--message (-m) and --file (-F) are mutually exclusive" msgstr "" -#: ../svn/svn.c:2863 ../svnbench/svnbench.c:849 ../svnmucc/svnmucc.c:678 -#: ../svnrdump/svnrdump.c:1037 +#: ../svn/svn.c:3070 ../svnbench/svnbench.c:855 ../svnmucc/svnmucc.c:678 +#: ../svnrdump/svnrdump.c:1047 msgid "--trust-server-cert-failures requires --non-interactive" msgstr "" -#: ../svn/svn.c:2871 ../svnbench/svnbench.c:857 ../svnmucc/svnmucc.c:686 -#: ../svnrdump/svnrdump.c:1044 +#: ../svn/svn.c:3078 ../svnbench/svnbench.c:863 ../svnmucc/svnmucc.c:686 +#: ../svnrdump/svnrdump.c:1054 msgid "--password-from-stdin requires --non-interactive" msgstr "" -#: ../svn/svn.c:2880 +#: ../svn/svn.c:3087 msgid "--diff-cmd and --internal-diff are mutually exclusive" msgstr "" -#: ../svn/svn.c:2922 +#: ../svn/svn.c:3129 msgid "--relocate and --depth are mutually exclusive" msgstr "" -#: ../svn/svn.c:2929 +#: ../svn/svn.c:3136 msgid "--relocate and --non-recursive (-N) are mutually exclusive" msgstr "" -#: ../svn/svn.c:3050 +#: ../svn/svn.c:3262 msgid "Log message file is a versioned file; use '--force-log' to override" msgstr "" -#: ../svn/svn.c:3057 +#: ../svn/svn.c:3269 msgid "Lock comment file is a versioned file; use '--force-log' to override" msgstr "" -#: ../svn/svn.c:3077 +#: ../svn/svn.c:3289 msgid "" "The log message is a pathname (was -F intended?); use '--force-log' to " "override" msgstr "" -#: ../svn/svn.c:3084 +#: ../svn/svn.c:3296 msgid "" "The lock comment is a pathname (was -F intended?); use '--force-log' to " "override" msgstr "" -#: ../svn/svn.c:3107 +#: ../svn/svn.c:3319 msgid "--auto-props and --no-auto-props are mutually exclusive" msgstr "" -#: ../svn/svn.c:3200 ../svn/svn.c:3207 +#: ../svn/svn.c:3412 ../svn/svn.c:3419 #, c-format msgid "--accept=%s incompatible with --non-interactive" msgstr "" -#: ../svn/svn.c:3256 +#: ../svn/svn.c:3468 #, c-format msgid "Try 'svn help %s' for more information" msgstr "" -#: ../svn/svn.c:3262 ../svnbench/svnbench.c:1000 +#: ../svn/svn.c:3474 ../svnbench/svnbench.c:1006 msgid "Please see the 'svn upgrade' command" msgstr "" -#: ../svn/svn.c:3268 ../svnmucc/svnmucc.c:971 ../svnrdump/svnrdump.c:1137 +#: ../svn/svn.c:3480 ../svnmucc/svnmucc.c:971 ../svnrdump/svnrdump.c:1147 msgid "" "Authentication failed and interactive prompting is disabled; see the --force-" "interactive option" msgstr "" -#: ../svn/svn.c:3273 +#: ../svn/svn.c:3485 msgid "" "Reading file from standard input because of -F option; this can interfere " "with interactive prompting" msgstr "" -#: ../svn/svn.c:3284 ../svnbench/svnbench.c:1008 +#: ../svn/svn.c:3496 ../svnbench/svnbench.c:1014 msgid "Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)" msgstr "" -#: ../svn/svn.c:3291 +#: ../svn/svn.c:3503 msgid "" "Another process is blocking the working copy database, or the underlying " "filesystem does not support file locking; if the working copy is on a " @@ -15763,7 +17076,7 @@ msgid "" "server" msgstr "" -#: ../svn/svn.c:3304 +#: ../svn/svn.c:3516 msgid "" "When using svn+ssh:// URLs, keep in mind that the --username and --password " "options are ignored because authentication is performed by SSH, not " @@ -15830,205 +17143,205 @@ msgid "" "configuration option were not set.\n" msgstr "" -#: ../svn/util.c:175 +#: ../svn/util.c:177 #, c-format msgid "The external merge tool '%s' exited with exit code %d." msgstr "" -#: ../svn/util.c:218 +#: ../svn/util.c:220 msgid "Log message contains a zero byte" msgstr "" -#: ../svn/util.c:278 +#: ../svn/util.c:280 #, c-format msgid " '%s'" msgstr "" -#: ../svn/util.c:282 +#: ../svn/util.c:284 msgid "Your commit message was left in a temporary file:" msgstr "" -#: ../svn/util.c:334 +#: ../svn/util.c:336 msgid "--This line, and those below, will be ignored--" msgstr "" -#: ../svn/util.c:360 ../svnmucc/svnmucc.c:432 +#: ../svn/util.c:362 ../svnmucc/svnmucc.c:432 msgid "Error normalizing log message to internal format" msgstr "" -#: ../svn/util.c:449 ../svnmucc/svnmucc.c:442 +#: ../svn/util.c:451 ../svnmucc/svnmucc.c:442 msgid "Cannot invoke editor to get log message when non-interactive" msgstr "" -#: ../svn/util.c:462 +#: ../svn/util.c:464 msgid "" "Could not use external editor to fetch log message; consider setting the " "$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) " "options" msgstr "" -#: ../svn/util.c:498 +#: ../svn/util.c:500 msgid "" "\n" "Log message unchanged or not specified\n" "(a)bort, (c)ontinue, (e)dit:\n" msgstr "" -#: ../svn/util.c:551 +#: ../svn/util.c:553 msgid "" "Use --force to override this restriction (local modifications may be lost)" msgstr "" -#: ../svn/util.c:741 ../svn/util.c:774 +#: ../svn/util.c:743 ../svn/util.c:776 msgid "none" msgstr "" -#: ../svn/util.c:742 +#: ../svn/util.c:744 msgid "file" msgstr "" -#: ../svn/util.c:743 +#: ../svn/util.c:745 msgid "dir" msgstr "" -#: ../svn/util.c:775 +#: ../svn/util.c:777 msgid "update" msgstr "" -#: ../svn/util.c:776 +#: ../svn/util.c:778 msgid "switch" msgstr "" -#: ../svn/util.c:777 +#: ../svn/util.c:779 msgid "merge" msgstr "" -#: ../svn/util.c:899 +#: ../svn/util.c:901 msgid "(invalid date)" msgstr "" -#: ../svn/util.c:1062 +#: ../svn/util.c:1064 #, c-format msgid "" "svn: warning: '%s' is a binary mime-type but file '%s' looks like text; " "diff, merge, blame, and other operations will stop working on this file\n" msgstr "" -#: ../svnadmin/svnadmin.c:177 ../svnfsfs/svnfsfs.c:101 -#: ../svnrdump/svnrdump.c:106 +#: ../svnadmin/svnadmin.c:180 ../svnfsfs/svnfsfs.c:101 +#: ../svnrdump/svnrdump.c:114 msgid "specify revision number ARG (or X:Y range)" msgstr "" -#: ../svnadmin/svnadmin.c:180 ../svnlook/svnlook.c:173 +#: ../svnadmin/svnadmin.c:183 ../svnlook/svnlook.c:173 msgid "specify transaction name ARG" msgstr "" -#: ../svnadmin/svnadmin.c:183 +#: ../svnadmin/svnadmin.c:186 msgid "dump or hotcopy incrementally" msgstr "" -#: ../svnadmin/svnadmin.c:186 +#: ../svnadmin/svnadmin.c:189 msgid "use deltas in dump output" msgstr "" -#: ../svnadmin/svnadmin.c:189 +#: ../svnadmin/svnadmin.c:192 msgid "bypass the repository hook system" msgstr "" -#: ../svnadmin/svnadmin.c:192 +#: ../svnadmin/svnadmin.c:195 msgid "bypass property validation logic" msgstr "" -#: ../svnadmin/svnadmin.c:195 +#: ../svnadmin/svnadmin.c:198 msgid "ignore revision datestamps found in the stream" msgstr "" -#: ../svnadmin/svnadmin.c:198 ../svnfsfs/svnfsfs.c:98 +#: ../svnadmin/svnadmin.c:201 ../svnfsfs/svnfsfs.c:98 msgid "no progress (only errors to stderr)" msgstr "" -#: ../svnadmin/svnadmin.c:201 +#: ../svnadmin/svnadmin.c:204 msgid "ignore any repos UUID found in the stream" msgstr "" -#: ../svnadmin/svnadmin.c:204 +#: ../svnadmin/svnadmin.c:207 msgid "set repos UUID to that found in stream, if any" msgstr "" -#: ../svnadmin/svnadmin.c:207 +#: ../svnadmin/svnadmin.c:210 msgid "" "type of repository:\n" " 'fsfs' (default), 'bdb' or 'fsx'\n" " CAUTION: FSX is for EXPERIMENTAL use only!" msgstr "" -#: ../svnadmin/svnadmin.c:212 +#: ../svnadmin/svnadmin.c:215 msgid "load at specified directory in repository" msgstr "" -#: ../svnadmin/svnadmin.c:215 +#: ../svnadmin/svnadmin.c:218 msgid "disable fsync at transaction commit [Berkeley DB]" msgstr "" -#: ../svnadmin/svnadmin.c:218 +#: ../svnadmin/svnadmin.c:221 msgid "disable automatic log file removal [Berkeley DB]" msgstr "" -#: ../svnadmin/svnadmin.c:224 +#: ../svnadmin/svnadmin.c:227 msgid "" "remove redundant Berkeley DB log files\n" " from source repository [Berkeley DB]" msgstr "" -#: ../svnadmin/svnadmin.c:228 +#: ../svnadmin/svnadmin.c:231 msgid "call pre-commit hook before committing revisions" msgstr "" -#: ../svnadmin/svnadmin.c:231 +#: ../svnadmin/svnadmin.c:234 msgid "call post-commit hook after committing revisions" msgstr "" -#: ../svnadmin/svnadmin.c:234 +#: ../svnadmin/svnadmin.c:237 msgid "call hook before changing revision property" msgstr "" -#: ../svnadmin/svnadmin.c:237 +#: ../svnadmin/svnadmin.c:240 msgid "call hook after changing revision property" msgstr "" -#: ../svnadmin/svnadmin.c:240 +#: ../svnadmin/svnadmin.c:243 msgid "" "wait instead of exit if the repository is in\n" " use by another process" msgstr "" -#: ../svnadmin/svnadmin.c:244 ../svnadmin/svnadmin.c:247 -#: ../svnadmin/svnadmin.c:250 +#: ../svnadmin/svnadmin.c:247 ../svnadmin/svnadmin.c:250 +#: ../svnadmin/svnadmin.c:253 msgid "deprecated; see --compatible-version" msgstr "" -#: ../svnadmin/svnadmin.c:253 +#: ../svnadmin/svnadmin.c:256 msgid "continue verification after detecting a corruption" msgstr "" -#: ../svnadmin/svnadmin.c:256 ../svnlook/svnlook.c:148 +#: ../svnadmin/svnadmin.c:259 ../svnlook/svnlook.c:148 msgid "" "size of the extra in-memory cache in MB used to\n" " minimize redundant operations. Default: 16.\n" " [used for FSFS repositories only]" msgstr "" -#: ../svnadmin/svnadmin.c:261 +#: ../svnadmin/svnadmin.c:264 msgid "" "use repository format compatible with Subversion\n" " version ARG (\"1.5.5\", \"1.7\", etc.)" msgstr "" -#: ../svnadmin/svnadmin.c:264 ../svnadmin/svnadmin.c:382 +#: ../svnadmin/svnadmin.c:267 ../svnadmin/svnadmin.c:405 msgid "read repository paths from file ARG" msgstr "" -#: ../svnadmin/svnadmin.c:267 +#: ../svnadmin/svnadmin.c:270 msgid "" "report any names within the same directory or\n" " svn:mergeinfo property value that differ only\n" @@ -16036,34 +17349,34 @@ msgid "" " identical" msgstr "" -#: ../svnadmin/svnadmin.c:273 +#: ../svnadmin/svnadmin.c:276 msgid "" "verify metadata only (ignored for BDB),\n" " checking against external corruption in\n" " Subversion 1.9+ format repositories.\n" msgstr "" -#: ../svnadmin/svnadmin.c:278 +#: ../svnadmin/svnadmin.c:281 msgid "" "disable flushing to disk during the operation\n" " (faster, but unsafe on power off)" msgstr "" -#: ../svnadmin/svnadmin.c:282 +#: ../svnadmin/svnadmin.c:285 msgid "" "normalize property values found in the dumpstream\n" " (currently, only translates non-LF line endings)" msgstr "" -#: ../svnadmin/svnadmin.c:286 +#: ../svnadmin/svnadmin.c:289 msgid "filter out nodes with given prefix(es) from dump" msgstr "" -#: ../svnadmin/svnadmin.c:289 +#: ../svnadmin/svnadmin.c:292 msgid "filter out nodes without given prefix(es) from dump" msgstr "" -#: ../svnadmin/svnadmin.c:292 +#: ../svnadmin/svnadmin.c:295 msgid "" "treat the path prefixes as file glob patterns.\n" " Glob special characters are '*' '?' '[]' and " @@ -16073,42 +17386,68 @@ msgid "" "foo." msgstr "" -#: ../svnadmin/svnadmin.c:307 +#: ../svnadmin/svnadmin.c:310 msgid "" "usage: svnadmin crashtest REPOS_PATH\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:312 +msgid "" "Open the repository at REPOS_PATH, then abort, thus simulating\n" "a process that crashes while holding an open repository handle.\n" msgstr "" -#: ../svnadmin/svnadmin.c:313 +#: ../svnadmin/svnadmin.c:318 msgid "" "usage: svnadmin create REPOS_PATH\n" "\n" -"Create a new, empty repository at REPOS_PATH.\n" msgstr "" -#: ../svnadmin/svnadmin.c:322 +#: ../svnadmin/svnadmin.c:320 +msgid "Create a new, empty repository at REPOS_PATH.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:329 msgid "" "usage: 1. svnadmin delrevprop REPOS_PATH -r REVISION NAME\n" " 2. svnadmin delrevprop REPOS_PATH -t TXN NAME\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:332 +msgid "" "1. Delete the property NAME on revision REVISION.\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:334 ../svnadmin/svnadmin.c:570 +msgid "" "Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n" "trigger the revision property-related hooks (for example, if you want\n" "an email notification sent from your post-revprop-change hook).\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:338 +msgid "" "NOTE: Revision properties are not versioned, so this command will\n" "irreversibly destroy the previous value of the property.\n" "\n" -"2. Delete the property NAME on transaction TXN.\n" msgstr "" -#: ../svnadmin/svnadmin.c:335 +#: ../svnadmin/svnadmin.c:341 +msgid "2. Delete the property NAME on transaction TXN.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:347 msgid "" "usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:349 +msgid "" "Run over the requested revision range, performing predecessor delti-\n" "fication on the paths changed in those revisions. Deltification in\n" "essence compresses the repository by only storing the differences or\n" @@ -16116,10 +17455,14 @@ msgid "" "this will simply deltify the HEAD revision.\n" msgstr "" -#: ../svnadmin/svnadmin.c:344 +#: ../svnadmin/svnadmin.c:358 msgid "" "usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:360 +msgid "" "Dump the contents of filesystem to stdout in a 'dumpfile'\n" "portable format, sending feedback to stderr. Dump revisions\n" "LOWER rev through UPPER rev. If no revisions are given, dump all\n" @@ -16130,19 +17473,28 @@ msgid "" "case, the second and subsequent revisions, if any, describe only paths\n" "changed in those revisions.)\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:370 +msgid "" "Using --exclude or --include gives results equivalent to authz-based\n" "path exclusions. In particular, when the source of a copy is\n" "excluded, the copy is transformed into an add (unlike in 'svndumpfilter').\n" msgstr "" -#: ../svnadmin/svnadmin.c:360 ../svnadmin/svnadmin.c:370 +#: ../svnadmin/svnadmin.c:376 ../svnadmin/svnadmin.c:388 +#: ../svnrdump/svnrdump.c:94 msgid "write to file ARG instead of stdout" msgstr "" -#: ../svnadmin/svnadmin.c:363 +#: ../svnadmin/svnadmin.c:379 msgid "" "usage: svnadmin dump-revprops REPOS_PATH [-r LOWER[:UPPER]]\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:381 +msgid "" "Dump the revision properties of filesystem to stdout in a 'dumpfile'\n" "portable format, sending feedback to stderr. Dump revisions\n" "LOWER rev through UPPER rev. If no revisions are given, dump the\n" @@ -16150,65 +17502,101 @@ msgid "" "properties for that one revision.\n" msgstr "" -#: ../svnadmin/svnadmin.c:373 +#: ../svnadmin/svnadmin.c:391 msgid "" -"usage: 1. svnadmin freeze REPOS_PATH PROGRAM [ARG...]\n" -" 2. svnadmin freeze -F FILE PROGRAM [ARG...]\n" +"usage: 1. svnadmin freeze REPOS_PATH -- PROGRAM [ARG...]\n" +" 2. svnadmin freeze -F FILE -- PROGRAM [ARG...]\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:394 +msgid "" "1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n" " Allows safe use of third-party backup tools on a live repository.\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:397 +msgid "" "2. Like 1 except all repositories listed in FILE are locked. The file\n" " format is repository paths separated by newlines. Repositories are\n" " locked in the same order as they are listed in the file.\n" +"\n" +"The '--' tells svnadmin to stop looking for svnadmin options and pass\n" +"all later arguments to PROGRAM even if they begin with '-'.\n" msgstr "" -#: ../svnadmin/svnadmin.c:385 +#: ../svnadmin/svnadmin.c:408 msgid "" "usage: svnadmin help [SUBCOMMAND...]\n" "\n" -"Describe the usage of this program or its subcommands.\n" msgstr "" -#: ../svnadmin/svnadmin.c:390 +#: ../svnadmin/svnadmin.c:410 ../svnfsfs/svnfsfs.c:119 ../svnlook/svnlook.c:273 +#: ../svnrdump/svnrdump.c:105 ../svnsync/svnsync.c:172 +msgid "Describe the usage of this program or its subcommands.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:415 msgid "" "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:417 +msgid "" "Make a hot copy of a repository.\n" "If --incremental is passed, data which already exists at the destination\n" "is not copied again. Incremental mode is implemented for FSFS " "repositories.\n" msgstr "" -#: ../svnadmin/svnadmin.c:397 +#: ../svnadmin/svnadmin.c:424 msgid "" "usage: svnadmin info REPOS_PATH\n" "\n" -"Print information about the repository at REPOS_PATH.\n" msgstr "" -#: ../svnadmin/svnadmin.c:402 +#: ../svnadmin/svnadmin.c:426 +msgid "Print information about the repository at REPOS_PATH.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:431 msgid "" "usage: svnadmin list-dblogs REPOS_PATH\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:433 +msgid "" "List all Berkeley DB log files.\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:435 +msgid "" "WARNING: Modifying or deleting logfiles which are still in use\n" "will cause your repository to be corrupted.\n" msgstr "" -#: ../svnadmin/svnadmin.c:409 +#: ../svnadmin/svnadmin.c:441 msgid "" "usage: svnadmin list-unused-dblogs REPOS_PATH\n" "\n" -"List unused Berkeley DB log files.\n" -"\n" msgstr "" -#: ../svnadmin/svnadmin.c:414 +#: ../svnadmin/svnadmin.c:443 +msgid "List unused Berkeley DB log files.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:448 msgid "" "usage: svnadmin load REPOS_PATH\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:450 +msgid "" "Read a 'dumpfile'-formatted stream from stdin, committing\n" "new revisions into the repository's filesystem. If the repository\n" "was previously empty, its UUID will, by default, be changed to the\n" @@ -16217,14 +17605,19 @@ msgid "" "in the dump stream whose revision numbers match the specified range.\n" msgstr "" -#: ../svnadmin/svnadmin.c:427 ../svnadmin/svnadmin.c:438 +#: ../svnadmin/svnadmin.c:463 ../svnadmin/svnadmin.c:476 +#: ../svnrdump/svnrdump.c:101 msgid "read from file ARG instead of stdin" msgstr "" -#: ../svnadmin/svnadmin.c:430 +#: ../svnadmin/svnadmin.c:466 msgid "" "usage: svnadmin load-revprops REPOS_PATH\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:468 +msgid "" "Read a 'dumpfile'-formatted stream from stdin, setting the revision\n" "properties in the repository's filesystem. Revisions not found in the\n" "repository will cause an error. Progress feedback is sent to stdout.\n" @@ -16232,69 +17625,116 @@ msgid "" "in the dump stream whose revision numbers match the specified range.\n" msgstr "" -#: ../svnadmin/svnadmin.c:441 +#: ../svnadmin/svnadmin.c:479 msgid "" "usage: svnadmin lock REPOS_PATH PATH USERNAME COMMENT-FILE [TOKEN]\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:481 +msgid "" "Lock PATH by USERNAME setting comments from COMMENT-FILE.\n" "If provided, use TOKEN as lock token. Use --bypass-hooks to avoid\n" "triggering the pre-lock and post-lock hook scripts.\n" msgstr "" -#: ../svnadmin/svnadmin.c:448 +#: ../svnadmin/svnadmin.c:488 msgid "" "usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:490 +msgid "" "Print descriptions of all locks on or under PATH-IN-REPOS (which,\n" "if not provided, is the root of the repository).\n" msgstr "" -#: ../svnadmin/svnadmin.c:454 +#: ../svnadmin/svnadmin.c:496 msgid "" "usage: svnadmin lstxns REPOS_PATH\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:498 +msgid "" "Print the names of uncommitted transactions. With -rN skip the output\n" "of those that have a base revision more recent than rN. Transactions\n" "with base revisions much older than HEAD are likely to have been\n" "abandonded and are candidates to be removed.\n" msgstr "" -#: ../svnadmin/svnadmin.c:463 +#: ../svnadmin/svnadmin.c:507 msgid "" "usage: svnadmin pack REPOS_PATH\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:509 +msgid "" "Possibly compact the repository into a more efficient storage model.\n" "This may not apply to all repositories, in which case, exit.\n" msgstr "" -#: ../svnadmin/svnadmin.c:469 +#: ../svnadmin/svnadmin.c:515 msgid "" "usage: svnadmin recover REPOS_PATH\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:517 +msgid "" "Run the recovery procedure on a repository. Do this if you've\n" "been getting errors indicating that recovery ought to be run.\n" "Berkeley DB recovery requires exclusive access and will\n" "exit if the repository is in use by another process.\n" msgstr "" -#: ../svnadmin/svnadmin.c:477 +#: ../svnadmin/svnadmin.c:525 +msgid "" +"usage: svnadmin rev-size REPOS_PATH -r REVISION\n" +"\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:527 +msgid "" +"Print the total size in bytes of the representation on disk of\n" +"revision REVISION.\n" +"\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:530 +msgid "The size includes revision properties and excludes FSFS indexes.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:536 msgid "" "usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n" "\n" -"Unconditionally remove lock from each LOCKED_PATH.\n" msgstr "" -#: ../svnadmin/svnadmin.c:482 +#: ../svnadmin/svnadmin.c:538 +msgid "Unconditionally remove lock from each LOCKED_PATH.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:543 msgid "" "usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n" "\n" -"Delete the named transaction(s).\n" msgstr "" -#: ../svnadmin/svnadmin.c:487 +#: ../svnadmin/svnadmin.c:545 +msgid "Delete the named transaction(s).\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:550 msgid "" "usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:552 +msgid "" "Set the log-message on revision REVISION to the contents of FILE. Use\n" "--bypass-hooks to avoid triggering the revision-property-related hooks\n" "(for example, if you do not want an email notification sent\n" @@ -16302,52 +17742,79 @@ msgid "" "revision properties has not been enabled in the pre-revprop-change\n" "hook).\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:559 +msgid "" "NOTE: Revision properties are not versioned, so this command will\n" "overwrite the previous log message.\n" msgstr "" -#: ../svnadmin/svnadmin.c:499 +#: ../svnadmin/svnadmin.c:565 msgid "" "usage: 1. svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n" " 2. svnadmin setrevprop REPOS_PATH -t TXN NAME FILE\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:568 +msgid "" "1. Set the property NAME on revision REVISION to the contents of FILE.\n" "\n" -"Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n" -"trigger the revision property-related hooks (for example, if you want\n" -"an email notification sent from your post-revprop-change hook).\n" -"\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:574 +msgid "" "NOTE: Revision properties are not versioned, so this command will\n" "overwrite the previous value of the property.\n" "\n" -"2. Set the property NAME on transaction TXN to the contents of FILE.\n" msgstr "" -#: ../svnadmin/svnadmin.c:512 +#: ../svnadmin/svnadmin.c:577 +msgid "2. Set the property NAME on transaction TXN to the contents of FILE.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:583 msgid "" "usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:585 +msgid "" "Reset the repository UUID for the repository located at REPOS_PATH. If\n" "NEW_UUID is provided, use that as the new repository UUID; otherwise,\n" "generate a brand new UUID for the repository.\n" msgstr "" -#: ../svnadmin/svnadmin.c:519 +#: ../svnadmin/svnadmin.c:592 msgid "" "usage: svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME TOKEN\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:594 +msgid "" "Unlock LOCKED_PATH (as USERNAME) after verifying that the token\n" "associated with the lock matches TOKEN. Use --bypass-hooks to avoid\n" "triggering the pre-unlock and post-unlock hook scripts.\n" msgstr "" -#: ../svnadmin/svnadmin.c:526 +#: ../svnadmin/svnadmin.c:601 msgid "" "usage: svnadmin upgrade REPOS_PATH\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:603 +msgid "" "Upgrade the repository located at REPOS_PATH to the latest supported\n" "schema version.\n" "\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:606 +msgid "" "This functionality is provided as a convenience for repository\n" "administrators who wish to make use of new Subversion functionality\n" "without having to undertake a potentially costly full repository dump\n" @@ -16357,165 +17824,164 @@ msgid "" "repository state as a dump and subsequent load would.\n" msgstr "" -#: ../svnadmin/svnadmin.c:539 +#: ../svnadmin/svnadmin.c:617 msgid "" "usage: svnadmin verify REPOS_PATH\n" "\n" -"Verify the data stored in the repository.\n" msgstr "" -#: ../svnadmin/svnadmin.c:640 +#: ../svnadmin/svnadmin.c:619 +msgid "Verify the data stored in the repository.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:720 ../svnadmin/svnadmin.c:2911 msgid "Invalid revision specifier" msgstr "" -#: ../svnadmin/svnadmin.c:644 +#: ../svnadmin/svnadmin.c:724 #, c-format msgid "Revisions must not be greater than the youngest revision (%ld)" msgstr "" -#: ../svnadmin/svnadmin.c:671 +#: ../svnadmin/svnadmin.c:751 #, c-format msgid "Path '%s' is not a local path" msgstr "" -#: ../svnadmin/svnadmin.c:700 +#: ../svnadmin/svnadmin.c:780 msgid "Not enough arguments" msgstr "" -#: ../svnadmin/svnadmin.c:703 -msgid "Too many arguments" -msgstr "" - -#: ../svnadmin/svnadmin.c:743 +#: ../svnadmin/svnadmin.c:823 #, c-format msgid "" "Successfully opened repository '%s'.\n" "Will now crash to simulate a crashing server process.\n" msgstr "" -#: ../svnadmin/svnadmin.c:782 +#: ../svnadmin/svnadmin.c:862 #, c-format msgid "" "%swarning: The \"%s\" repository back-end is deprecated, consider using \"%s" "\" instead.\n" msgstr "" -#: ../svnadmin/svnadmin.c:823 +#: ../svnadmin/svnadmin.c:903 msgid "Repositories compatible with 1.0.x must use --fs-type=bdb" msgstr "" -#: ../svnadmin/svnadmin.c:831 +#: ../svnadmin/svnadmin.c:911 #, c-format msgid "Repositories compatible with 1.8.x or earlier cannot use --fs-type=%s" msgstr "" -#: ../svnadmin/svnadmin.c:876 ../svnadmin/svnadmin.c:1276 -#: ../svnadmin/svnadmin.c:1606 +#: ../svnadmin/svnadmin.c:956 ../svnadmin/svnadmin.c:1356 +#: ../svnadmin/svnadmin.c:1686 msgid "First revision cannot be higher than second" msgstr "" -#: ../svnadmin/svnadmin.c:885 +#: ../svnadmin/svnadmin.c:965 #, c-format msgid "Deltifying revision %ld..." msgstr "" -#: ../svnadmin/svnadmin.c:889 ../svnadmin/svnadmin.c:1020 -#: ../svnadmin/svnadmin.c:1035 +#: ../svnadmin/svnadmin.c:969 ../svnadmin/svnadmin.c:1100 +#: ../svnadmin/svnadmin.c:1115 #, c-format msgid "done.\n" msgstr "" -#: ../svnadmin/svnadmin.c:938 +#: ../svnadmin/svnadmin.c:1018 msgid "* Error verifying repository metadata.\n" msgstr "" -#: ../svnadmin/svnadmin.c:944 +#: ../svnadmin/svnadmin.c:1024 #, c-format msgid "* Error verifying revision %ld.\n" msgstr "" -#: ../svnadmin/svnadmin.c:1001 +#: ../svnadmin/svnadmin.c:1081 msgid "* Verifying repository metadata ...\n" msgstr "" -#: ../svnadmin/svnadmin.c:1004 +#: ../svnadmin/svnadmin.c:1084 #, c-format msgid "* Verifying metadata at revision %ld ...\n" msgstr "" -#: ../svnadmin/svnadmin.c:1014 +#: ../svnadmin/svnadmin.c:1094 #, c-format msgid "Packing revisions in shard %s..." msgstr "" -#: ../svnadmin/svnadmin.c:1029 +#: ../svnadmin/svnadmin.c:1109 #, c-format msgid "Packing revprops in shard %s..." msgstr "" -#: ../svnadmin/svnadmin.c:1104 +#: ../svnadmin/svnadmin.c:1184 #, c-format msgid "<<< Skipped original revision %ld\n" msgstr "" -#: ../svnadmin/svnadmin.c:1120 +#: ../svnadmin/svnadmin.c:1200 msgid "" "Repository lock acquired.\n" "Please wait; recovering the repository may take some time...\n" msgstr "" -#: ../svnadmin/svnadmin.c:1127 +#: ../svnadmin/svnadmin.c:1207 msgid "" "Repository lock acquired.\n" "Please wait; upgrading the repository may take some time...\n" msgstr "" -#: ../svnadmin/svnadmin.c:1138 +#: ../svnadmin/svnadmin.c:1218 #, c-format msgid "Packed revision properties in shard %s\n" msgstr "" -#: ../svnadmin/svnadmin.c:1149 +#: ../svnadmin/svnadmin.c:1229 #, c-format msgid "Removed non-packed revision properties in shard %s\n" msgstr "" -#: ../svnadmin/svnadmin.c:1157 +#: ../svnadmin/svnadmin.c:1237 #, c-format msgid "Bumped repository format to %ld\n" msgstr "" -#: ../svnadmin/svnadmin.c:1165 +#: ../svnadmin/svnadmin.c:1245 #, c-format msgid "* Copied revision %ld.\n" msgstr "" -#: ../svnadmin/svnadmin.c:1171 +#: ../svnadmin/svnadmin.c:1251 #, c-format msgid "* Copied revisions from %ld to %ld.\n" msgstr "" -#: ../svnadmin/svnadmin.c:1182 +#: ../svnadmin/svnadmin.c:1262 #, c-format msgid "" "svnadmin: Warning - this repository is not sharded. Packing has no effect.\n" msgstr "" -#: ../svnadmin/svnadmin.c:1189 +#: ../svnadmin/svnadmin.c:1269 #, c-format msgid "Properties set on revision %ld.\n" msgstr "" -#: ../svnadmin/svnadmin.c:1384 +#: ../svnadmin/svnadmin.c:1464 #, c-format msgid "'--exclude' and '--include' options cannot be used simultaneously" msgstr "" -#: ../svnadmin/svnadmin.c:1488 +#: ../svnadmin/svnadmin.c:1568 msgid "No program provided" msgstr "" -#: ../svnadmin/svnadmin.c:1528 +#: ../svnadmin/svnadmin.c:1608 msgid "" "general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Subversion repository administration tool.\n" @@ -16525,197 +17991,197 @@ msgid "" "Available subcommands:\n" msgstr "" -#: ../svnadmin/svnadmin.c:1536 ../svnlook/svnlook.c:2218 +#: ../svnadmin/svnadmin.c:1616 ../svnlook/svnlook.c:2252 #: ../svnserve/svnserve.c:470 msgid "" "The following repository back-end (FS) modules are available:\n" "\n" msgstr "" -#: ../svnadmin/svnadmin.c:1565 +#: ../svnadmin/svnadmin.c:1645 #, c-format msgid "Invalid revision number (%ld) specified" msgstr "" -#: ../svnadmin/svnadmin.c:1575 +#: ../svnadmin/svnadmin.c:1655 msgid "Non-numeric revision specified" msgstr "" -#: ../svnadmin/svnadmin.c:1657 ../svnadmin/svnadmin.c:1715 +#: ../svnadmin/svnadmin.c:1737 ../svnadmin/svnadmin.c:1795 msgid "" "A property with invalid line ending found in dumpstream; consider using --" "normalize-props while loading." msgstr "" -#: ../svnadmin/svnadmin.c:1664 ../svnadmin/svnadmin.c:1722 +#: ../svnadmin/svnadmin.c:1744 ../svnadmin/svnadmin.c:1802 msgid "" "Invalid property value found in dumpstream; consider repairing the source or " "using --bypass-prop-validation while loading." msgstr "" -#: ../svnadmin/svnadmin.c:1814 ../svnadmin/svnadmin.c:2714 +#: ../svnadmin/svnadmin.c:1894 ../svnadmin/svnadmin.c:2794 msgid "" "Failed to get exclusive repository access; perhaps another process\n" "such as httpd, svnserve or svn has it open?" msgstr "" -#: ../svnadmin/svnadmin.c:1819 ../svnadmin/svnadmin.c:2719 +#: ../svnadmin/svnadmin.c:1899 ../svnadmin/svnadmin.c:2799 #, c-format msgid "Waiting on repository lock; perhaps another process has it open?\n" msgstr "" -#: ../svnadmin/svnadmin.c:1827 +#: ../svnadmin/svnadmin.c:1907 #, c-format msgid "" "\n" "Recovery completed.\n" msgstr "" -#: ../svnadmin/svnadmin.c:1834 +#: ../svnadmin/svnadmin.c:1914 #, c-format msgid "The latest repos revision is %ld.\n" msgstr "" -#: ../svnadmin/svnadmin.c:1946 +#: ../svnadmin/svnadmin.c:2026 #, c-format msgid "Transaction '%s' removed.\n" msgstr "" -#: ../svnadmin/svnadmin.c:2028 ../svnadmin/svnadmin.c:2142 -#: ../svnadmin/svnadmin.c:2764 +#: ../svnadmin/svnadmin.c:2108 ../svnadmin/svnadmin.c:2222 +#: ../svnadmin/svnadmin.c:2844 #, c-format msgid "--revision (-r) and --transaction (-t) are mutually exclusive" msgstr "" -#: ../svnadmin/svnadmin.c:2034 ../svnadmin/svnadmin.c:2770 +#: ../svnadmin/svnadmin.c:2114 ../svnadmin/svnadmin.c:2850 #, c-format msgid "Calling hooks is incompatible with --transaction (-t)" msgstr "" -#: ../svnadmin/svnadmin.c:2039 ../svnadmin/svnadmin.c:2084 -#: ../svnadmin/svnadmin.c:2775 +#: ../svnadmin/svnadmin.c:2119 ../svnadmin/svnadmin.c:2164 +#: ../svnadmin/svnadmin.c:2855 #, c-format msgid "Missing revision" msgstr "" -#: ../svnadmin/svnadmin.c:2042 ../svnadmin/svnadmin.c:2087 -#: ../svnadmin/svnadmin.c:2778 +#: ../svnadmin/svnadmin.c:2122 ../svnadmin/svnadmin.c:2167 +#: ../svnadmin/svnadmin.c:2858 #, c-format msgid "Only one revision allowed" msgstr "" -#: ../svnadmin/svnadmin.c:2206 +#: ../svnadmin/svnadmin.c:2286 msgid "" "\n" "-----Summary of corrupt revisions-----\n" msgstr "" -#: ../svnadmin/svnadmin.c:2258 +#: ../svnadmin/svnadmin.c:2338 #, c-format msgid "Failed to verify repository '%s'" msgstr "" -#: ../svnadmin/svnadmin.c:2310 +#: ../svnadmin/svnadmin.c:2390 #, c-format msgid "UUID: %s\n" msgstr "" -#: ../svnadmin/svnadmin.c:2313 +#: ../svnadmin/svnadmin.c:2393 #, c-format msgid "Revisions: %ld\n" msgstr "" -#: ../svnadmin/svnadmin.c:2319 +#: ../svnadmin/svnadmin.c:2399 #, c-format msgid "Repository Format: %d\n" msgstr "" -#: ../svnadmin/svnadmin.c:2333 +#: ../svnadmin/svnadmin.c:2413 #, c-format msgid "Compatible With Version: %d.%d.0\n" msgstr "" -#: ../svnadmin/svnadmin.c:2352 +#: ../svnadmin/svnadmin.c:2432 #, c-format msgid "Repository Capability: %s\n" msgstr "" -#: ../svnadmin/svnadmin.c:2361 +#: ../svnadmin/svnadmin.c:2441 #, c-format msgid "Filesystem Type: %s\n" msgstr "" -#: ../svnadmin/svnadmin.c:2363 +#: ../svnadmin/svnadmin.c:2443 #, c-format msgid "Filesystem Format: %d\n" msgstr "" -#: ../svnadmin/svnadmin.c:2370 +#: ../svnadmin/svnadmin.c:2450 #, c-format msgid "FSFS Sharded: yes\n" msgstr "" -#: ../svnadmin/svnadmin.c:2372 +#: ../svnadmin/svnadmin.c:2452 #, c-format msgid "FSFS Sharded: no\n" msgstr "" -#: ../svnadmin/svnadmin.c:2375 +#: ../svnadmin/svnadmin.c:2455 #, c-format msgid "FSFS Shard Size: %d\n" msgstr "" -#: ../svnadmin/svnadmin.c:2384 +#: ../svnadmin/svnadmin.c:2464 #, c-format msgid "FSFS Shards Packed: %ld/%ld\n" msgstr "" -#: ../svnadmin/svnadmin.c:2389 +#: ../svnadmin/svnadmin.c:2469 #, c-format msgid "FSFS Logical Addressing: yes\n" msgstr "" -#: ../svnadmin/svnadmin.c:2391 +#: ../svnadmin/svnadmin.c:2471 #, c-format msgid "FSFS Logical Addressing: no\n" msgstr "" -#: ../svnadmin/svnadmin.c:2401 +#: ../svnadmin/svnadmin.c:2481 #, c-format msgid "FSX Shard Size: %d\n" msgstr "" -#: ../svnadmin/svnadmin.c:2403 +#: ../svnadmin/svnadmin.c:2483 #, c-format msgid "FSX Shards Packed: %ld/%ld\n" msgstr "" -#: ../svnadmin/svnadmin.c:2414 +#: ../svnadmin/svnadmin.c:2494 #, c-format msgid "Configuration File: %s\n" msgstr "" -#: ../svnadmin/svnadmin.c:2542 ../svnlook/svnlook.c:2281 +#: ../svnadmin/svnadmin.c:2622 ../svnlook/svnlook.c:2315 #, c-format msgid "UUID Token: %s\n" msgstr "" -#: ../svnadmin/svnadmin.c:2543 ../svnlook/svnlook.c:2282 +#: ../svnadmin/svnadmin.c:2623 ../svnlook/svnlook.c:2316 #, c-format msgid "Owner: %s\n" msgstr "" -#: ../svnadmin/svnadmin.c:2544 ../svnlook/svnlook.c:2283 +#: ../svnadmin/svnadmin.c:2624 ../svnlook/svnlook.c:2317 #, c-format msgid "Created: %s\n" msgstr "" -#: ../svnadmin/svnadmin.c:2545 ../svnlook/svnlook.c:2284 +#: ../svnadmin/svnadmin.c:2625 ../svnlook/svnlook.c:2318 #, c-format msgid "Expires: %s\n" msgstr "" -#: ../svnadmin/svnadmin.c:2547 +#: ../svnadmin/svnadmin.c:2627 #, c-format msgid "" "Comment (%i line):\n" @@ -16728,82 +18194,92 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../svnadmin/svnadmin.c:2595 +#: ../svnadmin/svnadmin.c:2675 msgid "No paths to unlock provided" msgstr "" -#: ../svnadmin/svnadmin.c:2613 +#: ../svnadmin/svnadmin.c:2693 #, c-format msgid "Path '%s' isn't locked.\n" msgstr "" -#: ../svnadmin/svnadmin.c:2627 +#: ../svnadmin/svnadmin.c:2707 #, c-format msgid "Removed lock on '%s'.\n" msgstr "" -#: ../svnadmin/svnadmin.c:2681 +#: ../svnadmin/svnadmin.c:2761 #, c-format msgid "'%s' unlocked by user '%s'.\n" msgstr "" -#: ../svnadmin/svnadmin.c:2729 +#: ../svnadmin/svnadmin.c:2809 msgid "" "Upgrade of this repository's underlying versioned filesystem is not " "supported; consider dumping and loading the data elsewhere" msgstr "" -#: ../svnadmin/svnadmin.c:2736 +#: ../svnadmin/svnadmin.c:2816 msgid "" "Upgrade of this repository is not supported; consider dumping and loading " "the data elsewhere" msgstr "" -#: ../svnadmin/svnadmin.c:2742 +#: ../svnadmin/svnadmin.c:2822 #, c-format msgid "" "\n" "Upgrade completed.\n" msgstr "" -#: ../svnadmin/svnadmin.c:2856 ../svnfsfs/svnfsfs.c:281 -#: ../svnrdump/svnrdump.c:843 +#: ../svnadmin/svnadmin.c:2889 +#, c-format +msgid "" +"Revision size query is not implemented for the filesytem type found in '%s'" +msgstr "" + +#: ../svnadmin/svnadmin.c:2920 +msgid "%12" +msgstr "" + +#: ../svnadmin/svnadmin.c:2998 ../svnfsfs/svnfsfs.c:293 +#: ../svnrdump/svnrdump.c:853 msgid "" "Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'" msgstr "" -#: ../svnadmin/svnadmin.c:2939 +#: ../svnadmin/svnadmin.c:3081 #, c-format msgid "Cannot create pre-1.0-compatible repositories" msgstr "" -#: ../svnadmin/svnadmin.c:2951 +#: ../svnadmin/svnadmin.c:3093 #, c-format msgid "Cannot guarantee compatibility beyond the current running version (%s)" msgstr "" -#: ../svnadmin/svnadmin.c:3075 ../svnfsfs/svnfsfs.c:350 +#: ../svnadmin/svnadmin.c:3217 ../svnfsfs/svnfsfs.c:362 #, c-format msgid "subcommand argument required\n" msgstr "" -#: ../svnadmin/svnadmin.c:3112 ../svnfsfs/svnfsfs.c:385 +#: ../svnadmin/svnadmin.c:3254 ../svnfsfs/svnfsfs.c:397 msgid "Repository argument required" msgstr "" -#: ../svnadmin/svnadmin.c:3120 ../svnfsfs/svnfsfs.c:393 +#: ../svnadmin/svnadmin.c:3262 ../svnfsfs/svnfsfs.c:405 #, c-format msgid "'%s' is a URL when it should be a local path" msgstr "" -#: ../svnadmin/svnadmin.c:3150 +#: ../svnadmin/svnadmin.c:3292 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svnadmin help %s' for usage.\n" msgstr "" -#: ../svnadmin/svnadmin.c:3181 +#: ../svnadmin/svnadmin.c:3323 msgid "Try 'svnadmin help' for more info" msgstr "" @@ -16876,7 +18352,11 @@ msgid "" "%15s changes\n" msgstr "" -#: ../svnbench/svnbench.c:115 ../svnrdump/svnrdump.c:118 +#: ../svnbench/svnbench.c:87 +msgid "obsolete; try --depth=files or --depth=immediates" +msgstr "" + +#: ../svnbench/svnbench.c:115 ../svnrdump/svnrdump.c:126 msgid "specify a password ARG" msgstr "" @@ -16892,181 +18372,176 @@ msgstr "" msgid "use ARG as search pattern (glob syntax)" msgstr "" -#: ../svnbench/svnbench.c:218 +#: ../svnbench/svnbench.c:219 msgid "" "Fetch all versions of a file in a batch.\n" "usage: null-blame [-rM:N] TARGET[@REV]...\n" "\n" -" With no revision range (same as -r0:REV), or with '-r M:N' where M < N,\n" -" annotate each line that is present in revision N of the file, with\n" -" the last revision at or before rN that changed or added the line,\n" -" looking back no further than rM.\n" -"\n" -" With a reverse revision range '-r M:N' where M > N,\n" -" annotate each line that is present in revision N of the file, with\n" -" the next revision after rN that changed or deleted the line,\n" -" looking forward no further than rM.\n" -"\n" -" If specified, REV determines in which revision the target is first\n" -" looked up.\n" -"\n" -" Write the annotated result to standard output.\n" msgstr "" -#: ../svnbench/svnbench.c:238 +#: ../svnbench/svnbench.c:240 msgid "" "Create an unversioned copy of a tree.\n" "usage: null-export [-r REV] URL[@PEGREV]\n" "\n" +msgstr "" + +#: ../svnbench/svnbench.c:243 +msgid "" " Exports a clean directory tree from the repository specified by\n" " URL, at revision REV if it is given, otherwise at HEAD.\n" "\n" -" If specified, PEGREV determines in which revision the target is first\n" -" looked up.\n" msgstr "" -#: ../svnbench/svnbench.c:249 +#: ../svnbench/svnbench.c:252 msgid "" "List directory entries in the repository.\n" "usage: null-list [TARGET[@REV]...]\n" "\n" -" List each TARGET file and the contents of each TARGET directory as\n" -" they exist in the repository. If TARGET is a working copy path, the\n" -" corresponding repository URL will be used. If specified, REV determines\n" -" in which revision the target is first looked up.\n" -"\n" -" The default TARGET is '.', meaning the repository URL of the current\n" -" working directory.\n" -"\n" +msgstr "" + +#: ../svnbench/svnbench.c:263 +msgid "" " With --verbose, the following fields will be fetched for each item:\n" "\n" -" Revision number of the last commit\n" -" Author of the last commit\n" -" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n" -" Size (in bytes)\n" -" Date and time of the last commit\n" msgstr "" -#: ../svnbench/svnbench.c:270 +#: ../svnbench/svnbench.c:274 msgid "" "Fetch the log messages for a set of revision(s) and/or path(s).\n" "usage: 1. null-log [PATH][@REV]\n" " 2. null-log URL[@REV] [PATH...]\n" "\n" +msgstr "" + +#: ../svnbench/svnbench.c:278 +msgid "" " 1. Fetch the log messages for the URL corresponding to PATH\n" " (default: '.'). If specified, REV is the revision in which the\n" " URL is first looked up, and the default revision range is REV:1.\n" " If REV is not specified, the default revision range is BASE:1,\n" " since the URL might not exist in the HEAD revision.\n" "\n" +msgstr "" + +#: ../svnbench/svnbench.c:284 +msgid "" " 2. Fetch the log messages for the PATHs (default: '.') under URL.\n" " If specified, REV is the revision in which the URL is first\n" " looked up, and the default revision range is REV:1; otherwise,\n" " the URL is looked up in HEAD, and the default revision range is\n" " HEAD:1.\n" "\n" -" Multiple '-c' or '-r' options may be specified (but not a\n" -" combination of '-c' and '-r' options), and mixing of forward and\n" -" reverse ranges is allowed.\n" -"\n" +msgstr "" + +#: ../svnbench/svnbench.c:294 +msgid "" " With -v, also print all affected paths with each log message.\n" " With -q, don't print the log message body itself (note that this is\n" " compatible with -v).\n" "\n" +msgstr "" + +#: ../svnbench/svnbench.c:298 +msgid "" " Each log message is printed just once, even if more than one of the\n" " affected paths for that revision were explicitly requested. Logs\n" " follow copy history by default. Use --stop-on-copy to disable this\n" " behavior, which can be useful for determining branchpoints.\n" msgstr "" -#: ../svnbench/svnbench.c:304 +#: ../svnbench/svnbench.c:309 msgid "" "Display information about a local or remote item.\n" "usage: null-info [TARGET[@REV]...]\n" "\n" +msgstr "" + +#: ../svnbench/svnbench.c:312 +msgid "" " Print information about each TARGET (default: '.').\n" " TARGET may be either a working-copy path or URL. If specified, REV\n" " determines in which revision the target is first looked up.\n" msgstr "" -#: ../svnbench/svnbench.c:802 +#: ../svnbench/svnbench.c:808 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svnbench help %s' for usage.\n" msgstr "" -#: ../svnbench/svnbench.c:994 +#: ../svnbench/svnbench.c:1000 #, c-format msgid "Try 'svnbench help %s' for more information" msgstr "" -#: ../svnbench/svnbench.c:1019 +#: ../svnbench/svnbench.c:1025 #, c-format msgid "%15.6f seconds taken\n" msgstr "" -#: ../svnbench/svnbench.c:1026 +#: ../svnbench/svnbench.c:1032 #, c-format msgid "%15s bytes transferred over network\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:361 +#: ../svndumpfilter/svndumpfilter.c:360 msgid "This is an empty revision for padding." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:413 +#: ../svndumpfilter/svndumpfilter.c:412 #, c-format msgid "Revision %ld committed as %ld.\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:436 +#: ../svndumpfilter/svndumpfilter.c:435 #, c-format msgid "Revision %ld skipped.\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:533 +#: ../svndumpfilter/svndumpfilter.c:532 #, c-format msgid "Invalid copy source path '%s' for '%s'" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:572 +#: ../svndumpfilter/svndumpfilter.c:571 #, c-format msgid "Missing Node-action for path '%s'" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:615 +#: ../svndumpfilter/svndumpfilter.c:614 #, c-format msgid "No valid copyfrom revision in filtered stream for '%s'" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:684 +#: ../svndumpfilter/svndumpfilter.c:683 #, c-format msgid "Missing merge source path '%s'; try with --skip-missing-merge-sources" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:706 +#: ../svndumpfilter/svndumpfilter.c:705 #, c-format msgid "No valid revision range 'start' in filtered stream" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:713 +#: ../svndumpfilter/svndumpfilter.c:712 #, c-format msgid "No valid revision range 'end' in filtered stream" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:761 ../svndumpfilter/svndumpfilter.c:792 +#: ../svndumpfilter/svndumpfilter.c:760 ../svndumpfilter/svndumpfilter.c:791 #, c-format msgid "" "Delta property block detected, but deltas are not enabled for node '%s' in " "original revision %ld" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:954 +#: ../svndumpfilter/svndumpfilter.c:953 msgid "Do not display filtering statistics." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:956 +#: ../svndumpfilter/svndumpfilter.c:955 msgid "" "Treat the path prefixes as file glob patterns.\n" " Glob special characters are '*' '?' '[]' and " @@ -17076,35 +18551,35 @@ msgid "" "foo." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:961 +#: ../svndumpfilter/svndumpfilter.c:960 msgid "Remove revisions emptied by filtering." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:963 +#: ../svndumpfilter/svndumpfilter.c:962 msgid "" "Remove all empty revisions found in dumpstream\n" " except revision 0." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:966 +#: ../svndumpfilter/svndumpfilter.c:965 msgid "Renumber revisions left after filtering." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:969 +#: ../svndumpfilter/svndumpfilter.c:968 msgid "Skip missing merge sources." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:971 +#: ../svndumpfilter/svndumpfilter.c:970 msgid "Don't filter revision properties." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:973 +#: ../svndumpfilter/svndumpfilter.c:972 msgid "" "Read additional prefixes, one per line, from\n" " file ARG." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:985 +#: ../svndumpfilter/svndumpfilter.c:984 msgid "" "Filter out nodes with given prefixes from dumpstream.\n" "usage: svndumpfilter exclude PATH_PREFIX...\n" @@ -17116,13 +18591,13 @@ msgid "" "usage: svndumpfilter include PATH_PREFIX...\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1003 +#: ../svndumpfilter/svndumpfilter.c:1004 msgid "" "Describe the usage of this program or its subcommands.\n" "usage: svndumpfilter help [SUBCOMMAND...]\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1077 +#: ../svndumpfilter/svndumpfilter.c:1079 msgid "" "general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n" "Subversion repository dump filtering tool.\n" @@ -17132,47 +18607,47 @@ msgid "" "Available subcommands:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1136 +#: ../svndumpfilter/svndumpfilter.c:1138 #, c-format msgid "Excluding (and dropping empty revisions for) prefix patterns:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1138 +#: ../svndumpfilter/svndumpfilter.c:1140 #, c-format msgid "Excluding prefix patterns:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1141 +#: ../svndumpfilter/svndumpfilter.c:1143 #, c-format msgid "Including (and dropping empty revisions for) prefix patterns:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1143 +#: ../svndumpfilter/svndumpfilter.c:1145 #, c-format msgid "Including prefix patterns:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1151 +#: ../svndumpfilter/svndumpfilter.c:1153 #, c-format msgid "Excluding (and dropping empty revisions for) prefixes:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1153 +#: ../svndumpfilter/svndumpfilter.c:1155 #, c-format msgid "Excluding prefixes:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1156 +#: ../svndumpfilter/svndumpfilter.c:1158 #, c-format msgid "Including (and dropping empty revisions for) prefixes:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1158 +#: ../svndumpfilter/svndumpfilter.c:1160 #, c-format msgid "Including prefixes:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1186 +#: ../svndumpfilter/svndumpfilter.c:1188 #, c-format msgid "" "Dropped %d revision.\n" @@ -17183,41 +18658,41 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../svndumpfilter/svndumpfilter.c:1194 +#: ../svndumpfilter/svndumpfilter.c:1196 msgid "Revisions renumbered as follows:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1221 +#: ../svndumpfilter/svndumpfilter.c:1223 #, c-format msgid " %ld => (dropped)\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1236 +#: ../svndumpfilter/svndumpfilter.c:1238 #, c-format msgid "Dropped %d node:\n" msgid_plural "Dropped %d nodes:\n" msgstr[0] "" msgstr[1] "" -#: ../svndumpfilter/svndumpfilter.c:1395 +#: ../svndumpfilter/svndumpfilter.c:1397 msgid "--drop-empty-revs cannot be used with --drop-all-empty-revs" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1506 +#: ../svndumpfilter/svndumpfilter.c:1508 #, c-format msgid "" "\n" "Error: no prefixes supplied.\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1537 +#: ../svndumpfilter/svndumpfilter.c:1539 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svndumpfilter help %s' for usage.\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1555 +#: ../svndumpfilter/svndumpfilter.c:1557 msgid "Try 'svndumpfilter help' for more info" msgstr "" @@ -17312,13 +18787,16 @@ msgstr "" msgid "" "usage: svnfsfs help [SUBCOMMAND...]\n" "\n" -"Describe the usage of this program or its subcommands.\n" msgstr "" -#: ../svnfsfs/svnfsfs.c:122 +#: ../svnfsfs/svnfsfs.c:124 msgid "" "usage: svnfsfs dump-index REPOS_PATH -r REV\n" "\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:126 +msgid "" "Dump the index contents for the revision / pack file containing revision " "REV\n" "to console. This is only available for FSFS format 7 (SVN 1.9+) " @@ -17326,10 +18804,18 @@ msgid "" "The table produced contains a header in the first line followed by one line\n" "per index entry, ordered by location in the revision / pack file. Columns:\n" "\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:131 +msgid "" " * Byte offset (hex) at which the item starts\n" " * Length (hex) of the item in bytes\n" " * Item type (string) is one of the following:\n" "\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:135 +msgid "" " none ... Unused section. File contents shall be NULs.\n" " frep ... File representation.\n" " drep ... Directory representation.\n" @@ -17340,21 +18826,33 @@ msgid "" " rep .... Representation of unknown type. Should not be used.\n" " ??? .... Invalid. Index data is corrupt.\n" "\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:145 +msgid "" " The distinction between frep, drep, fprop and dprop is a mere " "internal\n" " classification used for various optimizations and does not affect " "the\n" " operational correctness.\n" "\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:149 +msgid "" " * Revision that the item belongs to (decimal)\n" " * Item number (decimal) within that revision\n" " * Modified FNV1a checksum (8 hex digits)\n" msgstr "" -#: ../svnfsfs/svnfsfs.c:148 +#: ../svnfsfs/svnfsfs.c:156 msgid "" "usage: svnfsfs load-index REPOS_PATH\n" "\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:158 +msgid "" "Read index contents from console. The format is the same as produced by " "the\n" "dump-index command, except that checksum as well as header are optional and " @@ -17365,19 +18863,22 @@ msgid "" "required.\n" msgstr "" -#: ../svnfsfs/svnfsfs.c:156 +#: ../svnfsfs/svnfsfs.c:166 msgid "" "usage: svnfsfs stats REPOS_PATH\n" "\n" -"Write object size statistics to console.\n" msgstr "" -#: ../svnfsfs/svnfsfs.c:176 +#: ../svnfsfs/svnfsfs.c:168 +msgid "Write object size statistics to console.\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:188 #, c-format msgid "%s repositories are not supported" msgstr "" -#: ../svnfsfs/svnfsfs.c:192 +#: ../svnfsfs/svnfsfs.c:204 msgid "" "general usage: svnfsfs SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Subversion FSFS repository manipulation tool.\n" @@ -17387,14 +18888,14 @@ msgid "" "Available subcommands:\n" msgstr "" -#: ../svnfsfs/svnfsfs.c:423 +#: ../svnfsfs/svnfsfs.c:435 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svnfsfs help %s' for usage.\n" msgstr "" -#: ../svnfsfs/svnfsfs.c:455 +#: ../svnfsfs/svnfsfs.c:467 msgid "Try 'svnfsfs help' for more info" msgstr "" @@ -17456,7 +18957,7 @@ msgid "" " -p, --show-c-function: Show C function name" msgstr "" -#: ../svnlook/svnlook.c:206 ../svnrdump/svnrdump.c:108 +#: ../svnlook/svnlook.c:206 ../svnrdump/svnrdump.c:116 #: ../svnserve/svnserve.c:421 ../svnversion/svnversion.c:146 msgid "no progress (only errors) to stderr" msgstr "" @@ -17465,238 +18966,291 @@ msgstr "" msgid "" "usage: svnlook author REPOS_PATH\n" "\n" -"Print the author.\n" msgstr "" -#: ../svnlook/svnlook.c:223 +#: ../svnlook/svnlook.c:220 +msgid "Print the author.\n" +msgstr "" + +#: ../svnlook/svnlook.c:225 msgid "" "usage: svnlook cat REPOS_PATH FILE_PATH\n" "\n" -"Print the contents of a file. Leading '/' on FILE_PATH is optional.\n" msgstr "" -#: ../svnlook/svnlook.c:228 +#: ../svnlook/svnlook.c:227 +msgid "Print the contents of a file. Leading '/' on FILE_PATH is optional.\n" +msgstr "" + +#: ../svnlook/svnlook.c:232 msgid "" "usage: svnlook changed REPOS_PATH\n" "\n" -"Print the paths that were changed.\n" msgstr "" -#: ../svnlook/svnlook.c:233 +#: ../svnlook/svnlook.c:234 +msgid "Print the paths that were changed.\n" +msgstr "" + +#: ../svnlook/svnlook.c:239 msgid "" "usage: svnlook date REPOS_PATH\n" "\n" -"Print the datestamp.\n" msgstr "" -#: ../svnlook/svnlook.c:238 +#: ../svnlook/svnlook.c:241 +msgid "Print the datestamp.\n" +msgstr "" + +#: ../svnlook/svnlook.c:246 msgid "" "usage: svnlook diff REPOS_PATH\n" "\n" -"Print GNU-style diffs of changed files and properties.\n" msgstr "" -#: ../svnlook/svnlook.c:245 +#: ../svnlook/svnlook.c:248 +msgid "Print GNU-style diffs of changed files and properties.\n" +msgstr "" + +#: ../svnlook/svnlook.c:255 msgid "" "usage: svnlook dirs-changed REPOS_PATH\n" "\n" +msgstr "" + +#: ../svnlook/svnlook.c:257 +msgid "" "Print the directories that were themselves changed (property edits)\n" "or whose file children were changed.\n" msgstr "" -#: ../svnlook/svnlook.c:251 +#: ../svnlook/svnlook.c:263 msgid "" "usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n" "\n" +msgstr "" + +#: ../svnlook/svnlook.c:265 +msgid "" "Print the size (in bytes) of the file located at PATH_IN_REPOS as\n" "it is represented in the repository.\n" msgstr "" -#: ../svnlook/svnlook.c:257 +#: ../svnlook/svnlook.c:271 msgid "" "usage: svnlook help [SUBCOMMAND...]\n" "\n" -"Describe the usage of this program or its subcommands.\n" msgstr "" -#: ../svnlook/svnlook.c:262 +#: ../svnlook/svnlook.c:278 msgid "" "usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n" "\n" +msgstr "" + +#: ../svnlook/svnlook.c:280 +msgid "" "Print information about the history of a path in the repository (or\n" "the root directory if no path is supplied).\n" msgstr "" -#: ../svnlook/svnlook.c:268 +#: ../svnlook/svnlook.c:286 msgid "" "usage: svnlook info REPOS_PATH\n" "\n" -"Print the author, datestamp, log message size, and log message.\n" msgstr "" -#: ../svnlook/svnlook.c:273 +#: ../svnlook/svnlook.c:288 +msgid "Print the author, datestamp, log message size, and log message.\n" +msgstr "" + +#: ../svnlook/svnlook.c:293 msgid "" "usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n" "\n" -"If a lock exists on a path in the repository, describe it.\n" msgstr "" -#: ../svnlook/svnlook.c:278 +#: ../svnlook/svnlook.c:295 +msgid "If a lock exists on a path in the repository, describe it.\n" +msgstr "" + +#: ../svnlook/svnlook.c:300 msgid "" "usage: svnlook log REPOS_PATH\n" "\n" -"Print the log message.\n" msgstr "" -#: ../svnlook/svnlook.c:283 +#: ../svnlook/svnlook.c:302 +msgid "Print the log message.\n" +msgstr "" + +#: ../svnlook/svnlook.c:307 msgid "" "usage: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n" " 2. svnlook propget --revprop REPOS_PATH PROPNAME\n" "\n" +msgstr "" + +#: ../svnlook/svnlook.c:312 +msgid "" "Print the raw value of a property on a path in the repository.\n" "With --revprop, print the raw value of a revision property.\n" msgstr "" -#: ../svnlook/svnlook.c:292 +#: ../svnlook/svnlook.c:318 msgid "" "usage: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n" " 2. svnlook proplist --revprop REPOS_PATH\n" "\n" +msgstr "" + +#: ../svnlook/svnlook.c:323 +msgid "" "List the properties of a path in the repository, or\n" "with the --revprop option, revision properties.\n" "With -v, show the property values too.\n" msgstr "" -#: ../svnlook/svnlook.c:303 +#: ../svnlook/svnlook.c:331 msgid "" "usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n" "\n" +msgstr "" + +#: ../svnlook/svnlook.c:333 +msgid "" "Print the tree, starting at PATH_IN_REPOS (if supplied, at the root\n" "of the tree otherwise), optionally showing node revision ids.\n" msgstr "" -#: ../svnlook/svnlook.c:309 +#: ../svnlook/svnlook.c:339 msgid "" "usage: svnlook uuid REPOS_PATH\n" "\n" -"Print the repository's UUID.\n" msgstr "" -#: ../svnlook/svnlook.c:314 +#: ../svnlook/svnlook.c:341 +msgid "Print the repository's UUID.\n" +msgstr "" + +#: ../svnlook/svnlook.c:346 msgid "" "usage: svnlook youngest REPOS_PATH\n" "\n" -"Print the youngest revision number.\n" msgstr "" -#: ../svnlook/svnlook.c:790 +#: ../svnlook/svnlook.c:348 +msgid "Print the youngest revision number.\n" +msgstr "" + +#: ../svnlook/svnlook.c:824 #, c-format msgid "%sProperty changes on: %s%s" msgstr "" -#: ../svnlook/svnlook.c:857 +#: ../svnlook/svnlook.c:891 #, c-format msgid "Copied: %s (from rev %ld, %s)\n" msgstr "" -#: ../svnlook/svnlook.c:925 +#: ../svnlook/svnlook.c:959 msgid "Added" msgstr "" -#: ../svnlook/svnlook.c:926 +#: ../svnlook/svnlook.c:960 msgid "Deleted" msgstr "" -#: ../svnlook/svnlook.c:927 +#: ../svnlook/svnlook.c:961 msgid "Modified" msgstr "" -#: ../svnlook/svnlook.c:928 +#: ../svnlook/svnlook.c:962 msgid "Index" msgstr "" -#: ../svnlook/svnlook.c:939 +#: ../svnlook/svnlook.c:973 msgid "" "(Binary files differ)\n" "\n" msgstr "" -#: ../svnlook/svnlook.c:1208 +#: ../svnlook/svnlook.c:1242 msgid "unknown" msgstr "" -#: ../svnlook/svnlook.c:1265 +#: ../svnlook/svnlook.c:1299 #, c-format msgid "Transaction '%s' is not based on a revision; how odd" msgstr "" -#: ../svnlook/svnlook.c:1408 +#: ../svnlook/svnlook.c:1442 #, c-format msgid "'%s' is a URL, probably should be a path" msgstr "" -#: ../svnlook/svnlook.c:1431 ../svnlook/svnlook.c:1454 +#: ../svnlook/svnlook.c:1465 ../svnlook/svnlook.c:1488 #, c-format msgid "Path '%s' is not a file" msgstr "" -#: ../svnlook/svnlook.c:1588 +#: ../svnlook/svnlook.c:1622 msgid "History item limit reached" msgstr "" -#: ../svnlook/svnlook.c:1607 +#: ../svnlook/svnlook.c:1641 #, c-format msgid "" "REVISION PATH \n" "-------- ---------\n" msgstr "" -#: ../svnlook/svnlook.c:1612 +#: ../svnlook/svnlook.c:1646 #, c-format msgid "" "REVISION PATH\n" "-------- ----\n" msgstr "" -#: ../svnlook/svnlook.c:1685 +#: ../svnlook/svnlook.c:1719 #, c-format msgid "Property '%s' not found on revision %ld" msgstr "" -#: ../svnlook/svnlook.c:1689 +#: ../svnlook/svnlook.c:1723 #, c-format msgid "Property '%s' not found on transaction %s" msgstr "" -#: ../svnlook/svnlook.c:1698 +#: ../svnlook/svnlook.c:1732 #, c-format msgid "" "Property '%s' not found on path '%s' or inherited from a parent in revision " "%ld" msgstr "" -#: ../svnlook/svnlook.c:1704 +#: ../svnlook/svnlook.c:1738 #, c-format msgid "Property '%s' not found on path '%s' in revision %ld" msgstr "" -#: ../svnlook/svnlook.c:1712 +#: ../svnlook/svnlook.c:1746 #, c-format msgid "" "Property '%s' not found on path '%s' or inherited from a parent in " "transaction %s" msgstr "" -#: ../svnlook/svnlook.c:1718 +#: ../svnlook/svnlook.c:1752 #, c-format msgid "Property '%s' not found on path '%s' in transaction %s" msgstr "" -#: ../svnlook/svnlook.c:2055 +#: ../svnlook/svnlook.c:2089 msgid "Missing repository path argument" msgstr "" -#: ../svnlook/svnlook.c:2207 +#: ../svnlook/svnlook.c:2241 msgid "" "general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Subversion repository inspection tool.\n" @@ -17709,7 +19263,7 @@ msgid "" "Available subcommands:\n" msgstr "" -#: ../svnlook/svnlook.c:2286 +#: ../svnlook/svnlook.c:2320 #, c-format msgid "" "Comment (%i line):\n" @@ -17720,57 +19274,57 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../svnlook/svnlook.c:2338 +#: ../svnlook/svnlook.c:2372 #, c-format msgid "Missing propname argument" msgstr "" -#: ../svnlook/svnlook.c:2339 +#: ../svnlook/svnlook.c:2373 #, c-format msgid "Missing propname and repository path arguments" msgstr "" -#: ../svnlook/svnlook.c:2345 +#: ../svnlook/svnlook.c:2379 msgid "Missing propname or repository path argument" msgstr "" -#: ../svnlook/svnlook.c:2499 +#: ../svnlook/svnlook.c:2533 msgid "Invalid revision number supplied" msgstr "" -#: ../svnlook/svnlook.c:2622 +#: ../svnlook/svnlook.c:2656 msgid "" "The '--transaction' (-t) and '--revision' (-r) arguments cannot co-exist" msgstr "" -#: ../svnlook/svnlook.c:2629 +#: ../svnlook/svnlook.c:2663 msgid "" "Cannot use the '--show-inherited-props' option with the '--revprop' option" msgstr "" -#: ../svnlook/svnlook.c:2686 +#: ../svnlook/svnlook.c:2720 #, c-format msgid "Try 'svnadmin verify' instead.\n" msgstr "" -#: ../svnlook/svnlook.c:2719 +#: ../svnlook/svnlook.c:2753 #, c-format msgid "Repository argument required\n" msgstr "" -#: ../svnlook/svnlook.c:2728 +#: ../svnlook/svnlook.c:2762 #, c-format msgid "'%s' is a URL when it should be a path\n" msgstr "" -#: ../svnlook/svnlook.c:2778 +#: ../svnlook/svnlook.c:2812 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svnlook help %s' for usage.\n" msgstr "" -#: ../svnlook/svnlook.c:2809 +#: ../svnlook/svnlook.c:2843 msgid "Try 'svnlook help' for more info" msgstr "" @@ -17844,12 +19398,16 @@ msgstr "" msgid "Invalid revision number '%s'" msgstr "" -#: ../svnrdump/load_editor.c:230 ../svnsync/svnsync.c:353 +#: ../svnrdump/load_editor.c:716 +msgid "This dumpstream reader requires a delta format dumpstream" +msgstr "" + +#: ../svnrdump/load_editor.c:1367 ../svnsync/svnsync.c:358 #, c-format msgid "Failed to get lock on destination repos, currently held by '%s'\n" msgstr "" -#: ../svnrdump/load_editor.c:374 +#: ../svnrdump/load_editor.c:1398 msgid "" "Target server does not support atomic revision property edits; consider " "upgrading it to 1.7." @@ -17859,43 +19417,49 @@ msgstr "" msgid "" "usage: svnrdump dump URL [-r LOWER[:UPPER]]\n" "\n" +msgstr "" + +#: ../svnrdump/svnrdump.c:89 +msgid "" "Dump revisions LOWER to UPPER of repository at remote URL to stdout\n" "in a 'dumpfile' portable format. If only LOWER is given, dump that\n" "one revision.\n" msgstr "" -#: ../svnrdump/svnrdump.c:93 +#: ../svnrdump/svnrdump.c:96 msgid "" "usage: svnrdump load URL\n" "\n" -"Load a 'dumpfile' given on stdin to a repository at remote URL.\n" msgstr "" -#: ../svnrdump/svnrdump.c:97 +#: ../svnrdump/svnrdump.c:98 +msgid "Load a 'dumpfile' given on stdin to a repository at remote URL.\n" +msgstr "" + +#: ../svnrdump/svnrdump.c:103 msgid "" "usage: svnrdump help [SUBCOMMAND...]\n" "\n" -"Describe the usage of this program or its subcommands.\n" msgstr "" -#: ../svnrdump/svnrdump.c:110 +#: ../svnrdump/svnrdump.c:118 msgid "dump incrementally" msgstr "" -#: ../svnrdump/svnrdump.c:112 +#: ../svnrdump/svnrdump.c:120 msgid "skip revision property ARG (e.g., \"svn:author\")" msgstr "" -#: ../svnrdump/svnrdump.c:132 ../svnserve/svnserve.c:413 +#: ../svnrdump/svnrdump.c:140 ../svnserve/svnserve.c:413 #: ../svnversion/svnversion.c:142 msgid "display this help" msgstr "" -#: ../svnrdump/svnrdump.c:161 -msgid "Read or write to a dumpfile instead of stdin/stdout" +#: ../svnrdump/svnrdump.c:170 +msgid "read/write file ARG instead of stdin/stdout" msgstr "" -#: ../svnrdump/svnrdump.c:667 +#: ../svnrdump/svnrdump.c:677 msgid "" "general usage: svnrdump SUBCOMMAND URL [-r LOWER[:UPPER]]\n" "Subversion remote repository dump and load tool.\n" @@ -17905,29 +19469,29 @@ msgid "" "Available subcommands:\n" msgstr "" -#: ../svnrdump/svnrdump.c:712 ../svnrdump/svnrdump.c:746 +#: ../svnrdump/svnrdump.c:722 ../svnrdump/svnrdump.c:756 msgid "Unsupported revision specifier used; use only integer values or 'HEAD'" msgstr "" -#: ../svnrdump/svnrdump.c:720 ../svnrdump/svnrdump.c:754 +#: ../svnrdump/svnrdump.c:730 ../svnrdump/svnrdump.c:764 #, c-format msgid "Revision '%ld' does not exist" msgstr "" -#: ../svnrdump/svnrdump.c:764 +#: ../svnrdump/svnrdump.c:774 msgid "" "LOWER revision cannot be greater than UPPER revision; consider reversing " "your revision range" msgstr "" -#: ../svnrdump/svnrdump.c:1011 +#: ../svnrdump/svnrdump.c:1021 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svnrdump help %s' for usage.\n" msgstr "" -#: ../svnrdump/svnrdump.c:1054 +#: ../svnrdump/svnrdump.c:1064 msgid "load subcommand with --password-from-stdin requires -F" msgstr "" @@ -17958,29 +19522,29 @@ msgstr "" msgid "Couldn't obtain the authenticated username" msgstr "" -#: ../svnserve/serve.c:2223 +#: ../svnserve/serve.c:2270 msgid "Path is not a string" msgstr "" -#: ../svnserve/serve.c:2428 +#: ../svnserve/serve.c:2477 msgid "Log revprop entry not a string" msgstr "" -#: ../svnserve/serve.c:2434 +#: ../svnserve/serve.c:2483 #, c-format msgid "Unknown revprop word '%s' in log command" msgstr "" -#: ../svnserve/serve.c:2450 +#: ../svnserve/serve.c:2499 msgid "Log path entry not a string" msgstr "" -#: ../svnserve/serve.c:3088 ../svnserve/serve.c:3267 +#: ../svnserve/serve.c:3154 ../svnserve/serve.c:3337 #, c-format msgid "No result for '%s'." msgstr "" -#: ../svnserve/serve.c:3908 +#: ../svnserve/serve.c:3995 #, c-format msgid "" "SASL requested but not compiled in; set '%s' to 'false' or recompile " @@ -18323,12 +19887,24 @@ msgstr "" msgid "" "usage: svnsync initialize DEST_URL SOURCE_URL\n" "\n" +msgstr "" + +#: ../svnsync/svnsync.c:97 +msgid "" "Initialize a destination repository for synchronization from\n" "another repository.\n" "\n" +msgstr "" + +#: ../svnsync/svnsync.c:100 +msgid "" "If the source URL is not the root of a repository, only the\n" "specified part of the repository will be synchronized.\n" "\n" +msgstr "" + +#: ../svnsync/svnsync.c:103 +msgid "" "The destination URL must point to the root of a repository which\n" "has been configured to allow revision property changes. In\n" "the general case, the destination repository must contain no\n" @@ -18339,19 +19915,31 @@ msgid "" "when initializing a copy of a repository as a mirror of that same\n" "repository, for example.)\n" "\n" +msgstr "" + +#: ../svnsync/svnsync.c:113 +msgid "" "You should not commit to, or make revision property changes in,\n" "the destination repository by any method other than 'svnsync'.\n" "In other words, the destination repository should be a read-only\n" "mirror of the source repository.\n" msgstr "" -#: ../svnsync/svnsync.c:121 +#: ../svnsync/svnsync.c:122 msgid "" "usage: svnsync synchronize DEST_URL [SOURCE_URL]\n" "\n" +msgstr "" + +#: ../svnsync/svnsync.c:124 +msgid "" "Transfer all pending revisions to the destination from the source\n" "with which it was initialized.\n" "\n" +msgstr "" + +#: ../svnsync/svnsync.c:127 +msgid "" "If SOURCE_URL is provided, use that as the source repository URL,\n" "ignoring what is recorded in the destination repository as the\n" "source URL. Specifying SOURCE_URL is recommended in particular\n" @@ -18359,52 +19947,75 @@ msgid "" "DEST_URL repository.\n" msgstr "" -#: ../svnsync/svnsync.c:134 +#: ../svnsync/svnsync.c:136 msgid "" "usage:\n" "\n" +msgstr "" + +#: ../svnsync/svnsync.c:138 +msgid "" " 1. svnsync copy-revprops DEST_URL [SOURCE_URL]\n" " 2. svnsync copy-revprops DEST_URL REV[:REV2]\n" "\n" +msgstr "" + +#: ../svnsync/svnsync.c:141 +msgid "" "Copy the revision properties in a given range of revisions to the\n" "destination from the source with which it was initialized. If the\n" "revision range is not specified, it defaults to all revisions in\n" "the DEST_URL repository. Note also that the 'HEAD' revision is the\n" "latest in DEST_URL, not necessarily the latest in SOURCE_URL.\n" "\n" +msgstr "" + +#: ../svnsync/svnsync.c:147 +msgid "" "If SOURCE_URL is provided, use that as the source repository URL,\n" "ignoring what is recorded in the destination repository as the\n" "source URL. Specifying SOURCE_URL is recommended in particular\n" "if untrusted users/administrators may have write access to the\n" "DEST_URL repository.\n" "\n" +msgstr "" + +#: ../svnsync/svnsync.c:153 +msgid "" "Unless you need to trigger the destination repositoy's revprop\n" "change hooks for all revision properties, it is recommended to use\n" "the --skip-unchanged option for best performance.\n" "\n" +msgstr "" + +#: ../svnsync/svnsync.c:157 +msgid "" "Form 2 is deprecated syntax, equivalent to specifying \"-rREV[:REV2]\".\n" msgstr "" -#: ../svnsync/svnsync.c:160 +#: ../svnsync/svnsync.c:163 msgid "" "usage: svnsync info DEST_URL\n" "\n" +msgstr "" + +#: ../svnsync/svnsync.c:165 +msgid "" "Print information about the synchronization destination repository\n" "located at DEST_URL.\n" msgstr "" -#: ../svnsync/svnsync.c:166 +#: ../svnsync/svnsync.c:170 msgid "" "usage: svnsync help [SUBCOMMAND...]\n" "\n" -"Describe the usage of this program or its subcommands.\n" msgstr "" -#: ../svnsync/svnsync.c:176 +#: ../svnsync/svnsync.c:181 msgid "print as little as possible" msgstr "" -#: ../svnsync/svnsync.c:178 +#: ../svnsync/svnsync.c:183 msgid "" "operate on revision ARG (or range ARG1:ARG2)\n" " A revision argument can be one of:\n" @@ -18412,34 +20023,34 @@ msgid "" " 'HEAD' latest in repository" msgstr "" -#: ../svnsync/svnsync.c:186 +#: ../svnsync/svnsync.c:191 msgid "allow a non-empty destination repository" msgstr "" -#: ../svnsync/svnsync.c:188 +#: ../svnsync/svnsync.c:193 msgid "don't copy unchanged revision properties" msgstr "" -#: ../svnsync/svnsync.c:200 +#: ../svnsync/svnsync.c:205 msgid "" "specify a username ARG (deprecated;\n" " see --source-username and --sync-username)" msgstr "" -#: ../svnsync/svnsync.c:204 +#: ../svnsync/svnsync.c:209 msgid "" "specify a password ARG (deprecated;\n" " see --source-password and --sync-password)" msgstr "" -#: ../svnsync/svnsync.c:208 +#: ../svnsync/svnsync.c:213 msgid "" "deprecated; same as\n" " --source-trust-server-cert-failures=unknown-ca\n" " --sync-trust-server-cert-failures=unknown-ca" msgstr "" -#: ../svnsync/svnsync.c:214 +#: ../svnsync/svnsync.c:219 msgid "" "with --non-interactive, accept SSL\n" " server certificates with failures.\n" @@ -18453,30 +20064,30 @@ msgid "" " Applied to the source URL." msgstr "" -#: ../svnsync/svnsync.c:234 +#: ../svnsync/svnsync.c:239 msgid "" "Like\n" " --source-trust-server-cert-failures,\n" " but applied to the destination URL." msgstr "" -#: ../svnsync/svnsync.c:240 +#: ../svnsync/svnsync.c:245 msgid "connect to source repository with username ARG" msgstr "" -#: ../svnsync/svnsync.c:242 +#: ../svnsync/svnsync.c:247 msgid "connect to source repository with password ARG" msgstr "" -#: ../svnsync/svnsync.c:244 +#: ../svnsync/svnsync.c:249 msgid "connect to sync repository with username ARG" msgstr "" -#: ../svnsync/svnsync.c:246 +#: ../svnsync/svnsync.c:251 msgid "connect to sync repository with password ARG" msgstr "" -#: ../svnsync/svnsync.c:258 +#: ../svnsync/svnsync.c:263 msgid "" "convert translatable properties from encoding ARG\n" " to UTF-8. If not specified, then properties " @@ -18484,7 +20095,7 @@ msgid "" " presumed to be encoded in UTF-8." msgstr "" -#: ../svnsync/svnsync.c:264 +#: ../svnsync/svnsync.c:269 msgid "" "Disable built-in locking. Use of this option can\n" " corrupt the mirror unless you ensure that no " @@ -18492,7 +20103,7 @@ msgid "" " instance of svnsync is running concurrently." msgstr "" -#: ../svnsync/svnsync.c:270 +#: ../svnsync/svnsync.c:275 msgid "" "Steal locks as necessary. Use, with caution,\n" " if your mirror repository contains stale locks\n" @@ -18501,83 +20112,83 @@ msgid "" " svnsync instance." msgstr "" -#: ../svnsync/svnsync.c:278 +#: ../svnsync/svnsync.c:283 msgid "" "size of the extra in-memory cache in MB used to\n" " minimize operations for local 'file' scheme.\n" msgstr "" -#: ../svnsync/svnsync.c:383 +#: ../svnsync/svnsync.c:388 msgid "" "Target server does not support atomic revision property edits; consider " "upgrading it to 1.7 or using an external locking program" msgstr "" -#: ../svnsync/svnsync.c:397 +#: ../svnsync/svnsync.c:402 #, c-format msgid "Stole lock previously held by '%s'\n" msgstr "" -#: ../svnsync/svnsync.c:487 +#: ../svnsync/svnsync.c:492 #, c-format msgid "Session is rooted at '%s' but the repos root is '%s'" msgstr "" -#: ../svnsync/svnsync.c:645 +#: ../svnsync/svnsync.c:650 #, c-format msgid "Copied properties for revision %ld (%s* properties skipped).\n" msgstr "" -#: ../svnsync/svnsync.c:650 +#: ../svnsync/svnsync.c:655 #, c-format msgid "Copied properties for revision %ld.\n" msgstr "" -#: ../svnsync/svnsync.c:666 +#: ../svnsync/svnsync.c:671 #, c-format msgid "" "NOTE: Normalized %s* properties to LF line endings (%d rev-props, %d node-" "props).\n" msgstr "" -#: ../svnsync/svnsync.c:805 +#: ../svnsync/svnsync.c:810 msgid "" "Destination repository already contains revision history; consider using --" "allow-non-empty if the repository's revisions are known to mirror their " "respective revisions in the source repository" msgstr "" -#: ../svnsync/svnsync.c:814 +#: ../svnsync/svnsync.c:819 #, c-format msgid "Destination repository is already synchronizing from '%s'" msgstr "" -#: ../svnsync/svnsync.c:849 +#: ../svnsync/svnsync.c:854 msgid "Destination repository has more revisions than source repository" msgstr "" -#: ../svnsync/svnsync.c:914 ../svnsync/svnsync.c:917 ../svnsync/svnsync.c:1590 -#: ../svnsync/svnsync.c:1597 ../svnsync/svnsync.c:1837 -#: ../svnsync/svnsync.c:1840 ../svnsync/svnsync.c:1884 +#: ../svnsync/svnsync.c:919 ../svnsync/svnsync.c:922 ../svnsync/svnsync.c:1595 +#: ../svnsync/svnsync.c:1602 ../svnsync/svnsync.c:1842 +#: ../svnsync/svnsync.c:1845 ../svnsync/svnsync.c:1889 #, c-format msgid "Path '%s' is not a URL" msgstr "" -#: ../svnsync/svnsync.c:944 +#: ../svnsync/svnsync.c:949 #, c-format msgid "Committed revision %ld.\n" msgstr "" -#: ../svnsync/svnsync.c:987 +#: ../svnsync/svnsync.c:992 msgid "Destination repository has not been initialized" msgstr "" -#: ../svnsync/svnsync.c:1362 +#: ../svnsync/svnsync.c:1367 #, c-format msgid "Commit created r%ld but should have created r%ld" msgstr "" -#: ../svnsync/svnsync.c:1482 +#: ../svnsync/svnsync.c:1487 #, c-format msgid "" "Revision being currently copied (%ld), last merged revision (%ld), and " @@ -18585,57 +20196,57 @@ msgid "" "destination without using svnsync?" msgstr "" -#: ../svnsync/svnsync.c:1520 +#: ../svnsync/svnsync.c:1525 #, c-format msgid "" "Destination HEAD (%ld) is not the last merged revision (%ld); have you " "committed to the destination without using svnsync?" msgstr "" -#: ../svnsync/svnsync.c:1650 ../svnsync/svnsync.c:1655 +#: ../svnsync/svnsync.c:1655 ../svnsync/svnsync.c:1660 #, c-format msgid "" "Cannot copy revprops for a revision (%ld) that has not been synchronized yet" msgstr "" -#: ../svnsync/svnsync.c:1720 ../svnsync/svnsync.c:1740 +#: ../svnsync/svnsync.c:1725 ../svnsync/svnsync.c:1745 #, c-format msgid "Invalid revision number (%ld)" msgstr "" -#: ../svnsync/svnsync.c:1790 +#: ../svnsync/svnsync.c:1795 msgid "" "Cannot specify revisions via both command-line arguments and the --revision " "(-r) option" msgstr "" -#: ../svnsync/svnsync.c:1798 ../svnsync/svnsync.c:2154 +#: ../svnsync/svnsync.c:1803 ../svnsync/svnsync.c:2159 #, c-format msgid "Invalid revision range '%s' provided" msgstr "" -#: ../svnsync/svnsync.c:1897 +#: ../svnsync/svnsync.c:1902 #, c-format msgid "Repository '%s' is not initialized for synchronization" msgstr "" #. Print the info. -#: ../svnsync/svnsync.c:1903 +#: ../svnsync/svnsync.c:1908 #, c-format msgid "Source URL: %s\n" msgstr "" -#: ../svnsync/svnsync.c:1905 +#: ../svnsync/svnsync.c:1910 #, c-format msgid "Source Repository UUID: %s\n" msgstr "" -#: ../svnsync/svnsync.c:1908 +#: ../svnsync/svnsync.c:1913 #, c-format msgid "Last Merged Revision: %s\n" msgstr "" -#: ../svnsync/svnsync.c:1925 +#: ../svnsync/svnsync.c:1930 msgid "" "general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n" "Subversion repository replication tool.\n" @@ -18645,30 +20256,30 @@ msgid "" "Available subcommands:\n" msgstr "" -#: ../svnsync/svnsync.c:2216 +#: ../svnsync/svnsync.c:2221 msgid "" "Cannot use --username or --password with any of --source-username, --source-" "password, --sync-username, or --sync-password.\n" msgstr "" -#: ../svnsync/svnsync.c:2239 +#: ../svnsync/svnsync.c:2244 msgid "--disable-locking and --steal-lock are mutually exclusive" msgstr "" -#: ../svnsync/svnsync.c:2257 +#: ../svnsync/svnsync.c:2262 msgid "" "--source-trust-server-cert-failures and --sync-trust-server-cert-failures " "require --non-interactive" msgstr "" -#: ../svnsync/svnsync.c:2326 +#: ../svnsync/svnsync.c:2331 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svnsync help %s' for usage.\n" msgstr "" -#: ../svnsync/svnsync.c:2390 +#: ../svnsync/svnsync.c:2395 msgid "Try 'svnsync help' for more info" msgstr "" diff --git a/subversion/po/sv.po b/subversion/po/sv.po index a6d4292..9d23834 100644 --- a/subversion/po/sv.po +++ b/subversion/po/sv.po @@ -110,8 +110,8 @@ msgid "" msgstr "" "Project-Id-Version: subversion 1.9\n" "Report-Msgid-Bugs-To: dev@subversion.apache.org\n" -"POT-Creation-Date: 2018-04-06 16:24+0200\n" -"PO-Revision-Date: 2018-04-06 16:27+0200\n" +"POT-Creation-Date: 2018-10-06 16:54+0200\n" +"PO-Revision-Date: 2018-10-06 17:37+0200\n" "Last-Translator: Subversion Developers \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -324,7 +324,7 @@ msgstr "Läsfel i rör" #. is errno on POSIX #: ../include/svn_error_codes.h:306 ../libsvn_subr/cmdline.c:435 #: ../libsvn_subr/cmdline.c:466 ../libsvn_subr/cmdline.c:489 ../svn/util.c:571 -#: ../svnlook/svnlook.c:2000 +#: ../svnlook/svnlook.c:2034 #, c-format msgid "Write error" msgstr "Fel vid skrivning" @@ -962,7 +962,7 @@ msgstr "Kunde inte läsa data från responshuvud" msgid "Repository has been moved" msgstr "Arkivet har flyttats" -#: ../include/svn_error_codes.h:1072 ../libsvn_ra_serf/util.c:937 +#: ../include/svn_error_codes.h:1072 ../libsvn_ra_serf/util.c:940 msgid "Connection timed out" msgstr "Nätverksanslutningen gick ut" @@ -1062,7 +1062,7 @@ msgstr "Operationen tillåter ej att källan är modifierad" msgid "Operation does not apply to directory" msgstr "Operationen kan ej utföras på en katalog" -#: ../include/svn_error_codes.h:1185 ../svnadmin/svnadmin.c:1747 +#: ../include/svn_error_codes.h:1185 ../svnadmin/svnadmin.c:1813 #, c-format msgid "Revision range is not allowed" msgstr "Revisionsområde otillåtet" @@ -1559,12 +1559,12 @@ msgstr "Certifikatssignaturen stämmer ej" msgid "Certficate verification failed" msgstr "Certifikatskontrollen misslyckades" -#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:290 +#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:296 msgid "GNOME Keyring is locked and we are non-interactive" msgstr "GNOMEs nyckelkedja är låst och vi är inte interaktiva" #: ../libsvn_client/add.c:609 ../libsvn_client/cmdline.c:365 -#: ../libsvn_subr/opt.c:941 +#: ../libsvn_subr/opt.c:908 #, c-format msgid "'%s' ends in a reserved name" msgstr "\"%s\" slutar med ett reserverat namn" @@ -1592,13 +1592,14 @@ msgid "Unsupported node kind for path '%s'" msgstr "Nodtypen för sökvägen \"%s\" stöds inte" #: ../libsvn_client/add.c:908 ../libsvn_client/changelist.c:65 -#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3098 -#: ../libsvn_client/export.c:1392 ../libsvn_client/import.c:861 -#: ../libsvn_client/patch.c:3745 ../libsvn_client/relocate.c:155 -#: ../libsvn_client/resolved.c:120 ../libsvn_client/revert.c:149 -#: ../libsvn_client/shelve.c:194 ../libsvn_client/status.c:368 -#: ../libsvn_client/switch.c:471 ../libsvn_client/update.c:701 -#: ../libsvn_client/upgrade.c:111 ../svn/util.c:990 ../svnbench/util.c:76 +#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3197 +#: ../libsvn_client/export.c:1389 ../libsvn_client/import.c:861 +#: ../libsvn_client/patch.c:3747 ../libsvn_client/relocate.c:155 +#: ../libsvn_client/resolved.c:120 ../libsvn_client/revert.c:152 +#: ../libsvn_client/shelf.c:1105 ../libsvn_client/status.c:444 +#: ../libsvn_client/switch.c:471 ../libsvn_client/update.c:749 +#: ../libsvn_client/upgrade.c:111 ../svn/shelf-cmd.c:1023 ../svn/util.c:990 +#: ../svnbench/util.c:76 #, c-format msgid "'%s' is not a local path" msgstr "\"%s\" är ingen lokal sökväg" @@ -1653,7 +1654,7 @@ msgstr "URL:en \"%s\" pekar på en katalog" msgid "Target changelist name must not be empty" msgstr "Ändringslistan får inte ha tomt namn" -#: ../libsvn_client/checkout.c:133 ../libsvn_client/export.c:1449 +#: ../libsvn_client/checkout.c:133 ../libsvn_client/export.c:1446 #: ../svnbench/null-export-cmd.c:293 #, c-format msgid "URL '%s' doesn't exist" @@ -1801,39 +1802,39 @@ msgstr "Arkiveringsobjektet \"%s\" har kopieringsflagga men ogiltig revision" msgid "Standard properties can't be set explicitly as revision properties" msgstr "Standardegenskaper kan inte sättas direkt som revisionsegenskaper" -#: ../libsvn_client/conflicts.c:734 ../libsvn_client/conflicts.c:1095 -#: ../libsvn_client/conflicts.c:1688 ../libsvn_client/conflicts.c:4625 -#: ../libsvn_client/conflicts.c:5124 ../libsvn_client/conflicts.c:5146 -#: ../libsvn_client/conflicts.c:5197 ../libsvn_client/conflicts.c:5674 +#: ../libsvn_client/conflicts.c:734 ../libsvn_client/conflicts.c:1100 +#: ../libsvn_client/conflicts.c:1693 ../libsvn_client/conflicts.c:4985 +#: ../libsvn_client/conflicts.c:5359 ../libsvn_client/conflicts.c:5381 +#: ../libsvn_client/conflicts.c:5433 ../libsvn_client/conflicts.c:5906 msgid "unknown author" msgstr "okänd författare" -#: ../libsvn_client/conflicts.c:1126 +#: ../libsvn_client/conflicts.c:1131 msgid "A file containing uncommitted changes was found in the working copy." msgstr "En fil med oarkiverade ändringar hittades i arbetskopian." -#: ../libsvn_client/conflicts.c:1129 +#: ../libsvn_client/conflicts.c:1134 msgid "A file which differs from the corresponding file on the merge source branch was found in the working copy." msgstr "En fil som skiljer sig från motsvarande fil i källgrenen för sammanslagningen hittades i arbetskopian." -#: ../libsvn_client/conflicts.c:1134 +#: ../libsvn_client/conflicts.c:1139 msgid "A file which already occupies this path was found in the working copy." msgstr "En fil som redan upptar denna sökväg hittades i arbetskopian." -#: ../libsvn_client/conflicts.c:1138 +#: ../libsvn_client/conflicts.c:1143 msgid "An unversioned file was found in the working copy." msgstr "En icke versionshanterad fil fanns i arbetskopian." -#: ../libsvn_client/conflicts.c:1142 +#: ../libsvn_client/conflicts.c:1147 msgid "A deleted file was found in the working copy." msgstr "En raderad fil hittades i arbetskopian." -#: ../libsvn_client/conflicts.c:1147 +#: ../libsvn_client/conflicts.c:1152 msgid "No such file was found in the working copy." msgstr "Ingen sådan fil hittades i arbetskopian." #. ### display deleted revision -#: ../libsvn_client/conflicts.c:1151 +#: ../libsvn_client/conflicts.c:1156 msgid "" "No such file was found in the merge target working copy.\n" "Perhaps the file has been deleted or moved away in the repository's history?" @@ -1842,7 +1843,7 @@ msgstr "" "Kanske filen har raderats eller flyttas bort i arkivets historia?" #. ### show more details about copies or replacements? -#: ../libsvn_client/conflicts.c:1161 +#: ../libsvn_client/conflicts.c:1166 msgid "A file scheduled to be added to the repository in the next commit was found in the working copy." msgstr "En fil schemalagd för att läggas till i nästa arkivering hittades i arbetskopian." @@ -1851,11 +1852,11 @@ msgstr "En fil schemalagd för att läggas till i nästa arkivering hittades i a #. * This case cannot happen until we detect incoming #. * moves, which we currently don't do. #. ### find deleted/moved revision? -#: ../libsvn_client/conflicts.c:1192 ../libsvn_client/conflicts.c:1224 +#: ../libsvn_client/conflicts.c:1197 ../libsvn_client/conflicts.c:1229 msgid "The file in the working copy had been moved away at the time this conflict was recorded." msgstr "Filen i arbetskopian var bortflyttad när denna konflikt registrerades." -#: ../libsvn_client/conflicts.c:1207 ../libsvn_client/conflicts.c:1240 +#: ../libsvn_client/conflicts.c:1212 ../libsvn_client/conflicts.c:1245 #, c-format msgid "" "The file in the working copy was moved away to\n" @@ -1869,11 +1870,11 @@ msgstr "" #. * This case cannot happen until we detect incoming #. * moves, which we currently don't do. #. ### find deleted/moved revision? -#: ../libsvn_client/conflicts.c:1266 ../libsvn_client/conflicts.c:1298 +#: ../libsvn_client/conflicts.c:1271 ../libsvn_client/conflicts.c:1303 msgid "A file had been moved here in the working copy at the time this conflict was recorded." msgstr "En fil hade flyttats hit i arbetskopian när denna konflikt registrerades." -#: ../libsvn_client/conflicts.c:1281 ../libsvn_client/conflicts.c:1314 +#: ../libsvn_client/conflicts.c:1286 ../libsvn_client/conflicts.c:1319 #, c-format msgid "" "A file was moved here in the working copy from\n" @@ -1882,32 +1883,32 @@ msgstr "" "En fil hade flyttats hit i arbetskopian från\n" "\"%s\"." -#: ../libsvn_client/conflicts.c:1350 +#: ../libsvn_client/conflicts.c:1355 msgid "A directory containing uncommitted changes was found in the working copy." msgstr "En katalog med oarkiverade ändringar hittades i arbetskopian." -#: ../libsvn_client/conflicts.c:1353 +#: ../libsvn_client/conflicts.c:1358 msgid "A directory which differs from the corresponding directory on the merge source branch was found in the working copy." msgstr "En katalog som skiljer sig från motsvarande katalog i källgrenen för sammanslagningen hittades i arbetskopian." -#: ../libsvn_client/conflicts.c:1358 +#: ../libsvn_client/conflicts.c:1363 msgid "A directory which already occupies this path was found in the working copy." msgstr "En katalog som redan upptar denna sökväg hittades i arbetskopian." -#: ../libsvn_client/conflicts.c:1362 +#: ../libsvn_client/conflicts.c:1367 msgid "An unversioned directory was found in the working copy." msgstr "En icke versionshanterad katalog hittades i arbetskopian." -#: ../libsvn_client/conflicts.c:1366 +#: ../libsvn_client/conflicts.c:1371 msgid "A deleted directory was found in the working copy." msgstr "En raderad katalog hittades i arbetskopian." -#: ../libsvn_client/conflicts.c:1372 +#: ../libsvn_client/conflicts.c:1377 msgid "No such directory was found in the working copy." msgstr "Ingen sådan katalog hittades i arbetskopian." #. ### display deleted revision -#: ../libsvn_client/conflicts.c:1376 +#: ../libsvn_client/conflicts.c:1381 msgid "" "No such directory was found in the merge target working copy.\n" "Perhaps the directory has been deleted or moved away in the repository's history?" @@ -1916,16 +1917,16 @@ msgstr "" "Kanske katalogen har raderats eller flyttats bort i arkivets historia?" #. ### show more details about copies or replacements? -#: ../libsvn_client/conflicts.c:1386 +#: ../libsvn_client/conflicts.c:1391 msgid "A directory scheduled to be added to the repository in the next commit was found in the working copy." msgstr "En katalog schemalagd för att läggas till i nästa arkivering hittades i arbetskopian." #. The move no longer exists. -#: ../libsvn_client/conflicts.c:1418 +#: ../libsvn_client/conflicts.c:1423 msgid "The directory in the working copy had been moved away at the time this conflict was recorded." msgstr "Katalogen i arbetskopian hade flyttas bort när denna konflikt registrerades." -#: ../libsvn_client/conflicts.c:1433 +#: ../libsvn_client/conflicts.c:1438 #, c-format msgid "" "The directory in the working copy was moved away to\n" @@ -1938,11 +1939,11 @@ msgstr "" #. * This case cannot happen until we detect incoming #. * moves, which we currently don't do. #. ### find deleted/moved revision? -#: ../libsvn_client/conflicts.c:1450 +#: ../libsvn_client/conflicts.c:1455 msgid "The directory had been moved away at the time this conflict was recorded." msgstr "Katalogen hade flyttats bort när denna konflikt registrerades." -#: ../libsvn_client/conflicts.c:1466 +#: ../libsvn_client/conflicts.c:1471 #, c-format msgid "" "The directory was moved away to\n" @@ -1956,11 +1957,11 @@ msgstr "" #. * This case cannot happen until we detect incoming #. * moves, which we currently don't do. #. ### find deleted/moved revision? -#: ../libsvn_client/conflicts.c:1492 ../libsvn_client/conflicts.c:1524 +#: ../libsvn_client/conflicts.c:1497 ../libsvn_client/conflicts.c:1529 msgid "A directory had been moved here at the time this conflict was recorded." msgstr "En katalog hade flyttats hit när denna konflikt registrerades." -#: ../libsvn_client/conflicts.c:1507 +#: ../libsvn_client/conflicts.c:1512 #, c-format msgid "" "A directory was moved here from\n" @@ -1969,7 +1970,7 @@ msgstr "" "En katalog hade flyttats hit från\n" "\"%s\"." -#: ../libsvn_client/conflicts.c:1540 +#: ../libsvn_client/conflicts.c:1545 #, c-format msgid "" "A directory was moved here in the working copy from\n" @@ -1978,24 +1979,24 @@ msgstr "" "En katalog hade flyttats hit i arbetskopian från\n" "\"%s\"." -#: ../libsvn_client/conflicts.c:2759 +#: ../libsvn_client/conflicts.c:3119 msgid "An item containing uncommitted changes was found in the working copy." msgstr "Ett objekt med oarkiverade ändringar hittades i arbetskopian." -#: ../libsvn_client/conflicts.c:2763 +#: ../libsvn_client/conflicts.c:3123 msgid "An item which already occupies this path was found in the working copy." msgstr "Ett objekt som redan upptar denna sökväg hittades i arbetskopian." -#: ../libsvn_client/conflicts.c:2767 +#: ../libsvn_client/conflicts.c:3127 msgid "A deleted item was found in the working copy." msgstr "Ett raderat objekt hittades i arbetskopian." -#: ../libsvn_client/conflicts.c:2772 +#: ../libsvn_client/conflicts.c:3132 msgid "No such file or directory was found in the working copy." msgstr "Ingen sådan fil eller katalog hittades i arbetskopian." #. ### display deleted revision -#: ../libsvn_client/conflicts.c:2777 +#: ../libsvn_client/conflicts.c:3137 msgid "" "No such file or directory was found in the merge target working copy.\n" "The item may have been deleted or moved away in the repository's history." @@ -2003,23 +2004,23 @@ msgstr "" "Ingen sådan fil eller katalog hittades i sammanslagningsmålets arbetskopia.\n" "Objektet kan ha raderats eller flyttats bort i arkivets historia." -#: ../libsvn_client/conflicts.c:2784 +#: ../libsvn_client/conflicts.c:3144 msgid "An unversioned item was found in the working copy." msgstr "Ett icke versionshanterat objekt hittades i arbetskopian." -#: ../libsvn_client/conflicts.c:2789 +#: ../libsvn_client/conflicts.c:3149 msgid "An item scheduled to be added to the repository in the next commit was found in the working copy." msgstr "Ett objekt schemalagt för att läggas till i nästa arkivering hittades i arbetskopian." -#: ../libsvn_client/conflicts.c:2794 +#: ../libsvn_client/conflicts.c:3154 msgid "The item in the working copy had been moved away at the time this conflict was recorded." msgstr "Objektet i arbetskopian hade flyttas bort när denna konflikt registrerades." -#: ../libsvn_client/conflicts.c:2798 +#: ../libsvn_client/conflicts.c:3158 msgid "An item had been moved here in the working copy at the time this conflict was recorded." msgstr "Ett objekt hade flyttats hit i arbetskopian när denna konflikt registrerades." -#: ../libsvn_client/conflicts.c:2826 +#: ../libsvn_client/conflicts.c:3186 #, c-format msgid "" "%s\n" @@ -2028,41 +2029,41 @@ msgstr "" "%s\n" "Och sedan flyttats bort till \"^/%s\" av %s i r%ld." -#: ../libsvn_client/conflicts.c:2891 +#: ../libsvn_client/conflicts.c:3251 msgid "No such file or directory was found in the merge target working copy.\n" msgstr "Ingen sådan fil eller katalog hittades i sammanslagningsmålets arbetskopia.\n" -#: ../libsvn_client/conflicts.c:2900 +#: ../libsvn_client/conflicts.c:3260 #, c-format msgid "%sThe file was moved to '^/%s' in r%ld by %s." msgstr "%sFilen flyttades till \"^/%s\" i r%ld av %s." -#: ../libsvn_client/conflicts.c:2906 +#: ../libsvn_client/conflicts.c:3266 #, c-format msgid "%sThe directory was moved to '^/%s' in r%ld by %s." msgstr "%sKatalogen flyttades till \"^/%s\" i r%ld av %s." -#: ../libsvn_client/conflicts.c:2913 +#: ../libsvn_client/conflicts.c:3273 #, c-format msgid "%sThe item was moved to '^/%s' in r%ld by %s." msgstr "%sObjektet flyttades till \"^/%s\" i r%ld av %s." -#: ../libsvn_client/conflicts.c:2929 +#: ../libsvn_client/conflicts.c:3289 #, c-format msgid "%sThe file '^/%s' was moved to '^/%s' in r%ld by %s." msgstr "%sFilen \"^/%s\" flyttades till \"^/%s\" i r%ld av %s." -#: ../libsvn_client/conflicts.c:2937 +#: ../libsvn_client/conflicts.c:3297 #, c-format msgid "%sThe directory '^/%s' was moved to '^/%s' in r%ld by %s." msgstr "%sKatalogen \"^/%s\" flyttades till \"^/%s\" i r%ld av %s." -#: ../libsvn_client/conflicts.c:2945 +#: ../libsvn_client/conflicts.c:3305 #, c-format msgid "%sThe item '^/%s' was moved to '^/%s' in r%ld by %s." msgstr "%sObjektet \"^/%s\" flyttades till \"^/%s\" i r%ld av %s." -#: ../libsvn_client/conflicts.c:2959 +#: ../libsvn_client/conflicts.c:3319 #, c-format msgid "" "No such file or directory was found in the merge target working copy.\n" @@ -2071,229 +2072,229 @@ msgstr "" "Ingen sådan fil eller katalog hittades i sammanslagningsmålets arbetskopia.\n" "\"^/%s\" raderades i r%ld av %s." -#: ../libsvn_client/conflicts.c:2983 +#: ../libsvn_client/conflicts.c:3343 msgid "An update operation tried to edit a file." msgstr "En uppdatering försökte ändra en fil." -#: ../libsvn_client/conflicts.c:2985 +#: ../libsvn_client/conflicts.c:3345 msgid "An update operation tried to add a file." msgstr "En uppdatering försökte lägga till en fil." -#: ../libsvn_client/conflicts.c:2987 +#: ../libsvn_client/conflicts.c:3347 msgid "An update operation tried to delete or move a file." msgstr "En uppdatering försökte radera eller flytta en fil." -#: ../libsvn_client/conflicts.c:2990 +#: ../libsvn_client/conflicts.c:3350 msgid "An update operation tried to replace a file." msgstr "En uppdatering försökte ersätta en fil." -#: ../libsvn_client/conflicts.c:2998 +#: ../libsvn_client/conflicts.c:3358 msgid "A switch operation tried to edit a file." msgstr "En växling försökte ändra en fil." -#: ../libsvn_client/conflicts.c:3000 +#: ../libsvn_client/conflicts.c:3360 msgid "A switch operation tried to add a file." msgstr "En växling försökte lägga till en fil." -#: ../libsvn_client/conflicts.c:3002 +#: ../libsvn_client/conflicts.c:3362 msgid "A switch operation tried to delete or move a file." msgstr "En växling försökte radera eller flytta en fil." -#: ../libsvn_client/conflicts.c:3005 +#: ../libsvn_client/conflicts.c:3365 msgid "A switch operation tried to replace a file." msgstr "En växling försökte ersätta en fil." -#: ../libsvn_client/conflicts.c:3013 +#: ../libsvn_client/conflicts.c:3373 msgid "A merge operation tried to edit a file." msgstr "En sammanslagning försökte ändra en fil." -#: ../libsvn_client/conflicts.c:3015 +#: ../libsvn_client/conflicts.c:3375 msgid "A merge operation tried to add a file." msgstr "En sammanslagning försökte lägga till en fil." -#: ../libsvn_client/conflicts.c:3017 +#: ../libsvn_client/conflicts.c:3377 msgid "A merge operation tried to delete or move a file." msgstr "En sammanslagning försökte radera eller flytta en fil." -#: ../libsvn_client/conflicts.c:3020 +#: ../libsvn_client/conflicts.c:3380 msgid "A merge operation tried to replace a file." msgstr "En sammanslagning försökte ersätta en fil." -#: ../libsvn_client/conflicts.c:3030 +#: ../libsvn_client/conflicts.c:3390 msgid "An update operation tried to change a directory." msgstr "En uppdatering försökte ändra en katalog." -#: ../libsvn_client/conflicts.c:3032 +#: ../libsvn_client/conflicts.c:3392 msgid "An update operation tried to add a directory." msgstr "En uppdatering försökte lägga till en katalog." -#: ../libsvn_client/conflicts.c:3034 +#: ../libsvn_client/conflicts.c:3394 msgid "An update operation tried to delete or move a directory." msgstr "En uppdatering försökte radera eller flytta en katalog." -#: ../libsvn_client/conflicts.c:3037 +#: ../libsvn_client/conflicts.c:3397 msgid "An update operation tried to replace a directory." msgstr "En uppdatering försökte ersätta en katalog." -#: ../libsvn_client/conflicts.c:3045 +#: ../libsvn_client/conflicts.c:3405 msgid "A switch operation tried to edit a directory." msgstr "En växling försökte ändra en katalog." -#: ../libsvn_client/conflicts.c:3047 +#: ../libsvn_client/conflicts.c:3407 msgid "A switch operation tried to add a directory." msgstr "En växling försökte lägga till en katalog." -#: ../libsvn_client/conflicts.c:3049 +#: ../libsvn_client/conflicts.c:3409 msgid "A switch operation tried to delete or move a directory." msgstr "En växling försökte radera eller flytta en katalog." -#: ../libsvn_client/conflicts.c:3052 +#: ../libsvn_client/conflicts.c:3412 msgid "A switch operation tried to replace a directory." msgstr "En växling försökte ersätta en katalog." -#: ../libsvn_client/conflicts.c:3060 +#: ../libsvn_client/conflicts.c:3420 msgid "A merge operation tried to edit a directory." msgstr "En sammanslagning försökte ändra en katalog." -#: ../libsvn_client/conflicts.c:3062 +#: ../libsvn_client/conflicts.c:3422 msgid "A merge operation tried to add a directory." msgstr "En sammanslagning försökte lägga till en katalog." -#: ../libsvn_client/conflicts.c:3064 +#: ../libsvn_client/conflicts.c:3424 msgid "A merge operation tried to delete or move a directory." msgstr "En sammanslagning försökte radera eller flytta en katalog." -#: ../libsvn_client/conflicts.c:3067 +#: ../libsvn_client/conflicts.c:3427 msgid "A merge operation tried to replace a directory." msgstr "En sammanslagning försökte ersätta en katalog." -#: ../libsvn_client/conflicts.c:3078 +#: ../libsvn_client/conflicts.c:3438 msgid "An update operation tried to edit an item." msgstr "En uppdatering försökte ändra ett objekt." -#: ../libsvn_client/conflicts.c:3080 +#: ../libsvn_client/conflicts.c:3440 msgid "An update operation tried to add an item." msgstr "En uppdatering försökte lägga till ett objekt." -#: ../libsvn_client/conflicts.c:3082 +#: ../libsvn_client/conflicts.c:3442 msgid "An update operation tried to delete or move an item." msgstr "En uppdatering försökte radera eller flytta ett objekt." -#: ../libsvn_client/conflicts.c:3085 +#: ../libsvn_client/conflicts.c:3445 msgid "An update operation tried to replace an item." msgstr "En uppdatering försökte ersätta ett objekt." -#: ../libsvn_client/conflicts.c:3093 +#: ../libsvn_client/conflicts.c:3453 msgid "A switch operation tried to edit an item." msgstr "En växling försökte ändra ett objekt." -#: ../libsvn_client/conflicts.c:3095 +#: ../libsvn_client/conflicts.c:3455 msgid "A switch operation tried to add an item." msgstr "En växling försökte lägga till ett objekt." -#: ../libsvn_client/conflicts.c:3097 +#: ../libsvn_client/conflicts.c:3457 msgid "A switch operation tried to delete or move an item." msgstr "En växling försökte radera eller flytta ett objekt." -#: ../libsvn_client/conflicts.c:3100 +#: ../libsvn_client/conflicts.c:3460 msgid "A switch operation tried to replace an item." msgstr "En växlig försökte ersätta ett objekt." -#: ../libsvn_client/conflicts.c:3108 +#: ../libsvn_client/conflicts.c:3468 msgid "A merge operation tried to edit an item." msgstr "En sammanslagning försökte ändra ett objekt." -#: ../libsvn_client/conflicts.c:3110 +#: ../libsvn_client/conflicts.c:3470 msgid "A merge operation tried to add an item." msgstr "En sammanslagning försökte lägga till ett objekt." -#: ../libsvn_client/conflicts.c:3112 +#: ../libsvn_client/conflicts.c:3472 msgid "A merge operation tried to delete or move an item." msgstr "En sammanslagning försökte radera eller flytta ett objekt." -#: ../libsvn_client/conflicts.c:3115 +#: ../libsvn_client/conflicts.c:3475 msgid "A merge operation tried to replace an item." msgstr "En sammanslagning försökte ersätta ett objekt." -#: ../libsvn_client/conflicts.c:3131 ../svn/cl-conflicts.c:212 +#: ../libsvn_client/conflicts.c:3491 ../svn/cl-conflicts.c:212 msgid "upon update" msgstr "vid uppdatering" -#: ../libsvn_client/conflicts.c:3132 ../svn/cl-conflicts.c:213 +#: ../libsvn_client/conflicts.c:3492 ../svn/cl-conflicts.c:213 msgid "upon switch" msgstr "vid växling" -#: ../libsvn_client/conflicts.c:3133 ../svn/cl-conflicts.c:214 +#: ../libsvn_client/conflicts.c:3493 ../svn/cl-conflicts.c:214 msgid "upon merge" msgstr "vid sammanslagning" -#: ../libsvn_client/conflicts.c:3134 ../svn/cl-conflicts.c:215 +#: ../libsvn_client/conflicts.c:3494 ../svn/cl-conflicts.c:215 msgid "upon none" msgstr "vid ingenting" -#: ../libsvn_client/conflicts.c:3153 ../svn/cl-conflicts.c:127 +#: ../libsvn_client/conflicts.c:3513 ../svn/cl-conflicts.c:127 #: ../svn/cl-conflicts.c:234 msgid "local edit" msgstr "lokal ändring" -#: ../libsvn_client/conflicts.c:3156 ../svn/cl-conflicts.c:140 +#: ../libsvn_client/conflicts.c:3516 ../svn/cl-conflicts.c:140 #: ../svn/cl-conflicts.c:237 msgid "local add" msgstr "lokalt tillägg" -#: ../libsvn_client/conflicts.c:3159 ../svn/cl-conflicts.c:131 +#: ../libsvn_client/conflicts.c:3519 ../svn/cl-conflicts.c:131 #: ../svn/cl-conflicts.c:240 msgid "local delete" msgstr "lokal radering" -#: ../libsvn_client/conflicts.c:3162 ../svn/cl-conflicts.c:129 +#: ../libsvn_client/conflicts.c:3522 ../svn/cl-conflicts.c:129 #: ../svn/cl-conflicts.c:243 msgid "local obstruction" msgstr "lokal blockering" -#: ../libsvn_client/conflicts.c:3166 ../svn/cl-conflicts.c:247 +#: ../libsvn_client/conflicts.c:3526 ../svn/cl-conflicts.c:247 #, c-format msgid "local %s" msgstr "lokal %s" -#: ../libsvn_client/conflicts.c:3175 ../svn/cl-conflicts.c:192 +#: ../libsvn_client/conflicts.c:3535 ../svn/cl-conflicts.c:192 #: ../svn/cl-conflicts.c:256 msgid "incoming edit" msgstr "inkommande ändring" -#: ../libsvn_client/conflicts.c:3178 ../svn/cl-conflicts.c:194 +#: ../libsvn_client/conflicts.c:3538 ../svn/cl-conflicts.c:194 #: ../svn/cl-conflicts.c:259 msgid "incoming add" msgstr "inkommande tillägg" -#: ../libsvn_client/conflicts.c:3181 ../svn/cl-conflicts.c:262 +#: ../libsvn_client/conflicts.c:3541 ../svn/cl-conflicts.c:262 msgid "incoming delete" msgstr "inkommande radering" -#: ../libsvn_client/conflicts.c:3185 ../svn/cl-conflicts.c:266 +#: ../libsvn_client/conflicts.c:3545 ../svn/cl-conflicts.c:266 #, c-format msgid "incoming %s" msgstr "inkommande %s" -#: ../libsvn_client/conflicts.c:3193 ../svn/cl-conflicts.c:273 +#: ../libsvn_client/conflicts.c:3553 ../svn/cl-conflicts.c:273 #: ../svn/cl-conflicts.c:326 #, c-format msgid "%s, %s %s" msgstr "%s, %s %s" -#: ../libsvn_client/conflicts.c:3252 +#: ../libsvn_client/conflicts.c:3612 #, c-format msgid "incoming %s %s" msgstr "inkommande %s %s" -#: ../libsvn_client/conflicts.c:3355 +#: ../libsvn_client/conflicts.c:3715 #, c-format msgid "Directory updated from r%ld to r%ld was replaced with a file by %s in r%ld." msgstr "Katalog uppdaterad från r%ld till r%ld ersattes av en fil av %s i r%ld." -#: ../libsvn_client/conflicts.c:3366 ../libsvn_client/conflicts.c:3446 -#: ../libsvn_client/conflicts.c:3700 ../libsvn_client/conflicts.c:3787 -#: ../libsvn_client/conflicts.c:4087 ../libsvn_client/conflicts.c:4155 +#: ../libsvn_client/conflicts.c:3726 ../libsvn_client/conflicts.c:3806 +#: ../libsvn_client/conflicts.c:4060 ../libsvn_client/conflicts.c:4147 +#: ../libsvn_client/conflicts.c:4447 ../libsvn_client/conflicts.c:4515 #, c-format msgid "" "%s\n" @@ -2302,14 +2303,14 @@ msgstr "" "%s\n" "Den ersatta katalogen flyttades till \"^/%s\"." -#: ../libsvn_client/conflicts.c:3381 +#: ../libsvn_client/conflicts.c:3741 #, c-format msgid "File updated from r%ld to r%ld was replaced with a file from another line of history by %s in r%ld." msgstr "Fil uppdaterad från r%ld till r%ld ersattes av en fil från en annan historielinje av %s i r%ld." -#: ../libsvn_client/conflicts.c:3393 ../libsvn_client/conflicts.c:3472 -#: ../libsvn_client/conflicts.c:3729 ../libsvn_client/conflicts.c:3815 -#: ../libsvn_client/conflicts.c:4116 ../libsvn_client/conflicts.c:4183 +#: ../libsvn_client/conflicts.c:3753 ../libsvn_client/conflicts.c:3832 +#: ../libsvn_client/conflicts.c:4089 ../libsvn_client/conflicts.c:4175 +#: ../libsvn_client/conflicts.c:4476 ../libsvn_client/conflicts.c:4543 #, c-format msgid "" "%s\n" @@ -2318,14 +2319,14 @@ msgstr "" "%s\n" "Den ersatta filen flyttades till \"^/%s\"." -#: ../libsvn_client/conflicts.c:3407 +#: ../libsvn_client/conflicts.c:3767 #, c-format msgid "Item updated from r%ld to r%ld was replaced with a file by %s in r%ld." msgstr "Objekt uppdaterat från r%ld till r%ld ersattes av en fil av %s i r%ld." -#: ../libsvn_client/conflicts.c:3417 ../libsvn_client/conflicts.c:3496 -#: ../libsvn_client/conflicts.c:3756 ../libsvn_client/conflicts.c:3842 -#: ../libsvn_client/conflicts.c:4210 +#: ../libsvn_client/conflicts.c:3777 ../libsvn_client/conflicts.c:3856 +#: ../libsvn_client/conflicts.c:4116 ../libsvn_client/conflicts.c:4202 +#: ../libsvn_client/conflicts.c:4570 #, c-format msgid "" "%s\n" @@ -2334,97 +2335,97 @@ msgstr "" "%s\n" "Det ersatta objektet flyttades till \"^/%s\"." -#: ../libsvn_client/conflicts.c:3434 +#: ../libsvn_client/conflicts.c:3794 #, c-format msgid "Directory updated from r%ld to r%ld was replaced with a directory from another line of history by %s in r%ld." msgstr "Katalog uppdaterad från r%ld till r%ld ersattes av en katalog från en annan historielinje av %s i r%ld." -#: ../libsvn_client/conflicts.c:3461 +#: ../libsvn_client/conflicts.c:3821 #, c-format msgid "File updated from r%ld to r%ld was replaced with a directory by %s in r%ld." msgstr "Fil uppdaterad från r%ld till r%ld ersattes av en katalog av %s i r%ld." -#: ../libsvn_client/conflicts.c:3486 +#: ../libsvn_client/conflicts.c:3846 #, c-format msgid "Item updated from r%ld to r%ld was replaced by %s in r%ld." msgstr "Objekt uppdaterat från r%ld till r%ld ersattes av %s i r%ld." -#: ../libsvn_client/conflicts.c:3519 +#: ../libsvn_client/conflicts.c:3879 #, c-format msgid "Directory updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld." msgstr "Katalog uppdaterad från r%ld till r%ld flyttades till \"^/%s\" av %s i r%ld." -#: ../libsvn_client/conflicts.c:3531 +#: ../libsvn_client/conflicts.c:3891 #, c-format msgid "Directory updated from r%ld to r%ld was deleted by %s in r%ld." msgstr "Katalog uppdaterad från r%ld till r%ld raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:3547 +#: ../libsvn_client/conflicts.c:3907 #, c-format msgid "File updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld." msgstr "Fil uppdaterad från r%ld till r%ld flyttades till \"^/%s\" av %s i r%ld." -#: ../libsvn_client/conflicts.c:3558 +#: ../libsvn_client/conflicts.c:3918 #, c-format msgid "File updated from r%ld to r%ld was deleted by %s in r%ld." msgstr "Fil uppdaterad från r%ld till r%ld raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:3572 +#: ../libsvn_client/conflicts.c:3932 #, c-format msgid "Item updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld." msgstr "Objekt uppdaterat från r%ld till r%ld flyttades till \"^/%s\" av %s i r%ld." -#: ../libsvn_client/conflicts.c:3583 +#: ../libsvn_client/conflicts.c:3943 #, c-format msgid "Item updated from r%ld to r%ld was deleted by %s in r%ld." msgstr "Objekt uppdaterat från r%ld till r%ld raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:3603 +#: ../libsvn_client/conflicts.c:3963 #, c-format msgid "Directory updated backwards from r%ld to r%ld was a file before the replacement made by %s in r%ld." msgstr "Katalog uppdaterad bakåt från r%ld till r%ld var en fil före ersättningen gjord av %s i r%ld." -#: ../libsvn_client/conflicts.c:3610 +#: ../libsvn_client/conflicts.c:3970 #, c-format msgid "File updated backwards from r%ld to r%ld was a file from another line of history before the replacement made by %s in r%ld." msgstr "Fil uppdaterad bakåt från r%ld till r%ld var en fil från en annan historielinje före ersättningen gjord av %s i r%ld." -#: ../libsvn_client/conflicts.c:3617 +#: ../libsvn_client/conflicts.c:3977 #, c-format msgid "Item updated backwards from r%ld to r%ld was replaced with a file by %s in r%ld." msgstr "Objekt uppdaterat bakåt från r%ld till r%ld ersattes av en fil av %s i r%ld." -#: ../libsvn_client/conflicts.c:3626 +#: ../libsvn_client/conflicts.c:3986 #, c-format msgid "Directory updated backwards from r%ld to r%ld was a directory from another line of history before the replacement made by %s in r%ld." msgstr "Katalog uppdaterad bakåt från r%ld till r%ld var en katalog från en annan historielinje före ersättningen gjord av %s i r%ld." -#: ../libsvn_client/conflicts.c:3634 +#: ../libsvn_client/conflicts.c:3994 #, c-format msgid "File updated backwards from r%ld to r%ld was a directory before the replacement made by %s in r%ld." msgstr "Fil uppdaterad bakåt från r%ld till r%ld var en katalog före ersättningen gjord av %s i r%ld." -#: ../libsvn_client/conflicts.c:3640 +#: ../libsvn_client/conflicts.c:4000 #, c-format msgid "Item updated backwards from r%ld to r%ld was replaced with a directory by %s in r%ld." msgstr "Objekt uppdaterat bakåt från r%ld till r%ld ersattes av en katalog av %s i r%ld." -#: ../libsvn_client/conflicts.c:3649 +#: ../libsvn_client/conflicts.c:4009 #, c-format msgid "Directory updated backwards from r%ld to r%ld did not exist before it was added by %s in r%ld." msgstr "Katalog uppdaterad bakåt från r%ld till r%ld fanns inte innan den lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:3656 +#: ../libsvn_client/conflicts.c:4016 #, c-format msgid "File updated backwards from r%ld to r%ld did not exist before it was added by %s in r%ld." msgstr "Fil uppdaterad bakåt från r%ld till r%ld fanns inte innan den lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:3662 +#: ../libsvn_client/conflicts.c:4022 #, c-format msgid "Item updated backwards from r%ld to r%ld did not exist before it was added by %s in r%ld." msgstr "Objekt uppdaterat bakåt från r%ld till r%ld fanns inte innan det lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:3687 +#: ../libsvn_client/conflicts.c:4047 #, c-format msgid "" "Directory switched from\n" @@ -2439,7 +2440,7 @@ msgstr "" "\"^/%s@%ld\"\n" "ersattes av en fil av %s i r%ld." -#: ../libsvn_client/conflicts.c:3715 +#: ../libsvn_client/conflicts.c:4075 #, c-format msgid "" "File switched from\n" @@ -2454,7 +2455,7 @@ msgstr "" "\"^/%s@%ld\"\n" "ersattes av en fil från en annan historielinje av %s i r%ld." -#: ../libsvn_client/conflicts.c:3743 ../libsvn_client/conflicts.c:3986 +#: ../libsvn_client/conflicts.c:4103 ../libsvn_client/conflicts.c:4346 #, c-format msgid "" "Item switched from\n" @@ -2469,7 +2470,7 @@ msgstr "" "\"^/%s@%ld\"\n" "ersattes av en fil av %s i r%ld." -#: ../libsvn_client/conflicts.c:3773 +#: ../libsvn_client/conflicts.c:4133 #, c-format msgid "" "Directory switched from\n" @@ -2484,7 +2485,7 @@ msgstr "" "\"^/%s@%ld\"\n" "ersattes av en katalog från en annan historielinje av %s i r%ld." -#: ../libsvn_client/conflicts.c:3802 +#: ../libsvn_client/conflicts.c:4162 #, c-format msgid "" "File switched from\n" @@ -2499,7 +2500,7 @@ msgstr "" "\"^/%s@%ld\"\n" "ersattes av en katalog av %s i r%ld." -#: ../libsvn_client/conflicts.c:3829 ../libsvn_client/conflicts.c:4016 +#: ../libsvn_client/conflicts.c:4189 ../libsvn_client/conflicts.c:4376 #, c-format msgid "" "Item switched from\n" @@ -2514,7 +2515,7 @@ msgstr "" "\"^/%s@%ld\"\n" "ersattes av en katalog av %s i r%ld." -#: ../libsvn_client/conflicts.c:3865 +#: ../libsvn_client/conflicts.c:4225 #, c-format msgid "" "Directory switched from\n" @@ -2529,7 +2530,7 @@ msgstr "" "\"^/%s@%ld\"\n" "flyttades till \"^/%s\" av %s i r%ld." -#: ../libsvn_client/conflicts.c:3879 +#: ../libsvn_client/conflicts.c:4239 #, c-format msgid "" "Directory switched from\n" @@ -2544,7 +2545,7 @@ msgstr "" "\"^/%s@%ld\"\n" "raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:3897 +#: ../libsvn_client/conflicts.c:4257 #, c-format msgid "" "File switched from\n" @@ -2559,7 +2560,7 @@ msgstr "" "\"^/%s@%ld\"\n" "flyttades till \"^/%s\" av %s i r%ld." -#: ../libsvn_client/conflicts.c:3911 +#: ../libsvn_client/conflicts.c:4271 #, c-format msgid "" "File switched from\n" @@ -2574,7 +2575,7 @@ msgstr "" "\"^/%s@%ld\"\n" "raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:3928 +#: ../libsvn_client/conflicts.c:4288 #, c-format msgid "" "Item switched from\n" @@ -2589,7 +2590,7 @@ msgstr "" "\"^/%s@%ld\"\n" "flyttades till \"^/%s\" av %s i r%ld." -#: ../libsvn_client/conflicts.c:3942 +#: ../libsvn_client/conflicts.c:4302 #, c-format msgid "" "Item switched from\n" @@ -2604,7 +2605,7 @@ msgstr "" "\"^/%s@%ld\"\n" "raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:3967 ../libsvn_client/conflicts.c:4007 +#: ../libsvn_client/conflicts.c:4327 ../libsvn_client/conflicts.c:4367 #, c-format msgid "" "Directory switched from\n" @@ -2619,7 +2620,7 @@ msgstr "" "\"^/%s@%ld\"\n" "var en fil före ersättningen gjord av %s i r%ld." -#: ../libsvn_client/conflicts.c:3977 +#: ../libsvn_client/conflicts.c:4337 #, c-format msgid "" "File switched from\n" @@ -2634,7 +2635,7 @@ msgstr "" "\"^/%s@%ld\"\n" "var en fil från en annan historielinje före ersättningen gjord av %s i r%ld." -#: ../libsvn_client/conflicts.c:3997 +#: ../libsvn_client/conflicts.c:4357 #, c-format msgid "" "Directory switched from\n" @@ -2649,7 +2650,7 @@ msgstr "" "\"^/%s@%ld\"\n" "var en katalog från en annan historielinje före ersättningen gjord av %s i r%ld." -#: ../libsvn_client/conflicts.c:4027 +#: ../libsvn_client/conflicts.c:4387 #, c-format msgid "" "Directory switched from\n" @@ -2664,7 +2665,7 @@ msgstr "" "\"^/%s@%ld\"\n" "fanns inte innan den lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:4037 +#: ../libsvn_client/conflicts.c:4397 #, c-format msgid "" "File switched from\n" @@ -2679,7 +2680,7 @@ msgstr "" "\"^/%s@%ld\"\n" "fanns inte innan den lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:4046 +#: ../libsvn_client/conflicts.c:4406 #, c-format msgid "" "Item switched from\n" @@ -2694,7 +2695,7 @@ msgstr "" "\"^/%s@%ld\"\n" "fanns inte innan det lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:4074 +#: ../libsvn_client/conflicts.c:4434 #, c-format msgid "" "Directory merged from\n" @@ -2709,7 +2710,7 @@ msgstr "" "\"^/%s@%ld\"\n" "ersattes av en fil av %s i r%ld." -#: ../libsvn_client/conflicts.c:4102 +#: ../libsvn_client/conflicts.c:4462 #, c-format msgid "" "File merged from\n" @@ -2724,7 +2725,7 @@ msgstr "" "\"^/%s@%ld\"\n" "ersattes av en fil från en annan historielinje av %s i r%ld." -#: ../libsvn_client/conflicts.c:4128 +#: ../libsvn_client/conflicts.c:4488 #, c-format msgid "" "Item merged from\n" @@ -2739,7 +2740,7 @@ msgstr "" "\"^/%s@%ld\"\n" "ersattes av en fil av %s i r%ld." -#: ../libsvn_client/conflicts.c:4141 +#: ../libsvn_client/conflicts.c:4501 #, c-format msgid "" "Directory merged from\n" @@ -2754,7 +2755,7 @@ msgstr "" "\"^/%s@%ld\"\n" "ersattes av en katalog från en annan historielinje av %s i r%ld." -#: ../libsvn_client/conflicts.c:4170 +#: ../libsvn_client/conflicts.c:4530 #, c-format msgid "" "File merged from\n" @@ -2769,7 +2770,7 @@ msgstr "" "\"^/%s@%ld\"\n" "ersattes av en katalog av %s i r%ld." -#: ../libsvn_client/conflicts.c:4197 +#: ../libsvn_client/conflicts.c:4557 #, c-format msgid "" "Item merged from\n" @@ -2784,7 +2785,7 @@ msgstr "" "\"^/%s@%ld\"\n" "ersattes av en katalog av %s i r%ld." -#: ../libsvn_client/conflicts.c:4233 +#: ../libsvn_client/conflicts.c:4593 #, c-format msgid "" "Directory merged from\n" @@ -2799,7 +2800,7 @@ msgstr "" "\"^/%s@%ld\"\n" "flyttades till \"^/%s\" av %s i r%ld." -#: ../libsvn_client/conflicts.c:4247 +#: ../libsvn_client/conflicts.c:4607 #, c-format msgid "" "Directory merged from\n" @@ -2814,7 +2815,7 @@ msgstr "" "\"^/%s@%ld\"\n" "raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:4265 +#: ../libsvn_client/conflicts.c:4625 #, c-format msgid "" "File merged from\n" @@ -2829,7 +2830,7 @@ msgstr "" "\"^/%s@%ld\"\n" "flyttades till \"^/%s\" av %s i r%ld." -#: ../libsvn_client/conflicts.c:4279 +#: ../libsvn_client/conflicts.c:4639 #, c-format msgid "" "File merged from\n" @@ -2844,7 +2845,7 @@ msgstr "" "\"^/%s@%ld\"\n" "raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:4296 +#: ../libsvn_client/conflicts.c:4656 #, c-format msgid "" "Item merged from\n" @@ -2859,7 +2860,7 @@ msgstr "" "\"^/%s@%ld\"\n" "flyttades till \"^/%s\" av %s i r%ld." -#: ../libsvn_client/conflicts.c:4310 +#: ../libsvn_client/conflicts.c:4670 #, c-format msgid "" "Item merged from\n" @@ -2874,7 +2875,7 @@ msgstr "" "\"^/%s@%ld\"\n" "raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:4335 ../libsvn_client/conflicts.c:4374 +#: ../libsvn_client/conflicts.c:4695 ../libsvn_client/conflicts.c:4734 #, c-format msgid "" "Directory reverse-merged from\n" @@ -2885,7 +2886,7 @@ msgstr "" "\"^/%s@%ld\"\n" "till ^/%s@%ld var en fil före ersättningen gjord av %s i r%ld." -#: ../libsvn_client/conflicts.c:4344 +#: ../libsvn_client/conflicts.c:4704 #, c-format msgid "" "File reverse-merged from\n" @@ -2900,7 +2901,7 @@ msgstr "" "\"^/%s@%ld\"\n" "var en fil från en annan historielinje före ersättningen gjord av %s i r%ld." -#: ../libsvn_client/conflicts.c:4353 +#: ../libsvn_client/conflicts.c:4713 #, c-format msgid "" "Item reverse-merged from\n" @@ -2915,7 +2916,7 @@ msgstr "" "\"^/%s@%ld\"\n" "ersattes av en fil av %s i r%ld." -#: ../libsvn_client/conflicts.c:4364 +#: ../libsvn_client/conflicts.c:4724 #, c-format msgid "" "Directory reverse-merged from\n" @@ -2926,7 +2927,7 @@ msgstr "" "\"^/%s@%ld\"\n" "till ^/%s@%ld var en katalog från en annan historielinje före ersättningen gjord av %s i r%ld." -#: ../libsvn_client/conflicts.c:4382 +#: ../libsvn_client/conflicts.c:4742 #, c-format msgid "" "Item reverse-merged from\n" @@ -2941,7 +2942,7 @@ msgstr "" "\"^/%s@%ld\"\n" "ersattes av en katalog av %s i r%ld." -#: ../libsvn_client/conflicts.c:4393 +#: ../libsvn_client/conflicts.c:4753 #, c-format msgid "" "Directory reverse-merged from\n" @@ -2952,7 +2953,7 @@ msgstr "" "\"^/%s@%ld\"\n" "till ^/%s@%ld fanns inte innan den lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:4402 +#: ../libsvn_client/conflicts.c:4762 #, c-format msgid "" "File reverse-merged from\n" @@ -2967,7 +2968,7 @@ msgstr "" "\"^/%s@%ld\"\n" "fanns inte innan den lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:4411 +#: ../libsvn_client/conflicts.c:4771 #, c-format msgid "" "Item reverse-merged from\n" @@ -2982,52 +2983,52 @@ msgstr "" "\"^/%s@%ld\"\n" "fanns inte innan det lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:5263 +#: ../libsvn_client/conflicts.c:5495 #, c-format msgid "A new directory appeared during update to r%ld; it was added by %s in r%ld and later deleted by %s in r%ld." msgstr "En ny katalog dök upp under uppdatering till r%ld; den lades till av %s i r%ld och raderades senare av %s i r%ld." -#: ../libsvn_client/conflicts.c:5270 +#: ../libsvn_client/conflicts.c:5502 #, c-format msgid "A new directory appeared during update to r%ld; it was added by %s in r%ld." msgstr "En ny katalog dök upp under uppdatering till r%ld; den lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:5275 +#: ../libsvn_client/conflicts.c:5507 #, c-format msgid "A new directory appeared during update to r%ld; it was deleted by %s in r%ld." msgstr "En ny katalog dök upp under uppdatering till r%ld; den raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:5285 +#: ../libsvn_client/conflicts.c:5517 #, c-format msgid "A new file appeared during update to r%ld; it was added by %s in r%ld and later deleted by %s in r%ld." msgstr "En ny fil dök upp under uppdatering till r%ld; den lades till av %s i r%ld och raderades senare av %s i r%ld." -#: ../libsvn_client/conflicts.c:5292 +#: ../libsvn_client/conflicts.c:5524 #, c-format msgid "A new file appeared during update to r%ld; it was added by %s in r%ld." msgstr "En ny fil dök upp under uppdatering till r%ld; den lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:5297 +#: ../libsvn_client/conflicts.c:5529 #, c-format msgid "A new file appeared during update to r%ld; it was deleted by %s in r%ld." msgstr "En ny katalog dök upp under uppdatering till r%ld; den raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:5306 +#: ../libsvn_client/conflicts.c:5538 #, c-format msgid "A new item appeared during update to r%ld; it was added by %s in r%ld and later deleted by %s in r%ld." msgstr "Ett nytt objekt dök upp under uppdatering till r%ld; det lades till av %s i r%ld och raderades senare av %s i r%ld." -#: ../libsvn_client/conflicts.c:5313 +#: ../libsvn_client/conflicts.c:5545 #, c-format msgid "A new item appeared during update to r%ld; it was added by %s in r%ld." msgstr "Ett nytt objekt dök upp under uppdatering till r%ld; det lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:5318 +#: ../libsvn_client/conflicts.c:5550 #, c-format msgid "A new item appeared during update to r%ld; it was deleted by %s in r%ld." msgstr "Ett nytt objekt dök upp under uppdatering till r%ld; det raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:5337 +#: ../libsvn_client/conflicts.c:5569 #, c-format msgid "" "A new directory appeared during switch to\n" @@ -3038,7 +3039,7 @@ msgstr "" "\"^/%s@%ld\".\n" "Den lades till av %s i r%ld och raderades senare av %s i r%ld." -#: ../libsvn_client/conflicts.c:5345 +#: ../libsvn_client/conflicts.c:5577 #, c-format msgid "" "A new directory appeared during switch to\n" @@ -3049,7 +3050,7 @@ msgstr "" "\"^/%s@%ld\".\n" "Den lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:5351 +#: ../libsvn_client/conflicts.c:5583 #, c-format msgid "" "A new directory appeared during switch to\n" @@ -3060,7 +3061,7 @@ msgstr "" "\"^/%s@%ld\".\n" "Den raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:5362 +#: ../libsvn_client/conflicts.c:5594 #, c-format msgid "" "A new file appeared during switch to\n" @@ -3071,7 +3072,7 @@ msgstr "" "\"^/%s@%ld\".\n" "Den lades till av %s i r%ld och raderades senare av %s i r%ld." -#: ../libsvn_client/conflicts.c:5370 +#: ../libsvn_client/conflicts.c:5602 #, c-format msgid "" "A new file appeared during switch to\n" @@ -3082,7 +3083,7 @@ msgstr "" "\"^/%s@%ld\".\n" "Den lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:5377 +#: ../libsvn_client/conflicts.c:5609 #, c-format msgid "" "A new file appeared during switch to\n" @@ -3093,7 +3094,7 @@ msgstr "" "\"^/%s@%ld\".\n" "Den raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:5388 +#: ../libsvn_client/conflicts.c:5620 #, c-format msgid "" "A new item appeared during switch to\n" @@ -3104,7 +3105,7 @@ msgstr "" "\"^/%s@%ld\".\n" "Det lades till av %s i r%ld och raderades senare av %s i r%ld." -#: ../libsvn_client/conflicts.c:5396 +#: ../libsvn_client/conflicts.c:5628 #, c-format msgid "" "A new item appeared during switch to\n" @@ -3115,7 +3116,7 @@ msgstr "" "\"^/%s@%ld\".\n" "Det lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:5403 +#: ../libsvn_client/conflicts.c:5635 #, c-format msgid "" "A new item appeared during switch to\n" @@ -3126,7 +3127,7 @@ msgstr "" "\"^/%s@%ld\".\n" "Det raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:5424 +#: ../libsvn_client/conflicts.c:5656 #, c-format msgid "" "A new directory appeared during merge of\n" @@ -3137,7 +3138,7 @@ msgstr "" "\"^/%s:%ld\".\n" "Den lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:5430 +#: ../libsvn_client/conflicts.c:5662 #, c-format msgid "" "A new directory appeared during merge of\n" @@ -3148,7 +3149,7 @@ msgstr "" "\"^/%s:%ld-%ld\".\n" "Den lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:5440 +#: ../libsvn_client/conflicts.c:5672 #, c-format msgid "" "A new file appeared during merge of\n" @@ -3159,7 +3160,7 @@ msgstr "" "\"^/%s:%ld\".\n" "Den lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:5446 +#: ../libsvn_client/conflicts.c:5678 #, c-format msgid "" "A new file appeared during merge of\n" @@ -3170,7 +3171,7 @@ msgstr "" "\"^/%s:%ld-%ld\".\n" "Den lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:5455 +#: ../libsvn_client/conflicts.c:5687 #, c-format msgid "" "A new item appeared during merge of\n" @@ -3181,7 +3182,7 @@ msgstr "" "\"^/%s:%ld\".\n" "Det lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:5461 +#: ../libsvn_client/conflicts.c:5693 #, c-format msgid "" "A new item appeared during merge of\n" @@ -3192,7 +3193,7 @@ msgstr "" "\"^/%s:%ld-%ld\".\n" "Det lades till av %s i r%ld." -#: ../libsvn_client/conflicts.c:5481 +#: ../libsvn_client/conflicts.c:5713 #, c-format msgid "" "A new directory appeared during reverse-merge of\n" @@ -3203,7 +3204,7 @@ msgstr "" "\"^/%s:%ld\".\n" "Den raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:5488 +#: ../libsvn_client/conflicts.c:5720 #, c-format msgid "" "A new directory appeared during reverse-merge of\n" @@ -3214,7 +3215,7 @@ msgstr "" "\"^/%s:%ld-%ld\".\n" "Den raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:5500 +#: ../libsvn_client/conflicts.c:5732 #, c-format msgid "" "A new file appeared during reverse-merge of\n" @@ -3225,7 +3226,7 @@ msgstr "" "\"^/%s:%ld\".\n" "Den raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:5507 +#: ../libsvn_client/conflicts.c:5739 #, c-format msgid "" "A new file appeared during reverse-merge of\n" @@ -3236,7 +3237,7 @@ msgstr "" "\"^/%s:%ld-%ld\".\n" "Den raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:5517 +#: ../libsvn_client/conflicts.c:5749 #, c-format msgid "" "A new item appeared during reverse-merge of\n" @@ -3247,7 +3248,7 @@ msgstr "" "\"^/%s:%ld\".\n" "Det raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:5524 +#: ../libsvn_client/conflicts.c:5756 #, c-format msgid "" "A new item appeared during reverse-merge of\n" @@ -3258,37 +3259,37 @@ msgstr "" "\"^/%s:%ld-%ld\".\n" "Det raderades av %s i r%ld." -#: ../libsvn_client/conflicts.c:5835 +#: ../libsvn_client/conflicts.c:6070 #, c-format msgid "Changes destined for a directory arrived via the following revisions during update from r%ld to r%ld." msgstr "Ändringar avsedda för en katalog kom genom följande revisioner under uppdatering från r%ld till r%ld." -#: ../libsvn_client/conflicts.c:5841 +#: ../libsvn_client/conflicts.c:6076 #, c-format msgid "Changes destined for a file arrived via the following revisions during update from r%ld to r%ld" msgstr "Ändringar avsedda för en fil kom genom följande revisioner under uppdatering från r%ld till r%ld" -#: ../libsvn_client/conflicts.c:5846 +#: ../libsvn_client/conflicts.c:6081 #, c-format msgid "Changes from the following revisions arrived during update from r%ld to r%ld" msgstr "Ändringar från följande revisioner kom under uppdatering från r%ld till r%ld" -#: ../libsvn_client/conflicts.c:5854 +#: ../libsvn_client/conflicts.c:6089 #, c-format msgid "Changes destined for a directory arrived via the following revisions during backwards update from r%ld to r%ld" msgstr "Ändringar avsedda för en katalog kom genom följande revisioner under uppdatering bakåt från r%ld till r%ld" -#: ../libsvn_client/conflicts.c:5861 +#: ../libsvn_client/conflicts.c:6096 #, c-format msgid "Changes destined for a file arrived via the following revisions during backwards update from r%ld to r%ld" msgstr "Ändringar avsedda för en fil kom genom följande revisioner under uppdatering bakåt från r%ld till r%ld" -#: ../libsvn_client/conflicts.c:5867 +#: ../libsvn_client/conflicts.c:6102 #, c-format msgid "Changes from the following revisions arrived during backwards update from r%ld to r%ld" msgstr "Ändringar från följande revisioner kom under uppdatering bakåt från r%ld till r%ld" -#: ../libsvn_client/conflicts.c:5881 ../libsvn_client/conflicts.c:5888 +#: ../libsvn_client/conflicts.c:6116 ../libsvn_client/conflicts.c:6123 #, c-format msgid "" "Changes destined for a directory arrived via the following revisions during switch to\n" @@ -3297,7 +3298,7 @@ msgstr "" "Ändringar avsedda för en katalog kom genom följande revisioner under växling till\n" "\"^/%s@r%ld\"" -#: ../libsvn_client/conflicts.c:5894 +#: ../libsvn_client/conflicts.c:6129 #, c-format msgid "" "Changes from the following revisions arrived during switch to\n" @@ -3306,22 +3307,28 @@ msgstr "" "Ändringar från följande revisioner kom under växling till\n" "\"^/%s@r%ld\"" -#: ../libsvn_client/conflicts.c:5937 ../libsvn_client/conflicts.c:5951 -#: ../libsvn_client/conflicts.c:5957 +#: ../libsvn_client/conflicts.c:6172 ../libsvn_client/conflicts.c:6189 +#: ../libsvn_client/conflicts.c:6195 #, c-format msgid "%s r%ld by %s%s" msgstr "%s r%ld av %s%s" -#: ../libsvn_client/conflicts.c:5947 +#: ../libsvn_client/conflicts.c:6182 #, c-format msgid "" "%s\n" +" [%d revision omitted for brevity],\n" +msgid_plural "" +"%s\n" " [%d revisions omitted for brevity],\n" -msgstr "" +msgstr[0] "" +"%s\n" +" [%d revision utelämnad],\n" +msgstr[1] "" "%s\n" " [%d revisioner utelämnade],\n" -#: ../libsvn_client/conflicts.c:6016 +#: ../libsvn_client/conflicts.c:6254 #, c-format msgid "" "Changes destined for a directory arrived during merge of\n" @@ -3330,7 +3337,7 @@ msgstr "" "Ändringar avsedda för en katalog kom under sammanslagning av\n" "\"^/%s:%ld\"." -#: ../libsvn_client/conflicts.c:6023 +#: ../libsvn_client/conflicts.c:6261 #, c-format msgid "" "Changes destined for a file arrived during merge of\n" @@ -3339,7 +3346,7 @@ msgstr "" "Ändringar avsedda för en fil kom under sammanslagning av\n" "\"^/%s:%ld\"." -#: ../libsvn_client/conflicts.c:6029 +#: ../libsvn_client/conflicts.c:6267 #, c-format msgid "" "Changes arrived during merge of\n" @@ -3348,7 +3355,7 @@ msgstr "" "Ändringar kom under sammanslagning av\n" "\"^/%s:%ld\"." -#: ../libsvn_client/conflicts.c:6041 +#: ../libsvn_client/conflicts.c:6279 #, c-format msgid "" "Changes destined for a directory arrived via the following revisions during merge of\n" @@ -3357,7 +3364,7 @@ msgstr "" "Ändringar avsedda för en katalog kom genom följande revisioner under sammanslagning av\n" "\"^/%s:%ld-%ld\"" -#: ../libsvn_client/conflicts.c:6048 +#: ../libsvn_client/conflicts.c:6286 #, c-format msgid "" "Changes destined for a file arrived via the following revisions during merge of\n" @@ -3366,7 +3373,7 @@ msgstr "" "Ändringar avsedda för en fil kom genom följande revisioner under sammanslagninv av\n" "\"^/%s:%ld-%ld\"" -#: ../libsvn_client/conflicts.c:6054 +#: ../libsvn_client/conflicts.c:6292 #, c-format msgid "" "Changes from the following revisions arrived during merge of\n" @@ -3375,7 +3382,7 @@ msgstr "" "Ändringar från följande revisioner kom under sammanslagning av\n" "\"^/%s:%ld-%ld\"" -#: ../libsvn_client/conflicts.c:6066 +#: ../libsvn_client/conflicts.c:6304 #, c-format msgid "" "Changes destined for a directory arrived during reverse-merge of\n" @@ -3384,7 +3391,7 @@ msgstr "" "Ändringar avsedda för en katalog kom under omvänd sammanslagning av\n" "\"^/%s:%ld\"." -#: ../libsvn_client/conflicts.c:6073 +#: ../libsvn_client/conflicts.c:6311 #, c-format msgid "" "Changes destined for a file arrived during reverse-merge of\n" @@ -3393,7 +3400,7 @@ msgstr "" "Ändringar kom under omvänd sammanslagning av\n" "\"^/%s:%ld\"." -#: ../libsvn_client/conflicts.c:6079 +#: ../libsvn_client/conflicts.c:6317 #, c-format msgid "" "Changes arrived during reverse-merge of\n" @@ -3402,7 +3409,7 @@ msgstr "" "Ändringar kom under omvänd sammanslagning av\n" "\"^/%s:%ld\"." -#: ../libsvn_client/conflicts.c:6091 +#: ../libsvn_client/conflicts.c:6329 #, c-format msgid "" "Changes destined for a directory arrived via the following revisions during reverse-merge of\n" @@ -3411,7 +3418,7 @@ msgstr "" "Ändringar avsedda för en katalog kom genom följande revisioner under omvänd sammanslagning av\n" "\"^/%s:%ld-%ld\"" -#: ../libsvn_client/conflicts.c:6099 +#: ../libsvn_client/conflicts.c:6337 #, c-format msgid "" "Changes destined for a file arrived via the following revisions during reverse-merge of\n" @@ -3420,7 +3427,7 @@ msgstr "" "Ändringar avsedda för en fil kom genom följande revisioner under omvänd sammanslagning av\n" "\"^/%s:%ld-%ld\"" -#: ../libsvn_client/conflicts.c:6107 +#: ../libsvn_client/conflicts.c:6345 #, c-format msgid "" "Changes from the following revisions arrived during reverse-merge of\n" @@ -3429,387 +3436,414 @@ msgstr "" "Ändringar från följande revisioner kom under omvänd sammanslagning av\n" "\"^/%s:%ld-%ld\"" -#: ../libsvn_client/conflicts.c:6296 +#: ../libsvn_client/conflicts.c:6534 #, c-format msgid "Tree conflict on '%s' can only be resolved to the current working copy state" msgstr "Trädkonflikt på \"%s\" kan endast lösas till tillståndet i nuvarande arbetskopia" -#: ../libsvn_client/conflicts.c:6480 ../libsvn_client/conflicts.c:6486 +#: ../libsvn_client/conflicts.c:6718 ../libsvn_client/conflicts.c:6724 #, c-format msgid "Cannot resolve tree conflict on '%s' (expected a base node but found none)" msgstr "Kan inte lösa trädkonflikten på \"%s\" (en basnod förväntades men hittades inte)" -#: ../libsvn_client/conflicts.c:6491 ../libsvn_client/conflicts.c:6517 -#: ../libsvn_client/conflicts.c:6544 ../libsvn_client/conflicts.c:6567 +#: ../libsvn_client/conflicts.c:6729 ../libsvn_client/conflicts.c:6755 +#: ../libsvn_client/conflicts.c:6782 ../libsvn_client/conflicts.c:6805 #, c-format msgid "Unexpected option id '%d'" msgstr "Oväntad options-ID \"%d\"" -#: ../libsvn_client/conflicts.c:6500 ../libsvn_client/conflicts.c:6509 +#: ../libsvn_client/conflicts.c:6738 ../libsvn_client/conflicts.c:6747 #, c-format msgid "Cannot resolve tree conflict on '%s' (expected base node kind '%s', but found '%s')" msgstr "Kan inte lösa trädkonflikten på \"%s\" (basnodstyp \"%s\" förväntades, men \"%s\" hittades)" -#: ../libsvn_client/conflicts.c:6525 ../libsvn_client/conflicts.c:6535 +#: ../libsvn_client/conflicts.c:6763 ../libsvn_client/conflicts.c:6773 #, c-format msgid "Cannot resolve tree conflict on '%s' (expected base node from '^/%s@%ld', but found '^/%s@%ld')" msgstr "Kan inte lösa trädkonflikten på \"%s\" (basnod från \"^/%s@%ld\" förväntades, men \"^/%s@%ld\" hittades)" -#: ../libsvn_client/conflicts.c:6553 ../libsvn_client/conflicts.c:6561 +#: ../libsvn_client/conflicts.c:6791 ../libsvn_client/conflicts.c:6799 #, c-format msgid "Cannot resolve tree conflict on '%s' (expected an added item, but the item is not added)" msgstr "Kan inte lösa trädkonflikten på \"%s\" (tillagt objekt förväntades, men objektet är inte tillagt)" -#: ../libsvn_client/conflicts.c:6731 ../libsvn_client/conflicts.c:8546 +#: ../libsvn_client/conflicts.c:6970 ../libsvn_client/conflicts.c:8807 #, c-format msgid "If needed, a backup copy of '%s' can be found at '%s'" msgstr "Vid behov finns en säkerhetskopia av \"%s\" vid \"%s\"" -#: ../libsvn_client/conflicts.c:7594 +#: ../libsvn_client/conflicts.c:7832 #, c-format msgid "Conflict resolution option '%d' requires details for tree conflict at '%s' to be fetched from the repository" msgstr "Konfliktlösningsvalet \"%d\" kräver att detaljer om trädkonflikten vid \"%s\" hämtas från arkivet" -#: ../libsvn_client/conflicts.c:7618 +#: ../libsvn_client/conflicts.c:7856 #, c-format msgid "Could not determine when '%s' was added the repository" msgstr "Kunde inte avgöra när \"%s\" lades till arkivet" -#: ../libsvn_client/conflicts.c:7633 +#: ../libsvn_client/conflicts.c:7871 #, c-format msgid "Could not determine when '%s' was deleted from the repository" msgstr "Kunde inte avgöra när \"%s\" raderades från arkivet" -#: ../libsvn_client/conflicts.c:7922 +#: ../libsvn_client/conflicts.c:8160 #, c-format msgid "Could not determine the revision in which '^/%s' was added to the repository.\n" msgstr "Kunde inte avgöra i vilken revision \"^/%s\" lades till arkivet.\n" -#: ../libsvn_client/conflicts.c:8026 -#, c-format -msgid "Conflict resolution option '%d' requires details for tree conflict at '%s' to be fetched from the repository." -msgstr "Konfliktlösningsvalet \"%d\" kräver att detaljer om trädkonflikten vid \"%s\" hämtas från arkivet." - -#: ../libsvn_client/conflicts.c:8043 +#: ../libsvn_client/conflicts.c:8256 #, c-format msgid "Cannot resolve tree conflict on '%s' (expected a copied item, but the item is not a copy)" msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett kopierat objekt, men objektet är inte en kopia)" -#: ../libsvn_client/conflicts.c:8054 -#, c-format -msgid "Could not find the revision in which '%s' was deleted from the repository" -msgstr "Kunde inte avgöra i vilken revision \"%s\" raderades från arkivet" - -#: ../libsvn_client/conflicts.c:8064 +#: ../libsvn_client/conflicts.c:8267 #, c-format msgid "Cannot resolve tree conflict on '%s' (expected an item copied from a revision smaller than r%ld, but the item was copied from r%ld)" msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett objekt kopierat från en revision mindre än r%ld, men objektet kopierades från r%ld)" -#: ../libsvn_client/conflicts.c:8077 +#: ../libsvn_client/conflicts.c:8279 #, c-format msgid "Cannot resolve tree conflict on '%s' (expected an item copied from a revision larger than r%ld, but the item was copied from r%ld)" msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett objekt kopierat från en revision större än r%ld, men objektet kopierades från r%ld)" -#: ../libsvn_client/conflicts.c:8096 +#: ../libsvn_client/conflicts.c:8298 #, c-format msgid "Cannot resolve tree conflict on '%s' (expected an item copied from '^/%s' or from '^/%s' but the item was copied from '^/%s@%ld')" msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett objekt kopierat från \"^/%s\" eller från \"^/%s\" men objektet kopierades från \"^/%s@%ld\")" -#: ../libsvn_client/conflicts.c:8118 +#: ../libsvn_client/conflicts.c:8320 #, c-format msgid "Cannot resolve tree conflict on '%s' (expected an item copied from '^/%s', but the item was copied from '^/%s@%ld')" msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett objekt kopierat från \"^/%s\", men objektet kopierades från \"^/%s@%ld\")" -#: ../libsvn_client/conflicts.c:8143 +#: ../libsvn_client/conflicts.c:8369 +#, c-format +msgid "Conflict resolution option '%d' requires details for tree conflict at '%s' to be fetched from the repository." +msgstr "Konfliktlösningsvalet \"%d\" kräver att detaljer om trädkonflikten vid \"%s\" hämtas från arkivet." + +#: ../libsvn_client/conflicts.c:8379 +#, c-format +msgid "Could not find the revision in which '%s' was deleted from the repository" +msgstr "Kunde inte avgöra i vilken revision \"%s\" raderades från arkivet" + +#: ../libsvn_client/conflicts.c:8404 #, c-format msgid "Cannot resolve tree conflict on '%s' (expected node kind '%s' but found '%s')" msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade nodtyp \"%s\" men hittade \"%s\")" -#: ../libsvn_client/conflicts.c:8310 ../libsvn_client/conflicts.c:8593 +#: ../libsvn_client/conflicts.c:8571 ../libsvn_client/conflicts.c:8854 #, c-format msgid "The specified conflict resolution option requires details for tree conflict at '%s' to be fetched from the repository first." msgstr "Det angivna konfliktlösningsvalet kräver att detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet." -#: ../libsvn_client/conflicts.c:8317 +#: ../libsvn_client/conflicts.c:8578 #, c-format msgid "Invalid operation code '%d' recorded for conflict at '%s'" msgstr "Ogiltig operationskod \"%d\" registrerad för konflikten vid \"%s\"" -#: ../libsvn_client/conflicts.c:8654 +#: ../libsvn_client/conflicts.c:8915 #, c-format msgid "Cannot resolve tree conflict on '%s' (expected a copied item at '%s', but the item is not a copy)" msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett kopierat objekt vid \"%s\", men objektet är inte en kopia)" -#: ../libsvn_client/conflicts.c:8667 +#: ../libsvn_client/conflicts.c:8928 #, c-format msgid "Cannot resolve tree conflict on '%s' (could not determine origin of '%s')" msgstr "Kan inte lösa trädkonflikten på \"%s\" (kunde inte avgöra ursprunget för \"%s\")" -#: ../libsvn_client/conflicts.c:8687 +#: ../libsvn_client/conflicts.c:8948 #, c-format msgid "Cannot resolve tree conflict on '%s' (could not find common ancestor of '^/%s@%ld' and '^/%s@%ld')" msgstr "Kan inte lösa trädkonflikten på \"%s\" (kunde inte hitta gemensamt ursprung för \"^/%s@%ld\" och \"^/%s@%ld\")" -#: ../libsvn_client/conflicts.c:9042 ../libsvn_client/conflicts.c:9125 -#: ../libsvn_client/conflicts.c:10291 +#: ../libsvn_client/conflicts.c:9134 +#, c-format +msgid "Corresponding working copy node not found for '%s'" +msgstr "Motsvarande nod i arbetskopian fanns ej för \"%s\"" + +#: ../libsvn_client/conflicts.c:9456 ../libsvn_client/conflicts.c:9539 +#: ../libsvn_client/conflicts.c:11122 msgid "Postpone" msgstr "Lös senare" -#: ../libsvn_client/conflicts.c:9043 ../libsvn_client/conflicts.c:9126 -#: ../libsvn_client/conflicts.c:10292 +#: ../libsvn_client/conflicts.c:9457 ../libsvn_client/conflicts.c:9540 +#: ../libsvn_client/conflicts.c:11123 msgid "skip this conflict and leave it unresolved" msgstr "hoppa över denna konflikt och lämna den olöst" -#: ../libsvn_client/conflicts.c:9052 ../libsvn_client/conflicts.c:9073 -#: ../libsvn_client/conflicts.c:9131 +#: ../libsvn_client/conflicts.c:9466 ../libsvn_client/conflicts.c:9487 +#: ../libsvn_client/conflicts.c:9545 msgid "Accept base" msgstr "Godta basen" -#: ../libsvn_client/conflicts.c:9053 +#: ../libsvn_client/conflicts.c:9467 msgid "discard local and incoming changes for this binary file" msgstr "släng bort lokala och inkommande ändringar för denna binärfil" -#: ../libsvn_client/conflicts.c:9058 ../libsvn_client/conflicts.c:9079 -#: ../libsvn_client/conflicts.c:9137 +#: ../libsvn_client/conflicts.c:9472 ../libsvn_client/conflicts.c:9493 +#: ../libsvn_client/conflicts.c:9551 msgid "Accept incoming" msgstr "Godta inkommande" -#: ../libsvn_client/conflicts.c:9059 +#: ../libsvn_client/conflicts.c:9473 msgid "accept incoming version of binary file" msgstr "godta inkommande version av binärfil" -#: ../libsvn_client/conflicts.c:9064 ../libsvn_client/conflicts.c:9103 -#: ../libsvn_client/conflicts.c:9143 ../libsvn_client/conflicts.c:9200 +#: ../libsvn_client/conflicts.c:9478 ../libsvn_client/conflicts.c:9517 +#: ../libsvn_client/conflicts.c:9557 ../libsvn_client/conflicts.c:9614 msgid "Mark as resolved" msgstr "Markera som löst" -#: ../libsvn_client/conflicts.c:9065 +#: ../libsvn_client/conflicts.c:9479 msgid "accept binary file as it appears in the working copy" msgstr "godta binärfilen som den är i arbetskopian" -#: ../libsvn_client/conflicts.c:9074 +#: ../libsvn_client/conflicts.c:9488 msgid "discard local and incoming changes for this file" msgstr "släng bort lokala och inkommande ändringar för denna fil" -#: ../libsvn_client/conflicts.c:9080 +#: ../libsvn_client/conflicts.c:9494 msgid "accept incoming version of entire file" msgstr "godta inkommande version av hela filen" -#: ../libsvn_client/conflicts.c:9085 +#: ../libsvn_client/conflicts.c:9499 msgid "Reject incoming" msgstr "Avslå inkommande" -#: ../libsvn_client/conflicts.c:9086 +#: ../libsvn_client/conflicts.c:9500 msgid "reject all incoming changes for this file" msgstr "avslå alla inkommande ändringar för denna fil" -#: ../libsvn_client/conflicts.c:9091 ../libsvn_client/conflicts.c:9149 +#: ../libsvn_client/conflicts.c:9505 ../libsvn_client/conflicts.c:9563 msgid "Accept incoming for conflicts" msgstr "Godta inkommande för konflikter" -#: ../libsvn_client/conflicts.c:9092 -msgid "accept changes only where they conflict" -msgstr "godta ändringar bara där konflikter uppstår" +#: ../libsvn_client/conflicts.c:9506 ../libsvn_client/conflicts.c:9564 +msgid "accept incoming changes only where they conflict" +msgstr "godta inkommande ändringar bara där konflikter uppstår" -#: ../libsvn_client/conflicts.c:9097 ../libsvn_client/conflicts.c:9155 +#: ../libsvn_client/conflicts.c:9511 ../libsvn_client/conflicts.c:9569 msgid "Reject conflicts" msgstr "Avslå konflikter" -#: ../libsvn_client/conflicts.c:9098 ../libsvn_client/conflicts.c:9156 -msgid "reject changes which conflict and accept the rest" -msgstr "avslå ändringar som orsakar konflikter och godta resten" +#: ../libsvn_client/conflicts.c:9512 +msgid "reject incoming changes which conflict and accept the rest" +msgstr "avslå inkommande ändringar som orsakar konflikter och godta resten" -#: ../libsvn_client/conflicts.c:9104 +#: ../libsvn_client/conflicts.c:9518 msgid "accept the file as it appears in the working copy" msgstr "godta filen som den är i arbetskopian" -#: ../libsvn_client/conflicts.c:9132 +#: ../libsvn_client/conflicts.c:9546 msgid "discard local and incoming changes for this property" msgstr "släng bort lokala och inkommande ändringar för denna egenskap" -#: ../libsvn_client/conflicts.c:9138 +#: ../libsvn_client/conflicts.c:9552 msgid "accept incoming version of entire property value" msgstr "godta inkommande version av hela egenskapsvärdet" -#: ../libsvn_client/conflicts.c:9144 +#: ../libsvn_client/conflicts.c:9558 msgid "accept working copy version of entire property value" msgstr "godta arbetskopians version av hela egenskapsvärdet" -#: ../libsvn_client/conflicts.c:9150 -msgid "accept incoming changes only where they conflict" -msgstr "godta inkommande ändringar bara där konflikter uppstår" +#: ../libsvn_client/conflicts.c:9570 +msgid "reject changes which conflict and accept the rest" +msgstr "avslå ändringar som orsakar konflikter och godta resten" -#: ../libsvn_client/conflicts.c:9161 +#: ../libsvn_client/conflicts.c:9575 msgid "Accept merged" msgstr "Godta sammanslaget" -#: ../libsvn_client/conflicts.c:9162 +#: ../libsvn_client/conflicts.c:9576 msgid "accept merged version of property value" msgstr "godta sammanslagen version av egenskapsvärde" -#: ../libsvn_client/conflicts.c:9201 +#: ../libsvn_client/conflicts.c:9615 msgid "accept current working copy state" msgstr "godta nuvarande tillstånd i arbetskopia" -#: ../libsvn_client/conflicts.c:9228 +#: ../libsvn_client/conflicts.c:9642 msgid "Update move destination" msgstr "Uppdatera flyttmålet" -#: ../libsvn_client/conflicts.c:9229 +#: ../libsvn_client/conflicts.c:9643 msgid "apply incoming changes to move destination" msgstr "utför inkommande ändringar på flyttmålet" -#: ../libsvn_client/conflicts.c:9263 +#: ../libsvn_client/conflicts.c:9677 msgid "Update any moved-away children" msgstr "Uppdatera bortflyttade barn om sådana finns" -#: ../libsvn_client/conflicts.c:9264 +#: ../libsvn_client/conflicts.c:9678 msgid "prepare for updating moved-away children, if any" msgstr "förbered för uppdatering av bortflyttade barn, om sådana finns" -#: ../libsvn_client/conflicts.c:9309 +#: ../libsvn_client/conflicts.c:9723 #, c-format msgid "ignore and do not add '^/%s@%ld' here" msgstr "hoppa över och lägg inte till \"^/%s@%ld\" här" -#: ../libsvn_client/conflicts.c:9317 +#: ../libsvn_client/conflicts.c:9731 #, c-format msgid "replace '^/%s@%ld' with the locally added file" msgstr "ersätt \"^/%s@%ld\" med den lokalt tillagda filen" -#: ../libsvn_client/conflicts.c:9322 +#: ../libsvn_client/conflicts.c:9736 #, c-format msgid "replace '^/%s@%ld' with the locally added directory" msgstr "ersätt \"^/%s@%ld\" med den lokalt tillagda katalogen" -#: ../libsvn_client/conflicts.c:9328 +#: ../libsvn_client/conflicts.c:9742 #, c-format msgid "replace '^/%s@%ld' with the locally added item" msgstr "ersätt \"^/%s@%ld\" med det lokalt tillagda objektet" -#: ../libsvn_client/conflicts.c:9333 +#: ../libsvn_client/conflicts.c:9747 #, c-format msgid "unexpected operation code '%d'" msgstr "oväntad operationskod \"%d\"" -#: ../libsvn_client/conflicts.c:9337 +#: ../libsvn_client/conflicts.c:9751 msgid "Ignore incoming addition" msgstr "Hoppa över inkommande tillägg" -#: ../libsvn_client/conflicts.c:9383 ../libsvn_client/conflicts.c:9508 +#: ../libsvn_client/conflicts.c:9797 ../libsvn_client/conflicts.c:9926 #, c-format msgid "merge '^/%s@%ld' into '%s'" msgstr "slå samman \"^/%s@%ld\" in i \"%s\"" -#: ../libsvn_client/conflicts.c:9391 ../libsvn_client/conflicts.c:9516 +#: ../libsvn_client/conflicts.c:9805 ../libsvn_client/conflicts.c:9935 #, c-format msgid "merge local '%s' and '^/%s@%ld'" msgstr "slå samman lokala \"%s\" och \"^/%s@%ld\"" -#: ../libsvn_client/conflicts.c:9401 +#: ../libsvn_client/conflicts.c:9815 msgid "Merge the files" msgstr "Slå samman filerna" -#: ../libsvn_client/conflicts.c:9450 +#: ../libsvn_client/conflicts.c:9864 #, c-format msgid "delete '%s', copy '^/%s@%ld' here, and merge the files" msgstr "radera \"%s\", kopiera hit \"^/%s@%ld\", och slå samman filerna" -#: ../libsvn_client/conflicts.c:9460 ../libsvn_client/conflicts.c:9638 +#: ../libsvn_client/conflicts.c:9874 ../libsvn_client/conflicts.c:10057 msgid "Replace and merge" msgstr "Ersätt och slå samman" -#: ../libsvn_client/conflicts.c:9525 +#: ../libsvn_client/conflicts.c:9944 msgid "Merge the directories" msgstr "Slå samman katalogerna" -#: ../libsvn_client/conflicts.c:9572 +#: ../libsvn_client/conflicts.c:9991 #, c-format msgid "delete '%s' and copy '^/%s@%ld' here" msgstr "radera \"%s\" och kopiera hit \"^/%s@%ld\"" -#: ../libsvn_client/conflicts.c:9581 +#: ../libsvn_client/conflicts.c:10000 msgid "Delete my directory and replace it with incoming directory" msgstr "Radera min katalog och ersätt den med inkommande katalog" -#: ../libsvn_client/conflicts.c:9628 +#: ../libsvn_client/conflicts.c:10047 #, c-format msgid "delete '%s', copy '^/%s@%ld' here, and merge the directories" msgstr "radera \"%s\", kopiera hit \"^/%s@%ld\", och slå samman katalogerna" -#: ../libsvn_client/conflicts.c:9708 +#: ../libsvn_client/conflicts.c:10127 #, c-format msgid "ignore the deletion of '^/%s@%ld'" msgstr "hoppa över raderingen av \"^/%s@%ld\"" -#: ../libsvn_client/conflicts.c:9713 +#: ../libsvn_client/conflicts.c:10132 msgid "Ignore incoming deletion" msgstr "Hoppa över inkommande radering" -#: ../libsvn_client/conflicts.c:9766 +#: ../libsvn_client/conflicts.c:10185 #, c-format msgid "accept the deletion of '%s'" msgstr "godta borttagningen av \"%s\"" -#: ../libsvn_client/conflicts.c:9773 +#: ../libsvn_client/conflicts.c:10192 msgid "Accept incoming deletion" msgstr "Godta inkommande radering" -#: ../libsvn_client/conflicts.c:9812 +#: ../libsvn_client/conflicts.c:10231 #, c-format msgid "move '%s' to '%s' and merge" msgstr "flytta \"%s\" till \"%s\" och slå samman" -#: ../libsvn_client/conflicts.c:9822 +#: ../libsvn_client/conflicts.c:10241 #, c-format msgid "move and merge local changes from '%s' into '%s'" msgstr "flytta och slå samman lokala ändringar från \"%s\" till \"%s\"" -#: ../libsvn_client/conflicts.c:9883 ../libsvn_client/conflicts.c:9943 +#: ../libsvn_client/conflicts.c:10302 ../libsvn_client/conflicts.c:10362 msgid "Move and merge" msgstr "Flytta och slå samman" -#: ../libsvn_client/conflicts.c:10027 +#: ../libsvn_client/conflicts.c:10426 #, c-format msgid "apply changes to move destination '%s'" msgstr "utför ändringar på flyttmålet \"%s\"" -#: ../libsvn_client/conflicts.c:10036 +#: ../libsvn_client/conflicts.c:10439 ../libsvn_client/conflicts.c:10447 msgid "Apply to move destination" msgstr "Utför ändringar på flyttmålet" -#: ../libsvn_client/conflicts.c:10069 ../libsvn_client/conflicts.c:10197 +#: ../libsvn_client/conflicts.c:10510 ../libsvn_client/conflicts.c:11021 #, c-format -msgid "Getting a list of possible move targets requires details for tree conflict at '%s' to be fetched from the repository first" -msgstr "För att räkna upp möjliga flyttmål måste detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet" +msgid "apply changes to '%s'" +msgstr "utför ändringar på \"%s\"" -#: ../libsvn_client/conflicts.c:10122 ../libsvn_client/conflicts.c:10245 +#: ../libsvn_client/conflicts.c:10523 ../libsvn_client/conflicts.c:10531 +msgid "Apply to corresponding local location" +msgstr "Utför ändringar på motsvarande lokalt ställe" + +#: ../libsvn_client/conflicts.c:10614 ../libsvn_client/conflicts.c:10634 +#: ../libsvn_client/conflicts.c:10906 #, c-format -msgid "Setting a move target requires details for tree conflict at '%s' to be fetched from the repository first" -msgstr "För att ange ett flyttmål måste detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet" +msgid "Getting a list of possible move targets requires details for tree conflict at '%s' to be fetched from the repository first" +msgstr "För att räkna upp möjliga flyttmål måste detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet" -#: ../libsvn_client/conflicts.c:10131 ../libsvn_client/conflicts.c:10258 +#: ../libsvn_client/conflicts.c:10679 ../libsvn_client/conflicts.c:11036 +#: ../libsvn_client/conflicts.c:11072 #, c-format msgid "Index '%d' is out of bounds of the possible move target list for '%s'" msgstr "Index \"%d\" är utanför listan av möjliga flyttmål för \"%s\"" -#: ../libsvn_client/conflicts.c:10168 +#: ../libsvn_client/conflicts.c:10707 #, c-format msgid "Repository path '%s' not found in list of possible move targets for '%s'" msgstr "Arkivsökvägen \"%s\" fanns inte i listan av möjliga flyttmål för \"%s\"" -#: ../libsvn_client/conflicts.c:10475 ../libsvn_client/conflicts.c:10524 -#: ../libsvn_client/conflicts.c:10577 +#: ../libsvn_client/conflicts.c:10751 ../libsvn_client/conflicts.c:10775 +#: ../libsvn_client/conflicts.c:10996 ../libsvn_client/conflicts.c:11059 +#, c-format +msgid "Setting a move target requires details for tree conflict at '%s' to be fetched from the repository first" +msgstr "För att ange ett flyttmål måste detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet" + +#: ../libsvn_client/conflicts.c:10858 +#, c-format +msgid "Getting a list of possible move siblings requires details for tree conflict at '%s' to be fetched from the repository first" +msgstr "För att få en lista på möjliga syskon att flytta måste detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet" + +#: ../libsvn_client/conflicts.c:11007 +#, c-format +msgid "Index '%d' is out of bounds of the possible move sibling list for '%s'" +msgstr "Index \"%d\" är utanför listan av möjliga syskon att flytta för \"%s\"" + +#: ../libsvn_client/conflicts.c:11309 ../libsvn_client/conflicts.c:11358 +#: ../libsvn_client/conflicts.c:11411 #, c-format msgid "Inapplicable conflict resolution option given for conflicted path '%s'" msgstr "Ej tillämpbart konfliktlösningsval angivet för konfliktsökväg \"%s\"" -#: ../libsvn_client/conflicts.c:10797 +#: ../libsvn_client/conflicts.c:11631 #, c-format msgid "Property '%s' is not in conflict." msgstr "Egenskapen \"%s\" är inte i konflikt" -#: ../libsvn_client/conflicts.c:11187 ../libsvn_wc/conflicts.c:3292 +#: ../libsvn_client/conflicts.c:12021 ../libsvn_wc/conflicts.c:3327 #, c-format msgid "Unable to resolve pending conflict on '%s'" msgstr "Kan inte lösa väntande konflikt på \"%s\"" @@ -3847,7 +3881,7 @@ msgstr "Sökvägen \"%s\" finns men är utesluten" #: ../libsvn_client/copy.c:991 ../libsvn_client/copy.c:1715 #: ../libsvn_client/copy.c:2090 ../libsvn_client/copy.c:2732 #: ../libsvn_client/import.c:911 ../libsvn_client/mtcc.c:456 -#: ../libsvn_client/mtcc.c:473 ../libsvn_ra_serf/util.c:1900 +#: ../libsvn_client/mtcc.c:473 ../libsvn_ra_serf/util.c:1920 #, c-format msgid "Path '%s' already exists" msgstr "Sökvägen \"%s\" finns redan" @@ -3868,8 +3902,8 @@ msgstr "Katalogen \"%s\" är inte versionshanterad" msgid "Path '%s' is not a directory" msgstr "Sökvägen \"%s\" är ingen katalog" -#: ../libsvn_client/copy.c:1131 ../libsvn_client/merge.c:10252 -#: ../svnlook/svnlook.c:1411 +#: ../libsvn_client/copy.c:1131 ../libsvn_client/merge.c:10270 +#: ../svnlook/svnlook.c:1445 #, c-format msgid "Path '%s' does not exist" msgstr "Sökvägen \"%s\" finns inte" @@ -3939,11 +3973,11 @@ msgid "Path '%s' is not in the working copy" msgstr "Sökvägen \"%s\" finns inte i arbetskopian" #: ../libsvn_client/copy_foreign.c:373 ../libsvn_client/export.c:814 -#: ../libsvn_client/repos_diff.c:1002 ../libsvn_fs_fs/dag.c:1107 +#: ../libsvn_client/repos_diff.c:997 ../libsvn_fs_fs/dag.c:1107 #: ../libsvn_fs_x/dag.c:904 ../libsvn_ra_serf/commit.c:2229 #: ../libsvn_ra_svn/client.c:1506 ../libsvn_wc/diff_editor.c:2109 #: ../libsvn_wc/diff_editor.c:2195 ../libsvn_wc/externals.c:711 -#: ../libsvn_wc/update_editor.c:4228 +#: ../libsvn_wc/update_editor.c:4239 #, c-format msgid "Checksum mismatch for '%s'" msgstr "Felaktig kontrollsumma för \"%s\"" @@ -3987,82 +4021,82 @@ msgstr "URL:en \"%s\" finns inte" msgid "Cannot specify revisions (except HEAD) with move operations" msgstr "Revisioner (förutom HEAD) kan ej anges vid flyttoperationer" -#: ../libsvn_client/deprecated.c:1667 +#: ../libsvn_client/deprecated.c:1750 msgid "No commits in repository" msgstr "Ingenting har arkiverats i arkivet" -#: ../libsvn_client/deprecated.c:3052 ../libsvn_wc/deprecated.c:4202 +#: ../libsvn_client/deprecated.c:3151 ../libsvn_wc/deprecated.c:4228 msgid "Non-recursive relocation not supported" msgstr "Icke-rekursiv omlokalisering otillåten" -#: ../libsvn_client/diff.c:66 +#: ../libsvn_client/diff.c:69 #, c-format msgid "Path '%s' must be an immediate child of the directory '%s'" msgstr "Sökvägen \"%s\" måste stå omedelbart under katalogen \"%s\"" -#: ../libsvn_client/diff.c:241 +#: ../libsvn_client/diff.c:292 #, c-format msgid "%s\t(revision %ld)" msgstr "%s\t(revision %ld)" -#: ../libsvn_client/diff.c:243 +#: ../libsvn_client/diff.c:294 #, c-format msgid "%s\t(nonexistent)" msgstr "%s\t(finns ej)" #. SVN_INVALID_REVNUM -#: ../libsvn_client/diff.c:245 +#: ../libsvn_client/diff.c:296 #, c-format msgid "%s\t(working copy)" msgstr "%s\t(arbetskopia)" -#: ../libsvn_client/diff.c:934 +#: ../libsvn_client/diff.c:978 #, c-format msgid "Cannot display: file marked as a binary type.%s" msgstr "Kan inte visa: filen markerad som binär.%s" -#: ../libsvn_client/diff.c:1471 ../libsvn_client/merge.c:7301 -#: ../libsvn_client/merge.c:10654 +#: ../libsvn_client/diff.c:1474 ../libsvn_client/merge.c:7344 +#: ../libsvn_client/merge.c:10672 msgid "Not all required revisions are specified" msgstr "Alla revisioner som krävs angavs inte" -#: ../libsvn_client/diff.c:1485 +#: ../libsvn_client/diff.c:1488 msgid "At least one revision must be something other than BASE or WORKING when diffing a URL" msgstr "Åtminstone en revision måste vara något annat än BASE eller WORKING för diff av en URL" -#: ../libsvn_client/diff.c:1522 +#: ../libsvn_client/diff.c:1525 #, c-format msgid "Diff target '%s' was not found in the repository at revision '%ld'" msgstr "\"%s\" fanns inte i revision %ld i arkivet" -#: ../libsvn_client/diff.c:1527 +#: ../libsvn_client/diff.c:1530 #, c-format msgid "Diff target '%s' was not found in the repository at revision '%ld' or '%ld'" msgstr "\"%s\" fanns inte i revision %ld eller %ld i arkivet" -#: ../libsvn_client/diff.c:1703 +#: ../libsvn_client/diff.c:1717 #, c-format msgid "Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'" msgstr "\"%s\" fanns inte i revision %ld och %ld i arkivet" -#: ../libsvn_client/diff.c:1708 +#: ../libsvn_client/diff.c:1722 #, c-format msgid "Diff targets '%s' and '%s' were not found in the repository at revisions '%ld' and '%ld'" msgstr "\"%s\" och \"%s\" fanns inte i revision %ld och %ld i arkivet" -#: ../libsvn_client/diff.c:1807 -msgid "Sorry, svn_client_diff6 was called in a way that is not yet supported" -msgstr "Tyvärr anropades svn_client_diff6 på ett sätt som inte stöds ännu" +#: ../libsvn_client/diff.c:1821 +msgid "Sorry, svn_client_diff7 was called in a way that is not yet supported" +msgstr "Tyvärr anropades svn_client_diff7 på ett sätt som inte stöds ännu" -#: ../libsvn_client/diff.c:1847 -msgid "Only diffs between a path's text-base and its working files are supported at this time" -msgstr "Endast skillnader mellan en arbetskopias textbas och arbetsfilerna stöds för närvarande" +#: ../libsvn_client/diff.c:1863 +msgid "A non-URL diff at this time must be either from a path's base to the same path's working version or between the working versions of two paths" +msgstr "En diff som inte är en URL måste antingen komma från sökvägens bas till samma sökvägs arbetsversion eller mellan två arbetsversioner av två sökvägar" -#: ../libsvn_client/diff.c:2551 ../libsvn_client/diff.c:2638 +#: ../libsvn_client/diff.c:2794 ../libsvn_client/diff.c:2857 msgid "Cannot ignore properties and show only properties at the same time" msgstr "Kan inte samtidigt bortse från egenskaper och bara visa egenskaper" -#: ../libsvn_client/diff_local.c:789 ../libsvn_wc/props.c:1675 +#: ../libsvn_client/diff_local.c:733 ../libsvn_wc/props.c:1675 #, c-format msgid "'%s' is not a file or directory" msgstr "\"%s\" är ingen fil eller katalog" @@ -4076,7 +4110,7 @@ msgstr "\"%s\" är inte ett giltigt radslutsvärde" msgid "Destination directory exists, and will not be overwritten unless forced" msgstr "Destinationskatalogen finns och kommer inte att skrivas över om det inte framtvingas" -#: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1529 +#: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1526 #: ../libsvn_wc/adm_crawler.c:1270 ../libsvn_wc/copy.c:651 #: ../libsvn_wc/crop.c:239 ../libsvn_wc/crop.c:342 ../libsvn_wc/info.c:377 #: ../libsvn_wc/node.c:529 ../libsvn_wc/props.c:202 ../libsvn_wc/status.c:2728 @@ -4097,14 +4131,14 @@ msgstr "Destinationskatalogen finns och kommer inte att skrivas över om det int msgid "The node '%s' was not found." msgstr "Noden \"%s\" kunde inte hittas." -#: ../libsvn_client/export.c:285 ../libsvn_client/export.c:1182 -#: ../libsvn_client/export.c:1237 +#: ../libsvn_client/export.c:285 ../libsvn_client/export.c:1181 +#: ../libsvn_client/export.c:1235 #, c-format msgid "Destination file '%s' exists, and will not be overwritten unless forced" msgstr "Destinationsfilen \"%s\" finns och kommer inte att skrivas över om det inte framtvingas" -#: ../libsvn_client/export.c:291 ../libsvn_client/export.c:1187 -#: ../libsvn_client/export.c:1242 +#: ../libsvn_client/export.c:291 ../libsvn_client/export.c:1186 +#: ../libsvn_client/export.c:1240 #, c-format msgid "Destination '%s' exists. Cannot overwrite directory with non-directory" msgstr "Destinationen \"%s\" finns redan. En katalog kan inte skrivas över med något som inte är en katalog" @@ -4175,8 +4209,8 @@ msgstr "\"%s\" är av en typ som är okänd eller ej kan versionshanteras" msgid "New entry name required when importing a file" msgstr "Nytt postnamn krävs vid import av en fil" -#: ../libsvn_client/import.c:787 ../libsvn_client/patch.c:3752 -#: ../libsvn_client/patch.c:3764 ../libsvn_wc/delete.c:93 +#: ../libsvn_client/import.c:787 ../libsvn_client/patch.c:3754 +#: ../libsvn_client/patch.c:3766 ../libsvn_wc/delete.c:93 #: ../libsvn_wc/lock.c:121 ../libsvn_wc/wc_db_wcroot.c:78 #, c-format msgid "'%s' does not exist" @@ -4249,12 +4283,12 @@ msgstr "De speciella revisionerna PREV, BASE och COMMITTED kan inte användas f msgid "Missing required revision specification" msgstr "Revisionsspecifikation saknas" -#: ../libsvn_client/merge.c:416 +#: ../libsvn_client/merge.c:436 #, c-format msgid "URL '%s' of '%s' is not in repository '%s'" msgstr "URL:en \"%s\" för \"%s\" är inte i arkivet \"%s\"" -#: ../libsvn_client/merge.c:453 +#: ../libsvn_client/merge.c:473 #, c-format msgid "'%s' must be from the same repository as '%s'" msgstr "\"%s\" måste vara från samma arkiv som \"%s\"" @@ -4262,26 +4296,26 @@ msgstr "\"%s\" måste vara från samma arkiv som \"%s\"" #. xgettext: the '.working', '.merge-left.r%ld' and #. '.merge-right.r%ld' strings are used to tag onto a file #. name in case of a merge conflict -#: ../libsvn_client/merge.c:2111 +#: ../libsvn_client/merge.c:2108 #, c-format msgid ".working%s%s" msgstr ".arbetskopia%s%s" -#: ../libsvn_client/merge.c:2114 +#: ../libsvn_client/merge.c:2111 #, c-format msgid ".merge-left.r%ld%s%s" msgstr ".sammanslagning-vänster.r%ld%s%s" -#: ../libsvn_client/merge.c:2118 +#: ../libsvn_client/merge.c:2115 #, c-format msgid ".merge-right.r%ld%s%s" msgstr ".sammanslagning-höger.r%ld%s%s" -#: ../libsvn_client/merge.c:4816 +#: ../libsvn_client/merge.c:4859 msgid "Cannot reverse-merge a range from a path's own future history; try updating first" msgstr "Det går inte att göra en omvänd sammanslagning av revisioner från en sökvägs egen framtid; försök att uppdatera först" -#: ../libsvn_client/merge.c:5537 +#: ../libsvn_client/merge.c:5580 #, c-format msgid "" "One or more conflicts were produced while merging r%ld:%ld into\n" @@ -4294,79 +4328,79 @@ msgstr "" "lös alla konflikter och kör om sammanslagningen för att ta hand om\n" "de återstående revisionerna" -#: ../libsvn_client/merge.c:6353 +#: ../libsvn_client/merge.c:6396 #, c-format msgid "Invalid mergeinfo detected on '%s', merge tracking not possible" msgstr "Ogiltig sammanslagningsinformation (\"mergeinfo\") för \"%s\"; följning av sammanslagning ej möjlig" -#: ../libsvn_client/merge.c:6504 +#: ../libsvn_client/merge.c:6547 msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n" msgstr "Följning av sammanslagning kräver att inga delträd saknas; försök att återställa dessa först:\n" -#: ../libsvn_client/merge.c:7505 +#: ../libsvn_client/merge.c:7548 #, c-format msgid "Invalid mergeinfo detected on merge target '%s', merge tracking not possible" msgstr "Ogiltig sammanslagningsinformation (\"mergeinfo\") för målet \"%s\"; följning av sammanslagning ej möjlig" -#: ../libsvn_client/merge.c:9823 +#: ../libsvn_client/merge.c:9856 msgid "Use of two URLs is not compatible with mergeinfo modification" msgstr "Det går inte att använda två URL:er vid ändring av sammanslagningsinformationen" -#: ../libsvn_client/merge.c:9830 ../libsvn_client/merge.c:10166 +#: ../libsvn_client/merge.c:9863 ../libsvn_client/merge.c:10184 msgid "Merge from foreign repository is not compatible with mergeinfo modification" msgstr "Sammanslagning från annat arkiv går inte vid ändring av sammanslagningsinformationen" -#: ../libsvn_client/merge.c:10259 ../libsvn_client/merge.c:10402 +#: ../libsvn_client/merge.c:10277 ../libsvn_client/merge.c:10420 #, c-format msgid "Merge target '%s' does not exist in the working copy" msgstr "Sammanslagningsmålet \"%s\" finns inte i arbetskopian" -#: ../libsvn_client/merge.c:10282 +#: ../libsvn_client/merge.c:10300 msgid "Cannot determine revision of working copy" msgstr "Arbetskopians revision kan inte bestämmas" -#: ../libsvn_client/merge.c:10288 +#: ../libsvn_client/merge.c:10306 #, c-format msgid "Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first" msgstr "Sammanslagning till en arbetskopia i blandad revision [%ld:%ld] går inte; försök med att uppdatera först" -#: ../libsvn_client/merge.c:10303 +#: ../libsvn_client/merge.c:10321 msgid "Cannot merge into a working copy with a switched subtree" msgstr "Kan inte slå samman till en arbetskopia med växlat delträd" -#: ../libsvn_client/merge.c:10319 +#: ../libsvn_client/merge.c:10337 msgid "Cannot merge into a working copy that has local modifications" msgstr "Kan inte slå samman till en arbetskopia som har lokala ändringar" -#: ../libsvn_client/merge.c:10339 ../svn/merge-cmd.c:56 +#: ../libsvn_client/merge.c:10357 ../svn/merge-cmd.c:56 #, c-format msgid "Invalid merge source '%s'; a working copy path can only be used with a repository revision (a number, a date, or head)" msgstr "Ogiltig sammanslagningskälla \"%s\"; en sökväg i en arbetskopia kan bara användas med en arkivrevision (ett nummer, ett datum eller \"HEAD\")" -#: ../libsvn_client/merge.c:10657 ../svn/merge-cmd.c:123 +#: ../libsvn_client/merge.c:10675 ../svn/merge-cmd.c:123 msgid "Merge sources must both be either paths or URLs" msgstr "Båda sammanslagningskällorna måste vara antingen sökvägar eller URL:er" -#: ../libsvn_client/merge.c:11427 ../libsvn_client/merge.c:11589 -#: ../libsvn_client/merge.c:12507 +#: ../libsvn_client/merge.c:11445 ../libsvn_client/merge.c:11607 +#: ../libsvn_client/merge.c:12525 #, c-format msgid "'%s@%ld' must be ancestrally related to '%s@%ld'" msgstr "\"%s@%ld\" måste ha samma ursprung som \"%s@%ld\"" -#: ../libsvn_client/merge.c:11539 +#: ../libsvn_client/merge.c:11557 #, c-format msgid "Neither the reintegrate source nor target can be the root of the repository" msgstr "Varken återföreningens källa eller mål kan vara arkivets rot" -#: ../libsvn_client/merge.c:11549 +#: ../libsvn_client/merge.c:11567 msgid "Reintegrate merge not possible" msgstr "Återförenande sammanslagning ej möjlig" -#: ../libsvn_client/merge.c:11619 +#: ../libsvn_client/merge.c:11637 msgid " Missing ranges: " msgstr " Saknade revisioner: " -#: ../libsvn_client/merge.c:11622 +#: ../libsvn_client/merge.c:11640 #, c-format msgid "" "Reintegrate can only be used if revisions %ld through %ld were previously merged from %s to the reintegrate source, but this is not the case:\n" @@ -4375,29 +4409,29 @@ msgstr "" "Återförening kan bara ske om revisionerna %ld till %ld tidigare slogs samman från %s till återföreningens källa, men så är inte fallet:\n" "%s" -#: ../libsvn_client/merge.c:11681 +#: ../libsvn_client/merge.c:11699 #, c-format msgid "Can't reintegrate into '%s' because it is locally added and therefore not related to the merge source" msgstr "Kan inte återförena in i \"%s\" eftersom den har lagts till lokalt och är därför orelaterad till sammanslagningskällan" -#: ../libsvn_client/merge.c:11969 +#: ../libsvn_client/merge.c:11987 msgid "Cannot merge automatically while ignoring mergeinfo" msgstr "Automatisk sammanslagning ej möjlig utan användning av sammanslagningsinformation" -#: ../libsvn_client/merge.c:12637 +#: ../libsvn_client/merge.c:12655 #, c-format msgid "Can't perform automatic merge into '%s' because it is locally added and therefore not related to the merge source" msgstr "Kan inte göra automatisk sammanslagning in i \"%s\" eftersom den har lagts till lokalt och är därför orelaterad till sammanslagningskällan" -#: ../libsvn_client/merge.c:12736 +#: ../libsvn_client/merge.c:12754 msgid "The required merge is reintegrate-like, and the record-only option cannot be used with this kind of merge" msgstr "Sammanslagningen som krävs är en återförening, och väljaren \"record-only\" kan inte användas för den här sortens sammanslagning" -#: ../libsvn_client/merge.c:12742 +#: ../libsvn_client/merge.c:12760 msgid "The required merge is reintegrate-like, and the depth option cannot be used with this kind of merge" msgstr "Sammanslagningen som krävs är en återförening, och väljaren för att ange djupet kan inte användas för den här sortens sammanslagning" -#: ../libsvn_client/merge.c:12748 +#: ../libsvn_client/merge.c:12766 msgid "The required merge is reintegrate-like, and the force_delete option cannot be used with this kind of merge" msgstr "Sammanslagningen som krävs är en återförening, och väljaren \"force_delete\" kan inte användas för den här sortens sammanslagning" @@ -4524,19 +4558,21 @@ msgstr "Kan inte arkivera till \"%s\" eftersom det inte är en katalog" #: ../libsvn_client/patch.c:346 #, c-format -msgid "Cannot strip %u components from '%s'" -msgstr "Kan inte ta bort %u sökvägsdelar från \"%s\"" +msgid "Cannot strip %u component from '%s'" +msgid_plural "Cannot strip %u components from '%s'" +msgstr[0] "Kan inte ta bort %u sökvägsdel från \"%s\"" +msgstr[1] "Kan inte ta bort %u sökvägsdelar från \"%s\"" -#: ../libsvn_client/patch.c:1296 ../libsvn_client/patch.c:1342 +#: ../libsvn_client/patch.c:1298 ../libsvn_client/patch.c:1344 #, c-format msgid "Invalid patch: specifies contradicting mode changes and %s changes (for '%s')" msgstr "Ogiltig patch: den anger motstridiga ändringar av filrättigheter och %s (för \"%s\")" -#: ../libsvn_client/patch.c:3741 +#: ../libsvn_client/patch.c:3743 msgid "strip count must be positive" msgstr "antal sökvägsdelar att ta bort måste vara positivt" -#: ../libsvn_client/patch.c:3757 ../libsvn_fs_base/tree.c:4112 +#: ../libsvn_client/patch.c:3759 ../libsvn_fs_base/tree.c:4112 #: ../libsvn_fs_base/tree.c:4117 ../libsvn_fs_fs/tree.c:3245 #: ../libsvn_fs_fs/tree.c:3251 ../libsvn_fs_x/tree.c:2188 #: ../libsvn_fs_x/tree.c:2194 ../libsvn_ra/compat.c:677 @@ -4545,7 +4581,7 @@ msgstr "antal sökvägsdelar att ta bort måste vara positivt" msgid "'%s' is not a file" msgstr "\"%s\" är ingen fil" -#: ../libsvn_client/patch.c:3769 ../libsvn_wc/util.c:59 +#: ../libsvn_client/patch.c:3771 ../libsvn_wc/util.c:59 #, c-format msgid "'%s' is not a directory" msgstr "\"%s\" är ingen katalog" @@ -4631,7 +4667,7 @@ msgstr "\"%s\" är inte arkivets rot" msgid "The repository at '%s' has uuid '%s', but the WC has '%s'" msgstr "Arkivet på \"%s\" har uuid \"%s\", men arbetskopian har \"%s\"" -#: ../libsvn_client/repos_diff.c:935 ../libsvn_wc/externals.c:629 +#: ../libsvn_client/repos_diff.c:930 ../libsvn_wc/externals.c:629 #, c-format msgid "Base checksum mismatch for '%s'" msgstr "Felaktig baskontrollsumma för \"%s\"" @@ -4646,23 +4682,47 @@ msgstr "Sökvägen \"%s\" saknar senaste arkiveringsrevision" msgid "Unrecognized revision type requested for '%s'" msgstr "Okänd revisionstyp begärd för \"%s\"" -#: ../libsvn_client/shelve.c:56 +#: ../libsvn_client/shelf.c:58 msgid "Shelf name cannot be the empty string" msgstr "Hyllnamnet kan inte vara tomma strängen" -#: ../libsvn_client/shelve.c:84 +#: ../libsvn_client/shelf.c:86 #, c-format msgid "Shelve: Bad encoded name '%s'" msgstr "Shelve: Felaktigt kodat namn \"%s\"" -#: ../libsvn_client/status.c:422 ../libsvn_client/status.c:601 +#: ../libsvn_client/shelf.c:1207 +#, c-format +msgid "Shelf '%s' not found" +msgstr "Hylla \"%s\" finns inte" + +#. xgettext: the '.working', '.merge-left' and '.merge-right' strings +#. are used to tag onto a file name in case of a merge conflict +#: ../libsvn_client/shelf.c:1385 ../libsvn_wc/wc_db_update_move.c:1627 +msgid ".working" +msgstr ".arbetskopia" + +#: ../libsvn_client/shelf.c:1386 +msgid ".merge-left" +msgstr ".sammanslagning-vänster" + +#: ../libsvn_client/shelf.c:1387 +msgid ".merge-right" +msgstr ".sammanslagning-höger" + +#: ../libsvn_client/shelf.c:2054 +#, c-format +msgid "Shelf '%s' version %d not found" +msgstr "Post \"%s\" med version %d finns inte" + +#: ../libsvn_client/status.c:498 ../libsvn_client/status.c:680 #: ../libsvn_wc/lock.c:564 ../libsvn_wc/lock.c:856 ../libsvn_wc/lock.c:1542 -#: ../libsvn_wc/wc_db.c:13629 ../libsvn_wc/wc_db_wcroot.c:722 +#: ../libsvn_wc/wc_db.c:13629 ../libsvn_wc/wc_db_wcroot.c:727 #, c-format msgid "'%s' is not a working copy" msgstr "\"%s\" är ingen arbetskopia" -#: ../libsvn_client/status.c:469 +#: ../libsvn_client/status.c:545 #, c-format msgid "Entry '%s' has no URL" msgstr "Posten \"%s\" saknar URL" @@ -4683,7 +4743,7 @@ msgid "Directory '%s' has no URL" msgstr "Katalogen \"%s\" saknar URL" #: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:236 -#: ../libsvn_ra_local/ra_plugin.c:326 ../libsvn_wc/update_editor.c:4921 +#: ../libsvn_ra_local/ra_plugin.c:326 ../libsvn_wc/update_editor.c:4932 #, c-format msgid "" "'%s'\n" @@ -4699,7 +4759,7 @@ msgstr "" msgid "'%s' shares no common ancestry with '%s'" msgstr "\"%s\" och \"%s\" saknar gemensamt ursprung" -#: ../libsvn_client/update.c:762 +#: ../libsvn_client/update.c:810 msgid "None of the targets are working copies" msgstr "Inget av målen är arbetskopior" @@ -4838,15 +4898,15 @@ msgstr "Sökvägen \"%s\" måste vara inuti katalogen \"%s\"" msgid "Failed to delete mmap '%s'" msgstr "Kunde inte ta bort minnesmappning \"%s\"" -#: ../libsvn_diff/parse-diff.c:368 +#: ../libsvn_diff/parse-diff.c:373 msgid "Unexpected data in base85 section" msgstr "Oväntad data i base85-sektion" -#: ../libsvn_diff/parse-diff.c:437 +#: ../libsvn_diff/parse-diff.c:442 msgid "Base85 data expands to longer than declared filesize" msgstr "Base85-data expanderas till mer än deklarerad filstorlek" -#: ../libsvn_diff/parse-diff.c:441 +#: ../libsvn_diff/parse-diff.c:446 msgid "Base85 data expands to smaller than declared filesize" msgstr "Base85-data expanderas till mindre än deklarerad filstorlek" @@ -5946,7 +6006,7 @@ msgstr "Fönsterlängd i svndiff är trasig" #: ../libsvn_fs_fs/cached_data.c:2164 #, c-format msgid "Length mismatch while reading representation: expected %s, got %s" -msgstr "Längden stämmer inte vid läsning av representation: väntade %s, fick %s" +msgstr "Längden stämde inte vid läsning av representation: väntade %s, fick %s" #: ../libsvn_fs_fs/cached_data.c:2197 ../libsvn_fs_x/cached_data.c:2095 msgid "Checksum mismatch while reading representation" @@ -6109,25 +6169,25 @@ msgid "Error converting entry in directory '%s' to UTF-8" msgstr "Fel vid omvandling av en post i katalogen \"%s\" till UTF-8" #: ../libsvn_fs_fs/hotcopy.c:147 ../libsvn_fs_x/hotcopy.c:148 -#: ../libsvn_subr/io.c:1084 +#: ../libsvn_subr/io.c:1089 #, c-format msgid "Source '%s' is not a directory" msgstr "Källan \"%s\" är ingen katalog" #: ../libsvn_fs_fs/hotcopy.c:153 ../libsvn_fs_x/hotcopy.c:154 -#: ../libsvn_subr/io.c:1090 +#: ../libsvn_subr/io.c:1095 #, c-format msgid "Destination '%s' is not a directory" msgstr "Destinationen \"%s\" är ingen katalog" #: ../libsvn_fs_fs/hotcopy.c:226 ../libsvn_fs_x/hotcopy.c:228 -#: ../libsvn_subr/io.c:1167 ../libsvn_subr/io.c:2863 +#: ../libsvn_subr/io.c:1172 ../libsvn_subr/io.c:2869 #, c-format msgid "Can't read directory '%s'" msgstr "Kan inte läsa katalogen \"%s\"" #: ../libsvn_fs_fs/hotcopy.c:231 ../libsvn_fs_x/hotcopy.c:233 -#: ../libsvn_subr/io.c:1172 ../libsvn_subr/io.c:2868 ../libsvn_subr/io.c:4654 +#: ../libsvn_subr/io.c:1177 ../libsvn_subr/io.c:2874 ../libsvn_subr/io.c:4660 #, c-format msgid "Error closing directory '%s'" msgstr "Fel vid stängning av katalogen \"%s\"" @@ -6614,7 +6674,7 @@ msgstr "" "tidigare representation just skrivs av en annan process" #: ../libsvn_fs_fs/transaction.c:358 ../libsvn_fs_x/transaction.c:640 -#: ../libsvn_subr/io.c:2347 +#: ../libsvn_subr/io.c:2352 #, c-format msgid "Can't get exclusive lock on file '%s'" msgstr "Kan inte ta ut exklusivt lås på filen \"%s\"" @@ -7103,12 +7163,12 @@ msgid "URL '%s' is not a child of the session's repository root URL '%s'" msgstr "URL:en \"%s\" är inte ett barn av sessionens arkivrots-URL \"%s\"" #: ../libsvn_ra_local/ra_plugin.c:1285 ../libsvn_ra_local/ra_plugin.c:1740 -#: ../libsvn_ra_serf/util.c:1844 ../svnserve/serve.c:3554 +#: ../libsvn_ra_serf/util.c:1864 ../svnserve/serve.c:3554 #, c-format msgid "'%s' path not found" msgstr "Sökvägen \"%s\" finns inte" -#: ../libsvn_ra_local/ra_plugin.c:1692 ../libsvn_ra_serf/options.c:759 +#: ../libsvn_ra_local/ra_plugin.c:1692 ../libsvn_ra_serf/options.c:777 #: ../libsvn_ra_svn/client.c:3093 #, c-format msgid "Don't know anything about capability '%s'" @@ -7184,7 +7244,7 @@ msgstr "REPORT-svaret innehöll inte de efterfrågade egenskaperna" msgid "Got unrecognized encoding '%s'" msgstr "Okänd kodning \"%s\"" -#: ../libsvn_ra_serf/list.c:126 ../libsvn_ra_serf/log.c:172 +#: ../libsvn_ra_serf/list.c:113 ../libsvn_ra_serf/log.c:172 #, c-format msgid "Unsupported encoding '%s'" msgstr "Kodningen \"%s\" stöds ej" @@ -7251,34 +7311,39 @@ msgstr "När egenskapen \"%s\" på \"%s\" behandlades:" msgid "While handling the '%s' path:" msgstr "När sökvägen \"%s\" behandlades:" -#: ../libsvn_ra_serf/options.c:473 +#: ../libsvn_ra_serf/options.c:413 +#, c-format +msgid "The server at '%s' does not support the HTTP/DAV protocol" +msgstr "Servern på \"%s\" stöder inte protokollet HTTP/DAV" + +#: ../libsvn_ra_serf/options.c:491 msgid "The OPTIONS response did not include the youngest revision" msgstr "OPTIONS-svaret innehöll inte den yngsta revisionen" -#: ../libsvn_ra_serf/options.c:514 +#: ../libsvn_ra_serf/options.c:532 msgid "The OPTIONS response did not include the requested activity-collection-set value" msgstr "OPTIONS-svaret innehöll inte det efterfrågade värdet på \"activity-collection-set\"" -#: ../libsvn_ra_serf/options.c:556 +#: ../libsvn_ra_serf/options.c:574 msgid "Location header not set on redirect response" msgstr "Platshuvud inte satt i omriktningssvar" -#: ../libsvn_ra_serf/options.c:586 ../libsvn_ra_serf/util.c:1835 +#: ../libsvn_ra_serf/options.c:604 ../libsvn_ra_serf/util.c:1855 #, c-format msgid "Repository moved permanently to '%s'" msgstr "Arkivet har permanent flyttats till \"%s\"" -#: ../libsvn_ra_serf/options.c:587 ../libsvn_ra_serf/util.c:1836 +#: ../libsvn_ra_serf/options.c:605 ../libsvn_ra_serf/util.c:1856 #, c-format msgid "Repository moved temporarily to '%s'" msgstr "Arkivet har tillfälligt flyttats till \"%s\"" -#: ../libsvn_ra_serf/options.c:742 +#: ../libsvn_ra_serf/options.c:760 #, c-format msgid "Don't know how to handle '%s' for capability '%s'" msgstr "Kan inte hantera \"%s\" för förmåga \"%s\"" -#: ../libsvn_ra_serf/options.c:766 +#: ../libsvn_ra_serf/options.c:784 #, c-format msgid "Attempt to fetch capability '%s' resulted in '%s'" msgstr "Ett försök att hämta förmåga \"%s\" resulterade i \"%s\"" @@ -7429,11 +7494,11 @@ msgstr "och andra orsaker" msgid "Invalid config: unable to load certificate file '%s'" msgstr "Felaktig konfiguration: kan inte ladda certifikatfilen \"%s\"" -#: ../libsvn_ra_serf/util.c:955 ../libsvn_ra_serf/util.c:958 +#: ../libsvn_ra_serf/util.c:958 ../libsvn_ra_serf/util.c:961 msgid "Error running context" msgstr "Fel vid körning av kontext" -#: ../libsvn_ra_serf/util.c:1230 +#: ../libsvn_ra_serf/util.c:1233 msgid "" "No more credentials or we tried too many times.\n" "Authentication failed" @@ -7441,85 +7506,85 @@ msgstr "" "Inga fler klientreferenser eller så försökte vi för många gånger.\n" "Autentisering misslyckades" -#: ../libsvn_ra_serf/util.c:1252 +#: ../libsvn_ra_serf/util.c:1255 msgid "Proxy authentication failed" msgstr "Proxy-autentisering misslyckades" -#: ../libsvn_ra_serf/util.c:1307 +#: ../libsvn_ra_serf/util.c:1310 #, c-format msgid "%s request on '%s' failed" msgstr "%s-förfrågan på \"%s\" misslyckades" -#: ../libsvn_ra_serf/util.c:1383 +#: ../libsvn_ra_serf/util.c:1386 #, c-format msgid "Premature EOF seen from server (http status=%d)" msgstr "För tidigt filslut från server (HTTP-felkod %d)" -#: ../libsvn_ra_serf/util.c:1734 +#: ../libsvn_ra_serf/util.c:1754 msgid "The PROPFIND response did not include the requested version-controlled-configuration value" msgstr "PROPFIND-svaret innehöll inte det efterfrågade värdet på \"version-controlled-configuration\"" -#: ../libsvn_ra_serf/util.c:1840 +#: ../libsvn_ra_serf/util.c:1860 #, c-format msgid "Access to '%s' forbidden" msgstr "Åtkomst till \"%s\" ej tillåten" -#: ../libsvn_ra_serf/util.c:1847 +#: ../libsvn_ra_serf/util.c:1867 #, c-format msgid "HTTP method is not allowed on '%s'" msgstr "HTTP-metod inte tillåten för \"%s\"" -#: ../libsvn_ra_serf/util.c:1851 +#: ../libsvn_ra_serf/util.c:1871 #, c-format msgid "'%s' conflicts" msgstr "\"%s\" orsakar konflikt" -#: ../libsvn_ra_serf/util.c:1854 +#: ../libsvn_ra_serf/util.c:1874 #, c-format msgid "Precondition on '%s' failed" msgstr "Förhandsvillkor för \"%s\" misslyckades" -#: ../libsvn_ra_serf/util.c:1857 +#: ../libsvn_ra_serf/util.c:1877 #, c-format msgid "'%s': no lock token available" msgstr "\"%s\": ingen låsidentifierare tillgänglig" -#: ../libsvn_ra_serf/util.c:1861 +#: ../libsvn_ra_serf/util.c:1881 #, c-format msgid "DAV request failed: 411 Content length required. The server or an intermediate proxy does not accept chunked encoding. Try setting 'http-chunked-requests' to 'auto' or 'no' in your client configuration." msgstr "DAV-begäran misslyckades: 411, innehållslängd krävs. Servern eller en mellanliggande proxy godtar inte styckvis kodning. Försök med att sätta \"http-chunked-requests\" till \"auto\" eller \"no\" i klientinställningarna." -#: ../libsvn_ra_serf/util.c:1867 +#: ../libsvn_ra_serf/util.c:1887 #, c-format msgid "Unexpected server error %d '%s' on '%s'" msgstr "Oväntat serverfel %d \"%s\" för \"%s\"" -#: ../libsvn_ra_serf/util.c:1871 +#: ../libsvn_ra_serf/util.c:1891 #, c-format msgid "The requested feature is not supported by '%s'" msgstr "Den begärda funktionen stöds inte av \"%s\"" -#: ../libsvn_ra_serf/util.c:1877 +#: ../libsvn_ra_serf/util.c:1897 #, c-format msgid "Unexpected HTTP status %d '%s' on '%s'" msgstr "Oväntat HTTP-fel %d \"%s\" för \"%s\"" -#: ../libsvn_ra_serf/util.c:1896 +#: ../libsvn_ra_serf/util.c:1916 #, c-format msgid "Path '%s' unexpectedly created" msgstr "Sökvägen \"%s\" skapades oväntat" -#: ../libsvn_ra_serf/util.c:1905 +#: ../libsvn_ra_serf/util.c:1925 #, c-format msgid "The HTTP method '%s' is not allowed on '%s'" msgstr "HTTP-metoden \"%s\" tillåts inte för \"%s\"" -#: ../libsvn_ra_serf/util.c:1910 +#: ../libsvn_ra_serf/util.c:1930 #, c-format msgid "Unexpected HTTP status %d '%s' on '%s' request to '%s'" msgstr "Oväntat HTTP-fel %d \"%s\" för \"%s\" vid begäran till \"%s\"" -#: ../libsvn_ra_serf/util.c:2013 +#: ../libsvn_ra_serf/util.c:2033 #, c-format msgid "Illegal URL '%s'" msgstr "Otillåten URL \"%s\"" @@ -8016,17 +8081,17 @@ msgstr "Åtkomstposten för enbart skrivning \"%s\" i regel [%s] är ogiltig" msgid "Recursive definition of group '%s'" msgstr "Rekursiv definition av grupp \"%s\"" -#: ../libsvn_repos/authz_parse.c:1044 ../libsvn_repos/authz_parse.c:1102 +#: ../libsvn_repos/authz_parse.c:1044 ../libsvn_repos/authz_parse.c:1103 #, c-format msgid "Alias '%s' was never defined" msgstr "Alias \"%s\" definierades aldrig" -#: ../libsvn_repos/authz_parse.c:1065 +#: ../libsvn_repos/authz_parse.c:1066 #, c-format msgid "Undefined group '%s'" msgstr "Odefinierad grupp \"%s\"" -#: ../libsvn_repos/authz_parse.c:1158 +#: ../libsvn_repos/authz_parse.c:1159 #, c-format msgid "Access entry refers to undefined group '%s'" msgstr "Åtkomstpost syftar på odefinierad grupp \"%s\"" @@ -8108,17 +8173,17 @@ msgstr "Delta-djupet \"exclude\" stöds ej" msgid "Invalid editor anchoring; at least one of the input paths is not a directory and there was no source entry" msgstr "Editeringen börjar på ett ogiltigt ställe; minst en av sökvägarna är ingen katalog och det fanns ingen källpost" -#: ../libsvn_repos/deprecated.c:715 ../svnadmin/svnadmin.c:988 +#: ../libsvn_repos/deprecated.c:715 ../svnadmin/svnadmin.c:1054 #, c-format msgid "* Dumped revision %ld.\n" msgstr "* Dumpade revision %ld.\n" -#: ../libsvn_repos/deprecated.c:721 ../svnadmin/svnadmin.c:994 +#: ../libsvn_repos/deprecated.c:721 ../svnadmin/svnadmin.c:1060 #, c-format msgid "* Verified revision %ld.\n" msgstr "* Verifierade revision %ld.\n" -#: ../libsvn_repos/deprecated.c:729 ../svnadmin/svnadmin.c:1042 +#: ../libsvn_repos/deprecated.c:729 ../svnadmin/svnadmin.c:1108 #, c-format msgid "" "\n" @@ -8129,7 +8194,7 @@ msgstr "" "------- Arkiverade revision %ld >>>\n" "\n" -#: ../libsvn_repos/deprecated.c:735 ../svnadmin/svnadmin.c:1048 +#: ../libsvn_repos/deprecated.c:735 ../svnadmin/svnadmin.c:1114 #, c-format msgid "" "\n" @@ -8140,36 +8205,36 @@ msgstr "" "------- Arkiverade ny revision %ld (från originalrevisionen %ld) >>>\n" "\n" -#: ../libsvn_repos/deprecated.c:748 ../svnadmin/svnadmin.c:1061 +#: ../libsvn_repos/deprecated.c:748 ../svnadmin/svnadmin.c:1127 #, c-format msgid " * editing path : %s ..." msgstr " * editerar sökvägen: %s ..." -#: ../libsvn_repos/deprecated.c:754 ../svnadmin/svnadmin.c:1067 +#: ../libsvn_repos/deprecated.c:754 ../svnadmin/svnadmin.c:1133 #, c-format msgid " * deleting path : %s ..." msgstr " * raderar sökvägen: %s ..." -#: ../libsvn_repos/deprecated.c:760 ../svnadmin/svnadmin.c:1073 +#: ../libsvn_repos/deprecated.c:760 ../svnadmin/svnadmin.c:1139 #, c-format msgid " * adding path : %s ..." msgstr " * lägger till sökvägen: %s ..." -#: ../libsvn_repos/deprecated.c:766 ../svnadmin/svnadmin.c:1079 +#: ../libsvn_repos/deprecated.c:766 ../svnadmin/svnadmin.c:1145 #, c-format msgid " * replacing path : %s ..." msgstr " * ersätter sökvägen: %s ..." -#: ../libsvn_repos/deprecated.c:776 ../svnadmin/svnadmin.c:1088 +#: ../libsvn_repos/deprecated.c:776 ../svnadmin/svnadmin.c:1154 msgid " done.\n" msgstr " klart.\n" -#: ../libsvn_repos/deprecated.c:786 ../svnadmin/svnadmin.c:1097 +#: ../libsvn_repos/deprecated.c:786 ../svnadmin/svnadmin.c:1163 #, c-format msgid "<<< Started new transaction, based on original revision %ld\n" msgstr "<<< Startade ny transaktion, baserad på originalrevisionen %ld\n" -#: ../libsvn_repos/deprecated.c:793 ../svnadmin/svnadmin.c:1110 +#: ../libsvn_repos/deprecated.c:793 ../svnadmin/svnadmin.c:1176 #, c-format msgid " removing '\\r' from %s ..." msgstr " tar bort \"\\r\" från %s ..." @@ -8234,40 +8299,40 @@ msgstr "Kopierar från ogiltig sökväg till \"%s\" i r%ld" msgid "Referencing data in revision %ld, which is older than the oldest dumped revision (r%ld). Loading this dump into an empty repository will fail." msgstr "Refererar till data i revision %ld, vilken är äldre än den äldsta dumpade revisionen (r%ld). Ett försök att läsa in denna dump i ett tomt arkiv kommer att misslyckas." -#: ../libsvn_repos/dump.c:2045 ../libsvn_repos/dump.c:2475 +#: ../libsvn_repos/dump.c:2031 ../libsvn_repos/dump.c:2461 #, c-format msgid "Start revision %ld is greater than end revision %ld" msgstr "Startrevisionen %ld är större än slutrevisionen %ld" -#: ../libsvn_repos/dump.c:2050 ../libsvn_repos/dump.c:2480 +#: ../libsvn_repos/dump.c:2036 ../libsvn_repos/dump.c:2466 #, c-format msgid "End revision %ld is invalid (youngest revision is %ld)" msgstr "Slutrevisionen %ld är ogiltig (den yngsta revisionen är %ld)" -#: ../libsvn_repos/dump.c:2178 +#: ../libsvn_repos/dump.c:2164 msgid "The range of revisions dumped contained references to copy sources outside that range." msgstr "De dumpade revisionerna innehöll referenser till kopior med källa utanför det revisionsområdet." -#: ../libsvn_repos/dump.c:2190 +#: ../libsvn_repos/dump.c:2176 msgid "The range of revisions dumped contained mergeinfo which reference revisions outside that range." msgstr "De dumpade revisionerna innehöll sammanslagningsinformation med referenser till revisioner utanför det revisionsområdet." -#: ../libsvn_repos/dump.c:2244 +#: ../libsvn_repos/dump.c:2230 #, c-format msgid "Node '%s' is not a directory." msgstr "Noden \"%s\" är ingen katalog." -#: ../libsvn_repos/dump.c:2252 +#: ../libsvn_repos/dump.c:2238 #, c-format msgid "Node '%s' is not a file." msgstr "Noden \"%s\" är inte en fil." -#: ../libsvn_repos/dump.c:2257 +#: ../libsvn_repos/dump.c:2243 #, c-format msgid "Unexpected node kind %d for '%s'" msgstr "Oväntad nodtyp %d för \"%s\"" -#: ../libsvn_repos/dump.c:2304 +#: ../libsvn_repos/dump.c:2290 #, c-format msgid "Duplicate representation of path '%s'" msgstr "Duplicerad representation av sökväg \"%s\"" @@ -8398,7 +8463,7 @@ msgstr "" "Ändring av revisionsegenskaper är ej påslaget i arkivet;\n" "be förvaltaren skapa krokskriptet \"pre-revprop-change\"" -#: ../libsvn_repos/list.c:314 ../libsvn_subr/io.c:2972 +#: ../libsvn_repos/list.c:314 ../libsvn_subr/io.c:2978 #, c-format msgid "Path '%s' not found" msgstr "Sökvägen \"%s\" finns inte" @@ -9071,7 +9136,8 @@ msgstr "Kan inte beräkna begärt datum" msgid "Can't expand time" msgstr "Kan inte dela upp tid" -#: ../libsvn_subr/deprecated.c:365 ../libsvn_subr/opt.c:302 +#: ../libsvn_subr/deprecated.c:365 ../libsvn_subr/deprecated.c:605 +#: ../libsvn_subr/opt.c:269 msgid "" "\n" "Valid options:\n" @@ -9079,7 +9145,20 @@ msgstr "" "\n" "Giltiga flaggor:\n" -#: ../libsvn_subr/deprecated.c:441 ../libsvn_subr/opt.c:426 +#: ../libsvn_subr/deprecated.c:545 ../libsvn_subr/opt.c:174 +msgid " ARG" +msgstr " ARG" + +#: ../libsvn_subr/deprecated.c:627 ../libsvn_subr/opt.c:291 +msgid "" +"\n" +"Global options:\n" +msgstr "" +"\n" +"Globala flaggor:\n" + +#: ../libsvn_subr/deprecated.c:769 ../libsvn_subr/deprecated.c:803 +#: ../libsvn_subr/opt.c:393 #, c-format msgid "" "\"%s\": unknown command.\n" @@ -9088,13 +9167,13 @@ msgstr "" "\"%s\": okänt kommando.\n" "\n" -#: ../libsvn_subr/deprecated.c:619 ../libsvn_subr/opt.c:1241 -#: ../svnrdump/svnrdump.c:597 +#: ../libsvn_subr/deprecated.c:931 ../libsvn_subr/deprecated.c:1031 +#: ../libsvn_subr/opt.c:1208 ../svnrdump/svnrdump.c:603 #, c-format msgid "Type '%s help' for usage.\n" msgstr "Skriv \"%s help\" för användning.\n" -#: ../libsvn_subr/deprecated.c:1047 +#: ../libsvn_subr/deprecated.c:1459 #, c-format msgid "'%s' is neither a file nor a directory name" msgstr "\"%s\" är varken ett fil- eller katalognamn" @@ -9200,233 +9279,233 @@ msgstr "Felaktig serialiserad hashtabell" msgid "Cannot serialize negative length" msgstr "Kan inte serialisera negativ längd" -#: ../libsvn_subr/io.c:354 +#: ../libsvn_subr/io.c:359 #, c-format msgid "Can't check path '%s'" msgstr "Kan inte kontrollera sökvägen \"%s\"" -#: ../libsvn_subr/io.c:599 ../libsvn_subr/io.c:5208 +#: ../libsvn_subr/io.c:604 ../libsvn_subr/io.c:5214 #, c-format msgid "Can't open '%s'" msgstr "Kan inte öppna \"%s\"" -#: ../libsvn_subr/io.c:625 ../libsvn_subr/io.c:711 +#: ../libsvn_subr/io.c:630 ../libsvn_subr/io.c:716 #, c-format msgid "Unable to make name for '%s'" msgstr "Kunde inte skapa namn för \"%s\"" -#: ../libsvn_subr/io.c:698 +#: ../libsvn_subr/io.c:703 #, c-format msgid "Can't create symbolic link '%s'" msgstr "Kan inte skapa symbolisk länk \"%s\"" -#: ../libsvn_subr/io.c:715 ../libsvn_subr/io.c:750 ../libsvn_subr/io.c:778 -#: ../libsvn_subr/io.c:1971 +#: ../libsvn_subr/io.c:720 ../libsvn_subr/io.c:755 ../libsvn_subr/io.c:783 +#: ../libsvn_subr/io.c:1976 msgid "Symbolic links are not supported on this platform" msgstr "Symboliska länkar stöds inte på denna plattform" -#: ../libsvn_subr/io.c:738 ../libsvn_subr/io.c:1930 ../libsvn_subr/io.c:1950 +#: ../libsvn_subr/io.c:743 ../libsvn_subr/io.c:1935 ../libsvn_subr/io.c:1955 #, c-format msgid "Can't read contents of link" msgstr "Kan inte läsa innehållet i länk" -#: ../libsvn_subr/io.c:798 +#: ../libsvn_subr/io.c:803 #, c-format msgid "Can't find a temporary directory" msgstr "Kan inte hitta temporär katalog" -#: ../libsvn_subr/io.c:916 +#: ../libsvn_subr/io.c:921 #, c-format msgid "Can't copy '%s' to '%s'" msgstr "Kan inte kopiera \"%s\" till \"%s\"" -#: ../libsvn_subr/io.c:959 ../libsvn_subr/io.c:981 ../libsvn_subr/io.c:1027 -#: ../libsvn_subr/io.c:5341 +#: ../libsvn_subr/io.c:964 ../libsvn_subr/io.c:986 ../libsvn_subr/io.c:1032 +#: ../libsvn_subr/io.c:5347 #, c-format msgid "Can't set permissions on '%s'" msgstr "Kan inte sätta rättigheter på \"%s\"" -#: ../libsvn_subr/io.c:977 ../libsvn_subr/io.c:2317 ../libsvn_subr/io.c:2377 -#: ../libsvn_subr/io.c:2466 ../libsvn_subr/io.c:5246 +#: ../libsvn_subr/io.c:982 ../libsvn_subr/io.c:2322 ../libsvn_subr/io.c:2382 +#: ../libsvn_subr/io.c:2471 ../libsvn_subr/io.c:5252 #, c-format msgid "Can't get file name" msgstr "Kan inte erhålla filnamn" -#: ../libsvn_subr/io.c:1050 +#: ../libsvn_subr/io.c:1055 #, c-format msgid "Can't append '%s' to '%s'" msgstr "Kan inte lägga till \"%s\" till \"%s\"" -#: ../libsvn_subr/io.c:1096 +#: ../libsvn_subr/io.c:1101 #, c-format msgid "Destination '%s' already exists" msgstr "Destinationen \"%s\" finns redan" -#: ../libsvn_subr/io.c:1205 +#: ../libsvn_subr/io.c:1210 #, c-format msgid "Can't make directory '%s'" msgstr "Kan inte skapa katalogen \"%s\"" -#: ../libsvn_subr/io.c:1309 +#: ../libsvn_subr/io.c:1314 #, c-format msgid "Can't set access time of '%s'" msgstr "Kan inte sätta åtkomsttiden på \"%s\"" -#: ../libsvn_subr/io.c:1647 ../libsvn_subr/io.c:1749 +#: ../libsvn_subr/io.c:1652 ../libsvn_subr/io.c:1754 #, c-format msgid "Can't change perms of file '%s'" msgstr "Kan inte ändra rättigheter på filen \"%s\"" -#: ../libsvn_subr/io.c:1877 +#: ../libsvn_subr/io.c:1882 #, c-format msgid "Can't get attributes of file '%s'" msgstr "Kan inte hämta attribut från filen \"%s\"" -#: ../libsvn_subr/io.c:1885 +#: ../libsvn_subr/io.c:1890 #, c-format msgid "Can't set attributes of file '%s'" msgstr "Kan inte sätta attribut i filen \"%s\"" -#: ../libsvn_subr/io.c:2022 ../libsvn_subr/io.c:2683 +#: ../libsvn_subr/io.c:2027 ../libsvn_subr/io.c:2689 #, c-format msgid "Can't remove file '%s'" msgstr "Kan inte radera filen \"%s\"" -#: ../libsvn_subr/io.c:2092 ../libsvn_subr/io.c:4286 +#: ../libsvn_subr/io.c:2097 ../libsvn_subr/io.c:4292 #, c-format msgid "Can't move '%s' to '%s'" msgstr "Kan inte flytta \"%s\" till \"%s\"" -#: ../libsvn_subr/io.c:2138 +#: ../libsvn_subr/io.c:2143 #, c-format msgid "Can't set file '%s' read-only" msgstr "Kan inte göra \"%s\" skrivskyddad" -#: ../libsvn_subr/io.c:2170 +#: ../libsvn_subr/io.c:2175 #, c-format msgid "Can't set file '%s' read-write" msgstr "Kan inte ta bort skrivskyddet på \"%s\"" -#: ../libsvn_subr/io.c:2209 ../libsvn_subr/io.c:2243 +#: ../libsvn_subr/io.c:2214 ../libsvn_subr/io.c:2248 #, c-format msgid "Error getting UID of process" msgstr "Fel vid läsning av processens användar-id" -#: ../libsvn_subr/io.c:2343 +#: ../libsvn_subr/io.c:2348 #, c-format msgid "Can't get shared lock on file '%s'" msgstr "Kan inte ta ut delat lås på filen \"%s\"" -#: ../libsvn_subr/io.c:2382 +#: ../libsvn_subr/io.c:2387 #, c-format msgid "Can't unlock file '%s'" msgstr "Kan inte låsa upp filen \"%s\"" -#: ../libsvn_subr/io.c:2484 ../libsvn_subr/io.c:2506 +#: ../libsvn_subr/io.c:2489 ../libsvn_subr/io.c:2511 #, c-format msgid "Can't flush file '%s' to disk" msgstr "Kan inte tömma filbuffertar för \"%s\" till disk" -#: ../libsvn_subr/io.c:2597 ../libsvn_subr/prompt.c:197 +#: ../libsvn_subr/io.c:2603 ../libsvn_subr/prompt.c:197 #, c-format msgid "Can't open stdin" msgstr "Kan inte öppna standard in" -#: ../libsvn_subr/io.c:2617 +#: ../libsvn_subr/io.c:2623 msgid "Reading from stdin is disallowed" msgstr "Att läsa från standardinmatningen tillåts ej" -#: ../libsvn_subr/io.c:2770 +#: ../libsvn_subr/io.c:2776 #, c-format msgid "Can't remove '%s'" msgstr "Kan inte radera \"%s\"" -#: ../libsvn_subr/io.c:2933 +#: ../libsvn_subr/io.c:2939 #, c-format msgid "Path '%s' not found, case obstructed by '%s'" msgstr "Sökvägen \"%s\" hittades inte, skiftlägesblockerad av \"%s\"" -#: ../libsvn_subr/io.c:3046 +#: ../libsvn_subr/io.c:3052 #, c-format msgid "Can't create process '%s' attributes" msgstr "Kan inte skapa attribut för processen \"%s\"" -#: ../libsvn_subr/io.c:3053 +#: ../libsvn_subr/io.c:3059 #, c-format msgid "Can't set process '%s' cmdtype" msgstr "Kan inte sätta cmdtype för processen \"%s\"" -#: ../libsvn_subr/io.c:3069 +#: ../libsvn_subr/io.c:3075 #, c-format msgid "Can't set process '%s' directory" msgstr "Kan inte sätta katalog för processen \"%s\"" -#: ../libsvn_subr/io.c:3083 +#: ../libsvn_subr/io.c:3089 #, c-format msgid "Can't set process '%s' child input" msgstr "Kan inte sätta standard in för processen \"%s\"" -#: ../libsvn_subr/io.c:3091 +#: ../libsvn_subr/io.c:3097 #, c-format msgid "Can't set process '%s' child outfile" msgstr "Kan inte sätta standard ut för processen \"%s\"" -#: ../libsvn_subr/io.c:3099 +#: ../libsvn_subr/io.c:3105 #, c-format msgid "Can't set process '%s' child errfile" msgstr "Kan inte sätta standard fel för processen \"%s\"" -#: ../libsvn_subr/io.c:3113 +#: ../libsvn_subr/io.c:3119 #, c-format msgid "Can't set process '%s' stdio pipes" msgstr "Kan inte sätta rör för standardin- och utmatning för processen \"%s\"" -#: ../libsvn_subr/io.c:3121 +#: ../libsvn_subr/io.c:3127 #, c-format msgid "Can't set process '%s' child errfile for error handler" msgstr "Kan inte sätta standard fel för processen \"%s\" för felhanteraren" -#: ../libsvn_subr/io.c:3128 +#: ../libsvn_subr/io.c:3134 #, c-format msgid "Can't set process '%s' error handler" msgstr "Kan inte sätta felhanterare för processen \"%s\"" -#: ../libsvn_subr/io.c:3151 +#: ../libsvn_subr/io.c:3157 #, c-format msgid "Can't start process '%s'" msgstr "Kan inte starta processen \"%s\"" -#: ../libsvn_subr/io.c:3175 +#: ../libsvn_subr/io.c:3181 #, c-format msgid "Error waiting for process '%s'" msgstr "Fel då processen \"%s\" inväntades" -#: ../libsvn_subr/io.c:3184 +#: ../libsvn_subr/io.c:3190 #, c-format msgid "Process '%s' failed (signal %d, core dumped)" msgstr "Processen \"%s\" misslyckades (signal %d, minnesutskrift skapad)" -#: ../libsvn_subr/io.c:3189 +#: ../libsvn_subr/io.c:3195 #, c-format msgid "Process '%s' failed (signal %d)" msgstr "Processen \"%s\" misslyckades (signal %d)" -#: ../libsvn_subr/io.c:3195 +#: ../libsvn_subr/io.c:3201 #, c-format msgid "Process '%s' failed (exitwhy %d, exitcode %d)" msgstr "Processen \"%s\" misslyckades (orsak %d, slutkod %d)" -#: ../libsvn_subr/io.c:3203 +#: ../libsvn_subr/io.c:3209 #, c-format msgid "Process '%s' returned error exitcode %d" msgstr "Processen \"%s\" returnerade felstatus %d" -#: ../libsvn_subr/io.c:3310 +#: ../libsvn_subr/io.c:3316 #, c-format msgid "'%s' returned %d" msgstr "\"%s\" returnerade %d" -#: ../libsvn_subr/io.c:3431 +#: ../libsvn_subr/io.c:3437 #, c-format msgid "" "Error running '%s': exitcode was %d, args were:\n" @@ -9441,188 +9520,188 @@ msgstr "" "%s\n" "%s" -#: ../libsvn_subr/io.c:3572 +#: ../libsvn_subr/io.c:3578 #, c-format msgid "Can't detect MIME type of non-file '%s'" msgstr "Kan inte känna av MIME-typ på \"%s\", som inte är en fil" -#: ../libsvn_subr/io.c:3667 +#: ../libsvn_subr/io.c:3673 #, c-format msgid "Can't open file '%s'" msgstr "Kan inte öppna filen \"%s\"" -#: ../libsvn_subr/io.c:3707 +#: ../libsvn_subr/io.c:3713 #, c-format msgid "Can't close file '%s'" msgstr "Kan inte stänga filen \"%s\"" -#: ../libsvn_subr/io.c:3708 +#: ../libsvn_subr/io.c:3714 #, c-format msgid "Can't close stream" msgstr "Kan inte stänga ström" -#: ../libsvn_subr/io.c:3717 ../libsvn_subr/io.c:3779 ../libsvn_subr/io.c:3804 -#: ../libsvn_subr/io.c:3894 +#: ../libsvn_subr/io.c:3723 ../libsvn_subr/io.c:3785 ../libsvn_subr/io.c:3810 +#: ../libsvn_subr/io.c:3900 #, c-format msgid "Can't read file '%s'" msgstr "Kan inte läsa filen \"%s\"" -#: ../libsvn_subr/io.c:3718 ../libsvn_subr/io.c:3780 ../libsvn_subr/io.c:3805 -#: ../libsvn_subr/io.c:3895 +#: ../libsvn_subr/io.c:3724 ../libsvn_subr/io.c:3786 ../libsvn_subr/io.c:3811 +#: ../libsvn_subr/io.c:3901 #, c-format msgid "Can't read stream" msgstr "Kan inte läsa från ström" -#: ../libsvn_subr/io.c:3727 +#: ../libsvn_subr/io.c:3733 #, c-format msgid "Can't write file '%s'" msgstr "Kan inte skriva till filen \"%s\"" -#: ../libsvn_subr/io.c:3728 +#: ../libsvn_subr/io.c:3734 #, c-format msgid "Can't write stream" msgstr "Kan inte skriva till ström" -#: ../libsvn_subr/io.c:3742 +#: ../libsvn_subr/io.c:3748 #, c-format msgid "Can't get attribute information from file '%s'" msgstr "Kan inte erhålla attributinformation från filen \"%s\"" -#: ../libsvn_subr/io.c:3743 +#: ../libsvn_subr/io.c:3749 #, c-format msgid "Can't get attribute information from stream" msgstr "Kan inte erhålla attributinformation från ström" -#: ../libsvn_subr/io.c:3816 +#: ../libsvn_subr/io.c:3822 #, c-format msgid "Can't set position pointer in file '%s'" msgstr "Kan inte sätta filpekaren i filen \"%s\"" -#: ../libsvn_subr/io.c:3817 +#: ../libsvn_subr/io.c:3823 #, c-format msgid "Can't set position pointer in stream" msgstr "Kan inte sätta filpekaren i ström" -#: ../libsvn_subr/io.c:3904 +#: ../libsvn_subr/io.c:3910 #, c-format msgid "Can't seek in file '%s'" msgstr "Kan inte flytta position i filen \"%s\"" -#: ../libsvn_subr/io.c:3905 +#: ../libsvn_subr/io.c:3911 #, c-format msgid "Can't seek in stream" msgstr "Kan inte flytta position i ström" -#: ../libsvn_subr/io.c:3922 ../libsvn_subr/io.c:3978 +#: ../libsvn_subr/io.c:3928 ../libsvn_subr/io.c:3984 #, c-format msgid "Can't write to file '%s'" msgstr "Kan inte skriva till filen \"%s\"" -#: ../libsvn_subr/io.c:3923 ../libsvn_subr/io.c:3979 +#: ../libsvn_subr/io.c:3929 ../libsvn_subr/io.c:3985 #, c-format msgid "Can't write to stream" msgstr "Kan inte skriva till ström" -#: ../libsvn_subr/io.c:3933 ../libsvn_subr/io.c:4090 +#: ../libsvn_subr/io.c:3939 ../libsvn_subr/io.c:4096 #, c-format msgid "Can't flush file '%s'" msgstr "Kan inte tömma buffertar för filen \"%s\"" -#: ../libsvn_subr/io.c:3934 ../libsvn_subr/io.c:4091 +#: ../libsvn_subr/io.c:3940 ../libsvn_subr/io.c:4097 #, c-format msgid "Can't flush stream" msgstr "Kan inte tömma buffertar för ström" -#: ../libsvn_subr/io.c:4055 +#: ../libsvn_subr/io.c:4061 #, c-format msgid "Can't write '%s' atomically" msgstr "Kan inte skriva atomiskt till \"%s\"" -#: ../libsvn_subr/io.c:4095 +#: ../libsvn_subr/io.c:4101 #, c-format msgid "Can't truncate file '%s'" msgstr "Kan inte hugga av filen \"%s\"" -#: ../libsvn_subr/io.c:4096 +#: ../libsvn_subr/io.c:4102 #, c-format msgid "Can't truncate stream" msgstr "Kan inte hugga av ström" -#: ../libsvn_subr/io.c:4176 +#: ../libsvn_subr/io.c:4182 #, c-format msgid "Can't read length line in file '%s'" msgstr "Kan inte läsa längdrad i filen \"%s\"" -#: ../libsvn_subr/io.c:4180 +#: ../libsvn_subr/io.c:4186 msgid "Can't read length line in stream" msgstr "Kan inte läsa längdrad i ström" -#: ../libsvn_subr/io.c:4202 +#: ../libsvn_subr/io.c:4208 #, c-format msgid "Can't stat '%s'" msgstr "Kan inte ta status på \"%s\"" -#: ../libsvn_subr/io.c:4380 +#: ../libsvn_subr/io.c:4386 #, c-format msgid "Can't create directory '%s'" msgstr "Kan inte skapa katalogen \"%s\"" -#: ../libsvn_subr/io.c:4392 ../libsvn_subr/io.c:4406 +#: ../libsvn_subr/io.c:4398 ../libsvn_subr/io.c:4412 #, c-format msgid "Can't hide directory '%s'" msgstr "Kan inte dölja katalogen \"%s\"" -#: ../libsvn_subr/io.c:4467 ../libsvn_subr/io.c:4590 +#: ../libsvn_subr/io.c:4473 ../libsvn_subr/io.c:4596 #, c-format msgid "Can't open directory '%s'" msgstr "Kan inte öppna katalogen \"%s\"" -#: ../libsvn_subr/io.c:4502 +#: ../libsvn_subr/io.c:4508 #, c-format msgid "Can't remove directory '%s'" msgstr "Kan inte radera katalogen \"%s\"" -#: ../libsvn_subr/io.c:4520 +#: ../libsvn_subr/io.c:4526 #, c-format msgid "Can't read directory" msgstr "Kan inte läsa katalog" -#: ../libsvn_subr/io.c:4540 +#: ../libsvn_subr/io.c:4546 #, c-format msgid "Error closing directory" msgstr "Fel vid stängning av katalog" -#: ../libsvn_subr/io.c:4609 +#: ../libsvn_subr/io.c:4615 #, c-format msgid "Can't read directory entry in '%s'" msgstr "Kan inte läsa katalogpost i \"%s\"" -#: ../libsvn_subr/io.c:4735 +#: ../libsvn_subr/io.c:4741 #, c-format msgid "Can't check directory '%s'" msgstr "Kan inte kontrollera katalogen \"%s\"" -#: ../libsvn_subr/io.c:4797 +#: ../libsvn_subr/io.c:4803 #, c-format msgid "Reading '%s'" msgstr "Läser \"%s\"" -#: ../libsvn_subr/io.c:4816 +#: ../libsvn_subr/io.c:4822 #, c-format msgid "First line of '%s' contains non-digit" msgstr "Första raden i \"%s\" innehåller något som inte är en siffra" -#: ../libsvn_subr/io.c:5131 +#: ../libsvn_subr/io.c:5137 #, c-format msgid "Can't create temporary file from template '%s'" msgstr "Kan inte skapa temporärfil från mallen \"%s\"" -#: ../libsvn_subr/io.c:5218 +#: ../libsvn_subr/io.c:5224 #, c-format msgid "Can't set aside '%s'" msgstr "Kan inte flytta \"%s\" åt sidan" -#: ../libsvn_subr/io.c:5230 ../libsvn_subr/stream.c:2231 +#: ../libsvn_subr/io.c:5236 ../libsvn_subr/stream.c:2231 #, c-format msgid "Unable to make name in '%s'" msgstr "Kunde inte skapa namn i \"%s\"" @@ -9708,49 +9787,37 @@ msgstr "Kan inte låsa upp mutex" msgid "Can't get module file name" msgstr "Kan inte erhålla modulens filnamn" -#: ../libsvn_subr/opt.c:189 -msgid " ARG" -msgstr " ARG" - -#: ../libsvn_subr/opt.c:324 -msgid "" -"\n" -"Global options:\n" -msgstr "" -"\n" -"Globala flaggor:\n" - -#: ../libsvn_subr/opt.c:827 +#: ../libsvn_subr/opt.c:794 #, c-format msgid "Syntax error parsing peg revision '%s'; did you mean '%s@'?" msgstr "Syntaxfel i den fixerade revisionen \"%s\"; menade du \"%s@\"?" -#: ../libsvn_subr/opt.c:833 +#: ../libsvn_subr/opt.c:800 #, c-format msgid "Syntax error parsing peg revision '%s'" msgstr "Syntaxfel i den fixerade revisionen \"%s\"" -#: ../libsvn_subr/opt.c:970 +#: ../libsvn_subr/opt.c:937 msgid "Revision property pair is empty" msgstr "Revisionsegenskapsparet är tomt" -#: ../libsvn_subr/opt.c:990 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:337 +#: ../libsvn_subr/opt.c:957 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:337 #: ../svn/propset-cmd.c:68 #, c-format msgid "'%s' is not a valid Subversion property name" msgstr "\"%s\" är inget giltigt namn på en Subversion-egenskap" -#: ../libsvn_subr/opt.c:1066 +#: ../libsvn_subr/opt.c:1033 #, c-format msgid "URL '%s' contains a '..' element" msgstr "URL:en \"%s\" innehåller ett \"..\"-element" -#: ../libsvn_subr/opt.c:1099 +#: ../libsvn_subr/opt.c:1066 #, c-format msgid "Error resolving case of '%s'" msgstr "Kunde inte ta reda på skiftläge för \"%s\"" -#: ../libsvn_subr/opt.c:1121 +#: ../libsvn_subr/opt.c:1088 #, c-format msgid "" "%s, version %s\n" @@ -9761,7 +9828,7 @@ msgstr "" " kompilerad %s %s på %s\n" "\n" -#: ../libsvn_subr/opt.c:1138 +#: ../libsvn_subr/opt.c:1105 msgid "" "System information:\n" "\n" @@ -9769,21 +9836,21 @@ msgstr "" "Systeminformation:\n" "\n" -#: ../libsvn_subr/opt.c:1139 +#: ../libsvn_subr/opt.c:1106 #, c-format msgid "* running on %s\n" msgstr "* kör på %s\n" -#: ../libsvn_subr/opt.c:1143 +#: ../libsvn_subr/opt.c:1110 #, c-format msgid " - %s\n" msgstr " - %s\n" -#: ../libsvn_subr/opt.c:1153 +#: ../libsvn_subr/opt.c:1120 msgid "* linked dependencies:\n" msgstr "* länkade beroenden:\n" -#: ../libsvn_subr/opt.c:1178 +#: ../libsvn_subr/opt.c:1145 msgid "* loaded shared libraries:\n" msgstr "* inlästa delat bibliotek:\n" @@ -9993,7 +10060,7 @@ msgid "Password for '%s' GNOME keyring: " msgstr "Lösenord för GNOME-nyckelring \"%s\": " #: ../libsvn_subr/simple_providers.c:444 -#: ../libsvn_subr/ssl_client_cert_pw_providers.c:286 +#: ../libsvn_subr/ssl_client_cert_pw_providers.c:294 #, c-format msgid "Config error: invalid value '%s' for option '%s'" msgstr "Konfigurationsfel: felaktigt värde \"%s\" för inställningen \"%s\"" @@ -10318,17 +10385,17 @@ msgstr "Revisionen %ld stämmer inte med den existerande revisionen %ld i \"%s\" msgid "URL '%s' (uuid: '%s') doesn't match existing URL '%s' (uuid: '%s') in '%s'" msgstr "URL:en \"%s\" (UUID: \"%s\") stämmer inte med den existerande URL:en \"%s\" (UUID: \"%s\") i \"%s\"" -#: ../libsvn_wc/adm_ops.c:313 ../libsvn_wc/update_editor.c:5334 +#: ../libsvn_wc/adm_ops.c:313 ../libsvn_wc/update_editor.c:5345 #, c-format msgid "Can't find parent directory's node while trying to add '%s'" msgstr "Kunde inte hitta föräldrakatalogens nod när \"%s\" skulle läggas till" -#: ../libsvn_wc/adm_ops.c:322 ../libsvn_wc/update_editor.c:5328 +#: ../libsvn_wc/adm_ops.c:322 ../libsvn_wc/update_editor.c:5339 #, c-format msgid "Can't add '%s' to a parent directory scheduled for deletion" msgstr "Kan inte lägga till \"%s\" i en föräldrakatalog som är schemalagd för radering" -#: ../libsvn_wc/adm_ops.c:329 ../libsvn_wc/update_editor.c:5341 +#: ../libsvn_wc/adm_ops.c:329 ../libsvn_wc/update_editor.c:5352 #, c-format msgid "Can't schedule an addition of '%s' below a not-directory node" msgstr "Kan inte schemalägga ett tillägg av \"%s\" under en nod som inte är en katalog" @@ -10366,78 +10433,78 @@ msgstr "För gammalt loggformat; var god använd Subversion 1.6 eller äldre" msgid "Not a conflict skel" msgstr "Inte ett konfliktskelett" -#: ../libsvn_wc/conflicts.c:608 ../libsvn_wc/conflicts.c:705 +#: ../libsvn_wc/conflicts.c:624 ../libsvn_wc/conflicts.c:721 msgid "Not a completed conflict skel" msgstr "Inte ett fullständigt konfliktskelett" -#: ../libsvn_wc/conflicts.c:786 ../libsvn_wc/conflicts.c:859 -#: ../libsvn_wc/conflicts.c:949 +#: ../libsvn_wc/conflicts.c:802 ../libsvn_wc/conflicts.c:875 +#: ../libsvn_wc/conflicts.c:966 msgid "Conflict not set" msgstr "Konflikt inte satt" -#: ../libsvn_wc/conflicts.c:1316 ../libsvn_wc/conflicts.c:1991 -#: ../libsvn_wc/conflicts.c:2036 +#: ../libsvn_wc/conflicts.c:1350 ../libsvn_wc/conflicts.c:2025 +#: ../libsvn_wc/conflicts.c:2070 msgid "Conflict callback violated API: returned no results" msgstr "Konfliktprocedur bröt mot API:et: returnerade inga resultat" -#: ../libsvn_wc/conflicts.c:1359 +#: ../libsvn_wc/conflicts.c:1393 msgid "Conflict callback violated API: returned no merged file" msgstr "Konfliktprocedur bröt mot API:et: returnerade ingen sammanslagen fil" -#: ../libsvn_wc/conflicts.c:1646 +#: ../libsvn_wc/conflicts.c:1680 #, c-format msgid "Conflict on '%s' cannot be resolved to 'theirs-conflict' or 'mine-conflict' because a merged version of the file cannot be created." msgstr "Konflikt på \"%s\" kan inte lösas till \"theirs-conflict\" eller \"mine-conflict\" eftersom en sammanslagen version av filen inte kan skapas." -#: ../libsvn_wc/conflicts.c:1691 +#: ../libsvn_wc/conflicts.c:1725 #, c-format msgid "Conflict on '%s' could not be resolved because the chosen version of the file is not available." msgstr "Konflikt på \"%s\" kan inte lösas eftersom den valda versionen av filen inte finns." -#: ../libsvn_wc/conflicts.c:2506 +#: ../libsvn_wc/conflicts.c:2540 msgid "Invalid 'conflict_result' argument" msgstr "Ogiltigt \"conflict_result\"-argument" -#: ../libsvn_wc/conflicts.c:2768 ../libsvn_wc/conflicts.c:2813 +#: ../libsvn_wc/conflicts.c:2803 ../libsvn_wc/conflicts.c:2848 #, c-format msgid "Tree conflict can only be resolved to 'working' or 'mine-conflict' state; '%s' not resolved" msgstr "Trädkonflikt kan endast lösas till tillstånden \"working\" eller \"mine-conflict\"; \"%s\" ej löst" -#: ../libsvn_wc/conflicts.c:2840 +#: ../libsvn_wc/conflicts.c:2875 #, c-format msgid "Tree conflict can only be resolved to 'working' state; '%s' is no longer moved" msgstr "Trädkonflikt kan endast lösas till tillståndet \"working\"; \"%s\" har inte längre flyttats" -#: ../libsvn_wc/conflicts.c:2858 +#: ../libsvn_wc/conflicts.c:2893 #, c-format msgid "Tree conflict can only be resolved to 'working' state; '%s' not resolved" msgstr "Trädkonflikt kan endast lösas till tillståndet \"working\"; \"%s\" ej löst" -#: ../libsvn_wc/conflicts.c:3035 +#: ../libsvn_wc/conflicts.c:3070 msgid "No conflict-callback and no pre-defined conflict-choice provided" msgstr "Ingen konfliktprocedur och inget fördefinierad konfliktval tillhandahölls" -#: ../libsvn_wc/conflicts.c:3304 +#: ../libsvn_wc/conflicts.c:3339 #, c-format msgid "Unable to resolve conflicts on '%s'" msgstr "Kan inte lösa konflikten på \"%s\"" -#: ../libsvn_wc/conflicts.c:3495 ../libsvn_wc/conflicts.c:3581 -#: ../libsvn_wc/conflicts.c:3660 ../libsvn_wc/conflicts.c:3746 -#: ../libsvn_wc/conflicts.c:3813 +#: ../libsvn_wc/conflicts.c:3530 ../libsvn_wc/conflicts.c:3616 +#: ../libsvn_wc/conflicts.c:3695 ../libsvn_wc/conflicts.c:3781 +#: ../libsvn_wc/conflicts.c:3848 #, c-format msgid "Unexpected conflict operation '%s' on '%s'" msgstr "Oväntad konfliktsoperation \"%s\" på \"%s\"" -#: ../libsvn_wc/conflicts.c:3503 ../libsvn_wc/conflicts.c:3588 -#: ../libsvn_wc/conflicts.c:3666 ../libsvn_wc/conflicts.c:3752 -#: ../libsvn_wc/conflicts.c:3819 +#: ../libsvn_wc/conflicts.c:3538 ../libsvn_wc/conflicts.c:3623 +#: ../libsvn_wc/conflicts.c:3701 ../libsvn_wc/conflicts.c:3787 +#: ../libsvn_wc/conflicts.c:3854 #, c-format msgid "Unexpected conflict reason '%s' on '%s'" msgstr "Oväntad konfliktorsak \"%s\" på \"%s\"" -#: ../libsvn_wc/conflicts.c:3594 ../libsvn_wc/conflicts.c:3672 -#: ../libsvn_wc/conflicts.c:3758 ../libsvn_wc/conflicts.c:3825 +#: ../libsvn_wc/conflicts.c:3629 ../libsvn_wc/conflicts.c:3707 +#: ../libsvn_wc/conflicts.c:3793 ../libsvn_wc/conflicts.c:3860 #, c-format msgid "Unexpected conflict action '%s' on '%s'" msgstr "Oväntad konflikthandling \"%s\" på \"%s\"" @@ -10566,7 +10633,7 @@ msgstr "\"%s\" representerar arkivroten och kan inte raderas" msgid "File '%s' has local modifications" msgstr "Filen \"%s\" har lokala ändringar" -#: ../libsvn_wc/deprecated.c:2393 +#: ../libsvn_wc/deprecated.c:2419 #, c-format msgid "Unexpectedly found '%s': path is marked 'missing'" msgstr "Hittade \"%s\", vilket var oväntat: sökvägen är markerad som \"saknad\"" @@ -11017,15 +11084,17 @@ msgstr "Okänt sätt att markera radslut \"%s\" för \"%s\"" #. scratch_ #: ../libsvn_wc/props.c:2239 #, c-format -msgid " (%d more duplicate targets found)" -msgstr " (ytterligare %d mål förekommer flera gånger)" +msgid " (%d more duplicate target found)" +msgid_plural " (%d more duplicate targets found)" +msgstr[0] " (ytterligare %d mål förekommer flera gånger)" +msgstr[1] " (ytterligare %d mål förekommer flera gånger)" -#: ../libsvn_wc/props.c:2244 +#: ../libsvn_wc/props.c:2246 #, c-format msgid "Invalid %s property on '%s': target '%s' appears more than once%s" msgstr "Ogiltig egenskap %s på \"%s\": målet \"%s\" förekommer mer än en gång%s" -#: ../libsvn_wc/props.c:2275 +#: ../libsvn_wc/props.c:2277 #, c-format msgid "Cannot set non-inheritable mergeinfo on a non-directory ('%s')" msgstr "Kan inte sätta icke-ärftlig sammanslagningsinformation på en icke-katalog (\"%s\")" @@ -11101,31 +11170,31 @@ msgstr "" msgid "'%s' is not valid as filename in directory '%s'" msgstr "\"%s\" är inte giltig som filnamn i katalogen \"%s\"" -#: ../libsvn_wc/update_editor.c:1507 +#: ../libsvn_wc/update_editor.c:1511 #, c-format msgid "Unexpected attempt to add a node at path '%s'" msgstr "Oväntat försök att lägga till en nod vid sökvägen \"%s\"" -#: ../libsvn_wc/update_editor.c:1518 +#: ../libsvn_wc/update_editor.c:1522 #, c-format msgid "Unexpected attempt to edit, delete, or replace a node at path '%s'" msgstr "Oväntat försök att ändra, radera eller ersätta en nod vid sökvägen \"%s\"" -#: ../libsvn_wc/update_editor.c:1899 +#: ../libsvn_wc/update_editor.c:1904 #, c-format msgid "Failed to add directory '%s': object of the same name as the administrative directory" msgstr "Kunde inte lägga till katalogen \"%s\": objektet har samma namn som förvaltningskatalogen" -#: ../libsvn_wc/update_editor.c:2572 +#: ../libsvn_wc/update_editor.c:2580 msgid "Couldn't do property merge" msgstr "Kunde inte slå ihop egenskaper" -#: ../libsvn_wc/update_editor.c:3111 +#: ../libsvn_wc/update_editor.c:3119 #, c-format msgid "Failed to add file '%s': object of the same name as the administrative directory" msgstr "Misslyckades att lägga till filen \"%s\": objektet har samma namn som förvaltningskatalogen" -#: ../libsvn_wc/update_editor.c:3650 +#: ../libsvn_wc/update_editor.c:3661 #, c-format msgid "" "Checksum mismatch for '%s':\n" @@ -11136,22 +11205,22 @@ msgstr "" " väntad: %s\n" " lagrad: %s\n" -#: ../libsvn_wc/update_editor.c:5309 +#: ../libsvn_wc/update_editor.c:5320 #, c-format msgid "Node '%s' exists." msgstr "Noden \"%s\" finns redan." -#: ../libsvn_wc/update_editor.c:5369 +#: ../libsvn_wc/update_editor.c:5380 #, c-format msgid "Copyfrom-url '%s' has different repository root than '%s'" msgstr "URL:en för kopieringskällan till \"%s\" har annan arkivrot än \"%s\"" -#: ../libsvn_wc/update_editor.c:5581 +#: ../libsvn_wc/update_editor.c:5592 #, c-format msgid "'%s' is not an unmodified copied directory" msgstr "\"%s\" är inte en oförändrad kopierad katalog" -#: ../libsvn_wc/update_editor.c:5592 +#: ../libsvn_wc/update_editor.c:5603 #, c-format msgid "Copyfrom '%s' doesn't match original location of '%s'" msgstr "Kopieringskällan \"%s\" motsvarar inte den ursprungliga platsen \"%s\"" @@ -11439,46 +11508,42 @@ msgstr "Den orörda texten med MD5-kontrollsumma \"%s\" hittades inte" msgid "'%s' is not deleted" msgstr "\"%s\" är inte raderad" -#: ../libsvn_wc/wc_db_update_move.c:459 ../libsvn_wc/wc_db_update_move.c:483 +#: ../libsvn_wc/wc_db_update_move.c:464 ../libsvn_wc/wc_db_update_move.c:488 #, c-format msgid "'%s' already in conflict" msgstr "\"%s\" är redan i konflikt" -#: ../libsvn_wc/wc_db_update_move.c:1621 -msgid ".working" -msgstr ".arbetskopia" - -#: ../libsvn_wc/wc_db_update_move.c:2183 +#: ../libsvn_wc/wc_db_update_move.c:2189 #, c-format msgid "Cannot apply update because '%s' is a switched path (please switch it back to its original URL and try again)" msgstr "Kan inte utföra uppdatering eftersom \"%s\" är en växlad sökväg (växla den tillbaka till dess ursprungliga URL och försök igen)" -#: ../libsvn_wc/wc_db_update_move.c:2192 +#: ../libsvn_wc/wc_db_update_move.c:2198 #, c-format msgid "Cannot apply update because '%s' is a mixed-revision working copy (please update and try again)" msgstr "Kan inte utföra uppdatering eftersom \"%s\" är en arbetskopia med blandad revision (uppdatera och försök igen)" -#: ../libsvn_wc/wc_db_update_move.c:2245 +#: ../libsvn_wc/wc_db_update_move.c:2251 #, c-format msgid "The node '%s' has not been moved away" msgstr "Noden \"%s\" har inte flyttats bort" -#: ../libsvn_wc/wc_db_update_move.c:2709 +#: ../libsvn_wc/wc_db_update_move.c:2715 #, c-format msgid "Cannot merge local changes from '%s' because '%s' already contains other local changes (please commit or revert these other changes and try again)" msgstr "Kan inte slå samman lokala ändringar från \"%s\" eftersom \"%s\" redan innehåller andra lokala ändringar (arkivera eller återställ dessa andra ändringar och försök igen)" -#: ../libsvn_wc/wc_db_update_move.c:4083 +#: ../libsvn_wc/wc_db_update_move.c:4089 #, c-format msgid "'%s' is not in conflict" msgstr "\"%s\" är inte i konflikt" -#: ../libsvn_wc/wc_db_update_move.c:4096 +#: ../libsvn_wc/wc_db_update_move.c:4102 #, c-format msgid "'%s' is not a valid tree-conflict victim" msgstr "\"%s\" är inte ett giltigt offer för trädkonflikt" -#: ../libsvn_wc/wc_db_update_move.c:4109 +#: ../libsvn_wc/wc_db_update_move.c:4115 #, c-format msgid "'%s' is already a moved away tree-conflict" msgstr "\"%s\" är redan en bortflyttad trädkonflikt" @@ -11529,27 +11594,27 @@ msgstr "" msgid "The symlink at '%s' points nowhere" msgstr "Den symboliska länken vid \"%s\" pekar ingenstans" -#: ../libsvn_wc/wc_db_wcroot.c:757 +#: ../libsvn_wc/wc_db_wcroot.c:762 #, c-format msgid "Missing a row in WCROOT for '%s'." msgstr "En rad i \"WCROOT\" saknas för \"%s\"." -#: ../libsvn_wc/wc_db_wcroot.c:811 +#: ../libsvn_wc/wc_db_wcroot.c:816 #, c-format msgid "The working copy at '%s' is corrupt." msgstr "Förstörd arbetskopia \"%s\"." -#: ../libsvn_wc/wc_db_wcroot.c:827 +#: ../libsvn_wc/wc_db_wcroot.c:832 #, c-format msgid "The working copy database at '%s' is missing." msgstr "Arbetskopians databas \"%s\" saknas." -#: ../libsvn_wc/wc_db_wcroot.c:836 +#: ../libsvn_wc/wc_db_wcroot.c:841 #, c-format msgid "The working copy database at '%s' is corrupt." msgstr "Arbetskopians databas \"%s\" är trasig." -#: ../libsvn_wc/wc_db_wcroot.c:994 +#: ../libsvn_wc/wc_db_wcroot.c:1000 #, c-format msgid "'%s' is not a working copy root" msgstr "\"%s\" är inte rot till en arbetskopia" @@ -11682,25 +11747,31 @@ msgstr "Raderar klientreferens av typ %s för autentiseringsregion \"%s\"\n" msgid "Credentials cache in '%s' is empty\n" msgstr "Klientreferenscache i \"%s\" är tom\n" -#: ../svn/auth-cmd.c:450 ../svn/auth-cmd.c:473 +#: ../svn/auth-cmd.c:450 ../svn/auth-cmd.c:476 #, c-format msgid "Credentials cache in '%s' contains no matching credentials" msgstr "Klientreferenscache i \"%s\" innehåller inga passande klientreferenser" #: ../svn/auth-cmd.c:458 #, c-format -msgid "Credentials cache in '%s' contains %d credentials\n" -msgstr "Klientreferenscache i \"%s\" innehåller %d klientreferenser\n" +msgid "Credentials cache in '%s' contains %d credential\n" +msgid_plural "Credentials cache in '%s' contains %d credentials\n" +msgstr[0] "Klientreferenscache i \"%s\" innehåller %d klientreferens\n" +msgstr[1] "Klientreferenscache i \"%s\" innehåller %d klientreferenser\n" -#: ../svn/auth-cmd.c:462 +#: ../svn/auth-cmd.c:464 #, c-format -msgid "Credentials cache in '%s' contains %d matching credentials\n" -msgstr "Klientreferenscache i \"%s\" innehåller %d passande klientreferenser\n" +msgid "Credentials cache in '%s' contains %d matching credential\n" +msgid_plural "Credentials cache in '%s' contains %d matching credentials\n" +msgstr[0] "Klientreferenscache i \"%s\" innehåller %d passande klientreferens\n" +msgstr[1] "Klientreferenscache i \"%s\" innehåller %d passande klientreferenser\n" -#: ../svn/auth-cmd.c:477 +#: ../svn/auth-cmd.c:481 #, c-format -msgid "Deleted %d matching credentials from '%s'\n" -msgstr "Raderade %d passande klientreferenser från \"%s\"\n" +msgid "Deleted %d matching credential from '%s'\n" +msgid_plural "Deleted %d matching credentials from '%s'\n" +msgstr[0] "Raderade %d passande klientreferens från \"%s\"\n" +msgstr[1] "Raderade %d passande klientreferenser från \"%s\"\n" #: ../svn/blame-cmd.c:314 ../svn/list-cmd.c:310 msgid "'verbose' option invalid in XML mode" @@ -11971,121 +12042,121 @@ msgstr "" #. Translators: keep long_desc below 70 characters (wrap with a left #. margin of 9 spaces if needed) -#: ../svn/conflict-callbacks.c:452 +#: ../svn/conflict-callbacks.c:457 msgid "Quit resolution" msgstr "Avbryt lösning" -#: ../svn/conflict-callbacks.c:452 +#: ../svn/conflict-callbacks.c:457 msgid "postpone all remaining conflicts" msgstr "skjut upp lösningen av återstående konflikter" #. Translators: keep long_desc below 70 characters (wrap with a left #. margin of 9 spaces if needed) -#: ../svn/conflict-callbacks.c:463 +#: ../svn/conflict-callbacks.c:468 msgid "Edit file" msgstr "Redigera fil" -#: ../svn/conflict-callbacks.c:463 +#: ../svn/conflict-callbacks.c:468 msgid "change merged file in an editor" msgstr "redigera sammanslagen fil i en editor" -#: ../svn/conflict-callbacks.c:466 +#: ../svn/conflict-callbacks.c:471 msgid "Show diff" msgstr "Visa skillnader" -#: ../svn/conflict-callbacks.c:466 +#: ../svn/conflict-callbacks.c:471 msgid "show all changes made to merged file" msgstr "visa alla ändringar i sammanslagen fil" #. Translators: keep long_desc below 70 characters (wrap with a left #. margin of 9 spaces if needed) -#: ../svn/conflict-callbacks.c:468 ../svn/conflict-callbacks.c:490 +#: ../svn/conflict-callbacks.c:473 ../svn/conflict-callbacks.c:495 msgid "Display conflict" msgstr "Visa konflikt" -#: ../svn/conflict-callbacks.c:468 +#: ../svn/conflict-callbacks.c:473 msgid "show all conflicts (ignoring merged version)" msgstr "visa alla konflikter (utom sammanslagen version)" -#: ../svn/conflict-callbacks.c:471 +#: ../svn/conflict-callbacks.c:476 msgid "Merge" msgstr "Sammanslagning" -#: ../svn/conflict-callbacks.c:471 +#: ../svn/conflict-callbacks.c:476 msgid "use merge tool to resolve conflict" msgstr "använd sammanslagningsverktyget för att lösa konflikten" -#: ../svn/conflict-callbacks.c:473 +#: ../svn/conflict-callbacks.c:478 msgid "Launch tool" msgstr "Kör verktyg" -#: ../svn/conflict-callbacks.c:473 +#: ../svn/conflict-callbacks.c:478 msgid "launch external merge tool to resolve conflict" msgstr "kör externt sammanslagningsverktyg för att lösa konflikten" -#: ../svn/conflict-callbacks.c:477 +#: ../svn/conflict-callbacks.c:482 msgid "Internal merge tool" msgstr "Internt sammanslagningsverktyg" -#: ../svn/conflict-callbacks.c:477 +#: ../svn/conflict-callbacks.c:482 msgid "use built-in merge tool to resolve conflict" msgstr "använd inbyggt sammanslagningsverktyg för att lösa konflikten" -#: ../svn/conflict-callbacks.c:480 +#: ../svn/conflict-callbacks.c:485 msgid "Show all options" msgstr "Visa alla val" -#: ../svn/conflict-callbacks.c:480 +#: ../svn/conflict-callbacks.c:485 msgid "show this list (also 'h', '?')" msgstr "visa denna lista (även \"h\" och \"?\")" -#: ../svn/conflict-callbacks.c:490 +#: ../svn/conflict-callbacks.c:495 msgid "show conflicts in this property" msgstr "visa konflikter i denna egenskap" -#: ../svn/conflict-callbacks.c:492 +#: ../svn/conflict-callbacks.c:497 msgid "Edit property" msgstr "Redigera egenskap" -#: ../svn/conflict-callbacks.c:492 +#: ../svn/conflict-callbacks.c:497 msgid "change merged property value in an editor" msgstr "redigera sammanslagen egenskap i en editor" -#: ../svn/conflict-callbacks.c:496 ../svn/conflict-callbacks.c:514 +#: ../svn/conflict-callbacks.c:501 ../svn/conflict-callbacks.c:519 msgid "Help" msgstr "Hjälp" -#: ../svn/conflict-callbacks.c:496 ../svn/conflict-callbacks.c:514 +#: ../svn/conflict-callbacks.c:501 ../svn/conflict-callbacks.c:519 msgid "show this help (also '?')" msgstr "visa denna hjälp (även \"?\")" #. Translators: keep long_desc below 70 characters (wrap with a left #. margin of 9 spaces if needed) -#: ../svn/conflict-callbacks.c:506 +#: ../svn/conflict-callbacks.c:511 msgid "Set repository move destination path" msgstr "Ange flyttmålets arkivsökväg" -#: ../svn/conflict-callbacks.c:507 +#: ../svn/conflict-callbacks.c:512 msgid "pick repository move target from list of possible targets" msgstr "välj arkivflyttmål från lista av möjliga mål" -#: ../svn/conflict-callbacks.c:510 +#: ../svn/conflict-callbacks.c:515 msgid "Set working copy move destination path" msgstr "Ange flyttmålets sökväg i arbetskopia" -#: ../svn/conflict-callbacks.c:511 +#: ../svn/conflict-callbacks.c:516 msgid "pick working copy move target from list of possible targets" msgstr "välj arbetskopians flyttmål från lista av möjliga mål" -#: ../svn/conflict-callbacks.c:613 +#: ../svn/conflict-callbacks.c:618 msgid "Select:" msgstr "Välj:" -#: ../svn/conflict-callbacks.c:699 +#: ../svn/conflict-callbacks.c:704 msgid "Words in square brackets are the corresponding --accept option arguments.\n" msgstr "Ord inom hakparenteser är motsvarande argument till flaggan --accept.\n" -#: ../svn/conflict-callbacks.c:744 +#: ../svn/conflict-callbacks.c:749 #, c-format msgid "" "Unrecognized option.\n" @@ -12094,17 +12165,17 @@ msgstr "" "Okänd väljare.\n" "\n" -#: ../svn/conflict-callbacks.c:909 +#: ../svn/conflict-callbacks.c:914 #, c-format msgid "Merge conflict discovered in binary file '%s'.\n" msgstr "Sammanslagningskonflikt upptäckt i binärfilen \"%s\".\n" -#: ../svn/conflict-callbacks.c:914 +#: ../svn/conflict-callbacks.c:919 #, c-format msgid "Merge conflict discovered in file '%s'.\n" msgstr "Sammanslagningskonflikt upptäckt i filen \"%s\".\n" -#: ../svn/conflict-callbacks.c:997 +#: ../svn/conflict-callbacks.c:1002 #, c-format msgid "" "Invalid option; cannot display conflicts for a binary file.\n" @@ -12113,7 +12184,7 @@ msgstr "" "Ogiltig väljare; kan inte visa konflikter för en binärfil.\n" "\n" -#: ../svn/conflict-callbacks.c:1005 +#: ../svn/conflict-callbacks.c:1010 #, c-format msgid "" "Invalid option; original files not available.\n" @@ -12122,7 +12193,7 @@ msgstr "" "Ogiltig väljare; ursprungliga filerna ej tillgängliga.\n" "\n" -#: ../svn/conflict-callbacks.c:1021 +#: ../svn/conflict-callbacks.c:1026 #, c-format msgid "" "Invalid option; there's no merged version to diff.\n" @@ -12131,7 +12202,7 @@ msgstr "" "Ogiltig väljare; det finns ingen sammanslagen version att jämföra med.\n" "\n" -#: ../svn/conflict-callbacks.c:1047 +#: ../svn/conflict-callbacks.c:1052 #, c-format msgid "" "Invalid option; there's no base path to merge.\n" @@ -12140,7 +12211,7 @@ msgstr "" "Felaktig väljare; det finns ingen bassökväg att slå samman.\n" "\n" -#: ../svn/conflict-callbacks.c:1140 +#: ../svn/conflict-callbacks.c:1145 #, c-format msgid "" "Invalid option.\n" @@ -12149,7 +12220,7 @@ msgstr "" "Ogiltig väljare.\n" "\n" -#: ../svn/conflict-callbacks.c:1169 +#: ../svn/conflict-callbacks.c:1174 #, c-format msgid "" "Invalid option; cannot choose based on conflicts in a binary file.\n" @@ -12158,7 +12229,7 @@ msgstr "" "Ogiltig väljare; kan inte välja utifrån konflikter i en binärfil.\n" "\n" -#: ../svn/conflict-callbacks.c:1183 +#: ../svn/conflict-callbacks.c:1188 #, c-format msgid "" "Invalid option; use diff/edit/merge/launch before choosing 'mark resolved'.\n" @@ -12167,12 +12238,12 @@ msgstr "" "Ogiltig väljare; använd diff/edit/merge/launch före \"markera löst\".\n" "\n" -#: ../svn/conflict-callbacks.c:1296 +#: ../svn/conflict-callbacks.c:1301 #, c-format msgid "Conflict for property '%s' discovered on '%s'.\n" msgstr "Konflikt för egenskapen \"%s\" upptäcktes på \"%s\".\n" -#: ../svn/conflict-callbacks.c:1365 +#: ../svn/conflict-callbacks.c:1370 #, c-format msgid "" "Invalid option; please edit the property first.\n" @@ -12181,7 +12252,7 @@ msgstr "" "Felaktigt val; redigera egenskapen först.\n" "\n" -#: ../svn/conflict-callbacks.c:1625 +#: ../svn/conflict-callbacks.c:1629 #, c-format msgid "" "Possible working copy destinations for moved-away '%s' are:\n" @@ -12192,7 +12263,7 @@ msgstr "" "%sBara ett mål kan vara en flytt; de andra är kopieringar.\n" "Ange numret för rätt sökväg för flyttmålet: " -#: ../svn/conflict-callbacks.c:1634 +#: ../svn/conflict-callbacks.c:1638 #, c-format msgid "" "Possible repository destinations for moved-away '%s' are:\n" @@ -12203,7 +12274,7 @@ msgstr "" "%sBara ett mål kan vara en flytt; de andra är kopieringar.\n" "Ange numret för rätt sökväg för flyttmålet: " -#: ../svn/conflict-callbacks.c:1716 +#: ../svn/conflict-callbacks.c:1783 #, c-format msgid "" "Tree conflict on '%s':\n" @@ -12212,12 +12283,12 @@ msgstr "" "Trädkonflikt på \"%s\":\n" "%s\n" -#: ../svn/conflict-callbacks.c:1736 +#: ../svn/conflict-callbacks.c:1803 #, c-format msgid "Applying recommended resolution '%s':\n" msgstr "Utför den rekommenderade lösningen \"%s\":\n" -#: ../svn/conflict-callbacks.c:1761 +#: ../svn/conflict-callbacks.c:1828 #, c-format msgid "" "\n" @@ -12231,12 +12302,12 @@ msgstr "" "Se \"svn help resolve\" för vidare information.\n" "\n" -#: ../svn/conflict-callbacks.c:1776 +#: ../svn/conflict-callbacks.c:1843 #, c-format msgid "Ambiguous move destinations exist in the repository; try the 'd' option\n" msgstr "Flertydiga flyttmål finns i arkivet; försök med valet \"d\"\n" -#: ../svn/conflict-callbacks.c:1781 +#: ../svn/conflict-callbacks.c:1848 #, c-format msgid "Ambiguous move destinations exist in the working copy; try the 'w' option\n" msgstr "Flertydiga flyttmål finns i arbetskopian; försök med valet \"w\"\n" @@ -12251,26 +12322,26 @@ msgstr "\"%s\": en fixerad revision är inte tillåten här" msgid "Local, non-commit operations do not take a log message or revision properties" msgstr "Lokala operationer, som ej medför arkivering, behöver inga loggmeddelanden eller revisionsegenskaper" -#: ../svn/diff-cmd.c:227 +#: ../svn/diff-cmd.c:242 msgid "'--xml' option only valid with '--summarize' option" msgstr "Flaggan \"--xml\" är endast tillåten tillsammans med \"--summarize\"" -#: ../svn/diff-cmd.c:240 ../svn/diff-cmd.c:244 ../svn/diff-cmd.c:248 -#: ../svn/diff-cmd.c:252 ../svn/diff-cmd.c:256 ../svn/diff-cmd.c:260 -#: ../svn/diff-cmd.c:264 ../svn/diff-cmd.c:268 +#: ../svn/diff-cmd.c:255 ../svn/diff-cmd.c:259 ../svn/diff-cmd.c:263 +#: ../svn/diff-cmd.c:267 ../svn/diff-cmd.c:271 ../svn/diff-cmd.c:275 +#: ../svn/diff-cmd.c:279 ../svn/diff-cmd.c:283 #, c-format msgid "'%s' not valid with '--summarize' option" msgstr "\"%s\" kan inte användas tillsammans med \"--summarize\"" -#: ../svn/diff-cmd.c:355 +#: ../svn/diff-cmd.c:370 msgid "'--new' option only valid with '--old' option" msgstr "Flaggan \"--new\" är endast tillåten tillsammans med \"--old\"" -#: ../svn/diff-cmd.c:373 +#: ../svn/diff-cmd.c:388 msgid "'svn diff [-r N[:M]] [TARGET[@REV]...]' does not support mixed target types. Try using the --old and --new options or one of the shorthand invocations listed in 'svn help diff'." msgstr "\"svn diff [-r N[:M]] [MÅL[@REV]...]\" stöder inte blandade måltyper. Försök med flaggorna \"--old\" och \"--new\" eller en av kortformerna som nämns i \"svn help diff\"." -#: ../svn/diff-cmd.c:430 +#: ../svn/diff-cmd.c:445 #, c-format msgid "Path '%s' not relative to base URLs" msgstr "Sökvägen \"%s\" är inte relativ mot bas-URL:erna" @@ -12396,8 +12467,8 @@ msgstr "" "Subversion är ett verktyg för versionshantering.\n" "Se http://subversion.apache.org/ för ytterligare information\n" -#: ../svn/help-cmd.c:71 ../svnbench/help-cmd.c:66 ../svnrdump/svnrdump.c:610 -#: ../svnsync/svnsync.c:1933 +#: ../svn/help-cmd.c:71 ../svnbench/help-cmd.c:66 ../svnrdump/svnrdump.c:616 +#: ../svnsync/svnsync.c:1938 msgid "" "The following repository access (RA) modules are available:\n" "\n" @@ -12446,237 +12517,247 @@ msgstr "För många argument till import-kommandot" msgid "Invalid URL '%s'" msgstr "Ogiltig URL \"%s\"" -#: ../svn/info-cmd.c:210 +#: ../svn/info-cmd.c:219 +#, c-format +msgid "svn-viewspec.py format 1 does not support the 'not-present' state found at '%s'" +msgstr "svn-viewspec.py format 1 stöder inte \"not-present\"-tillståndet som finns vid \"%s\"" + +#: ../svn/info-cmd.c:228 +#, c-format +msgid "svn-viewspec.py format 1 does not support the 'switched' state found at '%s'" +msgstr "svn-viewspect.py format 1 stöder inte \"switched\"-tillståndet som fanns vid \"%s\"" + +#: ../svn/info-cmd.c:466 #, c-format msgid "'%s' is not a valid value for --show-item" msgstr "\"%s\" är inte ett giltigt värde för --show-item" -#: ../svn/info-cmd.c:218 +#: ../svn/info-cmd.c:474 #, c-format msgid "'%s' is not a valid value for --show-item; did you mean '%s'?" msgstr "\"%s\" är inget giltigt värde för --show-item; menade du \"%s\"?" -#: ../svn/info-cmd.c:228 +#: ../svn/info-cmd.c:484 #, c-format msgid "'%s' is not a valid value for --show-item; did you mean '%s' or '%s'?" msgstr "\"%s\" är inget giltigt värde för --show-item; menade du \"%s\" eller \"%s\"?" -#: ../svn/info-cmd.c:239 +#: ../svn/info-cmd.c:495 #, c-format msgid "'%s' is not a valid value for --show-item; did you mean '%s', '%s' or '%s'?" msgstr "\"%s\" är inget giltigt värde för --show-item; menade du \"%s\", \"%s\" eller \"%s\"?" -#: ../svn/info-cmd.c:260 +#: ../svn/info-cmd.c:516 msgid "Resource is not under version control." msgstr "Resursen är inte versionshanterad." -#: ../svn/info-cmd.c:436 ../svnadmin/svnadmin.c:2304 -#: ../svnadmin/svnadmin.c:2540 +#: ../svn/info-cmd.c:692 ../svnadmin/svnadmin.c:2371 +#: ../svnadmin/svnadmin.c:2607 #, c-format msgid "Path: %s\n" msgstr "Sökväg: %s\n" -#: ../svn/info-cmd.c:443 +#: ../svn/info-cmd.c:699 #, c-format msgid "Name: %s\n" msgstr "Namn: %s\n" -#: ../svn/info-cmd.c:447 +#: ../svn/info-cmd.c:703 #, c-format msgid "Working Copy Root Path: %s\n" msgstr "Sökväg till arbetskopians rot: %s\n" -#: ../svn/info-cmd.c:453 +#: ../svn/info-cmd.c:709 #, c-format msgid "URL: %s\n" msgstr "URL: %s\n" -#: ../svn/info-cmd.c:456 +#: ../svn/info-cmd.c:712 #, c-format msgid "Relative URL: %s\n" msgstr "Relativ URL: %s\n" -#: ../svn/info-cmd.c:460 +#: ../svn/info-cmd.c:716 #, c-format msgid "Repository Root: %s\n" msgstr "Arkivrot: %s\n" -#: ../svn/info-cmd.c:464 +#: ../svn/info-cmd.c:720 #, c-format msgid "Repository UUID: %s\n" msgstr "Arkivets UUID: %s\n" -#: ../svn/info-cmd.c:468 +#: ../svn/info-cmd.c:724 #, c-format msgid "Revision: %ld\n" msgstr "Revision: %ld\n" -#: ../svn/info-cmd.c:473 +#: ../svn/info-cmd.c:729 #, c-format msgid "Node Kind: file\n" msgstr "Nodtyp: fil\n" -#: ../svn/info-cmd.c:477 +#: ../svn/info-cmd.c:733 #, c-format msgid "Node Kind: directory\n" msgstr "Nodtyp: katalog\n" -#: ../svn/info-cmd.c:481 +#: ../svn/info-cmd.c:737 #, c-format msgid "Node Kind: none\n" msgstr "Nodtyp: ingen\n" -#: ../svn/info-cmd.c:486 +#: ../svn/info-cmd.c:742 #, c-format msgid "Node Kind: unknown\n" msgstr "Nodtyp: okänd\n" -#: ../svn/info-cmd.c:495 +#: ../svn/info-cmd.c:751 #, c-format msgid "Schedule: normal\n" msgstr "Schemalagd: normal\n" -#: ../svn/info-cmd.c:499 +#: ../svn/info-cmd.c:755 #, c-format msgid "Schedule: add\n" msgstr "Schemalagd: att läggas till\n" -#: ../svn/info-cmd.c:503 +#: ../svn/info-cmd.c:759 #, c-format msgid "Schedule: delete\n" msgstr "Schemalagd: att raderas\n" -#: ../svn/info-cmd.c:507 +#: ../svn/info-cmd.c:763 #, c-format msgid "Schedule: replace\n" msgstr "Schemalagd: att ersättas\n" -#: ../svn/info-cmd.c:523 +#: ../svn/info-cmd.c:779 #, c-format msgid "Depth: empty\n" msgstr "Djup: \"empty\"\n" -#: ../svn/info-cmd.c:527 +#: ../svn/info-cmd.c:783 #, c-format msgid "Depth: files\n" msgstr "Djup: \"files\"\n" -#: ../svn/info-cmd.c:531 +#: ../svn/info-cmd.c:787 #, c-format msgid "Depth: immediates\n" msgstr "Djup: \"immediates\"\n" -#: ../svn/info-cmd.c:535 +#: ../svn/info-cmd.c:791 #, c-format msgid "Depth: exclude\n" msgstr "Djup: \"exclude\"\n" #. Other depths should never happen here. -#: ../svn/info-cmd.c:546 +#: ../svn/info-cmd.c:802 #, c-format msgid "Depth: INVALID\n" msgstr "Djup: OGILTIGT\n" -#: ../svn/info-cmd.c:550 +#: ../svn/info-cmd.c:806 #, c-format msgid "Copied From URL: %s\n" msgstr "Kopierad från URL: %s\n" -#: ../svn/info-cmd.c:554 +#: ../svn/info-cmd.c:810 #, c-format msgid "Copied From Rev: %ld\n" msgstr "Kopierad från revision: %ld\n" -#: ../svn/info-cmd.c:557 +#: ../svn/info-cmd.c:813 #, c-format msgid "Moved From: %s\n" msgstr "Flyttad från: %s\n" # ### -#: ../svn/info-cmd.c:564 +#: ../svn/info-cmd.c:820 #, c-format msgid "Moved To: %s\n" msgstr "Flyttad till: %s\n" -#: ../svn/info-cmd.c:572 +#: ../svn/info-cmd.c:828 #, c-format msgid "Last Changed Author: %s\n" msgstr "Författare till senaste ändringen: %s\n" -#: ../svn/info-cmd.c:576 +#: ../svn/info-cmd.c:832 #, c-format msgid "Last Changed Rev: %ld\n" msgstr "Senast ändrad i revision: %ld\n" -#: ../svn/info-cmd.c:581 +#: ../svn/info-cmd.c:837 msgid "Last Changed Date" msgstr "Datum för senaste ändringen" -#: ../svn/info-cmd.c:587 +#: ../svn/info-cmd.c:843 msgid "Text Last Updated" msgstr "Innehållet senast uppdaterat" -#: ../svn/info-cmd.c:590 +#: ../svn/info-cmd.c:846 #, c-format msgid "Checksum: %s\n" msgstr "Kontrollsumma: %s\n" -#: ../svn/info-cmd.c:624 +#: ../svn/info-cmd.c:880 #, c-format msgid "Conflict Previous Base File: %s\n" msgstr "Konflikt: föregående basfil: %s\n" -#: ../svn/info-cmd.c:632 +#: ../svn/info-cmd.c:888 #, c-format msgid "Conflict Previous Working File: %s\n" msgstr "Konflikt: föregående arbetsfil: %s\n" -#: ../svn/info-cmd.c:640 +#: ../svn/info-cmd.c:896 #, c-format msgid "Conflict Current Base File: %s\n" msgstr "Konflikt: nuvarande basfil: %s\n" -#: ../svn/info-cmd.c:676 +#: ../svn/info-cmd.c:932 msgid "Tree conflict" msgstr "Trädkonflikt" -#: ../svn/info-cmd.c:680 +#: ../svn/info-cmd.c:936 #, c-format msgid "Conflicted Properties: %s\n" msgstr "Konfliktegenskaper: %s\n" -#: ../svn/info-cmd.c:706 +#: ../svn/info-cmd.c:962 msgid "Conflict Details" msgstr "Konfliktdetaljer" -#: ../svn/info-cmd.c:727 +#: ../svn/info-cmd.c:983 msgid "Source left" msgstr "Källa vänster" -#: ../svn/info-cmd.c:736 +#: ../svn/info-cmd.c:992 msgid "Source right" msgstr "Källa höger" # ### -#: ../svn/info-cmd.c:745 +#: ../svn/info-cmd.c:1001 #, c-format msgid "Lock Token: %s\n" msgstr "Låsidentifierare: %s\n" -#: ../svn/info-cmd.c:749 +#: ../svn/info-cmd.c:1005 #, c-format msgid "Lock Owner: %s\n" msgstr "Låsägare: %s\n" -#: ../svn/info-cmd.c:754 +#: ../svn/info-cmd.c:1010 msgid "Lock Created" msgstr "Lås skapat" -#: ../svn/info-cmd.c:758 +#: ../svn/info-cmd.c:1014 msgid "Lock Expires" msgstr "Låset går ut" -#: ../svn/info-cmd.c:766 +#: ../svn/info-cmd.c:1022 #, c-format msgid "" "Lock Comment (%i line):\n" @@ -12691,32 +12772,32 @@ msgstr[1] "" "Låskommentar (%i rader):\n" "%s\n" -#: ../svn/info-cmd.c:775 +#: ../svn/info-cmd.c:1031 #, c-format msgid "Changelist: %s\n" msgstr "Ändringslista: %s\n" -#: ../svn/info-cmd.c:933 +#: ../svn/info-cmd.c:1209 msgid "--show-item is not valid in --xml mode" msgstr "--show-item är inte giltig i läget --xml" -#: ../svn/info-cmd.c:937 +#: ../svn/info-cmd.c:1213 msgid "--no-newline is not valid in --xml mode" msgstr "--new-newline är inte giltig i läget --xml" -#: ../svn/info-cmd.c:952 ../svn/info-cmd.c:972 +#: ../svn/info-cmd.c:1228 ../svn/info-cmd.c:1248 msgid "--incremental is only valid in --xml mode" msgstr "--incremental är endast tillåten i läget --xml" -#: ../svn/info-cmd.c:959 +#: ../svn/info-cmd.c:1235 msgid "--no-newline is only available for single-target, non-recursive info operations" msgstr "--no-newline är endast tillgänglig för icke-rekursiva informationsoperationer på ett enda mål" -#: ../svn/info-cmd.c:976 +#: ../svn/info-cmd.c:1252 msgid "--no-newline' is only valid with --show-item" msgstr "--no-newline är endast tillåten tillsammans med --show-item" -#: ../svn/info-cmd.c:1049 ../svnbench/null-info-cmd.c:283 +#: ../svn/info-cmd.c:1325 ../svnbench/null-info-cmd.c:283 msgid "Could not display info for all targets because some targets don't exist" msgstr "Kunde inte visa information för alla mål eftersom några mål inte finns" @@ -12749,91 +12830,91 @@ msgstr "Låskommentaren innehåller en noll-byte" msgid "One or more locks could not be obtained" msgstr "Ett eller flera lås kunde inte tas" -#: ../svn/log-cmd.c:110 +#: ../svn/log-cmd.c:111 ../svn/svn.c:1147 ../svn/svn.c:1219 ../svn/svn.c:1285 msgid "\n" msgstr "\n" -#: ../svn/log-cmd.c:340 +#: ../svn/log-cmd.c:341 msgid "(no author)" msgstr "(författare saknas)" -#: ../svn/log-cmd.c:346 +#: ../svn/log-cmd.c:347 msgid "(no date)" msgstr "(datum saknas)" -#: ../svn/log-cmd.c:376 +#: ../svn/log-cmd.c:377 #, c-format msgid " | %d line" msgid_plural " | %d lines" msgstr[0] " | %d rad" msgstr[1] " | %d rader" -#: ../svn/log-cmd.c:393 +#: ../svn/log-cmd.c:394 #, c-format msgid "Changed paths:\n" msgstr "Ändrade sökvägar:\n" -#: ../svn/log-cmd.c:413 +#: ../svn/log-cmd.c:414 #, c-format msgid " (from %s:%ld)" msgstr " (från %s:%ld)" -#: ../svn/log-cmd.c:431 +#: ../svn/log-cmd.c:432 #, c-format msgid "Reverse merged via:" msgstr "Omvänt sammanslaget från:" -#: ../svn/log-cmd.c:433 +#: ../svn/log-cmd.c:434 #, c-format msgid "Merged via:" msgstr "Sammanslaget från:" -#: ../svn/log-cmd.c:716 +#: ../svn/log-cmd.c:717 msgid "'with-all-revprops' option only valid in XML mode" msgstr "Flaggan \"with-all-revprops\" är endast tillåten i XML-läge" -#: ../svn/log-cmd.c:720 +#: ../svn/log-cmd.c:721 msgid "'with-no-revprops' option only valid in XML mode" msgstr "Flaggan \"with-no-revprops\" är endast tillåten i XML-läge" -#: ../svn/log-cmd.c:724 +#: ../svn/log-cmd.c:725 msgid "'with-revprop' option only valid in XML mode" msgstr "Flaggan \"with-revprop\" är endast tillåten i XML-läge" -#: ../svn/log-cmd.c:731 +#: ../svn/log-cmd.c:732 msgid "'diff' option is not supported in XML mode" msgstr "Flaggan \"diff\" stöds ej i XML-läge" -#: ../svn/log-cmd.c:737 +#: ../svn/log-cmd.c:738 msgid "'quiet' and 'diff' options are mutually exclusive" msgstr "Flaggorna \"quiet\" och \"quit\" kan inte användas samtidigt" -#: ../svn/log-cmd.c:741 +#: ../svn/log-cmd.c:742 msgid "'diff-cmd' option requires 'diff' option" msgstr "Flaggan \"diff-cmd\" måste användas med flaggan \"diff\"" -#: ../svn/log-cmd.c:745 +#: ../svn/log-cmd.c:746 msgid "'internal-diff' option requires 'diff' option" msgstr "Flaggan \"internal-diff\" måste användas med flaggan \"diff\"" -#: ../svn/log-cmd.c:749 +#: ../svn/log-cmd.c:750 msgid "'extensions' option requires 'diff' option" msgstr "Flaggan \"extensions\" måste användas med flaggan \"diff\"" -#: ../svn/log-cmd.c:754 +#: ../svn/log-cmd.c:755 msgid "'depth' option requires 'diff' option" msgstr "Flaggan \"depth\" måste användas med flaggan \"diff\"" -#: ../svn/log-cmd.c:770 ../svnbench/null-log-cmd.c:158 +#: ../svn/log-cmd.c:771 ../svnbench/null-log-cmd.c:158 msgid "-c and -r are mutually exclusive" msgstr "-c och -r kan inte användas samtidigt" -#: ../svn/log-cmd.c:802 +#: ../svn/log-cmd.c:803 #, c-format msgid "Only relative paths can be specified after a URL for 'svn log', but '%s' is not a relative path" msgstr "Endast relativa sökvägar kan anges efter en URL för \"svn log\", men \"%s\" är inte en relativ sökväg" -#: ../svn/log-cmd.c:849 +#: ../svn/log-cmd.c:850 #, c-format msgid "cannot assign with 'with-revprop' option (drop the '=')" msgstr "kan inte tilldela med flaggan \"with-revprop\" (ta bort \"=\")" @@ -12861,9 +12942,9 @@ msgid "Second revision required" msgstr "En andra revision måste anges" #: ../svn/merge-cmd.c:368 ../svn/merge-cmd.c:395 ../svn/mergeinfo-cmd.c:361 -#: ../svnadmin/svnadmin.c:2508 ../svnlook/svnlook.c:2052 -#: ../svnlook/svnlook.c:2246 ../svnlook/svnlook.c:2350 -#: ../svnlook/svnlook.c:2385 +#: ../svnadmin/svnadmin.c:2575 ../svnlook/svnlook.c:2086 +#: ../svnlook/svnlook.c:2280 ../svnlook/svnlook.c:2384 +#: ../svnlook/svnlook.c:2419 msgid "Too many arguments given" msgstr "För många argument" @@ -13318,7 +13399,7 @@ msgstr "Ersätter %s\n" msgid "Transmitting file data " msgstr "Skickar filinnehåll " -#: ../svn/notify.c:968 ../svnadmin/svnadmin.c:2485 ../svnbench/notify.c:749 +#: ../svn/notify.c:968 ../svnadmin/svnadmin.c:2552 ../svnbench/notify.c:749 #, c-format msgid "'%s' locked by user '%s'.\n" msgstr "\"%s\" låstes av användaren \"%s\".\n" @@ -13516,7 +13597,7 @@ msgid "Error writing to stream" msgstr "Fel vid skrivning till ström" #: ../svn/propget-cmd.c:187 ../svn/proplist-cmd.c:156 ../svn/proplist-cmd.c:160 -#: ../svnlook/svnlook.c:1743 ../svnlook/svnlook.c:1898 +#: ../svnlook/svnlook.c:1777 ../svnlook/svnlook.c:1932 #, c-format msgid "" "Inherited properties on '%s',\n" @@ -13526,8 +13607,8 @@ msgstr "" "från \"%s\":\n" #. Not a --revprop -#: ../svn/propget-cmd.c:197 ../svn/proplist-cmd.c:175 ../svnlook/svnlook.c:1778 -#: ../svnlook/svnlook.c:1933 +#: ../svn/propget-cmd.c:197 ../svn/proplist-cmd.c:175 ../svnlook/svnlook.c:1812 +#: ../svnlook/svnlook.c:1967 #, c-format msgid "Properties on '%s':\n" msgstr "Egenskaper på \"%s\":\n" @@ -13655,38 +13736,154 @@ msgstr "flaggan --accept saknas" msgid "invalid 'accept' ARG" msgstr "ogiltigt \"accept\"-argument" -#: ../svn/revert-cmd.c:80 +#: ../svn/revert-cmd.c:81 msgid "Try 'svn revert --depth infinity' instead?" msgstr "Försök med \"svn revert --depth infinity\" istället?" -#: ../svn/shelve-cmd.c:112 +#: ../svn/shelf-cmd.c:56 +#, c-format +msgid "Shelf '%s': no versions found" +msgstr "Hylla \"%s\": inga versioner funna" + +#: ../svn/shelf-cmd.c:144 +msgid "All targets must be in the same WC" +msgstr "Alla mål måste vara i samma arbetskopia" + +#: ../svn/shelf-cmd.c:164 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "för %d dag sedan" +msgstr[1] "för %d dagar sedan" + +#: ../svn/shelf-cmd.c:169 +#, c-format +msgid "%d hour ago" +msgid_plural "%d hours ago" +msgstr[0] "för %d timme sedan" +msgstr[1] "för %d timmar sedan" + +#: ../svn/shelf-cmd.c:174 #, c-format -msgid "Could not run external command '%s'" -msgstr "Kunde inte köra externa kommandot \"%s\"" +msgid "%d minute ago" +msgid_plural "%d minutes ago" +msgstr[0] "för %d minut sedan" +msgstr[1] "för %d minuter sedan" -#: ../svn/shelve-cmd.c:143 +#: ../svn/shelf-cmd.c:233 #, c-format -msgid "%-30s %6d mins old %10ld bytes %4d paths changed\n" -msgstr "%-30s %6d min gammal %10ld byte %4d sökvägar ändrade\n" +msgid "version %d" +msgstr "version %d" -#: ../svn/shelve-cmd.c:147 +#: ../svn/shelf-cmd.c:236 +#, c-format +msgid "version %d of %d" +msgid_plural "version %d of %d" +msgstr[0] "version %d av %d" +msgstr[1] "version %d av %d" + +#: ../svn/shelf-cmd.c:242 +#, c-format +msgid "%d path changed" +msgid_plural "%d paths changed" +msgstr[0] ", %d sökväg ändrade" +msgstr[1] ", %d sökvägar ändrade" + +#: ../svn/shelf-cmd.c:258 #, c-format msgid " %.50s\n" msgstr " %.50s\n" -#: ../svn/shelve-cmd.c:189 -msgid "No shelved changes found" -msgstr "Inga ändringar lagda på hyllan" +#: ../svn/shelf-cmd.c:351 +msgid "No shelves found" +msgstr "Inga hyllor finns" + +#: ../svn/shelf-cmd.c:467 +#, c-format +msgid "--- Save a new version of '%s' in WC root '%s'\n" +msgstr "--- Spara en ny version av \"%s\" i arbetskopians rot \"%s\"\n" + +#: ../svn/shelf-cmd.c:468 +#, c-format +msgid "--- Shelve '%s' in WC root '%s'\n" +msgstr "--- Lägg \"%s\" på hyllan i arbetskopian \"%s\"\n" + +#: ../svn/shelf-cmd.c:483 +#, c-format +msgid "--- Saving...\n" +msgstr "--- Sparar...\n" + +#: ../svn/shelf-cmd.c:484 +#, c-format +msgid "--- Shelving...\n" +msgstr "--- Lägger på hyllan...\n" + +#: ../svn/shelf-cmd.c:496 +#, c-format +msgid "%d path could not be shelved" +msgid_plural "%d paths could not be shelved" +msgstr[0] "%d sökväg kunde inte läggas på hyllan" +msgstr[1] "%d sökvägar kunde inte läggas på hyllan" + +#: ../svn/shelf-cmd.c:506 +#, c-format +msgid "No local modifications could be saved" +msgstr "Inga lokala ändringar kunde sparas" + +#: ../svn/shelf-cmd.c:507 +#, c-format +msgid "No local modifications could be shelved" +msgstr "Inga lokala ändringar kunde läggas på hyllan" + +#: ../svn/shelf-cmd.c:611 +#, c-format +msgid "Shelved path '%s' already has status '%c' in the working copy" +msgstr "Sökvägen \"%s\" på hyllan är redan i redan tillstånd \"%c\" i arbetskopian" + +#: ../svn/shelf-cmd.c:664 +#, c-format +msgid "--- Unshelve '%s' in WC root '%s'\n" +msgstr "--- Ta \"%s\" från hyllan i arbetskopian med rot \"%s\"\n" + +#: ../svn/shelf-cmd.c:672 +msgid "Cannot unshelve/restore, as at least one shelved path would conflict with a local modification or other status in the working copy" +msgstr "Kan inte ta från hyllan eller återställa, eftersom minst en sökväg skulle strida mot en lokal ändring eller annat tillstånd i arbetskopian" + +#: ../svn/shelf-cmd.c:690 +#, c-format +msgid "restored '%s' version %d and deleted %d newer version\n" +msgid_plural "restored '%s' version %d and deleted %d newer versions\n" +msgstr[0] "återställde \"%s\" version %d och raderade %d nyare version\n" +msgstr[1] "återställde \"%s\" version %d och raderade %d nyare versioner\n" + +#: ../svn/shelf-cmd.c:696 +#, c-format +msgid "restored '%s' version %d (the newest version)\n" +msgstr "återställde \"%s\" version %d (senaste versionen)\n" + +#: ../svn/shelf-cmd.c:797 +#, c-format +msgid "deleted '%s'\n" +msgstr "raderade \"%s\"\n" + +#: ../svn/shelf-cmd.c:897 +#, c-format +msgid "saved '%s' version %d\n" +msgstr "sparade \"%s\" version %d\n" -#: ../svn/shelve-cmd.c:285 +#: ../svn/shelf-cmd.c:901 #, c-format -msgid "No changes were shelved" -msgstr "Inga ändringar lades på hyllan" +msgid "shelved '%s' version %d\n" +msgstr "lade \"%s\" version %d på hyllan\n" -#: ../svn/shelve-cmd.c:327 +#: ../svn/shelf-cmd.c:932 #, c-format -msgid "unshelving the youngest change, '%s'\n" -msgstr "tar bort den yngsta ändringen från hyllan, \"%s\"\n" +msgid "unshelving the youngest shelf, '%s'\n" +msgstr "tar bort den yngsta hyllan, \"%s\"\n" + +#: ../svn/shelf-cmd.c:942 ../svn/shelf-cmd.c:1127 ../svnadmin/svnadmin.c:769 +msgid "Too many arguments" +msgstr "För många argument" #: ../svn/status-cmd.c:97 #, c-format @@ -13731,42 +13928,42 @@ msgstr "flyttad från %s" msgid "moved to %s" msgstr "flyttad till %s" -#: ../svn/svn.c:161 +#: ../svn/svn.c:160 msgid "force operation to run" msgstr "tvinga operationen att utföras" -#: ../svn/svn.c:163 +#: ../svn/svn.c:162 msgid "force validity of log message source" msgstr "acceptera alltid det angivna loggmeddelandet" -#: ../svn/svn.c:164 ../svn/svn.c:165 ../svnadmin/svnadmin.c:168 +#: ../svn/svn.c:163 ../svn/svn.c:164 ../svnadmin/svnadmin.c:168 #: ../svnadmin/svnadmin.c:171 ../svnbench/svnbench.c:83 #: ../svnbench/svnbench.c:84 ../svndumpfilter/svndumpfilter.c:944 #: ../svndumpfilter/svndumpfilter.c:947 ../svnfsfs/svnfsfs.c:89 #: ../svnfsfs/svnfsfs.c:92 ../svnlook/svnlook.c:115 ../svnlook/svnlook.c:127 -#: ../svnsync/svnsync.c:284 ../svnsync/svnsync.c:286 +#: ../svnsync/svnsync.c:289 ../svnsync/svnsync.c:291 msgid "show help on a subcommand" msgstr "visa hjälp för ett underkommando" -#: ../svn/svn.c:166 +#: ../svn/svn.c:165 msgid "specify log message ARG" msgstr "ange loggmeddelande ARG" -#: ../svn/svn.c:167 ../svnbench/svnbench.c:85 +#: ../svn/svn.c:166 ../svnbench/svnbench.c:85 msgid "print nothing, or only summary information" msgstr "ingen utmatning, eller bara sammanfattning" -#: ../svn/svn.c:168 ../svnbench/svnbench.c:86 +#: ../svn/svn.c:167 ../svnbench/svnbench.c:86 msgid "descend recursively, same as --depth=infinity" msgstr "gå ner rekursivt, som --depth=infinity" -#: ../svn/svn.c:169 ../svnbench/svnbench.c:87 +#: ../svn/svn.c:168 ../svnbench/svnbench.c:87 msgid "obsolete; try --depth=files or --depth=immediates" msgstr "" "föråldrat; försök med --depth=files\n" " eller --depth=immediates" -#: ../svn/svn.c:171 ../svnbench/svnbench.c:89 +#: ../svn/svn.c:170 ../svnbench/svnbench.c:89 msgid "" "the change made by revision ARG (like -r ARG-1:ARG)\n" " If ARG is negative this is like -r ARG:ARG-1\n" @@ -13779,7 +13976,7 @@ msgstr "" " Om ARG är på formen ARG1-ARG2 så är detta samma\n" " som ARG1:ARG2, där ARG1 ingår" -#: ../svn/svn.c:179 ../svnbench/svnbench.c:97 +#: ../svn/svn.c:178 ../svnbench/svnbench.c:97 msgid "" "ARG (some commands also take ARG1:ARG2 range)\n" " A revision argument can be one of:\n" @@ -13803,41 +14000,41 @@ msgstr "" " arkiveringen vid eller före BASE\n" " \"PREV\" revisionen före COMMITTED" -#: ../svn/svn.c:194 +#: ../svn/svn.c:193 msgid "read log message from file ARG" msgstr "läs loggmeddelande från filen ARG" -#: ../svn/svn.c:196 +#: ../svn/svn.c:195 msgid "give output suitable for concatenation" msgstr "skapa utdata som kan slås ihop" -#: ../svn/svn.c:198 +#: ../svn/svn.c:197 msgid "treat value as being in charset encoding ARG" msgstr "" "betrakta värdet som om det använder\n" " teckenkodningen ARG" -#: ../svn/svn.c:199 ../svnadmin/svnadmin.c:174 ../svnbench/svnbench.c:112 +#: ../svn/svn.c:198 ../svnadmin/svnadmin.c:174 ../svnbench/svnbench.c:112 #: ../svndumpfilter/svndumpfilter.c:950 ../svnfsfs/svnfsfs.c:95 -#: ../svnlook/svnlook.c:179 ../svnrdump/svnrdump.c:134 -#: ../svnserve/svnserve.c:419 ../svnsync/svnsync.c:282 +#: ../svnlook/svnlook.c:179 ../svnrdump/svnrdump.c:140 +#: ../svnserve/svnserve.c:419 ../svnsync/svnsync.c:287 #: ../svnversion/svnversion.c:144 msgid "show program version information" msgstr "visa programversionsinformation" -#: ../svn/svn.c:200 ../svnbench/svnbench.c:113 +#: ../svn/svn.c:199 ../svnbench/svnbench.c:113 msgid "print extra information" msgstr "visa extrainformation" -#: ../svn/svn.c:201 +#: ../svn/svn.c:200 msgid "display update information" msgstr "visa uppdateringsinformation" -#: ../svn/svn.c:202 ../svnbench/svnbench.c:114 ../svnrdump/svnrdump.c:116 +#: ../svn/svn.c:201 ../svnbench/svnbench.c:114 ../svnrdump/svnrdump.c:122 msgid "specify a username ARG" msgstr "ange ett användarnamn ARG" -#: ../svn/svn.c:204 +#: ../svn/svn.c:203 msgid "" "specify a password ARG (caution: on many operating\n" " systems, other users will be able to see this)" @@ -13845,11 +14042,11 @@ msgstr "" "ange lösenordet ARG (varning: på många system\n" " kan andra användare se detta)" -#: ../svn/svn.c:209 ../svnbench/svnbench.c:117 ../svnrdump/svnrdump.c:120 +#: ../svn/svn.c:208 ../svnbench/svnbench.c:117 ../svnrdump/svnrdump.c:126 msgid "read password from stdin" msgstr "läs lösenord från standard in" -#: ../svn/svn.c:211 +#: ../svn/svn.c:210 msgid "" "Specify differencing options for external diff or\n" " internal diff or blame. Default: '-u'. Options are\n" @@ -13877,13 +14074,13 @@ msgstr "" " -U N, --context N: Visa N rader sammanhang\n" " -p, --show-c-function: Visa funktionsnamn i C" -#: ../svn/svn.c:231 ../svnbench/svnbench.c:119 +#: ../svn/svn.c:230 ../svnbench/svnbench.c:119 msgid "pass contents of file ARG as additional args" msgstr "" "använd innehållet i filen ARG som ytterligare\n" " argument" -#: ../svn/svn.c:233 ../svnbench/svnbench.c:121 +#: ../svn/svn.c:232 ../svnbench/svnbench.c:121 msgid "" "limit operation by depth ARG ('empty', 'files',\n" " 'immediates', or 'infinity')" @@ -13891,7 +14088,7 @@ msgstr "" "begränsa kommandot till djupet ARG (\"empty\",\n" " \"files\", \"immediates\" eller \"infinity\")" -#: ../svn/svn.c:237 +#: ../svn/svn.c:236 msgid "" "set new working copy depth to ARG ('exclude',\n" " 'empty', 'files', 'immediates', or 'infinity')" @@ -13899,19 +14096,19 @@ msgstr "" "sätt arbetskopians djup till ARG (\"exclude\",\n" " \"empty\", \"files\", \"immediates\" eller \"infinity\")" -#: ../svn/svn.c:240 ../svnlook/svnlook.c:182 +#: ../svn/svn.c:239 ../svnlook/svnlook.c:182 msgid "output in XML" msgstr "visa information som XML" -#: ../svn/svn.c:241 +#: ../svn/svn.c:240 msgid "DEPRECATED" msgstr "FÖRÅLDRAT" -#: ../svn/svn.c:243 ../svnbench/svnbench.c:126 +#: ../svn/svn.c:242 ../svnbench/svnbench.c:126 msgid "do not cross copies while traversing history" msgstr "följ inte kopieringar när historiken gås igenom" -#: ../svn/svn.c:245 +#: ../svn/svn.c:244 msgid "" "disregard default and svn:ignore and\n" " svn:global-ignores property ignores" @@ -13919,12 +14116,12 @@ msgstr "" "bortse ifrån svn:ignore, svn:global-ignores och\n" " standarduteslutningar" -#: ../svn/svn.c:249 ../svnbench/svnbench.c:128 ../svnrdump/svnrdump.c:130 -#: ../svnsync/svnsync.c:198 +#: ../svn/svn.c:248 ../svnbench/svnbench.c:128 ../svnrdump/svnrdump.c:136 +#: ../svnsync/svnsync.c:203 msgid "do not cache authentication tokens" msgstr "spara inte autentiseringsinformation" -#: ../svn/svn.c:251 ../svnbench/svnbench.c:130 ../svnrdump/svnrdump.c:144 +#: ../svn/svn.c:250 ../svnbench/svnbench.c:130 ../svnrdump/svnrdump.c:150 msgid "" "deprecated; same as\n" " --trust-server-cert-failures=unknown-ca" @@ -13932,7 +14129,7 @@ msgstr "" "föråldrat; samma som\n" " --trust-server-cert-failures=unknown-ca" -#: ../svn/svn.c:255 ../svnbench/svnbench.c:134 ../svnrdump/svnrdump.c:148 +#: ../svn/svn.c:254 ../svnbench/svnbench.c:134 ../svnrdump/svnrdump.c:154 msgid "" "with --non-interactive, accept SSL server\n" " certificates with failures; ARG is comma-separated\n" @@ -13949,7 +14146,7 @@ msgstr "" " certifikat), \"not-yet-valid\" (certifikatet ännu\n" " ej giltigt) och \"other\" (alla andra fel)." -#: ../svn/svn.c:269 ../svnrdump/svnrdump.c:122 ../svnsync/svnsync.c:190 +#: ../svn/svn.c:268 ../svnrdump/svnrdump.c:128 ../svnsync/svnsync.c:195 msgid "" "do no interactive prompting (default is to prompt\n" " only if standard input is a terminal device)" @@ -13957,7 +14154,7 @@ msgstr "" "ingen interaktiv fråga (vanligtvis ställs frågor\n" " bara om standardinmatningen är en terminal)" -#: ../svn/svn.c:273 ../svnrdump/svnrdump.c:126 ../svnsync/svnsync.c:194 +#: ../svn/svn.c:272 ../svnrdump/svnrdump.c:132 ../svnsync/svnsync.c:199 msgid "" "do interactive prompting even if standard input\n" " is not a terminal device" @@ -13965,59 +14162,59 @@ msgstr "" "ställ interaktiva frågor även om\n" " standardinmatningen inte är en terminal" -#: ../svn/svn.c:277 +#: ../svn/svn.c:276 msgid "try operation but make no changes" msgstr "testa operationen, men gör inga ändringar" -#: ../svn/svn.c:279 +#: ../svn/svn.c:278 msgid "disable merge tracking; diff nodes as if related" msgstr "" "stäng av sammanslagningsföljning; jämför som om\n" " noderna var besläktade" -#: ../svn/svn.c:281 +#: ../svn/svn.c:280 msgid "ignore externals definitions" msgstr "bortse ifrån externals-definitioner" -#: ../svn/svn.c:282 +#: ../svn/svn.c:281 msgid "use ARG as merge command" msgstr "använd ARG som merge-kommando" -#: ../svn/svn.c:283 +#: ../svn/svn.c:282 msgid "use ARG as external editor" msgstr "använd ARG som extern editor" -#: ../svn/svn.c:285 +#: ../svn/svn.c:284 msgid "merge only mergeinfo differences" msgstr "" "slå bara ihop skillnader i\n" " sammanslagningsinformationen" -#: ../svn/svn.c:286 +#: ../svn/svn.c:285 msgid "use ARG as the older target" msgstr "använd ARG som det äldre målet" -#: ../svn/svn.c:287 +#: ../svn/svn.c:286 msgid "use ARG as the newer target" msgstr "använd ARG som det nyare målet" -#: ../svn/svn.c:289 +#: ../svn/svn.c:288 msgid "operate on a revision property (use with -r)" msgstr "arbeta med en revisionsegenskap (används med -r)" -#: ../svn/svn.c:290 +#: ../svn/svn.c:289 msgid "relocate via URL-rewriting" msgstr "omlokalisera genom att skriva om URL:er" -#: ../svn/svn.c:292 ../svnadmin/svnadmin.c:221 ../svnbench/svnbench.c:150 -#: ../svnrdump/svnrdump.c:114 ../svnsync/svnsync.c:248 +#: ../svn/svn.c:291 ../svnadmin/svnadmin.c:221 ../svnbench/svnbench.c:150 +#: ../svnrdump/svnrdump.c:120 ../svnsync/svnsync.c:253 msgid "read user configuration files from directory ARG" msgstr "" "läs användarens konfigurationsfiler från katalogen\n" " ARG" -#: ../svn/svn.c:294 ../svnbench/svnbench.c:152 ../svnrdump/svnrdump.c:136 -#: ../svnsync/svnsync.c:250 +#: ../svn/svn.c:293 ../svnbench/svnbench.c:152 ../svnrdump/svnrdump.c:142 +#: ../svnsync/svnsync.c:255 msgid "" "set user configuration option in the format:\n" " FILE:SECTION:OPTION=[VALUE]\n" @@ -14029,15 +14226,15 @@ msgstr "" " Till exempel:\n" " servers:global:http-library=serf" -#: ../svn/svn.c:301 +#: ../svn/svn.c:300 msgid "enable automatic properties" msgstr "aktivera automatiska egenskaper" -#: ../svn/svn.c:302 +#: ../svn/svn.c:301 msgid "disable automatic properties" msgstr "deaktivera automatiska egenskaper" -#: ../svn/svn.c:304 +#: ../svn/svn.c:303 msgid "" "use a different EOL marker than the standard\n" " system marker for files with the svn:eol-style\n" @@ -14049,39 +14246,39 @@ msgstr "" " \"eol-style\" satt till \"native\". ARG kan vara\n" " något av \"LF\", \"CR\" och \"CRLF\"" -#: ../svn/svn.c:311 ../svnbench/svnbench.c:159 +#: ../svn/svn.c:310 ../svnbench/svnbench.c:159 msgid "maximum number of log entries" msgstr "maximalt antal loggposter" -#: ../svn/svn.c:312 +#: ../svn/svn.c:311 msgid "don't unlock the targets" msgstr "lås inte upp målen" -#: ../svn/svn.c:313 +#: ../svn/svn.c:312 msgid "remove changelist association" msgstr "ta bort koppling till ändringslista" -#: ../svn/svn.c:315 +#: ../svn/svn.c:314 msgid "operate only on members of changelist ARG" msgstr "arbeta endast med medlemmar av ändringslistan ARG" -#: ../svn/svn.c:317 +#: ../svn/svn.c:316 msgid "don't delete changelists after commit" msgstr "ta inte bort ändringslistor efter arkivering" -#: ../svn/svn.c:318 +#: ../svn/svn.c:317 msgid "keep path in working copy" msgstr "behåll sökväg i arbetskopia" -#: ../svn/svn.c:320 ../svnbench/svnbench.c:161 +#: ../svn/svn.c:319 ../svnbench/svnbench.c:161 msgid "retrieve all revision properties" msgstr "hämta alla revisionsegenskaper" -#: ../svn/svn.c:322 ../svnbench/svnbench.c:163 +#: ../svn/svn.c:321 ../svnbench/svnbench.c:163 msgid "retrieve no revision properties" msgstr "hämta inga revisionsegenskaper" -#: ../svn/svn.c:324 ../svnbench/svnbench.c:165 +#: ../svn/svn.c:323 ../svnbench/svnbench.c:165 msgid "" "set revision property ARG in new revision\n" " using the name[=value] format" @@ -14089,11 +14286,11 @@ msgstr "" "sätt revisionsegenskapen ARG i ny revision\n" " på formatet namn[=värde]" -#: ../svn/svn.c:327 +#: ../svn/svn.c:326 msgid "make intermediate directories" msgstr "skapa mellanliggande kataloger" -#: ../svn/svn.c:329 ../svnbench/svnbench.c:169 +#: ../svn/svn.c:328 ../svnbench/svnbench.c:169 msgid "" "use/display additional information from merge\n" " history" @@ -14101,7 +14298,7 @@ msgstr "" "använd/visa ytterligare information från\n" " sammanslagningshistoriken" -#: ../svn/svn.c:333 +#: ../svn/svn.c:332 msgid "" "specify automatic conflict resolution action\n" " ('postpone', 'working', 'base', 'mine-conflict',\n" @@ -14116,7 +14313,7 @@ msgstr "" " (förkortningar: \"p\", \"mc\", \"tc\", \"mf\", \"tf\",\n" " \"e\", \"l\", \"r\")" -#: ../svn/svn.c:344 +#: ../svn/svn.c:343 msgid "" "specify which collection of revisions to display\n" " ('merged', 'eligible')" @@ -14124,11 +14321,11 @@ msgstr "" "ange slag av revisioner att visa\n" " (\"merged\", \"eligible\")" -#: ../svn/svn.c:348 +#: ../svn/svn.c:347 msgid "deprecated" msgstr "avrådes" -#: ../svn/svn.c:350 +#: ../svn/svn.c:349 msgid "" "number of leading path components to strip from\n" " paths parsed from the patch file. --strip 0\n" @@ -14148,67 +14345,67 @@ msgstr "" " Katalogseparatorn är \"/\" på alla plattformar.\n" " Ett \"/\" i början räknas som en katalog." -#: ../svn/svn.c:366 +#: ../svn/svn.c:365 msgid "don't expand keywords" msgstr "expandera inte nyckelord" -#: ../svn/svn.c:368 +#: ../svn/svn.c:367 msgid "apply the unidiff in reverse" msgstr "anbringa unidiffen baklänges" -#: ../svn/svn.c:370 +#: ../svn/svn.c:369 msgid "ignore whitespace during pattern matching" msgstr "strunta i tomrum vid mönstermatchning" -#: ../svn/svn.c:371 +#: ../svn/svn.c:370 msgid "produce diff output" msgstr "utdata i form av skillnader" #. maps to show_diff #. diff options -#: ../svn/svn.c:373 ../svnlook/svnlook.c:139 +#: ../svn/svn.c:372 ../svnlook/svnlook.c:139 msgid "use ARG as diff command" msgstr "använd ARG som diff-kommando" -#: ../svn/svn.c:375 +#: ../svn/svn.c:374 msgid "override diff-cmd specified in config file" msgstr "kringgå \"diff-cmd\" angiven i inställningsfilen" -#: ../svn/svn.c:377 ../svnlook/svnlook.c:133 +#: ../svn/svn.c:376 ../svnlook/svnlook.c:133 msgid "do not print differences for added files" msgstr "visa inte skillnader för tillagda filer" -#: ../svn/svn.c:379 ../svnlook/svnlook.c:136 +#: ../svn/svn.c:378 ../svnlook/svnlook.c:136 msgid "do not print differences for deleted files" msgstr "visa inte skillnader för raderade filer" -#: ../svn/svn.c:381 +#: ../svn/svn.c:380 msgid "don't diff copied or moved files with their source" msgstr "" "jämför inte kopierade eller flyttade filer\n" " med deras källa" -#: ../svn/svn.c:383 +#: ../svn/svn.c:382 msgid "diff unrelated nodes as delete and add" msgstr "jämför obesläktade noder som radering och tillägg" -#: ../svn/svn.c:384 +#: ../svn/svn.c:383 msgid "show a summary of the results" msgstr "visa en sammanfattning av resultatet" -#: ../svn/svn.c:386 +#: ../svn/svn.c:385 msgid "use git's extended diff format" msgstr "använd git:s utökade format" -#: ../svn/svn.c:388 ../svnlook/svnlook.c:142 +#: ../svn/svn.c:387 ../svnlook/svnlook.c:142 msgid "ignore properties during the operation" msgstr "strunta i egenskaper" -#: ../svn/svn.c:390 ../svnlook/svnlook.c:145 +#: ../svn/svn.c:389 ../svnlook/svnlook.c:145 msgid "show only properties during the operation" msgstr "visa endast egenskaper" -#: ../svn/svn.c:392 +#: ../svn/svn.c:391 msgid "" "generate diff suitable for generic third-party\n" " patch tools; currently the same as\n" @@ -14218,7 +14415,7 @@ msgstr "" " patch-verktyg; för närvarande samma som\n" " \"--show-copies-as-adds --ignore-properties\"" -#: ../svn/svn.c:400 +#: ../svn/svn.c:399 msgid "" "Allow operation on mixed-revision working copy.\n" " Use of this option is not recommended!\n" @@ -14228,7 +14425,7 @@ msgstr "" " Användning av denna flagga rekommenderas inte!\n" " Kör \"svn update\" istället." -#: ../svn/svn.c:406 +#: ../svn/svn.c:405 msgid "" "also operate on externals defined by\n" " svn:externals properties" @@ -14236,11 +14433,11 @@ msgstr "" "verka även på externa objekt\n" " definierade av egenskaperna svn:externals" -#: ../svn/svn.c:410 +#: ../svn/svn.c:409 msgid "retrieve properties set on parents of the target" msgstr "hämta egenskaper satta på målets föräldrar" -#: ../svn/svn.c:412 +#: ../svn/svn.c:411 msgid "" "use ARG as search pattern (glob syntax, case-\n" " and accent-insensitive, may require quotation marks\n" @@ -14251,31 +14448,31 @@ msgstr "" " behöva citattecken för att hindra expansion i\n" " skalet)" -#: ../svn/svn.c:418 +#: ../svn/svn.c:417 msgid "combine ARG with the previous search pattern" msgstr "kombinera ARG med föregående sökmönster" -#: ../svn/svn.c:420 +#: ../svn/svn.c:419 msgid "show revision log message, author and date" msgstr "visa loggmeddelande, författare och datum" -#: ../svn/svn.c:422 +#: ../svn/svn.c:421 msgid "remove unversioned items" msgstr "visa icke versionshanterade objekt" -#: ../svn/svn.c:423 +#: ../svn/svn.c:422 msgid "remove ignored items" msgstr "ta bort ej beaktade objekt" -#: ../svn/svn.c:424 ../svnlook/svnlook.c:155 ../svnversion/svnversion.c:140 +#: ../svn/svn.c:423 ../svnlook/svnlook.c:155 ../svnversion/svnversion.c:140 msgid "do not output the trailing newline" msgstr "skriv inte ut det avslutande radslutet" -#: ../svn/svn.c:425 +#: ../svn/svn.c:424 msgid "show cached passwords" msgstr "visa cachade lösenord" -#: ../svn/svn.c:427 +#: ../svn/svn.c:426 msgid "" "pin externals with no explicit revision to their\n" " current revision (recommended when tagging)" @@ -14284,7 +14481,7 @@ msgstr "" " vid deras nuvarande revision (rekommenderas\n" " vid märkning)" -#: ../svn/svn.c:431 +#: ../svn/svn.c:430 msgid "" "print only the item identified by ARG:\n" " 'kind' node kind of TARGET\n" @@ -14302,7 +14499,9 @@ msgid "" " date of 'last-changed-revision'\n" " 'last-changed-author'\n" " author of 'last-changed-revision'\n" -" 'wc-root' root of TARGET's working copy" +" 'wc-root' root of TARGET's working copy\n" +" 'schedule' 'normal','add','delete','replace'\n" +" 'depth' checkout depth of TARGET in WC" msgstr "" "visa bara elementet namngivet av ARG:\n" " \"kind\" MÅLets nodtyp\n" @@ -14319,9 +14518,13 @@ msgstr "" " datum för \"last-changed-revision\"\n" " \"last-changed-author\"\n" " författare till \"last-changed-revision\"\n" -" \"wc-root\" rot för MÅLets arbetskopia" +" \"wc-root\" rot för MÅLets arbetskopia\n" +" \"schedule\" \"normal\", \"add\", \"delete\",\n" +" \"replace\"\n" +" \"depth\" hämtningsdjup av MÅL i\n" +" arbetskopia" -#: ../svn/svn.c:466 +#: ../svn/svn.c:469 msgid "" "Local additions are merged with incoming additions\n" " instead of causing a tree conflict. Use of this\n" @@ -14333,25 +14536,25 @@ msgstr "" " väljare rekommenderas inte! Använd \"svn resolve\"\n" " för att lösa trädkonflikter istället." -#: ../svn/svn.c:475 +#: ../svn/svn.c:478 msgid "remove unreferenced pristines from .svn directory" msgstr "" "ta bort orörda filer som inte används\n" " från .svn-katalogen" -#: ../svn/svn.c:477 -msgid "list shelved patches" -msgstr "lista patchar på hyllan" - -#: ../svn/svn.c:478 -msgid "do not delete the shelved patch" -msgstr "radera inte patchen på hyllan" +#: ../svn/svn.c:481 +msgid "drop shelf after successful unshelve" +msgstr "ta bort hyllan efter lyckad återställning" -#: ../svn/svn.c:479 -msgid "delete the shelved patch" -msgstr "radera patchen på hyllan" +#: ../svn/svn.c:484 +msgid "" +"print the working copy layout, formatted according\n" +" to ARG: 'classic' or 'svn11'" +msgstr "" +"visa arbetskopians omfattning, formaterad enligt\n" +" ARG: \"classic\" eller \"svn11\"" -#: ../svn/svn.c:529 +#: ../svn/svn.c:536 msgid "" "Put files and directories under version control, scheduling\n" "them for addition to repository. They will be added in next commit.\n" @@ -14361,16 +14564,24 @@ msgstr "" "läggas till i arkivet. De kommer att läggas till vid nästa arkivering.\n" "användning: add PATH...\n" -#: ../svn/svn.c:534 +#: ../svn/svn.c:542 msgid "add intermediate parents" msgstr "skapa mellanliggande föräldrakataloger" -#: ../svn/svn.c:537 +#: ../svn/svn.c:545 msgid "" "Manage cached authentication credentials.\n" "usage: 1. svn auth [PATTERN ...]\n" "usage: 2. svn auth --remove PATTERN [PATTERN ...]\n" "\n" +msgstr "" +"Hantera cachade autentiseringsreferenser.\n" +"användning: 1. svn auth [MÖNSTER ...]\n" +"användning: 2. svn auth --remove MÖNSTER [MÖNSTER ...]\n" +"\n" + +#: ../svn/svn.c:549 +msgid "" " With no arguments, list all cached authentication credentials.\n" " Authentication credentials include usernames, passwords,\n" " SSL certificates, and SSL client-certificate passphrases.\n" @@ -14378,6 +14589,17 @@ msgid "" " or more patterns. With the --remove option, remove cached authentication\n" " credentials matching one or more patterns.\n" "\n" +msgstr "" +" Utan argument, lista alla cachade autentiseringsreferenser.\n" +" Autentiseringsreferenser omfattar användarnamn, lösenord, SSL-certifikat,\n" +" och lösenordsfraser för SSL-klientreferenser.\n" +" Om MÖNSTER angivits, lista bara referenser med attribut som motsvarar\n" +" ett eller flera mönster. Med väljaren --remove, ta bort cachade\n" +" autentiseringsreferenser som motsvarar ett eller flera mönster.\n" +"\n" + +#: ../svn/svn.c:556 +msgid "" " If more than one pattern is specified credentials are considered only if they\n" " match all specified patterns. Patterns are matched case-sensitively and may\n" " contain glob wildcards:\n" @@ -14388,17 +14610,6 @@ msgid "" " command line because many command shells will interfere by trying to\n" " expand them.\n" msgstr "" -"Hantera cachade autentiseringsreferenser.\n" -"användning: 1. svn auth [MÖNSTER ...]\n" -"användning: 2. svn auth --remove MÖNSTER [MÖNSTER ...]\n" -"\n" -" Utan argument, lista alla cachade autentiseringsreferenser.\n" -" Autentiseringsreferenser omfattar användarnamn, lösenord, SSL-certifikat,\n" -" och lösenordsfraser för SSL-klientreferenser.\n" -" Om MÖNSTER angivits, lista bara referenser med attribut som motsvarar\n" -" ett eller flera mönster. Med väljaren --remove, ta bort cachade\n" -" autentiseringsreferenser som motsvarar ett eller flera mönster.\n" -"\n" " Om mer än ett mönster angivits så beaktas bara referenser som motsvarar alla\n" " angivna mönster. Mönster är skiftlägesokänsliga och kan innehålla\n" " jokertecken:\n" @@ -14408,68 +14619,89 @@ msgstr "" " Observera att jokertecken vanligtvis behöver citeras på kommandoraden\n" " eftersom många kommandoskal annars försöker expandera dem.\n" -#: ../svn/svn.c:558 +#: ../svn/svn.c:567 msgid "remove matching authentication credentials" msgstr "ta bort motsvarande autentiseringsreferenser" -#: ../svn/svn.c:563 +#: ../svn/svn.c:572 msgid "" "Show when each line of a file was last (or\n" "next) changed.\n" "usage: blame [-rM:N] TARGET[@REV]...\n" "\n" +msgstr "" +"Visa när varje rad i en fil senast\n" +"ändrades, eller när den ändras därefter.\n" +"användning: blame [-rM:N] MÅL[@REV]...\n" +"\n" + +#: ../svn/svn.c:576 +msgid "" " Annotate each line of a file with the revision number and author of the\n" " last change (or optionally the next change) to that line.\n" "\n" +msgstr "" +" Kommentera varje rad i en fil med revisionsnumret och författaren till\n" +" den senaste ändringen (eller nästa ändring) av raden.\n" +"\n" + +#: ../svn/svn.c:579 ../svnbench/svnbench.c:222 +msgid "" " With no revision range (same as -r0:REV), or with '-r M:N' where M < N,\n" " annotate each line that is present in revision N of the file, with\n" " the last revision at or before rN that changed or added the line,\n" " looking back no further than rM.\n" "\n" +msgstr "" +" Utan revisionsintervall (samma som -r0:REV), eller med \"-r M:N\" där M < N,\n" +" kommentera varje rad som finns i revision N av filen, med den senaste\n" +" revisionen i eller före rN som ändrade eller lade till raden, utan att\n" +" gå längre bakåt i tiden än rM.\n" +"\n" + +#: ../svn/svn.c:584 ../svnbench/svnbench.c:227 +msgid "" " With a reverse revision range '-r M:N' where M > N,\n" " annotate each line that is present in revision N of the file, with\n" " the next revision after rN that changed or deleted the line,\n" " looking forward no further than rM.\n" "\n" -" If specified, REV determines in which revision the target is first\n" -" looked up.\n" -"\n" -" Write the annotated result to standard output.\n" msgstr "" -"Visa när varje rad i en fil senast\n" -"ändrades, eller när den ändras därefter.\n" -"användning: blame [-rM:N] MÅL[@REV]...\n" -"\n" -" Kommentera varje rad i en fil med revisionsnumret och författaren till\n" -" den senaste ändringen (eller nästa ändring) av raden.\n" -"\n" -" Utan revisionsintervall (samma som -r0:REV), eller med \"-r M:N\" där M < N,\n" -" kommentera varje rad som finns i revision N av filen, med den senaste\n" -" revisionen i eller före rN som ändrade eller lade till raden, utan att\n" -" gå längre bakåt i tiden än rM.\n" -"\n" " Med ett bakvänt revisionsintervall \"-r M:N\" där M > N, kommentera varje rad\n" " som finns i revision N av filen, med nästa revision efter rN som ändrade\n" " eller raderade raden, utan att gå längre framåt i tiden än rM.\n" "\n" + +#: ../svn/svn.c:589 ../svnbench/svnbench.c:232 +msgid "" +" If specified, REV determines in which revision the target is first\n" +" looked up.\n" +"\n" +msgstr "" " Om REV anges, bestämmer den i vilken revision målet först letas upp.\n" "\n" -" Det kommenterade resultatet skrivs till standardutmatningen.\n" -#: ../svn/svn.c:587 +#: ../svn/svn.c:592 ../svnbench/svnbench.c:235 +msgid " Write the annotated result to standard output.\n" +msgstr " Det kommenterade resultatet skrivs till standardutmatningen.\n" + +#: ../svn/svn.c:597 msgid "" "Output the content of specified files or URLs.\n" "usage: cat TARGET[@REV]...\n" "\n" -" If specified, REV determines in which revision the target is first\n" -" looked up.\n" msgstr "" "Visa innehållet i angivna filer eller URL:er.\n" "användning: cat MÅL[@REV]...\n" "\n" -" Om REV anges, bestämmer den i vilken revision målet först letas upp.\n" -#: ../svn/svn.c:595 +#: ../svn/svn.c:600 +msgid "" +" If specified, REV determines in which revision the target is first\n" +" looked up.\n" +msgstr " Om REV anges, bestämmer den i vilken revision målet först letas upp.\n" + +#: ../svn/svn.c:606 msgid "" "Associate (or dissociate) changelist CLNAME with the named files.\n" "usage: 1. changelist CLNAME PATH...\n" @@ -14480,19 +14712,40 @@ msgstr "" "användning: 1. changelist ÄLNAMN SÖKVÄG...\n" " 2. changelist --remove SÖKVÄG...\n" -#: ../svn/svn.c:601 +#: ../svn/svn.c:613 msgid "" "Check out a working copy from a repository.\n" "usage: checkout URL[@REV]... [PATH]\n" "\n" +msgstr "" +"Checka ut en arbetskopia från ett arkiv.\n" +"användning: checkout URL[@REV]... [SÖKVÄG]\n" +"\n" + +#: ../svn/svn.c:616 +msgid "" " If specified, REV determines in which revision the URL is first\n" " looked up.\n" "\n" +msgstr "" +" Om REV anges, bestämmer den i vilken revision målet först letas upp.\n" +"\n" + +#: ../svn/svn.c:619 +msgid "" " If PATH is omitted, the basename of the URL will be used as\n" " the destination. If multiple URLs are given each will be checked\n" " out into a sub-directory of PATH, with the name of the sub-directory\n" " being the basename of the URL.\n" "\n" +msgstr "" +" Om SÖKVÄG utelämnas, används URL:s basnamn som destination. Om flera\n" +" URL:er anges, kommer varje URL att checkas ut i en underkatalog till\n" +" SÖKVÄG som får URL:ens basnamn som katalognamn.\n" +"\n" + +#: ../svn/svn.c:624 +msgid "" " If --force is used, unversioned obstructing paths in the working\n" " copy destination do not automatically cause the check out to fail.\n" " If the obstructing path is the same type (file or directory) as the\n" @@ -14504,18 +14757,7 @@ msgid "" " to the working copy. All properties from the repository are applied\n" " to the obstructing path.\n" "\n" -" See also 'svn help update' for a list of possible characters\n" -" reporting the action taken.\n" msgstr "" -"Checka ut en arbetskopia från ett arkiv.\n" -"användning: checkout URL[@REV]... [SÖKVÄG]\n" -"\n" -" Om den anges, bestämmer REV i vilken revision URL först letas upp.\n" -"\n" -" Om SÖKVÄG utelämnas, används URL:s basnamn som destination. Om flera\n" -" URL:er anges, kommer varje URL att checkas ut i en underkatalog till\n" -" SÖKVÄG som får URL:ens basnamn som katalognamn.\n" -"\n" " Om --force används, orsakar icke versionshanterade sökvägar som är i\n" " vägen inte automatiskt att utcheckningen misslyckas vid försök att lägga till\n" " dem. Om sökvägen som är i vägen är av samma typ (fil eller katalog)\n" @@ -14527,10 +14769,16 @@ msgstr "" " ändringar i arbetskopian. Samtliga egenskaper i arkivet läggs till för\n" " sökvägar som är i vägen.\n" "\n" + +#: ../svn/svn.c:635 +msgid "" +" See also 'svn help update' for a list of possible characters\n" +" reporting the action taken.\n" +msgstr "" " Se även \"svn help update\" för en lista av möjliga tecken i rapporten\n" " om vilken åtgärd som utfördes.\n" -#: ../svn/svn.c:628 +#: ../svn/svn.c:641 msgid "" "Either recover from an interrupted operation that left the working copy locked,\n" "or remove unwanted files.\n" @@ -14539,25 +14787,6 @@ msgid "" " cleanup --remove-ignored [WCPATH...]\n" " 3. cleanup --vacuum-pristines [WCPATH...]\n" "\n" -" 1. When none of the options --remove-unversioned, --remove-ignored, and\n" -" --vacuum-pristines is specified, remove all write locks (shown as 'L' by\n" -" the 'svn status' command) from the working copy. Usually, this is only\n" -" necessary if a Subversion client has crashed while using the working copy,\n" -" leaving it in an unusable state.\n" -"\n" -" WARNING: There is no mechanism that will protect write locks still\n" -" being used by other Subversion clients. Running this command\n" -" without any options while another client is using the working\n" -" copy can corrupt the working copy beyond repair!\n" -"\n" -" 2. If the --remove-unversioned option or the --remove-ignored option\n" -" is given, remove any unversioned or ignored items within WCPATH.\n" -" Note that the 'svn status' command shows unversioned items as '?',\n" -" and ignored items as 'I' if the --no-ignore option is given to it.\n" -"\n" -" 3. If the --vacuum-pristines option is given, remove pristine copies of\n" -" files which are stored inside the .svn directory and which are no longer\n" -" referenced by any file in the working copy.\n" msgstr "" "Återställ efter en avbruten operation som försatte arbetskopian i lås,\n" "eller ta bort oönskade filer.\n" @@ -14566,61 +14795,115 @@ msgstr "" " cleanup --remove-ignored [AKSÖKVÄG...]\n" " 3. cleanup --vacuum-pristines [AKSÖKVÄG...]\n" "\n" + +#: ../svn/svn.c:648 +msgid "" +" 1. When none of the options --remove-unversioned, --remove-ignored, and\n" +" --vacuum-pristines is specified, remove all write locks (shown as 'L' by\n" +" the 'svn status' command) from the working copy. Usually, this is only\n" +" necessary if a Subversion client has crashed while using the working copy,\n" +" leaving it in an unusable state.\n" +"\n" +msgstr "" " 1. Utan väljarna --remove-unversioned, --remove-ignored och\n" " --vacuum-pristines, ta bort alla skrivlås (visade som \"L\" av kommandot\n" " \"svn status\") från arbetskopian. Detta behövs oftast bara om en\n" " Subversionklient kraschade när arbetskopian användes och denna fastnade\n" " i ett oanvändbart tillstånd.\n" "\n" + +#: ../svn/svn.c:654 +msgid "" +" WARNING: There is no mechanism that will protect write locks still\n" +" being used by other Subversion clients. Running this command\n" +" without any options while another client is using the working\n" +" copy can corrupt the working copy beyond repair!\n" +"\n" +msgstr "" " VARNING: Det finns ingen mekanism som skyddar skrivlås som fortfarande\n" " används av en annan Subversionklient. Om detta kommando körs\n" " medan en annan klient använder arbetskopian kan denna förstöras\n" " utan möjlighet till reparation!\n" "\n" + +#: ../svn/svn.c:659 +msgid "" +" 2. If the --remove-unversioned option or the --remove-ignored option\n" +" is given, remove any unversioned or ignored items within WCPATH.\n" +" Note that the 'svn status' command shows unversioned items as '?',\n" +" and ignored items as 'I' if the --no-ignore option is given to it.\n" +"\n" +msgstr "" " 2. Om --remove-unversioned eller --remove-ignored anges, ta bort ej\n" " versionshanterade eller ej beaktade objekt inom AKSÖKVÄG.\n" " Observera att kommandot \"svn status\" visare ej versionshanterade objekt\n" " som \"?\" och ej beaktade objekt som \"I\" om väljaren --no-ignore används.\n" "\n" + +#: ../svn/svn.c:664 +msgid "" +" 3. If the --vacuum-pristines option is given, remove pristine copies of\n" +" files which are stored inside the .svn directory and which are no longer\n" +" referenced by any file in the working copy.\n" +msgstr "" " 3. Om väljaren --vacuum-pristines anges, ta bort orörda kopior av filer\n" " i katalogen \".svn\" som inte längre används av någon fil i arbetskopian.\n" -#: ../svn/svn.c:656 +#: ../svn/svn.c:670 msgid "deprecated and ignored" msgstr "föråldrad och har ingen verkan" -#: ../svn/svn.c:659 +#: ../svn/svn.c:673 msgid "" "Send changes from your working copy to the repository.\n" "usage: commit [PATH...]\n" "\n" -" A log message must be provided, but it can be empty. If it is not\n" -" given by a --message or --file option, an editor will be started.\n" -"\n" -" If any targets are (or contain) locked items, those will be\n" -" unlocked after a successful commit, unless --no-unlock is given.\n" -"\n" -" If --include-externals is given, also commit file and directory\n" -" externals reached by recursion. Do not commit externals with a\n" -" fixed revision.\n" msgstr "" "Skicka ändringar från arbetskopian till arkivet.\n" "användning: commit [SÖKVÄG...]\n" "\n" + +#: ../svn/svn.c:676 +msgid "" +" A log message must be provided, but it can be empty. If it is not\n" +" given by a --message or --file option, an editor will be started.\n" +"\n" +msgstr "" " Ett loggmeddelande måste anges, men det kan vara tomt. Om det inte anges\n" " med en --message- eller --file-flagga, startas en editor.\n" "\n" + +#: ../svn/svn.c:679 +msgid "" +" If any targets are (or contain) locked items, those will be\n" +" unlocked after a successful commit, unless --no-unlock is given.\n" +"\n" +msgstr "" " Om något mål är låst (eller innehåller låsta objekt) kommer dessa att\n" " låsas upp efter en lyckad arkivering, såvida inte --no-unlock anges.\n" "\n" + +#: ../svn/svn.c:682 +msgid "" +" If --include-externals is given, also commit file and directory\n" +" externals reached by recursion. Do not commit externals with a\n" +" fixed revision.\n" +msgstr "" " Om --include-externals anges, arkivera också externa filer och kataloger\n" " som nås rekursivt. Arkivera inte externa objekt med en fixerad revision.\n" -#: ../svn/svn.c:675 +#: ../svn/svn.c:690 msgid "" "Copy files and directories in a working copy or repository.\n" "usage: copy SRC[@REV]... DST\n" "\n" +msgstr "" +"Kopiera filer och kataloger i en arbetskopia eller ett arkiv.\n" +"användning: copy KÄLLA[@REV]... MÅL\n" +"\n" + +#: ../svn/svn.c:693 +msgid "" " SRC and DST can each be either a working copy (WC) path or URL:\n" " WC -> WC: copy and schedule for addition (with history)\n" " WC -> URL: immediately commit a copy of WC to URL\n" @@ -14630,15 +14913,7 @@ msgid "" " the sources will be added as children of DST. When copying multiple\n" " sources, DST must be an existing directory.\n" "\n" -" WARNING: For compatibility with previous versions of Subversion,\n" -" copies performed using two working copy paths (WC -> WC) will not\n" -" contact the repository. As such, they may not, by default, be able\n" -" to propagate merge tracking information from the source of the copy\n" -" to the destination.\n" msgstr "" -"Kopiera filer och kataloger i en arbetskopia eller ett arkiv.\n" -"användning: copy KÄLLA[@REV]... MÅL\n" -"\n" " KÄLLA och MÅL kan vardera vara antingen en sökväg i en arbetskopia (AK)\n" " eller en URL:\n" " AK -> AK: kopiera och schemalägg för tillägg (med historik)\n" @@ -14650,17 +14925,34 @@ msgstr "" " så kommer källorna läggas till som barn till MÅL. När flera källor kopieras\n" " måste MÅL vara en befintlig katalog.\n" "\n" + +#: ../svn/svn.c:702 +msgid "" +" WARNING: For compatibility with previous versions of Subversion,\n" +" copies performed using two working copy paths (WC -> WC) will not\n" +" contact the repository. As such, they may not, by default, be able\n" +" to propagate merge tracking information from the source of the copy\n" +" to the destination.\n" +msgstr "" " VARNING: För kompatibilitet med tidigare versioner av Subversion kommer\n" " arkivet inte kontaktas vid kopiering mellan två arbetskopiesökvägar\n" " (AK -> AK). Därför kommer normalt inte information för sammanslagnings-\n" " följning överföras från kopieringens källa till dess mål.\n" -#: ../svn/svn.c:696 +#: ../svn/svn.c:712 msgid "" "Remove files and directories from version control.\n" "usage: 1. delete PATH...\n" " 2. delete URL...\n" "\n" +msgstr "" +"Radera filer och kataloger från versionshantering.\n" +"användning: 1. delete SÖKVÄG...\n" +" 2. delete URL...\n" +"\n" + +#: ../svn/svn.c:716 +msgid "" " 1. Each item specified by a PATH is scheduled for deletion upon\n" " the next commit. Files, and directories that have not been\n" " committed, are immediately removed from the working copy\n" @@ -14668,13 +14960,7 @@ msgid "" " PATHs that are, or contain, unversioned or modified items will\n" " not be removed unless the --force or --keep-local option is given.\n" "\n" -" 2. Each item specified by a URL is deleted from the repository\n" -" via an immediate commit.\n" msgstr "" -"Radera filer och kataloger från versionshantering.\n" -"användning: 1. delete SÖKVÄG...\n" -" 2. delete URL...\n" -"\n" " 1. Varje objekt som angivits med en sökväg schemaläggs för radering vid\n" " nästa arkivering. Filer och kataloger som aldrig arkiverats tas\n" " genast bort från arbetskopian såvida inte flaggan --keep-local anges.\n" @@ -14682,10 +14968,16 @@ msgstr "" " eller som är ändrade raderas bara om flaggan --force eller\n" " --keep-local används.\n" "\n" + +#: ../svn/svn.c:723 +msgid "" +" 2. Each item specified by a URL is deleted from the repository\n" +" via an immediate commit.\n" +msgstr "" " 2. Varje objekt som anges med en URL raderas från arkivet genom en\n" " omedelbar arkivering.\n" -#: ../svn/svn.c:712 +#: ../svn/svn.c:729 msgid "" "Display local changes or differences between two revisions or paths.\n" "usage: 1. diff\n" @@ -14696,32 +14988,6 @@ msgid "" " 5. diff OLD-URL[@OLDREV] NEW-PATH[@NEWREV]\n" " 6. diff OLD-PATH[@OLDREV] NEW-URL[@NEWREV]\n" "\n" -" 1. Use just 'svn diff' to display local modifications in a working copy.\n" -"\n" -" 2. Display the changes made to TARGETs as they are seen in REV between\n" -" two revisions. TARGETs may be all working copy paths or all URLs.\n" -" If TARGETs are working copy paths, N defaults to BASE and M to the\n" -" working copy; if URLs, N must be specified and M defaults to HEAD.\n" -" The '-c M' option is equivalent to '-r N:M' where N = M-1.\n" -" Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n" -"\n" -" 3. Display the differences between OLD-TGT as it was seen in OLDREV and\n" -" NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n" -" OLD-TGT and NEW-TGT and restrict the output to differences for those\n" -" paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV].\n" -" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV default\n" -" to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n" -" If OLDREV or NEWREV are not specified, they default to WORKING for\n" -" working copy targets and to HEAD for URL targets.\n" -"\n" -" Either or both OLD-TGT and NEW-TGT may also be paths to unversioned\n" -" targets. Revisions cannot be specified for unversioned targets.\n" -" Both targets must be of the same node kind (file or directory).\n" -" Diffing unversioned targets against URL targets is not supported.\n" -"\n" -" 4. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n" -" 5. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-PATH[@NEWREV]'\n" -" 6. Shorthand for 'svn diff --old=OLD-PATH[@OLDREV] --new=NEW-URL[@NEWREV]'\n" msgstr "" "Visa lokala ändringar eller skillnader mellan två revisioner\n" "eller sökvägar.\n" @@ -14733,8 +14999,25 @@ msgstr "" " 5. diff GAMMAL-URL[@GAMMALREV] NY-SÖKVÄG[@NYREV]\n" " 6. diff GAMMAL-SÖKVÄG[@GAMMALREV] NY-URL[@NYREV]\n" "\n" + +#: ../svn/svn.c:738 +msgid "" +" 1. Use just 'svn diff' to display local modifications in a working copy.\n" +"\n" +msgstr "" " 1. Använd bara \"svn diff\" för att visa lokala ändringar i en arbetskopia.\n" "\n" + +#: ../svn/svn.c:740 +msgid "" +" 2. Display the changes made to TARGETs as they are seen in REV between\n" +" two revisions. TARGETs may be all working copy paths or all URLs.\n" +" If TARGETs are working copy paths, N defaults to BASE and M to the\n" +" working copy; if URLs, N must be specified and M defaults to HEAD.\n" +" The '-c M' option is equivalent to '-r N:M' where N = M-1.\n" +" Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n" +"\n" +msgstr "" " 2. Visa ändringarna mellan två revisioner i målen MÅL som de ser ut i\n" " revision REV. Målen kan vara arbetskopior eller URL:er.\n" " Standardvärdet för N är BASE om målen är sökvägar till en\n" @@ -14744,6 +15027,19 @@ msgstr "" " Flaggan \"-c M\" fungerar som \"-r N:M\" där N = M-1.\n" " Det omvända fås med \"-c -M\", dvs \"-r M:N\" där N = M-1.\n" "\n" + +#: ../svn/svn.c:747 +msgid "" +" 3. Display the differences between OLD-TGT as it was seen in OLDREV and\n" +" NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n" +" OLD-TGT and NEW-TGT and restrict the output to differences for those\n" +" paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV].\n" +" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV default\n" +" to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n" +" If OLDREV or NEWREV are not specified, they default to WORKING for\n" +" working copy targets and to HEAD for URL targets.\n" +"\n" +msgstr "" " 3. Visa skillnaden mellan GAMMALT-MÅL som det såg ut i GAMMALREV och\n" " NYTT-MÅL som det såg ut i NYREV. Om en eller flera SÖKVÄGar anges,\n" " ska dessa vara relativa GAMMALT-MÅL och NYTT-MÅL och de begränsar\n" @@ -14755,12 +15051,28 @@ msgstr "" " Om flaggan -r inte anges är standardvärdet för GAMMALREV och NYREV\n" " WORKING för arbetskopior och HEAD för URL:er.\n" "\n" + +#: ../svn/svn.c:756 +msgid "" +" Either or both OLD-TGT and NEW-TGT may also be paths to unversioned\n" +" targets. Revisions cannot be specified for unversioned targets.\n" +" Both targets must be of the same node kind (file or directory).\n" +" Diffing unversioned targets against URL targets is not supported.\n" +"\n" +msgstr "" " GAMMALT-MÅL och/eller NYTT-MÅL kan också vara sökvägar till mål som\n" " inte är versionshanterade. Revisioner kan bara anges för\n" " versionshanterade mål. Båda målen måste vara av samma nodtyp (fil\n" " eller katalog). Att jämföra icke versionshanterade mål mot URL-mål\n" " stöds ej.\n" "\n" + +#: ../svn/svn.c:761 +msgid "" +" 4. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n" +" 5. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-PATH[@NEWREV]'\n" +" 6. Shorthand for 'svn diff --old=OLD-PATH[@OLDREV] --new=NEW-URL[@NEWREV]'\n" +msgstr "" " 4. Kortare sätt att skriva\n" " \"svn diff --old=GAMMAL-URL[@GAMMALREV] --new=NY-URL[@NYREV]\".\n" " 5. Kortare sätt att skriva\n" @@ -14768,44 +15080,55 @@ msgstr "" " 6. Kortare sätt att skriva\n" " \"svn diff --old=GAMMAL-SÖKVÄG[@GAMMALREV] --new=NY-URL[@NYREV]\".\n" -#: ../svn/svn.c:753 +#: ../svn/svn.c:771 msgid "" "Create an unversioned copy of a tree.\n" "usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n" " 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n" "\n" +msgstr "" +"Skapa en icke versionshanterad kopia av ett träd.\n" +"användning: 1. export [-r REV] URL[@FIXREV] [SÖKVÄG]\n" +" 2. export [-r REV] SÖKVÄG1[@FIXREV] [SÖKVÄG2]\n" +"\n" + +#: ../svn/svn.c:775 +msgid "" " 1. Exports a clean directory tree from the repository specified by\n" " URL, at revision REV if it is given, otherwise at HEAD, into\n" " PATH. If PATH is omitted, the last component of the URL is used\n" " for the local directory name.\n" "\n" -" 2. Exports a clean directory tree from the working copy specified by\n" +msgstr "" +" 1. Exporterar ett rent katalogträd från arkivet som anges av URL, vid\n" +" revisionen REV, eller HEAD om REV inte anges, till SÖKVÄG. Om SÖKVÄG\n" +" utelämnas används den sista delen av URL som lokalt katalognamn.\n" +"\n" + +#: ../svn/svn.c:780 +msgid "" +" 2. Exports a clean directory tree from the working copy specified by\n" " PATH1, at revision REV if it is given, otherwise at WORKING, into\n" " PATH2. If PATH2 is omitted, the last component of the PATH1 is used\n" " for the local directory name. If REV is not specified, all local\n" " changes will be preserved. Files not under version control will\n" " not be copied.\n" "\n" -" If specified, PEGREV determines in which revision the target is first\n" -" looked up.\n" msgstr "" -"Skapa en icke versionshanterad kopia av ett träd.\n" -"användning: 1. export [-r REV] URL[@FIXREV] [SÖKVÄG]\n" -" 2. export [-r REV] SÖKVÄG1[@FIXREV] [SÖKVÄG2]\n" -"\n" -" 1. Exporterar ett rent katalogträd från arkivet som anges av URL, vid\n" -" revisionen REV, eller HEAD om REV inte anges, till SÖKVÄG. Om SÖKVÄG\n" -" utelämnas används den sista delen av URL som lokalt katalognamn.\n" -"\n" " 2. Exporterar ett rent katalogträd från arbetskopian SÖKVÄG1, vid revision\n" " REV, eller WORKING om REV inte anges, till SÖKVÄG2. Om PATH2 utelämnas\n" " används den sista delen av PATH1 som lokalt katalognamn. Om REV inte\n" " är angiven kommer lokala ändringar att bevaras, men filer som inte är\n" " versionshanterade kopieras inte.\n" "\n" -" Om FIXREV är angiven, anger den i vilken revision målet först letas upp.\n" -#: ../svn/svn.c:775 ../svnbench/svnbench.c:212 +#: ../svn/svn.c:787 ../svnbench/svnbench.c:246 +msgid "" +" If specified, PEGREV determines in which revision the target is first\n" +" looked up.\n" +msgstr " Om FIXREV är angiven, anger den i vilken revision målet först letas upp.\n" + +#: ../svn/svn.c:794 ../svnbench/svnbench.c:212 msgid "" "Describe the usage of this program or its subcommands.\n" "usage: help [SUBCOMMAND...]\n" @@ -14813,11 +15136,18 @@ msgstr "" "Visa hur detta program eller dess underkommandon används.\n" "användning: help [UNDERKOMMANDO...]\n" -#: ../svn/svn.c:781 +#: ../svn/svn.c:801 msgid "" "Commit an unversioned file or tree into the repository.\n" "usage: import [PATH] URL\n" "\n" +msgstr "" +"Arkivera en icke versionshanterad fil eller katalog.\n" +"användning: import [SÖKVÄG] URL\n" +"\n" + +#: ../svn/svn.c:804 +msgid "" " Recursively commit a copy of PATH to URL.\n" " If PATH is omitted '.' is assumed.\n" " Parent directories are created as necessary in the repository.\n" @@ -14826,9 +15156,6 @@ msgid "" " Unversionable items such as device files and pipes are ignored\n" " if --force is specified.\n" msgstr "" -"Arkivera en icke versionshanterad fil eller katalog.\n" -"användning: import [SÖKVÄG] URL\n" -"\n" " Arkivera en kopia av SÖKVÄG till URL rekursivt.\n" " Om SÖKVÄG utelämnas används \".\". Föräldrakataloger skapas där det behövs\n" " i arkivet.\n" @@ -14836,178 +15163,218 @@ msgstr "" " Objekt som ej kan versionshanteras, såsom enhetsfiler och rörledningar,\n" " hoppas över om --force anges.\n" -#: ../svn/svn.c:795 +#: ../svn/svn.c:816 msgid "" "Display information about a local or remote item.\n" "usage: info [TARGET[@REV]...]\n" "\n" +msgstr "" +"Visa information om en fil eller katalog - lokal eller från ett arkiv.\n" +"användning: info [MÅL[@REV]...]\n" +"\n" + +#: ../svn/svn.c:819 +msgid "" " Print information about each TARGET (default: '.').\n" " TARGET may be either a working-copy path or a URL. If specified, REV\n" " determines in which revision the target is first looked up; the default\n" " is HEAD for a URL or BASE for a WC path.\n" "\n" -" With --show-item, print only the value of one item of information\n" -" about TARGET.\n" msgstr "" -"Visa information om en fil eller katalog - lokal eller från ett arkiv.\n" -"användning: info [MÅL[@REV]...]\n" -"\n" " Skriv ut information om varje angivet MÅL (\".\" om inget anges).\n" " MÅL kan antingen vara en arbetskopia eller en URL. Om REV anges, avgör\n" " den i vilken revision målet letas upp; normalt HEAD för en URL eller BASE\n" " för en sökväg i en arbetskopia.\n" "\n" + +#: ../svn/svn.c:824 +msgid "" +" With --show-item, print only the value of one item of information\n" +" about TARGET.\n" +"\n" +msgstr "" " Med --show-item, skriv bara ut värdet på en specifik sorts information\n" " om MÅL.\n" +"\n" + +#: ../svn/svn.c:827 +msgid "" +" EXPERIMENTAL:\n" +" With --x-viewspec, print the working copy layout.\n" +msgstr "" +" EXPERIMENTELLT:\n" +" Med --x-viewspec, visa arbetskopians omfattning.\n" -#: ../svn/svn.c:812 +#: ../svn/svn.c:838 ../svn/svn.c:864 msgid "" "List directory entries in the repository.\n" "usage: list [TARGET[@REV]...]\n" "\n" +msgstr "" +"Lista kataloginnehåll i arkivet.\n" +"användning: list [MÅL[@REV]...]\n" +"\n" + +#: ../svn/svn.c:841 ../svn/svn.c:867 ../svnbench/svnbench.c:255 +msgid "" " List each TARGET file and the contents of each TARGET directory as\n" " they exist in the repository. If TARGET is a working copy path, the\n" " corresponding repository URL will be used. If specified, REV determines\n" " in which revision the target is first looked up.\n" "\n" +msgstr "" +" Lista varje fil MÅL och innehållet i varje katalog MÅL som de ser ut i\n" +" arkivet. Om MÅL är en sökväg i en arbetskopia, används motsvarande URL\n" +" till arkivet. OM REV anges, avgör den var MÅL först letas upp.\n" +"\n" + +#: ../svn/svn.c:846 ../svn/svn.c:872 ../svnbench/svnbench.c:260 +msgid "" " The default TARGET is '.', meaning the repository URL of the current\n" " working directory.\n" "\n" +msgstr "" +" Standardvärdet för MÅL är \".\", vilket innebär arkiv-URL:en till\n" +" arbetskopian i aktuell katalog.\n" +"\n" + +#: ../svn/svn.c:849 +msgid "" " Multiple --search patterns may be specified and the output will be\n" " reduced to those paths whose last segment - i.e. the file or directory\n" " name - contains a sub-string matching at least one of these patterns\n" " (Windows only).\n" "\n" +msgstr "" +" Flera mönster kan ges med --search och utmatningen begränsas då till\n" +" sökvägarna vars sista komponent, dvs fil- eller katalognamnet, innehåller\n" +" en delsträng som matchar minst ett av dessa mönster (endast Windows).\n" +"\n" + +#: ../svn/svn.c:854 ../svn/svn.c:879 +msgid "" " With --verbose, the following fields will be shown for each item:\n" "\n" +msgstr "" +" Om --verbose används, visas status med följande fält:\n" +"\n" + +#: ../svn/svn.c:856 ../svn/svn.c:881 ../svnbench/svnbench.c:265 +msgid "" " Revision number of the last commit\n" " Author of the last commit\n" " If locked, the letter 'O'. (Use 'svn info URL' to see details)\n" " Size (in bytes)\n" " Date and time of the last commit\n" msgstr "" -"Lista kataloginnehåll i arkivet.\n" -"användning: list [MÅL[@REV]...]\n" -"\n" -" Lista varje fil MÅL och innehållet i varje katalog MÅL som de ser ut i\n" -" arkivet. Om MÅL är en sökväg i en arbetskopia, används motsvarande URL\n" -" till arkivet. OM REV anges, avgör den var MÅL först letas upp.\n" -"\n" -" Standardvärdet för MÅL är \".\", vilket innebär arkiv-URL:en till\n" -" arbetskopian i aktuell katalog.\n" -"\n" -" Flera mönster kan ges med --search och utmatningen begränsas då till\n" -" sökvägarna vars sista komponent, dvs fil- eller katalognamnet, innehåller\n" -" en delsträng som matchar minst ett av dessa mönster (endast Windows).\n" -"\n" -" Om --verbose används, visas status med följande fält:\n" -"\n" " Revisionsnummer för senaste arkiveringen\n" " Författare till senaste arkiveringen\n" " Om filen är låst, bokstaven \"O\". (Använd \"svn info URL\" för mer info)\n" " Storlek (i byte)\n" " Datum och tid för senaste arkiveringen\n" -#: ../svn/svn.c:837 +#: ../svn/svn.c:875 msgid "" -"List directory entries in the repository.\n" -"usage: list [TARGET[@REV]...]\n" -"\n" -" List each TARGET file and the contents of each TARGET directory as\n" -" they exist in the repository. If TARGET is a working copy path, the\n" -" corresponding repository URL will be used. If specified, REV determines\n" -" in which revision the target is first looked up.\n" -"\n" -" The default TARGET is '.', meaning the repository URL of the current\n" -" working directory.\n" -"\n" " Multiple --search patterns may be specified and the output will be\n" " reduced to those paths whose last segment - i.e. the file or directory\n" " name - matches at least one of these patterns.\n" "\n" -" With --verbose, the following fields will be shown for each item:\n" -"\n" -" Revision number of the last commit\n" -" Author of the last commit\n" -" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n" -" Size (in bytes)\n" -" Date and time of the last commit\n" msgstr "" -"Lista kataloginnehåll i arkivet.\n" -"användning: list [MÅL[@REV]...]\n" -"\n" -" Lista varje fil MÅL och innehållet i varje katalog MÅL som de ser ut i\n" -" arkivet. Om MÅL är en sökväg i en arbetskopia, används motsvarande URL\n" -" till arkivet. OM REV anges, avgör den var MÅL först letas upp.\n" -"\n" -" Standardvärdet för MÅL är \".\", vilket innebär arkiv-URL:en till\n" -" arbetskopian i aktuell katalog.\n" -"\n" " Flera mönster kan ges med --search och utmatningen begränsas då till\n" " sökvägarna vars sista komponent, dvs fil- eller katalognamnet, matchar\n" " minst ett av dessa mönster.\n" "\n" -" Om --verbose används, visas status med följande fält:\n" -"\n" -" Revisionsnummer för senaste arkiveringen\n" -" Författare till senaste arkiveringen\n" -" Om filen är låst, bokstaven \"O\". (Använd \"svn info URL\" för mer info)\n" -" Storlek (i byte)\n" -" Datum och tid för senaste arkiveringen\n" -#: ../svn/svn.c:864 +#: ../svn/svn.c:892 msgid "" "Lock working copy paths or URLs in the repository, so that\n" "no other user can commit changes to them.\n" "usage: lock TARGET...\n" "\n" -" Use --force to steal a lock from another user or working copy.\n" msgstr "" "Lås sökvägar till arbetskopior, eller URL:er, i arkivet så att ingen\n" "annan användare kan arkivera ändringar till dem.\n" "användning: lock MÅL...\n" "\n" + +#: ../svn/svn.c:896 +msgid " Use --force to steal a lock from another user or working copy.\n" +msgstr "" " Använd flaggan --force för att stjäla ett lås från en annan användare eller\n" " arbetskopia.\n" -#: ../svn/svn.c:870 +#: ../svn/svn.c:899 msgid "read lock comment from file ARG" msgstr "läs låskommentar från filen ARG" -#: ../svn/svn.c:871 +#: ../svn/svn.c:900 msgid "specify lock comment ARG" msgstr "ange låskommentar ARG" -#: ../svn/svn.c:872 +#: ../svn/svn.c:901 msgid "force validity of lock comment source" msgstr "acceptera alltid den angivna låskommentaren" -#: ../svn/svn.c:873 +#: ../svn/svn.c:902 msgid "steal locks" msgstr "stjäl lås" -#: ../svn/svn.c:876 +#: ../svn/svn.c:905 msgid "" "Show the log messages for a set of revision(s) and/or path(s).\n" "usage: 1. log [PATH][@REV]\n" " 2. log URL[@REV] [PATH...]\n" "\n" +msgstr "" +"Visa loggmeddelanden för revisioner och/eller filer.\n" +"användning: 1. log [SÖKVÄG][@REV]\n" +" 2. log URL[@REV] [SÖKVÄG...]\n" +"\n" + +#: ../svn/svn.c:909 +msgid "" " 1. Print the log messages for the URL corresponding to PATH\n" " (default: '.'). If specified, REV is the revision in which the\n" " URL is first looked up, and the default revision range is REV:1.\n" " If REV is not specified, the default revision range is BASE:1,\n" " since the URL might not exist in the HEAD revision.\n" "\n" +msgstr "" +" 1. Visa loggmeddelanden för URL:en som motsvarar SÖKVÄG (\".\" om ej\n" +" angiven). Om REV anges avgör den var SÖKVÄG letas upp, och standard-\n" +" värdet för revisionsområdet är då REV:1. Annars är standardvärdet\n" +" för revisionsområdet BASE:1 då URL:en kanske inte finns i\n" +" HEAD-revisionen.\n" +"\n" + +#: ../svn/svn.c:915 +msgid "" " 2. Print the log messages for the PATHs (default: '.') under URL.\n" " If specified, REV is the revision in which the URL is first\n" " looked up, and the default revision range is REV:1; otherwise,\n" " the URL is looked up in HEAD, and the default revision range is\n" " HEAD:1.\n" "\n" +msgstr "" +" 2. Visa loggmeddelanden för varje SÖKVÄG (\".\" om ingen angiven) under\n" +" URL. Om REV anges avgör den var SÖKVÄG letas upp, och standardvärdet\n" +" för revisionsområdet är då REV:1. Annars letas URL upp i HEAD och\n" +" standardvärdet för revisionsområdet är HEAD:1.\n" +"\n" + +#: ../svn/svn.c:921 ../svnbench/svnbench.c:290 +msgid "" " Multiple '-c' or '-r' options may be specified (but not a\n" " combination of '-c' and '-r' options), and mixing of forward and\n" " reverse ranges is allowed.\n" "\n" +msgstr "" +" Flaggorna \"-c\" och \"-r\" kan förekomma flera gånger (men inte blandas),\n" +" och det går att blanda områden angivna framlänges och baklänges.\n" +"\n" + +#: ../svn/svn.c:925 +msgid "" " With -v, also print all affected paths with each log message.\n" " Each changed path is preceded with a symbol describing the change:\n" " A: The path was added or copied.\n" @@ -15020,17 +15387,56 @@ msgid "" " the old path will be listed as deleted and the new path will be listed\n" " as copied from the old path at a prior revision.\n" "\n" +msgstr "" +" Om -v används skrivs även alla berörda sökvägar ut med varje loggmeddelande.\n" +" Varje ändrade sökväg föregås av en symbol som beskriver ändringen:\n" +" A: Sökvägen lades till eller kopierades.\n" +" D: Sökvägen raderades.\n" +" R: Sökvägen ersattes (raderades och lades till igen i samma revision).\n" +" M: Sökvägens fil och/eller egenskapsinnehåll ändrades.\n" +" Om en tillagd eller ersatt sökväg kopierades från någon annanstans så\n" +" visas kopians källsökväg och revision inom parenteser.\n" +" Om en fil eller katalog flyttades från en sökväg till en annan med\n" +" \"svn move\" så visas den gamla sökvägen som raderad och den nya som\n" +" kopierad från den gamla sökvägen vid en tidigare revision.\n" +"\n" + +#: ../svn/svn.c:937 +msgid "" " With -q, don't print the log message body itself (note that this is\n" " compatible with -v).\n" "\n" +msgstr "" +" Om -q används, skrivs inte loggmeddelanden ut (kan användas tillsammans med\n" +" -v).\n" +"\n" + +#: ../svn/svn.c:940 +msgid "" " Each log message is printed just once, even if more than one of the\n" " affected paths for that revision were explicitly requested. Logs\n" " follow copy history by default. Use --stop-on-copy to disable this\n" " behavior, which can be useful for determining branchpoints.\n" "\n" +msgstr "" +" Varje loggmeddelande skrivs endast ut en gång, även om flera av de\n" +" berörda sökvägarna angavs explicit. Loggar följer kopieringshistorik som\n" +" standard. Använd --stop-on-copy för att slå av detta, vilket kan vara\n" +" användbart för att avgöra förgreningspunkter.\n" +"\n" + +#: ../svn/svn.c:945 +msgid "" " The --depth option is only valid in combination with the --diff option\n" " and limits the scope of the displayed diff to the specified depth.\n" "\n" +msgstr "" +" Väljaren --depth kan bara användas tillsammans med --diff, och begränsar\n" +" omfattningen av den visade skillnaden till det angivna djupet.\n" +"\n" + +#: ../svn/svn.c:948 +msgid "" " If the --search option is used, log messages are displayed only if the\n" " provided search pattern matches any of the author, date, log message\n" " text (unless --quiet is used), or, if the --verbose option is also\n" @@ -15048,143 +15454,146 @@ msgid "" " number of log messages searched, rather than restricting the output\n" " to a particular number of matching log messages.\n" "\n" +msgstr "" +" Om flaggan --search anges, kommer loggmeddelanden bara visas om sökmönstret\n" +" matchar författaren, datumet, loggmeddelandets (utom med --quiet),\n" +" eller, med --verbose, en ändrad sökväg.\n" +" Sökmönstret kan innehålla jokertecken enligt skalsyntax:\n" +" ? matchar ett godtyckligt enstaka tecken\n" +" * matchar en följd av godtyckliga tecken\n" +" [abc] matchar något av tecknen inom hakparenteserna\n" +" Om flera \"--search\"-flaggor anges kommer ett loggmeddelande visas om\n" +" det matchar något av sökmönstren. Om flaggan --search-and anges,\n" +" så kombineras den flaggans argument med mönstret från föregående --search\n" +" eller --search-and, och ett loggmeddelande visas bara om det matchar det\n" +" kombinerade sökmönstret.\n" +" Om --limit används tillsammans med --search, så kommer --limit begränsa\n" +" antal genomsökta loggmeddelanden och inte antal matchande.\n" +"\n" + +#: ../svn/svn.c:965 +msgid "" " Examples:\n" "\n" +msgstr "" +" Exempel:\n" +"\n" + +#: ../svn/svn.c:967 +msgid "" " Show the latest 5 log messages for the current working copy\n" " directory and display paths changed in each commit:\n" " svn log -l 5 -v\n" "\n" +msgstr "" +" Visa de 5 senaste loggmeddelandena för den aktuella arbetskopians\n" +" katalog och visa sökvägar ändrade i varje arkivering:\n" +" svn log -l 5 -v\n" +"\n" + +#: ../svn/svn.c:971 +msgid "" " Show the log for bar.c as of revision 42:\n" " svn log bar.c@42\n" "\n" +msgstr "" +" Visa loggen för fil.c sådan den var i revision 42:\n" +" svn log fil.c@42\n" +"\n" + +#: ../svn/svn.c:974 +msgid "" " Show log messages and diffs for each commit to foo.c:\n" " svn log --diff http://www.example.com/repo/project/foo.c\n" " (Because the above command uses a full URL it does not require\n" " a working copy.)\n" "\n" +msgstr "" +" Visa loggmeddelanden och skillnader för varje arkivering av fil.c:\n" +" svn log --diff http://www.exempel.se/arkiv/projekt/fil.c\n" +" (Eftersom detta kommando anger en full URL behövs ingen arbetskopia.)\n" +"\n" + +#: ../svn/svn.c:979 +msgid "" " Show log messages for the children foo.c and bar.c of the directory\n" " '/trunk' as it appeared in revision 50, using the ^/ URL shortcut:\n" " svn log ^/trunk@50 foo.c bar.c\n" "\n" +msgstr "" +" Visa loggmeddelanden för filerna adam.c och bertil.c i katalogen\n" +" \"/trunk\" sådan den var i revision 50, med hjälp av URL-förkortningen\n" +" \"^/\":\n" +" svn log ^/trunk@50 adam.c bertil.c\n" +"\n" + +#: ../svn/svn.c:983 +msgid "" " Show the log messages for any incoming changes to foo.c during the\n" " next 'svn update':\n" " svn log -r BASE:HEAD foo.c\n" "\n" -" Show the log message for the revision in which /branches/foo\n" -" was created:\n" -" svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo\n" -"\n" -" If ^/trunk/foo.c was moved to ^/trunk/bar.c' in revision 22, 'svn log -v'\n" -" shows a deletion and a copy in its changed paths list, such as:\n" -" D /trunk/foo.c\n" -" A /trunk/bar.c (from /trunk/foo.c:21)\n" msgstr "" -"Visa loggmeddelanden för revisioner och/eller filer.\n" -"användning: 1. log [SÖKVÄG][@REV]\n" -" 2. log URL[@REV] [SÖKVÄG...]\n" -"\n" -" 1. Visa loggmeddelanden för URL:en som motsvarar SÖKVÄG (\".\" om ej\n" -" angiven). Om REV anges avgör den var SÖKVÄG letas upp, och standard-\n" -" värdet för revisionsområdet är då REV:1. Annars är standardvärdet\n" -" för revisionsområdet BASE:1 då URL:en kanske inte finns i\n" -" HEAD-revisionen.\n" -"\n" -" 2. Visa loggmeddelanden för varje SÖKVÄG (\".\" om ingen angiven) under\n" -" URL. Om REV anges avgör den var SÖKVÄG letas upp, och standardvärdet\n" -" för revisionsområdet är då REV:1. Annars letas URL upp i HEAD och\n" -" standardvärdet för revisionsområdet är HEAD:1.\n" -"\n" -" Flaggorna \"-c\" och \"-r\" kan förekomma flera gånger (men inte blandas),\n" -" och det går att blanda områden angivna framlänges och baklänges.\n" -"\n" -" Om -v används skrivs även alla berörda sökvägar ut med varje loggmeddelande.\n" -" Varje ändrade sökväg föregås av en symbol som beskriver ändringen:\n" -" A: Sökvägen lades till eller kopierades.\n" -" D: Sökvägen raderades.\n" -" R: Sökvägen ersattes (raderades och lades till igen i samma revision).\n" -" M: Sökvägens fil och/eller egenskapsinnehåll ändrades.\n" -" Om en tillagd eller ersatt sökväg kopierades från någon annanstans så\n" -" visas kopians källsökväg och revision inom parenteser.\n" -" Om en fil eller katalog flyttades från en sökväg till en annan med\n" -" \"svn move\" så visas den gamla sökvägen som raderad och den nya som\n" -" kopierad från den gamla sökvägen vid en tidigare revision.\n" -"\n" -" Om -q används, skrivs inte loggmeddelanden ut (kan användas tillsammans med\n" -" -v).\n" -"\n" -" Varje loggmeddelande skrivs endast ut en gång, även om flera av de\n" -" berörda sökvägarna angavs explicit. Loggar följer kopieringshistorik som\n" -" standard. Använd --stop-on-copy för att slå av detta, vilket kan vara\n" -" användbart för att avgöra förgreningspunkter.\n" -"\n" -" Väljaren --depth kan bara användas tillsammans med --diff, och begränsar\n" -" omfattningen av den visade skillnaden till det angivna djupet.\n" -"\n" -" Om flaggan --search anges, kommer loggmeddelanden bara visas om sökmönstret\n" -" matchar författaren, datumet, loggmeddelandets (utom med --quiet),\n" -" eller, med --verbose, en ändrad sökväg.\n" -" Sökmönstret kan innehålla jokertecken enligt skalsyntax:\n" -" ? matchar ett godtyckligt enstaka tecken\n" -" * matchar en följd av godtyckliga tecken\n" -" [abc] matchar något av tecknen inom hakparenteserna\n" -" Om flera \"--search\"-flaggor anges kommer ett loggmeddelande visas om\n" -" det matchar något av sökmönstren. Om flaggan --search-and anges,\n" -" så kombineras den flaggans argument med mönstret från föregående --search\n" -" eller --search-and, och ett loggmeddelande visas bara om det matchar det\n" -" kombinerade sökmönstret.\n" -" Om --limit används tillsammans med --search, så kommer --limit begränsa\n" -" antal genomsökta loggmeddelanden och inte antal matchande.\n" -"\n" -" Exempel:\n" -"\n" -" Visa de 5 senaste loggmeddelandena för den aktuella arbetskopians\n" -" katalog och visa sökvägar ändrade i varje arkivering:\n" -" svn log -l 5 -v\n" -"\n" -" Visa loggen för fil.c sådan den var i revision 42:\n" -" svn log fil.c@42\n" -"\n" -" Visa loggmeddelanden och skillnader för varje arkivering av fil.c:\n" -" svn log --diff http://www.exempel.se/arkiv/projekt/fil.c\n" -" (Eftersom detta kommando anger en full URL behövs ingen arbetskopia.)\n" -"\n" -" Visa loggmeddelanden för filerna adam.c och bertil.c i katalogen\n" -" \"/trunk\" sådan den var i revision 50, med hjälp av URL-förkortningen\n" -" \"^/\":\n" -" svn log ^/trunk@50 adam.c bertil.c\n" -"\n" " Visa loggmeddelanden för ändringar av fil.c som kommer ske vid nästa\n" " \"svn update\":\n" " svn log -r BASE:HEAD fil.c\n" "\n" + +#: ../svn/svn.c:987 +msgid "" +" Show the log message for the revision in which /branches/foo\n" +" was created:\n" +" svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo\n" +"\n" +msgstr "" " Visa loggmeddelandet för revisionen då /branches/gren skapades:\n" " svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/gren\n" "\n" + +#: ../svn/svn.c:991 +msgid "" +" Show all log messages for commits between the tags ^/tags/2.0 and\n" +" ^/tags/3.0; assuming that tag 2.0 was created in revision 100:\n" +" svn log -rHEAD:100 ^/tags/3.0\n" +"\n" +msgstr "" +" Visa alla loggmeddelanden för arkiveringar mellan märkena ^/tags/2.0\n" +" och ^/tags/3.0, med antagandet att märket 2.0 skapades i revision 100:\n" +" svn log -rHEAD:100 ^/tags/3.0\n" +"\n" + +#: ../svn/svn.c:995 +msgid "" +" If ^/trunk/foo.c was moved to ^/trunk/bar.c' in revision 22, 'svn log -v'\n" +" shows a deletion and a copy in its changed paths list, such as:\n" +" D /trunk/foo.c\n" +" A /trunk/bar.c (from /trunk/foo.c:21)\n" +msgstr "" " Om ^/trunk/adam.c flyttats till ^/trunk/bertil.c i revision 22, så\n" " visar \"svn log -v\" en radering och en kopia i listan av ändrade sökvägar:\n" " D /trunk/adam.c\n" " A /trunk/bertil.c (från /trunk/adam.c:21)\n" -#: ../svn/svn.c:970 ../svnbench/svnbench.c:300 +#: ../svn/svn.c:1004 ../svnbench/svnbench.c:305 msgid "retrieve revision property ARG" msgstr "hämta revisionsegenskapen ARG" -#: ../svn/svn.c:971 ../svnbench/svnbench.c:301 +#: ../svn/svn.c:1005 ../svnbench/svnbench.c:306 msgid "the change made in revision ARG" msgstr "ändringen gjord i revision ARG" -#: ../svn/svn.c:972 +#: ../svn/svn.c:1006 msgid "also print all affected paths" msgstr "skriv även ut alla berörda sökvägar" -#: ../svn/svn.c:973 +#: ../svn/svn.c:1007 msgid "do not print the log message" msgstr "skriv inte up loggmeddelandet" #. For this large section, let's keep it unindented for easier #. * viewing/editing. It has been vim-treated with a textwidth=75 and 'gw' #. * (with quotes and newlines removed). -#: ../svn/svn.c:979 +#: ../svn/svn.c:1013 msgid "" "Merge changes into a working copy.\n" "usage: 1. merge SOURCE[@REV] [TARGET_WCPATH]\n" @@ -15194,17 +15603,52 @@ msgid "" " 3. merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" " (the '2-URL' merge)\n" "\n" +msgstr "" +"Sammanslagning av ändringar i en arbetskopia.\n" +"användning: 1. merge KÄLLA[@REV] [AKSÖKVÄGSMÅL]\n" +" (\"fullständig\" sammanslagning)\n" +" 2. merge [-c M[,N...] | -r N:M ...] KÄLLA[@REV] [AKSÖKVÄGSMÅL]\n" +" (sammanslagning av utvalda ändringar)\n" +" 3. merge KÄLLA1[@REV1] KÄLLA2[@REV2] [AKSÖKVÄGSMÅL]\n" +" (sammanslagning av skillnaden mellan 2 URL:er)\n" +"\n" + +#: ../svn/svn.c:1021 +msgid "" " 1. This form, with one source path and no revision range, is called\n" " a 'complete' merge:\n" "\n" +msgstr "" +" 1. Denna form, med en källsökväg och utan revisionsområde, kallas en\n" +" \"fullständig\" sammanslagning:\n" +"\n" + +#: ../svn/svn.c:1024 +msgid "" " svn merge SOURCE[@REV] [TARGET_WCPATH]\n" "\n" +msgstr "" +" svn merge KÄLLA[@REV] [AKSÖKVÄGSMÅL]\n" +"\n" + +#: ../svn/svn.c:1026 +msgid "" " The complete merge is used for the 'sync' and 'reintegrate' merges\n" " in the 'feature branch' pattern described below. It finds all the\n" " changes on the source branch that have not already been merged to the\n" " target branch, and merges them into the working copy. Merge tracking\n" " is used to know which changes have already been merged.\n" "\n" +msgstr "" +" Den fullständiga sammanslagningen används för synkronisering och\n" +" återförening enligt mönstret av \"karaktärsgrenar\" beskrivet nedan.\n" +" Alla ändringar i källgrenen ännu ej införda i målgrenen kommer att\n" +" slås samman med arbetskopian. Sammanslagningsföljning används\n" +" för att hålla reda på vilka ändringar som redan införts.\n" +"\n" + +#: ../svn/svn.c:1032 +msgid "" " SOURCE specifies the branch from where the changes will be pulled, and\n" " TARGET_WCPATH specifies a working copy of the target branch to which\n" " the changes will be applied. Normally SOURCE and TARGET_WCPATH should\n" @@ -15212,6 +15656,17 @@ msgid "" " subtree, then the subtree path must be included in both SOURCE and\n" " TARGET_WCPATH; this is discouraged, to avoid subtree mergeinfo.)\n" "\n" +msgstr "" +" KÄLLA anger grenen varifrån ändringarna hämtas, och AKSÖKVÄGSMÅL en\n" +" arbetskopia av målgrenen i vilken ändringarna kommer anbringas.\n" +" Vanligtvis motsvarar KÄLLA och AKSÖKVÄGSMÅL var sin grenrot.\n" +" (För sammanslagning av endast ett delträd så måste sökvägen för\n" +" delträdet finnas med i både KÄLLA och AKSÖKVÄGSMÅL; detta rekommenderas\n" +" inte för att undvika sammanslagningsinformation i delträd.)\n" +"\n" + +#: ../svn/svn.c:1039 +msgid "" " SOURCE is usually a URL. The optional '@REV' specifies both the peg\n" " revision of the URL and the latest revision that will be considered\n" " for merging; if REV is not specified, the HEAD revision is assumed. If\n" @@ -15219,28 +15674,90 @@ msgid "" " used, and the default value of 'REV' is the base revision (usually the\n" " revision last updated to).\n" "\n" +msgstr "" +" KÄLLA är vanligen en URL. Den valfria \"@REV\" anger både URL:ens\n" +" fixerade revision och den senaste revisionen som kommer ifråga för\n" +" sammanslagning; om REV inte anges så används revisionen HEAD. Om KÄLLA\n" +" är en sökväg till en arbetskopia så används dess motsvarande URL, och\n" +" standardvärdet för \"REV\" är då basrevisionen (normalt revisionen som\n" +" arbetskopian senast uppdaterades till).\n" +"\n" + +#: ../svn/svn.c:1046 +msgid "" " TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" " assumed. There are some special cases:\n" "\n" +msgstr "" +" AKSÖKVÄGSMÅL är en sökväg till en arbetskopia; om inte angiven så\n" +" används i allmänhet \".\". Det finns vissa särskilda fall:\n" +"\n" + +#: ../svn/svn.c:1049 +msgid "" " - If SOURCE is a URL:\n" "\n" +msgstr "" +" - Om KÄLLA är en URL:\n" +"\n" + +#: ../svn/svn.c:1051 +msgid "" " - If the basename of the URL and the basename of '.' are the\n" " same, then the differences are applied to '.'. Otherwise,\n" " if a file with the same basename as that of the URL is found\n" " within '.', then the differences are applied to that file.\n" " In all other cases, the target defaults to '.'.\n" "\n" +msgstr "" +" - Om URL:ens basnamn är samma som den aktuella arbetskatalogens\n" +" basnamn så kommer skillnaderna anbringas i \".\". Annars om\n" +" det finns en fil med samma basnamn som URL:en i \".\", så\n" +" kommer skillnaderna anbringas i den filen. I alla andra fall\n" +" är målet \".\" om inget annat anges.\n" +"\n" + +#: ../svn/svn.c:1057 +msgid "" " - If SOURCE is a working copy path:\n" "\n" +msgstr "" +" - Om KÄLLA är en sökväg till en arbetskopia:\n" +"\n" + +#: ../svn/svn.c:1059 +msgid "" " - If the source is a file, then differences are applied to that\n" " file (useful for reverse-merging earlier changes). Otherwise,\n" " if the source is a directory, then the target defaults to '.'.\n" "\n" +msgstr "" +" - Om källan är en fil så anbringas skillnaderna i den filen\n" +" (vilket är användbart för omvänd sammanslagning av tidigare\n" +" ändringar). Annars, om källan är en katalog, så är målet \".\"\n" +" om inget annat anges.\n" +"\n" + +#: ../svn/svn.c:1063 +msgid "" " In normal usage the working copy should be up to date, at a single\n" " revision, with no local modifications and no switched subtrees.\n" "\n" +msgstr "" +" Vid normal användning bör arbetskopian bör vara uppdaterad, på en enda\n" +" revision, utan lokala ändringar eller växlade delträd.\n" +"\n" + +#: ../svn/svn.c:1066 +msgid "" " - The 'Feature Branch' Merging Pattern -\n" "\n" +msgstr "" +" - Sammanslagningsmönstret för \"funktionsgrenar\" -\n" +"\n" + +#: ../svn/svn.c:1068 +msgid "" " In this commonly used work flow, known also as the 'development\n" " branch' pattern, a developer creates a branch and commits a series of\n" " changes that implement a new feature. The developer periodically\n" @@ -15249,16 +15766,45 @@ msgid "" " complete, the developer performs a merge from the feature branch to\n" " the parent branch to re-integrate the changes.\n" "\n" +msgstr "" +" Med detta arbetsflöde, även kallat \"utvecklingsgrenar\", skapar en\n" +" utvecklare en gren och arkiverar en följd av ändringar som avser en\n" +" ny funktion. Utvecklaren inför då och då de senaste ändringarna från\n" +" föräldragrenen för att hålla utvecklingsgrenen aktuell. När den nya\n" +" funktionen är färdig gör utvecklaren en sammanslagning från funktions-\n" +" grenen till föräldragrenen för att återinföra ändringarna.\n" +"\n" + +#: ../svn/svn.c:1076 +msgid "" " parent --+----------o------o-o-------------o--\n" " \\ \\ \\ /\n" " \\ merge merge merge\n" " \\ \\ \\ /\n" " feature +--o-o-------o----o-o----o-------\n" "\n" +msgstr "" +" förälder --+----------o------o-o------------------o--\n" +" \\ \\ \\ /\n" +" \\ sammansl. sammansl. sammansl.\n" +" \\ \\ \\ /\n" +" funktion +--o-o-------o----o-o----o-----------\n" +"\n" + +#: ../svn/svn.c:1082 +msgid "" " A merge from the parent branch to the feature branch is called a\n" " 'sync' or 'catch-up' merge, and a merge from the feature branch to the\n" " parent branch is called a 'reintegrate' merge.\n" "\n" +msgstr "" +" En sammanslagning från föräldragrenen till funktionsgrenen kallas en\n" +" \"synkronisering\" eller att \"komma ikapp\", och en sammanslagning\n" +" från funktionsgrenen till föräldragrenen kallas en \"återförening\".\n" +"\n" + +#: ../svn/svn.c:1086 +msgid "" " - Sync Merge Example -\n" " ............\n" " . .\n" @@ -15269,324 +15815,7 @@ msgid "" " feature +------------------------o-----\n" " r100 r200\n" "\n" -" Subversion will locate all the changes on 'trunk' that have not yet\n" -" been merged into the 'feature' branch. In this case that is a single\n" -" range, r100:200. In the diagram above, L marks the left side (trunk@100)\n" -" and R marks the right side (trunk@200) of the merge source. The\n" -" difference between L and R will be applied to the target working copy\n" -" path. In this case, the working copy is a clean checkout of the entire\n" -" 'feature' branch.\n" -"\n" -" To perform this sync merge, have a clean working copy of the feature\n" -" branch and run the following command in its top-level directory:\n" -"\n" -" svn merge ^/trunk\n" -"\n" -" Note that the merge is now only in your local working copy and still\n" -" needs to be committed to the repository so that it can be seen by\n" -" others. You can review the changes and you may have to resolve\n" -" conflicts before you commit the merge.\n" -"\n" -" - Reintegrate Merge Example -\n" -"\n" -" The feature branch was last synced with trunk up to revision X. So the\n" -" difference between trunk@X and feature@HEAD contains the complete set\n" -" of changes that implement the feature, and no other changes. These\n" -" changes are applied to trunk.\n" -"\n" -" rW rX\n" -" trunk ------+--------------------L------------------o\n" -" \\ . ^\n" -" \\ ............. /\n" -" \\ . /\n" -" feature +--------------------------------R\n" -"\n" -" In the diagram above, L marks the left side (trunk@X) and R marks the\n" -" right side (feature@HEAD) of the merge. The difference between the\n" -" left and right side is merged into trunk, the target.\n" -"\n" -" To perform the merge, have a clean working copy of trunk and run the\n" -" following command in its top-level directory:\n" -"\n" -" svn merge ^/feature\n" -"\n" -" To prevent unnecessary merge conflicts, a reintegrate merge requires\n" -" that TARGET_WCPATH is not a mixed-revision working copy, has no local\n" -" modifications, and has no switched subtrees.\n" -"\n" -" A reintegrate merge also requires that the source branch is coherently\n" -" synced with the target -- in the above example, this means that all\n" -" revisions between the branch point W and the last merged revision X\n" -" are merged to the feature branch, so that there are no unmerged\n" -" revisions in-between.\n" -"\n" -"\n" -" 2. This form is called a 'cherry-pick' merge:\n" -"\n" -" svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n" -"\n" -" A cherry-pick merge is used to merge specific revisions (or revision\n" -" ranges) from one branch to another. By default, this uses merge\n" -" tracking to automatically skip any revisions that have already been\n" -" merged to the target; you can use the --ignore-ancestry option to\n" -" disable such skipping.\n" -"\n" -" SOURCE is usually a URL. The optional '@REV' specifies only the peg\n" -" revision of the URL and does not affect the merge range; if REV is not\n" -" specified, the HEAD revision is assumed. If SOURCE is a working copy\n" -" path, the corresponding URL of the path is used, and the default value\n" -" of 'REV' is the base revision (usually the revision last updated to).\n" -"\n" -" TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" -" assumed. The special cases noted above in the 'complete' merge form\n" -" also apply here.\n" -"\n" -" The revision ranges to be merged are specified by the '-r' and/or '-c'\n" -" options. '-r N:M' refers to the difference in the history of the\n" -" source branch between revisions N and M. You can use '-c M' to merge\n" -" single revisions: '-c M' is equivalent to '-r :M'. Each such\n" -" difference is applied to TARGET_WCPATH.\n" -"\n" -" If the mergeinfo in TARGET_WCPATH indicates that revisions within the\n" -" range were already merged, changes made in those revisions are not\n" -" merged again. If needed, the range is broken into multiple sub-ranges,\n" -" and each sub-range is merged separately.\n" -"\n" -" A 'reverse range' can be used to undo changes. For example, when\n" -" source and target refer to the same branch, a previously committed\n" -" revision can be 'undone'. In a reverse range, N is greater than M in\n" -" '-r N:M', or the '-c' option is used with a negative number: '-c -M'\n" -" is equivalent to '-r M:'. Undoing changes like this is also known\n" -" as performing a 'reverse merge'.\n" -"\n" -" Multiple '-c' and/or '-r' options may be specified and mixing of\n" -" forward and reverse ranges is allowed.\n" -"\n" -" - Cherry-pick Merge Example -\n" -"\n" -" A bug has been fixed on trunk in revision 50. This fix needs to\n" -" be merged from trunk onto the release branch.\n" -"\n" -" 1.x-release +-----------------------o-----\n" -" / ^\n" -" / |\n" -" / |\n" -" trunk ------+--------------------------LR-----\n" -" r50\n" -"\n" -" In the above diagram, L marks the left side (trunk@49) and R marks the\n" -" right side (trunk@50) of the merge. The difference between the left\n" -" and right side is applied to the target working copy path.\n" -"\n" -" Note that the difference between revision 49 and 50 is exactly those\n" -" changes that were committed in revision 50, not including changes\n" -" committed in revision 49.\n" -"\n" -" To perform the merge, have a clean working copy of the release branch\n" -" and run the following command in its top-level directory; remember\n" -" that the default target is '.':\n" -"\n" -" svn merge -c50 ^/trunk\n" -"\n" -" You can also cherry-pick several revisions and/or revision ranges:\n" -"\n" -" svn merge -c50,54,60 -r65:68 ^/trunk\n" -"\n" -"\n" -" 3. This form is called a '2-URL merge':\n" -"\n" -" svn merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" -"\n" -" You should use this merge variant only if the other variants do not\n" -" apply to your situation, as this variant can be quite complex to\n" -" master.\n" -"\n" -" Two source URLs are specified, identifying two trees on the same\n" -" branch or on different branches. The trees are compared and the\n" -" difference from SOURCE1@REV1 to SOURCE2@REV2 is applied to the\n" -" working copy of the target branch at TARGET_WCPATH. The target\n" -" branch may be the same as one or both sources, or different again.\n" -" The three branches involved can be completely unrelated.\n" -"\n" -" TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" -" assumed. The special cases noted above in the 'complete' merge form\n" -" also apply here.\n" -"\n" -" SOURCE1 and/or SOURCE2 can also be specified as a working copy path,\n" -" in which case the merge source URL is derived from the working copy.\n" -"\n" -" - 2-URL Merge Example -\n" -"\n" -" Two features have been developed on separate branches called 'foo' and\n" -" 'bar'. It has since become clear that 'bar' should be combined with\n" -" the 'foo' branch for further development before reintegration.\n" -"\n" -" Although both feature branches originate from trunk, they are not\n" -" directly related -- one is not a direct copy of the other. A 2-URL\n" -" merge is necessary.\n" -"\n" -" The 'bar' branch has been synced with trunk up to revision 500.\n" -" (If this revision number is not known, it can be located using the\n" -" 'svn log' and/or 'svn mergeinfo' commands.)\n" -" The difference between trunk@500 and bar@HEAD contains the complete\n" -" set of changes related to feature 'bar', and no other changes. These\n" -" changes are applied to the 'foo' branch.\n" -"\n" -" foo +-----------------------------------o\n" -" / ^\n" -" / /\n" -" / r500 /\n" -" trunk ------+------+-----------------L---------> /\n" -" \\ . /\n" -" \\ ............ /\n" -" \\ . /\n" -" bar +-----------------------------------R\n" -"\n" -" In the diagram above, L marks the left side (trunk@500) and R marks\n" -" the right side (bar@HEAD) of the merge. The difference between the\n" -" left and right side is applied to the target working copy path, in\n" -" this case a working copy of the 'foo' branch.\n" -"\n" -" To perform the merge, have a clean working copy of the 'foo' branch\n" -" and run the following command in its top-level directory:\n" -"\n" -" svn merge ^/trunk@500 ^/bar\n" -"\n" -" The exact changes applied by a 2-URL merge can be previewed with svn's\n" -" diff command, which is a good idea to verify if you do not have the\n" -" luxury of a clean working copy to merge to. In this case:\n" -"\n" -" svn diff ^/trunk@500 ^/bar@HEAD\n" -"\n" -"\n" -" The following applies to all types of merges:\n" -"\n" -" To prevent unnecessary merge conflicts, svn merge requires that\n" -" TARGET_WCPATH is not a mixed-revision working copy. Running 'svn update'\n" -" before starting a merge ensures that all items in the working copy are\n" -" based on the same revision.\n" -"\n" -" If possible, you should have no local modifications in the merge's target\n" -" working copy prior to the merge, to keep things simpler. It will be\n" -" easier to revert the merge and to understand the branch's history.\n" -"\n" -" Switched sub-paths should also be avoided during merging, as they may\n" -" cause incomplete merges and create subtree mergeinfo.\n" -"\n" -" For each merged item a line will be printed with characters reporting the\n" -" action taken. These characters have the following meaning:\n" -"\n" -" A Added\n" -" D Deleted\n" -" U Updated\n" -" C Conflict\n" -" G Merged\n" -" E Existed\n" -" R Replaced\n" -"\n" -" Characters in the first column report about the item itself.\n" -" Characters in the second column report about properties of the item.\n" -" A 'C' in the third column indicates a tree conflict, while a 'C' in\n" -" the first and second columns indicate textual conflicts in files\n" -" and in property values, respectively.\n" -"\n" -" - Merge Tracking -\n" -"\n" -" Subversion uses the svn:mergeinfo property to track merge history. This\n" -" property is considered at the start of a merge to determine what to merge\n" -" and it is updated at the conclusion of the merge to describe the merge\n" -" that took place. Mergeinfo is used only if the two sources are on the\n" -" same line of history -- if the first source is an ancestor of the second,\n" -" or vice-versa (i.e. if one has originally been created by copying the\n" -" other). This is verified and enforced when using sync merges and\n" -" reintegrate merges.\n" -"\n" -" The --ignore-ancestry option prevents merge tracking and thus ignores\n" -" mergeinfo, neither considering it nor recording it.\n" -"\n" -" - Merging from foreign repositories -\n" -"\n" -" Subversion does support merging from foreign repositories.\n" -" While all merge source URLs must point to the same repository, the merge\n" -" target working copy may come from a different repository than the source.\n" -" However, there are some caveats. Most notably, copies made in the\n" -" merge source will be transformed into plain additions in the merge\n" -" target. Also, merge-tracking is not supported for merges from foreign\n" -" repositories.\n" msgstr "" -"Sammanslagning av ändringar i en arbetskopia.\n" -"användning: 1. merge KÄLLA[@REV] [AKSÖKVÄGSMÅL]\n" -" (\"fullständig\" sammanslagning)\n" -" 2. merge [-c M[,N...] | -r N:M ...] KÄLLA[@REV] [AKSÖKVÄGSMÅL]\n" -" (sammanslagning av utvalda ändringar)\n" -" 3. merge KÄLLA1[@REV1] KÄLLA2[@REV2] [AKSÖKVÄGSMÅL]\n" -" (sammanslagning av skillnaden mellan 2 URL:er)\n" -"\n" -" 1. Denna form, med en källsökväg och utan revisionsområde, kallas en\n" -" \"fullständig\" sammanslagning:\n" -"\n" -" svn merge KÄLLA[@REV] [AKSÖKVÄGSMÅL]\n" -"\n" -" Den fullständiga sammanslagningen används för synkronisering och\n" -" återförening enligt mönstret av \"karaktärsgrenar\" beskrivet nedan.\n" -" Alla ändringar i källgrenen ännu ej införda i målgrenen kommer att\n" -" slås samman med arbetskopian. Sammanslagningsföljning används\n" -" för att hålla reda på vilka ändringar som redan införts.\n" -"\n" -" KÄLLA anger grenen varifrån ändringarna hämtas, och AKSÖKVÄGSMÅL en\n" -" arbetskopia av målgrenen i vilken ändringarna kommer anbringas.\n" -" Vanligtvis motsvarar KÄLLA och AKSÖKVÄGSMÅL var sin grenrot.\n" -" (För sammanslagning av endast ett delträd så måste sökvägen för\n" -" delträdet finnas med i både KÄLLA och AKSÖKVÄGSMÅL; detta rekommenderas\n" -" inte för att undvika sammanslagningsinformation i delträd.)\n" -"\n" -" KÄLLA är vanligen en URL. Den valfria \"@REV\" anger både URL:ens\n" -" fixerade revision och den senaste revisionen som kommer ifråga för\n" -" sammanslagning; om REV inte anges så används revisionen HEAD. Om KÄLLA\n" -" är en sökväg till en arbetskopia så används dess motsvarande URL, och\n" -" standardvärdet för \"REV\" är då basrevisionen (normalt revisionen som\n" -" arbetskopian senast uppdaterades till).\n" -"\n" -" AKSÖKVÄGSMÅL är en sökväg till en arbetskopia; om inte angiven så\n" -" används i allmänhet \".\". Det finns vissa särskilda fall:\n" -"\n" -" - Om KÄLLA är en URL:\n" -"\n" -" - Om URL:ens basnamn är samma som den aktuella arbetskatalogens\n" -" basnamn så kommer skillnaderna anbringas i \".\". Annars om\n" -" det finns en fil med samma basnamn som URL:en i \".\", så\n" -" kommer skillnaderna anbringas i den filen. I alla andra fall\n" -" är målet \".\" om inget annat anges.\n" -"\n" -" - Om KÄLLA är en sökväg till en arbetskopia:\n" -"\n" -" - Om källan är en fil så anbringas skillnaderna i den filen\n" -" (vilket är användbart för omvänd sammanslagning av tidigare\n" -" ändringar). Annars, om källan är en katalog, så är målet \".\"\n" -" om inget annat anges.\n" -"\n" -" Vid normal användning bör arbetskopian bör vara uppdaterad, på en enda\n" -" revision, utan lokala ändringar eller växlade delträd.\n" -"\n" -" - Sammanslagningsmönstret för \"funktionsgrenar\" -\n" -"\n" -" Med detta arbetsflöde, även kallat \"utvecklingsgrenar\", skapar en\n" -" utvecklare en gren och arkiverar en följd av ändringar som avser en\n" -" ny funktion. Utvecklaren inför då och då de senaste ändringarna från\n" -" föräldragrenen för att hålla utvecklingsgrenen aktuell. När den nya\n" -" funktionen är färdig gör utvecklaren en sammanslagning från funktions-\n" -" grenen till föräldragrenen för att återinföra ändringarna.\n" -"\n" -" förälder --+----------o------o-o------------------o--\n" -" \\ \\ \\ /\n" -" \\ sammansl. sammansl. sammansl.\n" -" \\ \\ \\ /\n" -" funktion +--o-o-------o----o-o----o-----------\n" -"\n" -" En sammanslagning från föräldragrenen till funktionsgrenen kallas en\n" -" \"synkronisering\" eller att \"komma ikapp\", och en sammanslagning\n" -" från funktionsgrenen till föräldragrenen kallas en \"återförening\".\n" -"\n" " - Exempel på synkroniserande sammanslagning -\n" " ............\n" " . .\n" @@ -15597,6 +15826,18 @@ msgstr "" " funktion +------------------------o-----\n" " r100 r200\n" "\n" + +#: ../svn/svn.c:1096 +msgid "" +" Subversion will locate all the changes on 'trunk' that have not yet\n" +" been merged into the 'feature' branch. In this case that is a single\n" +" range, r100:200. In the diagram above, L marks the left side (trunk@100)\n" +" and R marks the right side (trunk@200) of the merge source. The\n" +" difference between L and R will be applied to the target working copy\n" +" path. In this case, the working copy is a clean checkout of the entire\n" +" 'feature' branch.\n" +"\n" +msgstr "" " Subversion kommer hitta alla ändringar i \"trunk\" som ännu ej införts\n" " i grenen \"funktion\". I detta fall är det ett enda område, r100:200.\n" " I diagrammet ovan står V för vänstersidan (trunk@100) och H högersidan\n" @@ -15604,24 +15845,72 @@ msgstr "" " anbringas i arbetskopian. I detta fall är arbetsträdet en ren\n" " utcheckning av hela grenen \"funktion\".\n" "\n" + +#: ../svn/svn.c:1104 +msgid "" +" To perform this sync merge, have a clean working copy of the feature\n" +" branch and run the following command in its top-level directory:\n" +"\n" +msgstr "" " För att göra en synkroniserande sammanslagning behövs en ren\n" " arbetskopia av funktionsgrenen. Kör följande kommando i dess\n" " rotkatalog:\n" "\n" + +#: ../svn/svn.c:1107 +msgid "" +" svn merge ^/trunk\n" +"\n" +msgstr "" " svn merge ^/trunk\n" "\n" + +#: ../svn/svn.c:1109 +msgid "" +" Note that the merge is now only in your local working copy and still\n" +" needs to be committed to the repository so that it can be seen by\n" +" others. You can review the changes and you may have to resolve\n" +" conflicts before you commit the merge.\n" +"\n" +msgstr "" " Sammanslagningen är nu bara gjord i din egna arbetskopia och behöver\n" " fortfarande arkiveras så att andra kan se den. Du kan granska\n" " ändringarna och kan behöva lösa konflikter innan sammanslagningen\n" " arkiveras.\n" "\n" + +#: ../svn/svn.c:1114 +msgid "" +" - Reintegrate Merge Example -\n" +"\n" +msgstr "" " - Exempel på återförening -\n" "\n" -" Funktionsgrenen synkroniserades senast med \"trunk\" vid revision X.\n" + +#: ../svn/svn.c:1116 +msgid "" +" The feature branch was last synced with trunk up to revision X. So the\n" +" difference between trunk@X and feature@HEAD contains the complete set\n" +" of changes that implement the feature, and no other changes. These\n" +" changes are applied to trunk.\n" +"\n" +msgstr "" +" Funktionsgrenen synkroniserades senast med \\\"trunk\\\" vid revision X.\n" " Skillnaden mellan trunk@X och funktion@HEAD innehåller alltså alla\n" " ändringar i funktionsgrenen och inga andra. Dessa anbringas i\n" " \"trunk\".\n" "\n" + +#: ../svn/svn.c:1121 +msgid "" +" rW rX\n" +" trunk ------+--------------------L------------------o\n" +" \\ . ^\n" +" \\ ............. /\n" +" \\ . /\n" +" feature +--------------------------------R\n" +"\n" +msgstr "" " rW rX\n" " trunk ------+--------------------V------------------o\n" " \\ . ^\n" @@ -15629,36 +15918,106 @@ msgstr "" " \\ . /\n" " funktion +--------------------------------H\n" "\n" + +#: ../svn/svn.c:1128 +msgid "" +" In the diagram above, L marks the left side (trunk@X) and R marks the\n" +" right side (feature@HEAD) of the merge. The difference between the\n" +" left and right side is merged into trunk, the target.\n" +"\n" +msgstr "" " I diagrammet ovan står V för vänstersidan (trunk@X) och H högersidan\n" " (funktion@HEAD) av sammanslagningen. Skillnaden mellan vänstra och\n" " högra sidan införs i målet \"trunk\".\n" "\n" + +#: ../svn/svn.c:1132 +msgid "" +" To perform the merge, have a clean working copy of trunk and run the\n" +" following command in its top-level directory:\n" +"\n" +msgstr "" " För sammanslagningen behövs en ren arbetskopia av \"trunk\".\n" " Kör följande kommando i dess rotkatalog:\n" "\n" + +#: ../svn/svn.c:1135 +msgid "" +" svn merge ^/feature\n" +"\n" +msgstr "" " svn merge ^/funktion\n" "\n" + +#: ../svn/svn.c:1137 +msgid "" +" To prevent unnecessary merge conflicts, a reintegrate merge requires\n" +" that TARGET_WCPATH is not a mixed-revision working copy, has no local\n" +" modifications, and has no switched subtrees.\n" +"\n" +msgstr "" " För att förhindra onödiga konflikter kräver en återförening att\n" " AKSÖKVÄGSMÅL inte är en arbetskopia med blandad revision och saknar\n" " lokala ändringar och växlade delträd.\n" "\n" + +#: ../svn/svn.c:1141 +msgid "" +" A reintegrate merge also requires that the source branch is coherently\n" +" synced with the target -- in the above example, this means that all\n" +" revisions between the branch point W and the last merged revision X\n" +" are merged to the feature branch, so that there are no unmerged\n" +" revisions in-between.\n" +"\n" +msgstr "" " En återförening kräver också att källgrenen har genomgående\n" " synkroniserats med målet -- i exemplet ovan innebär det att alla\n" " revisioner mellan grenpunkten W och den sist sammanslagna revisionen X\n" " införs till funktionsgrenen, så att det inte finns kvar några\n" " revisioner därimellan.\n" "\n" + +#: ../svn/svn.c:1148 +msgid "" +" 2. This form is called a 'cherry-pick' merge:\n" "\n" +msgstr "" " 2. Denna form är en sammanslagning av utvalda ändringar:\n" "\n" + +#: ../svn/svn.c:1150 +msgid "" +" svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n" +"\n" +msgstr "" " svn merge [-c M[,N...] | -r N:M ...] KÄLLA[@REV] [AKSÖKVÄGSMÅL]\n" "\n" + +#: ../svn/svn.c:1152 +msgid "" +" A cherry-pick merge is used to merge specific revisions (or revision\n" +" ranges) from one branch to another. By default, this uses merge\n" +" tracking to automatically skip any revisions that have already been\n" +" merged to the target; you can use the --ignore-ancestry option to\n" +" disable such skipping.\n" +"\n" +msgstr "" " Denna form av sammanslagning används för att överföra enskilda\n" " ändringar (eller revisionsintervall) mellan grenar. Normalt används\n" " sammanslagningsföljning för att automatiskt hoppa över revisioner som\n" " redan införts i målet; använd flaggan --ignore-ancestry för att stänga\n" " av denna automatik.\n" "\n" + +#: ../svn/svn.c:1158 +msgid "" +" SOURCE is usually a URL. The optional '@REV' specifies only the peg\n" +" revision of the URL and does not affect the merge range; if REV is not\n" +" specified, the HEAD revision is assumed. If SOURCE is a working copy\n" +" path, the corresponding URL of the path is used, and the default value\n" +" of 'REV' is the base revision (usually the revision last updated to).\n" +"\n" +msgstr "" " KÄLLA är vanligen en URL. Den valfria \"@REV\" anger bara URL:ens\n" " fixerade revision och påverkar inte sammanslagningens område; om REV\n" " inte angivits används revisionen HEAD. Om KÄLLA är en sökväg till en\n" @@ -15666,21 +16025,59 @@ msgstr "" " \"REV\" är basrevisionen (normalt revisionen för den senaste\n" " uppdateringen).\n" "\n" + +#: ../svn/svn.c:1164 ../svn/svn.c:1235 +msgid "" +" TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" +" assumed. The special cases noted above in the 'complete' merge form\n" +" also apply here.\n" +"\n" +msgstr "" " AKSÖKVÄGSMÅL är en sökväg till en arbetskopia; om ej angiven antas \".\".\n" " De särskilda fallen ovan för den \"fullständiga\" sammanslagningsformen\n" " gäller även här.\n" "\n" + +#: ../svn/svn.c:1168 +msgid "" +" The revision ranges to be merged are specified by the '-r' and/or '-c'\n" +" options. '-r N:M' refers to the difference in the history of the\n" +" source branch between revisions N and M. You can use '-c M' to merge\n" +" single revisions: '-c M' is equivalent to '-r :M'. Each such\n" +" difference is applied to TARGET_WCPATH.\n" +"\n" +msgstr "" " Revisionerna som införas anges med flaggorna \"-r\" och/eller \"-c\".\n" " \"-r N:M\" betyder skillnaden i källgrenens historik mellan\n" " revisionerna N och M. För att införa enstaka revisioner, använd\n" " \"-c M\", vilket är detsamma som \"-r :M\". Varje sådan skillnad\n" " eller ändring anbringas i AKSÖKVÄGSMÅL.\n" "\n" + +#: ../svn/svn.c:1174 +msgid "" +" If the mergeinfo in TARGET_WCPATH indicates that revisions within the\n" +" range were already merged, changes made in those revisions are not\n" +" merged again. If needed, the range is broken into multiple sub-ranges,\n" +" and each sub-range is merged separately.\n" +"\n" +msgstr "" " Om revisioner inom ett intervall redan är införda, enligt samman-\n" " slagningsinformationen i AKSÖKVÄGSMÅL, så kommer de inte införas\n" " igen. Om det behövs kommer intervall delas upp och varje delintervall\n" " behandlas separat.\n" "\n" + +#: ../svn/svn.c:1179 +msgid "" +" A 'reverse range' can be used to undo changes. For example, when\n" +" source and target refer to the same branch, a previously committed\n" +" revision can be 'undone'. In a reverse range, N is greater than M in\n" +" '-r N:M', or the '-c' option is used with a negative number: '-c -M'\n" +" is equivalent to '-r M:'. Undoing changes like this is also known\n" +" as performing a 'reverse merge'.\n" +"\n" +msgstr "" " Ett \"omvänt område\" kan användas för att upphäva ändringar. Till\n" " exempel kan en tidigare arkiverad revision \"göras ogjord\" när både\n" " källa och mål är i samma gren. I ett omvänt område är N större än M\n" @@ -15688,14 +16085,45 @@ msgstr "" " \"-c -M\" är samma som \"-r M:\". Att upphäva ändringar på detta\n" " sätt kallas även \"omvänd sammanslagning\".\n" "\n" + +#: ../svn/svn.c:1186 +msgid "" +" Multiple '-c' and/or '-r' options may be specified and mixing of\n" +" forward and reverse ranges is allowed.\n" +"\n" +msgstr "" " Flaggorna \"-c\" och/eller \"-r\" kan anges flera gånger, och det går\n" " att på samma gång ange raka och omvända revisionsområden.\n" "\n" + +#: ../svn/svn.c:1189 +msgid "" +" - Cherry-pick Merge Example -\n" +"\n" +msgstr "" " - Exempel på sammanslagning av utvalda ändringar -\n" "\n" + +#: ../svn/svn.c:1191 +msgid "" +" A bug has been fixed on trunk in revision 50. This fix needs to\n" +" be merged from trunk onto the release branch.\n" +"\n" +msgstr "" " Ett fel har rättats i \"trunk\" i revision 50. Denna rättelse behöver\n" " införas i grenen för utgåvor.\n" "\n" + +#: ../svn/svn.c:1194 +msgid "" +" 1.x-release +-----------------------o-----\n" +" / ^\n" +" / |\n" +" / |\n" +" trunk ------+--------------------------LR-----\n" +" r50\n" +"\n" +msgstr "" " 1.x-utgåva +-----------------------o-----\n" " / ^\n" " / |\n" @@ -15703,55 +16131,163 @@ msgstr "" " trunk ------+--------------------------VH-----\n" " r50\n" "\n" + +#: ../svn/svn.c:1201 +msgid "" +" In the above diagram, L marks the left side (trunk@49) and R marks the\n" +" right side (trunk@50) of the merge. The difference between the left\n" +" and right side is applied to the target working copy path.\n" +"\n" +msgstr "" " I diagrammet ovan står V för vänstra sidan (trunk@49) och H för högra\n" " sidan (trunk@50) av sammanslagningen. Skillnaden mellan vänstra och\n" " högra sidan anbringas i målets arbetskopia.\n" "\n" + +#: ../svn/svn.c:1205 +msgid "" +" Note that the difference between revision 49 and 50 is exactly those\n" +" changes that were committed in revision 50, not including changes\n" +" committed in revision 49.\n" +"\n" +msgstr "" " Observera att skillnaden mellan revision 49 och 50 är bara ändringarna\n" " som arkiverades i revision 50, och inkluderar inte ändringarna i\n" " revision 49.\n" "\n" + +#: ../svn/svn.c:1209 +msgid "" +" To perform the merge, have a clean working copy of the release branch\n" +" and run the following command in its top-level directory; remember\n" +" that the default target is '.':\n" +"\n" +msgstr "" " För att göra sammanslagningen, börja med en ren arbetskopia av\n" " grenen \"1.x-utgåva\" och kör följande kommando i dess rotkatalog.\n" " Standardvärdet för målet är \".\":\n" "\n" + +#: ../svn/svn.c:1213 +msgid "" +" svn merge -c50 ^/trunk\n" +"\n" +msgstr "" " svn merge -c50 ^/trunk\n" "\n" + +#: ../svn/svn.c:1215 +msgid "" +" You can also cherry-pick several revisions and/or revision ranges:\n" +"\n" +msgstr "" " Det går också att plocka flera revisioner och/eller intervall:\n" "\n" + +#: ../svn/svn.c:1217 +msgid "" +" svn merge -c50,54,60 -r65:68 ^/trunk\n" +"\n" +msgstr "" " svn merge -c50,54,60 -r65:68 ^/trunk\n" "\n" + +#: ../svn/svn.c:1220 +msgid "" +" 3. This form is called a '2-URL merge':\n" "\n" +msgstr "" " 3. Denna form är en sammanslagning av skillnaden mellan 2 URL:er:\n" "\n" + +#: ../svn/svn.c:1222 +msgid "" +" svn merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" +"\n" +msgstr "" " svn merge KÄLLA1[@REV1] KÄLLA2[@REV2] [AKSÖKVÄGSMÅL]\n" "\n" + +#: ../svn/svn.c:1224 +msgid "" +" You should use this merge variant only if the other variants do not\n" +" apply to your situation, as this variant can be quite complex to\n" +" master.\n" +"\n" +msgstr "" " Använd bara denna form om de andra varianterna inte passad den\n" " aktuella situationen, eftersom den är förhållandevis komplicerad.\n" "\n" + +#: ../svn/svn.c:1228 +msgid "" +" Two source URLs are specified, identifying two trees on the same\n" +" branch or on different branches. The trees are compared and the\n" +" difference from SOURCE1@REV1 to SOURCE2@REV2 is applied to the\n" +" working copy of the target branch at TARGET_WCPATH. The target\n" +" branch may be the same as one or both sources, or different again.\n" +" The three branches involved can be completely unrelated.\n" +"\n" +msgstr "" " Två käll-URL:er anges, som betecknar två träd på samma gren eller\n" " på olika grenar. Träden jämförs och skillnaden från KÄLLA1@REV1 till\n" " KÄLLA2@REV2 anbringas i arbetskopian för målgrenen i AKSÖKVÄGSMÅL.\n" " Målgrenen kan vara samma som endera källan, eller något annat.\n" " De tre inblandade grenarna kan vara helt obesläktade.\n" "\n" -" AKSÖKVÄGSMÅL är en sökväg till en arbetskopia; om ej angiven antas \".\".\n" -" De särskilda fallen ovan för den \"fullständiga\" sammanslagningsformen\n" -" gäller även här.\n" + +#: ../svn/svn.c:1239 +msgid "" +" SOURCE1 and/or SOURCE2 can also be specified as a working copy path,\n" +" in which case the merge source URL is derived from the working copy.\n" "\n" +msgstr "" " KÄLLA1 och/eller KÄLLA2 kan också anges som sökvägar i en arbetskopia,\n" " och då tas käll-URL:en för sammanslagningen från arbetskopian.\n" "\n" + +#: ../svn/svn.c:1242 +msgid "" +" - 2-URL Merge Example -\n" +"\n" +msgstr "" " - Exempel på sammanslagning med 2 URL:er -\n" "\n" + +#: ../svn/svn.c:1244 +msgid "" +" Two features have been developed on separate branches called 'foo' and\n" +" 'bar'. It has since become clear that 'bar' should be combined with\n" +" the 'foo' branch for further development before reintegration.\n" +"\n" +msgstr "" " Två funktioner har utvecklats på skilda grenar, \"apelsin\" och\n" " \"banan\". Det står nu klart att \"banan\" borde kombineras med grenen\n" " \"apelsin\" för vidare utveckling före återförening.\n" "\n" + +#: ../svn/svn.c:1248 +msgid "" +" Although both feature branches originate from trunk, they are not\n" +" directly related -- one is not a direct copy of the other. A 2-URL\n" +" merge is necessary.\n" +"\n" +msgstr "" " Trots att båda funktionsgrenarna har sitt ursprung i trunk så är de\n" " inte direkt besläktade -- den ena är inte en direkt kopia av den andra.\n" " En sammanslagning med 2 URL:er krävs.\n" "\n" + +#: ../svn/svn.c:1252 +msgid "" +" The 'bar' branch has been synced with trunk up to revision 500.\n" +" (If this revision number is not known, it can be located using the\n" +" 'svn log' and/or 'svn mergeinfo' commands.)\n" +" The difference between trunk@500 and bar@HEAD contains the complete\n" +" set of changes related to feature 'bar', and no other changes. These\n" +" changes are applied to the 'foo' branch.\n" +"\n" +msgstr "" " Grenen \"banan\" har synkroniserats med \"trunk\" upp till revision\n" " 500. (Om revisionsnumret inte är känt kan det hittas med hjälp av\n" " kommandona \"svn log\" och/eller \"svn mergeinfo\".)\n" @@ -15759,6 +16295,20 @@ msgstr "" " som har med funktionen \"banan\" att göra, och inga andra. Dessa\n" " ändringar anbringas i grenen \"apelsin\".\n" "\n" + +#: ../svn/svn.c:1259 +msgid "" +" foo +-----------------------------------o\n" +" / ^\n" +" / /\n" +" / r500 /\n" +" trunk ------+------+-----------------L---------> /\n" +" \\ . /\n" +" \\ ............ /\n" +" \\ . /\n" +" bar +-----------------------------------R\n" +"\n" +msgstr "" " apelsin +-----------------------------------o\n" " / ^\n" " / /\n" @@ -15769,41 +16319,125 @@ msgstr "" " \\ . /\n" " banan +-----------------------------------H\n" "\n" + +#: ../svn/svn.c:1269 +msgid "" +" In the diagram above, L marks the left side (trunk@500) and R marks\n" +" the right side (bar@HEAD) of the merge. The difference between the\n" +" left and right side is applied to the target working copy path, in\n" +" this case a working copy of the 'foo' branch.\n" +"\n" +msgstr "" " I diagrammet ovan betecknar V vänstersidan (trunk@500) och H högersidan\n" " (banan@HEAD) av sammanslagningen. Skillnaden mellan vänstra och högra\n" " sidan anbringas i målets arbetskopia, i detta fall en arbetskopia av\n" " grenen \"apelsin\".\n" "\n" + +#: ../svn/svn.c:1274 +msgid "" +" To perform the merge, have a clean working copy of the 'foo' branch\n" +" and run the following command in its top-level directory:\n" +"\n" +msgstr "" " För att göra sammanslagningen, kör följande kommando i rotkatalogen\n" " till en ren arbetskopia av grenen \"apelsin\":\n" "\n" + +#: ../svn/svn.c:1277 +msgid "" +" svn merge ^/trunk@500 ^/bar\n" +"\n" +msgstr "" " svn merge ^/trunk@500 ^/banan\n" "\n" + +#: ../svn/svn.c:1279 +msgid "" +" The exact changes applied by a 2-URL merge can be previewed with svn's\n" +" diff command, which is a good idea to verify if you do not have the\n" +" luxury of a clean working copy to merge to. In this case:\n" +"\n" +msgstr "" " Precis vilka ändringar som en 2-URL-sammanslagning gör kan förhands-\n" " granskas med hjälp av \"svn diff\". Detta kräver ingen arbetskopia.\n" " I detta fall:\n" "\n" + +#: ../svn/svn.c:1283 +msgid "" +" svn diff ^/trunk@500 ^/bar@HEAD\n" +"\n" +msgstr "" " svn diff ^/trunk@500 ^/banan@HEAD\n" "\n" + +#: ../svn/svn.c:1286 +msgid "" +" The following applies to all types of merges:\n" "\n" +msgstr "" " Följande gäller alla sorters sammanslagningar:\n" "\n" + +#: ../svn/svn.c:1288 +msgid "" +" To prevent unnecessary merge conflicts, svn merge requires that\n" +" TARGET_WCPATH is not a mixed-revision working copy. Running 'svn update'\n" +" before starting a merge ensures that all items in the working copy are\n" +" based on the same revision.\n" +"\n" +msgstr "" " För att undvika onödiga konflikter kräver \"svn merge\" att AKSÖKVÄGSMÅL\n" " inte är en arbetskopia med blandad revision. Kör \"svn update\" innan\n" " en sammanslagning påbörjas för att vara säker på att alla objekt i\n" " arbetskopian utgår från samma revision.\n" "\n" + +#: ../svn/svn.c:1293 +msgid "" +" If possible, you should have no local modifications in the merge's target\n" +" working copy prior to the merge, to keep things simpler. It will be\n" +" easier to revert the merge and to understand the branch's history.\n" +"\n" +msgstr "" " Undvik om möjligt lokala ändringar i sammanslagningsmålets arbetskopia\n" " före sammanslagningen, för enkelhets skull. Det är då lättare att ångra\n" " åtgärden och att förstå grenens historik.\n" "\n" + +#: ../svn/svn.c:1297 +msgid "" +" Switched sub-paths should also be avoided during merging, as they may\n" +" cause incomplete merges and create subtree mergeinfo.\n" +"\n" +msgstr "" " Växlade delträd bör också undvikas under sammanslagning, eftersom de\n" " kan orsaka ofullständiga sammanslagningar och ge upphov till samman-\n" " slagningsinformation i delträd.\n" "\n" + +#: ../svn/svn.c:1300 +msgid "" +" For each merged item a line will be printed with characters reporting the\n" +" action taken. These characters have the following meaning:\n" +"\n" +msgstr "" " För varje objekt som slagits samman skrivs en rad med en bokstav för\n" " vad som gjordes. Dessa bokstäver betyder:\n" "\n" + +#: ../svn/svn.c:1303 ../svn/svn.c:1907 +msgid "" +" A Added\n" +" D Deleted\n" +" U Updated\n" +" C Conflict\n" +" G Merged\n" +" E Existed\n" +" R Replaced\n" +"\n" +msgstr "" " A Tillagt\n" " D Borttaget\n" " U Uppdaterat\n" @@ -15812,14 +16446,43 @@ msgstr "" " E Befintligt\n" " R Ersatt\n" "\n" + +#: ../svn/svn.c:1311 +msgid "" +" Characters in the first column report about the item itself.\n" +" Characters in the second column report about properties of the item.\n" +" A 'C' in the third column indicates a tree conflict, while a 'C' in\n" +" the first and second columns indicate textual conflicts in files\n" +" and in property values, respectively.\n" +"\n" +msgstr "" " Ett tecken i den första kolumnen ger information om själva objektet.\n" " Information om objektets egenskaper ges av tecken i andra kolumnen.\n" " Ett \"C\" i tredje kolumnen påvisar en trädkonflikt, medan ett \"C\" i\n" " första och andra kolumnen betyder textkonflikter i filer respektive\n" " egenskapsvärden.\n" "\n" + +#: ../svn/svn.c:1317 +msgid "" +" - Merge Tracking -\n" +"\n" +msgstr "" " - Sammanslagningsföljning -\n" "\n" + +#: ../svn/svn.c:1319 +msgid "" +" Subversion uses the svn:mergeinfo property to track merge history. This\n" +" property is considered at the start of a merge to determine what to merge\n" +" and it is updated at the conclusion of the merge to describe the merge\n" +" that took place. Mergeinfo is used only if the two sources are on the\n" +" same line of history -- if the first source is an ancestor of the second,\n" +" or vice-versa (i.e. if one has originally been created by copying the\n" +" other). This is verified and enforced when using sync merges and\n" +" reintegrate merges.\n" +"\n" +msgstr "" " Subversion använder egenskapen svn:mergeinfo för att följa samman-\n" " slagningshistoriken. Denna egenskap läses i början av sammanslagningen\n" " för att avgöra vad som skall ingå, och uppdateras vid sammanslagningens\n" @@ -15829,12 +16492,36 @@ msgstr "" " som en kopia av den andra). Detta kontrolleras i synkroniseringar och\n" " återföreningar.\n" "\n" + +#: ../svn/svn.c:1328 +msgid "" +" The --ignore-ancestry option prevents merge tracking and thus ignores\n" +" mergeinfo, neither considering it nor recording it.\n" +"\n" +msgstr "" " Flaggan --ignore-ancestry hindrar sammanslagningsföljning från att\n" " användas; sammanslagningsinformationen kommer varken användas eller\n" " uppdateras.\n" "\n" + +#: ../svn/svn.c:1331 +msgid "" +" - Merging from foreign repositories -\n" +"\n" +msgstr "" " - Sammanslagning från andra arkiv -\n" "\n" + +#: ../svn/svn.c:1333 +msgid "" +" Subversion does support merging from foreign repositories.\n" +" While all merge source URLs must point to the same repository, the merge\n" +" target working copy may come from a different repository than the source.\n" +" However, there are some caveats. Most notably, copies made in the\n" +" merge source will be transformed into plain additions in the merge\n" +" target. Also, merge-tracking is not supported for merges from foreign\n" +" repositories.\n" +msgstr "" " Subversion tillåter sammanslagning från andra arkiv.\n" " Alla käll-URL:er måste peka på samma arkiv, men målets arbetskopia kan\n" " komma från ett annat arkiv än källan. Följande måste dock beaktas:\n" @@ -15842,18 +16529,26 @@ msgstr "" " Vidare stöds inte sammanslagningsföljning för sammanslagningar från\n" " andra arkiv.\n" -#: ../svn/svn.c:1309 +#: ../svn/svn.c:1344 msgid "force deletions even if deleted contents don't match" msgstr "" "radera alltid även om raderat innehåll inte\n" " stämmer överens" -#: ../svn/svn.c:1313 +#: ../svn/svn.c:1348 msgid "" "Display merge-related information.\n" "usage: 1. mergeinfo SOURCE[@REV] [TARGET[@REV]]\n" " 2. mergeinfo --show-revs=WHICH SOURCE[@REV] [TARGET[@REV]]\n" "\n" +msgstr "" +"Visa information om sammanslagningar.\n" +"användning: 1. mergeinfo KÄLLA[@REV] [MÅL[@REV]]\n" +" 2. mergeinfo --show-revs=VILKA KÄLLA[@REV] [MÅL[@REV]]\n" +"\n" + +#: ../svn/svn.c:1352 +msgid "" " 1. Summarize the history of merging between SOURCE and TARGET. The graph\n" " shows, from left to right:\n" " the youngest common ancestor of the branches;\n" @@ -15861,28 +16556,7 @@ msgid "" " that will be used for the next complete merge;\n" " the repository path and revision number of the tip of each branch.\n" "\n" -" 2. Print the revision numbers on SOURCE that have been merged to TARGET\n" -" (with --show-revs=merged), or that have not been merged to TARGET\n" -" (with --show-revs=eligible). Print only revisions in which there was\n" -" at least one change in SOURCE.\n" -"\n" -" If --revision (-r) is provided, filter the displayed information to\n" -" show only that which is associated with the revisions within the\n" -" specified range. Revision numbers, dates, and the 'HEAD' keyword are\n" -" valid range values.\n" -"\n" -" SOURCE and TARGET are the source and target branch URLs, respectively.\n" -" (If a WC path is given, the corresponding base URL is used.) The default\n" -" TARGET is the current working directory ('.'). REV specifies the revision\n" -" to be considered the tip of the branch; the default for SOURCE is HEAD,\n" -" and the default for TARGET is HEAD for a URL or BASE for a WC path.\n" -"\n" -" The depth can be 'empty' or 'infinity'; the default is 'empty'.\n" msgstr "" -"Visa information om sammanslagningar.\n" -"användning: 1. mergeinfo KÄLLA[@REV] [MÅL[@REV]]\n" -" 2. mergeinfo --show-revs=VILKA KÄLLA[@REV] [MÅL[@REV]]\n" -"\n" " 1. Sammanfatta sammanslagningshistoriken mellan KÄLLA och MÅL. Diagrammet\n" " visar, från vänster till höger:\n" " grenarnas yngsta gemensamma ursprung;\n" @@ -15891,15 +16565,43 @@ msgstr "" " sammanslagning;\n" " arkivsökväg och revisionsnummer för varje grenspets.\n" "\n" + +#: ../svn/svn.c:1359 +msgid "" +" 2. Print the revision numbers on SOURCE that have been merged to TARGET\n" +" (with --show-revs=merged), or that have not been merged to TARGET\n" +" (with --show-revs=eligible). Print only revisions in which there was\n" +" at least one change in SOURCE.\n" +"\n" +msgstr "" " 2. Visa revisionsnumren i KÄLLA som har införts i MÅL\n" " (med --show-revs=merged), eller som inte har införts i MÅL\n" " (med --show-revs=eligible). Bara revisioner där minst en ändring\n" " skedde i KÄLLA visas.\n" "\n" + +#: ../svn/svn.c:1364 +msgid "" +" If --revision (-r) is provided, filter the displayed information to\n" +" show only that which is associated with the revisions within the\n" +" specified range. Revision numbers, dates, and the 'HEAD' keyword are\n" +" valid range values.\n" +"\n" +msgstr "" " Om --revision (-r) anges, begränsa de visade revisionerna till det\n" " angivna området. Revisionsnummer, datum och nyckelordet \"HEAD\" är\n" " giltiga områdesvärden.\n" "\n" + +#: ../svn/svn.c:1369 +msgid "" +" SOURCE and TARGET are the source and target branch URLs, respectively.\n" +" (If a WC path is given, the corresponding base URL is used.) The default\n" +" TARGET is the current working directory ('.'). REV specifies the revision\n" +" to be considered the tip of the branch; the default for SOURCE is HEAD,\n" +" and the default for TARGET is HEAD for a URL or BASE for a WC path.\n" +"\n" +msgstr "" " KÄLLA och MÅL är URL:er för käll- respektive målgrenen. (Om en sökväg\n" " till en arbetskopia anges, så används motsvarande bas-URL istället.)\n" " Standardvärdet på MÅL är den aktuella arbetskatalogen (\".\").\n" @@ -15907,64 +16609,82 @@ msgstr "" " är HEAD, och för MÅL är standardvärdet HEAD för en URL och BASE för en\n" " arbetskopia.\n" "\n" -" Djupet kan vara \"empty\" eller \"infinity\"; standardvärdet är \"empty\".\n" -#: ../svn/svn.c:1345 +#: ../svn/svn.c:1375 +msgid " The depth can be 'empty' or 'infinity'; the default is 'empty'.\n" +msgstr " Djupet kan vara \"empty\" eller \"infinity\"; standardvärdet är \"empty\".\n" + +#: ../svn/svn.c:1381 msgid "" "Create a new directory under version control.\n" "usage: 1. mkdir PATH...\n" " 2. mkdir URL...\n" "\n" -" Create version controlled directories.\n" -"\n" -" 1. Each directory specified by a working copy PATH is created locally\n" -" and scheduled for addition upon the next commit.\n" -"\n" -" 2. Each directory specified by a URL is created in the repository via\n" -" an immediate commit.\n" -"\n" -" In both cases, all the intermediate directories must already exist,\n" -" unless the --parents option is given.\n" msgstr "" "Skapa en ny versionshanterad katalog.\n" "användning: 1. mkdir SÖKVÄG...\n" " 2. mkdir URL...\n" "\n" + +#: ../svn/svn.c:1385 +msgid "" +" Create version controlled directories.\n" +"\n" +msgstr "" " Skapa versionshanterade kataloger.\n" "\n" + +#: ../svn/svn.c:1387 +msgid "" +" 1. Each directory specified by a working copy PATH is created locally\n" +" and scheduled for addition upon the next commit.\n" +"\n" +msgstr "" " 1. Varje katalog som anges av en sökväg i en arbetskopia, skapas lokalt\n" " och schemaläggs att läggas till vid nästa arkivering.\n" "\n" + +#: ../svn/svn.c:1390 +msgid "" +" 2. Each directory specified by a URL is created in the repository via\n" +" an immediate commit.\n" +"\n" +msgstr "" " 2. Varje katalog som anges av en URL, skapas i arkivet och arkiveras\n" " genast.\n" "\n" + +#: ../svn/svn.c:1393 +msgid "" +" In both cases, all the intermediate directories must already exist,\n" +" unless the --parents option is given.\n" +msgstr "" " I båda fallen måste katalogerna ovanför de angivna redan finnas,\n" " såvida inte flaggan --parents anges.\n" -#: ../svn/svn.c:1362 +#: ../svn/svn.c:1399 msgid "" "Move (rename) an item in a working copy or repository.\n" "usage: move SRC... DST\n" "\n" -" SRC and DST can both be working copy (WC) paths or URLs:\n" -" WC -> WC: move an item in a working copy, as a local change to\n" -" be committed later (with or without further changes)\n" -" URL -> URL: move an item in the repository directly, immediately\n" -" creating a new revision in the repository\n" -" All the SRCs must be of the same type. If DST is an existing directory,\n" -" the sources will be added as children of DST. When moving multiple\n" -" sources, DST must be an existing directory.\n" -"\n" -" SRC and DST of WC -> WC moves must be committed in the same revision.\n" -" Furthermore, WC -> WC moves will refuse to move a mixed-revision subtree.\n" -" To avoid unnecessary conflicts, it is recommended to run 'svn update'\n" -" to update the subtree to a single revision before moving it.\n" -" The --allow-mixed-revisions option is provided for backward compatibility.\n" msgstr "" "Flytta (döp om) en fil eller katalog i en arbetskopia\n" "eller ett arkiv.\n" "användning: move KÄLLOR... MÅL\n" "\n" + +#: ../svn/svn.c:1402 +msgid "" +" SRC and DST can both be working copy (WC) paths or URLs:\n" +" WC -> WC: move an item in a working copy, as a local change to\n" +" be committed later (with or without further changes)\n" +" URL -> URL: move an item in the repository directly, immediately\n" +" creating a new revision in the repository\n" +" All the SRCs must be of the same type. If DST is an existing directory,\n" +" the sources will be added as children of DST. When moving multiple\n" +" sources, DST must be an existing directory.\n" +"\n" +msgstr "" " KÄLLOR och MÅL kan båda vara sökvägar till en arbetskopia (AK)\n" " eller URL:er:\n" " AK -> AK: flytta ett objekt i en arbetskopia, som en lokal ändring\n" @@ -15975,6 +16695,15 @@ msgstr "" " så kommer källorna läggas till som barn till MÅL. När flera källor flyttas\n" " måste MÅL vara en befintlig katalog.\n" "\n" + +#: ../svn/svn.c:1411 +msgid "" +" SRC and DST of WC -> WC moves must be committed in the same revision.\n" +" Furthermore, WC -> WC moves will refuse to move a mixed-revision subtree.\n" +" To avoid unnecessary conflicts, it is recommended to run 'svn update'\n" +" to update the subtree to a single revision before moving it.\n" +" The --allow-mixed-revisions option is provided for backward compatibility.\n" +msgstr "" " KÄLLOR och MÅL i flyttningar mellan arbetskopior måste arkiveras i\n" " samma revision, och kan inte flytta delträd med blandad revision.\n" " För att undvika onödiga konflikter rekommenderas att \"svn update\"\n" @@ -15982,19 +16711,42 @@ msgstr "" " flyttas.\n" " Flaggan --allow-mixed-revision finns till för bakåtkompatibilitet.\n" -#: ../svn/svn.c:1384 +#: ../svn/svn.c:1422 msgid "" "Apply a patch to a working copy.\n" "usage: patch PATCHFILE [WCPATH]\n" "\n" +msgstr "" +"Anbringa en ändringsfil (patch) i en arbetskopia.\n" +"användning: patch PATCHFIL [AKSÖKVÄG]\n" +"\n" + +#: ../svn/svn.c:1425 +msgid "" " Apply a unidiff patch in PATCHFILE to the working copy WCPATH.\n" " If WCPATH is omitted, '.' is assumed.\n" "\n" +msgstr "" +" Anbringa ändringsfilen PATCHFIL, i unidiff-format, på\n" +" arbetskopian AKSÖKVÄG. Om AKSÖKVÄG utelämnas så antas \".\".\n" +"\n" + +#: ../svn/svn.c:1428 +msgid "" " A unidiff patch suitable for application to a working copy can be\n" " produced with the 'svn diff' command or third-party diffing tools.\n" " Any non-unidiff content of PATCHFILE is ignored, except for Subversion\n" " property diffs as produced by 'svn diff'.\n" "\n" +msgstr "" +" En ändringsfil lämpad för att anbringas på en arbetskopia kan genereras\n" +" med hjälp av kommandot \"svn diff\" eller ett externt verktyg.\n" +" De delar av PATCHFIL som inte motsvarar unidiff-formatet hoppas över,\n" +" utom egenskapsändringar som genererades av \"svn diff\".\n" +"\n" + +#: ../svn/svn.c:1433 +msgid "" " Changes listed in the patch will either be applied or rejected.\n" " If a change does not match at its exact line offset, it may be applied\n" " earlier or later in the file if a match is found elsewhere for the\n" @@ -16004,41 +16756,7 @@ msgid "" " If no matching context can be found for a change, the change conflicts\n" " and will be written to a reject file with the extension .svnpatch.rej.\n" "\n" -" For each patched file a line will be printed with characters reporting\n" -" the action taken. These characters have the following meaning:\n" -"\n" -" A Added\n" -" D Deleted\n" -" U Updated\n" -" C Conflict\n" -" G Merged (with local uncommitted changes)\n" -"\n" -" Changes applied with an offset or fuzz are reported on lines starting\n" -" with the '>' symbol. You should review such changes carefully.\n" -"\n" -" If the patch removes all content from a file, that file is scheduled\n" -" for deletion. If the patch creates a new file, that file is scheduled\n" -" for addition. Use 'svn revert' to undo deletions and additions you\n" -" do not agree with.\n" -"\n" -" Hint: If the patch file was created with Subversion, it will contain\n" -" the number of a revision N the patch will cleanly apply to\n" -" (look for lines like '--- foo/bar.txt (revision N)').\n" -" To avoid rejects, first update to the revision N using\n" -" 'svn update -r N', apply the patch, and then update back to the\n" -" HEAD revision. This way, conflicts can be resolved interactively.\n" msgstr "" -"Anbringa en ändringsfil (patch) i en arbetskopia.\n" -"användning: patch PATCHFIL [AKSÖKVÄG]\n" -"\n" -" Anbringa ändringsfilen PATCHFIL, i unidiff-format, på\n" -" arbetskopian AKSÖKVÄG. Om AKSÖKVÄG utelämnas så antas \".\".\n" -"\n" -" En ändringsfil lämpad för att anbringas på en arbetskopia kan genereras\n" -" med hjälp av kommandot \"svn diff\" eller ett externt verktyg.\n" -" De delar av PATCHFIL som inte motsvarar unidiff-formatet hoppas över,\n" -" utom egenskapsändringar som genererades av \"svn diff\".\n" -"\n" " Ändringarna i den angivna filen kommer antingen att anbringas eller\n" " avslås. Om en ändring inte passar in på sin angivna plats men rätt\n" " omgivande rader finns längre upp eller ner i filen så kan den anbringas\n" @@ -16048,23 +16766,66 @@ msgstr "" " Om ingen passande plats kan hittas för en ändring, så betraktas den som\n" " en konflikt och skrivs till en avslagsfil med suffixet \".svnpatch.rej\".\n" "\n" + +#: ../svn/svn.c:1442 +msgid "" +" For each patched file a line will be printed with characters reporting\n" +" the action taken. These characters have the following meaning:\n" +"\n" +msgstr "" " För varje ändrad fil skrivs en rad med en bokstav för vad som gjordes.\n" " Dessa bokstäver betyder:\n" "\n" + +#: ../svn/svn.c:1445 +msgid "" +" A Added\n" +" D Deleted\n" +" U Updated\n" +" C Conflict\n" +" G Merged (with local uncommitted changes)\n" +"\n" +msgstr "" " A Tillagd\n" " D Borttagen\n" " U Uppdaterad\n" " C Konflikt\n" " G Sammanslagen (med lokala ändringar som inte har arkiverats)\n" "\n" + +#: ../svn/svn.c:1451 +msgid "" +" Changes applied with an offset or fuzz are reported on lines starting\n" +" with the '>' symbol. You should review such changes carefully.\n" +"\n" +msgstr "" " För ändringar som inte anbragdes exakt rapporteras detta på rader som\n" " börjar med tecknet \">\". Sådana ändringar bör granskas noga.\n" "\n" + +#: ../svn/svn.c:1454 +msgid "" +" If the patch removes all content from a file, that file is scheduled\n" +" for deletion. If the patch creates a new file, that file is scheduled\n" +" for addition. Use 'svn revert' to undo deletions and additions you\n" +" do not agree with.\n" +"\n" +msgstr "" " Om allt innehåll tas bort från en fil, så kommer den filen schemaläggas\n" " för radering. Om en ny fil skapas så kommer den schemaläggas att läggas\n" " till. Använd \"svn revert\" för att förhindra oönskade raderingar och\n" " tillägg.\n" "\n" + +#: ../svn/svn.c:1459 +msgid "" +" Hint: If the patch file was created with Subversion, it will contain\n" +" the number of a revision N the patch will cleanly apply to\n" +" (look for lines like '--- foo/bar.txt (revision N)').\n" +" To avoid rejects, first update to the revision N using\n" +" 'svn update -r N', apply the patch, and then update back to the\n" +" HEAD revision. This way, conflicts can be resolved interactively.\n" +msgstr "" " Anm: Om ändringsfilen skapades av Subversion, innehåller den revisions-\n" " numret N som den kan anbringas rent på (leta efter rader som liknar\n" " \"--- katalog/fil.txt (revision N)\"). För att undvika avslag,\n" @@ -16072,158 +16833,205 @@ msgstr "" " anbringa ändringsfilen, och uppdatera sedan tillbaka till revisionen\n" " HEAD. På så sätt kan konflikter lösas interaktivt.\n" -#: ../svn/svn.c:1432 +#: ../svn/svn.c:1470 msgid "" "Remove a property from files, dirs, or revisions.\n" "usage: 1. propdel PROPNAME [PATH...]\n" " 2. propdel PROPNAME --revprop -r REV [TARGET]\n" "\n" -" 1. Removes versioned props in working copy.\n" -" 2. Removes unversioned remote prop on repos revision.\n" -" TARGET only determines which repository to access.\n" -"\n" -" See 'svn help propset' for descriptions of the svn:* special properties.\n" msgstr "" "Radera en egenskap från filer, kataloger eller revisioner.\n" "användning: 1. propdel PROPNAMN [SÖKVÄG...]\n" " 2. propdel PROPNAMN --revprop -r REV [MÅL]\n" "\n" + +#: ../svn/svn.c:1474 +msgid "" +" 1. Removes versioned props in working copy.\n" +" 2. Removes unversioned remote prop on repos revision.\n" +" TARGET only determines which repository to access.\n" +"\n" +msgstr "" " 1. Ta bort versionshanterade egenskaper i arbetskopian.\n" " 2. Ta bort en icke versionshanterad revisionsegenskap på en revision i\n" " arkivet.\n" " MÅL används endast för att avgöra vilket arkiv som ska användas.\n" "\n" + +#: ../svn/svn.c:1478 ../svn/svn.c:1491 ../svn/svn.c:1515 ../svn/svn.c:1535 +msgid " See 'svn help propset' for descriptions of the svn:* special properties.\n" +msgstr "" " Se \"svn help propset\" för beskrivning av de speciella egenskaperna som\n" " börjar med \"svn:\".\n" -#: ../svn/svn.c:1444 +#: ../svn/svn.c:1483 msgid "" "Edit a property with an external editor.\n" "usage: 1. propedit PROPNAME TARGET...\n" " 2. propedit PROPNAME --revprop -r REV [TARGET]\n" "\n" -" 1. Edits versioned prop in working copy or repository.\n" -" 2. Edits unversioned remote prop on repos revision.\n" -" TARGET only determines which repository to access.\n" -"\n" -" See 'svn help propset' for descriptions of the svn:* special properties.\n" msgstr "" "Redigera en egenskap med en extern editor.\n" "användning: 1. propedit EGENSKAPSNAMN MÅL...\n" " 2. propedit EGENSKAPSNAMN --revprop -r REV [MÅL]\n" "\n" + +#: ../svn/svn.c:1487 +msgid "" +" 1. Edits versioned prop in working copy or repository.\n" +" 2. Edits unversioned remote prop on repos revision.\n" +" TARGET only determines which repository to access.\n" +"\n" +msgstr "" " 1. Redigerar versionshanterade egenskaper i arbetskopian eller arkivet.\n" " 2. Redigerar en icke versionshanterad revisionsegenskap på en revision i\n" " arkivet.\n" " MÅL används endast för att avgöra vilket arkiv som ska användas.\n" "\n" -" Se \"svn help propset\" för beskrivning av de speciella egenskaperna som\n" -" börjar med \"svn:\".\n" -#: ../svn/svn.c:1456 +#: ../svn/svn.c:1496 msgid "" "Print the value of a property on files, dirs, or revisions.\n" "usage: 1. propget PROPNAME [TARGET[@REV]...]\n" " 2. propget PROPNAME --revprop -r REV [TARGET]\n" "\n" -" 1. Prints versioned props. If specified, REV determines in which\n" -" revision the target is first looked up.\n" -" 2. Prints unversioned remote prop on repos revision.\n" -" TARGET only determines which repository to access.\n" -"\n" -" With --verbose, the target path and the property name are printed on\n" -" separate lines before each value, like 'svn proplist --verbose'.\n" -" Otherwise, if there is more than one TARGET or a depth other than\n" -" 'empty', the target path is printed on the same line before each value.\n" -"\n" -" By default, an extra newline is printed after the property value so that\n" -" the output looks pretty. With a single TARGET, depth 'empty' and without\n" -" --show-inherited-props, you can use the --no-newline option to disable this\n" -" (useful when redirecting a binary property value to a file, for example).\n" -"\n" -" See 'svn help propset' for descriptions of the svn:* special properties.\n" msgstr "" "Skriv ut värdet på en egenskap för filer, kataloger\n" "eller revisioner.\n" "användning: 1. propget PROPNAMN [MÅL[@REV]...]\n" " 2. propget PROPNAMN --revprop -r REV [MÅL]\n" "\n" + +#: ../svn/svn.c:1500 +msgid "" +" 1. Prints versioned props. If specified, REV determines in which\n" +" revision the target is first looked up.\n" +" 2. Prints unversioned remote prop on repos revision.\n" +" TARGET only determines which repository to access.\n" +"\n" +msgstr "" " 1. Visa en versionshanterad egenskap i arbetskopian. Om REV anges, avgör\n" " den i vilken revision MÅL söks upp.\n" " 2. Visa en icke versionshanterad revisionsegenskap för en revision i\n" " arkivet.\n" " MÅL används endast för att avgöra vilket arkiv som ska användas.\n" "\n" + +#: ../svn/svn.c:1505 +msgid "" +" With --verbose, the target path and the property name are printed on\n" +" separate lines before each value, like 'svn proplist --verbose'.\n" +" Otherwise, if there is more than one TARGET or a depth other than\n" +" 'empty', the target path is printed on the same line before each value.\n" +"\n" +msgstr "" " Med --verbose kommer målsökvägen och egenskapsnamnet skrivas på skilda\n" " rader före varje värde, som med \"svn proplist --verbose\". Annars, med\n" " mer än ett MÅL eller ett djup annat än \"empty\", så skrivs målsökvägen\n" " på samma rad framför varje värde.\n" "\n" + +#: ../svn/svn.c:1510 +msgid "" +" By default, an extra newline is printed after the property value so that\n" +" the output looks pretty. With a single TARGET, depth 'empty' and without\n" +" --show-inherited-props, you can use the --no-newline option to disable this\n" +" (useful when redirecting a binary property value to a file, for example).\n" +"\n" +msgstr "" " Normalt skrivs ett radslut ut efter värdena, så att utskrifterna ser\n" " snyggare ut. Med ett enda MÅL, djupet \"empty\" och utan --show-inherited-props\n" " så kan flaggan --no-newline användas för att slå av detta radslut\n" " (bland annat användbart när binära egenskaper skickas till en fil).\n" "\n" -" Se \"svn help propset\" för beskrivning av de speciella egenskaperna som\n" -" börjar med \"svn:\".\n" -#: ../svn/svn.c:1478 ../svn/svn.c:1497 +#: ../svn/svn.c:1519 ../svn/svn.c:1539 msgid "print path, name and value on separate lines" msgstr "skriv sökväg, namn och värde på skilda rader" -#: ../svn/svn.c:1479 +#: ../svn/svn.c:1520 msgid "(deprecated; use --no-newline)" msgstr "(föråldrat; se --no-newline)" -#: ../svn/svn.c:1482 +#: ../svn/svn.c:1523 msgid "" "List all properties on files, dirs, or revisions.\n" "usage: 1. proplist [TARGET[@REV]...]\n" " 2. proplist --revprop -r REV [TARGET]\n" "\n" -" 1. Lists versioned props. If specified, REV determines in which\n" -" revision the target is first looked up.\n" -" 2. Lists unversioned remote props on repos revision.\n" -" TARGET only determines which repository to access.\n" -"\n" -" With --verbose, the property values are printed as well, like 'svn propget\n" -" --verbose'. With --quiet, the paths are not printed.\n" -"\n" -" See 'svn help propset' for descriptions of the svn:* special properties.\n" msgstr "" "Lista alla egenskaper på filer, kataloger eller\n" "revisioner.\n" "användning: 1. proplist [MÅL[@REV]...]\n" " 2. proplist --revprop -r REV [MÅL]\n" "\n" + +#: ../svn/svn.c:1527 +msgid "" +" 1. Lists versioned props. If specified, REV determines in which\n" +" revision the target is first looked up.\n" +" 2. Lists unversioned remote props on repos revision.\n" +" TARGET only determines which repository to access.\n" +"\n" +msgstr "" " 1. Listar versionshanterade egenskaper. Om REV är angiven, bestämmer den i\n" " vilken revision MÅL först letas upp.\n" " 2. Listar icke versionshanterade revisionsegenskaper för en revision i\n" " ett arkiv.\n" " MÅL används endast för att avgöra vilket arkiv som ska användas.\n" "\n" + +#: ../svn/svn.c:1532 +msgid "" +" With --verbose, the property values are printed as well, like 'svn propget\n" +" --verbose'. With --quiet, the paths are not printed.\n" +"\n" +msgstr "" " Med --verbose skrivs egenskapsvärdena också ut, som med \"svn propget\n" " --verbose\". Med --quiet skrivs inte sökvägarna ut.\n" "\n" -" Se \"svn help propset\" för beskrivning av de speciella egenskaperna som\n" -" börjar med \"svn:\".\n" -#: ../svn/svn.c:1498 +#: ../svn/svn.c:1540 msgid "don't print the path" msgstr "skriv inte sökvägen" -#: ../svn/svn.c:1501 +#: ../svn/svn.c:1543 msgid "" "Set the value of a property on files, dirs, or revisions.\n" "usage: 1. propset PROPNAME PROPVAL PATH...\n" " 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n" "\n" +msgstr "" +"Sätt värdet på en egenskap på filer, kataloger\n" +"eller revisioner.\n" +"användning: 1. propset PROPNAMN VÄRDE SÖKVÄG...\n" +" 2. propset PROPNAMN --revprop -r REV VÄRDE [MÅL]\n" +"\n" + +#: ../svn/svn.c:1547 +msgid "" " 1. Changes a versioned file or directory property in a working copy.\n" " 2. Changes an unversioned property on a repository revision.\n" " (TARGET only determines which repository to access.)\n" "\n" +msgstr "" +" 1. Ändra en versionshanterad egenskap på en fil eller katalog\n" +" i en arbetskopia.\n" +" 2. Gör en ändring av en icke versionshanterad revisionsegenskap på en\n" +" revision i arkivet.\n" +" MÅL används endast för att avgöra vilket arkiv som ska användas.\n" +"\n" + +#: ../svn/svn.c:1551 +msgid "" " The value may be provided with the --file option instead of PROPVAL.\n" "\n" +msgstr "" +" Värdet kan tillhandahållas med flaggan --file istället för som VÄRDE.\n" +"\n" + +#: ../svn/svn.c:1553 +msgid "" " Property names starting with 'svn:' are reserved. Subversion recognizes\n" " the following special versioned properties on a file:\n" " svn:keywords - Keywords to be expanded. Valid keywords are:\n" @@ -16235,6 +17043,21 @@ msgid "" " Id - A compressed summary of the previous four.\n" " Header - Similar to Id but includes the full URL.\n" "\n" +msgstr "" +" Egenskaper vars namn börjar med \"svn:\" är reserverade. Subversion\n" +" känner igen följande särskilda versionshanterade egenskaper på filer:\n" +" svn:keywords - Nyckelord som ska expanderas. Giltiga nyckelord är:\n" +" URL, HeadURL - URL:en till filens senaste revision.\n" +" Author, LastChangedBy - Personen som gjorde den senaste ändringen.\n" +" Date, LastChangedDate - Datum/tid för den senaste ändringen.\n" +" Rev, Revision, - Senaste revisionen där filen ändrades.\n" +" LastChangedRevision\n" +" Id - Ett sammandrag av de 4 nyckelorden ovan.\n" +" Header - Som \"Id\" men med full URL.\n" +"\n" + +#: ../svn/svn.c:1564 +msgid "" " Custom keywords can be defined with a format string separated from\n" " the keyword name with '='. Valid format substitutions are:\n" " %a - The author of the revision given by %r.\n" @@ -16253,6 +17076,29 @@ msgid "" " Once a custom keyword has been defined for a file, it can be used\n" " within the file like any other keyword: $MyKeyword$\n" "\n" +msgstr "" +" Egna nyckelord kan definieras med en formatsträng som avskiljs från\n" +" namnet med \"=\". Giltiga formatsubstitutioner är:\n" +" %a - Författaren till revisionen som ges av %r.\n" +" %b - Basnamnet för filens URL.\n" +" %d - Datumet för revisionen som ges av %r, på kort form.\n" +" %D - Datumet för revisionen som ges av %r, på lång form.\n" +" %P - Filens sökväg relativt arkivroten.\n" +" %r - Revisionsnumret för den senaste ändringen av filen.\n" +" %R - Arkivrotens URL.\n" +" %u - Filens URL.\n" +" %_ - Ett mellanslag (nyckelordsdefinitioner kan inte bokstavligen\n" +" innehålla mellanslag).\n" +" %% - Ett procenttecken (\"%\").\n" +" %H - Samma som %P%_%r%_%d%_%a.\n" +" %I - Samma som %b%_%r%_%d%_%a.\n" +" Exempel på definition av ett eget nyckelord: Mittnyckelord=%r%_%a%_%P\n" +" När ett eget nyckelord har definierats för en fil kan det användas\n" +" inom den filen som vilket annat nyckelord som helst: $Mittnyckelord$\n" +"\n" + +#: ../svn/svn.c:1582 +msgid "" " svn:executable - If present, make the file executable. Use\n" " 'svn propdel svn:executable PATH...' to clear.\n" " svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n" @@ -16265,6 +17111,22 @@ msgid "" " when it is not locked. Use 'svn propdel svn:needs-lock PATH...'\n" " to clear.\n" "\n" +msgstr "" +" svn:executable - Om den finns, görs filen exekverbar. Använd\n" +" \"svn propdel svn:executable SÖKVÄG...\" för att nollställa.\n" +" svn:eol-style - Något av \"native\", \"CR\", \"LF\" eller \"CRLF\".\n" +" svn:mime-type - Filens MIME-typ. Används för att avgöra hur samman-\n" +" slagningar av ändringar sker och hur den skickas från Apache. En\n" +" MIME-typ som inleds med \"text/\" eller som saknas behandlas som text.\n" +" Allt annat behandlas som binärdata.\n" +" svn:needs-lock - Om den är satt, visar den att filen bör låsas innan\n" +" den ändras. Gör att arbetsfilen blir skrivskyddad när den inte är\n" +" låst. Använd \"svn propdel svn:needs-lock SÖKVÄG...\" för att\n" +" nollställa.\n" +"\n" + +#: ../svn/svn.c:1594 +msgid "" " Subversion recognizes the following special versioned properties on a\n" " directory:\n" " svn:ignore - A list of file glob patterns to ignore, one per line.\n" @@ -16300,61 +17162,6 @@ msgid "" " 'relative_url relative_path' with peg revision support.\n" " Lines starting with a '#' character are ignored.\n" msgstr "" -"Sätt värdet på en egenskap på filer, kataloger\n" -"eller revisioner.\n" -"användning: 1. propset PROPNAMN VÄRDE SÖKVÄG...\n" -" 2. propset PROPNAMN --revprop -r REV VÄRDE [MÅL]\n" -"\n" -" 1. Ändra en versionshanterad egenskap på en fil eller katalog\n" -" i en arbetskopia.\n" -" 2. Gör en ändring av en icke versionshanterad revisionsegenskap på en\n" -" revision i arkivet.\n" -" MÅL används endast för att avgöra vilket arkiv som ska användas.\n" -"\n" -" Värdet kan tillhandahållas med flaggan --file istället för som VÄRDE.\n" -"\n" -" Egenskaper vars namn börjar med \"svn:\" är reserverade. Subversion\n" -" känner igen följande särskilda versionshanterade egenskaper på filer:\n" -" svn:keywords - Nyckelord som ska expanderas. Giltiga nyckelord är:\n" -" URL, HeadURL - URL:en till filens senaste revision.\n" -" Author, LastChangedBy - Personen som gjorde den senaste ändringen.\n" -" Date, LastChangedDate - Datum/tid för den senaste ändringen.\n" -" Rev, Revision, - Senaste revisionen där filen ändrades.\n" -" LastChangedRevision\n" -" Id - Ett sammandrag av de 4 nyckelorden ovan.\n" -" Header - Som \"Id\" men med full URL.\n" -"\n" -" Egna nyckelord kan definieras med en formatsträng som avskiljs från\n" -" namnet med \"=\". Giltiga formatsubstitutioner är:\n" -" %a - Författaren till revisionen som ges av %r.\n" -" %b - Basnamnet för filens URL.\n" -" %d - Datumet för revisionen som ges av %r, på kort form.\n" -" %D - Datumet för revisionen som ges av %r, på lång form.\n" -" %P - Filens sökväg relativt arkivroten.\n" -" %r - Revisionsnumret för den senaste ändringen av filen.\n" -" %R - Arkivrotens URL.\n" -" %u - Filens URL.\n" -" %_ - Ett mellanslag (nyckelordsdefinitioner kan inte bokstavligen\n" -" innehålla mellanslag).\n" -" %% - Ett procenttecken (\"%\").\n" -" %H - Samma som %P%_%r%_%d%_%a.\n" -" %I - Samma som %b%_%r%_%d%_%a.\n" -" Exempel på definition av ett eget nyckelord: Mittnyckelord=%r%_%a%_%P\n" -" När ett eget nyckelord har definierats för en fil kan det användas\n" -" inom den filen som vilket annat nyckelord som helst: $Mittnyckelord$\n" -"\n" -" svn:executable - Om den finns, görs filen exekverbar. Använd\n" -" \"svn propdel svn:executable SÖKVÄG...\" för att nollställa.\n" -" svn:eol-style - Något av \"native\", \"CR\", \"LF\" eller \"CRLF\".\n" -" svn:mime-type - Filens MIME-typ. Används för att avgöra hur samman-\n" -" slagningar av ändringar sker och hur den skickas från Apache. En\n" -" MIME-typ som inleds med \"text/\" eller som saknas behandlas som text.\n" -" Allt annat behandlas som binärdata.\n" -" svn:needs-lock - Om den är satt, visar den att filen bör låsas innan\n" -" den ändras. Gör att arbetsfilen blir skrivskyddad när den inte är\n" -" låst. Använd \"svn propdel svn:needs-lock SÖKVÄG...\" för att\n" -" nollställa.\n" -"\n" " Subversion känner igen följande särskilda versionshanterade egenskaper på\n" " kataloger:\n" " svn:ignore - En lista med filmönster att ignorera, ett per rad.\n" @@ -16392,72 +17199,124 @@ msgstr "" " \"relativ_URL relativ_sökväg\" med stöd för fixerad revision.\n" " Rader som börjar med tecknet \"#\" hoppas över.\n" -#: ../svn/svn.c:1588 +#: ../svn/svn.c:1631 msgid "read property value from file ARG" msgstr "läs egenskapsvärde från filen ARG" -#: ../svn/svn.c:1591 +#: ../svn/svn.c:1634 msgid "" "Relocate the working copy to point to a different repository root URL.\n" "usage: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n" " 2. relocate TO-URL [PATH]\n" "\n" +msgstr "" +"Omlokalisera arbetskopian till att använda en annan arkivrots-URL.\n" +"användning: 1. relocate FRÅN-PREFIX TILL-PREFIX [SÖKVÄG...]\n" +" 2. relocate TILL-URL [SÖKVÄG]\n" +"\n" + +#: ../svn/svn.c:1638 +msgid "" " Rewrite working copy URL metadata to reflect a syntactic change only.\n" " This is used when a repository's root URL changes (such as a scheme\n" " or hostname change) but your working copy still reflects the same\n" " directory within the same repository.\n" "\n" -" 1. FROM-PREFIX and TO-PREFIX are initial substrings of the working\n" -" copy's current and new URLs, respectively. (You may specify the\n" -" complete old and new URLs if you wish.) Use 'svn info' to determine\n" -" the current working copy URL.\n" -"\n" -" 2. TO-URL is the (complete) new repository URL to use for PATH.\n" -"\n" -" Examples:\n" -" svn relocate http:// svn:// project1 project2\n" -" svn relocate http://www.example.com/repo/project \\\n" -" svn://svn.example.com/repo/project\n" msgstr "" -"Omlokalisera arbetskopian till att använda en annan arkivrots-URL.\n" -"användning: 1. relocate FRÅN-PREFIX TILL-PREFIX [SÖKVÄG...]\n" -" 2. relocate TILL-URL [SÖKVÄG]\n" -"\n" " Skriv om arbetskopians URL-metadata för att avspegla en ren syntaxändring.\n" " Detta används när en arkivrots-URL ändras (t.ex. byte av schema eller\n" " värddator) men arbetskopian representerar fortfarande samma katalog i\n" " samma arkiv.\n" "\n" + +#: ../svn/svn.c:1643 +msgid "" +" 1. FROM-PREFIX and TO-PREFIX are initial substrings of the working\n" +" copy's current and new URLs, respectively. (You may specify the\n" +" complete old and new URLs if you wish.) Use 'svn info' to determine\n" +" the current working copy URL.\n" +"\n" +msgstr "" " 1. FRÅN-PREFIX och TILL-PREFIX är förled till arbetskopians aktuella\n" " respektive nya URL:er. (Det går att ange hela de gamla och nya URL:erna\n" " om man vill.) Använd \"svn info\" för att ta reda på aktuell URL till\n" " arbetskopian.\n" "\n" + +#: ../svn/svn.c:1648 +msgid "" +" 2. TO-URL is the (complete) new repository URL to use for PATH.\n" +"\n" +msgstr "" " 2. TILL-URL är den (fullständiga) nya arkiv-URL:en att använda för SÖKVÄG.\n" "\n" + +#: ../svn/svn.c:1650 +msgid "" +" Examples:\n" +" svn relocate http:// svn:// project1 project2\n" +" svn relocate http://www.example.com/repo/project \\\n" +" svn://svn.example.com/repo/project\n" +msgstr "" " Exempel:\n" " svn relocate http:// svn:// projekt1 projekt2\n" " svn relocate http://www.exempel.se/arkiv/projekt \\\n" " svn://svn.exempel.se/arkiv/projekt\n" -#: ../svn/svn.c:1614 +#: ../svn/svn.c:1658 msgid "" "Resolve conflicts on working copy files or directories.\n" "usage: resolve [PATH...]\n" "\n" +msgstr "" +"Lös konflikter i filer och kataloger i arbetskopian.\n" +"användning: resolve [SÖKVÄG...]\n" +"\n" + +#: ../svn/svn.c:1661 +msgid "" " By default, perform interactive conflict resolution on PATH.\n" " In this mode, the command is recursive by default (depth 'infinity').\n" "\n" +msgstr "" +" Om inget annat anges, genomför interaktiv konfliktlösning på SÖKVÄG.\n" +" I detta läge är kommandot normalt rekursivt (djup \"infinity\").\n" +"\n" + +#: ../svn/svn.c:1664 +msgid "" " The --accept=ARG option prevents interactive prompting and forces\n" " conflicts on PATH to be resolved in the manner specified by ARG.\n" " In this mode, the command is not recursive by default (depth 'empty').\n" "\n" +msgstr "" +" Väljaren --accept=ARG förhindrar interaktiva frågor och tvingar lösning\n" +" av alla konflikter enligt ARG. I detta läge är kommandot normalt inte\n" +" rekursivt (djup \"empty\").\n" +"\n" + +#: ../svn/svn.c:1668 +msgid "" " A conflicted path cannot be committed with 'svn commit' until it\n" " has been marked as resolved with 'svn resolve'.\n" "\n" +msgstr "" +" En sökväg med konflikt kan inte arkiveras med \"svn commit\" förrän den har\n" +" lösts med \"svn resolve\".\n" +"\n" + +#: ../svn/svn.c:1671 +msgid "" " Subversion knows three types of conflicts:\n" " Text conflicts, Property conflicts, and Tree conflicts.\n" "\n" +msgstr "" +" Subversion har tre sorters konflikter:\n" +" Textkonflikter, egenskapskonflikter och trädkonflikter.\n" +"\n" + +#: ../svn/svn.c:1674 +msgid "" " Text conflicts occur when overlapping changes to file contents were\n" " made. Text conflicts are usually resolved by editing the conflicted\n" " file or by using a merge tool (which may be an external program).\n" @@ -16466,11 +17325,34 @@ msgid "" " only useful in situations where it is acceptable to discard local or\n" " incoming changes altogether.\n" "\n" +msgstr "" +" Textkonflikter inträffar när överlappande ändringar av filinnehållet\n" +" görs. Textkonflikter löses vanligtvis genom att redigera filen med\n" +" konflikt eller med ett sammanslagningsverktyg (som kan vara ett\n" +" externt program).\n" +" \"svn resolve\" har väljare som kan användas för att redigera filer\n" +" automatiskt (som \"mine-full\" eller \"theirs-conflict\") men dessa är\n" +" bara användbara i situationer då det går bra att förkasta lokala\n" +" eller inkommande ändringar helt och hållet.\n" +"\n" + +#: ../svn/svn.c:1682 +msgid "" " Property conflicts are usually resolved by editing the value of the\n" " conflicted property (either from the interactive prompt, or with\n" " 'svn propedit'). As with text conflicts, options exist to edit a\n" " property automatically, discarding some changes in favour of others.\n" "\n" +msgstr "" +" Egenskapskonflikter löses vanligtvis genom att redigera värdet på\n" +" egenskapen med konflikt (antingen från en interaktiv fråga eller\n" +" med \"svn propedit\"). Liksom för textkonflikter finns väljare för\n" +" automatisk redigering av en egenskap där vissa ändringar kan förkastas\n" +" till förmån för andra.\n" +"\n" + +#: ../svn/svn.c:1687 +msgid "" " Tree conflicts occur when a change to the directory structure was\n" " made, and when this change cannot be applied to the working copy\n" " without affecting other changes (text changes, property changes,\n" @@ -16481,6 +17363,20 @@ msgid "" " It is recommended to use these automatic options whenever possible,\n" " rather than attempting manual tree conflict resolution.\n" "\n" +msgstr "" +" Trädkonflikter inträffar när en ändring av katalogstrukturen har\n" +" gjorts och denna ändring inte kan utföras i arbetskopian utan att\n" +" påverka andra ändringar (ändringar i text, egenskaper, eller\n" +" andra ändringar av katalogstrukturen). Kortfattad information\n" +" om trädkonflikter visas av kommandona \"svn status\" och \"svn info\".\n" +" I interaktivt läge kommer \"svn resolve\" försökta beskriva\n" +" trädkonflikter i detalj och kan erbjuda val för att lösa konflikten\n" +" automatiskt. Det rekommenderas att dessa automatiska val används\n" +" när det går, istället för att lösa trädkonflikten manuellt.\n" +"\n" + +#: ../svn/svn.c:1697 +msgid "" " If a tree conflict cannot be resolved automatically, it is recommended\n" " to figure out why the conflict occurred before attempting to resolve it.\n" " The 'svn log -v' command can be used to inspect structural changes\n" @@ -16493,48 +17389,6 @@ msgid "" " local changes with 'svn revert'. Files or directories might have to be\n" " copied, deleted, or moved.\n" msgstr "" -"Lös konflikter i filer och kataloger i arbetskopian.\n" -"användning: resolve [SÖKVÄG...]\n" -"\n" -" Om inget annat anges, genomför interaktiv konfliktlösning på SÖKVÄG.\n" -" I detta läge är kommandot normalt rekursivt (djup \"infinity\").\n" -"\n" -" Väljaren --accept=ARG förhindrar interaktiva frågor och tvingar lösning\n" -" av alla konflikter enligt ARG. I detta läge är kommandot normalt inte\n" -" rekursivt (djup \"empty\").\n" -"\n" -" En sökväg med konflikt kan inte arkiveras med \"svn commit\" förrän den har\n" -" lösts med \"svn resolve\".\n" -"\n" -" Subversion har tre sorters konflikter:\n" -" Textkonflikter, egenskapskonflikter och trädkonflikter.\n" -"\n" -" Textkonflikter inträffar när överlappande ändringar av filinnehållet\n" -" görs. Textkonflikter löses vanligtvis genom att redigera filen med\n" -" konflikt eller med ett sammanslagningsverktyg (som kan vara ett\n" -" externt program).\n" -"\n" -" \"svn resolve\" har väljare som kan användas för att redigera filer\n" -" automatiskt (som \"mine-full\" eller \"theirs-conflict\") men dessa är\n" -" bara användbara i situationer då det går bra att förkasta lokala\n" -" eller inkommande ändringar helt och hållet.\n" -"\n" -" Egenskapskonflikter löses vanligtvis genom att redigera värdet på\n" -" egenskapen med konflikt (antingen från en interaktiv fråga eller\n" -" med \"svn propedit\"). Liksom för textkonflikter finns väljare för\n" -" automatisk redigering av en egenskap där vissa ändringar kan förkastas\n" -" till förmån för andra.\n" -"\n" -" Trädkonflikter inträffar när en ändring av katalogstrukturen har\n" -" gjorts och denna ändring inte kan utföras i arbetskopian utan att\n" -" påverka andra ändringar (ändringar i text, egenskaper, eller\n" -" andra ändringar av katalogstrukturen). Kortfattad information\n" -" om trädkonflikter visas av kommandona \"svn status\" och \"svn info\".\n" -" I interaktivt läge kommer \"svn resolve\" försökta beskriva\n" -" trädkonflikter i detalj och kan erbjuda val för att lösa konflikten\n" -" automatiskt. Det rekommenderas att dessa automatiska val används\n" -" när det går, istället för att lösa trädkonflikten manuellt.\n" -"\n" " Om en trädkonflikt inte kan lösas automatiskt är det bäst att ta\n" " reda på varför konflikten inträffade innan försök görs att lösa den.\n" " Kommandot \"svn log -v\" kan användas för att undersöka strukturändringar\n" @@ -16547,7 +17401,7 @@ msgstr "" " nödvändigt att slänga bort vissa lokala ändringar med \"svn revert\".\n" " Filer eller kataloger kan behöva kopieras, raderas eller flyttas.\n" -#: ../svn/svn.c:1665 +#: ../svn/svn.c:1710 msgid "" "specify automatic conflict resolution source\n" " ('base', 'working', 'mine-conflict',\n" @@ -16557,56 +17411,85 @@ msgstr "" " (\"base\", \"working\", \"mine-conflict\",\n" " \"theirs-conflict\", \"mine-full\", \"theirs-full\")" -#: ../svn/svn.c:1672 +#: ../svn/svn.c:1717 msgid "" "Remove 'conflicted' state on working copy files or directories.\n" "usage: resolved PATH...\n" "\n" +msgstr "" +"Ta bort konflikttillstånd på filer eller kataloger i arbetskopian.\n" +"användning: resolved SÖKVÄG...\n" +"\n" + +#: ../svn/svn.c:1720 +msgid "" " Note: this subcommand does not semantically resolve conflicts or\n" " remove conflict markers; it merely removes the conflict-related\n" " artifact files and allows PATH to be committed again. It has been\n" " deprecated in favor of running 'svn resolve --accept working'.\n" msgstr "" -"Ta bort konflikttillstånd på filer eller kataloger i arbetskopian.\n" -"användning: resolved SÖKVÄG...\n" -"\n" " Anmärkning: Det här underkommandot löser inga konflikter och tar inte bort\n" " konfliktmarkörer; det tar endast bort filerna som skapades då konflikten\n" " uppstod och gör så att det går att arkivera SÖKVÄG igen. Det rekommenderas\n" " att använda \"svn resolve --accept working\" istället.\n" -#: ../svn/svn.c:1682 +#: ../svn/svn.c:1728 msgid "" "Restore pristine working copy state (undo local changes).\n" "usage: revert PATH...\n" "\n" -" Revert changes in the working copy at or within PATH, and remove\n" -" conflict markers as well, if any.\n" -"\n" -" This subcommand does not revert already committed changes.\n" -" For information about undoing already committed changes, search\n" -" the output of 'svn help merge' for 'undo'.\n" msgstr "" "Återställ arbetskopia till orört tillstånd (upphäv lokala ändringar).\n" "användning: revert SÖKVÄG...\n" "\n" + +#: ../svn/svn.c:1731 +msgid "" +" Revert changes in the working copy at or within PATH, and remove\n" +" conflict markers as well, if any.\n" +"\n" +msgstr "" " Upphäv ändringar i arbetskopian på eller inom SÖKVÄG, och ta bort\n" " konfliktmarkeringar om sådana finns.\n" "\n" + +#: ../svn/svn.c:1734 +msgid "" +" This subcommand does not revert already committed changes.\n" +" For information about undoing already committed changes, search\n" +" the output of 'svn help merge' for 'undo'.\n" +msgstr "" " Detta underkommando upphäver inte redan arkiverade ändringar.\n" " För information om att göra det, kör \"svn help merge\" och sök efter\n" " \"upphäva\".\n" -#: ../svn/svn.c:1694 +#: ../svn/svn.c:1741 msgid "" "Print the status of working copy files and directories.\n" "usage: status [PATH...]\n" "\n" +msgstr "" +"Visa status för filer och kataloger i en arbetskopia.\n" +"användning: status [SÖKVÄG...]\n" +"\n" + +#: ../svn/svn.c:1744 +msgid "" " With no args, print only locally modified items (no network access).\n" " With -q, print only summary information about locally modified items.\n" " With -u, add working revision and server out-of-date information.\n" " With -v, print full revision information on every item.\n" "\n" +msgstr "" +" Utan argument visas endast lokala ändringar (kräver inte nätverksåtkomst).\n" +" Med -q skrivs endast en sammanfattning om lokalt ändrade objekt.\n" +" Med -u visas dessutom revisioner i arbetskopian och information\n" +" om ändringar på servern.\n" +" Med -v visas fullständig revisionsinformation för varje objekt.\n" +"\n" + +#: ../svn/svn.c:1749 +msgid "" " The first seven columns in the output are each one character wide:\n" " First column: Says if item was added, deleted, or otherwise changed\n" " ' ' no modifications\n" @@ -16651,55 +17534,7 @@ msgid "" " If the item is a tree conflict victim, an additional line is printed\n" " after the item's status line, explaining the nature of the conflict.\n" "\n" -" The out-of-date information appears in the ninth column (with -u):\n" -" '*' a newer revision exists on the server\n" -" ' ' the working copy is up to date\n" -"\n" -" Remaining fields are variable width and delimited by spaces:\n" -" The working revision (with -u or -v; '-' if the item is copied)\n" -" The last committed revision and last committed author (with -v)\n" -" The working copy path is always the final field, so it can\n" -" include spaces.\n" -"\n" -" The presence of a question mark ('?') where a working revision, last\n" -" committed revision, or last committed author was expected indicates\n" -" that the information is unknown or irrelevant given the state of the\n" -" item (for example, when the item is the result of a copy operation).\n" -" The question mark serves as a visual placeholder to facilitate parsing.\n" -"\n" -" Example output:\n" -" svn status wc\n" -" M wc/bar.c\n" -" A + wc/qax.c\n" -"\n" -" svn status -u wc\n" -" M 965 wc/bar.c\n" -" * 965 wc/foo.c\n" -" A + - wc/qax.c\n" -" Status against revision: 981\n" -"\n" -" svn status --show-updates --verbose wc\n" -" M 965 938 kfogel wc/bar.c\n" -" * 965 922 sussman wc/foo.c\n" -" A + - 687 joe wc/qax.c\n" -" 965 687 joe wc/zig.c\n" -" Status against revision: 981\n" -"\n" -" svn status\n" -" M wc/bar.c\n" -" ! C wc/qaz.c\n" -" > local missing, incoming edit upon update\n" -" D wc/qax.c\n" msgstr "" -"Visa status för filer och kataloger i en arbetskopia.\n" -"användning: status [SÖKVÄG...]\n" -"\n" -" Utan argument visas endast lokala ändringar (kräver inte nätverksåtkomst).\n" -" Med -q skrivs endast en sammanfattning om lokalt ändrade objekt.\n" -" Med -u visas dessutom revisioner i arbetskopian och information\n" -" om ändringar på servern.\n" -" Med -v visas fullständig revisionsinformation för varje objekt.\n" -"\n" " De sju första kolumnerna är vardera ett tecken breda:\n" " Första kolumnen: Visar huruvida objektet har lagts till, raderats eller\n" " ändrats\n" @@ -16747,33 +17582,91 @@ msgstr "" " Om objektet är föremål för en trädkonflikt kommer en extra rad om\n" " konflikten skrivas efter objektets statusrad.\n" "\n" + +#: ../svn/svn.c:1793 +msgid "" +" The out-of-date information appears in the ninth column (with -u):\n" +" '*' a newer revision exists on the server\n" +" ' ' the working copy is up to date\n" +"\n" +msgstr "" " Information om uppdateringar på servern visas i den nionde kolumnen\n" " (om -u angivits):\n" " \"*\" en nyare revision finns på servern\n" " \" \" arbetskopian är aktuell\n" "\n" + +#: ../svn/svn.c:1797 +msgid "" +" Remaining fields are variable width and delimited by spaces:\n" +" The working revision (with -u or -v; '-' if the item is copied)\n" +" The last committed revision and last committed author (with -v)\n" +" The working copy path is always the final field, so it can\n" +" include spaces.\n" +"\n" +msgstr "" " De återstående fälten har varierande längd och avgränsas med mellanslag:\n" " Arbetskopians revision (med -u eller -v; \"-\" om objektet är kopierat)\n" " Revision och författare för senaste arkivering (med -v)\n" " Arbetskopians sökväg står alltid sist, så att den kan innehålla mellanslag.\n" "\n" + +#: ../svn/svn.c:1803 +msgid "" +" The presence of a question mark ('?') where a working revision, last\n" +" committed revision, or last committed author was expected indicates\n" +" that the information is unknown or irrelevant given the state of the\n" +" item (for example, when the item is the result of a copy operation).\n" +" The question mark serves as a visual placeholder to facilitate parsing.\n" +"\n" +msgstr "" " Ett frågetecken (\"?\") i fältet för arbetskopians revision, eller\n" " revision eller författare för senaste arkiveringen, betyder att\n" " informationen är okänd eller utan betydelse i objektets nuvarande\n" " tillstånd (till exempel när objektet kommer från en kopiering).\n" " Frågetecknet fungerar som platshållare för att förenkla tolkning.\n" "\n" + +#: ../svn/svn.c:1809 +msgid "" +" Example output:\n" +" svn status wc\n" +" M wc/bar.c\n" +" A + wc/qax.c\n" +"\n" +msgstr "" " Exempel på vad som kan visas:\n" " svn status ak\n" " M ak/alfa.c\n" " A + ak/gamma.c\n" "\n" + +#: ../svn/svn.c:1814 +msgid "" +" svn status -u wc\n" +" M 965 wc/bar.c\n" +" * 965 wc/foo.c\n" +" A + - wc/qax.c\n" +" Status against revision: 981\n" +"\n" +msgstr "" " svn status -u ak\n" " M 965 ak/alfa.c\n" " * 965 ak/beta.c\n" " A + - ak/gamma.c\n" " Status gentemot revision: 981\n" "\n" + +#: ../svn/svn.c:1820 +msgid "" +" svn status --show-updates --verbose wc\n" +" M 965 938 kfogel wc/bar.c\n" +" * 965 922 sussman wc/foo.c\n" +" A + - 687 joe wc/qax.c\n" +" 965 687 joe wc/zig.c\n" +" Status against revision: 981\n" +"\n" +msgstr "" " svn status --show-updates --verbose ak\n" " M 965 938 lindblom ak/alfa.c\n" " * 965 922 bergstrand ak/beta.c\n" @@ -16781,28 +17674,55 @@ msgstr "" " 965 687 johan ak/jota.c\n" " Status gentemot revision: 981\n" "\n" + +#: ../svn/svn.c:1827 +msgid "" +" svn status\n" +" M wc/bar.c\n" +" ! C wc/qaz.c\n" +" > local missing, incoming edit upon update\n" +" D wc/qax.c\n" +msgstr "" " svn status\n" " M ak/alfa.c\n" " ! C ak/delta.c\n" " > lokal fil saknas, inkommande fil ändrad vid uppdatering\n" " D ak/delta.c\n" -#: ../svn/svn.c:1787 +#: ../svn/svn.c:1835 msgid "don't print unversioned items" msgstr "visa inte icke versionshanterade objekt" -#: ../svn/svn.c:1790 +#: ../svn/svn.c:1838 msgid "" "Update the working copy to a different URL within the same repository.\n" "usage: 1. switch URL[@PEGREV] [PATH]\n" " 2. switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n" "\n" +msgstr "" +"Uppdatera arbetskopian till en annan URL inom samma arkiv.\n" +"användning: 1. switch URL[@FIXREV] [SÖKVÄG]\n" +" 2. switch --relocate FRÅN-PREFIX TILL-PREFIX [SÖKVÄG...]\n" +"\n" + +#: ../svn/svn.c:1842 +msgid "" " 1. Update the working copy to mirror a new URL within the repository.\n" " This behavior is similar to 'svn update', and is the way to\n" " move a working copy to a branch or tag within the same repository.\n" " If specified, PEGREV determines in which revision the target is first\n" " looked up.\n" "\n" +msgstr "" +" 1. Uppdatera arbetskopian så att den återspeglar en ny URL i arkivet.\n" +" Detta liknar hur \"svn update\" beter sig och är det sätt på vilket\n" +" man flyttar en arbetskopia till en gren eller ett märke inom ett\n" +" och samma arkiv. Om FIXREV anges bestämmer den i vilken revision som\n" +" målet ursprunglingen slås upp.\n" +"\n" + +#: ../svn/svn.c:1848 +msgid "" " If --force is used, unversioned obstructing paths in the working\n" " copy do not automatically cause a failure if the switch attempts to\n" " add the same path. If the obstructing path is the same type (file\n" @@ -16814,35 +17734,7 @@ msgid "" " modification to the working copy. All properties from the repository\n" " are applied to the obstructing path.\n" "\n" -" Use the --set-depth option to set a new working copy depth on the\n" -" targets of this operation.\n" -"\n" -" By default, Subversion will refuse to switch a working copy path to\n" -" a new URL with which it shares no common version control ancestry.\n" -" Use the '--ignore-ancestry' option to override this sanity check.\n" -"\n" -" 2. The '--relocate' option is deprecated. This syntax is equivalent to\n" -" 'svn relocate FROM-PREFIX TO-PREFIX [PATH]'.\n" -"\n" -" See also 'svn help update' for a list of possible characters\n" -" reporting the action taken.\n" -"\n" -" Examples:\n" -" svn switch ^/branches/1.x-release\n" -" svn switch --relocate http:// svn://\n" -" svn switch --relocate http://www.example.com/repo/project \\\n" -" svn://svn.example.com/repo/project\n" msgstr "" -"Uppdatera arbetskopian till en annan URL inom samma arkiv.\n" -"användning: 1. switch URL[@FIXREV] [SÖKVÄG]\n" -" 2. switch --relocate FRÅN-PREFIX TILL-PREFIX [SÖKVÄG...]\n" -"\n" -" 1. Uppdatera arbetskopian så att den återspeglar en ny URL i arkivet.\n" -" Detta liknar hur \"svn update\" beter sig och är det sätt på vilket\n" -" man flyttar en arbetskopia till en gren eller ett märke inom ett\n" -" och samma arkiv. Om FIXREV anges bestämmer den i vilken revision som\n" -" målet ursprunglingen slås upp.\n" -"\n" " Om --force används, orsakar icke versionshanterade sökvägar som är i\n" " vägen inte automatiskt att operationen misslyckas vid försök att lägga\n" " till dem. Om sökvägen som är i vägen är av samma typ (fil eller\n" @@ -16854,75 +17746,129 @@ msgstr "" " filer att betraktas som lokala ändringar i arbetskopian. Samtliga\n" " egenskaper i arkivet läggs till för sökvägar som är i vägen.\n" "\n" + +#: ../svn/svn.c:1859 +msgid "" +" Use the --set-depth option to set a new working copy depth on the\n" +" targets of this operation.\n" +"\n" +msgstr "" " Använd väljaren --set-depth för att ange ett nytt arbetskopiedjup för\n" " målet för denna handling.\n" "\n" + +#: ../svn/svn.c:1862 +msgid "" +" By default, Subversion will refuse to switch a working copy path to\n" +" a new URL with which it shares no common version control ancestry.\n" +" Use the '--ignore-ancestry' option to override this sanity check.\n" +"\n" +msgstr "" " Normalt vägrar Subversion att växla en sökväg i en arbetskopia till\n" " en ny URL utan gemensamt ursprung i versionshanteringen. Använd\n" " flaggan \"--ignore-ancestry\" för att kringgå denna kontroll.\n" "\n" + +#: ../svn/svn.c:1866 +msgid "" +" 2. The '--relocate' option is deprecated. This syntax is equivalent to\n" +" 'svn relocate FROM-PREFIX TO-PREFIX [PATH]'.\n" +"\n" +msgstr "" " 2. Flaggan \"--relocate\" är föråldrad. Denna syntax motsvaras nu av\n" " \"svn relocate FRÅN-PREFIX TILL-PREFIX [SÖKVÄG]\".\n" "\n" + +#: ../svn/svn.c:1869 +msgid "" +" See also 'svn help update' for a list of possible characters\n" +" reporting the action taken.\n" +"\n" +msgstr "" " Se även \"svn help update\" för en lista av möjliga tecken som indikerar\n" " vad som gjorts.\n" "\n" + +#: ../svn/svn.c:1872 +msgid "" +" Examples:\n" +" svn switch ^/branches/1.x-release\n" +" svn switch --relocate http:// svn://\n" +" svn switch --relocate http://www.example.com/repo/project \\\n" +" svn://svn.example.com/repo/project\n" +msgstr "" " Exempel:\n" " svn switch ^/branches/1.x-utgåva\n" " svn switch --relocate http:// svn://\n" " svn switch --relocate http://www.exempel.se/arkiv/projekt \\\n" " svn://svn.exempel.se/arkiv/projekt\n" -#: ../svn/svn.c:1833 +#: ../svn/svn.c:1882 msgid "allow switching to a node with no common ancestor" msgstr "tillåt växling till en nod utan gemensamt ursprung" -#: ../svn/svn.c:1835 ../svn/svn.c:1897 +#: ../svn/svn.c:1884 ../svn/svn.c:1948 msgid "handle unversioned obstructions as changes" msgstr "" "behandla ej versionshanterade blockeringar\n" " som ändringar" -#: ../svn/svn.c:1836 +#: ../svn/svn.c:1885 msgid "deprecated; use 'svn relocate'" msgstr "föråldrat; använd \"svn relocate\"" -#: ../svn/svn.c:1840 +#: ../svn/svn.c:1889 msgid "" "Unlock working copy paths or URLs.\n" "usage: unlock TARGET...\n" "\n" -" Use --force to break a lock held by another user or working copy.\n" msgstr "" "Lås upp sökvägar i en arbetskopia eller URL:er.\n" "användning: unlock MÅL...\n" "\n" -"Använd --force för att \"bryta upp\" ett lås som hålls av en annan användare\n" -"eller arbetskopia.\n" -#: ../svn/svn.c:1845 +#: ../svn/svn.c:1892 +msgid " Use --force to break a lock held by another user or working copy.\n" +msgstr "" +" Använd --force för att \"bryta upp\" ett lås som hålls av en annan användare\n" +" eller arbetskopia.\n" + +#: ../svn/svn.c:1895 msgid "break locks" msgstr "bryt upp lås" -#: ../svn/svn.c:1848 +#: ../svn/svn.c:1898 msgid "" "Bring changes from the repository into the working copy.\n" "usage: update [PATH...]\n" "\n" +msgstr "" +"Inför ändringar från arkivet i arbetskopian.\n" +"användning: update [SÖKVÄG...]\n" +"\n" + +#: ../svn/svn.c:1901 +msgid "" " If no revision is given, bring working copy up-to-date with HEAD rev.\n" " Else synchronize working copy to revision given by -r.\n" "\n" +msgstr "" +" Om ingen revision anges, görs arbetskopian aktuell enligt huvudrevisionen.\n" +" Annars synkroniseras arbetskopian med den revision som anges med -r.\n" +"\n" + +#: ../svn/svn.c:1904 +msgid "" " For each updated item a line will be printed with characters reporting\n" " the action taken. These characters have the following meaning:\n" "\n" -" A Added\n" -" D Deleted\n" -" U Updated\n" -" C Conflict\n" -" G Merged\n" -" E Existed\n" -" R Replaced\n" +msgstr "" +" För varje uppdaterat objekt visas en rad vars första tecken indikerar\n" +" vad som gjorts. Dessa tecken har följande innebörd:\n" "\n" + +#: ../svn/svn.c:1915 +msgid "" " Characters in the first column report about the item itself.\n" " Characters in the second column report about properties of the item.\n" " A 'B' in the third column signifies that the lock for the file has\n" @@ -16931,44 +17877,7 @@ msgid "" " the first and second columns indicate textual conflicts in files\n" " and in property values, respectively.\n" "\n" -" If --force is used, unversioned obstructing paths in the working\n" -" copy do not automatically cause a failure if the update attempts to\n" -" add the same path. If the obstructing path is the same type (file\n" -" or directory) as the corresponding path in the repository it becomes\n" -" versioned but its contents are left 'as-is' in the working copy.\n" -" This means that an obstructing directory's unversioned children may\n" -" also obstruct and become versioned. For files, any content differences\n" -" between the obstruction and the repository are treated like a local\n" -" modification to the working copy. All properties from the repository\n" -" are applied to the obstructing path. Obstructing paths are reported\n" -" in the first column with code 'E'.\n" -"\n" -" If the specified update target is missing from the working copy but its\n" -" immediate parent directory is present, checkout the target into its\n" -" parent directory at the specified depth. If --parents is specified,\n" -" create any missing parent directories of the target by checking them\n" -" out, too, at depth=empty.\n" -"\n" -" Use the --set-depth option to set a new working copy depth on the\n" -" targets of this operation.\n" msgstr "" -"Inför ändringar från arkivet i arbetskopian.\n" -"användning: update [SÖKVÄG...]\n" -"\n" -" Om ingen revision anges, görs arbetskopian aktuell enligt huvudrevisionen.\n" -" Annars synkroniseras arbetskopian med den revision som anges med -r.\n" -"\n" -" För varje uppdaterat objekt visas en rad vars första tecken indikerar\n" -" vad som gjorts. Dessa tecken har följande innebörd:\n" -"\n" -" A Tillagt\n" -" D Raderat\n" -" U Uppdaterat\n" -" C Konflikt\n" -" G Sammanslaget\n" -" E Fanns redan\n" -" R Ersatt\n" -"\n" " Tecken i första kolumnen står för objektet i sig.\n" " Tecken i andra kolumnen står för objektets egenskaper.\n" " Ett \"B\" i tredje kolumnen visar att ett lås har blivit stulet eller brutet.\n" @@ -16976,6 +17885,22 @@ msgstr "" " första och andra kolumnerna innebär textkonflikter i filer respektive\n" " egenskaper.\n" "\n" + +#: ../svn/svn.c:1923 +msgid "" +" If --force is used, unversioned obstructing paths in the working\n" +" copy do not automatically cause a failure if the update attempts to\n" +" add the same path. If the obstructing path is the same type (file\n" +" or directory) as the corresponding path in the repository it becomes\n" +" versioned but its contents are left 'as-is' in the working copy.\n" +" This means that an obstructing directory's unversioned children may\n" +" also obstruct and become versioned. For files, any content differences\n" +" between the obstruction and the repository are treated like a local\n" +" modification to the working copy. All properties from the repository\n" +" are applied to the obstructing path. Obstructing paths are reported\n" +" in the first column with code 'E'.\n" +"\n" +msgstr "" " Om --force används, orsakar icke versionshanterade sökvägar som är i\n" " vägen inte automatiskt att operationen misslyckas vid försök att lägga till\n" " dem. Om sökvägen som är i vägen är av samma typ (fil eller katalog)\n" @@ -16988,245 +17913,443 @@ msgstr "" " sökvägar som är i vägen. Sökvägar som är i vägen rapporteras i första\n" " kolumnen med ett \"E\".\n" "\n" + +#: ../svn/svn.c:1935 +msgid "" +" If the specified update target is missing from the working copy but its\n" +" immediate parent directory is present, checkout the target into its\n" +" parent directory at the specified depth. If --parents is specified,\n" +" create any missing parent directories of the target by checking them\n" +" out, too, at depth=empty.\n" +"\n" +msgstr "" " Om det angivna uppdateringsmålet saknas i arbetskopian men dess\n" " omedelbara föräldrakatalog finns, så kommer målet hämtas till dess\n" " föräldrakatalog på det angivna djupet. Om flaggan --parents anges kommer\n" " målets saknade föräldrakataloger skapas genom att även de hämtas, med\n" " djupet \"empty\".\n" "\n" + +#: ../svn/svn.c:1941 +msgid "" +" Use the --set-depth option to set a new working copy depth on the\n" +" targets of this operation.\n" +msgstr "" " Använd väljaren --set-depth för att ange ett nytt arbetskopiedjup för\n" " målet för denna handling.\n" -#: ../svn/svn.c:1900 +#: ../svn/svn.c:1951 msgid "" "Upgrade the metadata storage format for a working copy.\n" "usage: upgrade [WCPATH...]\n" "\n" -" Local modifications are preserved.\n" msgstr "" "Uppgradera lagringsformatet för en arbetskopia.\n" "användning: upgrade [AKSÖKVÄG...]\n" "\n" -" Lokala ändringar behålls som de är.\n" -#: ../svn/svn.c:1907 +#: ../svn/svn.c:1954 +msgid " Local modifications are preserved.\n" +msgstr " Lokala ändringar behålls som de är.\n" + +#: ../svn/svn.c:1959 msgid "" -"Put a local change aside, as if putting it on a shelf.\n" -"usage: 1. x-shelve [--keep-local] NAME [PATH...]\n" -" 2. x-shelve --delete NAME\n" -" 3. x-shelve --list\n" +"Show shelved changes as a diff.\n" +"usage: x-shelf-diff SHELF [VERSION]\n" "\n" -" 1. Save the local change in the given PATHs to a patch file, and\n" -" revert that change from the WC unless '--keep-local' is given.\n" -" If a log message is given with '-m' or '-F', include it at the\n" -" beginning of the patch file.\n" -"\n" -" 2. Delete the shelved change NAME.\n" -" (A backup is kept, named with a '.bak' extension.)\n" +msgstr "" +"Visa ändringar på hyllan som en ändringsfil.\n" +"användning: x-shelf-diff HYLLA [VERSION]\n" "\n" -" 3. List shelved changes. Include the first line of any log message\n" -" and some details about the contents of the change, unless '-q' is\n" -" given.\n" + +#: ../svn/svn.c:1962 +msgid "" +" Show the changes in SHELF:VERSION (default: latest) as a diff.\n" "\n" -" The kinds of change you can shelve are those supported by 'svn diff'\n" -" and 'svn patch'. The following are currently NOT supported:\n" -" mergeinfo changes, copies, moves, mkdir, rmdir,\n" -" 'binary' content, uncommittable states\n" +msgstr "" +" Visa ändringarna i HYLLA:VERSION (skönsvärde: senaste) som en\n" +" ändringsfil.\n" "\n" -" To bring back a shelved change, use 'svn x-unshelve NAME'.\n" + +#: ../svn/svn.c:1964 +msgid "" +" See also: 'svn diff --cl=svn:shelf:SHELF' which supports most options of\n" +" 'svn diff'.\n" "\n" -" Shelved changes are stored in /.svn/shelves/\n" +msgstr "" +" Se även: \"svn diff --cl=svn:shelf:HYLLA\" som tillåter de flesta av\n" +" väljarna för \"svn diff\".\n" "\n" + +#: ../svn/svn.c:1967 ../svn/svn.c:1980 ../svn/svn.c:1993 ../svn/svn.c:2005 +#: ../svn/svn.c:2017 ../svn/svn.c:2032 ../svn/svn.c:2066 ../svn/svn.c:2099 +msgid "" " The shelving feature is EXPERIMENTAL. This command is likely to change\n" " in the next release, and there is no promise of backward compatibility.\n" msgstr "" -"Lägg en lokal ändring åt sidan, som om den lades på hyllan.\n" -"användning: 1. x-shelve [--keep-local] NAMN [SÖKVÄG...]\n" -" 2. x-shelve --delete NAMN\n" -" 3. x-shelve --list\n" +" Hyllfunktionen är EXPERIMENTELL. Detta kommando kommer troligen\n" +" ändras i nästa utgåva, och ingen bakåtkompatibilitet utlovas.\n" + +#: ../svn/svn.c:1974 +msgid "" +"Delete a shelf.\n" +"usage: x-shelf-drop SHELF [PATH ...]\n" +"\n" +msgstr "" +"Radera en hylla.\n" +"användning: x-shelf-drop HYLLA [SÖKVÄG ...]\n" "\n" -" 1. Spara den lokala ändringen av givna SÖKVÄGar till en patchfil, och\n" -" återställ denna ändring från arbetskopian såvida inte \"--keep-local\"\n" -" anges. Om ett loggmeddelande ges med \"-m\" eller \"-F\", ta med det\n" -" i början av patchfilen.\n" + +#: ../svn/svn.c:1977 +msgid "" +" Delete the shelves named SHELF from the working copies containing PATH\n" +" (default PATH is '.')\n" "\n" -" 2. Radera ändringen NAMN från hyllan.\n" -" (En säkerhetskopia finns kvar med filslutet \".bak\".)\n" +msgstr "" +" Radera hyllorna med namn HYLLA från arbetskopiorna som innehåller SÖKVÄG\n" +" (\".\" om ingen anges)\n" "\n" -" 3. Lista ändringar på hyllan. Den första raden av loggmeddelandet och\n" -" vissa detaljer om ändringens innehåll tas med, såvida inte \"-q\"\n" -" anges.\n" + +#: ../svn/svn.c:1986 +msgid "" +"List shelves.\n" +"usage: x-shelf-list [PATH ...]\n" "\n" -" Ändringar som kan läggas på hyllan är de som stöds av \"svn diff\" och\n" -" \"svn patch\". Följande slag av ändringar stöds för närvarande INTE:\n" -" mergeinfo-ändring, kopiering, flytt, mkdir, rmdir,\n" -" \"binärt\" innehåll, ej arkiverbara tillstånd\n" +msgstr "" +"Lista hyllor.\n" +"användning: x-shelf-list [SÖKVÄG ...]\n" "\n" -" För att återfå en ändring från hyllan, använd \"svn x-unshelve NAMN\".\n" + +#: ../svn/svn.c:1989 +msgid "" +" List shelves for each working copy containing PATH (default is '.')\n" +" Include the first line of any log message and some details about the\n" +" contents of the shelf, unless '-q' is given.\n" "\n" -" Ändringar på hyllan lagras i /.svn/shelves/\n" +msgstr "" +" Lista hyllor för varje arbetskopia som innehåller SÖKVÄG (\".\" om ej angiven).\n" +" Ta med den första raden av loggmeddelanden och en del detaljer om hyllans\n" +" innehåll, om inte väljaren \"-q\" anges.\n" "\n" -" Hyllfunktionen är EXPERIMENTELL. Detta kommando kommer troligen\n" -" ändras i nästa utgåva, och ingen bakåtkompatibilitet utlovas.\n" -#: ../svn/svn.c:1943 +#: ../svn/svn.c:2000 msgid "" -"Bring a shelved change back to a local change in the WC.\n" -"usage: 1. x-unshelve [--keep-shelved] [NAME]\n" -" 2. x-unshelve --list\n" +"List which shelf affects each path.\n" +"usage: x-shelf-list-by-paths [PATH...]\n" +"\n" +msgstr "" +"Lista hyllor som påverkar givna sökvägar.\n" +"användning: x-shelf-list-by-paths [SÖKVÄG...]\n" "\n" -" 1. Apply the shelved change NAME to the working copy.\n" -" Delete the patch unless the '--keep-shelved' option is given.\n" -" (A backup is kept, named with a '.bak' extension.)\n" -" NAME defaults to the most recent shelved change.\n" + +#: ../svn/svn.c:2003 +msgid "" +" List which shelf most recently affects each path below the given PATHs.\n" "\n" -" 2. List shelved changes. Include the first line of any log message\n" -" and some details about the contents of the change, unless '-q' is\n" -" given.\n" +msgstr "" +" Lista hyllorna som senast påverkar varje sökväg under givna SÖKVÄGar.\n" "\n" -" Any conflict between the change being unshelved and a change\n" -" already in the WC is handled the same way as by 'svn patch',\n" -" creating a 'reject' file.\n" + +#: ../svn/svn.c:2011 +msgid "" +"Show the versions of a shelf.\n" +"usage: x-shelf-log SHELF [PATH...]\n" "\n" -" The shelving feature is EXPERIMENTAL. This command is likely to change\n" -" in the next release, and there is no promise of backward compatibility.\n" msgstr "" -"Hämta tillbaka en ändring från hyllan som en lokal ändring\n" -" i arbetskopian.\n" -"användning: 1. x-unshelve [--keep-shelved] [NAMN]\n" -" 2. x-unshelve --list\n" +"Visa en hyllas versioner.\n" +"användning: x-shelf-log HYLLA [SÖKVÄG...]\n" "\n" -" 1. Anbringa ändringen NAME från hyllan på arbetskopian.\n" -" Radera patchen såvida inte väljaren \"--keep-shelved\" anges.\n" -" (En säkerhetskopia finns kvar med filslutet \".bak\".)\n" + +#: ../svn/svn.c:2014 +msgid "" +" Show all versions of SHELF for each working copy containing PATH (the\n" +" default PATH is '.').\n" "\n" -" 2. Lista ändringar på hyllan. Den första raden av loggmeddelandet och\n" -" vissa detaler om ändringens innehåll tas med, såvida inte \"-q\"\n" -" anges.\n" +msgstr "" +" Visa alla versioner på HYLLA för varje arbetskopia som innehåller SÖKVÄG\n" +" (\".\" om ingen anges).\n" "\n" -" Konflikter mellan ändringen som tas från hyllan och en ändring som\n" -" redan finns i arbetskopian hanteras på samma sätt som av \"svn patch\",\n" -" och orsakar en \"reject\"-fil.\n" + +#: ../svn/svn.c:2024 +msgid "" +"Copy local changes onto a new version of a shelf.\n" +"usage: x-shelf-save SHELF [PATH...]\n" +"\n" +msgstr "" +"Kopiera lokala ändringar till en ny version av en hylla.\n" +"användning: x-shelf-save HYLLA [SÖKVÄG...]\n" "\n" -" Hyllfunktionen är EXPERIMENTELL. Detta kommando kommer troligen\n" -" ändras i nästa utgåva, och ingen bakåtkompatibilitet utlovas.\n" -#: ../svn/svn.c:1966 +#: ../svn/svn.c:2027 msgid "" -"List shelved changes.\n" -"usage: x-shelves\n" +" Save local changes in the given PATHs as a new version of SHELF.\n" +" The shelf's log message can be set with -m, -F, etc.\n" "\n" -" The shelving feature is EXPERIMENTAL. This command is likely to change\n" -" in the next release, and there is no promise of backward compatibility.\n" msgstr "" -"Lista ändringar på hyllan.\n" -"användning: x-shelves\n" +" Spara lokala ändringar i givna SÖKVÄGar som en ny version av HYLLA.\n" +" Hyllans loggmeddelande kan anges med -m, -F, osv.\n" "\n" -" Hyllfunktionen är EXPERIMENTELL. Detta kommando kommer troligen\n" -" ändras i nästa utgåva, och ingen bakåtkompatibilitet utlovas.\n" -#: ../svn/svn.c:2146 ../svnbench/svnbench.c:468 ../svnlook/svnlook.c:2556 +#: ../svn/svn.c:2030 +msgid "" +" The same as 'svn shelve --keep-local'.\n" +"\n" +msgstr "" +" Samma som \"svn shelve --keep-local\".\n" +"\n" + +#: ../svn/svn.c:2042 +msgid "" +"Move local changes onto a shelf.\n" +"usage: x-shelve [--keep-local] SHELF [PATH...]\n" +"\n" +msgstr "" +"Flytta lokala ändringar till en hylla.\n" +"användning: x-shelve [--keep-local] HYLLA [SÖKVÄG...]\n" +"\n" + +#: ../svn/svn.c:2045 +msgid "" +" Save the local changes in the given PATHs to a new or existing SHELF.\n" +" Revert those changes from the WC unless '--keep-local' is given.\n" +" The shelf's log message can be set with -m, -F, etc.\n" +"\n" +msgstr "" +" Spara lokala ändringar i angivna SÖKVÄGar i en ny eller befintlig HYLLA.\n" +" Återställ dessa ändringar från arbetskopian om inte \"--keep-local\" anges.\n" +" Hyllans loggmeddelande kan anges med -m, -F, osv.\n" +"\n" + +#: ../svn/svn.c:2049 +msgid "" +" 'svn shelve --keep-local' is the same as 'svn shelf-save'.\n" +"\n" +msgstr "" +" \"svn shelve --keep-local\" är samma som \"svn shelf-save\".\n" +"\n" + +#: ../svn/svn.c:2051 +msgid "" +" The kinds of change you can shelve are committable changes to files and\n" +" properties, except the following kinds which are not yet supported:\n" +" * copies and moves\n" +" * mkdir and rmdir\n" +" Uncommittable states such as conflicts, unversioned and missing cannot\n" +" be shelved.\n" +"\n" +msgstr "" +" Ändringar som kan läggas på hyllan är arkiveringsbara ändringar till filer\n" +" och egenskaper, förutom följande som inte stöds än:\n" +" * kopieringar och flyttningar\n" +" * mkdir och rmdir\n" +" Ej arkiveringsbara tillstånd som konflikter, ej versionshanterade eller\n" +" saknade filer kan inte läggas på hyllan.\n" +"\n" + +#: ../svn/svn.c:2058 +msgid "" +" To bring back shelved changes, use 'svn unshelve SHELF'.\n" +"\n" +msgstr "" +" För att återfå ändringar från hyllan, använd \"svn unshelve HYLLA\".\n" +"\n" + +#: ../svn/svn.c:2060 +msgid "" +" Shelves are currently stored under /.svn/experimental/shelves/ .\n" +" (In Subversion 1.10, shelves were stored under /.svn/shelves/ as\n" +" patch files. To recover a shelf created by 1.10, either use a 1.10\n" +" client to find and unshelve it, or find the patch file and use any\n" +" 1.10 or later 'svn patch' to apply it.)\n" +"\n" +msgstr "" +" Hyllor lagras för närvarande under /.svn/experimental/shelves/.\n" +" (I Subversion 1.10 lagrades hyllor under /.svn/shelves/ som\n" +" ändringsfiler. För att återfå en hylla skapad av version 1.10, anbringa\n" +" antingen hyllan med klient version 1.10, eller hitta ändringsfilen och\n" +" anbringa den med \"svn patch\" med klient 1.10 eller senare.)\n" +"\n" + +#: ../svn/svn.c:2075 +msgid "" +"Copy shelved changes back into the WC.\n" +"usage: x-unshelve [--drop] [SHELF [VERSION]]\n" +"\n" +msgstr "" +"Kopiera tillbaka ändringar från hyllan till arbetskopian.\n" +"användning: x-unshelve [--drop] [HYLLA [VERSION]]\n" +"\n" + +#: ../svn/svn.c:2078 +msgid "" +" Apply the changes stored in SHELF to the working copy.\n" +" SHELF defaults to the newest shelf.\n" +"\n" +msgstr "" +" Anbringa ändringar från HYLLA till arbetskopian.\n" +" Den nyaste hyllan används om HYLLA inte anges.\n" +"\n" + +#: ../svn/svn.c:2081 +msgid "" +" Apply the newest version of the shelf, by default. If VERSION is\n" +" specified, apply that version and discard all versions newer than that.\n" +" In any case, retain the unshelved version and versions older than that\n" +" (unless --drop is specified).\n" +"\n" +msgstr "" +" Anbringa normalt ändringar från den nyaste versionen av hyllan. Om VERSION\n" +" anges, använd den versionen och släng bort alla nyare versioner.\n" +" I båda fallen behålls versionen som användes från hyllan och alla äldre\n" +" versioner (såvida inte --drop anges).\n" +"\n" + +#: ../svn/svn.c:2086 +msgid "" +" With --drop, delete the entire shelf (like 'svn shelf-drop') after\n" +" successfully unshelving with no conflicts.\n" +"\n" +msgstr "" +" Med --drop, radera hela hyllan (som med \"svn shelf-drop\") efter att ha\n" +" lyckats anbringa ändringen utan konflikter.\n" +"\n" + +#: ../svn/svn.c:2089 +msgid "" +" The working files involved should be in a clean, unmodified state\n" +" before using this command. To roll back to an older version of the\n" +" shelf, first ensure any current working changes are removed, such as\n" +" by shelving or reverting them, and then unshelve the desired version.\n" +"\n" +msgstr "" +" Filerna i arbetskopian bör vara i ett rent och oförändrat tillstånd innan\n" +" detta kommando används. För att återgå till en äldre version av hyllan,\n" +" se först till att eventuella ändringar i arbetskopian tas bort, genom att\n" +" återställa dem eller lägga dem på hyllan, och återställ därefter den\n" +" önskade versionen från hyllan.\n" +"\n" + +#: ../svn/svn.c:2094 +msgid "" +" Unshelve normally refuses to apply any changes if any path involved is\n" +" already modified (or has any other abnormal status) in the WC. With\n" +" --force, it does not check and may error out and/or produce partial or\n" +" unexpected results.\n" +"\n" +msgstr "" +" Kopiering från hyllan kräver vanligen att ingen inblandad sökväg redan har\n" +" ändrats (eller är i annat onormalt tillstånd) i arbetskopian. Med --force\n" +" tas denna kontroll bort och kommandot kan gå fel och/eller ge upphov till\n" +" halvfärdiga eller oväntade resultat.\n" +"\n" + +#: ../svn/svn.c:2180 +#, c-format +msgid "'%s' is not a valid --x-viewspec value" +msgstr "\"%s\" är inte ett giltigt värde för --x-viewspec" + +#: ../svn/svn.c:2292 ../svnbench/svnbench.c:474 ../svnlook/svnlook.c:2590 msgid "Non-numeric limit argument given" msgstr "Argumentet till limit-flaggan är inget tal" -#: ../svn/svn.c:2151 ../svnbench/svnbench.c:473 ../svnlook/svnlook.c:2561 +#: ../svn/svn.c:2297 ../svnbench/svnbench.c:479 ../svnlook/svnlook.c:2595 msgid "Argument to --limit must be positive" msgstr "Argumentet till --limit måste vara positivt" -#: ../svn/svn.c:2171 ../svn/svn.c:2449 +#: ../svn/svn.c:2317 ../svn/svn.c:2592 msgid "Can't specify -c with --old" msgstr "Kan inte ange -c med --old" -#: ../svn/svn.c:2201 ../svnbench/svnbench.c:509 +#: ../svn/svn.c:2347 ../svnbench/svnbench.c:515 #, c-format msgid "Negative number in range (%s) not supported with -c" msgstr "Negativt tal i område (%s) stöds ej med -c" -#: ../svn/svn.c:2213 ../svnbench/svnbench.c:521 +#: ../svn/svn.c:2359 ../svnbench/svnbench.c:527 #, c-format msgid "Non-numeric change argument (%s) given to -c" msgstr "Argumentet till flaggan -c (%s) är inget tal" -#: ../svn/svn.c:2220 ../svnbench/svnbench.c:528 +#: ../svn/svn.c:2366 ../svnbench/svnbench.c:534 msgid "There is no change 0" msgstr "Ändring 0 finns inte" -#: ../svn/svn.c:2261 ../svnadmin/svnadmin.c:2865 ../svnbench/svnbench.c:570 -#: ../svnfsfs/svnfsfs.c:291 ../svnrdump/svnrdump.c:855 -#: ../svnsync/svnsync.c:2141 +#: ../svn/svn.c:2407 ../svnadmin/svnadmin.c:2932 ../svnbench/svnbench.c:576 +#: ../svnfsfs/svnfsfs.c:303 ../svnrdump/svnrdump.c:861 +#: ../svnsync/svnsync.c:2146 #, c-format msgid "Syntax error in revision argument '%s'" msgstr "Syntaxfel i revisionsargumentet \"%s\"" -#: ../svn/svn.c:2327 ../svn/svn.c:2344 ../svnbench/svnbench.c:609 +#: ../svn/svn.c:2470 ../svn/svn.c:2487 ../svnbench/svnbench.c:615 #, c-format msgid "Error converting depth from locale to UTF-8" msgstr "Fel vid konvertering av djupet från lokal kodning till UTF-8" -#: ../svn/svn.c:2334 ../svnbench/svnbench.c:616 +#: ../svn/svn.c:2477 ../svnbench/svnbench.c:622 #, c-format msgid "'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'" msgstr "\"%s\" är inget giltigt djup; försök med \"empty\", \"files\", \"immediates\" eller \"infinity\"" -#: ../svn/svn.c:2351 +#: ../svn/svn.c:2494 #, c-format msgid "'%s' is not a valid depth; try 'exclude', 'empty', 'files', 'immediates', or 'infinity'" msgstr "\"%s\" är inget giltigt djup; försök med \"exclude\", \"empty\", \"files\", \"immediates\" eller \"infinity\"" -#: ../svn/svn.c:2486 +#: ../svn/svn.c:2629 #, c-format msgid "Syntax error in native-eol argument '%s'" msgstr "Syntaxfel i native-eol-argumentet \"%s\"" -#: ../svn/svn.c:2505 +#: ../svn/svn.c:2650 msgid "Changelist names must not be empty" msgstr "Ändringslistor får inte ha tomma namn" -#: ../svn/svn.c:2539 +#: ../svn/svn.c:2683 #, c-format msgid "'%s' is not a valid --accept value" msgstr "\"%s\" är inte ett giltigt värde för --accept" -#: ../svn/svn.c:2547 +#: ../svn/svn.c:2691 #, c-format msgid "'%s' is not a valid --show-revs value" msgstr "\"%s\" är inte ett giltigt värde för --show-revs" -#: ../svn/svn.c:2563 +#: ../svn/svn.c:2707 #, c-format msgid "Invalid strip count '%s'" msgstr "Ogiltigt antal att ta bort: \"%s\"" -#: ../svn/svn.c:2569 +#: ../svn/svn.c:2713 msgid "Argument to --strip must be positive" msgstr "Argumentet till --strip måste vara positivt" -#: ../svn/svn.c:2660 ../svnmucc/svnmucc.c:666 ../svnrdump/svnrdump.c:934 -#: ../svnsync/svnsync.c:2199 +#: ../svn/svn.c:2809 ../svnmucc/svnmucc.c:666 ../svnrdump/svnrdump.c:940 +#: ../svnsync/svnsync.c:2204 msgid "--non-interactive and --force-interactive are mutually exclusive" msgstr "--non-interactive och --force-interactive kan inte användas samtidigt" -#: ../svn/svn.c:2713 ../svnbench/svnbench.c:750 -#: ../svndumpfilter/svndumpfilter.c:1425 ../svnlook/svnlook.c:2660 +#: ../svn/svn.c:2862 ../svnbench/svnbench.c:756 +#: ../svndumpfilter/svndumpfilter.c:1428 ../svnlook/svnlook.c:2694 #, c-format msgid "Subcommand argument required\n" msgstr "Argument för underkommando krävs\n" -#: ../svn/svn.c:2731 ../svnadmin/svnadmin.c:3091 ../svnbench/svnbench.c:768 -#: ../svndumpfilter/svndumpfilter.c:1442 ../svnfsfs/svnfsfs.c:367 -#: ../svnlook/svnlook.c:2677 ../svnrdump/svnrdump.c:978 +#: ../svn/svn.c:2880 ../svnadmin/svnadmin.c:3158 ../svnbench/svnbench.c:774 +#: ../svndumpfilter/svndumpfilter.c:1445 ../svnfsfs/svnfsfs.c:379 +#: ../svnlook/svnlook.c:2711 ../svnrdump/svnrdump.c:984 #, c-format msgid "Unknown subcommand: '%s'\n" msgstr "Okänt underkommando: \"%s\"\n" -#: ../svn/svn.c:2740 +#: ../svn/svn.c:2889 #, c-format msgid "Undo is done using either the 'svn revert' or the 'svn merge' command.\n" msgstr "" "Återgång till tidigare tillstånd görs med antingen \"svn revert\"\n" "eller \"svn merge\".\n" -#: ../svn/svn.c:2776 +#: ../svn/svn.c:2925 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" @@ -17235,99 +18358,99 @@ msgstr "" "Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n" "Skriv \"svn help %s\" för användning.\n" -#: ../svn/svn.c:2791 ../svnbench/svnbench.c:816 +#: ../svn/svn.c:2940 ../svnbench/svnbench.c:822 msgid "Multiple revision arguments encountered; can't specify -c twice, or both -c and -r" msgstr "Flera revisionsargument påträffades; -c kan inte anges flera gånger; -c och -r kan inte användas samtidigt" -#: ../svn/svn.c:2802 +#: ../svn/svn.c:2951 msgid "--depth and --set-depth are mutually exclusive" msgstr "--depth och --set-depth kan inte användas samtidigt" -#: ../svn/svn.c:2811 ../svnbench/svnbench.c:827 +#: ../svn/svn.c:2960 ../svnbench/svnbench.c:833 msgid "--with-all-revprops and --with-no-revprops are mutually exclusive" msgstr "--with-all-revprops och --with-no-revprops kan inte användas samtidigt" -#: ../svn/svn.c:2820 ../svnbench/svnbench.c:836 +#: ../svn/svn.c:2969 ../svnbench/svnbench.c:842 msgid "--with-revprop and --with-no-revprops are mutually exclusive" msgstr "--with-revprop och --with-no-revprops kan inte användas samtidigt" -#: ../svn/svn.c:2850 +#: ../svn/svn.c:2999 msgid "--message (-m) and --file (-F) are mutually exclusive" msgstr "--message (-m) och --file (-F) kan inte användas samtidigt" -#: ../svn/svn.c:2863 ../svnbench/svnbench.c:849 ../svnmucc/svnmucc.c:678 -#: ../svnrdump/svnrdump.c:1037 +#: ../svn/svn.c:3012 ../svnbench/svnbench.c:855 ../svnmucc/svnmucc.c:678 +#: ../svnrdump/svnrdump.c:1043 msgid "--trust-server-cert-failures requires --non-interactive" msgstr "--trust-server-cert-failures kräver --non-interactive" -#: ../svn/svn.c:2871 ../svnbench/svnbench.c:857 ../svnmucc/svnmucc.c:686 -#: ../svnrdump/svnrdump.c:1044 +#: ../svn/svn.c:3020 ../svnbench/svnbench.c:863 ../svnmucc/svnmucc.c:686 +#: ../svnrdump/svnrdump.c:1050 msgid "--password-from-stdin requires --non-interactive" msgstr "--password-from-stdin kräver --non-interactive" -#: ../svn/svn.c:2880 +#: ../svn/svn.c:3029 msgid "--diff-cmd and --internal-diff are mutually exclusive" msgstr "--diff-cmd och --internal-diff kan inte användas samtidigt" -#: ../svn/svn.c:2922 +#: ../svn/svn.c:3071 msgid "--relocate and --depth are mutually exclusive" msgstr "--relocate och --depth kan inte användas samtidigt" -#: ../svn/svn.c:2929 +#: ../svn/svn.c:3078 msgid "--relocate and --non-recursive (-N) are mutually exclusive" msgstr "--relocate och --non-recursive (-N) kan inte användas samtidigt" -#: ../svn/svn.c:3050 +#: ../svn/svn.c:3201 msgid "Log message file is a versioned file; use '--force-log' to override" msgstr "Filen med loggmeddelandet är versionshanterad; använd --force-log för att kringgå" -#: ../svn/svn.c:3057 +#: ../svn/svn.c:3208 msgid "Lock comment file is a versioned file; use '--force-log' to override" msgstr "Filen med låskommentaren är versionshanterad; använd --force-log för att kringgå" -#: ../svn/svn.c:3077 +#: ../svn/svn.c:3228 msgid "The log message is a pathname (was -F intended?); use '--force-log' to override" msgstr "Loggmeddelandet är en sökväg (avsågs -F?); använd --force-log för att kringgå" -#: ../svn/svn.c:3084 +#: ../svn/svn.c:3235 msgid "The lock comment is a pathname (was -F intended?); use '--force-log' to override" msgstr "Låskommentaren är en sökväg (avsågs -F?); använd --force-log för att kringgå" -#: ../svn/svn.c:3107 +#: ../svn/svn.c:3258 msgid "--auto-props and --no-auto-props are mutually exclusive" msgstr "--auto-props och --no-auto-props kan inte användas samtidigt" -#: ../svn/svn.c:3200 ../svn/svn.c:3207 +#: ../svn/svn.c:3351 ../svn/svn.c:3358 #, c-format msgid "--accept=%s incompatible with --non-interactive" msgstr "--accept=%s kan inte användas med --non-interactive" -#: ../svn/svn.c:3256 +#: ../svn/svn.c:3407 #, c-format msgid "Try 'svn help %s' for more information" msgstr "Skriv \"svn help %s\" för vidare information" -#: ../svn/svn.c:3262 ../svnbench/svnbench.c:1000 +#: ../svn/svn.c:3413 ../svnbench/svnbench.c:1006 msgid "Please see the 'svn upgrade' command" msgstr "Se kommandot \"svn upgrade\"" -#: ../svn/svn.c:3268 ../svnmucc/svnmucc.c:971 ../svnrdump/svnrdump.c:1137 +#: ../svn/svn.c:3419 ../svnmucc/svnmucc.c:971 ../svnrdump/svnrdump.c:1143 msgid "Authentication failed and interactive prompting is disabled; see the --force-interactive option" msgstr "Autentisering misslyckades och interaktiva frågor är avstängda; se flaggan --force-interactive" -#: ../svn/svn.c:3273 +#: ../svn/svn.c:3424 msgid "Reading file from standard input because of -F option; this can interfere with interactive prompting" msgstr "Läser filen från standardinmatningen eftersom flaggan -F angavs; detta kan påverka interaktiva frågor" -#: ../svn/svn.c:3284 ../svnbench/svnbench.c:1008 +#: ../svn/svn.c:3435 ../svnbench/svnbench.c:1014 msgid "Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)" msgstr "Kör \"svn cleanup\" för att ta bort lås (skriv \"svn help cleanup\" för mer information)" -#: ../svn/svn.c:3291 +#: ../svn/svn.c:3442 msgid "Another process is blocking the working copy database, or the underlying filesystem does not support file locking; if the working copy is on a network filesystem, make sure file locking has been enabled on the file server" msgstr "En annan process blockerar arbetskopians databas, eller så stöder det underliggande filsystemet inte fillåsning; om arbetskopian ligger på ett nätverksfilsystem, se till att filservern har fillåsning påslagen" -#: ../svn/svn.c:3304 +#: ../svn/svn.c:3455 msgid "When using svn+ssh:// URLs, keep in mind that the --username and --password options are ignored because authentication is performed by SSH, not Subversion" msgstr "När URL:er på formen svn+ssh:// används, kom ihåg att flaggorna --username och --password ej beaktas eftersom autentisering görs av SSH, inte av Subversion" @@ -17467,7 +18590,7 @@ msgid "svn: warning: '%s' is a binary mime-type but file '%s' looks like text; d msgstr "svn: varning: \"%s\" är en binär MIME-typ men filen \"%s\" ser ut som text; \"diff\", \"merge\", \"blame\" och andra kommandon kommer sluta fungera med denna fil\n" #: ../svnadmin/svnadmin.c:177 ../svnfsfs/svnfsfs.c:101 -#: ../svnrdump/svnrdump.c:106 +#: ../svnrdump/svnrdump.c:112 msgid "specify revision number ARG (or X:Y range)" msgstr "ange revisionsnummer ARG (eller ett område X:Y)" @@ -17604,7 +18727,7 @@ msgstr "" "använd ett arkivformat kompatibelt med\n" " Subversion-version ARG (\"1.5.5\", \"1.7\", osv)" -#: ../svnadmin/svnadmin.c:264 ../svnadmin/svnadmin.c:382 +#: ../svnadmin/svnadmin.c:264 ../svnadmin/svnadmin.c:402 msgid "read repository paths from file ARG" msgstr "läs arkivsökvägar från filen ARG" @@ -17670,76 +18793,106 @@ msgstr "" msgid "" "usage: svnadmin crashtest REPOS_PATH\n" "\n" -"Open the repository at REPOS_PATH, then abort, thus simulating\n" -"a process that crashes while holding an open repository handle.\n" msgstr "" "användning: svnadmin crashtest ARKIVSÖKVÄG\n" "\n" + +#: ../svnadmin/svnadmin.c:309 +msgid "" +"Open the repository at REPOS_PATH, then abort, thus simulating\n" +"a process that crashes while holding an open repository handle.\n" +msgstr "" "Öppna arkivet under ARKIVSÖKVÄG och avbryt därefter, vilket simulerar en\n" "process som kraschar då den har ett arkiv öppet.\n" -#: ../svnadmin/svnadmin.c:313 +#: ../svnadmin/svnadmin.c:315 msgid "" "usage: svnadmin create REPOS_PATH\n" "\n" -"Create a new, empty repository at REPOS_PATH.\n" msgstr "" "användning: svnadmin create ARKIVSÖKVÄG\n" "\n" -"Skapa ett nytt tomt arkiv under sökvägen ARKIVSÖKVÄG.\n" -#: ../svnadmin/svnadmin.c:322 +#: ../svnadmin/svnadmin.c:317 +msgid "Create a new, empty repository at REPOS_PATH.\n" +msgstr "Skapa ett nytt tomt arkiv under sökvägen ARKIVSÖKVÄG.\n" + +#: ../svnadmin/svnadmin.c:326 msgid "" "usage: 1. svnadmin delrevprop REPOS_PATH -r REVISION NAME\n" " 2. svnadmin delrevprop REPOS_PATH -t TXN NAME\n" "\n" +msgstr "" +"användning: 1. svnadmin delrevprop ARKIVSÖKVÄG -r REVISION NAMN\n" +" 2. svnadmin delrevprop ARKIVSÖKVÄG -t TRANS NAMN\n" +"\n" + +#: ../svnadmin/svnadmin.c:329 +msgid "" "1. Delete the property NAME on revision REVISION.\n" "\n" +msgstr "" +"1. Radera egenskapen NAMN i revision REVISION.\n" +"\n" + +#: ../svnadmin/svnadmin.c:331 ../svnadmin/svnadmin.c:556 +msgid "" "Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n" "trigger the revision property-related hooks (for example, if you want\n" "an email notification sent from your post-revprop-change hook).\n" "\n" -"NOTE: Revision properties are not versioned, so this command will\n" -"irreversibly destroy the previous value of the property.\n" -"\n" -"2. Delete the property NAME on transaction TXN.\n" msgstr "" -"användning: 1. svnadmin delrevprop ARKIVSÖKVÄG -r REVISION NAMN\n" -" 2. svnadmin delrevprop ARKIVSÖKVÄG -t TRANS NAMN\n" -"\n" -"1. Radera egenskapen NAMN i revision REVISION.\n" -"\n" "Använd --use-pre-revprop-change-hook/--use-post-revprop-change-hook för\n" "att starta krokskripten för revisionsegenskaper (till exempel\n" "för att få e-post skickad från krokskriptet post-revprop-change).\n" "\n" + +#: ../svnadmin/svnadmin.c:335 +msgid "" +"NOTE: Revision properties are not versioned, so this command will\n" +"irreversibly destroy the previous value of the property.\n" +"\n" +msgstr "" "Observera: Historik sparas ej för revisionsegenskaper, så detta kommando\n" "kastar bort egenskapens tidigare värde.\n" "\n" -"2. Radera egenskapen NAMN i transaktionen TRANS.\n" -#: ../svnadmin/svnadmin.c:335 +#: ../svnadmin/svnadmin.c:338 +msgid "2. Delete the property NAME on transaction TXN.\n" +msgstr "2. Radera egenskapen NAMN i transaktionen TRANS.\n" + +#: ../svnadmin/svnadmin.c:344 msgid "" "usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n" "\n" +msgstr "" +"användning: svnadmin deltify [-r BÖRJAN[:SLUT]] ARKIVSÖKVÄG\n" +"\n" + +#: ../svnadmin/svnadmin.c:346 +msgid "" "Run over the requested revision range, performing predecessor delti-\n" "fication on the paths changed in those revisions. Deltification in\n" "essence compresses the repository by only storing the differences or\n" "delta from the preceding revision. If no revisions are specified,\n" "this will simply deltify the HEAD revision.\n" msgstr "" -"användning: svnadmin deltify [-r BÖRJAN[:SLUT]] ARKIVSÖKVÄG\n" -"\n" "Gå igenom det angivna revisionsområdet och utför föregångardeltifiering av\n" "de sökvägar som ändrats i dessa revisioner. I stora drag komprimerar\n" "deltifieringen arkivet genom att endast lagra skillnader eller deltan\n" "jämfört med föregående revision. Om inga revisioner anges, deltifieras\n" "huvudrevisionen.\n" -#: ../svnadmin/svnadmin.c:344 +#: ../svnadmin/svnadmin.c:355 msgid "" "usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n" "\n" +msgstr "" +"användning: svnadmin dump ARKIVSÖKVÄG [-r BÖRJAN[:SLUT] [--incremental]]\n" +"\n" + +#: ../svnadmin/svnadmin.c:357 +msgid "" "Dump the contents of filesystem to stdout in a 'dumpfile'\n" "portable format, sending feedback to stderr. Dump revisions\n" "LOWER rev through UPPER rev. If no revisions are given, dump all\n" @@ -17750,12 +18903,7 @@ msgid "" "case, the second and subsequent revisions, if any, describe only paths\n" "changed in those revisions.)\n" "\n" -"Using --exclude or --include gives results equivalent to authz-based\n" -"path exclusions. In particular, when the source of a copy is\n" -"excluded, the copy is transformed into an add (unlike in 'svndumpfilter').\n" msgstr "" -"användning: svnadmin dump ARKIVSÖKVÄG [-r BÖRJAN[:SLUT] [--incremental]]\n" -"\n" "Skriv innehållet i filsystemet till standard ut i ett portabelt\n" "\"dumpfile\"-format med återkoppling till standard fel. Revisionerna BÖRJAN\n" "till och med SLUT skrivs ut. Om inga revisioner anges, skrivs samtliga\n" @@ -17766,120 +18914,169 @@ msgstr "" "revisioner därefter bara ta med sökvägarna som ändrades i varje enskild\n" "revision.)\n" "\n" + +#: ../svnadmin/svnadmin.c:367 +msgid "" +"Using --exclude or --include gives results equivalent to authz-based\n" +"path exclusions. In particular, when the source of a copy is\n" +"excluded, the copy is transformed into an add (unlike in 'svndumpfilter').\n" +msgstr "" "Väljarna --exclude och --include ger resultat som motsvarar authz-baserade\n" "sökvägsuteslutningar. I synnerhet, när kopieringskällan är utesluten\n" "omvandlas kopian till ett tillägg (till skillnad från \"svndumpfilter\").\n" -#: ../svnadmin/svnadmin.c:360 ../svnadmin/svnadmin.c:370 +#: ../svnadmin/svnadmin.c:373 ../svnadmin/svnadmin.c:385 msgid "write to file ARG instead of stdout" msgstr "skriv till filen ARG istället för standard ut" -#: ../svnadmin/svnadmin.c:363 +#: ../svnadmin/svnadmin.c:376 msgid "" "usage: svnadmin dump-revprops REPOS_PATH [-r LOWER[:UPPER]]\n" "\n" +msgstr "" +"användning: svnadmin dump-revprops ARKIVSÖKVÄG [-r BÖRJAN[:SLUT]]\n" +"\n" + +#: ../svnadmin/svnadmin.c:378 +msgid "" "Dump the revision properties of filesystem to stdout in a 'dumpfile'\n" "portable format, sending feedback to stderr. Dump revisions\n" "LOWER rev through UPPER rev. If no revisions are given, dump the\n" "properties for all revisions. If only LOWER is given, dump the\n" "properties for that one revision.\n" msgstr "" -"användning: svnadmin dump ARKIVSÖKVÄG [-r BÖRJAN[:SLUT] [--incremental]]\n" -"\n" -"Skriv innehållet i filsystemet till standard ut i ett portabelt\n" -"\"dumpfile\"-format med återkoppling till standard fel. Revisionerna BÖRJAN\n" -"till och med SLUT skrivs ut. Om inga revisioner anges skrivs samtliga\n" -"revisionsträd. Om endast BÖRJAN anges, skrivs det revisionsträdet.\n" +"Skriv revisionsegenskaperna i ett filsystem till standard ut i ett\n" +"portabelt \"dumpfile\"-format med återkoppling till standard fel.\n" +"Revisionerna BÖRJAN till och med SLUT skrivs ut. Om inga revisioner\n" +"anges skrivs egenskaperna för samtliga revisioner. Om endast BÖRJAN\n" +"anges kommer bara egenskaperna för den enda revisionen skrivas ut.\n" -#: ../svnadmin/svnadmin.c:373 +#: ../svnadmin/svnadmin.c:388 msgid "" -"usage: 1. svnadmin freeze REPOS_PATH PROGRAM [ARG...]\n" -" 2. svnadmin freeze -F FILE PROGRAM [ARG...]\n" +"usage: 1. svnadmin freeze REPOS_PATH -- PROGRAM [ARG...]\n" +" 2. svnadmin freeze -F FILE -- PROGRAM [ARG...]\n" +"\n" +msgstr "" +"användning: 1. svnadmin freeze ARKIVSÖKVÄG -- PROGRAM [ARGUMENT...]\n" +" 2. svnadmin freeze -F FIL -- PROGRAM [ARGUMENT...]\n" "\n" + +#: ../svnadmin/svnadmin.c:391 +msgid "" "1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n" " Allows safe use of third-party backup tools on a live repository.\n" "\n" -"2. Like 1 except all repositories listed in FILE are locked. The file\n" -" format is repository paths separated by newlines. Repositories are\n" -" locked in the same order as they are listed in the file.\n" msgstr "" -"användning: 1. svnadmin freeze ARKIVSÖKVÄG PROGRAM [ARGUMENT...]\n" -" 2. svnadmin freeze -F FIL PROGRAM [ARGUMENT...]\n" -"\n" "1. Kör PROGRAM med ARGUMENT samtidigt som ARKIVSÖKVÄG hålls låst för skrivning.\n" " Detta möjliggör säker användning av standardverktyg för säkerhetskopiering\n" " på ett arkiv under drift.\n" "\n" + +#: ../svnadmin/svnadmin.c:394 +msgid "" +"2. Like 1 except all repositories listed in FILE are locked. The file\n" +" format is repository paths separated by newlines. Repositories are\n" +" locked in the same order as they are listed in the file.\n" +"\n" +"The '--' tells svnadmin to stop looking for svnadmin options and pass\n" +"all later arguments to PROGRAM even if they begin with '-'.\n" +msgstr "" "2. Som i 1, men alla arkiv listade i FIL hålls låsta. Filens format är en\n" " arkivsökväg på varje rad. Arkiven låses i samma ordning som de står\n" " i filen.\n" +"\n" +"Argumentet \"--\" markerar slutet av väljare för svnadmin; resterande\n" +"argument skickas direkt till PROGRAM även om de börjar med \"-\".\n" -#: ../svnadmin/svnadmin.c:385 +#: ../svnadmin/svnadmin.c:405 msgid "" "usage: svnadmin help [SUBCOMMAND...]\n" "\n" -"Describe the usage of this program or its subcommands.\n" msgstr "" "användning: svnadmin help [UNDERKOMMANDO...]\n" "\n" -"Beskriver hur det här programmet och dess underkommandon används.\n" -#: ../svnadmin/svnadmin.c:390 +#: ../svnadmin/svnadmin.c:407 ../svnfsfs/svnfsfs.c:119 ../svnlook/svnlook.c:273 +#: ../svnrdump/svnrdump.c:103 ../svnsync/svnsync.c:172 +msgid "Describe the usage of this program or its subcommands.\n" +msgstr "Beskriver hur det här programmet och dess underkommandon används.\n" + +#: ../svnadmin/svnadmin.c:412 msgid "" "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n" "\n" +msgstr "" +"användning: svnadmin hotcopy ARKIVSÖKVÄG NY_ARKIVSÖKVÄG\n" +"\n" + +#: ../svnadmin/svnadmin.c:414 +msgid "" "Make a hot copy of a repository.\n" "If --incremental is passed, data which already exists at the destination\n" "is not copied again. Incremental mode is implemented for FSFS repositories.\n" msgstr "" -"användning: svnadmin hotcopy ARKIVSÖKVÄG NY_ARKIVSÖKVÄG\n" -"\n" "Gör en kopiering under drift av ett arkiv.\n" "Med flaggan --incremental kommer data som redan finns i destinationen inte\n" "kopieras igen. Denna funktion finns implementerad för FSFS-arkiv.\n" -#: ../svnadmin/svnadmin.c:397 +#: ../svnadmin/svnadmin.c:421 msgid "" "usage: svnadmin info REPOS_PATH\n" "\n" -"Print information about the repository at REPOS_PATH.\n" msgstr "" -"användning: svnadmin info ARKIVSÖKVÄG\n" +"användning: svnadmin info ARKIVSÖKVÄG\n" +"\n" + +#: ../svnadmin/svnadmin.c:423 +msgid "Print information about the repository at REPOS_PATH.\n" +msgstr "Visa information om arkivet i ARKIVSÖKVÄG.\n" + +#: ../svnadmin/svnadmin.c:428 +msgid "" +"usage: svnadmin list-dblogs REPOS_PATH\n" +"\n" +msgstr "" +"användning: svnadmin list-dblogs ARKIVSÖKVÄG\n" +"\n" + +#: ../svnadmin/svnadmin.c:430 +msgid "" +"List all Berkeley DB log files.\n" +"\n" +msgstr "" +"Ger en lista av Berkeley DB-loggfiler.\n" "\n" -"Visa information om arkivet i ARKIVSÖKVÄG.\n" -#: ../svnadmin/svnadmin.c:402 +#: ../svnadmin/svnadmin.c:432 msgid "" -"usage: svnadmin list-dblogs REPOS_PATH\n" -"\n" -"List all Berkeley DB log files.\n" -"\n" "WARNING: Modifying or deleting logfiles which are still in use\n" "will cause your repository to be corrupted.\n" msgstr "" -"användning: svnadmin list-dblogs ARKIVSÖKVÄG\n" -"\n" -"Ger en lista av alla Berkeley DB-loggfiler.\n" -"\n" "VARNING: Att ändra eller ta bort loggfiler som fortfarande används leder\n" "till att databasen förstörs.\n" -#: ../svnadmin/svnadmin.c:409 +#: ../svnadmin/svnadmin.c:438 msgid "" "usage: svnadmin list-unused-dblogs REPOS_PATH\n" "\n" -"List unused Berkeley DB log files.\n" -"\n" msgstr "" "användning: svnadmin list-unused-dblogs ARKIVSÖKVÄG\n" "\n" -"Ger en lista av Berkeley DB-loggfiler som inte används.\n" -"\n" -#: ../svnadmin/svnadmin.c:414 +#: ../svnadmin/svnadmin.c:440 +msgid "List unused Berkeley DB log files.\n" +msgstr "Ger en lista av Berkeley DB-loggfiler som inte används.\n" + +#: ../svnadmin/svnadmin.c:445 msgid "" "usage: svnadmin load REPOS_PATH\n" "\n" +msgstr "" +"användning: svnadmin load ARKIVSÖKVÄG\n" +"\n" + +#: ../svnadmin/svnadmin.c:447 +msgid "" "Read a 'dumpfile'-formatted stream from stdin, committing\n" "new revisions into the repository's filesystem. If the repository\n" "was previously empty, its UUID will, by default, be changed to the\n" @@ -17887,130 +19084,162 @@ msgid "" "If --revision is specified, limit the loaded revisions to only those\n" "in the dump stream whose revision numbers match the specified range.\n" msgstr "" -"användning: svnadmin load ARKIVSÖKVÄG\n" -"\n" "Läser in en fil i \"dumpfile\"-format från standard in och inför nya revisioner\n" "i arkivets filsystem. Om arkivet var tomt från början, kommer normalt\n" "dess UUID att sättas till UUID:n i filen. Förloppet visas på standard ut.\n" "Om flaggan --revision anges kommer bara revisionerna vars nummer ingår i det\n" "angivna området läsas in från inmatningsströmmen.\n" -#: ../svnadmin/svnadmin.c:427 ../svnadmin/svnadmin.c:438 +#: ../svnadmin/svnadmin.c:460 ../svnadmin/svnadmin.c:473 msgid "read from file ARG instead of stdin" msgstr "läs från filen ARG istället för standard in" -#: ../svnadmin/svnadmin.c:430 +#: ../svnadmin/svnadmin.c:463 msgid "" "usage: svnadmin load-revprops REPOS_PATH\n" "\n" +msgstr "" +"användning: svnadmin load-revprops ARKIVSÖKVÄG\n" +"\n" + +#: ../svnadmin/svnadmin.c:465 +msgid "" "Read a 'dumpfile'-formatted stream from stdin, setting the revision\n" "properties in the repository's filesystem. Revisions not found in the\n" "repository will cause an error. Progress feedback is sent to stdout.\n" "If --revision is specified, limit the loaded revisions to only those\n" "in the dump stream whose revision numbers match the specified range.\n" msgstr "" -"användning: svnadmin load-revprops ARKIVSÖKVÄG\n" -"\n" "Läser in en fil i \"dumpfile\"-format från standard in och sätter revisions-\n" "egenskaper i arkivets filsystem. Revisioner som inte hittas i arkivet\n" "betraktas som fel. Framskridande visas på standard ut.\n" "Om flaggan --revision anges kommer bara revisionerna vars nummer ingår i det\n" "angivna området läsas in från inmatningsströmmen.\n" -#: ../svnadmin/svnadmin.c:441 +#: ../svnadmin/svnadmin.c:476 msgid "" "usage: svnadmin lock REPOS_PATH PATH USERNAME COMMENT-FILE [TOKEN]\n" "\n" -"Lock PATH by USERNAME setting comments from COMMENT-FILE.\n" -"If provided, use TOKEN as lock token. Use --bypass-hooks to avoid\n" -"triggering the pre-lock and post-lock hook scripts.\n" msgstr "" "användning: svnadmin lock ARKIVSÖKVÄG SÖKVÄG ANVÄNDARNAMN\n" " KOMMENTARFIL [ID]\n" "\n" + +#: ../svnadmin/svnadmin.c:478 +msgid "" +"Lock PATH by USERNAME setting comments from COMMENT-FILE.\n" +"If provided, use TOKEN as lock token. Use --bypass-hooks to avoid\n" +"triggering the pre-lock and post-lock hook scripts.\n" +msgstr "" "Lås SÖKVÄG som ANVÄNDARNAMN med kommentarer från KOMMENTARFIL.\n" "Om angivet, använd ID som låsidentifierare. Använd --bypass-hooks för att\n" "förhindra körning av krokskripten \"pre-lock\" och \"post-lock\".\n" -#: ../svnadmin/svnadmin.c:448 +#: ../svnadmin/svnadmin.c:485 msgid "" "usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n" "\n" -"Print descriptions of all locks on or under PATH-IN-REPOS (which,\n" -"if not provided, is the root of the repository).\n" msgstr "" "användning: svnadmin lslocks ARKIVSÖKVÄG [SÖKVÄG-I-ARKIV]\n" "\n" + +#: ../svnadmin/svnadmin.c:487 +msgid "" +"Print descriptions of all locks on or under PATH-IN-REPOS (which,\n" +"if not provided, is the root of the repository).\n" +msgstr "" "Beskriv alla lås i eller under SÖKVÄG-I-ARKIV (som är arkivets rot om ej\n" "angiven).\n" -#: ../svnadmin/svnadmin.c:454 +#: ../svnadmin/svnadmin.c:493 msgid "" "usage: svnadmin lstxns REPOS_PATH\n" "\n" +msgstr "" +"användning: svnadmin lstxns ARKIVSÖKVÄG\n" +"\n" + +#: ../svnadmin/svnadmin.c:495 +msgid "" "Print the names of uncommitted transactions. With -rN skip the output\n" "of those that have a base revision more recent than rN. Transactions\n" "with base revisions much older than HEAD are likely to have been\n" "abandonded and are candidates to be removed.\n" msgstr "" -"användning: svnadmin lstxns ARKIVSÖKVÄG\n" -"\n" "Skriv namnen på oarkiverade transaktioner. Med -rN, hoppa över transaktioner\n" "med basrevision nyare än rN. Transaktioner med basrevisioner som är mycket\n" "äldre än HEAD har sannolikt övergivits och kan troligen tas bort.\n" -#: ../svnadmin/svnadmin.c:463 +#: ../svnadmin/svnadmin.c:504 msgid "" "usage: svnadmin pack REPOS_PATH\n" "\n" -"Possibly compact the repository into a more efficient storage model.\n" -"This may not apply to all repositories, in which case, exit.\n" msgstr "" "användning: svnadmin pack ARKIVSÖKVÄG\n" "\n" + +#: ../svnadmin/svnadmin.c:506 +msgid "" +"Possibly compact the repository into a more efficient storage model.\n" +"This may not apply to all repositories, in which case, exit.\n" +msgstr "" "Packa arkivet i ett effektivare lagringsformat om det går.\n" "I annat fall sker ingenting.\n" -#: ../svnadmin/svnadmin.c:469 +#: ../svnadmin/svnadmin.c:512 msgid "" "usage: svnadmin recover REPOS_PATH\n" "\n" +msgstr "" +"användning: svnadmin recover ARKIVSÖKVÄG\n" +"\n" + +#: ../svnadmin/svnadmin.c:514 +msgid "" "Run the recovery procedure on a repository. Do this if you've\n" "been getting errors indicating that recovery ought to be run.\n" "Berkeley DB recovery requires exclusive access and will\n" "exit if the repository is in use by another process.\n" msgstr "" -"användning: svnadmin recover ARKIVSÖKVÄG\n" -"\n" "Utför rutinen för att återskapa databasen. Gör detta om du har fått\n" "felmeddelanden som talar om att det behövs. Återskapandet av en Berkeley-\n" "databas kräver enskild åtkomst och kommer avbrytas om databasen används av\n" "någon annan process.\n" -#: ../svnadmin/svnadmin.c:477 +#: ../svnadmin/svnadmin.c:522 msgid "" "usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n" "\n" -"Unconditionally remove lock from each LOCKED_PATH.\n" msgstr "" "användning: svnadmin rmlocks ARKIVSÖKVÄG LÅST_SÖKVÄG...\n" "\n" -"Ta ovillkorligen bort lås från varje LÅST_SÖKVÄG.\n" -#: ../svnadmin/svnadmin.c:482 +#: ../svnadmin/svnadmin.c:524 +msgid "Unconditionally remove lock from each LOCKED_PATH.\n" +msgstr "Ta ovillkorligen bort lås från varje LÅST_SÖKVÄG.\n" + +#: ../svnadmin/svnadmin.c:529 msgid "" "usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n" "\n" -"Delete the named transaction(s).\n" msgstr "" "användning: svnadmin rmtxns ARKIVSÖKVÄG TXN_NAMN...\n" "\n" -"Ta bort namngivna transaktion(er).\n" -#: ../svnadmin/svnadmin.c:487 +#: ../svnadmin/svnadmin.c:531 +msgid "Delete the named transaction(s).\n" +msgstr "Ta bort namngivna transaktion(er).\n" + +#: ../svnadmin/svnadmin.c:536 msgid "" "usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n" "\n" +msgstr "" +"användning: svnadmin setlog ARKIVSÖKVÄG -r REVISION FIL\n" +"\n" + +#: ../svnadmin/svnadmin.c:538 +msgid "" "Set the log-message on revision REVISION to the contents of FILE. Use\n" "--bypass-hooks to avoid triggering the revision-property-related hooks\n" "(for example, if you do not want an email notification sent\n" @@ -18018,84 +19247,108 @@ msgid "" "revision properties has not been enabled in the pre-revprop-change\n" "hook).\n" "\n" -"NOTE: Revision properties are not versioned, so this command will\n" -"overwrite the previous log message.\n" msgstr "" -"användning: svnadmin setlog ARKIVSÖKVÄG -r REVISION FIL\n" -"\n" "Sätt loggmeddelandet för revisionen REVISION till innehållet i filen FIL.\n" "Använd --bypass-hooks för att revisionsegenskapsrelaterade krokskript inte\n" "ska aktiveras (om du till exempel vill undvika att e-post skickas från\n" "ditt \"post-revprop-change\"-krokskript, eller om ändring av\n" "revisionsegenskaper ej är påslaget i \"pre-revprop-change\"-krokskriptet).\n" "\n" + +#: ../svnadmin/svnadmin.c:545 +msgid "" +"NOTE: Revision properties are not versioned, so this command will\n" +"overwrite the previous log message.\n" +msgstr "" "ANMÄRKNING: Historik lagras inte för revisionsegenskaper, så detta kommando\n" "skriver för alltid över det befintliga loggmeddelandet.\n" -#: ../svnadmin/svnadmin.c:499 +#: ../svnadmin/svnadmin.c:551 msgid "" "usage: 1. svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n" " 2. svnadmin setrevprop REPOS_PATH -t TXN NAME FILE\n" "\n" -"1. Set the property NAME on revision REVISION to the contents of FILE.\n" -"\n" -"Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n" -"trigger the revision property-related hooks (for example, if you want\n" -"an email notification sent from your post-revprop-change hook).\n" -"\n" -"NOTE: Revision properties are not versioned, so this command will\n" -"overwrite the previous value of the property.\n" -"\n" -"2. Set the property NAME on transaction TXN to the contents of FILE.\n" msgstr "" "användning: 1. svnadmin setrevprop ARKIVSÖKVÄG -r REVISION NAMN FIL\n" " 2. svnadmin setrevprop ARKIVSÖKVÄG -t TRANS NAMN FIL\n" "\n" + +#: ../svnadmin/svnadmin.c:554 +msgid "" +"1. Set the property NAME on revision REVISION to the contents of FILE.\n" +"\n" +msgstr "" "1. Sätt egenskapen NAMN i revisionen REVISION till innehållet i FIL.\n" "\n" -"Använd --use-pre-revprop-change-hook/--use-post-revprop-change-hook\n" -"för att starta krokskripten för revisionsegenskaper (om du exempelvis\n" -"vill att epost ska skickas från \"post-revprop-change\"-krokskriptet).\n" + +#: ../svnadmin/svnadmin.c:560 +msgid "" +"NOTE: Revision properties are not versioned, so this command will\n" +"overwrite the previous value of the property.\n" "\n" +msgstr "" "ANMÄRKNING: Historik sparas ej för revisionsegenskaper, så detta kommando\n" "skriver över egenskapens tidigare värde.\n" "\n" -"2. Sätt egenskapen NAMN i transaktionen TRANS till innehållet i FIL.\n" -#: ../svnadmin/svnadmin.c:512 +#: ../svnadmin/svnadmin.c:563 +msgid "2. Set the property NAME on transaction TXN to the contents of FILE.\n" +msgstr "2. Sätt egenskapen NAMN i transaktionen TRANS till innehållet i FIL.\n" + +#: ../svnadmin/svnadmin.c:569 msgid "" "usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n" "\n" +msgstr "" +"användning: svnadmin setuuid ARKIVSÖKVÄG [NY_UUID]\n" +"\n" + +#: ../svnadmin/svnadmin.c:571 +msgid "" "Reset the repository UUID for the repository located at REPOS_PATH. If\n" "NEW_UUID is provided, use that as the new repository UUID; otherwise,\n" "generate a brand new UUID for the repository.\n" msgstr "" -"användning: svnadmin setuuid ARKIVSÖKVÄG [NY_UUID]\n" -"\n" "Återställ UUID för arkivet i ARKIVSÖKVÄG. Om NY_UUID anges kommer det\n" "användas som ny UUID för arkivet; annars kommer en helt ny UUID genereras.\n" -#: ../svnadmin/svnadmin.c:519 +#: ../svnadmin/svnadmin.c:578 msgid "" "usage: svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME TOKEN\n" "\n" +msgstr "" +"användning: svnadmin unlock ARKIVSÖKVÄG LÅST_SÖKVÄG ANVÄNDARNAMN ID\n" +"\n" + +#: ../svnadmin/svnadmin.c:580 +msgid "" "Unlock LOCKED_PATH (as USERNAME) after verifying that the token\n" "associated with the lock matches TOKEN. Use --bypass-hooks to avoid\n" "triggering the pre-unlock and post-unlock hook scripts.\n" msgstr "" -"användning: svnadmin unlock ARKIVSÖKVÄG LÅST_SÖKVÄG ANVÄNDARNAMN ID\n" -"\n" "Lås upp LÅST_SÖKVÄG (som ANVÄNDARNAMN) efter att ha kontrollerat att\n" "låsidentifieraren stämmer med ID. Använd --bypass-hooks för att förhindra\n" "körning av krokskripten \"pre-unlock\" och \"post-unlock\".\n" -#: ../svnadmin/svnadmin.c:526 +#: ../svnadmin/svnadmin.c:587 msgid "" "usage: svnadmin upgrade REPOS_PATH\n" "\n" +msgstr "" +"användning: svnadmin upgrade ARKIVSÖKVÄG\n" +"\n" + +#: ../svnadmin/svnadmin.c:589 +msgid "" "Upgrade the repository located at REPOS_PATH to the latest supported\n" "schema version.\n" "\n" +msgstr "" +"Uppgradera arkivet vid ARKIVSÖKVÄG till den senaste schemaversionen.\n" +"\n" + +#: ../svnadmin/svnadmin.c:592 +msgid "" "This functionality is provided as a convenience for repository\n" "administrators who wish to make use of new Subversion functionality\n" "without having to undertake a potentially costly full repository dump\n" @@ -18104,10 +19357,6 @@ msgid "" "integrity of the repository. It does not guarantee the most optimized\n" "repository state as a dump and subsequent load would.\n" msgstr "" -"användning: svnadmin upgrade ARKIVSÖKVÄG\n" -"\n" -"Uppgradera arkivet vid ARKIVSÖKVÄG till den senaste schemaversionen.\n" -"\n" "Denna funktion är till för arkivförvaltare som vill utnyttja nya\n" "funktioner i Subversion utan att behöva företa sig en hel utskrivning\n" "och återställning av arkivet. Uppgraderingen i sig gör bara så lite arbete\n" @@ -18115,39 +19364,37 @@ msgstr "" "helhet. Den garanterar inte ett optimerat arkivtillstånd vilket en\n" "utskrivning och återställning skulle göra.\n" -#: ../svnadmin/svnadmin.c:539 +#: ../svnadmin/svnadmin.c:603 msgid "" "usage: svnadmin verify REPOS_PATH\n" "\n" -"Verify the data stored in the repository.\n" msgstr "" "användning: svnadmin verify ARKIVSÖKVÄG\n" "\n" -"Kontrollerar den data som är lagrad i arkivet.\n" -#: ../svnadmin/svnadmin.c:640 +#: ../svnadmin/svnadmin.c:605 +msgid "Verify the data stored in the repository.\n" +msgstr "Kontrollerar den data som är lagrad i arkivet.\n" + +#: ../svnadmin/svnadmin.c:706 msgid "Invalid revision specifier" msgstr "Ogiltig revisionsangivelse" -#: ../svnadmin/svnadmin.c:644 +#: ../svnadmin/svnadmin.c:710 #, c-format msgid "Revisions must not be greater than the youngest revision (%ld)" msgstr "Revisionerna får ej vara större än den yngsta revisionen (%ld)" -#: ../svnadmin/svnadmin.c:671 +#: ../svnadmin/svnadmin.c:737 #, c-format msgid "Path '%s' is not a local path" msgstr "\"%s\" är ingen lokal sökväg" -#: ../svnadmin/svnadmin.c:700 +#: ../svnadmin/svnadmin.c:766 msgid "Not enough arguments" msgstr "För få argument" -#: ../svnadmin/svnadmin.c:703 -msgid "Too many arguments" -msgstr "För många argument" - -#: ../svnadmin/svnadmin.c:743 +#: ../svnadmin/svnadmin.c:809 #, c-format msgid "" "Successfully opened repository '%s'.\n" @@ -18156,70 +19403,70 @@ msgstr "" "Lyckades öppna arkiv \"%s\".\n" "Kommer nu att krascha för att simulera en kraschande serverprocess.\n" -#: ../svnadmin/svnadmin.c:782 +#: ../svnadmin/svnadmin.c:848 #, c-format msgid "%swarning: The \"%s\" repository back-end is deprecated, consider using \"%s\" instead.\n" msgstr "%svarning: Arkivmekanismen \"%s\" är föråldrad; överväg att använda \"%s\" istället.\n" -#: ../svnadmin/svnadmin.c:823 +#: ../svnadmin/svnadmin.c:889 msgid "Repositories compatible with 1.0.x must use --fs-type=bdb" msgstr "Arkiv kompatibla med 1.0.x måste använda --fs-type=bdb" -#: ../svnadmin/svnadmin.c:831 +#: ../svnadmin/svnadmin.c:897 #, c-format msgid "Repositories compatible with 1.8.x or earlier cannot use --fs-type=%s" msgstr "Arkiv kompatibla med 1.8.x eller äldre måste använda --fs-type=%s" -#: ../svnadmin/svnadmin.c:876 ../svnadmin/svnadmin.c:1276 -#: ../svnadmin/svnadmin.c:1606 +#: ../svnadmin/svnadmin.c:942 ../svnadmin/svnadmin.c:1342 +#: ../svnadmin/svnadmin.c:1672 msgid "First revision cannot be higher than second" msgstr "Den första revisionen kan inte vara högre än den andra" -#: ../svnadmin/svnadmin.c:885 +#: ../svnadmin/svnadmin.c:951 #, c-format msgid "Deltifying revision %ld..." msgstr "Deltifierar revision %ld..." -#: ../svnadmin/svnadmin.c:889 ../svnadmin/svnadmin.c:1020 -#: ../svnadmin/svnadmin.c:1035 +#: ../svnadmin/svnadmin.c:955 ../svnadmin/svnadmin.c:1086 +#: ../svnadmin/svnadmin.c:1101 #, c-format msgid "done.\n" msgstr "klart.\n" -#: ../svnadmin/svnadmin.c:938 +#: ../svnadmin/svnadmin.c:1004 msgid "* Error verifying repository metadata.\n" msgstr "* Fel vid kontroll av arkivmetadata.\n" -#: ../svnadmin/svnadmin.c:944 +#: ../svnadmin/svnadmin.c:1010 #, c-format msgid "* Error verifying revision %ld.\n" msgstr "* Fel vid kontroll av revision %ld.\n" -#: ../svnadmin/svnadmin.c:1001 +#: ../svnadmin/svnadmin.c:1067 msgid "* Verifying repository metadata ...\n" msgstr "* Kontrollerar arkivmetadata...\n" -#: ../svnadmin/svnadmin.c:1004 +#: ../svnadmin/svnadmin.c:1070 #, c-format msgid "* Verifying metadata at revision %ld ...\n" msgstr "* Kontrollerar metadata i revision %ld...\n" -#: ../svnadmin/svnadmin.c:1014 +#: ../svnadmin/svnadmin.c:1080 #, c-format msgid "Packing revisions in shard %s..." msgstr "Packar revision i skärva %s..." -#: ../svnadmin/svnadmin.c:1029 +#: ../svnadmin/svnadmin.c:1095 #, c-format msgid "Packing revprops in shard %s..." msgstr "Packar revisionsegenskaper i skärva %s..." -#: ../svnadmin/svnadmin.c:1104 +#: ../svnadmin/svnadmin.c:1170 #, c-format msgid "<<< Skipped original revision %ld\n" msgstr "<<< Hoppade över ursprungliga revisionen %ld\n" -#: ../svnadmin/svnadmin.c:1120 +#: ../svnadmin/svnadmin.c:1186 msgid "" "Repository lock acquired.\n" "Please wait; recovering the repository may take some time...\n" @@ -18227,7 +19474,7 @@ msgstr "" "Arkivlåset har erhållits.\n" "Vänta; det kan ta tid att återskapa arkivet...\n" -#: ../svnadmin/svnadmin.c:1127 +#: ../svnadmin/svnadmin.c:1193 msgid "" "Repository lock acquired.\n" "Please wait; upgrading the repository may take some time...\n" @@ -18235,51 +19482,51 @@ msgstr "" "Arkivlåset har erhållits.\n" "Vänta; det kan ta tid att uppgradera arkivet...\n" -#: ../svnadmin/svnadmin.c:1138 +#: ../svnadmin/svnadmin.c:1204 #, c-format msgid "Packed revision properties in shard %s\n" msgstr "Packar revisionsegenskaper i skärva %s\n" -#: ../svnadmin/svnadmin.c:1149 +#: ../svnadmin/svnadmin.c:1215 #, c-format msgid "Removed non-packed revision properties in shard %s\n" msgstr "Raderar icke-packade revisionsegenskaper i skärva %s\n" -#: ../svnadmin/svnadmin.c:1157 +#: ../svnadmin/svnadmin.c:1223 #, c-format msgid "Bumped repository format to %ld\n" msgstr "Flyttade fram arkivformatet till %ld\n" -#: ../svnadmin/svnadmin.c:1165 +#: ../svnadmin/svnadmin.c:1231 #, c-format msgid "* Copied revision %ld.\n" msgstr "* Kopierade revision %ld.\n" -#: ../svnadmin/svnadmin.c:1171 +#: ../svnadmin/svnadmin.c:1237 #, c-format msgid "* Copied revisions from %ld to %ld.\n" msgstr "* Kopierade revisioner från %ld till %ld.\n" -#: ../svnadmin/svnadmin.c:1182 +#: ../svnadmin/svnadmin.c:1248 #, c-format msgid "svnadmin: Warning - this repository is not sharded. Packing has no effect.\n" msgstr "svnadmin: varning: detta arkiv är inte splittrat. Packning saknar verkan.\n" -#: ../svnadmin/svnadmin.c:1189 +#: ../svnadmin/svnadmin.c:1255 #, c-format msgid "Properties set on revision %ld.\n" msgstr "Egenskaper satta för revision %ld.\n" -#: ../svnadmin/svnadmin.c:1384 +#: ../svnadmin/svnadmin.c:1450 #, c-format msgid "'--exclude' and '--include' options cannot be used simultaneously" msgstr "Väljarna \"--exclude\" och \"--include\" kan inte användas samtidigt" -#: ../svnadmin/svnadmin.c:1488 +#: ../svnadmin/svnadmin.c:1554 msgid "No program provided" msgstr "Inget program angivet" -#: ../svnadmin/svnadmin.c:1528 +#: ../svnadmin/svnadmin.c:1594 msgid "" "general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Subversion repository administration tool.\n" @@ -18296,7 +19543,7 @@ msgstr "" "\n" "Tillgängliga underkommandon:\n" -#: ../svnadmin/svnadmin.c:1536 ../svnlook/svnlook.c:2218 +#: ../svnadmin/svnadmin.c:1602 ../svnlook/svnlook.c:2252 #: ../svnserve/svnserve.c:470 msgid "" "The following repository back-end (FS) modules are available:\n" @@ -18305,24 +19552,24 @@ msgstr "" "Följande arkivåtkomstmoduler är tillgängliga:\n" "\n" -#: ../svnadmin/svnadmin.c:1565 +#: ../svnadmin/svnadmin.c:1631 #, c-format msgid "Invalid revision number (%ld) specified" msgstr "Ogiltigt revisionsnummer (%ld) angivet" -#: ../svnadmin/svnadmin.c:1575 +#: ../svnadmin/svnadmin.c:1641 msgid "Non-numeric revision specified" msgstr "Ickenumerisk revision angiven" -#: ../svnadmin/svnadmin.c:1657 ../svnadmin/svnadmin.c:1715 +#: ../svnadmin/svnadmin.c:1723 ../svnadmin/svnadmin.c:1781 msgid "A property with invalid line ending found in dumpstream; consider using --normalize-props while loading." msgstr "Egenskap med felaktigt radslut hittad i dumpströmmen; överväg --normalize-props vid inläsning." -#: ../svnadmin/svnadmin.c:1664 ../svnadmin/svnadmin.c:1722 +#: ../svnadmin/svnadmin.c:1730 ../svnadmin/svnadmin.c:1788 msgid "Invalid property value found in dumpstream; consider repairing the source or using --bypass-prop-validation while loading." msgstr "Ogiltigt egenskapsvärde hittat i dumpströmmen; reparera källan eller använd --bypass-prop-validation vid inläsningen." -#: ../svnadmin/svnadmin.c:1814 ../svnadmin/svnadmin.c:2713 +#: ../svnadmin/svnadmin.c:1880 ../svnadmin/svnadmin.c:2780 msgid "" "Failed to get exclusive repository access; perhaps another process\n" "such as httpd, svnserve or svn has it open?" @@ -18330,12 +19577,12 @@ msgstr "" "Kunde inte erhålla enskild åtkomst till arkivet; kanske någon annan process,\n" "såsom httpd, svnserve eller svn har det öppet?" -#: ../svnadmin/svnadmin.c:1819 ../svnadmin/svnadmin.c:2718 +#: ../svnadmin/svnadmin.c:1885 ../svnadmin/svnadmin.c:2785 #, c-format msgid "Waiting on repository lock; perhaps another process has it open?\n" msgstr "Väntar på arkivlås; kanske någon annan process har arkivet öppen?\n" -#: ../svnadmin/svnadmin.c:1827 +#: ../svnadmin/svnadmin.c:1893 #, c-format msgid "" "\n" @@ -18344,40 +19591,40 @@ msgstr "" "\n" "Återskapande klart.\n" -#: ../svnadmin/svnadmin.c:1834 +#: ../svnadmin/svnadmin.c:1900 #, c-format msgid "The latest repos revision is %ld.\n" msgstr "Den senaste revisionen i arkivet är %ld.\n" -#: ../svnadmin/svnadmin.c:1946 +#: ../svnadmin/svnadmin.c:2012 #, c-format msgid "Transaction '%s' removed.\n" msgstr "Transaktionen \"%s\" borttagen.\n" -#: ../svnadmin/svnadmin.c:2028 ../svnadmin/svnadmin.c:2142 -#: ../svnadmin/svnadmin.c:2763 +#: ../svnadmin/svnadmin.c:2094 ../svnadmin/svnadmin.c:2208 +#: ../svnadmin/svnadmin.c:2830 #, c-format msgid "--revision (-r) and --transaction (-t) are mutually exclusive" msgstr "--revision (-r) och --transaction (-t) kan inte användas samtidigt" -#: ../svnadmin/svnadmin.c:2034 ../svnadmin/svnadmin.c:2769 +#: ../svnadmin/svnadmin.c:2100 ../svnadmin/svnadmin.c:2836 #, c-format msgid "Calling hooks is incompatible with --transaction (-t)" msgstr "Krokskript kan inte anropas när --transaction (-t) används" -#: ../svnadmin/svnadmin.c:2039 ../svnadmin/svnadmin.c:2084 -#: ../svnadmin/svnadmin.c:2774 +#: ../svnadmin/svnadmin.c:2105 ../svnadmin/svnadmin.c:2150 +#: ../svnadmin/svnadmin.c:2841 #, c-format msgid "Missing revision" msgstr "Revision saknas" -#: ../svnadmin/svnadmin.c:2042 ../svnadmin/svnadmin.c:2087 -#: ../svnadmin/svnadmin.c:2777 +#: ../svnadmin/svnadmin.c:2108 ../svnadmin/svnadmin.c:2153 +#: ../svnadmin/svnadmin.c:2844 #, c-format msgid "Only one revision allowed" msgstr "Endast en revision tillåts" -#: ../svnadmin/svnadmin.c:2205 +#: ../svnadmin/svnadmin.c:2272 msgid "" "\n" "-----Summary of corrupt revisions-----\n" @@ -18385,112 +19632,112 @@ msgstr "" "\n" "-----Sammanfattning av trasiga revisioner-----\n" -#: ../svnadmin/svnadmin.c:2257 +#: ../svnadmin/svnadmin.c:2324 #, c-format msgid "Failed to verify repository '%s'" msgstr "Kunde inte kontrollera arkivet \"%s\"" -#: ../svnadmin/svnadmin.c:2309 +#: ../svnadmin/svnadmin.c:2376 #, c-format msgid "UUID: %s\n" msgstr "UUID: %s\n" -#: ../svnadmin/svnadmin.c:2312 +#: ../svnadmin/svnadmin.c:2379 #, c-format msgid "Revisions: %ld\n" msgstr "Revisioner: %ld\n" -#: ../svnadmin/svnadmin.c:2318 +#: ../svnadmin/svnadmin.c:2385 #, c-format msgid "Repository Format: %d\n" msgstr "Arkivformat: %d\n" -#: ../svnadmin/svnadmin.c:2332 +#: ../svnadmin/svnadmin.c:2399 #, c-format msgid "Compatible With Version: %d.%d.0\n" msgstr "Kompatibelt med version: %d.%d.0\n" -#: ../svnadmin/svnadmin.c:2351 +#: ../svnadmin/svnadmin.c:2418 #, c-format msgid "Repository Capability: %s\n" msgstr "Arkivförmåga: %s\n" -#: ../svnadmin/svnadmin.c:2360 +#: ../svnadmin/svnadmin.c:2427 #, c-format msgid "Filesystem Type: %s\n" msgstr "Filsystemstyp: %s\n" -#: ../svnadmin/svnadmin.c:2362 +#: ../svnadmin/svnadmin.c:2429 #, c-format msgid "Filesystem Format: %d\n" msgstr "Filsystemsformat: %d\n" -#: ../svnadmin/svnadmin.c:2369 +#: ../svnadmin/svnadmin.c:2436 #, c-format msgid "FSFS Sharded: yes\n" msgstr "FSFS splittrad: ja\n" -#: ../svnadmin/svnadmin.c:2371 +#: ../svnadmin/svnadmin.c:2438 #, c-format msgid "FSFS Sharded: no\n" msgstr "FSFS splittrad: nej\n" -#: ../svnadmin/svnadmin.c:2374 +#: ../svnadmin/svnadmin.c:2441 #, c-format msgid "FSFS Shard Size: %d\n" msgstr "FSFS skärvstorlek: %d\n" -#: ../svnadmin/svnadmin.c:2383 +#: ../svnadmin/svnadmin.c:2450 #, c-format msgid "FSFS Shards Packed: %ld/%ld\n" msgstr "FSFS skärvor packade: %ld/%ld\n" -#: ../svnadmin/svnadmin.c:2388 +#: ../svnadmin/svnadmin.c:2455 #, c-format msgid "FSFS Logical Addressing: yes\n" msgstr "FSFS logisk adressering: ja\n" -#: ../svnadmin/svnadmin.c:2390 +#: ../svnadmin/svnadmin.c:2457 #, c-format msgid "FSFS Logical Addressing: no\n" msgstr "FSFS logisk adressering: nej\n" -#: ../svnadmin/svnadmin.c:2400 +#: ../svnadmin/svnadmin.c:2467 #, c-format msgid "FSX Shard Size: %d\n" msgstr "FSX skärvstorlek: %d\n" -#: ../svnadmin/svnadmin.c:2402 +#: ../svnadmin/svnadmin.c:2469 #, c-format msgid "FSX Shards Packed: %ld/%ld\n" msgstr "FSFX skärvor packade: %ld/%ld\n" -#: ../svnadmin/svnadmin.c:2413 +#: ../svnadmin/svnadmin.c:2480 #, c-format msgid "Configuration File: %s\n" msgstr "Konfigurationsfil: %s\n" -#: ../svnadmin/svnadmin.c:2541 ../svnlook/svnlook.c:2281 +#: ../svnadmin/svnadmin.c:2608 ../svnlook/svnlook.c:2315 #, c-format msgid "UUID Token: %s\n" msgstr "UUID-identifierare: %s\n" -#: ../svnadmin/svnadmin.c:2542 ../svnlook/svnlook.c:2282 +#: ../svnadmin/svnadmin.c:2609 ../svnlook/svnlook.c:2316 #, c-format msgid "Owner: %s\n" msgstr "Ägare: %s\n" -#: ../svnadmin/svnadmin.c:2543 ../svnlook/svnlook.c:2283 +#: ../svnadmin/svnadmin.c:2610 ../svnlook/svnlook.c:2317 #, c-format msgid "Created: %s\n" msgstr "Skapat: %s\n" -#: ../svnadmin/svnadmin.c:2544 ../svnlook/svnlook.c:2284 +#: ../svnadmin/svnadmin.c:2611 ../svnlook/svnlook.c:2318 #, c-format msgid "Expires: %s\n" msgstr "Går ut: %s\n" -#: ../svnadmin/svnadmin.c:2546 +#: ../svnadmin/svnadmin.c:2613 #, c-format msgid "" "Comment (%i line):\n" @@ -18509,34 +19756,34 @@ msgstr[1] "" "%s\n" "\n" -#: ../svnadmin/svnadmin.c:2594 +#: ../svnadmin/svnadmin.c:2661 msgid "No paths to unlock provided" msgstr "Ingen sökväg till upplåsning tillhandahölls" -#: ../svnadmin/svnadmin.c:2612 +#: ../svnadmin/svnadmin.c:2679 #, c-format msgid "Path '%s' isn't locked.\n" msgstr "Sökvägen \"%s\" är inte låst.\n" -#: ../svnadmin/svnadmin.c:2626 +#: ../svnadmin/svnadmin.c:2693 #, c-format msgid "Removed lock on '%s'.\n" msgstr "Tog bort lås på \"%s\".\n" -#: ../svnadmin/svnadmin.c:2680 +#: ../svnadmin/svnadmin.c:2747 #, c-format msgid "'%s' unlocked by user '%s'.\n" msgstr "\"%s\" låstes upp av användaren \"%s\".\n" -#: ../svnadmin/svnadmin.c:2728 +#: ../svnadmin/svnadmin.c:2795 msgid "Upgrade of this repository's underlying versioned filesystem is not supported; consider dumping and loading the data elsewhere" msgstr "Uppgradering av det versionshanterade filsystemet som används av detta arkiv stöds ej; skriv ut och återställ informationen någon annanstans" -#: ../svnadmin/svnadmin.c:2735 +#: ../svnadmin/svnadmin.c:2802 msgid "Upgrade of this repository is not supported; consider dumping and loading the data elsewhere" msgstr "Uppgradering av detta arkiv stöds ej; skriv ut och återställ informationen någon annanstans" -#: ../svnadmin/svnadmin.c:2741 +#: ../svnadmin/svnadmin.c:2808 #, c-format msgid "" "\n" @@ -18545,36 +19792,36 @@ msgstr "" "\n" "Uppdatering klar.\n" -#: ../svnadmin/svnadmin.c:2855 ../svnfsfs/svnfsfs.c:281 -#: ../svnrdump/svnrdump.c:843 +#: ../svnadmin/svnadmin.c:2922 ../svnfsfs/svnfsfs.c:293 +#: ../svnrdump/svnrdump.c:849 msgid "Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'" msgstr "Flera revisionsargument påträffades; försök med \"-r M:N\" istället för \"-r M -r N\"" -#: ../svnadmin/svnadmin.c:2938 +#: ../svnadmin/svnadmin.c:3005 #, c-format msgid "Cannot create pre-1.0-compatible repositories" msgstr "Kan inte skapa arkiv kompatibelt med versioner äldre än 1.0" -#: ../svnadmin/svnadmin.c:2950 +#: ../svnadmin/svnadmin.c:3017 #, c-format msgid "Cannot guarantee compatibility beyond the current running version (%s)" msgstr "Kan inte garantera kompatibilitet bortom versionen som nu körs (%s)" -#: ../svnadmin/svnadmin.c:3074 ../svnfsfs/svnfsfs.c:350 +#: ../svnadmin/svnadmin.c:3141 ../svnfsfs/svnfsfs.c:362 #, c-format msgid "subcommand argument required\n" msgstr "argument för underkommando krävs\n" -#: ../svnadmin/svnadmin.c:3111 ../svnfsfs/svnfsfs.c:385 +#: ../svnadmin/svnadmin.c:3178 ../svnfsfs/svnfsfs.c:397 msgid "Repository argument required" msgstr "Argument för arkiv krävs" -#: ../svnadmin/svnadmin.c:3119 ../svnfsfs/svnfsfs.c:393 +#: ../svnadmin/svnadmin.c:3186 ../svnfsfs/svnfsfs.c:405 #, c-format msgid "'%s' is a URL when it should be a local path" msgstr "\"%s\" är en URL när den skulle vara en lokal sökväg" -#: ../svnadmin/svnadmin.c:3149 +#: ../svnadmin/svnadmin.c:3216 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" @@ -18583,7 +19830,7 @@ msgstr "" "Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n" "Skriv \"svnadmin help %s\" för användning.\n" -#: ../svnadmin/svnadmin.c:3180 +#: ../svnadmin/svnadmin.c:3247 msgid "Try 'svnadmin help' for more info" msgstr "Skriv \"svnadmin help\" för mer information" @@ -18684,7 +19931,7 @@ msgstr "" "%15s meddelanderader\n" "%15s ändringar\n" -#: ../svnbench/svnbench.c:115 ../svnrdump/svnrdump.c:118 +#: ../svnbench/svnbench.c:115 ../svnrdump/svnrdump.c:124 msgid "specify a password ARG" msgstr "ange ett lösenord ARG" @@ -18700,175 +19947,141 @@ msgstr "ställ inte frågor till användaren" msgid "use ARG as search pattern (glob syntax)" msgstr "använd ARG som sökmönster (skalsyntax)" -#: ../svnbench/svnbench.c:218 +#: ../svnbench/svnbench.c:219 msgid "" "Fetch all versions of a file in a batch.\n" "usage: null-blame [-rM:N] TARGET[@REV]...\n" "\n" -" With no revision range (same as -r0:REV), or with '-r M:N' where M < N,\n" -" annotate each line that is present in revision N of the file, with\n" -" the last revision at or before rN that changed or added the line,\n" -" looking back no further than rM.\n" -"\n" -" With a reverse revision range '-r M:N' where M > N,\n" -" annotate each line that is present in revision N of the file, with\n" -" the next revision after rN that changed or deleted the line,\n" -" looking forward no further than rM.\n" -"\n" -" If specified, REV determines in which revision the target is first\n" -" looked up.\n" -"\n" -" Write the annotated result to standard output.\n" msgstr "" "Hämta alla versioner av en fil på en gång.\n" "användning: null-blame [-rM:N] MÅL[@REV]...\n" "\n" -" Utan revisionsintervall (samma som -r0:REV), eller med \"-r M:N\" där M < N,\n" -" kommentera varje rad som finns i revision N av filen, med den senaste\n" -" revisionen i eller före rN som ändrade eller lade till raden, utan att\n" -" gå längre bakåt i tiden än rM.\n" -"\n" -" Med ett bakvänt revisionsintervall \"-r M:N\" där M > N, kommentera varje rad\n" -" som finns i revision N av filen, med nästa revision efter rN som ändrade\n" -" eller raderade raden, utan att gå längre framåt i tiden än rM.\n" -"\n" -" Om REV anges, bestämmer den i vilken revision målet först letas upp.\n" -"\n" -" Det kommenterade resultatet skrivs till standardutmatningen.\n" -#: ../svnbench/svnbench.c:238 +#: ../svnbench/svnbench.c:240 msgid "" "Create an unversioned copy of a tree.\n" "usage: null-export [-r REV] URL[@PEGREV]\n" "\n" -" Exports a clean directory tree from the repository specified by\n" -" URL, at revision REV if it is given, otherwise at HEAD.\n" -"\n" -" If specified, PEGREV determines in which revision the target is first\n" -" looked up.\n" msgstr "" "Skapa en icke versionshanterad kopia av ett träd.\n" "användning: null-export [-r REV] URL[@FIXREV]\n" "\n" + +#: ../svnbench/svnbench.c:243 +msgid "" +" Exports a clean directory tree from the repository specified by\n" +" URL, at revision REV if it is given, otherwise at HEAD.\n" +"\n" +msgstr "" " Exporterar ett rent katalogträd från arkivet som anges av URL, vid\n" " revisionen REV, eller HEAD om REV inte anges.\n" "\n" -" Om FIXREV är angiven, anger den i vilken revision målet först letas upp.\n" -#: ../svnbench/svnbench.c:249 +#: ../svnbench/svnbench.c:252 msgid "" "List directory entries in the repository.\n" "usage: null-list [TARGET[@REV]...]\n" "\n" -" List each TARGET file and the contents of each TARGET directory as\n" -" they exist in the repository. If TARGET is a working copy path, the\n" -" corresponding repository URL will be used. If specified, REV determines\n" -" in which revision the target is first looked up.\n" -"\n" -" The default TARGET is '.', meaning the repository URL of the current\n" -" working directory.\n" -"\n" -" With --verbose, the following fields will be fetched for each item:\n" -"\n" -" Revision number of the last commit\n" -" Author of the last commit\n" -" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n" -" Size (in bytes)\n" -" Date and time of the last commit\n" msgstr "" "Lista kataloginnehåll i arkivet.\n" "användning: null-list [MÅL[@REV]...]\n" "\n" -" Lista varje fil MÅL och innehållet i varje katalog MÅL som de ser ut i\n" -" arkivet. Om MÅL är en sökväg i en arbetskopia, används motsvarande URL\n" -" till arkivet. OM REV anges, avgör den var MÅL först letas upp.\n" -"\n" -" Standardvärdet för MÅL är \".\", vilket innebär arkiv-URL:en till\n" -" arbetskopian i aktuell katalog.\n" + +#: ../svnbench/svnbench.c:263 +msgid "" +" With --verbose, the following fields will be fetched for each item:\n" "\n" +msgstr "" " Om --verbose används, visas status med följande fält:\n" "\n" -" Revisionsnummer för senaste arkiveringen\n" -" Författare till senaste arkiveringen\n" -" Om filen är låst, bokstaven \"O\". (Använd \"svn info URL\" för mer info)\n" -" Storlek (i byte)\n" -" Datum och tid för senaste arkiveringen\n" -#: ../svnbench/svnbench.c:270 +#: ../svnbench/svnbench.c:274 msgid "" "Fetch the log messages for a set of revision(s) and/or path(s).\n" "usage: 1. null-log [PATH][@REV]\n" " 2. null-log URL[@REV] [PATH...]\n" "\n" +msgstr "" +"Hämta loggmeddelanden för revisioner och/eller filer.\n" +"användning: 1. null-log [SÖKVÄG][@REV]\n" +" 2. null-log URL[@REV] [SÖKVÄG...]\n" +"\n" + +#: ../svnbench/svnbench.c:278 +msgid "" " 1. Fetch the log messages for the URL corresponding to PATH\n" " (default: '.'). If specified, REV is the revision in which the\n" " URL is first looked up, and the default revision range is REV:1.\n" " If REV is not specified, the default revision range is BASE:1,\n" " since the URL might not exist in the HEAD revision.\n" "\n" -" 2. Fetch the log messages for the PATHs (default: '.') under URL.\n" -" If specified, REV is the revision in which the URL is first\n" -" looked up, and the default revision range is REV:1; otherwise,\n" -" the URL is looked up in HEAD, and the default revision range is\n" -" HEAD:1.\n" -"\n" -" Multiple '-c' or '-r' options may be specified (but not a\n" -" combination of '-c' and '-r' options), and mixing of forward and\n" -" reverse ranges is allowed.\n" -"\n" -" With -v, also print all affected paths with each log message.\n" -" With -q, don't print the log message body itself (note that this is\n" -" compatible with -v).\n" -"\n" -" Each log message is printed just once, even if more than one of the\n" -" affected paths for that revision were explicitly requested. Logs\n" -" follow copy history by default. Use --stop-on-copy to disable this\n" -" behavior, which can be useful for determining branchpoints.\n" msgstr "" -"Hämta loggmeddelanden för revisioner och/eller filer.\n" -"användning: 1. null-log [SÖKVÄG][@REV]\n" -" 2. null-log URL[@REV] [SÖKVÄG...]\n" -"\n" " 1. Hämta loggmeddelanden för URL:en som motsvarar SÖKVÄG (\".\" om ej\n" " angiven). Om REV anges avgör den var SÖKVÄG letas upp, och standard-\n" " värdet för revisionsområdet är då REV:1. Annars är standardvärdet\n" " för revisionsområdet BASE:1 då URL:en kanske inte finns i\n" " HEAD-revisionen.\n" "\n" + +#: ../svnbench/svnbench.c:284 +msgid "" +" 2. Fetch the log messages for the PATHs (default: '.') under URL.\n" +" If specified, REV is the revision in which the URL is first\n" +" looked up, and the default revision range is REV:1; otherwise,\n" +" the URL is looked up in HEAD, and the default revision range is\n" +" HEAD:1.\n" +"\n" +msgstr "" " 2. Hämta loggmeddelanden för varje SÖKVÄG (\".\" om ingen angiven) under\n" " URL. Om REV anges avgör den var SÖKVÄG letas upp, och standardvärdet\n" " för revisionsområdet är då REV:1. Annars letas URL upp i HEAD och\n" " standardvärdet för revisionsområdet är HEAD:1.\n" "\n" -" Flaggorna \"-c\" och \"-r\" kan förekomma flera gånger (men inte blandas),\n" -" och det går att blanda områden angivna framlänges och baklänges.\n" + +#: ../svnbench/svnbench.c:294 +msgid "" +" With -v, also print all affected paths with each log message.\n" +" With -q, don't print the log message body itself (note that this is\n" +" compatible with -v).\n" "\n" +msgstr "" " Om -v används skrivs även alla berörda sökvägar ut med varje loggmeddelande.\n" " Om -q används, skrivs inte loggmeddelanden ut (kan användas tillsammans med\n" -" -v).\n" "\n" + +#: ../svnbench/svnbench.c:298 +msgid "" +" Each log message is printed just once, even if more than one of the\n" +" affected paths for that revision were explicitly requested. Logs\n" +" follow copy history by default. Use --stop-on-copy to disable this\n" +" behavior, which can be useful for determining branchpoints.\n" +msgstr "" " Varje loggmeddelande skrivs endast ut en gång, även om flera av de\n" " berörda sökvägarna angavs explicit. Loggar följer kopieringshistorik som\n" " standard. Använd --stop-on-copy för att slå av detta, vilket kan vara\n" " användbart för att avgöra förgreningspunkter.\n" -#: ../svnbench/svnbench.c:304 +#: ../svnbench/svnbench.c:309 msgid "" "Display information about a local or remote item.\n" "usage: null-info [TARGET[@REV]...]\n" "\n" -" Print information about each TARGET (default: '.').\n" -" TARGET may be either a working-copy path or URL. If specified, REV\n" -" determines in which revision the target is first looked up.\n" msgstr "" "Visa information om en fil eller katalog - lokal eller från ett arkiv.\n" "användning: null-info [MÅL[@REV]...]\n" "\n" + +#: ../svnbench/svnbench.c:312 +msgid "" +" Print information about each TARGET (default: '.').\n" +" TARGET may be either a working-copy path or URL. If specified, REV\n" +" determines in which revision the target is first looked up.\n" +msgstr "" " Skriv ut information om varje angivet MÅL (\".\" om inget anges).\n" " MÅL kan antingen vara en arbetskopia eller en URL. Om REV anges, avgör\n" " den i vilken revision målet letas upp.\n" -#: ../svnbench/svnbench.c:802 +#: ../svnbench/svnbench.c:808 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" @@ -18877,17 +20090,17 @@ msgstr "" "Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n" "Skriv \"svnbench help %s\" för användning.\n" -#: ../svnbench/svnbench.c:994 +#: ../svnbench/svnbench.c:1000 #, c-format msgid "Try 'svnbench help %s' for more information" msgstr "Skriv \"svnbench help %s\" för vidare information" -#: ../svnbench/svnbench.c:1019 +#: ../svnbench/svnbench.c:1025 #, c-format msgid "%15.6f seconds taken\n" msgstr "tog %15.6f s\n" -#: ../svnbench/svnbench.c:1026 +#: ../svnbench/svnbench.c:1032 #, c-format msgid "%15s bytes transferred over network\n" msgstr "%15s byte överförda över nätverket\n" @@ -19001,7 +20214,7 @@ msgstr "" "Filtrera bort noder med angivna prefix från dumpströmmen.\n" "användning: svndumpfilter exclude SÖKVÄGS_PREFIX...\n" -#: ../svndumpfilter/svndumpfilter.c:992 +#: ../svndumpfilter/svndumpfilter.c:993 msgid "" "Filter out nodes without given prefixes from dumpstream.\n" "usage: svndumpfilter include PATH_PREFIX...\n" @@ -19009,7 +20222,7 @@ msgstr "" "Filtrera bort noder utan angivna prefix från dumpströmmen.\n" "användning: svndumpfilter include SÖKVÄGS_PREFIX...\n" -#: ../svndumpfilter/svndumpfilter.c:1001 +#: ../svndumpfilter/svndumpfilter.c:1003 msgid "" "Describe the usage of this program or its subcommands.\n" "usage: svndumpfilter help [SUBCOMMAND...]\n" @@ -19017,7 +20230,7 @@ msgstr "" "Visa hur detta program eller dess underkommandon används.\n" "användning: svndumpfilter help [UNDERKOMMANDO...]\n" -#: ../svndumpfilter/svndumpfilter.c:1075 +#: ../svndumpfilter/svndumpfilter.c:1078 msgid "" "general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n" "Subversion repository dump filtering tool.\n" @@ -19034,47 +20247,47 @@ msgstr "" "\n" "Tillgängliga underkommandon:\n" -#: ../svndumpfilter/svndumpfilter.c:1134 +#: ../svndumpfilter/svndumpfilter.c:1137 #, c-format msgid "Excluding (and dropping empty revisions for) prefix patterns:\n" msgstr "Utesluter (och tar bort tomma revisioner för) prefixmönster:\n" -#: ../svndumpfilter/svndumpfilter.c:1136 +#: ../svndumpfilter/svndumpfilter.c:1139 #, c-format msgid "Excluding prefix patterns:\n" msgstr "Utesluter prefixmönster:\n" -#: ../svndumpfilter/svndumpfilter.c:1139 +#: ../svndumpfilter/svndumpfilter.c:1142 #, c-format msgid "Including (and dropping empty revisions for) prefix patterns:\n" msgstr "Tar med (och tar bort tomma revisioner för) prefixmönster:\n" -#: ../svndumpfilter/svndumpfilter.c:1141 +#: ../svndumpfilter/svndumpfilter.c:1144 #, c-format msgid "Including prefix patterns:\n" msgstr "Tar med prefixmönster:\n" -#: ../svndumpfilter/svndumpfilter.c:1149 +#: ../svndumpfilter/svndumpfilter.c:1152 #, c-format msgid "Excluding (and dropping empty revisions for) prefixes:\n" msgstr "Utesluter (och tar bort tomma revisioner för) prefix:\n" -#: ../svndumpfilter/svndumpfilter.c:1151 +#: ../svndumpfilter/svndumpfilter.c:1154 #, c-format msgid "Excluding prefixes:\n" msgstr "Utesluter prefix:\n" -#: ../svndumpfilter/svndumpfilter.c:1154 +#: ../svndumpfilter/svndumpfilter.c:1157 #, c-format msgid "Including (and dropping empty revisions for) prefixes:\n" msgstr "Tar med (och tar bort tomma revisioner för) prefix:\n" -#: ../svndumpfilter/svndumpfilter.c:1156 +#: ../svndumpfilter/svndumpfilter.c:1159 #, c-format msgid "Including prefixes:\n" msgstr "Tar med prefix:\n" -#: ../svndumpfilter/svndumpfilter.c:1184 +#: ../svndumpfilter/svndumpfilter.c:1187 #, c-format msgid "" "Dropped %d revision.\n" @@ -19089,27 +20302,27 @@ msgstr[1] "" "Hoppade över %d revisioner.\n" "\n" -#: ../svndumpfilter/svndumpfilter.c:1192 +#: ../svndumpfilter/svndumpfilter.c:1195 msgid "Revisions renumbered as follows:\n" msgstr "Revisionerna har numrerats om enligt följande:\n" -#: ../svndumpfilter/svndumpfilter.c:1219 +#: ../svndumpfilter/svndumpfilter.c:1222 #, c-format msgid " %ld => (dropped)\n" msgstr " %ld => (borttagen)\n" -#: ../svndumpfilter/svndumpfilter.c:1234 +#: ../svndumpfilter/svndumpfilter.c:1237 #, c-format msgid "Dropped %d node:\n" msgid_plural "Dropped %d nodes:\n" msgstr[0] "Tog bort %d noder:\n" msgstr[1] "Tog bort %d noder:\n" -#: ../svndumpfilter/svndumpfilter.c:1393 +#: ../svndumpfilter/svndumpfilter.c:1396 msgid "--drop-empty-revs cannot be used with --drop-all-empty-revs" msgstr "--drop-empty-revs kan inte användas tillsammans med --drop-all-empty-revs" -#: ../svndumpfilter/svndumpfilter.c:1504 +#: ../svndumpfilter/svndumpfilter.c:1507 #, c-format msgid "" "\n" @@ -19118,7 +20331,7 @@ msgstr "" "\n" "Fel: inga prefix angivna.\n" -#: ../svndumpfilter/svndumpfilter.c:1535 +#: ../svndumpfilter/svndumpfilter.c:1538 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" @@ -19127,7 +20340,7 @@ msgstr "" "Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n" "Skriv \"svndumpfilter help %s\" för användning.\n" -#: ../svndumpfilter/svndumpfilter.c:1553 +#: ../svndumpfilter/svndumpfilter.c:1556 msgid "Try 'svndumpfilter help' for more info" msgstr "Skriv \"svndumpfilter help\" för med information" @@ -19249,25 +20462,45 @@ msgstr "" msgid "" "usage: svnfsfs help [SUBCOMMAND...]\n" "\n" -"Describe the usage of this program or its subcommands.\n" msgstr "" "användning: svnfsfs help [UNDERKOMMANDO...]\n" "\n" -"Visa hur detta program eller dess underkommandon används.\n" -#: ../svnfsfs/svnfsfs.c:122 +#: ../svnfsfs/svnfsfs.c:124 msgid "" "usage: svnfsfs dump-index REPOS_PATH -r REV\n" "\n" +msgstr "" +"användning: svnfsfs dump-index ARKIVSÖKVÄG -r REV\n" +"\n" + +#: ../svnfsfs/svnfsfs.c:126 +msgid "" "Dump the index contents for the revision / pack file containing revision REV\n" "to console. This is only available for FSFS format 7 (SVN 1.9+) repositories.\n" "The table produced contains a header in the first line followed by one line\n" "per index entry, ordered by location in the revision / pack file. Columns:\n" "\n" +msgstr "" +"Skriv innehÃ¥llet i indexet för revision/packfilen som innehÃ¥ller\n" +"revision REV till konsolen. Detta är endast tillgängligt för\n" +"FSFS-arkiv pÃ¥ format 7 (SVN 1.9 eller senare).\n" +"\n" + +#: ../svnfsfs/svnfsfs.c:131 +msgid "" " * Byte offset (hex) at which the item starts\n" " * Length (hex) of the item in bytes\n" " * Item type (string) is one of the following:\n" "\n" +msgstr "" +" * Byteposition (hex) där objektet börjar\n" +" * Längd (hex) av objektet i byte\n" +" * Objekttyp (sträng), en av följande:\n" +"\n" + +#: ../svnfsfs/svnfsfs.c:135 +msgid "" " none ... Unused section. File contents shall be NULs.\n" " frep ... File representation.\n" " drep ... Directory representation.\n" @@ -19278,27 +20511,7 @@ msgid "" " rep .... Representation of unknown type. Should not be used.\n" " ??? .... Invalid. Index data is corrupt.\n" "\n" -" The distinction between frep, drep, fprop and dprop is a mere internal\n" -" classification used for various optimizations and does not affect the\n" -" operational correctness.\n" -"\n" -" * Revision that the item belongs to (decimal)\n" -" * Item number (decimal) within that revision\n" -" * Modified FNV1a checksum (8 hex digits)\n" msgstr "" -"användning: svnfsfs dump-index ARKIVSÖKVÄG -r REV\n" -"\n" -"Skriv innehÃ¥llet i indexet för revision/packfilen som innehÃ¥ller\n" -"revision REV till konsolen. Detta är endast tillgängligt för\n" -"FSFS-arkiv pÃ¥ format 7 (SVN 1.9 eller senare).\n" -"\n" -"Den producerade tabellen innehÃ¥ller ett huvud pÃ¥ första raden följt av\n" -"en indexpost per rad, i positionsordning frÃ¥n revision/packfilen. Kolumner:\n" -"\n" -" * Byteposition (hex) där objektet börjar\n" -" * Längd (hex) av objektet i byte\n" -" * Objekttyp (sträng), en av följande:\n" -"\n" " \"none\" ... Oanvänd sektion. FilinnehÃ¥llet utgörs av nollbytes.\n" " \"frep\" ... Filrepresentation.\n" " \"drep\" ... Katalogrepresentation.\n" @@ -19309,46 +20522,67 @@ msgstr "" " \"rep\" .... Representation av okänd typ. Borde ej användas.\n" " \"???\" .... Ogiltig. Trasigt indexdata.\n" "\n" + +#: ../svnfsfs/svnfsfs.c:145 +msgid "" +" The distinction between frep, drep, fprop and dprop is a mere internal\n" +" classification used for various optimizations and does not affect the\n" +" operational correctness.\n" +"\n" +msgstr "" " Skillnaden mellan frep, drep, fprop och dprop är bara en\n" " intern klassindelning för diverse optimeringar och pÃ¥verkar\n" " inte korrektheten i drift.\n" "\n" + +#: ../svnfsfs/svnfsfs.c:149 +msgid "" +" * Revision that the item belongs to (decimal)\n" +" * Item number (decimal) within that revision\n" +" * Modified FNV1a checksum (8 hex digits)\n" +msgstr "" " * Revision som objektet tillhör (decimalt)\n" " * Objektnummer (decimalt) inom den revisionen\n" " * Modifierad FNV1a-kontrollsumma (8 hexsiffror)\n" -#: ../svnfsfs/svnfsfs.c:148 +#: ../svnfsfs/svnfsfs.c:156 msgid "" "usage: svnfsfs load-index REPOS_PATH\n" "\n" +msgstr "" +"användning: svnfsfs load-index ARKIVSÖKVÄG\n" +"\n" + +#: ../svnfsfs/svnfsfs.c:158 +msgid "" "Read index contents from console. The format is the same as produced by the\n" "dump-index command, except that checksum as well as header are optional and will\n" "be ignored. The data must cover the full revision / pack file; the revision\n" "number is automatically extracted from input stream. No ordering is required.\n" msgstr "" -"användning: svnfsfs load-index ARKIVSÖKVÄG\n" -"\n" "Läs indexinnehÃ¥ll frÃ¥n konsolen. Formatet är samma som kommandot dump-index\n" "producerar, förutom att kontrollsumman och huvudet är valfria och inte\n" "används. Datan mÃ¥ste täcka hela revision/packfilen; revisionsnumret tas\n" "automatiskt frÃ¥n inmatningsströmmen. Ingen speciell ordning krävs.\n" -#: ../svnfsfs/svnfsfs.c:156 +#: ../svnfsfs/svnfsfs.c:166 msgid "" "usage: svnfsfs stats REPOS_PATH\n" "\n" -"Write object size statistics to console.\n" msgstr "" "användning: svnfsfs stats ARKIVSÖKVÄG\n" "\n" -"Skriv statistik för objektstorlek till konsolen.\n" -#: ../svnfsfs/svnfsfs.c:176 +#: ../svnfsfs/svnfsfs.c:168 +msgid "Write object size statistics to console.\n" +msgstr "Skriv statistik för objektstorlek till konsolen.\n" + +#: ../svnfsfs/svnfsfs.c:188 #, c-format msgid "%s repositories are not supported" msgstr "%s-arkiv stöds ej" -#: ../svnfsfs/svnfsfs.c:192 +#: ../svnfsfs/svnfsfs.c:204 msgid "" "general usage: svnfsfs SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Subversion FSFS repository manipulation tool.\n" @@ -19364,7 +20598,7 @@ msgstr "" "\n" "Tillgängliga underkommandon:\n" -#: ../svnfsfs/svnfsfs.c:423 +#: ../svnfsfs/svnfsfs.c:435 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" @@ -19373,7 +20607,7 @@ msgstr "" "Underkommandot \"%s\" tillÃ¥ter inte flaggan \"%s\"\n" "Skriv \"svnfsfs help %s\" för användning.\n" -#: ../svnfsfs/svnfsfs.c:455 +#: ../svnfsfs/svnfsfs.c:467 msgid "Try 'svnfsfs help' for more info" msgstr "Skriv \"svnfsfs help\" för mer information" @@ -19445,7 +20679,7 @@ msgstr "" " -U N, --context N: Visa N raders sammanhang \n" " -p, --show-c-function: Visa funktionsnamn i C" -#: ../svnlook/svnlook.c:206 ../svnrdump/svnrdump.c:108 +#: ../svnlook/svnlook.c:206 ../svnrdump/svnrdump.c:114 #: ../svnserve/svnserve.c:421 ../svnversion/svnversion.c:146 msgid "no progress (only errors) to stderr" msgstr "" @@ -19456,218 +20690,261 @@ msgstr "" msgid "" "usage: svnlook author REPOS_PATH\n" "\n" -"Print the author.\n" msgstr "" "användning: svnlook author ARKIVSÖKVÄG\n" "\n" -"Visa författaren.\n" -#: ../svnlook/svnlook.c:223 +#: ../svnlook/svnlook.c:220 +msgid "Print the author.\n" +msgstr "Visa författaren.\n" + +#: ../svnlook/svnlook.c:225 msgid "" "usage: svnlook cat REPOS_PATH FILE_PATH\n" "\n" -"Print the contents of a file. Leading '/' on FILE_PATH is optional.\n" msgstr "" "användning: svnlook cat ARKIVSÖKVÄG FIL_SÖKVÄG\n" "\n" -"Visa innehÃ¥llet i en fil. Inledande \"/\" är valfritt för FIL_SÖKVÄG.\n" -#: ../svnlook/svnlook.c:228 +#: ../svnlook/svnlook.c:227 +msgid "Print the contents of a file. Leading '/' on FILE_PATH is optional.\n" +msgstr "Visa innehÃ¥llet i en fil. Inledande \"/\" är valfritt för FIL_SÖKVÄG.\n" + +#: ../svnlook/svnlook.c:232 msgid "" "usage: svnlook changed REPOS_PATH\n" "\n" -"Print the paths that were changed.\n" msgstr "" "användning: svnlook changed ARKIVSÖKVÄG\n" "\n" -"Visa vilka sökvägar som har ändrats.\n" -#: ../svnlook/svnlook.c:233 +#: ../svnlook/svnlook.c:234 +msgid "Print the paths that were changed.\n" +msgstr "Visa vilka sökvägar som har ändrats.\n" + +#: ../svnlook/svnlook.c:239 msgid "" "usage: svnlook date REPOS_PATH\n" "\n" -"Print the datestamp.\n" msgstr "" "användning: svnlook date ARKIVSÖKVÄG\n" "\n" -"Visa datumstämpel.\n" -#: ../svnlook/svnlook.c:238 +#: ../svnlook/svnlook.c:241 +msgid "Print the datestamp.\n" +msgstr "Visa datumstämpel.\n" + +#: ../svnlook/svnlook.c:246 msgid "" "usage: svnlook diff REPOS_PATH\n" "\n" -"Print GNU-style diffs of changed files and properties.\n" msgstr "" "användning: svnlook diff ARKIVSÖKVÄG\n" "\n" -"Visa diffar i GNU-stil för ändrade filer och egenskaper.\n" -#: ../svnlook/svnlook.c:245 +#: ../svnlook/svnlook.c:248 +msgid "Print GNU-style diffs of changed files and properties.\n" +msgstr "Visa diffar i GNU-stil för ändrade filer och egenskaper.\n" + +#: ../svnlook/svnlook.c:255 msgid "" "usage: svnlook dirs-changed REPOS_PATH\n" "\n" -"Print the directories that were themselves changed (property edits)\n" -"or whose file children were changed.\n" msgstr "" "användning: svnlook dirs-changed ARKIVSÖKVÄG\n" "\n" + +#: ../svnlook/svnlook.c:257 +msgid "" +"Print the directories that were themselves changed (property edits)\n" +"or whose file children were changed.\n" +msgstr "" "Visa kataloger som själva har ändrats (egenskapsändringar) eller vars\n" "barnfiler har ändrats.\n" -#: ../svnlook/svnlook.c:251 +#: ../svnlook/svnlook.c:263 msgid "" "usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n" "\n" -"Print the size (in bytes) of the file located at PATH_IN_REPOS as\n" -"it is represented in the repository.\n" msgstr "" "användning: svnlook filesize ARKIVSÖKVÄG SÖKVÄG_I_ARKIV\n" "\n" + +#: ../svnlook/svnlook.c:265 +msgid "" +"Print the size (in bytes) of the file located at PATH_IN_REPOS as\n" +"it is represented in the repository.\n" +msgstr "" "Visa storleken (i byte) av filen i SÖKVÄG_I_ARKIV sÃ¥dan den representeras\n" "i arkivet.\n" -#: ../svnlook/svnlook.c:257 +#: ../svnlook/svnlook.c:271 msgid "" "usage: svnlook help [SUBCOMMAND...]\n" "\n" -"Describe the usage of this program or its subcommands.\n" msgstr "" "användning: svnlook help [UNDERKOMMANDO...]\n" "\n" -"Beskriv användningen av detta program eller dess underkommandon.\n" -#: ../svnlook/svnlook.c:262 +#: ../svnlook/svnlook.c:278 msgid "" "usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n" "\n" -"Print information about the history of a path in the repository (or\n" -"the root directory if no path is supplied).\n" msgstr "" "användning: svnlook history ARKIVSÖKVÄG [SÖKVÄG_I_ARKIV]\n" "\n" + +#: ../svnlook/svnlook.c:280 +msgid "" +"Print information about the history of a path in the repository (or\n" +"the root directory if no path is supplied).\n" +msgstr "" "Visa information om historiken för en sökväg i arkivet (eller rotkatalogen\n" "om ingen sökväg anges).\n" -#: ../svnlook/svnlook.c:268 +#: ../svnlook/svnlook.c:286 msgid "" "usage: svnlook info REPOS_PATH\n" "\n" -"Print the author, datestamp, log message size, and log message.\n" msgstr "" "användning: svnlook info ARKIVSÖKVÄG\n" "\n" + +#: ../svnlook/svnlook.c:288 +msgid "Print the author, datestamp, log message size, and log message.\n" +msgstr "" "Visa författaren, datumstämpeln, loggmeddelandets storlek samt\n" "själva loggmeddelandet.\n" -#: ../svnlook/svnlook.c:273 +#: ../svnlook/svnlook.c:293 msgid "" "usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n" "\n" -"If a lock exists on a path in the repository, describe it.\n" msgstr "" "användning: svnlook lock ARKIVSÖKVÄG SÖKVÄG_I_ARKIV\n" "\n" -"Om ett lÃ¥s finns pÃ¥ en sökväg i arkivet, visa information om det.\n" -#: ../svnlook/svnlook.c:278 +#: ../svnlook/svnlook.c:295 +msgid "If a lock exists on a path in the repository, describe it.\n" +msgstr "Om ett lÃ¥s finns pÃ¥ en sökväg i arkivet, visa information om det.\n" + +#: ../svnlook/svnlook.c:300 msgid "" "usage: svnlook log REPOS_PATH\n" "\n" -"Print the log message.\n" msgstr "" "användning: svnlook log ARKIVSÖKVÄG\n" "\n" -"Visa loggmeddelandet.\n" -#: ../svnlook/svnlook.c:283 +#: ../svnlook/svnlook.c:302 +msgid "Print the log message.\n" +msgstr "Visa loggmeddelandet.\n" + +#: ../svnlook/svnlook.c:307 msgid "" "usage: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n" " 2. svnlook propget --revprop REPOS_PATH PROPNAME\n" "\n" -"Print the raw value of a property on a path in the repository.\n" -"With --revprop, print the raw value of a revision property.\n" msgstr "" "användning: 1. svnlook propget ARKIVSÖKVÄG EGENSKAPSNAMN\n" " 2. svnlook propget --revprop ARKIVSÖKVÄG\n" " EGENSKAPSNAMN\n" "\n" + +#: ../svnlook/svnlook.c:312 +msgid "" +"Print the raw value of a property on a path in the repository.\n" +"With --revprop, print the raw value of a revision property.\n" +msgstr "" "Skriv ut det rÃ¥a värdet för en egenskap pÃ¥ en sökväg i arkivet.\n" "Om --revprop används, skriv ut det rÃ¥a värdet pÃ¥ en revisionsegenskap.\n" -#: ../svnlook/svnlook.c:292 +#: ../svnlook/svnlook.c:318 msgid "" "usage: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n" " 2. svnlook proplist --revprop REPOS_PATH\n" "\n" -"List the properties of a path in the repository, or\n" -"with the --revprop option, revision properties.\n" -"With -v, show the property values too.\n" msgstr "" "användning: 1. svnlook proplist ARKIVSÖKVÄG SÖKVÄG_I_ARKIV\n" " 2. svnlook proplist --revprop ARKIVSÖKVÄG\n" "\n" + +#: ../svnlook/svnlook.c:323 +msgid "" +"List the properties of a path in the repository, or\n" +"with the --revprop option, revision properties.\n" +"With -v, show the property values too.\n" +msgstr "" "Lista egenskaperna för en sökväg i arkivet eller, om --revprop anges,\n" "visa revisionsegenskaper. Med -v visas även egenskapernas värden.\n" -#: ../svnlook/svnlook.c:303 +#: ../svnlook/svnlook.c:331 msgid "" "usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n" "\n" -"Print the tree, starting at PATH_IN_REPOS (if supplied, at the root\n" -"of the tree otherwise), optionally showing node revision ids.\n" msgstr "" "användning: svnlook tree ARKIVSÖKVÄG [SÖKVÄG_I_ARKIV]\n" "\n" + +#: ../svnlook/svnlook.c:333 +msgid "" +"Print the tree, starting at PATH_IN_REPOS (if supplied, at the root\n" +"of the tree otherwise), optionally showing node revision ids.\n" +msgstr "" "Visa trädet, med början i SÖKVÄG_I_ARKIV (om den anges, annars används trädets\n" "rot). Visa även nodrevisions-ID:n om sÃ¥ önskas.\n" -#: ../svnlook/svnlook.c:309 +#: ../svnlook/svnlook.c:339 msgid "" "usage: svnlook uuid REPOS_PATH\n" "\n" -"Print the repository's UUID.\n" msgstr "" "användning: svnlook uuid ARKIVSÖKVÄG\n" "\n" -"Visa arkivets UUID.\n" -#: ../svnlook/svnlook.c:314 +#: ../svnlook/svnlook.c:341 +msgid "Print the repository's UUID.\n" +msgstr "Visa arkivets UUID.\n" + +#: ../svnlook/svnlook.c:346 msgid "" "usage: svnlook youngest REPOS_PATH\n" "\n" -"Print the youngest revision number.\n" msgstr "" "användning: svnlook youngest ARKIVSÖKVÄG\n" "\n" -"Visa det yngsta revisionsnumret.\n" -#: ../svnlook/svnlook.c:790 +#: ../svnlook/svnlook.c:348 +msgid "Print the youngest revision number.\n" +msgstr "Visa det yngsta revisionsnumret.\n" + +#: ../svnlook/svnlook.c:824 #, c-format msgid "%sProperty changes on: %s%s" msgstr "%sEgenskapsändringar för: %s%s" -#: ../svnlook/svnlook.c:857 +#: ../svnlook/svnlook.c:891 #, c-format msgid "Copied: %s (from rev %ld, %s)\n" msgstr "Kopierad: %s (frÃ¥n revision %ld, %s)\n" -#: ../svnlook/svnlook.c:925 +#: ../svnlook/svnlook.c:959 msgid "Added" msgstr "Tillagd" -#: ../svnlook/svnlook.c:926 +#: ../svnlook/svnlook.c:960 msgid "Deleted" msgstr "Raderad" -#: ../svnlook/svnlook.c:927 +#: ../svnlook/svnlook.c:961 msgid "Modified" msgstr "Ändrad" -#: ../svnlook/svnlook.c:928 +#: ../svnlook/svnlook.c:962 msgid "Index" msgstr "Index" -#: ../svnlook/svnlook.c:939 +#: ../svnlook/svnlook.c:973 msgid "" "(Binary files differ)\n" "\n" @@ -19675,30 +20952,30 @@ msgstr "" "(Binära filer skiljer sig Ã¥t)\n" "\n" -#: ../svnlook/svnlook.c:1208 +#: ../svnlook/svnlook.c:1242 msgid "unknown" msgstr "okänd" -#: ../svnlook/svnlook.c:1265 +#: ../svnlook/svnlook.c:1299 #, c-format msgid "Transaction '%s' is not based on a revision; how odd" msgstr "Transaktionen \"%s\" är inte baserad pÃ¥ en revision; skumt" -#: ../svnlook/svnlook.c:1408 +#: ../svnlook/svnlook.c:1442 #, c-format msgid "'%s' is a URL, probably should be a path" msgstr "\"%s\" är en URL; ska troligen vara en sökväg" -#: ../svnlook/svnlook.c:1431 ../svnlook/svnlook.c:1454 +#: ../svnlook/svnlook.c:1465 ../svnlook/svnlook.c:1488 #, c-format msgid "Path '%s' is not a file" msgstr "Sökvägen \"%s\" är inte en fil" -#: ../svnlook/svnlook.c:1588 +#: ../svnlook/svnlook.c:1622 msgid "History item limit reached" msgstr "Gräns nÃ¥dd för element i historiken" -#: ../svnlook/svnlook.c:1607 +#: ../svnlook/svnlook.c:1641 #, c-format msgid "" "REVISION PATH \n" @@ -19707,7 +20984,7 @@ msgstr "" "REVISION SÖKVÄG \n" "-------- -----------\n" -#: ../svnlook/svnlook.c:1612 +#: ../svnlook/svnlook.c:1646 #, c-format msgid "" "REVISION PATH\n" @@ -19716,41 +20993,41 @@ msgstr "" "REVISION SÖKVÄG\n" "-------- ------\n" -#: ../svnlook/svnlook.c:1685 +#: ../svnlook/svnlook.c:1719 #, c-format msgid "Property '%s' not found on revision %ld" msgstr "Egenskapen \"%s\" finns inte för revision %ld" -#: ../svnlook/svnlook.c:1689 +#: ../svnlook/svnlook.c:1723 #, c-format msgid "Property '%s' not found on transaction %s" msgstr "Egenskapen \"%s\" finns inte i transaktion %s" -#: ../svnlook/svnlook.c:1698 +#: ../svnlook/svnlook.c:1732 #, c-format msgid "Property '%s' not found on path '%s' or inherited from a parent in revision %ld" msgstr "Egenskapen \"%s\" finns inte pÃ¥ sökvägen \"%s\" eller ärvd frÃ¥n en förälder i revision %ld" -#: ../svnlook/svnlook.c:1704 +#: ../svnlook/svnlook.c:1738 #, c-format msgid "Property '%s' not found on path '%s' in revision %ld" msgstr "Egenskapen \"%s\" finns inte pÃ¥ sökvägen \"%s\" i revision %ld" -#: ../svnlook/svnlook.c:1712 +#: ../svnlook/svnlook.c:1746 #, c-format msgid "Property '%s' not found on path '%s' or inherited from a parent in transaction %s" msgstr "Egenskapen \"%s\" finns inte pÃ¥ sökvägen \"%s\" eller ärvd frÃ¥n en förälder i transaktion %s" -#: ../svnlook/svnlook.c:1718 +#: ../svnlook/svnlook.c:1752 #, c-format msgid "Property '%s' not found on path '%s' in transaction %s" msgstr "Egenskapen \"%s\" finns inte pÃ¥ sökvägen \"%s\" i transaktion %s" -#: ../svnlook/svnlook.c:2055 +#: ../svnlook/svnlook.c:2089 msgid "Missing repository path argument" msgstr "Arkivargument saknas" -#: ../svnlook/svnlook.c:2207 +#: ../svnlook/svnlook.c:2241 msgid "" "general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Subversion repository inspection tool.\n" @@ -19772,7 +21049,7 @@ msgstr "" "\n" "Tillgängliga underkommandon:\n" -#: ../svnlook/svnlook.c:2286 +#: ../svnlook/svnlook.c:2320 #, c-format msgid "" "Comment (%i line):\n" @@ -19787,48 +21064,48 @@ msgstr[1] "" "Kommentar (%i rader):\n" "%s\n" -#: ../svnlook/svnlook.c:2338 +#: ../svnlook/svnlook.c:2372 #, c-format msgid "Missing propname argument" msgstr "Egenskapsargument saknas" -#: ../svnlook/svnlook.c:2339 +#: ../svnlook/svnlook.c:2373 #, c-format msgid "Missing propname and repository path arguments" msgstr "Egenskapsnamns- och arkivsökvägsargument saknas" -#: ../svnlook/svnlook.c:2345 +#: ../svnlook/svnlook.c:2379 msgid "Missing propname or repository path argument" msgstr "Egenskapsnamns- eller arkivsökvägsargument saknas" -#: ../svnlook/svnlook.c:2499 +#: ../svnlook/svnlook.c:2533 msgid "Invalid revision number supplied" msgstr "Ogiltigt revisionsnummer angivet" -#: ../svnlook/svnlook.c:2622 +#: ../svnlook/svnlook.c:2656 msgid "The '--transaction' (-t) and '--revision' (-r) arguments cannot co-exist" msgstr "Flaggorna \"--transaction\" (-t) och \"--revision\" (-r) kan inte anges samtidigt" -#: ../svnlook/svnlook.c:2629 +#: ../svnlook/svnlook.c:2663 msgid "Cannot use the '--show-inherited-props' option with the '--revprop' option" msgstr "Kan inte använda flaggan \"--show-inherited-props\" tillsammans med \"--revprop\"" -#: ../svnlook/svnlook.c:2686 +#: ../svnlook/svnlook.c:2720 #, c-format msgid "Try 'svnadmin verify' instead.\n" msgstr "Försök med \"svnadmin verify\" istället.\n" -#: ../svnlook/svnlook.c:2719 +#: ../svnlook/svnlook.c:2753 #, c-format msgid "Repository argument required\n" msgstr "Arkivargument krävs\n" -#: ../svnlook/svnlook.c:2728 +#: ../svnlook/svnlook.c:2762 #, c-format msgid "'%s' is a URL when it should be a path\n" msgstr "\"%s\" är en URL när den skulle vara en sökväg\n" -#: ../svnlook/svnlook.c:2778 +#: ../svnlook/svnlook.c:2812 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" @@ -19837,7 +21114,7 @@ msgstr "" "Underkommandot \"%s\" tillÃ¥ter inte flaggan \"%s\"\n" "Skriv \"svnlook help %s\" för användning.\n" -#: ../svnlook/svnlook.c:2809 +#: ../svnlook/svnlook.c:2843 msgid "Try 'svnlook help' for more info" msgstr "Skriv \"svnlook help\" för mer information" @@ -19959,7 +21236,7 @@ msgstr "--message (-m), --file (-F) och --with-revprop=svn:log kan inte använda msgid "Invalid revision number '%s'" msgstr "Ogiltigt revisionsnummer \"%s\"" -#: ../svnrdump/load_editor.c:230 ../svnsync/svnsync.c:353 +#: ../svnrdump/load_editor.c:230 ../svnsync/svnsync.c:358 #, c-format msgid "Failed to get lock on destination repos, currently held by '%s'\n" msgstr "Kunde inte lÃ¥sa destinationsarkivet; det är för närvarande lÃ¥st av \"%s\"\n" @@ -19972,54 +21249,56 @@ msgstr "MÃ¥lservern stöder inte atomisk ändring av revisionsegenskaper; överv msgid "" "usage: svnrdump dump URL [-r LOWER[:UPPER]]\n" "\n" +msgstr "" +"användning: svnrdump dump URL [-r BÖRJAN[:SLUT]]\n" +"\n" + +#: ../svnrdump/svnrdump.c:89 +msgid "" "Dump revisions LOWER to UPPER of repository at remote URL to stdout\n" "in a 'dumpfile' portable format. If only LOWER is given, dump that\n" "one revision.\n" msgstr "" -"användning: svnrdump dump URL [-r BÖRJAN[:SLUT]]\n" -"\n" "Dumpa revisionerna BÖRJAN till SLUT av arkivet vid URL till standard ut\n" "i ett portabelt \"dumpfile\"-format. Om bara BÖRJAN anges, dumpa bara\n" "den revisionen.\n" -#: ../svnrdump/svnrdump.c:93 +#: ../svnrdump/svnrdump.c:95 msgid "" "usage: svnrdump load URL\n" "\n" -"Load a 'dumpfile' given on stdin to a repository at remote URL.\n" msgstr "" "användning: svnrdump load URL\n" "\n" -"Läs in en dumpfil frÃ¥n standard in till ett arkiv vid URL.\n" #: ../svnrdump/svnrdump.c:97 +msgid "Load a 'dumpfile' given on stdin to a repository at remote URL.\n" +msgstr "Läs in en dumpfil frÃ¥n standard in till ett arkiv vid URL.\n" + +#: ../svnrdump/svnrdump.c:101 msgid "" "usage: svnrdump help [SUBCOMMAND...]\n" "\n" -"Describe the usage of this program or its subcommands.\n" -msgstr "" -"användning: svnadmin help [UNDERKOMMANDO...]\n" -"\n" -"Beskriv hur det här programmet och dess underkommandon används.\n" +msgstr "användning: svnrdump help [UNDERKOMMANDO...]\n\n" -#: ../svnrdump/svnrdump.c:110 +#: ../svnrdump/svnrdump.c:116 msgid "dump incrementally" msgstr "dumpa inkrementellt" -#: ../svnrdump/svnrdump.c:112 +#: ../svnrdump/svnrdump.c:118 msgid "skip revision property ARG (e.g., \"svn:author\")" msgstr "hoppa över revisionsegenskapen ARG (t.ex. \"svn:author\")" -#: ../svnrdump/svnrdump.c:132 ../svnserve/svnserve.c:413 +#: ../svnrdump/svnrdump.c:138 ../svnserve/svnserve.c:413 #: ../svnversion/svnversion.c:142 msgid "display this help" msgstr "visa denna hjälp" -#: ../svnrdump/svnrdump.c:161 +#: ../svnrdump/svnrdump.c:167 msgid "Read or write to a dumpfile instead of stdin/stdout" msgstr "Läs eller skriv till en dumpfil istället för standard in/ut" -#: ../svnrdump/svnrdump.c:667 +#: ../svnrdump/svnrdump.c:673 msgid "" "general usage: svnrdump SUBCOMMAND URL [-r LOWER[:UPPER]]\n" "Subversion remote repository dump and load tool.\n" @@ -20036,20 +21315,20 @@ msgstr "" "\n" "Tillgängliga underkommandon:\n" -#: ../svnrdump/svnrdump.c:712 ../svnrdump/svnrdump.c:746 +#: ../svnrdump/svnrdump.c:718 ../svnrdump/svnrdump.c:752 msgid "Unsupported revision specifier used; use only integer values or 'HEAD'" msgstr "Ej stödd revisionsangivelse; använd endast heltal eller \"HEAD\"" -#: ../svnrdump/svnrdump.c:720 ../svnrdump/svnrdump.c:754 +#: ../svnrdump/svnrdump.c:726 ../svnrdump/svnrdump.c:760 #, c-format msgid "Revision '%ld' does not exist" msgstr "Revisionen \"%ld\" finns inte" -#: ../svnrdump/svnrdump.c:764 +#: ../svnrdump/svnrdump.c:770 msgid "LOWER revision cannot be greater than UPPER revision; consider reversing your revision range" msgstr "Revisionen BÖRJAN kan inte vara större än SLUT; byt plats pÃ¥ dem" -#: ../svnrdump/svnrdump.c:1011 +#: ../svnrdump/svnrdump.c:1017 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" @@ -20058,7 +21337,7 @@ msgstr "" "Underkommandot \"%s\" tillÃ¥ter inte flaggan \"%s\"\n" "Skriv \"svnrdump help %s\" för användning.\n" -#: ../svnrdump/svnrdump.c:1054 +#: ../svnrdump/svnrdump.c:1060 msgid "load subcommand with --password-from-stdin requires -F" msgstr "Underkommandot \"load\" med --password-from-stdin mÃ¥ste användas med -F" @@ -20536,12 +21815,31 @@ msgstr "Tjänsten kunde inte starta; ett internt fel inträffade dÃ¥ tjänsten s msgid "" "usage: svnsync initialize DEST_URL SOURCE_URL\n" "\n" +msgstr "" +"användning: svnsync initialize DEST-URL KÄLL-URL\n" +"\n" + +#: ../svnsync/svnsync.c:97 +msgid "" "Initialize a destination repository for synchronization from\n" "another repository.\n" "\n" +msgstr "" +"Initiera ett destinationsarkiv för synkronisering frÃ¥n ett annat arkiv.\n" +"\n" + +#: ../svnsync/svnsync.c:100 +msgid "" "If the source URL is not the root of a repository, only the\n" "specified part of the repository will be synchronized.\n" "\n" +msgstr "" +"Om käll-URL:en inte är rot till ett arkiv kommer bara den angivna delen av\n" +"arkivet synkroniseras.\n" +"\n" + +#: ../svnsync/svnsync.c:103 +msgid "" "The destination URL must point to the root of a repository which\n" "has been configured to allow revision property changes. In\n" "the general case, the destination repository must contain no\n" @@ -20552,18 +21850,7 @@ msgid "" "when initializing a copy of a repository as a mirror of that same\n" "repository, for example.)\n" "\n" -"You should not commit to, or make revision property changes in,\n" -"the destination repository by any method other than 'svnsync'.\n" -"In other words, the destination repository should be a read-only\n" -"mirror of the source repository.\n" msgstr "" -"användning: svnsync initialize DEST-URL KÄLL-URL\n" -"\n" -"Initiera ett destinationsarkiv för synkronisering frÃ¥n ett annat arkiv.\n" -"\n" -"Om käll-URL:en inte är rot till ett arkiv kommer bara den angivna delen av\n" -"arkivet synkroniseras.\n" -"\n" "Destinations-URL:en mÃ¥ste utpeka roten till ett arkiv som tillÃ¥ter ändring\n" "av revisionsegenskaper. I allmänhet fÃ¥r destinationsarkivet inte innehÃ¥lla\n" "nÃ¥gra arkiverade revisioner. Använd --allow-non-empty för att kringgÃ¥\n" @@ -20572,107 +21859,142 @@ msgstr "" "till exempel användbart när en kopia av ett arkiv skall tjäna som spegling\n" "av samma arkiv.)\n" "\n" + +#: ../svnsync/svnsync.c:113 +msgid "" +"You should not commit to, or make revision property changes in,\n" +"the destination repository by any method other than 'svnsync'.\n" +"In other words, the destination repository should be a read-only\n" +"mirror of the source repository.\n" +msgstr "" "Man bör inte arkivera till, eller göra ändringar av revisionsegenskaper i\n" "destinationsarkivet pÃ¥ nÃ¥got annat sätt än med \"svnsync\". Med andra ord\n" "bör destinationsarkivet vara en spegling av källarkivet som endast används\n" "för läsning.\n" -#: ../svnsync/svnsync.c:121 +#: ../svnsync/svnsync.c:122 msgid "" "usage: svnsync synchronize DEST_URL [SOURCE_URL]\n" "\n" +msgstr "" +"användning: svnsync synchronize DEST-URL [KÄLL-URL]\n" +"\n" + +#: ../svnsync/svnsync.c:124 +msgid "" "Transfer all pending revisions to the destination from the source\n" "with which it was initialized.\n" "\n" +msgstr "" +"Överför alla utestÃ¥ende revisioner till destinationen frÃ¥n källan som\n" +"synkroniseringen förbereddes för.\n" +"\n" + +#: ../svnsync/svnsync.c:127 +msgid "" "If SOURCE_URL is provided, use that as the source repository URL,\n" "ignoring what is recorded in the destination repository as the\n" "source URL. Specifying SOURCE_URL is recommended in particular\n" "if untrusted users/administrators may have write access to the\n" "DEST_URL repository.\n" msgstr "" -"användning: svnsync synchronize DEST-URL [KÄLL-URL]\n" -"\n" -"Överför alla utestÃ¥ende revisioner till destinationen frÃ¥n källan som\n" -"synkroniseringen förbereddes för.\n" -"\n" "Om KÄLL-URL anges kommer den användas som URL till källarkivet istället för\n" "källan som var sparad i destinationsarkivet. Att ange KÄLL-URL rekommenderas\n" "speciellt när icke betrodda användare eller förvaltare kan ha skrivande\n" "Ã¥tkomst till arkivet DEST-URL.\n" -#: ../svnsync/svnsync.c:134 +#: ../svnsync/svnsync.c:136 msgid "" "usage:\n" "\n" +msgstr "" +"användning:\n" +"\n" + +#: ../svnsync/svnsync.c:138 +msgid "" " 1. svnsync copy-revprops DEST_URL [SOURCE_URL]\n" " 2. svnsync copy-revprops DEST_URL REV[:REV2]\n" "\n" +msgstr "" +" 1. svnsync copy-revprops DEST-URL [KÄLL-URL]\n" +" 2. svnsync copy-revprops DEST-URL REV[:REV2]\n" +"\n" + +#: ../svnsync/svnsync.c:141 +msgid "" "Copy the revision properties in a given range of revisions to the\n" "destination from the source with which it was initialized. If the\n" "revision range is not specified, it defaults to all revisions in\n" "the DEST_URL repository. Note also that the 'HEAD' revision is the\n" "latest in DEST_URL, not necessarily the latest in SOURCE_URL.\n" "\n" -"If SOURCE_URL is provided, use that as the source repository URL,\n" -"ignoring what is recorded in the destination repository as the\n" -"source URL. Specifying SOURCE_URL is recommended in particular\n" -"if untrusted users/administrators may have write access to the\n" -"DEST_URL repository.\n" -"\n" -"Unless you need to trigger the destination repositoy's revprop\n" -"change hooks for all revision properties, it is recommended to use\n" -"the --skip-unchanged option for best performance.\n" -"\n" -"Form 2 is deprecated syntax, equivalent to specifying \"-rREV[:REV2]\".\n" msgstr "" -"användning:\n" -"\n" -" 1. svnsync copy-revprops DEST-URL [KÄLL-URL]\n" -" 2. svnsync copy-revprops DEST-URL REV[:REV2]\n" -"\n" "Kopiera revisionsegenskaperna i ett givet revisionsomrÃ¥de till destinationen\n" "frÃ¥n källan som synkroniseringen förbereddes för. Om revisionsomrÃ¥det inte\n" "anges antas att alla revisioner i arkivet DEST-URL avsÃ¥gs. Observera även\n" "att revisionen \"HEAD\" är den senaste i DEST-URL, inte nödvändigtvis den\n" "senaste i KÄLL-URL.\n" "\n" + +#: ../svnsync/svnsync.c:147 +msgid "" +"If SOURCE_URL is provided, use that as the source repository URL,\n" +"ignoring what is recorded in the destination repository as the\n" +"source URL. Specifying SOURCE_URL is recommended in particular\n" +"if untrusted users/administrators may have write access to the\n" +"DEST_URL repository.\n" +"\n" +msgstr "" "Om KÄLL-URL anges kommer den användas som URL till källarkivet istället för\n" "källan som var sparad i destinationsarkivet. Att ange KÄLL-URL rekommenderas\n" "speciellt när icke betrodda användare eller förvaltare kan ha skrivande\n" "Ã¥tkomst till arkivet DEST-URL.\n" "\n" + +#: ../svnsync/svnsync.c:153 +msgid "" +"Unless you need to trigger the destination repositoy's revprop\n" +"change hooks for all revision properties, it is recommended to use\n" +"the --skip-unchanged option for best performance.\n" +"\n" +msgstr "" "Om du inte behöver utlösa destinationsarkivets krokskript för alla\n" "revisionsegenskaper rekommenderas att använda väljaren --skip-unchanged\n" "för bästa prestanda.\n" "\n" -"Form 2 är förÃ¥ldrad och ekvivalent med att ange \"-rREV[:REV2]\".\n" -#: ../svnsync/svnsync.c:160 +#: ../svnsync/svnsync.c:157 +msgid "Form 2 is deprecated syntax, equivalent to specifying \"-rREV[:REV2]\".\n" +msgstr "Form 2 är förÃ¥ldrad och ekvivalent med att ange \"-rREV[:REV2]\".\n" + +#: ../svnsync/svnsync.c:163 msgid "" "usage: svnsync info DEST_URL\n" "\n" -"Print information about the synchronization destination repository\n" -"located at DEST_URL.\n" msgstr "" "användning: svnsync info DEST-URL\n" "\n" -"Visa information om destinationsarkivet för synkronisering i DEST-URL.\n" -#: ../svnsync/svnsync.c:166 +#: ../svnsync/svnsync.c:165 +msgid "" +"Print information about the synchronization destination repository\n" +"located at DEST_URL.\n" +msgstr "Visa information om destinationsarkivet för synkronisering i DEST-URL.\n" + +#: ../svnsync/svnsync.c:170 msgid "" "usage: svnsync help [SUBCOMMAND...]\n" "\n" -"Describe the usage of this program or its subcommands.\n" msgstr "" "användning: svnsync help [UNDERKOMMANDO...]\n" "\n" -"Visa hur detta program eller dess underkommandon används.\n" -#: ../svnsync/svnsync.c:176 +#: ../svnsync/svnsync.c:181 msgid "print as little as possible" msgstr "visa sÃ¥ lite information som möjligt" -#: ../svnsync/svnsync.c:178 +#: ../svnsync/svnsync.c:183 msgid "" "operate on revision ARG (or range ARG1:ARG2)\n" " A revision argument can be one of:\n" @@ -20684,15 +22006,15 @@ msgstr "" " TAL revisionsnummer\n" " \"HEAD\" senaste i arkivet" -#: ../svnsync/svnsync.c:186 +#: ../svnsync/svnsync.c:191 msgid "allow a non-empty destination repository" msgstr "tillÃ¥t ett icke-tomt destinationsarkiv" -#: ../svnsync/svnsync.c:188 +#: ../svnsync/svnsync.c:193 msgid "don't copy unchanged revision properties" msgstr "kopiera inte revisionsegenskaper" -#: ../svnsync/svnsync.c:200 +#: ../svnsync/svnsync.c:205 msgid "" "specify a username ARG (deprecated;\n" " see --source-username and --sync-username)" @@ -20700,7 +22022,7 @@ msgstr "" "ange användarnamnet ARG (förÃ¥ldrat;\n" " se --source-username och --sync-username)" -#: ../svnsync/svnsync.c:204 +#: ../svnsync/svnsync.c:209 msgid "" "specify a password ARG (deprecated;\n" " see --source-password and --sync-password)" @@ -20708,7 +22030,7 @@ msgstr "" "ange lösenordet ARG (förÃ¥ldrat;\n" " se --source-password and --sync-password)" -#: ../svnsync/svnsync.c:208 +#: ../svnsync/svnsync.c:213 msgid "" "deprecated; same as\n" " --source-trust-server-cert-failures=unknown-ca\n" @@ -20718,7 +22040,7 @@ msgstr "" " --source-trust-server-cert-failures=unknown-ca\n" " --sync-trust-server-cert-failures=unknown-ca" -#: ../svnsync/svnsync.c:214 +#: ../svnsync/svnsync.c:219 msgid "" "with --non-interactive, accept SSL\n" " server certificates with failures.\n" @@ -20741,7 +22063,7 @@ msgstr "" " - \"other\" (alla andra fel).\n" " Gäller käll-URL." -#: ../svnsync/svnsync.c:234 +#: ../svnsync/svnsync.c:239 msgid "" "Like\n" " --source-trust-server-cert-failures,\n" @@ -20751,25 +22073,25 @@ msgstr "" " --source-trust-server-cert-failures,\n" " men gäller mÃ¥l-URL." -#: ../svnsync/svnsync.c:240 +#: ../svnsync/svnsync.c:245 msgid "connect to source repository with username ARG" msgstr "anslut till källarkivet med användarnamn ARG" -#: ../svnsync/svnsync.c:242 +#: ../svnsync/svnsync.c:247 msgid "connect to source repository with password ARG" msgstr "anslut till källarkivet med lösenord ARG" -#: ../svnsync/svnsync.c:244 +#: ../svnsync/svnsync.c:249 msgid "connect to sync repository with username ARG" msgstr "" "anslut till synkroniseringsarkiv med\n" " användarnamn ARG" -#: ../svnsync/svnsync.c:246 +#: ../svnsync/svnsync.c:251 msgid "connect to sync repository with password ARG" msgstr "anslut till synkroniseringsarkiv med lösenord ARG" -#: ../svnsync/svnsync.c:258 +#: ../svnsync/svnsync.c:263 msgid "" "convert translatable properties from encoding ARG\n" " to UTF-8. If not specified, then properties are\n" @@ -20779,7 +22101,7 @@ msgstr "" " kodning ARG till UTF-8. Om ej angiven antas\n" " egenskaper vara kodade i UTF-8." -#: ../svnsync/svnsync.c:264 +#: ../svnsync/svnsync.c:269 msgid "" "Disable built-in locking. Use of this option can\n" " corrupt the mirror unless you ensure that no other\n" @@ -20790,7 +22112,7 @@ msgstr "" " säkert att ingen annan körning av svnsync sker\n" " samtidigt." -#: ../svnsync/svnsync.c:270 +#: ../svnsync/svnsync.c:275 msgid "" "Steal locks as necessary. Use, with caution,\n" " if your mirror repository contains stale locks\n" @@ -20801,7 +22123,7 @@ msgstr "" " om spegelarkivet innehÃ¥ller utgÃ¥ngna lÃ¥s och\n" " ingen annan körning av svnsync sker samtidigt." -#: ../svnsync/svnsync.c:278 +#: ../svnsync/svnsync.c:283 msgid "" "size of the extra in-memory cache in MB used to\n" " minimize operations for local 'file' scheme.\n" @@ -20810,120 +22132,120 @@ msgstr "" " att minimera antalet operationer för\n" " lokala \"file\"-schemat.\n" -#: ../svnsync/svnsync.c:383 +#: ../svnsync/svnsync.c:388 msgid "Target server does not support atomic revision property edits; consider upgrading it to 1.7 or using an external locking program" msgstr "MÃ¥lservern stöder inte atomisk ändring av revisionsegenskaper; uppgradera den till 1.7 eller använd ett externt lÃ¥sprogram." -#: ../svnsync/svnsync.c:397 +#: ../svnsync/svnsync.c:402 #, c-format msgid "Stole lock previously held by '%s'\n" msgstr "Stal lÃ¥s som tidigare ägdes av \"%s\"\n" -#: ../svnsync/svnsync.c:487 +#: ../svnsync/svnsync.c:492 #, c-format msgid "Session is rooted at '%s' but the repos root is '%s'" msgstr "Sessionens rot är \"%s\", men arkivets rot är \"%s\"" -#: ../svnsync/svnsync.c:645 +#: ../svnsync/svnsync.c:650 #, c-format msgid "Copied properties for revision %ld (%s* properties skipped).\n" msgstr "Kopierade egenskaper för revision %ld (%s*-egenskaper hoppades över).\n" -#: ../svnsync/svnsync.c:650 +#: ../svnsync/svnsync.c:655 #, c-format msgid "Copied properties for revision %ld.\n" msgstr "Kopierade egenskaper för revision %ld.\n" -#: ../svnsync/svnsync.c:666 +#: ../svnsync/svnsync.c:671 #, c-format msgid "NOTE: Normalized %s* properties to LF line endings (%d rev-props, %d node-props).\n" msgstr "ANMÄRKNING: %s*-egenskaper normaliserade till LF-radslut (%d revisionsegenskaper, %d nodegenskaper).\n" -#: ../svnsync/svnsync.c:805 +#: ../svnsync/svnsync.c:810 msgid "Destination repository already contains revision history; consider using --allow-non-empty if the repository's revisions are known to mirror their respective revisions in the source repository" msgstr "Destinationsarkivet innehÃ¥ller redan en revisionshistorik; använd --allow-non-empty om det är känt att arkivets revisioner motsvarar dem i källarkivet" -#: ../svnsync/svnsync.c:814 +#: ../svnsync/svnsync.c:819 #, c-format msgid "Destination repository is already synchronizing from '%s'" msgstr "Destinationsarkivet synkroniseras redan frÃ¥n \"%s\"" -#: ../svnsync/svnsync.c:849 +#: ../svnsync/svnsync.c:854 msgid "Destination repository has more revisions than source repository" msgstr "Destinationsarkivet har fler revisioner än källarkivet" -#: ../svnsync/svnsync.c:914 ../svnsync/svnsync.c:917 ../svnsync/svnsync.c:1590 -#: ../svnsync/svnsync.c:1597 ../svnsync/svnsync.c:1837 -#: ../svnsync/svnsync.c:1840 ../svnsync/svnsync.c:1884 +#: ../svnsync/svnsync.c:919 ../svnsync/svnsync.c:922 ../svnsync/svnsync.c:1595 +#: ../svnsync/svnsync.c:1602 ../svnsync/svnsync.c:1842 +#: ../svnsync/svnsync.c:1845 ../svnsync/svnsync.c:1889 #, c-format msgid "Path '%s' is not a URL" msgstr "Sökvägen \"%s\" är inte en URL" -#: ../svnsync/svnsync.c:944 +#: ../svnsync/svnsync.c:949 #, c-format msgid "Committed revision %ld.\n" msgstr "Arkiverade revision %ld.\n" -#: ../svnsync/svnsync.c:987 +#: ../svnsync/svnsync.c:992 msgid "Destination repository has not been initialized" msgstr "Destinationsarkivet har ej initierats" -#: ../svnsync/svnsync.c:1362 +#: ../svnsync/svnsync.c:1367 #, c-format msgid "Commit created r%ld but should have created r%ld" msgstr "Arkiveringen skapade r%ld men den borde ha skapat r%ld" -#: ../svnsync/svnsync.c:1482 +#: ../svnsync/svnsync.c:1487 #, c-format msgid "Revision being currently copied (%ld), last merged revision (%ld), and destination HEAD (%ld) are inconsistent; have you committed to the destination without using svnsync?" msgstr "Revisionen som nu kopieras (%ld), senaste sammanslagna revisionen (%ld) och mÃ¥lets HEAD (%ld) är inkonsistenta. Har du arkiverat till destinationen utan att använda svnsync?" -#: ../svnsync/svnsync.c:1520 +#: ../svnsync/svnsync.c:1525 #, c-format msgid "Destination HEAD (%ld) is not the last merged revision (%ld); have you committed to the destination without using svnsync?" msgstr "HEAD i mÃ¥larkivet (%ld) är inte den senaste sammanslagna revisionen (%ld). Har du arkiverat till destinationen utan att använda svnsync?" -#: ../svnsync/svnsync.c:1650 ../svnsync/svnsync.c:1655 +#: ../svnsync/svnsync.c:1655 ../svnsync/svnsync.c:1660 #, c-format msgid "Cannot copy revprops for a revision (%ld) that has not been synchronized yet" msgstr "Kan inte kopiera revisionsegenskaper för en revision (%ld) som ej har synkroniserats" -#: ../svnsync/svnsync.c:1720 ../svnsync/svnsync.c:1740 +#: ../svnsync/svnsync.c:1725 ../svnsync/svnsync.c:1745 #, c-format msgid "Invalid revision number (%ld)" msgstr "Ogiltigt revisionsnummer (%ld)" -#: ../svnsync/svnsync.c:1790 +#: ../svnsync/svnsync.c:1795 msgid "Cannot specify revisions via both command-line arguments and the --revision (-r) option" msgstr "Kan inte ange revisioner bÃ¥de som kommandoradsargument och med flaggan --revision (-r)" -#: ../svnsync/svnsync.c:1798 ../svnsync/svnsync.c:2154 +#: ../svnsync/svnsync.c:1803 ../svnsync/svnsync.c:2159 #, c-format msgid "Invalid revision range '%s' provided" msgstr "Ogiltigt revisionsomrÃ¥de \"%s\" angivet" -#: ../svnsync/svnsync.c:1897 +#: ../svnsync/svnsync.c:1902 #, c-format msgid "Repository '%s' is not initialized for synchronization" msgstr "Arkivet \"%s\" har inte initierats för synkronisering" #. Print the info. -#: ../svnsync/svnsync.c:1903 +#: ../svnsync/svnsync.c:1908 #, c-format msgid "Source URL: %s\n" msgstr "Käll-URL: %s\n" -#: ../svnsync/svnsync.c:1905 +#: ../svnsync/svnsync.c:1910 #, c-format msgid "Source Repository UUID: %s\n" msgstr "Källarkivets UUID: %s\n" -#: ../svnsync/svnsync.c:1908 +#: ../svnsync/svnsync.c:1913 #, c-format msgid "Last Merged Revision: %s\n" msgstr "Senast sammanslagen revision: %s\n" -#: ../svnsync/svnsync.c:1925 +#: ../svnsync/svnsync.c:1930 msgid "" "general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n" "Subversion repository replication tool.\n" @@ -20939,19 +22261,19 @@ msgstr "" "\n" "Tillgängliga underkommandon:\n" -#: ../svnsync/svnsync.c:2216 +#: ../svnsync/svnsync.c:2221 msgid "Cannot use --username or --password with any of --source-username, --source-password, --sync-username, or --sync-password.\n" msgstr "Kan inte använda --username eller --password tillsammans med nÃ¥gon av flaggorna --source-username, --source-password, --sync-username eller --sync-password.\n" -#: ../svnsync/svnsync.c:2239 +#: ../svnsync/svnsync.c:2244 msgid "--disable-locking and --steal-lock are mutually exclusive" msgstr "--disable-locking och --steal-lock kan inte användas samtidigt" -#: ../svnsync/svnsync.c:2257 +#: ../svnsync/svnsync.c:2262 msgid "--source-trust-server-cert-failures and --sync-trust-server-cert-failures require --non-interactive" msgstr "--source-trust-server-cert-failures och --sync-trust-server-cert-failures kräver --non-interactive" -#: ../svnsync/svnsync.c:2326 +#: ../svnsync/svnsync.c:2331 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" @@ -20960,7 +22282,7 @@ msgstr "" "Underkommandot \"%s\" tillÃ¥ter inte flaggan \"%s\"\n" "Skriv \"svnsync help %s\" för användning.\n" -#: ../svnsync/svnsync.c:2390 +#: ../svnsync/svnsync.c:2395 msgid "Try 'svnsync help' for more info" msgstr "Skriv \"svnsync help\" för mer information" diff --git a/subversion/svn/auth-cmd.c b/subversion/svn/auth-cmd.c index 68ca067..b064b8a 100644 --- a/subversion/svn/auth-cmd.c +++ b/subversion/svn/auth-cmd.c @@ -455,12 +455,15 @@ svn_cl__auth(apr_getopt_t *os, void *baton, apr_pool_t *pool) { if (b.patterns->nelts == 0) SVN_ERR(svn_cmdline_printf(pool, - _("Credentials cache in '%s' contains %d credentials\n"), + Q_("Credentials cache in '%s' contains %d credential\n", + "Credentials cache in '%s' contains %d credentials\n", + b.matches), svn_dirent_local_style(config_path, pool), b.matches)); else SVN_ERR(svn_cmdline_printf(pool, - _("Credentials cache in '%s' contains %d matching " - "credentials\n"), + Q_("Credentials cache in '%s' contains %d matching credential\n", + "Credentials cache in '%s' contains %d matching credentials\n", + b.matches), svn_dirent_local_style(config_path, pool), b.matches)); } @@ -474,9 +477,11 @@ svn_cl__auth(apr_getopt_t *os, void *baton, apr_pool_t *pool) "no matching credentials"), svn_dirent_local_style(config_path, pool)); else - SVN_ERR(svn_cmdline_printf(pool, _("Deleted %d matching credentials " - "from '%s'\n"), b.matches, - svn_dirent_local_style(config_path, pool))); + SVN_ERR(svn_cmdline_printf(pool, + Q_("Deleted %d matching credential from '%s'\n", + "Deleted %d matching credentials from '%s'\n", + b.matches), + b.matches, svn_dirent_local_style(config_path, pool))); } return SVN_NO_ERROR; diff --git a/subversion/svn/blame-cmd.c b/subversion/svn/blame-cmd.c index 3911a64..8f95576 100644 --- a/subversion/svn/blame-cmd.c +++ b/subversion/svn/blame-cmd.c @@ -44,6 +44,7 @@ typedef struct blame_baton_t svn_stream_t *out; svn_stringbuf_t *sbuf; + svn_revnum_t start_revnum, end_revnum; int rev_maxlength; } blame_baton_t; @@ -54,15 +55,13 @@ typedef struct blame_baton_t XML to stdout. */ static svn_error_t * blame_receiver_xml(void *baton, - svn_revnum_t start_revnum, - svn_revnum_t end_revnum, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, - const char *line, + const svn_string_t *line, svn_boolean_t local_change, apr_pool_t *pool) { @@ -170,15 +169,13 @@ print_line_info(svn_stream_t *out, /* This implements the svn_client_blame_receiver3_t interface. */ static svn_error_t * blame_receiver(void *baton, - svn_revnum_t start_revnum, - svn_revnum_t end_revnum, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *merged_rev_props, const char *merged_path, - const char *line, + const svn_string_t *line, svn_boolean_t local_change, apr_pool_t *pool) { @@ -188,19 +185,19 @@ blame_receiver(void *baton, svn_boolean_t use_merged = FALSE; if (!bb->rev_maxlength) - { - svn_revnum_t max_revnum = MAX(start_revnum, end_revnum); - /* The standard column width for the revision number is 6 characters. - If the revision number can potentially be larger (i.e. if the end_revnum - is larger than 1000000), we increase the column width as needed. */ - - bb->rev_maxlength = 6; - while (max_revnum >= 1000000) - { - bb->rev_maxlength++; - max_revnum = max_revnum / 10; - } - } + { + svn_revnum_t max_revnum = MAX(bb->start_revnum, bb->end_revnum); + /* The standard column width for the revision number is 6 characters. + If the revision number can potentially be larger (i.e. if the end_revnum + is larger than 1000000), we increase the column width as needed. */ + + bb->rev_maxlength = 6; + while (max_revnum >= 1000000) + { + bb->rev_maxlength++; + max_revnum = max_revnum / 10; + } + } if (opt_state->use_merge_history) { @@ -237,7 +234,7 @@ blame_receiver(void *baton, bb->rev_maxlength, pool)); - return svn_stream_printf(out, pool, "%s%s", line, APR_EOL_STR); + return svn_stream_printf(out, pool, "%s%s", line->data, APR_EOL_STR); } @@ -333,7 +330,7 @@ svn_cl__blame(apr_getopt_t *os, const char *target = APR_ARRAY_IDX(targets, i, const char *); const char *truepath; svn_opt_revision_t peg_revision; - svn_client_blame_receiver3_t receiver; + svn_client_blame_receiver4_t receiver; svn_pool_clear(subpool); SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton)); @@ -368,7 +365,8 @@ svn_cl__blame(apr_getopt_t *os, else receiver = blame_receiver; - err = svn_client_blame5(truepath, + err = svn_client_blame6(&bl.start_revnum, &bl.end_revnum, + truepath, &peg_revision, &opt_state->start_revision, &opt_state->end_revision, diff --git a/subversion/svn/cl.h b/subversion/svn/cl.h index a5b1d9b..5e72985 100644 --- a/subversion/svn/cl.h +++ b/subversion/svn/cl.h @@ -32,6 +32,7 @@ #include #include +#include "svn_types.h" #include "svn_wc.h" #include "svn_client.h" #include "svn_string.h" @@ -126,6 +127,16 @@ typedef enum svn_cl__show_revs_t { svn_cl__show_revs_t svn_cl__show_revs_from_word(const char *word); + +/* Unit types for file size conversion. */ +typedef enum svn_cl__size_unit_t + { + SVN_CL__SIZE_UNIT_NONE = 0, /* Default, no conversion. */ + SVN_CL__SIZE_UNIT_XML = -1, /* Conversion for XML output. */ + SVN_CL__SIZE_UNIT_BASE_10 = 1000, /* Use base-10 SI units. */ + SVN_CL__SIZE_UNIT_BASE_2 = 1024 /* Use base-2 SI units. */ + } svn_cl__size_unit_t; + /*** Command dispatch. ***/ @@ -250,13 +261,20 @@ typedef struct svn_cl__opt_state_t svn_boolean_t mergeinfo_log; /* show log message in mergeinfo command */ svn_boolean_t remove_unversioned;/* remove unversioned items */ svn_boolean_t remove_ignored; /* remove ignored items */ + svn_boolean_t remove_added; /* reverting added item also removes it */ svn_boolean_t no_newline; /* do not output the trailing newline */ svn_boolean_t show_passwords; /* show cached passwords */ svn_boolean_t pin_externals; /* pin externals to last-changed revisions */ const char *show_item; /* print only the given item */ svn_boolean_t adds_as_modification; /* update 'add vs add' no tree conflict */ svn_boolean_t vacuum_pristines; /* remove unreferenced pristines */ - svn_boolean_t list; + svn_boolean_t drop; /* drop shelf after successful unshelve */ + svn_cl__size_unit_t file_size_unit; /* file size format */ + enum svn_cl__viewspec_t { + svn_cl__viewspec_unspecified = 0 /* default */, + svn_cl__viewspec_classic, + svn_cl__viewspec_svn11 + } viewspec; /* value of --x-viewspec */ } svn_cl__opt_state_t; /* Conflict stats for operations such as update and merge. */ @@ -304,9 +322,15 @@ svn_opt_subcommand_t svn_cl__revert, svn_cl__resolve, svn_cl__resolved, - svn_cl__shelve, - svn_cl__unshelve, - svn_cl__shelves, + svn_cl__shelf_diff, + svn_cl__shelf_drop, + svn_cl__shelf_list, + svn_cl__shelf_list_by_paths, + svn_cl__shelf_log, + svn_cl__shelf_save, + svn_cl__shelf_shelve, + svn_cl__shelf_unshelve, + svn_cl__wc_copy_mods, svn_cl__status, svn_cl__switch, svn_cl__unlock, @@ -315,7 +339,7 @@ svn_opt_subcommand_t /* See definition in svn.c for documentation. */ -extern const svn_opt_subcommand_desc2_t svn_cl__cmd_table[]; +extern const svn_opt_subcommand_desc3_t svn_cl__cmd_table[]; /* See definition in svn.c for documentation. */ extern const int svn_cl__global_options[]; @@ -711,6 +735,24 @@ svn_cl__node_kind_str_xml(svn_node_kind_t kind); const char * svn_cl__node_kind_str_human_readable(svn_node_kind_t kind); +/* Set *RESULT to the size of a file, formatted according to BASE. + For base-10 and base-2 units, the size is constrained to at most + three significant digits. + + If LONG_UNITS is TRUE, any unit suffixes will be the whole SI symbol, + e.g., KiB, MiB, etc; otherwise only the first letters will be used. + + File sizes are never negative, so we don't handle that case other than + making sure that the scale adjustment will work. + + The result will be allocated from RESULT_POOL. */ +svn_error_t * +svn_cl__format_file_size(const char **result, + svn_filesize_t size, + svn_cl__size_unit_t base, + svn_boolean_t long_units, + apr_pool_t *result_pool); + /** Provides an XML name for a given OPERATION. * Note: POOL is currently not used. @@ -915,6 +957,20 @@ svn_cl__similarity_check(const char *key, apr_size_t token_count, apr_pool_t *scratch_pool); +/* Return in FUNC_P and BATON_P a callback that prints a summary diff, + * according to the options XML and IGNORE_PROPERTIES. + * + * ANCHOR is a URL or local path to be prefixed to the printed paths. + */ +svn_error_t * +svn_cl__get_diff_summary_writer(svn_client_diff_summarize_func_t *func_p, + void **baton_p, + svn_boolean_t xml, + svn_boolean_t ignore_properties, + const char *anchor, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/subversion/svn/conflict-callbacks.c b/subversion/svn/conflict-callbacks.c index 278fffc..acd27e5 100644 --- a/subversion/svn/conflict-callbacks.c +++ b/subversion/svn/conflict-callbacks.c @@ -440,6 +440,17 @@ static const resolver_option_t builtin_resolver_options[] = /* Options for local move vs incoming edit. */ { "m", svn_client_conflict_option_local_move_file_text_merge }, + { "m", svn_client_conflict_option_local_move_dir_merge }, + + /* Options for local missing vs incoming edit. */ + { "m", svn_client_conflict_option_sibling_move_file_text_merge }, + { "m", svn_client_conflict_option_sibling_move_dir_merge }, + + /* Options for incoming move vs local move. */ + { "m", svn_client_conflict_option_both_moved_file_merge }, + { "M", svn_client_conflict_option_both_moved_file_move_merge }, + { "m", svn_client_conflict_option_both_moved_dir_merge }, + { "M", svn_client_conflict_option_both_moved_dir_move_merge }, { NULL } }; @@ -1529,17 +1540,16 @@ build_tree_conflict_options( id != svn_client_conflict_option_accept_current_wc_state) *all_options_are_dumb = FALSE; - if (id == svn_client_conflict_option_incoming_move_file_text_merge || - id == svn_client_conflict_option_incoming_move_dir_merge) - { - SVN_ERR( - svn_client_conflict_option_get_moved_to_repos_relpath_candidates( - possible_moved_to_repos_relpaths, builtin_option, - result_pool, iterpool)); - SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates( - possible_moved_to_abspaths, builtin_option, - result_pool, iterpool)); - } + if (*possible_moved_to_repos_relpaths == NULL) + SVN_ERR( + svn_client_conflict_option_get_moved_to_repos_relpath_candidates2( + possible_moved_to_repos_relpaths, builtin_option, + result_pool, iterpool)); + + if (*possible_moved_to_abspaths == NULL) + SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates2( + possible_moved_to_abspaths, builtin_option, + result_pool, iterpool)); } svn_pool_destroy(iterpool); @@ -1654,8 +1664,8 @@ prompt_move_target_path(int *preferred_move_target_idx, { char buf[1024]; - svn_cmdline_fprintf(stderr, iterpool, "%s\n", - svn_err_best_message(err, buf, sizeof(buf))); + SVN_ERR(svn_cmdline_fprintf(stderr, iterpool, "%s\n", + svn_err_best_message(err, buf, sizeof(buf)))); svn_error_clear(err); continue; } @@ -1670,6 +1680,69 @@ prompt_move_target_path(int *preferred_move_target_idx, return SVN_NO_ERROR; } +static svn_error_t * +find_conflict_option_with_repos_move_targets( + svn_client_conflict_option_t **option_with_move_targets, + apr_array_header_t *options, + apr_pool_t *scratch_pool) +{ + apr_pool_t *iterpool = svn_pool_create(scratch_pool); + int i; + apr_array_header_t *possible_moved_to_repos_relpaths = NULL; + + *option_with_move_targets = NULL; + + for (i = 0; i < options->nelts; i++) + { + svn_client_conflict_option_t *option; + + svn_pool_clear(iterpool); + option = APR_ARRAY_IDX(options, i, svn_client_conflict_option_t *); + SVN_ERR(svn_client_conflict_option_get_moved_to_repos_relpath_candidates2( + &possible_moved_to_repos_relpaths, option, iterpool, iterpool)); + if (possible_moved_to_repos_relpaths) + { + *option_with_move_targets = option; + break; + } + } + svn_pool_destroy(iterpool); + + return SVN_NO_ERROR; +} + +static svn_error_t * +find_conflict_option_with_working_copy_move_targets( + svn_client_conflict_option_t **option_with_move_targets, + apr_array_header_t *options, + apr_pool_t *scratch_pool) +{ + apr_pool_t *iterpool = svn_pool_create(scratch_pool); + int i; + apr_array_header_t *possible_moved_to_abspaths = NULL; + + *option_with_move_targets = NULL; + + for (i = 0; i < options->nelts; i++) + { + svn_client_conflict_option_t *option; + + svn_pool_clear(iterpool); + option = APR_ARRAY_IDX(options, i, svn_client_conflict_option_t *); + SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates2( + &possible_moved_to_abspaths, option, scratch_pool, + iterpool)); + if (possible_moved_to_abspaths) + { + *option_with_move_targets = option; + break; + } + } + svn_pool_destroy(iterpool); + + return SVN_NO_ERROR; +} + /* Ask the user what to do about the tree conflict described by CONFLICT * and either resolve the conflict accordingly or postpone resolution. * SCRATCH_POOL is used for temporary allocations. */ @@ -1797,7 +1870,7 @@ handle_tree_conflict(svn_boolean_t *resolved, { int preferred_move_target_idx; apr_array_header_t *options; - svn_client_conflict_option_t *conflict_option; + svn_client_conflict_option_t *option; SVN_ERR(prompt_move_target_path(&preferred_move_target_idx, possible_moved_to_repos_relpaths, @@ -1810,22 +1883,12 @@ handle_tree_conflict(svn_boolean_t *resolved, ctx, iterpool, iterpool)); - conflict_option = - svn_client_conflict_option_find_by_id( - options, - svn_client_conflict_option_incoming_move_file_text_merge); - if (conflict_option == NULL) + SVN_ERR(find_conflict_option_with_repos_move_targets( + &option, options, iterpool)); + if (option) { - conflict_option = - svn_client_conflict_option_find_by_id( - options, svn_client_conflict_option_incoming_move_dir_merge); - } - - if (conflict_option) - { - SVN_ERR(svn_client_conflict_option_set_moved_to_repos_relpath( - conflict_option, preferred_move_target_idx, - ctx, iterpool)); + SVN_ERR(svn_client_conflict_option_set_moved_to_repos_relpath2( + option, preferred_move_target_idx, ctx, iterpool)); repos_move_target_chosen = TRUE; wc_move_target_chosen = FALSE; @@ -1851,7 +1914,7 @@ handle_tree_conflict(svn_boolean_t *resolved, { int preferred_move_target_idx; apr_array_header_t *options; - svn_client_conflict_option_t *conflict_option; + svn_client_conflict_option_t *option; SVN_ERR(prompt_move_target_path(&preferred_move_target_idx, possible_moved_to_abspaths, TRUE, @@ -1863,22 +1926,12 @@ handle_tree_conflict(svn_boolean_t *resolved, ctx, iterpool, iterpool)); - conflict_option = - svn_client_conflict_option_find_by_id( - options, - svn_client_conflict_option_incoming_move_file_text_merge); - if (conflict_option == NULL) - { - conflict_option = - svn_client_conflict_option_find_by_id( - options, svn_client_conflict_option_incoming_move_dir_merge); - } - - if (conflict_option) + SVN_ERR(find_conflict_option_with_working_copy_move_targets( + &option, options, iterpool)); + if (option) { - SVN_ERR(svn_client_conflict_option_set_moved_to_abspath( - conflict_option, preferred_move_target_idx, ctx, - iterpool)); + SVN_ERR(svn_client_conflict_option_set_moved_to_abspath2( + option, preferred_move_target_idx, ctx, iterpool)); wc_move_target_chosen = TRUE; /* Update option description. */ @@ -1930,7 +1983,6 @@ resolve_conflict_interactively(svn_boolean_t *resolved, svn_cmdline_prompt_baton_t *pb, svn_cl__conflict_stats_t *conflict_stats, svn_client_ctx_t *ctx, - apr_pool_t *result_pool, apr_pool_t *scratch_pool) { svn_boolean_t text_conflicted; @@ -1964,7 +2016,7 @@ resolve_conflict_interactively(svn_boolean_t *resolved, if (props_conflicted->nelts > 0) SVN_ERR(handle_prop_conflicts(resolved, postponed, quit, &merged_propval, path_prefix, pb, editor_cmd, config, conflict, - conflict_stats, ctx, result_pool, scratch_pool)); + conflict_stats, ctx, scratch_pool, scratch_pool)); if (tree_conflicted) SVN_ERR(handle_tree_conflict(resolved, postponed, quit, printed_description, conflict, path_prefix, pb, conflict_stats, ctx, @@ -2201,11 +2253,14 @@ svn_cl__resolve_conflict(svn_boolean_t *quit, svn_boolean_t postponed = FALSE; svn_boolean_t printed_description = FALSE; svn_error_t *err; + apr_pool_t *iterpool; *quit = FALSE; + iterpool = svn_pool_create(scratch_pool); while (!resolved && !postponed && !*quit) { + svn_pool_clear(iterpool); err = resolve_conflict_interactively(&resolved, &postponed, quit, external_failed, printed_summary, @@ -2214,7 +2269,7 @@ svn_cl__resolve_conflict(svn_boolean_t *quit, editor_cmd, ctx->config, path_prefix, pb, conflict_stats, ctx, - scratch_pool, scratch_pool); + iterpool); if (err && err->apr_err == SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE) { /* Conflict resolution has failed. Let the user try again. @@ -2226,6 +2281,7 @@ svn_cl__resolve_conflict(svn_boolean_t *quit, } SVN_ERR(err); } + svn_pool_destroy(iterpool); } else if (option_id != svn_client_conflict_option_postpone) SVN_ERR(mark_conflict_resolved(conflict, option_id, diff --git a/subversion/svn/diff-cmd.c b/subversion/svn/diff-cmd.c index 9e389ec..b5f3702 100644 --- a/subversion/svn/diff-cmd.c +++ b/subversion/svn/diff-cmd.c @@ -181,6 +181,24 @@ summarize_regular(const svn_client_diff_summarize_t *summary, return svn_cmdline_fflush(stdout); } +svn_error_t * +svn_cl__get_diff_summary_writer(svn_client_diff_summarize_func_t *func_p, + void **baton_p, + svn_boolean_t xml, + svn_boolean_t ignore_properties, + const char *anchor, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + struct summarize_baton_t *b = apr_pcalloc(result_pool, sizeof(*b)); + + b->anchor = anchor; + b->ignore_properties = ignore_properties; + *func_p = xml ? summarize_xml : summarize_regular; + *baton_p = b; + return SVN_NO_ERROR; +} + /* An svn_opt_subcommand_t to handle the 'diff' command. This implements the `svn_opt_subcommand_t' interface. */ svn_error_t * @@ -203,9 +221,6 @@ svn_cl__diff(apr_getopt_t *os, svn_boolean_t ignore_properties = opt_state->diff.patch_compatible || opt_state->diff.ignore_properties; int i; - struct summarize_baton_t summarize_baton; - const svn_client_diff_summarize_func_t summarize_func = - (opt_state->xml ? summarize_xml : summarize_regular); if (opt_state->extensions) options = svn_cstring_split(opt_state->extensions, " \t\n\r", TRUE, pool); @@ -448,9 +463,13 @@ svn_cl__diff(apr_getopt_t *os, if (opt_state->diff.summarize) { - summarize_baton.anchor = target1; - summarize_baton.ignore_properties = ignore_properties; + svn_client_diff_summarize_func_t summarize_func; + void *summarize_baton; + SVN_ERR(svn_cl__get_diff_summary_writer( + &summarize_func, &summarize_baton, + opt_state->xml, ignore_properties, target1, + iterpool, iterpool)); SVN_ERR(svn_client_diff_summarize2( target1, &opt_state->start_revision, @@ -459,11 +478,11 @@ svn_cl__diff(apr_getopt_t *os, opt_state->depth, ! opt_state->diff.notice_ancestry, opt_state->changelists, - summarize_func, &summarize_baton, + summarize_func, summarize_baton, ctx, iterpool)); } else - SVN_ERR(svn_client_diff6( + SVN_ERR(svn_client_diff7( options, target1, &(opt_state->start_revision), @@ -479,6 +498,7 @@ svn_cl__diff(apr_getopt_t *os, ignore_properties, opt_state->diff.properties_only, opt_state->diff.use_git_diff_format, + TRUE /*pretty_print_mergeinfo*/, svn_cmdline_output_encoding(pool), outstream, errstream, @@ -501,8 +521,13 @@ svn_cl__diff(apr_getopt_t *os, if (opt_state->diff.summarize) { - summarize_baton.anchor = truepath; - summarize_baton.ignore_properties = ignore_properties; + svn_client_diff_summarize_func_t summarize_func; + void *summarize_baton; + + SVN_ERR(svn_cl__get_diff_summary_writer( + &summarize_func, &summarize_baton, + opt_state->xml, ignore_properties, truepath, + iterpool, iterpool)); SVN_ERR(svn_client_diff_summarize_peg2( truepath, &peg_revision, @@ -511,11 +536,11 @@ svn_cl__diff(apr_getopt_t *os, opt_state->depth, ! opt_state->diff.notice_ancestry, opt_state->changelists, - summarize_func, &summarize_baton, + summarize_func, summarize_baton, ctx, iterpool)); } else - SVN_ERR(svn_client_diff_peg6( + SVN_ERR(svn_client_diff_peg7( options, truepath, &peg_revision, @@ -531,6 +556,7 @@ svn_cl__diff(apr_getopt_t *os, ignore_properties, opt_state->diff.properties_only, opt_state->diff.use_git_diff_format, + TRUE /*pretty_print_mergeinfo*/, svn_cmdline_output_encoding(pool), outstream, errstream, diff --git a/subversion/svn/filesize.c b/subversion/svn/filesize.c new file mode 100644 index 0000000..ba1c356 --- /dev/null +++ b/subversion/svn/filesize.c @@ -0,0 +1,221 @@ +/* + * filesize.c -- Utilities for displaying file sizes + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ + + +/*** Includes. ***/ + +#include +#include +#include + +#include + +#include "cl.h" + + +/*** Code. ***/ + +/* The structure that describes the units and their magnitudes. */ +typedef struct filesize_order_t +{ + svn_filesize_t mask; + const char *suffix; + const char *short_suffix; +} filesize_order_t; + + +/* Get the index of the order of magnitude of the given SIZE. + The returned index will be within [0 .. order_size - 1]. */ +static apr_size_t +get_order_index(svn_filesize_t abs_size, + const filesize_order_t *order, + apr_size_t order_size) +{ + /* It would be sexy to do a binary search here, but with only 7 elements + in the arrays ... we should ### FIXME: do the binary search anyway. */ + apr_size_t index = order_size; + while (index > 0) + { + --index; + if (abs_size > order[index].mask) + break; + } + return index; +} + + +/* Format the adjusted size with the given units. */ +static const char * +format_size(double human_readable_size, + svn_boolean_t long_units, + const filesize_order_t *order, + apr_size_t index, + apr_pool_t *result_pool) +{ + /* NOTE: We want to display a locale-specific decimal sepratator, but + APR's formatter completely ignores the locale. So we use the + good, old, standard, *dangerous* sprintf() to format the size. + + But, on the bright side, we require that the number has no more + than 3 non-fractional digits. So the call to sprintf() here + should be safe. */ + const double absolute_human_readable_size = fabs(human_readable_size); + const char *const suffix = (long_units ? order[index].suffix + : order[index].short_suffix); + + /* 3 digits (or 2 digits and 1 decimal separator) + + 1 negative sign (which should not appear under normal circumstances) + + 1 nul terminator + --- + = 5 characters of space needed in the buffer. */ + char buffer[8]; + + assert(absolute_human_readable_size < 1000.0); + + /* When the adjusted size has only one significant digit left of the + decimal point, show tenths of a unit, too. */ + sprintf(buffer, "%.*f", + absolute_human_readable_size < 10.0 ? 1 : 0, + human_readable_size); + return apr_pstrcat(result_pool, buffer, suffix, SVN_VA_NULL); +} + + +static const char * +get_base2_unit_file_size(svn_filesize_t size, + svn_boolean_t long_units, + apr_pool_t *result_pool) +{ + static const filesize_order_t order[] = + { + {APR_INT64_C(0x0000000000000000), " B", "B"}, /* byte */ + {APR_INT64_C(0x00000000000003FF), " KiB", "K"}, /* kibi */ + {APR_INT64_C(0x00000000000FFFFF), " MiB", "M"}, /* mibi */ + {APR_INT64_C(0x000000003FFFFFFF), " GiB", "G"}, /* gibi */ + {APR_INT64_C(0x000000FFFFFFFFFF), " TiB", "T"}, /* tibi */ + {APR_INT64_C(0x0003FFFFFFFFFFFF), " EiB", "E"}, /* exbi */ + {APR_INT64_C(0x0FFFFFFFFFFFFFFF), " PiB", "P"} /* pibi */ + }; + static const apr_size_t order_size = sizeof(order) / sizeof(order[0]); + + const svn_filesize_t abs_size = ((size < 0) ? -size : size); + apr_size_t index = get_order_index(abs_size, order, order_size); + double human_readable_size; + + /* Adjust the size to the given order of magnitude. + + This is division by (order[index].mask + 1), which is the base-2^10 + magnitude of the size; and that is the same as an arithmetic right + shift by (index * 10) bits. But we split it into an integer and a + floating-point division, so that we don't overflow the mantissa at + very large file sizes. */ + if ((abs_size >> 10 * index) > 999) + { + /* This assertion should never fail, because we only have 4 binary + digits in the petabyte (all right, "pibibyte") range and so the + number of petabytes can't be large enough to cause the program + flow to enter this conditional block. */ + assert(index < order_size - 1); + ++index; + } + human_readable_size = (index == 0 ? (double)size + : (size >> 3 * index) / 128.0 / index); + + return format_size(human_readable_size, + long_units, order, index, result_pool); +} + + +static const char * +get_base10_unit_file_size(svn_filesize_t size, + svn_boolean_t long_units, + apr_pool_t *result_pool) +{ + static const filesize_order_t order[] = + { + {APR_INT64_C( 0), " B", "B"}, /* byte */ + {APR_INT64_C( 999), " kB", "k"}, /* kilo */ + {APR_INT64_C( 999999), " MB", "M"}, /* mega */ + {APR_INT64_C( 999999999), " GB", "G"}, /* giga */ + {APR_INT64_C( 999999999999), " TB", "T"}, /* tera */ + {APR_INT64_C( 999999999999999), " EB", "E"}, /* exa */ + {APR_INT64_C(999999999999999999), " PB", "P"} /* peta */ + /* 18446744073709551615 is the maximum value. */ + }; + static const apr_size_t order_size = sizeof(order) / sizeof(order[0]); + + const svn_filesize_t abs_size = ((size < 0) ? -size : size); + apr_size_t index = get_order_index(abs_size, order, order_size); + double human_readable_size; + + /* Adjust the size to the given order of magnitude. + + This is division by (order[index].mask + 1), which is the base-1000 + magnitude of the size. For large file sizes, we split the operation + into an integer and a floating-point division, so that we don't + overflow the mantissa. */ + if (index == 0) + human_readable_size = (double)size; + else if (index <= 3) + human_readable_size = (double)size / (order[index].mask + 1); + else + { + /* [ Keep integer division here! ] */ + const double divisor = (double)((order[index].mask + 1) / 1000000); + human_readable_size = (size / 1000000) / divisor; + /* [ And here! ] */ + } + + return format_size(human_readable_size, + long_units, order, index, result_pool); +} + + +svn_error_t * +svn_cl__format_file_size(const char **result, + svn_filesize_t size, + svn_cl__size_unit_t base, + svn_boolean_t long_units, + apr_pool_t *result_pool) +{ + switch (base) + { + case SVN_CL__SIZE_UNIT_NONE: + case SVN_CL__SIZE_UNIT_XML: + *result = apr_psprintf(result_pool, "%" SVN_FILESIZE_T_FMT, size); + break; + + case SVN_CL__SIZE_UNIT_BASE_2: + *result = get_base2_unit_file_size(size, long_units, result_pool); + break; + + case SVN_CL__SIZE_UNIT_BASE_10: + *result = get_base10_unit_file_size(size, long_units, result_pool); + break; + + default: + SVN_ERR_MALFUNCTION(); + } + + return SVN_NO_ERROR; +} diff --git a/subversion/svn/help-cmd.c b/subversion/svn/help-cmd.c index 3d5375c..f812784 100644 --- a/subversion/svn/help-cmd.c +++ b/subversion/svn/help-cmd.c @@ -179,7 +179,7 @@ svn_cl__help(apr_getopt_t *os, svn_stringbuf_appendcstr(version_footer, "* KWallet (KDE)\n"); #endif - return svn_opt_print_help4(os, + return svn_opt_print_help5(os, "svn", /* ### erm, derive somehow? */ opt_state ? opt_state->version : FALSE, opt_state ? opt_state->quiet : FALSE, diff --git a/subversion/svn/info-cmd.c b/subversion/svn/info-cmd.c index e0c0041..369c4d9 100644 --- a/subversion/svn/info-cmd.c +++ b/subversion/svn/info-cmd.c @@ -21,6 +21,10 @@ * ==================================================================== */ +/* We define this here to remove any further warnings about the usage of + experimental functions in this file. */ +#define SVN_EXPERIMENTAL + /* ==================================================================== */ @@ -45,6 +49,254 @@ /*** Code. ***/ +struct layout_list_baton_t +{ + svn_boolean_t checkout; + const char *target; + const char *target_abspath; + svn_boolean_t with_revs; + int vs_py_format; +}; + +/* Output as 'svn' command-line commands. + * + * Implements svn_client__layout_func_t + */ +static svn_error_t * +output_svn_command_line(void *layout_baton, + const char *local_abspath, + const char *repos_root_url, + svn_boolean_t not_present, + svn_boolean_t url_changed, + const char *url, + svn_boolean_t revision_changed, + svn_revnum_t revision, + svn_boolean_t depth_changed, + svn_depth_t depth, + apr_pool_t *scratch_pool) +{ + struct layout_list_baton_t *llb = layout_baton; + const char *relpath = svn_dirent_skip_ancestor(llb->target_abspath, + local_abspath); + const char *cmd; + const char *depth_str; + const char *url_rev_str; + + depth_str = (depth_changed + ? apr_psprintf(scratch_pool, " --set-depth=%s", + svn_depth_to_word(depth)) + : ""); + + if (llb->checkout) + { + cmd = "svn checkout"; + if (depth != svn_depth_infinity) + depth_str = apr_psprintf(scratch_pool, + " --depth=%s", svn_depth_to_word(depth)); + url_rev_str = apr_psprintf(scratch_pool, " %s", url); + if (llb->with_revs) + url_rev_str = apr_psprintf(scratch_pool, "%s@%ld", + url_rev_str, revision); + llb->checkout = FALSE; + } + else if (not_present) + { + /* Easiest way to create a not present node: update to r0 */ + cmd = "svn update"; + url_rev_str = " -r0"; + } + else if (url_changed) + { + cmd = "svn switch"; + url_rev_str = apr_psprintf(scratch_pool, " ^/%s", + svn_uri_skip_ancestor(repos_root_url, + url, scratch_pool)); + if (llb->with_revs) + url_rev_str = apr_psprintf(scratch_pool, "%s@%ld", + url_rev_str, revision); + } + else if (llb->with_revs && revision_changed) + { + cmd = "svn update"; + url_rev_str = apr_psprintf(scratch_pool, " -r%ld", revision); + } + else if (depth_changed) + { + cmd = "svn update"; + url_rev_str = ""; + } + else + return SVN_NO_ERROR; + + SVN_ERR(svn_cmdline_printf(scratch_pool, + "%s%-23s%-10s %s\n", + cmd, depth_str, url_rev_str, + svn_dirent_local_style( + svn_dirent_join(llb->target, relpath, + scratch_pool), scratch_pool))); + + return SVN_NO_ERROR; +} + +/* */ +static const char * +depth_to_viewspec_py(svn_depth_t depth, + apr_pool_t *result_pool) +{ + switch (depth) + { + case svn_depth_infinity: + return "/**"; + case svn_depth_immediates: + return "/*"; + case svn_depth_files: + return "/~"; + case svn_depth_empty: + return ""; + case svn_depth_exclude: + return "!"; + default: + break; + } + return NULL; +} + +/* Output in the format used by 'tools/client-side/viewspec.py' + * + * Implements svn_client__layout_func_t + */ +static svn_error_t * +output_svn_viewspec_py(void *layout_baton, + const char *local_abspath, + const char *repos_root_url, + svn_boolean_t not_present, + svn_boolean_t url_changed, + const char *url, + svn_boolean_t revision_changed, + svn_revnum_t revision, + svn_boolean_t depth_changed, + svn_depth_t depth, + apr_pool_t *scratch_pool) +{ + struct layout_list_baton_t *llb = layout_baton; + const char *relpath = svn_dirent_skip_ancestor(llb->target_abspath, + local_abspath); + const char *depth_str; + const char *rev_str = ""; + const char *repos_rel_url = ""; + + depth_str = ((depth_changed || llb->checkout) + ? depth_to_viewspec_py(depth, scratch_pool) + : ""); + if (! llb->with_revs) + revision_changed = FALSE; + if (revision_changed) + rev_str = apr_psprintf(scratch_pool, "@%ld", revision); + + if (llb->checkout) + { + SVN_ERR(svn_cmdline_printf(scratch_pool, + "Format: %d\n" + "Url: %s\n", + llb->vs_py_format, url)); + if (llb->with_revs) + SVN_ERR(svn_cmdline_printf(scratch_pool, + "Revision: %ld\n", + revision)); + SVN_ERR(svn_cmdline_printf(scratch_pool, "\n")); + llb->checkout = FALSE; + + if (depth == svn_depth_empty) + return SVN_NO_ERROR; + if (depth_str[0] == '/') + depth_str++; + } + else if (not_present) + { + /* Easiest way to create a not present node: update to r0 */ + if (llb->vs_py_format < 2) + return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL, + _("svn-viewspec.py format 1 does not support " + "the 'not-present' state found at '%s'"), + relpath); + rev_str = "@0"; + } + else if (url_changed) + { + if (llb->vs_py_format < 2) + return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL, + _("svn-viewspec.py format 1 does not support " + "the 'switched' state found at '%s'"), + relpath); + repos_rel_url = svn_uri_skip_ancestor(repos_root_url, url, + scratch_pool); + repos_rel_url = apr_psprintf(scratch_pool, "^/%s", repos_rel_url); + } + else if (!(revision_changed || depth_changed)) + return SVN_NO_ERROR; + + SVN_ERR(svn_cmdline_printf(scratch_pool, + "%s%s %s%s\n", + relpath, depth_str, repos_rel_url, rev_str)); + + return SVN_NO_ERROR; +} + +/* + * Call svn_client__layout_list(), using a receiver function decided + * by VIEWSPEC. + */ +static svn_error_t * +cl_layout_list(apr_array_header_t *targets, + enum svn_cl__viewspec_t viewspec, + void *baton, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + const char *list_path, *list_abspath; + struct layout_list_baton_t llb; + + /* Add "." if user passed 0 arguments */ + svn_opt_push_implicit_dot_target(targets, scratch_pool); + + if (targets->nelts > 1) + return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, 0, NULL); + + list_path = APR_ARRAY_IDX(targets, 0, const char *); + + SVN_ERR(svn_cl__check_target_is_local_path(list_path)); + + SVN_ERR(svn_dirent_get_absolute(&list_abspath, list_path, + scratch_pool)); + + llb.checkout = TRUE; + llb.target = list_path; + llb.target_abspath = list_abspath; + llb.with_revs = TRUE; + + switch (viewspec) + { + case svn_cl__viewspec_classic: + /* svn-viewspec.py format */ + llb.vs_py_format = 2; + + SVN_ERR(svn_client__layout_list(list_abspath, + output_svn_viewspec_py, &llb, + ctx, scratch_pool)); + break; + case svn_cl__viewspec_svn11: + /* svn command-line format */ + SVN_ERR(svn_client__layout_list(list_abspath, + output_svn_command_line, &llb, + ctx, scratch_pool)); + break; + default: + SVN_ERR_MALFUNCTION(); + } + + return SVN_NO_ERROR; +} + static svn_error_t * svn_cl__info_print_time(apr_time_t atime, const char *desc, @@ -100,6 +352,7 @@ typedef enum info_item_relative_url, info_item_repos_root_url, info_item_repos_uuid, + info_item_repos_size, /* Working copy revision or repository HEAD revision */ info_item_revision, @@ -110,7 +363,9 @@ typedef enum info_item_last_changed_author, /* Working copy information */ - info_item_wc_root + info_item_wc_root, + info_item_schedule, + info_item_depth } info_item_t; /* Mapping between option keywords and info_item_t. */ @@ -128,12 +383,15 @@ static const info_item_map_t info_item_map[] = { MAKE_STRING("relative-url"), info_item_relative_url }, { MAKE_STRING("repos-root-url"), info_item_repos_root_url }, { MAKE_STRING("repos-uuid"), info_item_repos_uuid }, + { MAKE_STRING("repos-size"), info_item_repos_size }, { MAKE_STRING("revision"), info_item_revision }, { MAKE_STRING("last-changed-revision"), info_item_last_changed_rev }, { MAKE_STRING("last-changed-date"), info_item_last_changed_date }, { MAKE_STRING("last-changed-author"), info_item_last_changed_author }, - { MAKE_STRING("wc-root"), info_item_wc_root } + { MAKE_STRING("wc-root"), info_item_wc_root }, + { MAKE_STRING("schedule"), info_item_schedule }, + { MAKE_STRING("depth"), info_item_depth }, }; #undef MAKE_STRING @@ -163,6 +421,9 @@ typedef struct print_info_baton_t /* Did we already print a line of output? */ svn_boolean_t start_new_line; + /* Format for file sizes */ + svn_cl__size_unit_t file_size_unit; + /* The client context. */ svn_client_ctx_t *ctx; } print_info_baton_t; @@ -251,21 +512,40 @@ print_info_xml(void *baton, apr_pool_t *pool) { svn_stringbuf_t *sb = svn_stringbuf_create_empty(pool); - const char *rev_str; print_info_baton_t *const receiver_baton = baton; - if (SVN_IS_VALID_REVNUM(info->rev)) - rev_str = apr_psprintf(pool, "%ld", info->rev); - else - rev_str = apr_pstrdup(pool, _("Resource is not under version control.")); + const char *const path_str = + svn_cl__local_style_skip_ancestor( + receiver_baton->path_prefix, target, pool); + const char *const kind_str = svn_cl__node_kind_str_xml(info->kind); + const char *const rev_str = + (SVN_IS_VALID_REVNUM(info->rev) + ? apr_psprintf(pool, "%ld", info->rev) + : apr_pstrdup(pool, _("Resource is not under version control."))); /* "" */ - svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "entry", - "path", svn_cl__local_style_skip_ancestor( - receiver_baton->path_prefix, target, pool), - "kind", svn_cl__node_kind_str_xml(info->kind), - "revision", rev_str, - SVN_VA_NULL); + if (info->kind == svn_node_file && info->size != SVN_INVALID_FILESIZE) + { + const char *size_str; + SVN_ERR(svn_cl__format_file_size(&size_str, info->size, + SVN_CL__SIZE_UNIT_XML, + FALSE, pool)); + + svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "entry", + "path", path_str, + "kind", kind_str, + "revision", rev_str, + "size", size_str, + SVN_VA_NULL); + } + else + { + svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "entry", + "path", path_str, + "kind", kind_str, + "revision", rev_str, + SVN_VA_NULL); + } /* " xx " */ svn_cl__xml_tagged_cdata(&sb, pool, "url", info->URL); @@ -487,6 +767,16 @@ print_info(void *baton, break; } + if (info->kind == svn_node_file && info->size != SVN_INVALID_FILESIZE) + { + const char *sizestr; + SVN_ERR(svn_cl__format_file_size(&sizestr, info->size, + receiver_baton->file_size_unit, + TRUE, pool)); + SVN_ERR(svn_cmdline_printf(pool, _("Size in Repository: %s\n"), + sizestr)); + } + if (info->wc_info) { switch (info->wc_info->schedule) @@ -827,11 +1117,12 @@ print_info_item(void *baton, apr_pool_t *pool) { print_info_baton_t *const receiver_baton = baton; + const char *const actual_target_path = + (!receiver_baton->target_is_path ? info->URL + : svn_cl__local_style_skip_ancestor( + receiver_baton->path_prefix, target, pool)); const char *const target_path = - (!receiver_baton->multiple_targets ? NULL - : (!receiver_baton->target_is_path ? info->URL - : svn_cl__local_style_skip_ancestor( - receiver_baton->path_prefix, target, pool))); + (receiver_baton->multiple_targets ? actual_target_path : NULL); if (receiver_baton->start_new_line) SVN_ERR(svn_cmdline_fputs("\n", stdout, pool)); @@ -860,6 +1151,36 @@ print_info_item(void *baton, SVN_ERR(print_info_item_string(info->repos_UUID, target_path, pool)); break; + case info_item_repos_size: + if (info->kind != svn_node_file) + { + receiver_baton->start_new_line = FALSE; + return SVN_NO_ERROR; + } + + if (info->size == SVN_INVALID_FILESIZE) + { + if (receiver_baton->multiple_targets) + { + receiver_baton->start_new_line = FALSE; + return SVN_NO_ERROR; + } + + return svn_error_createf( + SVN_ERR_UNSUPPORTED_FEATURE, NULL, + _("can't show in-repository size of working copy file '%s'"), + actual_target_path); + } + + { + const char *sizestr; + SVN_ERR(svn_cl__format_file_size(&sizestr, info->size, + receiver_baton->file_size_unit, + TRUE, pool)); + SVN_ERR(print_info_item_string(sizestr, target_path, pool)); + } + break; + case info_item_revision: SVN_ERR(print_info_item_revision(info->rev, target_path, pool)); break; @@ -888,6 +1209,20 @@ print_info_item(void *baton, target_path, pool)); break; + case info_item_schedule: + SVN_ERR(print_info_item_string( + (info->wc_info + ? schedule_str(info->wc_info->schedule) : NULL), + target_path, pool)); + break; + + case info_item_depth: + SVN_ERR(print_info_item_string( + ((info->wc_info && info->kind == svn_node_dir) + ? svn_depth_to_word(info->wc_info->depth) : NULL), + target_path, pool)); + break; + default: SVN_ERR_MALFUNCTION(); } @@ -918,10 +1253,17 @@ svn_cl__info(apr_getopt_t *os, opt_state->targets, ctx, FALSE, pool)); + if (opt_state->viewspec) + { + SVN_ERR(cl_layout_list(targets, opt_state->viewspec, baton, ctx, pool)); + return SVN_NO_ERROR; + } + /* Add "." if user passed 0 arguments. */ svn_opt_push_implicit_dot_target(targets, pool); receiver_baton.ctx = ctx; + receiver_baton.file_size_unit = opt_state->file_size_unit; if (opt_state->xml) { @@ -935,6 +1277,10 @@ svn_cl__info(apr_getopt_t *os, return svn_error_create( SVN_ERR_CL_ARG_PARSING_ERROR, NULL, _("--no-newline is not valid in --xml mode")); + if (opt_state->file_size_unit != SVN_CL__SIZE_UNIT_NONE) + return svn_error_create( + SVN_ERR_CL_ARG_PARSING_ERROR, NULL, + _("--human-readable is not valid in --xml mode")); /* If output is not incremental, output the XML header and wrap everything in a top-level element. This makes the output in diff --git a/subversion/svn/list-cmd.c b/subversion/svn/list-cmd.c index da18252..121b08f 100644 --- a/subversion/svn/list-cmd.c +++ b/subversion/svn/list-cmd.c @@ -40,8 +40,13 @@ /* Baton used when printing directory entries. */ struct print_baton { - svn_boolean_t verbose; svn_client_ctx_t *ctx; + svn_boolean_t verbose; + svn_cl__size_unit_t file_size_unit; + + /* Keep track of the width of the author field. */ + int author_width; + int max_author_width; /* To keep track of last seen external information. */ const char *last_external_parent_url; @@ -49,12 +54,23 @@ struct print_baton { svn_boolean_t in_external; }; +/* Starting and maximum width of the author field */ +static const int initial_author_width = 8; +static const int initial_human_readable_author_width = 14; +static const int maximum_author_width = 16; +static const int maximum_human_readable_author_width = 22; + +/* Width of the size field */ +static const int normal_size_width = 10; +static const int human_readable_size_width = 4; + /* Field flags required for this function */ static const apr_uint32_t print_dirent_fields = SVN_DIRENT_KIND; static const apr_uint32_t print_dirent_fields_verbose = ( SVN_DIRENT_KIND | SVN_DIRENT_SIZE | SVN_DIRENT_TIME | SVN_DIRENT_CREATED_REV | SVN_DIRENT_LAST_AUTHOR); + /* This implements the svn_client_list_func2_t API, printing a single directory entry in text format. */ static svn_error_t * @@ -121,7 +137,11 @@ print_dirent(void *baton, apr_status_t apr_err; apr_size_t size; char timestr[20]; - const char *sizestr, *utf8_timestr; + const int sizewidth = (pb->file_size_unit == SVN_CL__SIZE_UNIT_NONE + ? normal_size_width + : human_readable_size_width); + const char *sizestr = ""; + const char *utf8_timestr; /* svn_time_to_human_cstring gives us something *way* too long to use for this, so we have to roll our own. We include @@ -146,15 +166,33 @@ print_dirent(void *baton, /* we need it in UTF-8. */ SVN_ERR(svn_utf_cstring_to_utf8(&utf8_timestr, timestr, scratch_pool)); - sizestr = apr_psprintf(scratch_pool, "%" SVN_FILESIZE_T_FMT, - dirent->size); + /* We may have to adjust the width of th 'author' field. */ + if (dirent->last_author) + { + const int author_width = (int)strlen(dirent->last_author); + if (author_width > pb->author_width) + { + if (author_width < pb->max_author_width) + pb->author_width = author_width; + else + pb->author_width = pb->max_author_width; + } + } + + if (dirent->kind == svn_node_file) + { + SVN_ERR(svn_cl__format_file_size(&sizestr, dirent->size, + pb->file_size_unit, + FALSE, scratch_pool)); + } return svn_cmdline_printf - (scratch_pool, "%7ld %-8.8s %c %10s %12s %s%s\n", + (scratch_pool, "%7ld %-*.*s %c %*s %12s %s%s\n", dirent->created_rev, + pb->author_width, pb->author_width, dirent->last_author ? dirent->last_author : " ? ", lock ? 'O' : ' ', - (dirent->kind == svn_node_file) ? sizestr : "", + sizewidth, sizestr, utf8_timestr, entryname, (dirent->kind == svn_node_dir) ? "/" : ""); @@ -238,9 +276,11 @@ print_dirent_xml(void *baton, if (dirent->kind == svn_node_file) { - svn_cl__xml_tagged_cdata - (&sb, scratch_pool, "size", - apr_psprintf(scratch_pool, "%" SVN_FILESIZE_T_FMT, dirent->size)); + const char *sizestr; + SVN_ERR(svn_cl__format_file_size(&sizestr, dirent->size, + SVN_CL__SIZE_UNIT_XML, + FALSE, scratch_pool)); + svn_cl__xml_tagged_cdata(&sb, scratch_pool, "size", sizestr); } svn_xml_make_open_tag(&sb, scratch_pool, svn_xml_normal, "commit", @@ -303,11 +343,17 @@ svn_cl__list(apr_getopt_t *os, if (opt_state->xml) { - /* The XML output contains all the information, so "--verbose" - does not apply. */ + /* The XML output contains all the information, so "--verbose" does + not apply, and using "--human-readable" with machine-readable + output does not make sense. */ if (opt_state->verbose) - return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL, - _("'verbose' option invalid in XML mode")); + return svn_error_create( + SVN_ERR_CL_ARG_PARSING_ERROR, NULL, + _("--verbose is not valid in --xml mode")); + if (opt_state->file_size_unit != SVN_CL__SIZE_UNIT_NONE) + return svn_error_create( + SVN_ERR_CL_ARG_PARSING_ERROR, NULL, + _("--human-readable is not valid in --xml mode")); /* If output is not incremental, output the XML header and wrap everything in a top-level element. This makes the output in @@ -318,9 +364,9 @@ svn_cl__list(apr_getopt_t *os, else { if (opt_state->incremental) - return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL, - _("'incremental' option only valid in XML " - "mode")); + return svn_error_create( + SVN_ERR_CL_ARG_PARSING_ERROR, NULL, + _("--incremental is only valid in --xml mode")); } if (opt_state->xml) @@ -332,6 +378,17 @@ svn_cl__list(apr_getopt_t *os, pb.ctx = ctx; pb.verbose = opt_state->verbose; + pb.file_size_unit = opt_state->file_size_unit; + if (pb.file_size_unit == SVN_CL__SIZE_UNIT_NONE) + { + pb.author_width = initial_author_width; + pb.max_author_width = maximum_author_width; + } + else + { + pb.author_width = initial_human_readable_author_width; + pb.max_author_width = maximum_human_readable_author_width; + } if (opt_state->depth == svn_depth_unknown) opt_state->depth = svn_depth_immediates; diff --git a/subversion/svn/log-cmd.c b/subversion/svn/log-cmd.c index 57f8415..45e88f7 100644 --- a/subversion/svn/log-cmd.c +++ b/subversion/svn/log-cmd.c @@ -88,7 +88,7 @@ display_diff(const svn_log_entry_t *log_entry, end_revision.value.number = log_entry->revision; SVN_ERR(svn_stream_puts(outstream, "\n")); - SVN_ERR(svn_client_diff_peg6(diff_options, + SVN_ERR(svn_client_diff_peg7(diff_options, target_path_or_url, target_peg_revision, &start_revision, &end_revision, @@ -102,6 +102,7 @@ display_diff(const svn_log_entry_t *log_entry, FALSE /* ignore prop diff */, FALSE /* properties only */, FALSE /* use git diff format */, + TRUE /* pretty_print_mergeinfo */, svn_cmdline_output_encoding(pool), outstream, errstream, @@ -333,7 +334,7 @@ svn_cl__log_entry_receiver(void *baton, return SVN_NO_ERROR; } - /* ### See http://subversion.tigris.org/issues/show_bug.cgi?id=807 + /* ### See https://issues.apache.org/jira/browse/SVN-807 for more on the fallback fuzzy conversions below. */ if (author == NULL) diff --git a/subversion/svn/merge-cmd.c b/subversion/svn/merge-cmd.c index f5c1919..140a39f 100644 --- a/subversion/svn/merge-cmd.c +++ b/subversion/svn/merge-cmd.c @@ -545,27 +545,31 @@ retry: "fix invalid mergeinfo in target with 'svn propset'")); } - /* Run the interactive resolver if conflicts were raised. */ - SVN_ERR(svn_cl__conflict_stats_get_paths(&conflicted_paths, conflict_stats, - pool, pool)); - if (conflicted_paths) + if (! opt_state->dry_run) { - SVN_ERR(svn_cl__walk_conflicts(conflicted_paths, conflict_stats, - opt_state, ctx, pool)); - if (merge_err && - svn_error_root_cause(merge_err)->apr_err == SVN_ERR_WC_FOUND_CONFLICT) + /* Run the interactive resolver if conflicts were raised. */ + SVN_ERR(svn_cl__conflict_stats_get_paths(&conflicted_paths, + conflict_stats, pool, pool)); + if (conflicted_paths) { - svn_error_t *err; - - /* Check if all conflicts were resolved just now. */ - err = svn_cl__conflict_stats_get_paths(&conflicted_paths, - conflict_stats, pool, pool); - if (err) - merge_err = svn_error_compose_create(merge_err, err); - else if (conflicted_paths == NULL) + SVN_ERR(svn_cl__walk_conflicts(conflicted_paths, conflict_stats, + opt_state, ctx, pool)); + if (merge_err && svn_error_root_cause(merge_err)->apr_err == + SVN_ERR_WC_FOUND_CONFLICT) { - svn_error_clear(merge_err); - goto retry; /* ### conflicts resolved; continue merging */ + svn_error_t *err; + + /* Check if all conflicts were resolved just now. */ + err = svn_cl__conflict_stats_get_paths(&conflicted_paths, + conflict_stats, + pool, pool); + if (err) + merge_err = svn_error_compose_create(merge_err, err); + else if (conflicted_paths == NULL) + { + svn_error_clear(merge_err); + goto retry; /* ### conflicts resolved; continue merging */ + } } } } diff --git a/subversion/svn/notify.c b/subversion/svn/notify.c index c15301e..ea0cc15 100644 --- a/subversion/svn/notify.c +++ b/subversion/svn/notify.c @@ -210,7 +210,7 @@ svn_cl__conflict_stats_get_paths(apr_array_header_t **conflicted_paths, } } - svn_hash_keys(conflicted_paths, all_conflicts, result_pool); + SVN_ERR(svn_hash_keys(conflicted_paths, all_conflicts, result_pool)); svn_sort__array(*conflicted_paths, svn_sort_compare_paths); return SVN_NO_ERROR; diff --git a/subversion/svn/propset-cmd.c b/subversion/svn/propset-cmd.c index 0508706..e7a8183 100644 --- a/subversion/svn/propset-cmd.c +++ b/subversion/svn/propset-cmd.c @@ -151,7 +151,7 @@ svn_cl__propset(apr_getopt_t *os, * must always be explicitly provided when setting a versioned * property. See * - * http://subversion.tigris.org/issues/show_bug.cgi?id=924 + * https://issues.apache.org/jira/browse/SVN-924 * * for more details. */ diff --git a/subversion/svn/revert-cmd.c b/subversion/svn/revert-cmd.c index 74d7ff1..2ff3556 100644 --- a/subversion/svn/revert-cmd.c +++ b/subversion/svn/revert-cmd.c @@ -67,10 +67,11 @@ svn_cl__revert(apr_getopt_t *os, SVN_ERR(svn_cl__check_targets_are_local_paths(targets)); - err = svn_client_revert3(targets, opt_state->depth, + err = svn_client_revert4(targets, opt_state->depth, opt_state->changelists, FALSE /* clear_changelists */, FALSE /* metadata_only */, + !opt_state->remove_added /*added_keep_local*/, ctx, scratch_pool); if (err && (err->apr_err == SVN_ERR_WC_INVALID_OPERATION_DEPTH) diff --git a/subversion/svn/shelf-cmd.c b/subversion/svn/shelf-cmd.c new file mode 100644 index 0000000..9066fb7 --- /dev/null +++ b/subversion/svn/shelf-cmd.c @@ -0,0 +1,1233 @@ +/* + * shelf-cmd.c -- Shelving commands. + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + */ + +/* We define this here to remove any further warnings about the usage of + experimental functions in this file. */ +#define SVN_EXPERIMENTAL + +#include "svn_client.h" +#include "svn_error_codes.h" +#include "svn_error.h" +#include "svn_hash.h" +#include "svn_path.h" +#include "svn_props.h" +#include "svn_pools.h" +#include "svn_utf.h" + +#include "cl.h" + +#include "svn_private_config.h" +#include "private/svn_sorts_private.h" +#include "private/svn_client_private.h" + + +/* Open the newest version of SHELF; error if no versions found. */ +static svn_error_t * +get_newest_version_existing(svn_client__shelf_version_t **shelf_version_p, + svn_client__shelf_t *shelf, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + SVN_ERR(svn_client__shelf_get_newest_version(shelf_version_p, shelf, + result_pool, scratch_pool)); + if (!*shelf_version_p) + { + return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL, + _("Shelf '%s': no versions found"), + shelf->name); + } + + return SVN_NO_ERROR; +} + +/* Fetch the next argument. */ +static svn_error_t * +get_next_argument(const char **arg, + apr_getopt_t *os, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + apr_array_header_t *args; + + SVN_ERR(svn_opt_parse_num_args(&args, os, 1, scratch_pool)); + SVN_ERR(svn_utf_cstring_to_utf8(arg, + APR_ARRAY_IDX(args, 0, const char *), + result_pool)); + return SVN_NO_ERROR; +} + +/* Parse the remaining arguments as paths relative to a WC. + * + * TARGETS are relative to current working directory. + * + * Set *targets_by_wcroot to a hash mapping (char *)wcroot_abspath to + * (apr_array_header_t *)array of relpaths relative to that WC root. + */ +static svn_error_t * +targets_relative_to_wcs(apr_hash_t **targets_by_wcroot_p, + apr_array_header_t *targets, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + apr_hash_t *targets_by_wcroot = apr_hash_make(result_pool); + int i; + + /* Make each target relative to the WC root. */ + for (i = 0; i < targets->nelts; i++) + { + const char *target = APR_ARRAY_IDX(targets, i, const char *); + const char *wcroot_abspath; + apr_array_header_t *paths; + + SVN_ERR(svn_dirent_get_absolute(&target, target, result_pool)); + SVN_ERR(svn_client_get_wc_root(&wcroot_abspath, target, + ctx, result_pool, scratch_pool)); + paths = svn_hash_gets(targets_by_wcroot, wcroot_abspath); + if (! paths) + { + paths = apr_array_make(result_pool, 0, sizeof(char *)); + svn_hash_sets(targets_by_wcroot, wcroot_abspath, paths); + } + target = svn_dirent_skip_ancestor(wcroot_abspath, target); + + if (target) + APR_ARRAY_PUSH(paths, const char *) = target; + } + *targets_by_wcroot_p = targets_by_wcroot; + return SVN_NO_ERROR; +} + +/* Return targets relative to a WC. Error if they refer to more than one WC. */ +static svn_error_t * +targets_relative_to_a_wc(const char **wc_root_abspath_p, + apr_array_header_t **paths_p, + apr_getopt_t *os, + const apr_array_header_t *known_targets, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + apr_array_header_t *targets; + apr_hash_t *targets_by_wcroot; + apr_hash_index_t *hi; + + SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os, + known_targets, + ctx, FALSE, result_pool)); + svn_opt_push_implicit_dot_target(targets, result_pool); + + SVN_ERR(targets_relative_to_wcs(&targets_by_wcroot, targets, + ctx, result_pool, scratch_pool)); + if (apr_hash_count(targets_by_wcroot) != 1) + return svn_error_create(SVN_ERR_ILLEGAL_TARGET, NULL, + _("All targets must be in the same WC")); + + hi = apr_hash_first(scratch_pool, targets_by_wcroot); + *wc_root_abspath_p = apr_hash_this_key(hi); + *paths_p = apr_hash_this_val(hi); + return SVN_NO_ERROR; +} + +/* Return a human-friendly description of DURATION. + */ +static char * +friendly_age_str(apr_time_t mtime, + apr_time_t time_now, + apr_pool_t *result_pool) +{ + int minutes = (int)((time_now - mtime) / 1000000 / 60); + char *s; + + if (minutes >= 60 * 24) + s = apr_psprintf(result_pool, + Q_("%d day ago", "%d days ago", + minutes / 60 / 24), + minutes / 60 / 24); + else if (minutes >= 60) + s = apr_psprintf(result_pool, + Q_("%d hour ago", "%d hours ago", + minutes / 60), + minutes / 60); + else + s = apr_psprintf(result_pool, + Q_("%d minute ago", "%d minutes ago", + minutes), + minutes); + return s; +} + +/* A comparison function for svn_sort__hash(), comparing the mtime of two + svn_client_shelf_info_t's. */ +static int +compare_shelf_infos_by_mtime(const svn_sort__item_t *a, + const svn_sort__item_t *b) +{ + svn_client__shelf_info_t *a_val = a->value; + svn_client__shelf_info_t *b_val = b->value; + + return (a_val->mtime < b_val->mtime) + ? -1 : (a_val->mtime > b_val->mtime) ? 1 : 0; +} + +/* Return a list of shelves sorted by their mtime, oldest first. + */ +static svn_error_t * +list_sorted_by_date(apr_array_header_t **list, + const char *local_abspath, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + apr_hash_t *shelf_infos; + + SVN_ERR(svn_client__shelf_list(&shelf_infos, local_abspath, + ctx, scratch_pool, scratch_pool)); + *list = svn_sort__hash(shelf_infos, + compare_shelf_infos_by_mtime, + scratch_pool); + return SVN_NO_ERROR; +} + +/* */ +static svn_error_t * +stats(svn_client__shelf_t *shelf, + int version, + svn_client__shelf_version_t *shelf_version, + apr_time_t time_now, + svn_boolean_t with_logmsg, + apr_pool_t *scratch_pool) +{ + char *age_str; + char *version_str; + apr_hash_t *paths; + const char *paths_str = ""; + + if (! shelf_version) + { + return SVN_NO_ERROR; + } + + age_str = friendly_age_str(shelf_version->mtime, time_now, scratch_pool); + if (version == shelf->max_version) + version_str = apr_psprintf(scratch_pool, + _("version %d"), version); + else + version_str = apr_psprintf(scratch_pool, + Q_("version %d of %d", "version %d of %d", + shelf->max_version), + version, shelf->max_version); + SVN_ERR(svn_client__shelf_paths_changed(&paths, shelf_version, + scratch_pool, scratch_pool)); + paths_str = apr_psprintf(scratch_pool, + Q_("%d path changed", "%d paths changed", + apr_hash_count(paths)), + apr_hash_count(paths)); + SVN_ERR(svn_cmdline_printf(scratch_pool, + "%-30s %s, %s, %s\n", + shelf->name, version_str, age_str, paths_str)); + + if (with_logmsg) + { + char *log_message; + + SVN_ERR(svn_client__shelf_get_log_message(&log_message, shelf, + scratch_pool)); + if (log_message) + { + SVN_ERR(svn_cmdline_printf(scratch_pool, + _(" %.50s\n"), + log_message)); + } + } + + return SVN_NO_ERROR; +} + +/* Display a list of shelves */ +static svn_error_t * +shelves_list(const char *local_abspath, + svn_boolean_t quiet, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + apr_time_t time_now = apr_time_now(); + apr_array_header_t *list; + int i; + + SVN_ERR(list_sorted_by_date(&list, + local_abspath, ctx, scratch_pool)); + + for (i = 0; i < list->nelts; i++) + { + const svn_sort__item_t *item = &APR_ARRAY_IDX(list, i, svn_sort__item_t); + const char *name = item->key; + svn_client__shelf_t *shelf; + svn_client__shelf_version_t *shelf_version; + + SVN_ERR(svn_client__shelf_open_existing(&shelf, name, local_abspath, + ctx, scratch_pool)); + SVN_ERR(svn_client__shelf_get_newest_version(&shelf_version, shelf, + scratch_pool, scratch_pool)); + if (quiet) + SVN_ERR(svn_cmdline_printf(scratch_pool, "%s\n", shelf->name)); + else if (!shelf_version) + SVN_ERR(svn_cmdline_printf(scratch_pool, "%-30s no versions\n", + shelf->name)); + else + SVN_ERR(stats(shelf, shelf->max_version, shelf_version, time_now, + TRUE /*with_logmsg*/, scratch_pool)); + SVN_ERR(svn_client__shelf_close(shelf, scratch_pool)); + } + + return SVN_NO_ERROR; +} + +/* Print info about each checkpoint of the shelf named NAME. + */ +static svn_error_t * +shelf_log(const char *name, + const char *local_abspath, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + apr_time_t time_now = apr_time_now(); + svn_client__shelf_t *shelf; + apr_array_header_t *versions; + int i; + + SVN_ERR(svn_client__shelf_open_existing(&shelf, name, local_abspath, + ctx, scratch_pool)); + SVN_ERR(svn_client__shelf_get_all_versions(&versions, shelf, + scratch_pool, scratch_pool)); + for (i = 0; i < versions->nelts; i++) + { + svn_client__shelf_version_t *shelf_version + = APR_ARRAY_IDX(versions, i, void *); + + SVN_ERR(stats(shelf, i + 1, shelf_version, time_now, + FALSE /*with_logmsg*/, scratch_pool)); + } + + SVN_ERR(svn_client__shelf_close(shelf, scratch_pool)); + return SVN_NO_ERROR; +} + +/* Find the name of the youngest shelf. + */ +static svn_error_t * +name_of_youngest(const char **name_p, + const char *local_abspath, + svn_client_ctx_t *ctx, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + apr_array_header_t *list; + const svn_sort__item_t *youngest_item; + + SVN_ERR(list_sorted_by_date(&list, + local_abspath, ctx, scratch_pool)); + if (list->nelts == 0) + return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL, + _("No shelves found")); + + youngest_item = &APR_ARRAY_IDX(list, list->nelts - 1, svn_sort__item_t); + *name_p = apr_pstrdup(result_pool, youngest_item->key); + return SVN_NO_ERROR; +} + +struct status_baton +{ + /* These fields correspond to the ones in the + svn_cl__print_status() interface. */ + const char *target_abspath; + const char *target_path; + + svn_boolean_t quiet; /* don't display statuses while shelving them */ + int num_paths_shelved; + int num_paths_not_shelved; + svn_client_ctx_t *ctx; +}; + +/* A status callback function for printing STATUS for PATH. */ +static svn_error_t * +print_status(void *baton, + const char *path, + const svn_client_status_t *status, + apr_pool_t *scratch_pool) +{ + struct status_baton *sb = baton; + unsigned int conflicts; + + return svn_cl__print_status(sb->target_abspath, sb->target_path, + path, status, + TRUE /*suppress_externals_placeholders*/, + FALSE /*detailed*/, + FALSE /*show_last_committed*/, + TRUE /*skip_unrecognized*/, + FALSE /*repos_locks*/, + &conflicts, &conflicts, &conflicts, + sb->ctx, + scratch_pool); +} + +/* A callback function for shelved paths. */ +static svn_error_t * +was_shelved(void *baton, + const char *path, + const svn_client_status_t *status, + apr_pool_t *scratch_pool) +{ + struct status_baton *sb = baton; + + if (!sb->quiet) + { + SVN_ERR(print_status(baton, path, status, scratch_pool)); + } + + ++sb->num_paths_shelved; + return SVN_NO_ERROR; +} + +/* A callback function for not-shelved paths. */ +static svn_error_t * +was_not_shelved(void *baton, + const char *path, + const svn_client_status_t *status, + apr_pool_t *scratch_pool) +{ + struct status_baton *sb = baton; + + SVN_ERR(print_status(baton, path, status, scratch_pool)); + SVN_ERR(svn_cmdline_printf(scratch_pool, " > not shelved\n")); + ++sb->num_paths_not_shelved; + return SVN_NO_ERROR; +} + +/** Shelve/save a new version of changes. + * + * Shelve in shelf @a name the local modifications found by @a paths, + * @a depth, @a changelists. Revert the shelved changes from the WC + * unless @a keep_local is true. + * + * If no local modifications are found, throw an error. + * + * If @a dry_run is true, don't actually do it. + * + * Report in @a *new_version_p the new version number (or, with dry run, + * what it would be). + */ +static svn_error_t * +shelve(int *new_version_p, + const char *name, + const apr_array_header_t *paths, + svn_depth_t depth, + const apr_array_header_t *changelists, + apr_hash_t *revprop_table, + svn_boolean_t keep_local, + svn_boolean_t dry_run, + svn_boolean_t quiet, + const char *local_abspath, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + svn_client__shelf_t *shelf; + svn_client__shelf_version_t *previous_version; + svn_client__shelf_version_t *new_version; + struct status_baton sb; + + SVN_ERR(svn_client__shelf_open_or_create(&shelf, + name, local_abspath, + ctx, scratch_pool)); + SVN_ERR(svn_client__shelf_get_newest_version(&previous_version, shelf, + scratch_pool, scratch_pool)); + + if (! quiet) + { + SVN_ERR(svn_cmdline_printf(scratch_pool, keep_local + ? _("--- Save a new version of '%s' in WC root '%s'\n") + : _("--- Shelve '%s' in WC root '%s'\n"), + shelf->name, shelf->wc_root_abspath)); + SVN_ERR(stats(shelf, shelf->max_version, previous_version, apr_time_now(), + TRUE /*with_logmsg*/, scratch_pool)); + } + + sb.target_abspath = shelf->wc_root_abspath; + sb.target_path = ""; + sb.quiet = quiet; + sb.num_paths_shelved = 0; + sb.num_paths_not_shelved = 0; + sb.ctx = ctx; + + if (! quiet) + SVN_ERR(svn_cmdline_printf(scratch_pool, + keep_local ? _("--- Saving...\n") + : _("--- Shelving...\n"))); + SVN_ERR(svn_client__shelf_save_new_version3(&new_version, shelf, + paths, depth, changelists, + was_shelved, &sb, + was_not_shelved, &sb, + scratch_pool)); + if (sb.num_paths_not_shelved > 0) + { + SVN_ERR(svn_client__shelf_delete_newer_versions(shelf, previous_version, + scratch_pool)); + SVN_ERR(svn_client__shelf_close(shelf, scratch_pool)); + return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL, + Q_("%d path could not be shelved", + "%d paths could not be shelved", + sb.num_paths_not_shelved), + sb.num_paths_not_shelved); + } + if (sb.num_paths_shelved == 0 + || ! new_version) + { + SVN_ERR(svn_client__shelf_close(shelf, scratch_pool)); + return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL, + keep_local ? _("No local modifications could be saved") + : _("No local modifications could be shelved")); + } + + /* Un-apply the changes, if required. */ + if (!keep_local) + { + SVN_ERR(svn_client__shelf_unapply(new_version, + dry_run, scratch_pool)); + } + + /* Fetch the log message and any other revprops */ + if (ctx->log_msg_func3) + { + const char *tmp_file; + apr_array_header_t *commit_items + = apr_array_make(scratch_pool, 1, sizeof(void *)); + const char *message = ""; + + SVN_ERR(ctx->log_msg_func3(&message, &tmp_file, commit_items, + ctx->log_msg_baton3, scratch_pool)); + /* Abort the shelving if the log message callback requested so. */ + if (! message) + return SVN_NO_ERROR; + + if (message && !dry_run) + { + svn_string_t *propval = svn_string_create(message, scratch_pool); + + if (! revprop_table) + revprop_table = apr_hash_make(scratch_pool); + svn_hash_sets(revprop_table, SVN_PROP_REVISION_LOG, propval); + } + } + + SVN_ERR(svn_client__shelf_revprop_set_all(shelf, revprop_table, scratch_pool)); + + if (new_version_p) + *new_version_p = shelf->max_version; + + if (dry_run) + { + SVN_ERR(svn_client__shelf_delete_newer_versions(shelf, previous_version, + scratch_pool)); + } + + SVN_ERR(svn_client__shelf_close(shelf, scratch_pool)); + return SVN_NO_ERROR; +} + +/* Return the single character representation of STATUS. + * (Similar to subversion/svn/status.c:generate_status_code() + * and subversion/tests/libsvn_client/client-test.c:status_to_char().) */ +static char +status_to_char(enum svn_wc_status_kind status) +{ + switch (status) + { + case svn_wc_status_none: return '.'; + case svn_wc_status_unversioned: return '?'; + case svn_wc_status_normal: return ' '; + case svn_wc_status_added: return 'A'; + case svn_wc_status_missing: return '!'; + case svn_wc_status_deleted: return 'D'; + case svn_wc_status_replaced: return 'R'; + case svn_wc_status_modified: return 'M'; + case svn_wc_status_merged: return 'G'; + case svn_wc_status_conflicted: return 'C'; + case svn_wc_status_ignored: return 'I'; + case svn_wc_status_obstructed: return '~'; + case svn_wc_status_external: return 'X'; + case svn_wc_status_incomplete: return ':'; + default: return '*'; + } +} + +/* Throw an error if any path affected by SHELF_VERSION gives a conflict + * when applied (as a dry-run) to the WC. */ +static svn_error_t * +test_apply(svn_client__shelf_version_t *shelf_version, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + apr_hash_t *paths; + apr_hash_index_t *hi; + + SVN_ERR(svn_client__shelf_paths_changed(&paths, shelf_version, + scratch_pool, scratch_pool)); + for (hi = apr_hash_first(scratch_pool, paths); hi; hi = apr_hash_next(hi)) + { + const char *path = apr_hash_this_key(hi); + svn_boolean_t conflict; + + SVN_ERR(svn_client__shelf_test_apply_file(&conflict, shelf_version, path, + scratch_pool)); + if (conflict) + { + char *to_wc_abspath + = svn_dirent_join(shelf_version->shelf->wc_root_abspath, path, + scratch_pool); + svn_wc_status3_t *status; + + SVN_ERR(svn_wc_status3(&status, ctx->wc_ctx, to_wc_abspath, + scratch_pool, scratch_pool)); + return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL, + _("Shelved path '%s' already has " + "status '%c' in the working copy"), + path, status_to_char(status->node_status)); + } + } + return SVN_NO_ERROR; +} + +/** Restore/unshelve a given or newest version of changes. + * + * Restore local modifications from shelf @a name version @a arg, + * or the newest version is @a arg is null. + * + * If @a dry_run is true, don't actually do it. + * + * Error if any path would have a conflict, unless @a force_if_conflict. + */ +static svn_error_t * +shelf_restore(const char *name, + const char *arg, + svn_boolean_t dry_run, + svn_boolean_t quiet, + svn_boolean_t force_if_conflict, + const char *local_abspath, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + int version, old_version; + apr_time_t time_now = apr_time_now(); + svn_client__shelf_t *shelf; + svn_client__shelf_version_t *shelf_version; + + SVN_ERR(svn_client__shelf_open_existing(&shelf, name, local_abspath, + ctx, scratch_pool)); + + old_version = shelf->max_version; + if (arg) + { + SVN_ERR(svn_cstring_atoi(&version, arg)); + SVN_ERR(svn_client__shelf_version_open(&shelf_version, + shelf, version, + scratch_pool, scratch_pool)); + } + else + { + version = shelf->max_version; + SVN_ERR(get_newest_version_existing(&shelf_version, shelf, + scratch_pool, scratch_pool)); + } + + if (! quiet) + { + SVN_ERR(svn_cmdline_printf(scratch_pool, + _("--- Unshelve '%s' in WC root '%s'\n"), + shelf->name, shelf->wc_root_abspath)); + SVN_ERR(stats(shelf, version, shelf_version, time_now, + TRUE /*with_logmsg*/, scratch_pool)); + } + if (! force_if_conflict) + { + SVN_ERR_W(test_apply(shelf_version, ctx, scratch_pool), + _("Cannot unshelve/restore, as at least one shelved " + "path would conflict with a local modification " + "or other status in the working copy")); + } + + SVN_ERR(svn_client__shelf_apply(shelf_version, + dry_run, scratch_pool)); + + if (! dry_run) + { + SVN_ERR(svn_client__shelf_delete_newer_versions(shelf, shelf_version, + scratch_pool)); + } + + if (!quiet) + { + if (version < old_version) + SVN_ERR(svn_cmdline_printf(scratch_pool, + Q_("restored '%s' version %d and deleted %d newer version\n", + "restored '%s' version %d and deleted %d newer versions\n", + old_version - version), + name, version, old_version - version)); + else + SVN_ERR(svn_cmdline_printf(scratch_pool, + _("restored '%s' version %d (the newest version)\n"), + name, version)); + } + + SVN_ERR(svn_client__shelf_close(shelf, scratch_pool)); + return SVN_NO_ERROR; +} + +static svn_error_t * +shelf_diff(const char *name, + const char *arg, + const char *local_abspath, + svn_boolean_t summarize, + svn_depth_t depth, + svn_boolean_t ignore_ancestry, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + svn_client__shelf_t *shelf; + svn_client__shelf_version_t *shelf_version; + svn_stream_t *stream, *errstream; + svn_diff_tree_processor_t *diff_processor; + + SVN_ERR(svn_client__shelf_open_existing(&shelf, name, local_abspath, + ctx, scratch_pool)); + + if (arg) + { + int version; + + SVN_ERR(svn_cstring_atoi(&version, arg)); + SVN_ERR(svn_client__shelf_version_open(&shelf_version, + shelf, version, + scratch_pool, scratch_pool)); + } + else + { + SVN_ERR(get_newest_version_existing(&shelf_version, shelf, + scratch_pool, scratch_pool)); + } + + SVN_ERR(svn_stream_for_stdout(&stream, scratch_pool)); + errstream = svn_stream_empty(scratch_pool); + + if (summarize) + { + svn_client_diff_summarize_func_t func; + void *baton; + + SVN_ERR(svn_cl__get_diff_summary_writer(&func, &baton, + FALSE /*xml*/, + FALSE /*ignore_properties*/, + "" /*anchor/prefix*/, + scratch_pool, scratch_pool)); + SVN_ERR(svn_client__get_diff_summarize_callbacks(&diff_processor, + func, baton, + scratch_pool, + scratch_pool)); + } + else + { + SVN_ERR(svn_client__get_diff_writer_svn( + &diff_processor, + NULL /*anchor*/, + "", "", /*orig_path_1, orig_path_2,*/ + NULL /*options*/, + "" /*relative_to_dir*/, + FALSE /*no_diff_added*/, + FALSE /*no_diff_deleted*/, + FALSE /*show_copies_as_adds*/, + FALSE /*ignore_content_type*/, + FALSE /*ignore_properties*/, + FALSE /*properties_only*/, + TRUE /*pretty_print_mergeinfo*/, + svn_cmdline_output_encoding(scratch_pool), + stream, errstream, + ctx, scratch_pool)); + } + + SVN_ERR(svn_client__shelf_diff(shelf_version, "", + depth, ignore_ancestry, + diff_processor, scratch_pool)); + SVN_ERR(svn_stream_close(stream)); + + SVN_ERR(svn_client__shelf_close(shelf, scratch_pool)); + return SVN_NO_ERROR; +} + +/* This implements the `svn_opt_subcommand_t' interface. */ +static svn_error_t * +shelf_drop(const char *name, + const char *local_abspath, + svn_boolean_t dry_run, + svn_boolean_t quiet, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + SVN_ERR(svn_client__shelf_delete(name, local_abspath, dry_run, + ctx, scratch_pool)); + if (! quiet) + SVN_ERR(svn_cmdline_printf(scratch_pool, + _("deleted '%s'\n"), + name)); + return SVN_NO_ERROR; +} + +/* */ +static svn_error_t * +shelf_shelve(int *new_version, + const char *name, + apr_array_header_t *targets, + svn_depth_t depth, + apr_array_header_t *changelists, + apr_hash_t *revprop_table, + svn_boolean_t keep_local, + svn_boolean_t dry_run, + svn_boolean_t quiet, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + const char *local_abspath; + + if (depth == svn_depth_unknown) + depth = svn_depth_infinity; + + SVN_ERR(svn_cl__check_targets_are_local_paths(targets)); + + SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, scratch_pool)); + + svn_opt_push_implicit_dot_target(targets, scratch_pool); + + /* ### TODO: check all paths are in same WC; for now use first path */ + SVN_ERR(svn_dirent_get_absolute(&local_abspath, + APR_ARRAY_IDX(targets, 0, char *), + scratch_pool)); + + SVN_ERR(shelve(new_version, name, + targets, depth, changelists, + revprop_table, + keep_local, dry_run, quiet, + local_abspath, ctx, scratch_pool)); + + return SVN_NO_ERROR; +} + +/* This implements the `svn_opt_subcommand_t' interface. */ +svn_error_t * +svn_cl__shelf_save(apr_getopt_t *os, + void *baton, + apr_pool_t *pool) +{ + svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state; + + opt_state->keep_local = TRUE; + SVN_ERR(svn_cl__shelf_shelve(os, baton, pool)); + return SVN_NO_ERROR; +} + +/* This implements the `svn_opt_subcommand_t' interface. */ +svn_error_t * +svn_cl__shelf_shelve(apr_getopt_t *os, + void *baton, + apr_pool_t *pool) +{ + svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state; + svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx; + const char *name; + apr_array_header_t *targets; + + if (opt_state->quiet) + ctx->notify_func2 = NULL; /* Easy out: avoid unneeded work */ + + SVN_ERR(get_next_argument(&name, os, pool, pool)); + + /* Parse the remaining arguments as paths. */ + SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os, + opt_state->targets, + ctx, FALSE, pool)); + { + int new_version; + svn_error_t *err; + + if (ctx->log_msg_func3) + SVN_ERR(svn_cl__make_log_msg_baton(&ctx->log_msg_baton3, + opt_state, NULL, ctx->config, + pool)); + err = shelf_shelve(&new_version, name, + targets, opt_state->depth, opt_state->changelists, + opt_state->revprop_table, + opt_state->keep_local, opt_state->dry_run, + opt_state->quiet, ctx, pool); + if (ctx->log_msg_func3) + SVN_ERR(svn_cl__cleanup_log_msg(ctx->log_msg_baton3, + err, pool)); + else + SVN_ERR(err); + + if (! opt_state->quiet) + { + if (opt_state->keep_local) + SVN_ERR(svn_cmdline_printf(pool, + _("saved '%s' version %d\n"), + name, new_version)); + else + SVN_ERR(svn_cmdline_printf(pool, + _("shelved '%s' version %d\n"), + name, new_version)); + } + } + + return SVN_NO_ERROR; +} + +/* This implements the `svn_opt_subcommand_t' interface. */ +svn_error_t * +svn_cl__shelf_unshelve(apr_getopt_t *os, + void *baton, + apr_pool_t *scratch_pool) +{ + svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state; + svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx; + const char *local_abspath; + const char *name; + const char *arg = NULL; + + SVN_ERR(svn_dirent_get_absolute(&local_abspath, "", scratch_pool)); + + if (os->ind < os->argc) + { + SVN_ERR(get_next_argument(&name, os, scratch_pool, scratch_pool)); + } + else + { + SVN_ERR(name_of_youngest(&name, + local_abspath, ctx, scratch_pool, scratch_pool)); + SVN_ERR(svn_cmdline_printf(scratch_pool, + _("unshelving the youngest shelf, '%s'\n"), + name)); + } + + /* Which checkpoint number? */ + if (os->ind < os->argc) + SVN_ERR(get_next_argument(&arg, os, scratch_pool, scratch_pool)); + + if (os->ind < os->argc) + return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL, + _("Too many arguments")); + + if (opt_state->quiet) + ctx->notify_func2 = NULL; /* Easy out: avoid unneeded work */ + + SVN_ERR(shelf_restore(name, arg, + opt_state->dry_run, opt_state->quiet, + opt_state->force /*force_already_modified*/, + local_abspath, ctx, scratch_pool)); + + if (opt_state->drop) + { + SVN_ERR(shelf_drop(name, local_abspath, + opt_state->dry_run, opt_state->quiet, + ctx, scratch_pool)); + } + return SVN_NO_ERROR; +} + +/* This implements the `svn_opt_subcommand_t' interface. */ +svn_error_t * +svn_cl__shelf_list(apr_getopt_t *os, + void *baton, + apr_pool_t *pool) +{ + svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state; + svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx; + apr_array_header_t *targets = NULL; + apr_pool_t *iterpool = svn_pool_create(pool); + int i; + + SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os, + opt_state->targets, + ctx, FALSE, pool)); + /* Add "." if user passed 0 arguments */ + svn_opt_push_implicit_dot_target(targets, pool); + + for (i = 0; i < targets->nelts; ++i) + { + const char *local_abspath; + const char *target = APR_ARRAY_IDX(targets, i, const char *); + + svn_pool_clear(iterpool); + + SVN_ERR(svn_dirent_get_absolute(&local_abspath, target, iterpool)); + + SVN_ERR(shelves_list(local_abspath, + opt_state->quiet, + ctx, iterpool)); + } + + svn_pool_destroy(iterpool); + + return SVN_NO_ERROR; +} + +/* "svn shelf-list-by-paths [PATH...]" + * + * TARGET_RELPATHS are all within the same WC, relative to WC_ROOT_ABSPATH. + */ +static svn_error_t * +shelf_list_by_paths(apr_array_header_t *target_relpaths, + const char *wc_root_abspath, + svn_client_ctx_t *ctx, + apr_pool_t *scratch_pool) +{ + apr_array_header_t *shelves; + apr_hash_t *paths_to_shelf_name = apr_hash_make(scratch_pool); + apr_array_header_t *array; + int i; + + SVN_ERR(list_sorted_by_date(&shelves, + wc_root_abspath, ctx, scratch_pool)); + + /* Check paths are valid */ + for (i = 0; i < target_relpaths->nelts; i++) + { + char *target_relpath = APR_ARRAY_IDX(target_relpaths, i, char *); + + if (svn_path_is_url(target_relpath)) + return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL, + _("'%s' is not a local path"), target_relpath); + SVN_ERR_ASSERT(svn_relpath_is_canonical(target_relpath)); + } + + /* Find the most recent shelf for each affected path */ + for (i = 0; i < shelves->nelts; i++) + { + svn_sort__item_t *item = &APR_ARRAY_IDX(shelves, i, svn_sort__item_t); + const char *name = item->key; + svn_client__shelf_t *shelf; + svn_client__shelf_version_t *shelf_version; + apr_hash_t *shelf_paths; + int j; + + SVN_ERR(svn_client__shelf_open_existing(&shelf, + name, wc_root_abspath, + ctx, scratch_pool)); + SVN_ERR(svn_client__shelf_get_newest_version(&shelf_version, shelf, + scratch_pool, scratch_pool)); + if (!shelf_version) + continue; + SVN_ERR(svn_client__shelf_paths_changed(&shelf_paths, + shelf_version, + scratch_pool, scratch_pool)); + for (j = 0; j < target_relpaths->nelts; j++) + { + char *target_relpath = APR_ARRAY_IDX(target_relpaths, j, char *); + apr_hash_index_t *hi; + + for (hi = apr_hash_first(scratch_pool, shelf_paths); + hi; hi = apr_hash_next(hi)) + { + const char *shelf_path = apr_hash_this_key(hi); + + if (svn_relpath_skip_ancestor(target_relpath, shelf_path)) + { + if (! svn_hash_gets(paths_to_shelf_name, shelf_path)) + { + svn_hash_sets(paths_to_shelf_name, shelf_path, shelf->name); + } + } + } + } + } + + /* Print the results. */ + array = svn_sort__hash(paths_to_shelf_name, + svn_sort_compare_items_as_paths, + scratch_pool); + for (i = 0; i < array->nelts; i++) + { + svn_sort__item_t *item = &APR_ARRAY_IDX(array, i, svn_sort__item_t); + const char *path = item->key; + const char *name = item->value; + + SVN_ERR(svn_cmdline_printf(scratch_pool, "%-20.20s %s\n", + name, + svn_dirent_local_style(path, scratch_pool))); + } + return SVN_NO_ERROR; +} + +/* This implements the `svn_opt_subcommand_t' interface. */ +svn_error_t * +svn_cl__shelf_list_by_paths(apr_getopt_t *os, + void *baton, + apr_pool_t *pool) +{ + svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state; + svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx; + const char *wc_root_abspath; + apr_array_header_t *targets; + + /* Parse the remaining arguments as paths. */ + SVN_ERR(targets_relative_to_a_wc(&wc_root_abspath, &targets, + os, opt_state->targets, + ctx, pool, pool)); + + SVN_ERR(shelf_list_by_paths(targets, wc_root_abspath, ctx, pool)); + return SVN_NO_ERROR; +} + +/* This implements the `svn_opt_subcommand_t' interface. */ +svn_error_t * +svn_cl__shelf_diff(apr_getopt_t *os, + void *baton, + apr_pool_t *pool) +{ + svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state; + svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx; + const char *local_abspath; + const char *name; + const char *arg = NULL; + + SVN_ERR(svn_dirent_get_absolute(&local_abspath, "", pool)); + + SVN_ERR(get_next_argument(&name, os, pool, pool)); + + /* Which checkpoint number? */ + if (os->ind < os->argc) + SVN_ERR(get_next_argument(&arg, os, pool, pool)); + + if (os->ind < os->argc) + return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL, + _("Too many arguments")); + + SVN_ERR(shelf_diff(name, arg, local_abspath, + opt_state->diff.summarize, + opt_state->depth, opt_state->ignore_ancestry, + ctx, pool)); + + return SVN_NO_ERROR; +} + +/* This implements the `svn_opt_subcommand_t' interface. */ +svn_error_t * +svn_cl__shelf_drop(apr_getopt_t *os, + void *baton, + apr_pool_t *pool) +{ + svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state; + svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx; + const char *name; + apr_array_header_t *targets = NULL; + apr_pool_t *iterpool = svn_pool_create(pool); + int i; + + SVN_ERR(get_next_argument(&name, os, pool, pool)); + + SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os, + opt_state->targets, + ctx, FALSE, pool)); + svn_opt_push_implicit_dot_target(targets, pool); + + for (i = 0; i < targets->nelts; ++i) + { + const char *local_abspath; + const char *target = APR_ARRAY_IDX(targets, i, const char *); + + svn_pool_clear(iterpool); + + SVN_ERR(svn_dirent_get_absolute(&local_abspath, target, iterpool)); + SVN_ERR(shelf_drop(name, local_abspath, + opt_state->dry_run, opt_state->quiet, + ctx, iterpool)); + } + + svn_pool_destroy(iterpool); + + return SVN_NO_ERROR; +} + +/* This implements the `svn_opt_subcommand_t' interface. */ +svn_error_t * +svn_cl__shelf_log(apr_getopt_t *os, + void *baton, + apr_pool_t *pool) +{ + svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state; + svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx; + const char *name; + apr_array_header_t *targets = NULL; + apr_pool_t *iterpool = svn_pool_create(pool); + int i; + + SVN_ERR(get_next_argument(&name, os, pool, pool)); + + SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os, + opt_state->targets, + ctx, FALSE, pool)); + svn_opt_push_implicit_dot_target(targets, pool); + + for (i = 0; i < targets->nelts; ++i) + { + const char *local_abspath; + const char *target = APR_ARRAY_IDX(targets, i, const char *); + + svn_pool_clear(iterpool); + + SVN_ERR(svn_dirent_get_absolute(&local_abspath, target, iterpool)); + SVN_ERR(shelf_log(name, local_abspath, ctx, iterpool)); + } + + svn_pool_destroy(iterpool); + + return SVN_NO_ERROR; +} + +/**************************************************************************/ + +/* This implements the `svn_opt_subcommand_t' interface. */ +svn_error_t * +svn_cl__wc_copy_mods(apr_getopt_t *os, + void *baton, + apr_pool_t *pool) +{ + svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx; + const char *src_wc_abspath, *dst_wc_abspath; + + SVN_ERR(get_next_argument(&src_wc_abspath, os, pool, pool)); + SVN_ERR(svn_dirent_get_absolute(&src_wc_abspath, src_wc_abspath, pool)); + + SVN_ERR(get_next_argument(&dst_wc_abspath, os, pool, pool)); + SVN_ERR(svn_dirent_get_absolute(&dst_wc_abspath, dst_wc_abspath, pool)); + + SVN_ERR(svn_client__wc_copy_mods(src_wc_abspath, dst_wc_abspath, + ctx->notify_func2, ctx->notify_baton2, + ctx, pool)); + + return SVN_NO_ERROR; +} diff --git a/subversion/svn/shelve-cmd.c b/subversion/svn/shelve-cmd.c deleted file mode 100644 index df88a65..0000000 --- a/subversion/svn/shelve-cmd.c +++ /dev/null @@ -1,369 +0,0 @@ -/* - * shelve-cmd.c -- Shelve commands. - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ - -/* We define this here to remove any further warnings about the usage of - experimental functions in this file. */ -#define SVN_EXPERIMENTAL - -#include "svn_client.h" -#include "svn_error_codes.h" -#include "svn_error.h" -#include "svn_path.h" -#include "svn_utf.h" - -#include "cl.h" - -#include "svn_private_config.h" -#include "private/svn_sorts_private.h" - - -/* First argument should be the name of a shelved change. */ -static svn_error_t * -get_name(const char **name, - apr_getopt_t *os, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) -{ - apr_array_header_t *args; - - SVN_ERR(svn_opt_parse_num_args(&args, os, 1, scratch_pool)); - SVN_ERR(svn_utf_cstring_to_utf8(name, - APR_ARRAY_IDX(args, 0, const char *), - result_pool)); - return SVN_NO_ERROR; -} - -/* A comparison function for svn_sort__hash(), comparing the mtime of two - svn_client_shelved_patch_info_t's. */ -static int -compare_shelved_patch_infos_by_mtime(const svn_sort__item_t *a, - const svn_sort__item_t *b) -{ - svn_client_shelved_patch_info_t *a_val = a->value; - svn_client_shelved_patch_info_t *b_val = b->value; - - return (a_val->dirent->mtime < b_val->dirent->mtime) - ? -1 : (a_val->dirent->mtime > b_val->dirent->mtime) ? 1 : 0; -} - -/* Return a list of shelved changes sorted by patch file mtime, oldest first. - */ -static svn_error_t * -list_sorted_by_date(apr_array_header_t **list, - const char *local_abspath, - svn_client_ctx_t *ctx, - apr_pool_t *scratch_pool) -{ - apr_hash_t *shelved_patch_infos; - - SVN_ERR(svn_client_shelves_list(&shelved_patch_infos, local_abspath, - ctx, scratch_pool, scratch_pool)); - *list = svn_sort__hash(shelved_patch_infos, - compare_shelved_patch_infos_by_mtime, - scratch_pool); - return SVN_NO_ERROR; -} - -#ifndef WIN32 -/* Run CMD with ARGS. - * Send its stdout to the parent's stdout. Disconnect its stdin and stderr. - */ -static svn_error_t * -run_cmd(const char *cmd, - const char *const *args, - apr_pool_t *scratch_pool) -{ - apr_status_t apr_err; - apr_file_t *outfile; - svn_error_t *err; - int exitcode; - - apr_err = apr_file_open_stdout(&outfile, scratch_pool); - if (apr_err) - return svn_error_wrap_apr(apr_err, "Can't open stdout"); - - err = svn_io_run_cmd(NULL /*path*/, cmd, args, - &exitcode, NULL /*exitwhy*/, - TRUE /*inherit*/, - NULL /*infile*/, outfile, NULL /*errfile*/, - scratch_pool); - if (err || exitcode) - return svn_error_createf(SVN_ERR_EXTERNAL_PROGRAM, err, - _("Could not run external command '%s'"), cmd); - return SVN_NO_ERROR; -} -#endif - -/* Display a list of shelved changes */ -static svn_error_t * -shelves_list(const char *local_abspath, - svn_boolean_t diffstat, - svn_client_ctx_t *ctx, - apr_pool_t *scratch_pool) -{ - apr_array_header_t *list; - int i; - - SVN_ERR(list_sorted_by_date(&list, - local_abspath, ctx, scratch_pool)); - - for (i = 0; i < list->nelts; i++) - { - const svn_sort__item_t *item = &APR_ARRAY_IDX(list, i, svn_sort__item_t); - const char *name = item->key; - svn_client_shelved_patch_info_t *info = item->value; - int age = (int)((apr_time_now() - info->mtime) / 1000000 / 60); - apr_hash_t *paths; - - SVN_ERR(svn_client_shelf_get_paths(&paths, - name, local_abspath, ctx, - scratch_pool, scratch_pool)); - - SVN_ERR(svn_cmdline_printf(scratch_pool, - _("%-30s %6d mins old %10ld bytes %4d paths changed\n"), - name, age, (long)info->dirent->filesize, - apr_hash_count(paths))); - SVN_ERR(svn_cmdline_printf(scratch_pool, - _(" %.50s\n"), - info->message)); - - if (diffstat) - { -#ifndef WIN32 - const char *args[4]; - svn_error_t *err; - - args[0] = "diffstat"; - args[1] = "-p0"; - args[2] = info->patch_path; - args[3] = NULL; - err = run_cmd("diffstat", args, scratch_pool); - if (err) - svn_error_clear(err); - else - SVN_ERR(svn_cmdline_printf(scratch_pool, - "\n")); -#endif - } - } - - return SVN_NO_ERROR; -} - -/* Find the name of the youngest shelved change. - */ -static svn_error_t * -name_of_youngest(const char **name_p, - const char *local_abspath, - svn_client_ctx_t *ctx, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) -{ - apr_array_header_t *list; - const svn_sort__item_t *youngest_item; - - SVN_ERR(list_sorted_by_date(&list, - local_abspath, ctx, scratch_pool)); - if (list->nelts == 0) - return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL, - _("No shelved changes found")); - - youngest_item = &APR_ARRAY_IDX(list, list->nelts - 1, svn_sort__item_t); - *name_p = youngest_item->key; - return SVN_NO_ERROR; -} - -/* This implements the `svn_opt_subcommand_t' interface. */ -svn_error_t * -svn_cl__shelve(apr_getopt_t *os, - void *baton, - apr_pool_t *pool) -{ - svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state; - svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx; - const char *local_abspath; - const char *name; - apr_array_header_t *targets; - svn_boolean_t has_changes; - - if (opt_state->quiet) - ctx->notify_func2 = NULL; /* Easy out: avoid unneeded work */ - - SVN_ERR(svn_dirent_get_absolute(&local_abspath, "", pool)); - - if (opt_state->list) - { - if (os->ind < os->argc) - return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, 0, NULL); - - SVN_ERR(shelves_list(local_abspath, - ! opt_state->quiet /*diffstat*/, - ctx, pool)); - return SVN_NO_ERROR; - } - - SVN_ERR(get_name(&name, os, pool, pool)); - - if (opt_state->remove) - { - if (os->ind < os->argc) - return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, 0, NULL); - - SVN_ERR(svn_client_shelves_delete(name, local_abspath, - opt_state->dry_run, - ctx, pool)); - if (! opt_state->quiet) - SVN_ERR(svn_cmdline_printf(pool, "deleted '%s'\n", name)); - return SVN_NO_ERROR; - } - - /* Parse the remaining arguments as paths. */ - SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os, - opt_state->targets, - ctx, FALSE, pool)); - svn_opt_push_implicit_dot_target(targets, pool); - - { - svn_depth_t depth = opt_state->depth; - svn_error_t *err; - - /* shelve has no implicit dot-target `.', so don't you put that - code here! */ - if (!targets->nelts) - return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL); - - SVN_ERR(svn_cl__check_targets_are_local_paths(targets)); - - if (depth == svn_depth_unknown) - depth = svn_depth_infinity; - - SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, pool)); - - if (ctx->log_msg_func3) - SVN_ERR(svn_cl__make_log_msg_baton(&ctx->log_msg_baton3, - opt_state, NULL, ctx->config, - pool)); - err = svn_client_shelve(name, - targets, depth, opt_state->changelists, - opt_state->keep_local, opt_state->dry_run, - ctx, pool); - if (ctx->log_msg_func3) - SVN_ERR(svn_cl__cleanup_log_msg(ctx->log_msg_baton3, - err, pool)); - else - SVN_ERR(err); - } - - /* If no modifications were shelved, throw an error. */ - SVN_ERR(svn_client_shelf_has_changes(&has_changes, - name, local_abspath, ctx, pool)); - if (! has_changes) - { - SVN_ERR(svn_client_shelves_delete(name, local_abspath, - opt_state->dry_run, ctx, pool)); - return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL, - _("No changes were shelved")); - } - - if (! opt_state->quiet) - SVN_ERR(svn_cmdline_printf(pool, "shelved '%s'\n", name)); - - return SVN_NO_ERROR; -} - -/* This implements the `svn_opt_subcommand_t' interface. */ -svn_error_t * -svn_cl__unshelve(apr_getopt_t *os, - void *baton, - apr_pool_t *pool) -{ - svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state; - svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx; - const char *local_abspath; - const char *name; - apr_array_header_t *targets; - - SVN_ERR(svn_dirent_get_absolute(&local_abspath, "", pool)); - - if (opt_state->list) - { - if (os->ind < os->argc) - return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, 0, NULL); - - SVN_ERR(shelves_list(local_abspath, - ! opt_state->quiet /*diffstat*/, - ctx, pool)); - return SVN_NO_ERROR; - } - - if (os->ind < os->argc) - { - SVN_ERR(get_name(&name, os, pool, pool)); - } - else - { - SVN_ERR(name_of_youngest(&name, local_abspath, ctx, pool, pool)); - SVN_ERR(svn_cmdline_printf(pool, - _("unshelving the youngest change, '%s'\n"), - name)); - } - - /* There should be no remaining arguments. */ - SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os, - opt_state->targets, - ctx, FALSE, pool)); - if (targets->nelts) - return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, 0, NULL); - - if (opt_state->quiet) - ctx->notify_func2 = NULL; /* Easy out: avoid unneeded work */ - - SVN_ERR(svn_client_unshelve(name, local_abspath, - opt_state->keep_local, opt_state->dry_run, - ctx, pool)); - if (! opt_state->quiet) - SVN_ERR(svn_cmdline_printf(pool, "unshelved '%s'\n", name)); - - return SVN_NO_ERROR; -} - -/* This implements the `svn_opt_subcommand_t' interface. */ -svn_error_t * -svn_cl__shelves(apr_getopt_t *os, - void *baton, - apr_pool_t *pool) -{ - svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state; - svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx; - const char *local_abspath; - - /* There should be no remaining arguments. */ - if (os->ind < os->argc) - return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, 0, NULL); - - SVN_ERR(svn_dirent_get_absolute(&local_abspath, "", pool)); - SVN_ERR(shelves_list(local_abspath, ! opt_state->quiet /*diffstat*/, - ctx, pool)); - - return SVN_NO_ERROR; -} diff --git a/subversion/svn/svn.c b/subversion/svn/svn.c index 48b894f..f83cc08 100644 --- a/subversion/svn/svn.c +++ b/subversion/svn/svn.c @@ -140,15 +140,15 @@ typedef enum svn_cl__longopt_t { opt_mergeinfo_log, opt_remove_unversioned, opt_remove_ignored, + opt_remove_added, opt_no_newline, opt_show_passwords, opt_pin_externals, opt_show_item, opt_adds_as_modification, opt_vacuum_pristines, - opt_delete, - opt_keep_shelved, - opt_list + opt_drop, + opt_viewspec, } svn_cl__longopt_t; @@ -166,7 +166,8 @@ const apr_getopt_option_t svn_cl__options[] = {"message", 'm', 1, N_("specify log message ARG")}, {"quiet", 'q', 0, N_("print nothing, or only summary information")}, {"recursive", 'R', 0, N_("descend recursively, same as --depth=infinity")}, - {"non-recursive", 'N', 0, N_("obsolete; try --depth=files or --depth=immediates")}, + {"non-recursive", 'N', 0, N_("obsolete")}, + {"human-readable",'H', 0, N_("show human-readable output")}, {"change", 'c', 1, N_("the change made by revision ARG (like -r ARG-1:ARG)\n" " " @@ -421,6 +422,8 @@ const apr_getopt_option_t svn_cl__options[] = {"remove-unversioned", opt_remove_unversioned, 0, N_("remove unversioned items")}, {"remove-ignored", opt_remove_ignored, 0, N_("remove ignored items")}, + {"remove-added", opt_remove_added, 0, + N_("reverting an added item will remove it from disk")}, {"no-newline", opt_no_newline, 0, N_("do not output the trailing newline")}, {"show-passwords", opt_show_passwords, 0, N_("show cached passwords")}, {"pin-externals", opt_pin_externals, 0, @@ -444,6 +447,10 @@ const apr_getopt_option_t svn_cl__options[] = " " " 'repos-uuid' UUID of repository\n" " " + " 'repos-size' for files, the size of TARGET\n" + " " + " in the repository\n" + " " " 'revision' specified or implied revision\n" " " " 'last-changed-revision'\n" @@ -460,7 +467,11 @@ const apr_getopt_option_t svn_cl__options[] = " " " author of 'last-changed-revision'\n" " " - " 'wc-root' root of TARGET's working copy")}, + " 'wc-root' root of TARGET's working copy\n" + " " + " 'schedule' 'normal','add','delete','replace'\n" + " " + " 'depth' checkout depth of TARGET in WC")}, {"adds-as-modification", opt_adds_as_modification, 0, N_("Local additions are merged with incoming additions\n" @@ -474,9 +485,13 @@ const apr_getopt_option_t svn_cl__options[] = {"vacuum-pristines", opt_vacuum_pristines, 0, N_("remove unreferenced pristines from .svn directory")}, - {"list", opt_list, 0, N_("list shelved patches")}, - {"keep-shelved", opt_keep_shelved, 0, N_("do not delete the shelved patch")}, - {"delete", opt_delete, 0, N_("delete the shelved patch")}, + {"drop", opt_drop, 0, + N_("drop shelf after successful unshelve")}, + + {"x-viewspec", opt_viewspec, 1, + N_("print the working copy layout, formatted according\n" + " " + "to ARG: 'classic' or 'svn11'")}, /* Long-opt Aliases * @@ -523,92 +538,118 @@ const int svn_cl__global_options[] = opt_encoding, \ opt_with_revprop -const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = +const svn_opt_subcommand_desc3_t svn_cl__cmd_table[] = { - { "add", svn_cl__add, {0}, N_ - ("Put files and directories under version control, scheduling\n" - "them for addition to repository. They will be added in next commit.\n" - "usage: add PATH...\n"), + { "add", svn_cl__add, {0}, {N_( + "Put new files and directories under version control.\n" + "usage: add PATH...\n" + "\n"), N_( + " Schedule unversioned PATHs for addition, so they will become versioned and\n" + " be added to the repository in the next commit. Recurse into directories by\n" + " default (see the --depth option).\n" + "\n"), N_( + " The 'svn add' command is only necessary for files and directories that are\n" + " not yet under version control. Unversioned files and directories can be\n" + " identified with 'svn status' (see 'svn help status').\n" + "\n"), N_( + " The effects of 'svn add' can be undone with 'svn revert' before the addition\n" + " has been committed. Once committed, a path can be removed from version\n" + " control with 'svn delete', and in some circumstances by running a reverse-\n" + " merge (see 'svn help merge' for details).\n" + "\n"), N_( + " With --force, add all the unversioned paths found in PATHs and ignore the\n" + " rest; otherwise, error out if any specified paths are already versioned.\n" + "\n"), N_( + " The selection of items to add may be influenced by the 'ignores' feature.\n" + " Properties may be attached to the items as configured by the 'auto-props'\n" + " feature.\n" + )}, {opt_targets, 'N', opt_depth, 'q', opt_force, opt_no_ignore, opt_autoprops, opt_no_autoprops, opt_parents }, - {{opt_parents, N_("add intermediate parents")}} }, - - { "auth", svn_cl__auth, {0}, N_ - ("Manage cached authentication credentials.\n" - "usage: 1. svn auth [PATTERN ...]\n" - "usage: 2. svn auth --remove PATTERN [PATTERN ...]\n" - "\n" - " With no arguments, list all cached authentication credentials.\n" - " Authentication credentials include usernames, passwords,\n" - " SSL certificates, and SSL client-certificate passphrases.\n" - " If PATTERN is specified, only list credentials with attributes matching one\n" - " or more patterns. With the --remove option, remove cached authentication\n" - " credentials matching one or more patterns.\n" - "\n" - " If more than one pattern is specified credentials are considered only if they\n" - " match all specified patterns. Patterns are matched case-sensitively and may\n" - " contain glob wildcards:\n" - " ? matches any single character\n" - " * matches a sequence of arbitrary characters\n" - " [abc] matches any of the characters listed inside the brackets\n" - " Note that wildcards will usually need to be quoted or escaped on the\n" - " command line because many command shells will interfere by trying to\n" - " expand them.\n"), + {{opt_parents, N_("add intermediate parents")}, + {'N', N_("obsolete; same as --depth=empty")}, + {opt_force, N_("ignore already versioned paths")}} }, + + { "auth", svn_cl__auth, {0}, {N_( + "Manage cached authentication credentials.\n" + "usage: 1. svn auth [PATTERN ...]\n" + " 2. svn auth --remove PATTERN [PATTERN ...]\n" + "\n"), N_( + " With no arguments, list all cached authentication credentials.\n" + " Authentication credentials include usernames, passwords,\n" + " SSL certificates, and SSL client-certificate passphrases.\n" + " If PATTERN is specified, only list credentials with attributes matching one\n" + " or more patterns. With the --remove option, remove cached authentication\n" + " credentials matching one or more patterns.\n" + "\n"), N_( + " If more than one pattern is specified credentials are considered only if they\n" + " match all specified patterns. Patterns are matched case-sensitively and may\n" + " contain glob wildcards:\n" + " ? matches any single character\n" + " * matches a sequence of arbitrary characters\n" + " [abc] matches any of the characters listed inside the brackets\n" + " Note that wildcards will usually need to be quoted or escaped on the\n" + " command line because many command shells will interfere by trying to\n" + " expand them.\n" + )}, { opt_remove, opt_show_passwords }, { {opt_remove, N_("remove matching authentication credentials")} } }, - { "blame", svn_cl__blame, {"praise", "annotate", "ann"}, N_ - ("Show when each line of a file was last (or\n" + { "blame", svn_cl__blame, {"praise", "annotate", "ann"}, {N_( + "Show when each line of a file was last (or\n" "next) changed.\n" "usage: blame [-rM:N] TARGET[@REV]...\n" - "\n" + "\n"), N_( " Annotate each line of a file with the revision number and author of the\n" " last change (or optionally the next change) to that line.\n" - "\n" + "\n"), N_( " With no revision range (same as -r0:REV), or with '-r M:N' where M < N,\n" " annotate each line that is present in revision N of the file, with\n" " the last revision at or before rN that changed or added the line,\n" " looking back no further than rM.\n" - "\n" + "\n"), N_( " With a reverse revision range '-r M:N' where M > N,\n" " annotate each line that is present in revision N of the file, with\n" " the next revision after rN that changed or deleted the line,\n" " looking forward no further than rM.\n" - "\n" + "\n"), N_( " If specified, REV determines in which revision the target is first\n" " looked up.\n" - "\n" - " Write the annotated result to standard output.\n"), + "\n"), N_( + " Write the annotated result to standard output.\n" + )}, {'r', 'v', 'g', opt_incremental, opt_xml, 'x', opt_force} }, - { "cat", svn_cl__cat, {0}, N_ - ("Output the content of specified files or URLs.\n" + { "cat", svn_cl__cat, {0}, {N_( + "Output the content of specified files or URLs.\n" "usage: cat TARGET[@REV]...\n" - "\n" + "\n"), N_( " If specified, REV determines in which revision the target is first\n" - " looked up.\n"), + " looked up.\n" + )}, {'r', opt_ignore_keywords} }, - { "changelist", svn_cl__changelist, {"cl"}, N_ - ("Associate (or dissociate) changelist CLNAME with the named files.\n" + { "changelist", svn_cl__changelist, {"cl"}, {N_( + "Associate (or dissociate) changelist CLNAME with the named files.\n" "usage: 1. changelist CLNAME PATH...\n" - " 2. changelist --remove PATH...\n"), + " 2. changelist --remove PATH...\n" + )}, { 'q', 'R', opt_depth, opt_remove, opt_targets, opt_changelist} }, - { "checkout", svn_cl__checkout, {"co"}, N_ - ("Check out a working copy from a repository.\n" + { "checkout", svn_cl__checkout, {"co"}, {N_( + "Check out a working copy from a repository.\n" "usage: checkout URL[@REV]... [PATH]\n" - "\n" + "\n"), N_( " If specified, REV determines in which revision the URL is first\n" " looked up.\n" - "\n" + "\n"), N_( " If PATH is omitted, the basename of the URL will be used as\n" " the destination. If multiple URLs are given each will be checked\n" " out into a sub-directory of PATH, with the name of the sub-directory\n" " being the basename of the URL.\n" - "\n" + "\n"), N_( " If --force is used, unversioned obstructing paths in the working\n" " copy destination do not automatically cause the check out to fail.\n" " If the obstructing path is the same type (file or directory) as the\n" @@ -619,62 +660,67 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " obstruction and the repository are treated like a local modification\n" " to the working copy. All properties from the repository are applied\n" " to the obstructing path.\n" - "\n" + "\n"), N_( " See also 'svn help update' for a list of possible characters\n" - " reporting the action taken.\n"), - {'r', 'q', 'N', opt_depth, opt_force, opt_ignore_externals} }, + " reporting the action taken.\n" + )}, + {'r', 'q', 'N', opt_depth, opt_force, opt_ignore_externals}, + {{'N', N_("obsolete; same as --depth=files")}} }, - { "cleanup", svn_cl__cleanup, {0}, N_ - ("Either recover from an interrupted operation that left the working copy locked,\n" + { "cleanup", svn_cl__cleanup, {0}, {N_( + "Either recover from an interrupted operation that left the working copy locked,\n" "or remove unwanted files.\n" "usage: 1. cleanup [WCPATH...]\n" " 2. cleanup --remove-unversioned [WCPATH...]\n" " cleanup --remove-ignored [WCPATH...]\n" " 3. cleanup --vacuum-pristines [WCPATH...]\n" - "\n" + "\n"), N_( " 1. When none of the options --remove-unversioned, --remove-ignored, and\n" " --vacuum-pristines is specified, remove all write locks (shown as 'L' by\n" " the 'svn status' command) from the working copy. Usually, this is only\n" " necessary if a Subversion client has crashed while using the working copy,\n" " leaving it in an unusable state.\n" - "\n" + "\n"), N_( " WARNING: There is no mechanism that will protect write locks still\n" " being used by other Subversion clients. Running this command\n" " without any options while another client is using the working\n" " copy can corrupt the working copy beyond repair!\n" - "\n" + "\n"), N_( " 2. If the --remove-unversioned option or the --remove-ignored option\n" " is given, remove any unversioned or ignored items within WCPATH.\n" " Note that the 'svn status' command shows unversioned items as '?',\n" " and ignored items as 'I' if the --no-ignore option is given to it.\n" - "\n" + "\n"), N_( " 3. If the --vacuum-pristines option is given, remove pristine copies of\n" " files which are stored inside the .svn directory and which are no longer\n" - " referenced by any file in the working copy.\n"), + " referenced by any file in the working copy.\n" + )}, { opt_remove_unversioned, opt_remove_ignored, opt_vacuum_pristines, opt_include_externals, 'q', opt_merge_cmd }, { { opt_merge_cmd, N_("deprecated and ignored") } } }, - { "commit", svn_cl__commit, {"ci"}, - N_("Send changes from your working copy to the repository.\n" - "usage: commit [PATH...]\n" - "\n" - " A log message must be provided, but it can be empty. If it is not\n" - " given by a --message or --file option, an editor will be started.\n" - "\n" - " If any targets are (or contain) locked items, those will be\n" - " unlocked after a successful commit, unless --no-unlock is given.\n" - "\n" - " If --include-externals is given, also commit file and directory\n" - " externals reached by recursion. Do not commit externals with a\n" - " fixed revision.\n"), + { "commit", svn_cl__commit, {"ci"}, {N_( + "Send changes from your working copy to the repository.\n" + "usage: commit [PATH...]\n" + "\n"), N_( + " A log message must be provided, but it can be empty. If it is not\n" + " given by a --message or --file option, an editor will be started.\n" + "\n"), N_( + " If any targets are (or contain) locked items, those will be\n" + " unlocked after a successful commit, unless --no-unlock is given.\n" + "\n"), N_( + " If --include-externals is given, also commit file and directory\n" + " externals reached by recursion. Do not commit externals with a\n" + " fixed revision.\n" + )}, {'q', 'N', opt_depth, opt_targets, opt_no_unlock, SVN_CL__LOG_MSG_OPTIONS, - opt_changelist, opt_keep_changelists, opt_include_externals} }, + opt_changelist, opt_keep_changelists, opt_include_externals}, + {{'N', N_("obsolete; same as --depth=empty")}} }, - { "copy", svn_cl__copy, {"cp"}, N_ - ("Copy files and directories in a working copy or repository.\n" + { "copy", svn_cl__copy, {"cp"}, {N_( + "Copy files and directories in a working copy or repository.\n" "usage: copy SRC[@REV]... DST\n" - "\n" + "\n"), N_( " SRC and DST can each be either a working copy (WC) path or URL:\n" " WC -> WC: copy and schedule for addition (with history)\n" " WC -> URL: immediately commit a copy of WC to URL\n" @@ -683,33 +729,35 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " All the SRCs must be of the same type. If DST is an existing directory,\n" " the sources will be added as children of DST. When copying multiple\n" " sources, DST must be an existing directory.\n" - "\n" + "\n"), N_( " WARNING: For compatibility with previous versions of Subversion,\n" " copies performed using two working copy paths (WC -> WC) will not\n" " contact the repository. As such, they may not, by default, be able\n" " to propagate merge tracking information from the source of the copy\n" - " to the destination.\n"), + " to the destination.\n" + )}, {'r', 'q', opt_ignore_externals, opt_parents, SVN_CL__LOG_MSG_OPTIONS, opt_pin_externals} }, - { "delete", svn_cl__delete, {"del", "remove", "rm"}, N_ - ("Remove files and directories from version control.\n" + { "delete", svn_cl__delete, {"del", "remove", "rm"}, {N_( + "Remove files and directories from version control.\n" "usage: 1. delete PATH...\n" " 2. delete URL...\n" - "\n" + "\n"), N_( " 1. Each item specified by a PATH is scheduled for deletion upon\n" " the next commit. Files, and directories that have not been\n" " committed, are immediately removed from the working copy\n" " unless the --keep-local option is given.\n" " PATHs that are, or contain, unversioned or modified items will\n" " not be removed unless the --force or --keep-local option is given.\n" - "\n" + "\n"), N_( " 2. Each item specified by a URL is deleted from the repository\n" - " via an immediate commit.\n"), + " via an immediate commit.\n" + )}, {opt_force, 'q', opt_targets, SVN_CL__LOG_MSG_OPTIONS, opt_keep_local} }, - { "diff", svn_cl__diff, {"di"}, N_ - ("Display local changes or differences between two revisions or paths.\n" + { "diff", svn_cl__diff, {"di"}, {N_( + "Display local changes or differences between two revisions or paths.\n" "usage: 1. diff\n" " 2. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n" " 3. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] \\\n" @@ -717,16 +765,16 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " 4. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n" " 5. diff OLD-URL[@OLDREV] NEW-PATH[@NEWREV]\n" " 6. diff OLD-PATH[@OLDREV] NEW-URL[@NEWREV]\n" - "\n" + "\n"), N_( " 1. Use just 'svn diff' to display local modifications in a working copy.\n" - "\n" + "\n"), N_( " 2. Display the changes made to TARGETs as they are seen in REV between\n" " two revisions. TARGETs may be all working copy paths or all URLs.\n" " If TARGETs are working copy paths, N defaults to BASE and M to the\n" " working copy; if URLs, N must be specified and M defaults to HEAD.\n" " The '-c M' option is equivalent to '-r N:M' where N = M-1.\n" " Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n" - "\n" + "\n"), N_( " 3. Display the differences between OLD-TGT as it was seen in OLDREV and\n" " NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n" " OLD-TGT and NEW-TGT and restrict the output to differences for those\n" @@ -735,164 +783,178 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n" " If OLDREV or NEWREV are not specified, they default to WORKING for\n" " working copy targets and to HEAD for URL targets.\n" - "\n" + "\n"), N_( " Either or both OLD-TGT and NEW-TGT may also be paths to unversioned\n" " targets. Revisions cannot be specified for unversioned targets.\n" " Both targets must be of the same node kind (file or directory).\n" " Diffing unversioned targets against URL targets is not supported.\n" - "\n" + "\n"), N_( " 4. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n" " 5. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-PATH[@NEWREV]'\n" - " 6. Shorthand for 'svn diff --old=OLD-PATH[@OLDREV] --new=NEW-URL[@NEWREV]'\n"), + " 6. Shorthand for 'svn diff --old=OLD-PATH[@OLDREV] --new=NEW-URL[@NEWREV]'\n" + )}, {'r', 'c', opt_old_cmd, opt_new_cmd, 'N', opt_depth, opt_diff_cmd, opt_internal_diff, 'x', opt_no_diff_added, opt_no_diff_deleted, opt_ignore_properties, opt_properties_only, opt_show_copies_as_adds, opt_notice_ancestry, opt_summarize, opt_changelist, - opt_force, opt_xml, opt_use_git_diff_format, opt_patch_compatible} }, - { "export", svn_cl__export, {0}, N_ - ("Create an unversioned copy of a tree.\n" + opt_force, opt_xml, opt_use_git_diff_format, opt_patch_compatible}, + {{'N', N_("obsolete; same as --depth=files")}} }, + + { "export", svn_cl__export, {0}, {N_( + "Create an unversioned copy of a tree.\n" "usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n" " 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n" - "\n" + "\n"), N_( " 1. Exports a clean directory tree from the repository specified by\n" " URL, at revision REV if it is given, otherwise at HEAD, into\n" " PATH. If PATH is omitted, the last component of the URL is used\n" " for the local directory name.\n" - "\n" + "\n"), N_( " 2. Exports a clean directory tree from the working copy specified by\n" " PATH1, at revision REV if it is given, otherwise at WORKING, into\n" " PATH2. If PATH2 is omitted, the last component of the PATH1 is used\n" " for the local directory name. If REV is not specified, all local\n" " changes will be preserved. Files not under version control will\n" " not be copied.\n" - "\n" + "\n"), N_( " If specified, PEGREV determines in which revision the target is first\n" - " looked up.\n"), + " looked up.\n" + )}, {'r', 'q', 'N', opt_depth, opt_force, opt_native_eol, opt_ignore_externals, - opt_ignore_keywords} }, - - { "help", svn_cl__help, {"?", "h"}, N_ - ("Describe the usage of this program or its subcommands.\n" - "usage: help [SUBCOMMAND...]\n"), - {0} }, + opt_ignore_keywords}, + {{'N', N_("obsolete; same as --depth=files")}} }, + + { "help", svn_cl__help, {"?", "h"}, {N_( + "Describe the usage of this program or its subcommands.\n" + "usage: help [SUBCOMMAND...]\n" + )}, + {'v'}, + {{'v', N_("also show experimental subcommands and options")}} }, /* This command is also invoked if we see option "--help", "-h" or "-?". */ - { "import", svn_cl__import, {0}, N_ - ("Commit an unversioned file or tree into the repository.\n" + { "import", svn_cl__import, {0}, {N_( + "Commit an unversioned file or tree into the repository.\n" "usage: import [PATH] URL\n" - "\n" + "\n"), N_( " Recursively commit a copy of PATH to URL.\n" " If PATH is omitted '.' is assumed.\n" " Parent directories are created as necessary in the repository.\n" " If PATH is a directory, the contents of the directory are added\n" " directly under URL.\n" " Unversionable items such as device files and pipes are ignored\n" - " if --force is specified.\n"), + " if --force is specified.\n" + )}, {'q', 'N', opt_depth, opt_autoprops, opt_force, opt_no_autoprops, - SVN_CL__LOG_MSG_OPTIONS, opt_no_ignore} }, + SVN_CL__LOG_MSG_OPTIONS, opt_no_ignore}, + {{'N', N_("obsolete; same as --depth=files")}} }, - { "info", svn_cl__info, {0}, N_ - ("Display information about a local or remote item.\n" + { "info", svn_cl__info, {0}, {N_( + "Display information about a local or remote item.\n" "usage: info [TARGET[@REV]...]\n" - "\n" + "\n"), N_( " Print information about each TARGET (default: '.').\n" " TARGET may be either a working-copy path or a URL. If specified, REV\n" " determines in which revision the target is first looked up; the default\n" " is HEAD for a URL or BASE for a WC path.\n" - "\n" + "\n"), N_( " With --show-item, print only the value of one item of information\n" - " about TARGET.\n"), - {'r', 'R', opt_depth, opt_targets, opt_incremental, opt_xml, - opt_changelist, opt_include_externals, opt_show_item, opt_no_newline} + " about TARGET.\n" + "\n"), N_( + " EXPERIMENTAL:\n" + " With --x-viewspec, print the working copy layout.\n" + )}, + {'r', 'R', 'H', opt_depth, opt_targets, opt_incremental, opt_xml, + opt_changelist, opt_include_externals, opt_show_item, opt_no_newline, + opt_viewspec}, + {{'H', N_("show file sizes with base-2 unit suffixes\n" + " " + "(Byte, Kilobyte, Megabyte, Gigabyte, Terabyte\n" + " " + "and Petabyte), limiting the number of digits\n" + " " + "to three or less")}} }, { "list", svn_cl__list, {"ls"}, -#if defined(WIN32) - N_ - ("List directory entries in the repository.\n" + {N_( + "List directory entries in the repository.\n" "usage: list [TARGET[@REV]...]\n" - "\n" + "\n"), N_( " List each TARGET file and the contents of each TARGET directory as\n" " they exist in the repository. If TARGET is a working copy path, the\n" " corresponding repository URL will be used. If specified, REV determines\n" " in which revision the target is first looked up.\n" - "\n" + "\n"), N_( " The default TARGET is '.', meaning the repository URL of the current\n" " working directory.\n" - "\n" + "\n"), +#if defined(WIN32) + N_( " Multiple --search patterns may be specified and the output will be\n" " reduced to those paths whose last segment - i.e. the file or directory\n" " name - contains a sub-string matching at least one of these patterns\n" " (Windows only).\n" - "\n" - " With --verbose, the following fields will be shown for each item:\n" - "\n" - " Revision number of the last commit\n" - " Author of the last commit\n" - " If locked, the letter 'O'. (Use 'svn info URL' to see details)\n" - " Size (in bytes)\n" - " Date and time of the last commit\n"), + "\n"), #else - N_ - ("List directory entries in the repository.\n" - "usage: list [TARGET[@REV]...]\n" - "\n" - " List each TARGET file and the contents of each TARGET directory as\n" - " they exist in the repository. If TARGET is a working copy path, the\n" - " corresponding repository URL will be used. If specified, REV determines\n" - " in which revision the target is first looked up.\n" - "\n" - " The default TARGET is '.', meaning the repository URL of the current\n" - " working directory.\n" - "\n" + N_( " Multiple --search patterns may be specified and the output will be\n" " reduced to those paths whose last segment - i.e. the file or directory\n" " name - matches at least one of these patterns.\n" - "\n" + "\n"), +#endif + N_( " With --verbose, the following fields will be shown for each item:\n" - "\n" + "\n"), N_( " Revision number of the last commit\n" " Author of the last commit\n" " If locked, the letter 'O'. (Use 'svn info URL' to see details)\n" " Size (in bytes)\n" - " Date and time of the last commit\n"), -#endif - {'r', 'v', 'R', opt_depth, opt_incremental, opt_xml, - opt_include_externals, opt_search}, }, - - { "lock", svn_cl__lock, {0}, N_ - ("Lock working copy paths or URLs in the repository, so that\n" + " Date and time of the last commit\n" + )}, + {'r', 'v', 'R', 'H', opt_depth, opt_incremental, opt_xml, + opt_include_externals, opt_search}, + {{'H', N_("with --verbose, show file sizes with base-2\n" + " " + "unit suffixes (Byte, Kilobyte, Megabyte,\n" + " " + "Gigabyte, Terabyte and Petabyte), limiting\n" + " " + "the number of digits to three or less")}} }, + + { "lock", svn_cl__lock, {0}, {N_( + "Lock working copy paths or URLs in the repository, so that\n" "no other user can commit changes to them.\n" "usage: lock TARGET...\n" - "\n" - " Use --force to steal a lock from another user or working copy.\n"), + "\n"), N_( + " Use --force to steal a lock from another user or working copy.\n" + )}, { opt_targets, 'm', 'F', opt_force_log, opt_encoding, opt_force, 'q' }, {{'F', N_("read lock comment from file ARG")}, {'m', N_("specify lock comment ARG")}, {opt_force_log, N_("force validity of lock comment source")}, {opt_force, N_("steal locks")}} }, - { "log", svn_cl__log, {0}, N_ - ("Show the log messages for a set of revision(s) and/or path(s).\n" + { "log", svn_cl__log, {0}, {N_( + "Show the log messages for a set of revision(s) and/or path(s).\n" "usage: 1. log [PATH][@REV]\n" " 2. log URL[@REV] [PATH...]\n" - "\n" + "\n"), N_( " 1. Print the log messages for the URL corresponding to PATH\n" " (default: '.'). If specified, REV is the revision in which the\n" " URL is first looked up, and the default revision range is REV:1.\n" " If REV is not specified, the default revision range is BASE:1,\n" " since the URL might not exist in the HEAD revision.\n" - "\n" + "\n"), N_( " 2. Print the log messages for the PATHs (default: '.') under URL.\n" " If specified, REV is the revision in which the URL is first\n" " looked up, and the default revision range is REV:1; otherwise,\n" " the URL is looked up in HEAD, and the default revision range is\n" " HEAD:1.\n" - "\n" + "\n"), N_( " Multiple '-c' or '-r' options may be specified (but not a\n" " combination of '-c' and '-r' options), and mixing of forward and\n" " reverse ranges is allowed.\n" - "\n" + "\n"), N_( " With -v, also print all affected paths with each log message.\n" " Each changed path is preceded with a symbol describing the change:\n" " A: The path was added or copied.\n" @@ -904,18 +966,18 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " If a file or directory was moved from one path to another with 'svn move'\n" " the old path will be listed as deleted and the new path will be listed\n" " as copied from the old path at a prior revision.\n" - "\n" + "\n"), N_( " With -q, don't print the log message body itself (note that this is\n" " compatible with -v).\n" - "\n" + "\n"), N_( " Each log message is printed just once, even if more than one of the\n" " affected paths for that revision were explicitly requested. Logs\n" " follow copy history by default. Use --stop-on-copy to disable this\n" " behavior, which can be useful for determining branchpoints.\n" - "\n" + "\n"), N_( " The --depth option is only valid in combination with the --diff option\n" " and limits the scope of the displayed diff to the specified depth.\n" - "\n" + "\n"), N_( " If the --search option is used, log messages are displayed only if the\n" " provided search pattern matches any of the author, date, log message\n" " text (unless --quiet is used), or, if the --verbose option is also\n" @@ -932,37 +994,42 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " If --limit is used in combination with --search, --limit restricts the\n" " number of log messages searched, rather than restricting the output\n" " to a particular number of matching log messages.\n" - "\n" + "\n"), N_( " Examples:\n" - "\n" + "\n"), N_( " Show the latest 5 log messages for the current working copy\n" " directory and display paths changed in each commit:\n" " svn log -l 5 -v\n" - "\n" + "\n"), N_( " Show the log for bar.c as of revision 42:\n" " svn log bar.c@42\n" - "\n" + "\n"), N_( " Show log messages and diffs for each commit to foo.c:\n" " svn log --diff http://www.example.com/repo/project/foo.c\n" " (Because the above command uses a full URL it does not require\n" " a working copy.)\n" - "\n" + "\n"), N_( " Show log messages for the children foo.c and bar.c of the directory\n" " '/trunk' as it appeared in revision 50, using the ^/ URL shortcut:\n" " svn log ^/trunk@50 foo.c bar.c\n" - "\n" + "\n"), N_( " Show the log messages for any incoming changes to foo.c during the\n" " next 'svn update':\n" " svn log -r BASE:HEAD foo.c\n" - "\n" + "\n"), N_( " Show the log message for the revision in which /branches/foo\n" " was created:\n" " svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo\n" - "\n" + "\n"), N_( + " Show all log messages for commits between the tags ^/tags/2.0 and\n" + " ^/tags/3.0; assuming that tag 2.0 was created in revision 100:\n" + " svn log -rHEAD:100 ^/tags/3.0\n" + "\n"), N_( " If ^/trunk/foo.c was moved to ^/trunk/bar.c' in revision 22, 'svn log -v'\n" " shows a deletion and a copy in its changed paths list, such as:\n" " D /trunk/foo.c\n" - " A /trunk/bar.c (from /trunk/foo.c:21)\n"), + " A /trunk/bar.c (from /trunk/foo.c:21)\n" + )}, {'r', 'c', 'q', 'v', 'g', opt_targets, opt_stop_on_copy, opt_incremental, opt_xml, 'l', opt_with_all_revprops, opt_with_no_revprops, opt_with_revprop, opt_depth, opt_diff, opt_diff_cmd, @@ -972,8 +1039,8 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = {'v', N_("also print all affected paths")}, {'q', N_("do not print the log message")}} }, - { "merge", svn_cl__merge, {0}, N_ - ( /* For this large section, let's keep it unindented for easier + { "merge", svn_cl__merge, {0}, {N_( + /* For this large section, let's keep it unindented for easier * viewing/editing. It has been vim-treated with a textwidth=75 and 'gw' * (with quotes and newlines removed). */ "Merge changes into a working copy.\n" @@ -983,54 +1050,54 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " (the 'cherry-pick' merge)\n" " 3. merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" " (the '2-URL' merge)\n" -"\n" +"\n"), N_( " 1. This form, with one source path and no revision range, is called\n" " a 'complete' merge:\n" -"\n" +"\n"), N_( " svn merge SOURCE[@REV] [TARGET_WCPATH]\n" -"\n" +"\n"), N_( " The complete merge is used for the 'sync' and 'reintegrate' merges\n" " in the 'feature branch' pattern described below. It finds all the\n" " changes on the source branch that have not already been merged to the\n" " target branch, and merges them into the working copy. Merge tracking\n" " is used to know which changes have already been merged.\n" -"\n" +"\n"), N_( " SOURCE specifies the branch from where the changes will be pulled, and\n" " TARGET_WCPATH specifies a working copy of the target branch to which\n" " the changes will be applied. Normally SOURCE and TARGET_WCPATH should\n" " each correspond to the root of a branch. (If you want to merge only a\n" " subtree, then the subtree path must be included in both SOURCE and\n" " TARGET_WCPATH; this is discouraged, to avoid subtree mergeinfo.)\n" -"\n" +"\n"), N_( " SOURCE is usually a URL. The optional '@REV' specifies both the peg\n" " revision of the URL and the latest revision that will be considered\n" " for merging; if REV is not specified, the HEAD revision is assumed. If\n" " SOURCE is a working copy path, the corresponding URL of the path is\n" " used, and the default value of 'REV' is the base revision (usually the\n" " revision last updated to).\n" -"\n" +"\n"), N_( " TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" " assumed. There are some special cases:\n" -"\n" +"\n"), N_( " - If SOURCE is a URL:\n" -"\n" +"\n"), N_( " - If the basename of the URL and the basename of '.' are the\n" " same, then the differences are applied to '.'. Otherwise,\n" " if a file with the same basename as that of the URL is found\n" " within '.', then the differences are applied to that file.\n" " In all other cases, the target defaults to '.'.\n" -"\n" +"\n"), N_( " - If SOURCE is a working copy path:\n" -"\n" +"\n"), N_( " - If the source is a file, then differences are applied to that\n" " file (useful for reverse-merging earlier changes). Otherwise,\n" " if the source is a directory, then the target defaults to '.'.\n" -"\n" +"\n"), N_( " In normal usage the working copy should be up to date, at a single\n" " revision, with no local modifications and no switched subtrees.\n" -"\n" +"\n"), N_( " - The 'Feature Branch' Merging Pattern -\n" -"\n" +"\n"), N_( " In this commonly used work flow, known also as the 'development\n" " branch' pattern, a developer creates a branch and commits a series of\n" " changes that implement a new feature. The developer periodically\n" @@ -1038,17 +1105,17 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " development branch up to date with those changes. When the feature is\n" " complete, the developer performs a merge from the feature branch to\n" " the parent branch to re-integrate the changes.\n" -"\n" +"\n"), N_( " parent --+----------o------o-o-------------o--\n" " \\ \\ \\ /\n" " \\ merge merge merge\n" " \\ \\ \\ /\n" " feature +--o-o-------o----o-o----o-------\n" -"\n" +"\n"), N_( " A merge from the parent branch to the feature branch is called a\n" " 'sync' or 'catch-up' merge, and a merge from the feature branch to the\n" " parent branch is called a 'reintegrate' merge.\n" -"\n" +"\n"), N_( " - Sync Merge Example -\n" " ............\n" " . .\n" @@ -1058,7 +1125,7 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " \\ v\n" " feature +------------------------o-----\n" " r100 r200\n" -"\n" +"\n"), N_( " Subversion will locate all the changes on 'trunk' that have not yet\n" " been merged into the 'feature' branch. In this case that is a single\n" " range, r100:200. In the diagram above, L marks the left side (trunk@100)\n" @@ -1066,162 +1133,162 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " difference between L and R will be applied to the target working copy\n" " path. In this case, the working copy is a clean checkout of the entire\n" " 'feature' branch.\n" -"\n" +"\n"), N_( " To perform this sync merge, have a clean working copy of the feature\n" " branch and run the following command in its top-level directory:\n" -"\n" +"\n"), N_( " svn merge ^/trunk\n" -"\n" +"\n"), N_( " Note that the merge is now only in your local working copy and still\n" " needs to be committed to the repository so that it can be seen by\n" " others. You can review the changes and you may have to resolve\n" " conflicts before you commit the merge.\n" -"\n" +"\n"), N_( " - Reintegrate Merge Example -\n" -"\n" +"\n"), N_( " The feature branch was last synced with trunk up to revision X. So the\n" " difference between trunk@X and feature@HEAD contains the complete set\n" " of changes that implement the feature, and no other changes. These\n" " changes are applied to trunk.\n" -"\n" +"\n"), N_( " rW rX\n" " trunk ------+--------------------L------------------o\n" " \\ . ^\n" " \\ ............. /\n" " \\ . /\n" " feature +--------------------------------R\n" -"\n" +"\n"), N_( " In the diagram above, L marks the left side (trunk@X) and R marks the\n" " right side (feature@HEAD) of the merge. The difference between the\n" " left and right side is merged into trunk, the target.\n" -"\n" +"\n"), N_( " To perform the merge, have a clean working copy of trunk and run the\n" " following command in its top-level directory:\n" -"\n" +"\n"), N_( " svn merge ^/feature\n" -"\n" +"\n"), N_( " To prevent unnecessary merge conflicts, a reintegrate merge requires\n" " that TARGET_WCPATH is not a mixed-revision working copy, has no local\n" " modifications, and has no switched subtrees.\n" -"\n" +"\n"), N_( " A reintegrate merge also requires that the source branch is coherently\n" " synced with the target -- in the above example, this means that all\n" " revisions between the branch point W and the last merged revision X\n" " are merged to the feature branch, so that there are no unmerged\n" " revisions in-between.\n" -"\n" -"\n" +"\n"), N_( +"\n"), N_( " 2. This form is called a 'cherry-pick' merge:\n" -"\n" +"\n"), N_( " svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n" -"\n" +"\n"), N_( " A cherry-pick merge is used to merge specific revisions (or revision\n" " ranges) from one branch to another. By default, this uses merge\n" " tracking to automatically skip any revisions that have already been\n" " merged to the target; you can use the --ignore-ancestry option to\n" " disable such skipping.\n" -"\n" +"\n"), N_( " SOURCE is usually a URL. The optional '@REV' specifies only the peg\n" " revision of the URL and does not affect the merge range; if REV is not\n" " specified, the HEAD revision is assumed. If SOURCE is a working copy\n" " path, the corresponding URL of the path is used, and the default value\n" " of 'REV' is the base revision (usually the revision last updated to).\n" -"\n" +"\n"), N_( " TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" " assumed. The special cases noted above in the 'complete' merge form\n" " also apply here.\n" -"\n" +"\n"), N_( " The revision ranges to be merged are specified by the '-r' and/or '-c'\n" " options. '-r N:M' refers to the difference in the history of the\n" " source branch between revisions N and M. You can use '-c M' to merge\n" " single revisions: '-c M' is equivalent to '-r :M'. Each such\n" " difference is applied to TARGET_WCPATH.\n" -"\n" +"\n"), N_( " If the mergeinfo in TARGET_WCPATH indicates that revisions within the\n" " range were already merged, changes made in those revisions are not\n" " merged again. If needed, the range is broken into multiple sub-ranges,\n" " and each sub-range is merged separately.\n" -"\n" +"\n"), N_( " A 'reverse range' can be used to undo changes. For example, when\n" " source and target refer to the same branch, a previously committed\n" " revision can be 'undone'. In a reverse range, N is greater than M in\n" " '-r N:M', or the '-c' option is used with a negative number: '-c -M'\n" " is equivalent to '-r M:'. Undoing changes like this is also known\n" " as performing a 'reverse merge'.\n" -"\n" +"\n"), N_( " Multiple '-c' and/or '-r' options may be specified and mixing of\n" " forward and reverse ranges is allowed.\n" -"\n" +"\n"), N_( " - Cherry-pick Merge Example -\n" -"\n" +"\n"), N_( " A bug has been fixed on trunk in revision 50. This fix needs to\n" " be merged from trunk onto the release branch.\n" -"\n" +"\n"), N_( " 1.x-release +-----------------------o-----\n" " / ^\n" " / |\n" " / |\n" " trunk ------+--------------------------LR-----\n" " r50\n" -"\n" +"\n"), N_( " In the above diagram, L marks the left side (trunk@49) and R marks the\n" " right side (trunk@50) of the merge. The difference between the left\n" " and right side is applied to the target working copy path.\n" -"\n" +"\n"), N_( " Note that the difference between revision 49 and 50 is exactly those\n" " changes that were committed in revision 50, not including changes\n" " committed in revision 49.\n" -"\n" +"\n"), N_( " To perform the merge, have a clean working copy of the release branch\n" " and run the following command in its top-level directory; remember\n" " that the default target is '.':\n" -"\n" +"\n"), N_( " svn merge -c50 ^/trunk\n" -"\n" +"\n"), N_( " You can also cherry-pick several revisions and/or revision ranges:\n" -"\n" +"\n"), N_( " svn merge -c50,54,60 -r65:68 ^/trunk\n" -"\n" -"\n" +"\n"), N_( +"\n"), N_( " 3. This form is called a '2-URL merge':\n" -"\n" +"\n"), N_( " svn merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" -"\n" +"\n"), N_( " You should use this merge variant only if the other variants do not\n" " apply to your situation, as this variant can be quite complex to\n" " master.\n" -"\n" +"\n"), N_( " Two source URLs are specified, identifying two trees on the same\n" " branch or on different branches. The trees are compared and the\n" " difference from SOURCE1@REV1 to SOURCE2@REV2 is applied to the\n" " working copy of the target branch at TARGET_WCPATH. The target\n" " branch may be the same as one or both sources, or different again.\n" " The three branches involved can be completely unrelated.\n" -"\n" +"\n"), N_( " TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" " assumed. The special cases noted above in the 'complete' merge form\n" " also apply here.\n" -"\n" +"\n"), N_( " SOURCE1 and/or SOURCE2 can also be specified as a working copy path,\n" " in which case the merge source URL is derived from the working copy.\n" -"\n" +"\n"), N_( " - 2-URL Merge Example -\n" -"\n" +"\n"), N_( " Two features have been developed on separate branches called 'foo' and\n" " 'bar'. It has since become clear that 'bar' should be combined with\n" " the 'foo' branch for further development before reintegration.\n" -"\n" +"\n"), N_( " Although both feature branches originate from trunk, they are not\n" " directly related -- one is not a direct copy of the other. A 2-URL\n" " merge is necessary.\n" -"\n" +"\n"), N_( " The 'bar' branch has been synced with trunk up to revision 500.\n" " (If this revision number is not known, it can be located using the\n" " 'svn log' and/or 'svn mergeinfo' commands.)\n" " The difference between trunk@500 and bar@HEAD contains the complete\n" " set of changes related to feature 'bar', and no other changes. These\n" " changes are applied to the 'foo' branch.\n" -"\n" +"\n"), N_( " foo +-----------------------------------o\n" " / ^\n" " / /\n" @@ -1231,41 +1298,41 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " \\ ............ /\n" " \\ . /\n" " bar +-----------------------------------R\n" -"\n" +"\n"), N_( " In the diagram above, L marks the left side (trunk@500) and R marks\n" " the right side (bar@HEAD) of the merge. The difference between the\n" " left and right side is applied to the target working copy path, in\n" " this case a working copy of the 'foo' branch.\n" -"\n" +"\n"), N_( " To perform the merge, have a clean working copy of the 'foo' branch\n" " and run the following command in its top-level directory:\n" -"\n" +"\n"), N_( " svn merge ^/trunk@500 ^/bar\n" -"\n" +"\n"), N_( " The exact changes applied by a 2-URL merge can be previewed with svn's\n" " diff command, which is a good idea to verify if you do not have the\n" " luxury of a clean working copy to merge to. In this case:\n" -"\n" +"\n"), N_( " svn diff ^/trunk@500 ^/bar@HEAD\n" -"\n" -"\n" +"\n"), N_( +"\n"), N_( " The following applies to all types of merges:\n" -"\n" +"\n"), N_( " To prevent unnecessary merge conflicts, svn merge requires that\n" " TARGET_WCPATH is not a mixed-revision working copy. Running 'svn update'\n" " before starting a merge ensures that all items in the working copy are\n" " based on the same revision.\n" -"\n" +"\n"), N_( " If possible, you should have no local modifications in the merge's target\n" " working copy prior to the merge, to keep things simpler. It will be\n" " easier to revert the merge and to understand the branch's history.\n" -"\n" +"\n"), N_( " Switched sub-paths should also be avoided during merging, as they may\n" " cause incomplete merges and create subtree mergeinfo.\n" -"\n" +"\n"), N_( " For each merged item a line will be printed with characters reporting the\n" " action taken. These characters have the following meaning:\n" -"\n" +"\n"), N_( " A Added\n" " D Deleted\n" " U Updated\n" @@ -1273,15 +1340,15 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " G Merged\n" " E Existed\n" " R Replaced\n" -"\n" +"\n"), N_( " Characters in the first column report about the item itself.\n" " Characters in the second column report about properties of the item.\n" " A 'C' in the third column indicates a tree conflict, while a 'C' in\n" " the first and second columns indicate textual conflicts in files\n" " and in property values, respectively.\n" -"\n" +"\n"), N_( " - Merge Tracking -\n" -"\n" +"\n"), N_( " Subversion uses the svn:mergeinfo property to track merge history. This\n" " property is considered at the start of a merge to determine what to merge\n" " and it is updated at the conclusion of the merge to describe the merge\n" @@ -1290,78 +1357,82 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " or vice-versa (i.e. if one has originally been created by copying the\n" " other). This is verified and enforced when using sync merges and\n" " reintegrate merges.\n" -"\n" +"\n"), N_( " The --ignore-ancestry option prevents merge tracking and thus ignores\n" " mergeinfo, neither considering it nor recording it.\n" -"\n" +"\n"), N_( " - Merging from foreign repositories -\n" -"\n" +"\n"), N_( " Subversion does support merging from foreign repositories.\n" " While all merge source URLs must point to the same repository, the merge\n" " target working copy may come from a different repository than the source.\n" " However, there are some caveats. Most notably, copies made in the\n" " merge source will be transformed into plain additions in the merge\n" " target. Also, merge-tracking is not supported for merges from foreign\n" -" repositories.\n"), +" repositories.\n" + )}, {'r', 'c', 'N', opt_depth, 'q', opt_force, opt_dry_run, opt_merge_cmd, opt_record_only, 'x', opt_ignore_ancestry, opt_accept, opt_reintegrate, opt_allow_mixed_revisions, 'v'}, - { { opt_force, N_("force deletions even if deleted contents don't match") } } + { { opt_force, N_("force deletions even if deleted contents don't match") }, + {'N', N_("obsolete; same as --depth=files")} } }, - { "mergeinfo", svn_cl__mergeinfo, {0}, N_ - ("Display merge-related information.\n" + { "mergeinfo", svn_cl__mergeinfo, {0}, {N_( + "Display merge-related information.\n" "usage: 1. mergeinfo SOURCE[@REV] [TARGET[@REV]]\n" " 2. mergeinfo --show-revs=WHICH SOURCE[@REV] [TARGET[@REV]]\n" - "\n" + "\n"), N_( " 1. Summarize the history of merging between SOURCE and TARGET. The graph\n" " shows, from left to right:\n" " the youngest common ancestor of the branches;\n" " the latest full merge in either direction, and thus the common base\n" " that will be used for the next complete merge;\n" " the repository path and revision number of the tip of each branch.\n" - "\n" + "\n"), N_( " 2. Print the revision numbers on SOURCE that have been merged to TARGET\n" " (with --show-revs=merged), or that have not been merged to TARGET\n" " (with --show-revs=eligible). Print only revisions in which there was\n" " at least one change in SOURCE.\n" - "\n" + "\n"), N_( " If --revision (-r) is provided, filter the displayed information to\n" " show only that which is associated with the revisions within the\n" " specified range. Revision numbers, dates, and the 'HEAD' keyword are\n" " valid range values.\n" - "\n" + "\n"), N_( " SOURCE and TARGET are the source and target branch URLs, respectively.\n" " (If a WC path is given, the corresponding base URL is used.) The default\n" " TARGET is the current working directory ('.'). REV specifies the revision\n" " to be considered the tip of the branch; the default for SOURCE is HEAD,\n" " and the default for TARGET is HEAD for a URL or BASE for a WC path.\n" - "\n" - " The depth can be 'empty' or 'infinity'; the default is 'empty'.\n"), + "\n"), N_( + " The depth can be 'empty' or 'infinity'; the default is 'empty'.\n" + )}, {'r', 'R', 'q', 'v', opt_depth, opt_show_revs, opt_mergeinfo_log, opt_incremental } }, - { "mkdir", svn_cl__mkdir, {0}, N_ - ("Create a new directory under version control.\n" + { "mkdir", svn_cl__mkdir, {0}, {N_( + "Create a new directory under version control.\n" "usage: 1. mkdir PATH...\n" " 2. mkdir URL...\n" - "\n" + "\n"), N_( " Create version controlled directories.\n" - "\n" + "\n"), N_( " 1. Each directory specified by a working copy PATH is created locally\n" " and scheduled for addition upon the next commit.\n" - "\n" + "\n"), N_( " 2. Each directory specified by a URL is created in the repository via\n" " an immediate commit.\n" - "\n" + "\n"), N_( " In both cases, all the intermediate directories must already exist,\n" - " unless the --parents option is given.\n"), + " unless the --parents option is given.\n" + )}, {'q', opt_parents, SVN_CL__LOG_MSG_OPTIONS} }, - { "move", svn_cl__move, {"mv", "rename", "ren"}, N_ - ("Move (rename) an item in a working copy or repository.\n" + { "move", svn_cl__move, {"mv", "rename", "ren"}, {N_( + "Move (rename) an item in a working copy or repository.\n" "usage: move SRC... DST\n" - "\n" + "\n"), N_( " SRC and DST can both be working copy (WC) paths or URLs:\n" " WC -> WC: move an item in a working copy, as a local change to\n" " be committed later (with or without further changes)\n" @@ -1370,28 +1441,29 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " All the SRCs must be of the same type. If DST is an existing directory,\n" " the sources will be added as children of DST. When moving multiple\n" " sources, DST must be an existing directory.\n" - "\n" + "\n"), N_( " SRC and DST of WC -> WC moves must be committed in the same revision.\n" " Furthermore, WC -> WC moves will refuse to move a mixed-revision subtree.\n" " To avoid unnecessary conflicts, it is recommended to run 'svn update'\n" " to update the subtree to a single revision before moving it.\n" - " The --allow-mixed-revisions option is provided for backward compatibility.\n"), + " The --allow-mixed-revisions option is provided for backward compatibility.\n" + )}, {'q', opt_force, opt_parents, opt_allow_mixed_revisions, SVN_CL__LOG_MSG_OPTIONS, 'r'}, {{'r', "deprecated and ignored"}} }, - { "patch", svn_cl__patch, {0}, N_ - ("Apply a patch to a working copy.\n" + { "patch", svn_cl__patch, {0}, {N_( + "Apply a patch to a working copy.\n" "usage: patch PATCHFILE [WCPATH]\n" - "\n" + "\n"), N_( " Apply a unidiff patch in PATCHFILE to the working copy WCPATH.\n" " If WCPATH is omitted, '.' is assumed.\n" - "\n" + "\n"), N_( " A unidiff patch suitable for application to a working copy can be\n" " produced with the 'svn diff' command or third-party diffing tools.\n" " Any non-unidiff content of PATCHFILE is ignored, except for Subversion\n" " property diffs as produced by 'svn diff'.\n" - "\n" + "\n"), N_( " Changes listed in the patch will either be applied or rejected.\n" " If a change does not match at its exact line offset, it may be applied\n" " earlier or later in the file if a match is found elsewhere for the\n" @@ -1400,114 +1472,118 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " or more lines of context are ignored when matching the change.\n" " If no matching context can be found for a change, the change conflicts\n" " and will be written to a reject file with the extension .svnpatch.rej.\n" - "\n" + "\n"), N_( " For each patched file a line will be printed with characters reporting\n" " the action taken. These characters have the following meaning:\n" - "\n" + "\n"), N_( " A Added\n" " D Deleted\n" " U Updated\n" " C Conflict\n" " G Merged (with local uncommitted changes)\n" - "\n" + "\n"), N_( " Changes applied with an offset or fuzz are reported on lines starting\n" " with the '>' symbol. You should review such changes carefully.\n" - "\n" + "\n"), N_( " If the patch removes all content from a file, that file is scheduled\n" " for deletion. If the patch creates a new file, that file is scheduled\n" " for addition. Use 'svn revert' to undo deletions and additions you\n" " do not agree with.\n" - "\n" + "\n"), N_( " Hint: If the patch file was created with Subversion, it will contain\n" " the number of a revision N the patch will cleanly apply to\n" " (look for lines like '--- foo/bar.txt (revision N)').\n" " To avoid rejects, first update to the revision N using\n" " 'svn update -r N', apply the patch, and then update back to the\n" " HEAD revision. This way, conflicts can be resolved interactively.\n" - ), + )}, {'q', opt_dry_run, opt_strip, opt_reverse_diff, opt_ignore_whitespace} }, - { "propdel", svn_cl__propdel, {"pdel", "pd"}, N_ - ("Remove a property from files, dirs, or revisions.\n" + { "propdel", svn_cl__propdel, {"pdel", "pd"}, {N_( + "Remove a property from files, dirs, or revisions.\n" "usage: 1. propdel PROPNAME [PATH...]\n" " 2. propdel PROPNAME --revprop -r REV [TARGET]\n" - "\n" + "\n"), N_( " 1. Removes versioned props in working copy.\n" " 2. Removes unversioned remote prop on repos revision.\n" " TARGET only determines which repository to access.\n" - "\n" - " See 'svn help propset' for descriptions of the svn:* special properties.\n"), + "\n"), N_( + " See 'svn help propset' for descriptions of the svn:* special properties.\n" + )}, {'q', 'R', opt_depth, 'r', opt_revprop, opt_changelist} }, - { "propedit", svn_cl__propedit, {"pedit", "pe"}, N_ - ("Edit a property with an external editor.\n" + { "propedit", svn_cl__propedit, {"pedit", "pe"}, {N_( + "Edit a property with an external editor.\n" "usage: 1. propedit PROPNAME TARGET...\n" " 2. propedit PROPNAME --revprop -r REV [TARGET]\n" - "\n" + "\n"), N_( " 1. Edits versioned prop in working copy or repository.\n" " 2. Edits unversioned remote prop on repos revision.\n" " TARGET only determines which repository to access.\n" - "\n" - " See 'svn help propset' for descriptions of the svn:* special properties.\n"), + "\n"), N_( + " See 'svn help propset' for descriptions of the svn:* special properties.\n" + )}, {'r', opt_revprop, SVN_CL__LOG_MSG_OPTIONS, opt_force} }, - { "propget", svn_cl__propget, {"pget", "pg"}, N_ - ("Print the value of a property on files, dirs, or revisions.\n" + { "propget", svn_cl__propget, {"pget", "pg"}, {N_( + "Print the value of a property on files, dirs, or revisions.\n" "usage: 1. propget PROPNAME [TARGET[@REV]...]\n" " 2. propget PROPNAME --revprop -r REV [TARGET]\n" - "\n" + "\n"), N_( " 1. Prints versioned props. If specified, REV determines in which\n" " revision the target is first looked up.\n" " 2. Prints unversioned remote prop on repos revision.\n" " TARGET only determines which repository to access.\n" - "\n" + "\n"), N_( " With --verbose, the target path and the property name are printed on\n" " separate lines before each value, like 'svn proplist --verbose'.\n" " Otherwise, if there is more than one TARGET or a depth other than\n" " 'empty', the target path is printed on the same line before each value.\n" - "\n" + "\n"), N_( " By default, an extra newline is printed after the property value so that\n" " the output looks pretty. With a single TARGET, depth 'empty' and without\n" " --show-inherited-props, you can use the --no-newline option to disable this\n" " (useful when redirecting a binary property value to a file, for example).\n" - "\n" - " See 'svn help propset' for descriptions of the svn:* special properties.\n"), + "\n"), N_( + " See 'svn help propset' for descriptions of the svn:* special properties.\n" + )}, {'v', 'R', opt_depth, 'r', opt_revprop, opt_strict, opt_no_newline, opt_xml, opt_changelist, opt_show_inherited_props }, {{'v', N_("print path, name and value on separate lines")}, {opt_strict, N_("(deprecated; use --no-newline)")}} }, - { "proplist", svn_cl__proplist, {"plist", "pl"}, N_ - ("List all properties on files, dirs, or revisions.\n" + { "proplist", svn_cl__proplist, {"plist", "pl"}, {N_( + "List all properties on files, dirs, or revisions.\n" "usage: 1. proplist [TARGET[@REV]...]\n" " 2. proplist --revprop -r REV [TARGET]\n" - "\n" + "\n"), N_( " 1. Lists versioned props. If specified, REV determines in which\n" " revision the target is first looked up.\n" " 2. Lists unversioned remote props on repos revision.\n" " TARGET only determines which repository to access.\n" - "\n" + "\n"), N_( " With --verbose, the property values are printed as well, like 'svn propget\n" " --verbose'. With --quiet, the paths are not printed.\n" - "\n" - " See 'svn help propset' for descriptions of the svn:* special properties.\n"), + "\n"), N_( + " See 'svn help propset' for descriptions of the svn:* special properties.\n" + )}, {'v', 'R', opt_depth, 'r', 'q', opt_revprop, opt_xml, opt_changelist, opt_show_inherited_props }, {{'v', N_("print path, name and value on separate lines")}, {'q', N_("don't print the path")}} }, - { "propset", svn_cl__propset, {"pset", "ps"}, N_ - ("Set the value of a property on files, dirs, or revisions.\n" + { "propset", svn_cl__propset, {"pset", "ps"}, {N_( + "Set the value of a property on files, dirs, or revisions.\n" "usage: 1. propset PROPNAME PROPVAL PATH...\n" " 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n" - "\n" + "\n"), N_( " 1. Changes a versioned file or directory property in a working copy.\n" " 2. Changes an unversioned property on a repository revision.\n" " (TARGET only determines which repository to access.)\n" - "\n" + "\n"), N_( " The value may be provided with the --file option instead of PROPVAL.\n" - "\n" + "\n"), N_( " Property names starting with 'svn:' are reserved. Subversion recognizes\n" " the following special versioned properties on a file:\n" " svn:keywords - Keywords to be expanded. Valid keywords are:\n" @@ -1518,7 +1594,7 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " LastChangedRevision\n" " Id - A compressed summary of the previous four.\n" " Header - Similar to Id but includes the full URL.\n" - "\n" + "\n"), N_( " Custom keywords can be defined with a format string separated from\n" " the keyword name with '='. Valid format substitutions are:\n" " %a - The author of the revision given by %r.\n" @@ -1536,7 +1612,7 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " Example custom keyword definition: MyKeyword=%r%_%a%_%P\n" " Once a custom keyword has been defined for a file, it can be used\n" " within the file like any other keyword: $MyKeyword$\n" - "\n" + "\n"), N_( " svn:executable - If present, make the file executable. Use\n" " 'svn propdel svn:executable PATH...' to clear.\n" " svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n" @@ -1548,7 +1624,7 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " before it is modified. Makes the working copy file read-only\n" " when it is not locked. Use 'svn propdel svn:needs-lock PATH...'\n" " to clear.\n" - "\n" + "\n"), N_( " Subversion recognizes the following special versioned properties on a\n" " directory:\n" " svn:ignore - A list of file glob patterns to ignore, one per line.\n" @@ -1582,51 +1658,53 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " LOCALPATH [-r PEG] URL\n" " The ambiguous format 'relative_path relative_path' is taken as\n" " 'relative_url relative_path' with peg revision support.\n" - " Lines starting with a '#' character are ignored.\n"), + " Lines starting with a '#' character are ignored.\n" + )}, {'F', opt_encoding, 'q', 'r', opt_targets, 'R', opt_depth, opt_revprop, opt_force, opt_changelist }, {{'F', N_("read property value from file ARG")}} }, - { "relocate", svn_cl__relocate, {0}, N_ - ("Relocate the working copy to point to a different repository root URL.\n" + { "relocate", svn_cl__relocate, {0}, {N_( + "Relocate the working copy to point to a different repository root URL.\n" "usage: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n" " 2. relocate TO-URL [PATH]\n" - "\n" + "\n"), N_( " Rewrite working copy URL metadata to reflect a syntactic change only.\n" " This is used when a repository's root URL changes (such as a scheme\n" " or hostname change) but your working copy still reflects the same\n" " directory within the same repository.\n" - "\n" + "\n"), N_( " 1. FROM-PREFIX and TO-PREFIX are initial substrings of the working\n" " copy's current and new URLs, respectively. (You may specify the\n" " complete old and new URLs if you wish.) Use 'svn info' to determine\n" " the current working copy URL.\n" - "\n" + "\n"), N_( " 2. TO-URL is the (complete) new repository URL to use for PATH.\n" - "\n" + "\n"), N_( " Examples:\n" " svn relocate http:// svn:// project1 project2\n" " svn relocate http://www.example.com/repo/project \\\n" - " svn://svn.example.com/repo/project\n"), + " svn://svn.example.com/repo/project\n" + )}, {opt_ignore_externals} }, - { "resolve", svn_cl__resolve, {0}, N_ - ("Resolve conflicts on working copy files or directories.\n" + { "resolve", svn_cl__resolve, {0}, {N_( + "Resolve conflicts on working copy files or directories.\n" "usage: resolve [PATH...]\n" - "\n" + "\n"), N_( " By default, perform interactive conflict resolution on PATH.\n" " In this mode, the command is recursive by default (depth 'infinity').\n" - "\n" + "\n"), N_( " The --accept=ARG option prevents interactive prompting and forces\n" " conflicts on PATH to be resolved in the manner specified by ARG.\n" " In this mode, the command is not recursive by default (depth 'empty').\n" - "\n" + "\n"), N_( " A conflicted path cannot be committed with 'svn commit' until it\n" " has been marked as resolved with 'svn resolve'.\n" - "\n" + "\n"), N_( " Subversion knows three types of conflicts:\n" " Text conflicts, Property conflicts, and Tree conflicts.\n" - "\n" + "\n"), N_( " Text conflicts occur when overlapping changes to file contents were\n" " made. Text conflicts are usually resolved by editing the conflicted\n" " file or by using a merge tool (which may be an external program).\n" @@ -1634,12 +1712,12 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " edit files (such as 'mine-full' or 'theirs-conflict'), but these are\n" " only useful in situations where it is acceptable to discard local or\n" " incoming changes altogether.\n" - "\n" + "\n"), N_( " Property conflicts are usually resolved by editing the value of the\n" " conflicted property (either from the interactive prompt, or with\n" " 'svn propedit'). As with text conflicts, options exist to edit a\n" " property automatically, discarding some changes in favour of others.\n" - "\n" + "\n"), N_( " Tree conflicts occur when a change to the directory structure was\n" " made, and when this change cannot be applied to the working copy\n" " without affecting other changes (text changes, property changes,\n" @@ -1649,7 +1727,7 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " in detail, and may offer options to resolve the conflict automatically.\n" " It is recommended to use these automatic options whenever possible,\n" " rather than attempting manual tree conflict resolution.\n" - "\n" + "\n"), N_( " If a tree conflict cannot be resolved automatically, it is recommended\n" " to figure out why the conflict occurred before attempting to resolve it.\n" " The 'svn log -v' command can be used to inspect structural changes\n" @@ -1660,7 +1738,8 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " in a way such that the conflict is resolved. This may involve editing\n" " files manually or with 'svn merge'. It may be necessary to discard some\n" " local changes with 'svn revert'. Files or directories might have to be\n" - " copied, deleted, or moved.\n"), + " copied, deleted, or moved.\n" + )}, {opt_targets, 'R', opt_depth, 'q', opt_accept}, {{opt_accept, N_("specify automatic conflict resolution source\n" " " @@ -1668,37 +1747,40 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " " "'theirs-conflict', 'mine-full', 'theirs-full')")}} }, - { "resolved", svn_cl__resolved, {0}, N_ - ("Remove 'conflicted' state on working copy files or directories.\n" + { "resolved", svn_cl__resolved, {0}, {N_( + "Remove 'conflicted' state on working copy files or directories.\n" "usage: resolved PATH...\n" - "\n" + "\n"), N_( " Note: this subcommand does not semantically resolve conflicts or\n" " remove conflict markers; it merely removes the conflict-related\n" " artifact files and allows PATH to be committed again. It has been\n" - " deprecated in favor of running 'svn resolve --accept working'.\n"), + " deprecated in favor of running 'svn resolve --accept working'.\n" + )}, {opt_targets, 'R', opt_depth, 'q'} }, - { "revert", svn_cl__revert, {0}, N_ - ("Restore pristine working copy state (undo local changes).\n" + { "revert", svn_cl__revert, {0}, {N_( + "Restore pristine working copy state (undo local changes).\n" "usage: revert PATH...\n" - "\n" + "\n"), N_( " Revert changes in the working copy at or within PATH, and remove\n" " conflict markers as well, if any.\n" - "\n" + "\n"), N_( " This subcommand does not revert already committed changes.\n" " For information about undoing already committed changes, search\n" - " the output of 'svn help merge' for 'undo'.\n"), - {opt_targets, 'R', opt_depth, 'q', opt_changelist} }, + " the output of 'svn help merge' for 'undo'.\n" + )}, + {opt_targets, 'R', opt_depth, 'q', opt_changelist, + opt_remove_added} }, - { "status", svn_cl__status, {"stat", "st"}, N_ - ("Print the status of working copy files and directories.\n" + { "status", svn_cl__status, {"stat", "st"}, {N_( + "Print the status of working copy files and directories.\n" "usage: status [PATH...]\n" - "\n" + "\n"), N_( " With no args, print only locally modified items (no network access).\n" " With -q, print only summary information about locally modified items.\n" " With -u, add working revision and server out-of-date information.\n" " With -v, print full revision information on every item.\n" - "\n" + "\n"), N_( " The first seven columns in the output are each one character wide:\n" " First column: Says if item was added, deleted, or otherwise changed\n" " ' ' no modifications\n" @@ -1742,61 +1824,63 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " 'C' tree-Conflicted\n" " If the item is a tree conflict victim, an additional line is printed\n" " after the item's status line, explaining the nature of the conflict.\n" - "\n" + "\n"), N_( " The out-of-date information appears in the ninth column (with -u):\n" " '*' a newer revision exists on the server\n" " ' ' the working copy is up to date\n" - "\n" + "\n"), N_( " Remaining fields are variable width and delimited by spaces:\n" " The working revision (with -u or -v; '-' if the item is copied)\n" " The last committed revision and last committed author (with -v)\n" " The working copy path is always the final field, so it can\n" " include spaces.\n" - "\n" + "\n"), N_( " The presence of a question mark ('?') where a working revision, last\n" " committed revision, or last committed author was expected indicates\n" " that the information is unknown or irrelevant given the state of the\n" " item (for example, when the item is the result of a copy operation).\n" " The question mark serves as a visual placeholder to facilitate parsing.\n" - "\n" + "\n"), N_( " Example output:\n" " svn status wc\n" " M wc/bar.c\n" " A + wc/qax.c\n" - "\n" + "\n"), N_( " svn status -u wc\n" " M 965 wc/bar.c\n" " * 965 wc/foo.c\n" " A + - wc/qax.c\n" " Status against revision: 981\n" - "\n" + "\n"), N_( " svn status --show-updates --verbose wc\n" " M 965 938 kfogel wc/bar.c\n" " * 965 922 sussman wc/foo.c\n" " A + - 687 joe wc/qax.c\n" " 965 687 joe wc/zig.c\n" " Status against revision: 981\n" - "\n" + "\n"), N_( " svn status\n" " M wc/bar.c\n" " ! C wc/qaz.c\n" " > local missing, incoming edit upon update\n" - " D wc/qax.c\n"), + " D wc/qax.c\n" + )}, { 'u', 'v', 'N', opt_depth, 'r', 'q', opt_no_ignore, opt_incremental, opt_xml, opt_ignore_externals, opt_changelist}, - {{'q', N_("don't print unversioned items")}} }, + {{'q', N_("don't print unversioned items")}, + {'N', N_("obsolete; same as --depth=immediates")}} }, - { "switch", svn_cl__switch, {"sw"}, N_ - ("Update the working copy to a different URL within the same repository.\n" + { "switch", svn_cl__switch, {"sw"}, {N_( + "Update the working copy to a different URL within the same repository.\n" "usage: 1. switch URL[@PEGREV] [PATH]\n" " 2. switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n" - "\n" + "\n"), N_( " 1. Update the working copy to mirror a new URL within the repository.\n" " This behavior is similar to 'svn update', and is the way to\n" " move a working copy to a branch or tag within the same repository.\n" " If specified, PEGREV determines in which revision the target is first\n" " looked up.\n" - "\n" + "\n"), N_( " If --force is used, unversioned obstructing paths in the working\n" " copy do not automatically cause a failure if the switch attempts to\n" " add the same path. If the obstructing path is the same type (file\n" @@ -1807,25 +1891,26 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " between the obstruction and the repository are treated like a local\n" " modification to the working copy. All properties from the repository\n" " are applied to the obstructing path.\n" - "\n" + "\n"), N_( " Use the --set-depth option to set a new working copy depth on the\n" " targets of this operation.\n" - "\n" + "\n"), N_( " By default, Subversion will refuse to switch a working copy path to\n" " a new URL with which it shares no common version control ancestry.\n" " Use the '--ignore-ancestry' option to override this sanity check.\n" - "\n" + "\n"), N_( " 2. The '--relocate' option is deprecated. This syntax is equivalent to\n" " 'svn relocate FROM-PREFIX TO-PREFIX [PATH]'.\n" - "\n" + "\n"), N_( " See also 'svn help update' for a list of possible characters\n" " reporting the action taken.\n" - "\n" + "\n"), N_( " Examples:\n" " svn switch ^/branches/1.x-release\n" " svn switch --relocate http:// svn://\n" " svn switch --relocate http://www.example.com/repo/project \\\n" - " svn://svn.example.com/repo/project\n"), + " svn://svn.example.com/repo/project\n" + )}, { 'r', 'N', opt_depth, opt_set_depth, 'q', opt_merge_cmd, opt_ignore_externals, opt_ignore_ancestry, opt_force, opt_accept, opt_relocate }, @@ -1833,27 +1918,29 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = N_("allow switching to a node with no common ancestor")}, {opt_force, N_("handle unversioned obstructions as changes")}, - {opt_relocate,N_("deprecated; use 'svn relocate'")}} + {opt_relocate, N_("deprecated; use 'svn relocate'")}, + {'N', N_("obsolete; same as --depth=files")}} }, - { "unlock", svn_cl__unlock, {0}, N_ - ("Unlock working copy paths or URLs.\n" + { "unlock", svn_cl__unlock, {0}, {N_( + "Unlock working copy paths or URLs.\n" "usage: unlock TARGET...\n" - "\n" - " Use --force to break a lock held by another user or working copy.\n"), + "\n"), N_( + " Use --force to break a lock held by another user or working copy.\n" + )}, { opt_targets, opt_force, 'q' }, {{opt_force, N_("break locks")}} }, - { "update", svn_cl__update, {"up"}, N_ - ("Bring changes from the repository into the working copy.\n" + { "update", svn_cl__update, {"up"}, {N_( + "Bring changes from the repository into the working copy.\n" "usage: update [PATH...]\n" - "\n" + "\n"), N_( " If no revision is given, bring working copy up-to-date with HEAD rev.\n" " Else synchronize working copy to revision given by -r.\n" - "\n" + "\n"), N_( " For each updated item a line will be printed with characters reporting\n" " the action taken. These characters have the following meaning:\n" - "\n" + "\n"), N_( " A Added\n" " D Deleted\n" " U Updated\n" @@ -1861,7 +1948,7 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " G Merged\n" " E Existed\n" " R Replaced\n" - "\n" + "\n"), N_( " Characters in the first column report about the item itself.\n" " Characters in the second column report about properties of the item.\n" " A 'B' in the third column signifies that the lock for the file has\n" @@ -1869,7 +1956,7 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " A 'C' in the fourth column indicates a tree conflict, while a 'C' in\n" " the first and second columns indicate textual conflicts in files\n" " and in property values, respectively.\n" - "\n" + "\n"), N_( " If --force is used, unversioned obstructing paths in the working\n" " copy do not automatically cause a failure if the update attempts to\n" " add the same path. If the obstructing path is the same type (file\n" @@ -1881,97 +1968,190 @@ const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = " modification to the working copy. All properties from the repository\n" " are applied to the obstructing path. Obstructing paths are reported\n" " in the first column with code 'E'.\n" - "\n" + "\n"), N_( " If the specified update target is missing from the working copy but its\n" " immediate parent directory is present, checkout the target into its\n" " parent directory at the specified depth. If --parents is specified,\n" " create any missing parent directories of the target by checking them\n" " out, too, at depth=empty.\n" - "\n" + "\n"), N_( " Use the --set-depth option to set a new working copy depth on the\n" - " targets of this operation.\n"), + " targets of this operation.\n" + )}, {'r', 'N', opt_depth, opt_set_depth, 'q', opt_merge_cmd, opt_force, opt_ignore_externals, opt_changelist, opt_editor_cmd, opt_accept, opt_parents, opt_adds_as_modification}, { {opt_force, - N_("handle unversioned obstructions as changes")} } }, + N_("handle unversioned obstructions as changes")}, + {'N', N_("obsolete; same as --depth=files")} } }, - { "upgrade", svn_cl__upgrade, {0}, N_ - ("Upgrade the metadata storage format for a working copy.\n" + { "upgrade", svn_cl__upgrade, {0}, {N_( + "Upgrade the metadata storage format for a working copy.\n" "usage: upgrade [WCPATH...]\n" - "\n" - " Local modifications are preserved.\n"), + "\n"), N_( + " Local modifications are preserved.\n" + )}, { 'q' } }, - { "x-shelve", svn_cl__shelve, {"shelve"}, N_ - ("Put a local change aside, as if putting it on a shelf.\n" - "usage: 1. x-shelve [--keep-local] NAME [PATH...]\n" - " 2. x-shelve --delete NAME\n" - " 3. x-shelve --list\n" - "\n" - " 1. Save the local change in the given PATHs to a patch file, and\n" - " revert that change from the WC unless '--keep-local' is given.\n" - " If a log message is given with '-m' or '-F', include it at the\n" - " beginning of the patch file.\n" - "\n" - " 2. Delete the shelved change NAME.\n" - " (A backup is kept, named with a '.bak' extension.)\n" - "\n" - " 3. List shelved changes. Include the first line of any log message\n" - " and some details about the contents of the change, unless '-q' is\n" - " given.\n" - "\n" - " The kinds of change you can shelve are those supported by 'svn diff'\n" - " and 'svn patch'. The following are currently NOT supported:\n" - " mergeinfo changes, copies, moves, mkdir, rmdir,\n" - " 'binary' content, uncommittable states\n" - "\n" - " To bring back a shelved change, use 'svn x-unshelve NAME'.\n" - "\n" - " Shelved changes are stored in /.svn/shelves/\n" - "\n" + { "x-shelf-diff", svn_cl__shelf_diff, {0}, {N_( + "Show shelved changes as a diff.\n" + "usage: x-shelf-diff SHELF [VERSION]\n" + "\n"), N_( + " Show the changes in SHELF:VERSION (default: latest) as a diff.\n" + "\n"), N_( + " See also: 'svn diff --cl=svn:shelf:SHELF' which supports most options of\n" + " 'svn diff'.\n" + "\n"), N_( + " The shelving feature is EXPERIMENTAL. This command is likely to change\n" + " in the next release, and there is no promise of backward compatibility.\n" + )}, + {opt_summarize}, + }, + + { "x-shelf-drop", svn_cl__shelf_drop, {0}, {N_( + "Delete a shelf.\n" + "usage: x-shelf-drop SHELF [PATH ...]\n" + "\n"), N_( + " Delete the shelves named SHELF from the working copies containing PATH\n" + " (default PATH is '.')\n" + "\n"), N_( + " The shelving feature is EXPERIMENTAL. This command is likely to change\n" + " in the next release, and there is no promise of backward compatibility.\n" + )}, + }, + + { "x-shelf-list", svn_cl__shelf_list, {"x-shelves"}, {N_( + "List shelves.\n" + "usage: x-shelf-list [PATH ...]\n" + "\n"), N_( + " List shelves for each working copy containing PATH (default is '.')\n" + " Include the first line of any log message and some details about the\n" + " contents of the shelf, unless '-q' is given.\n" + "\n"), N_( " The shelving feature is EXPERIMENTAL. This command is likely to change\n" " in the next release, and there is no promise of backward compatibility.\n" - ), - {opt_delete, opt_list, 'q', opt_dry_run, opt_keep_local, + )}, + {'q', 'v'} + }, + + { "x-shelf-list-by-paths", svn_cl__shelf_list_by_paths, {0}, {N_( + "List which shelf affects each path.\n" + "usage: x-shelf-list-by-paths [PATH...]\n" + "\n"), N_( + " List which shelf most recently affects each path below the given PATHs.\n" + "\n"), N_( + " The shelving feature is EXPERIMENTAL. This command is likely to change\n" + " in the next release, and there is no promise of backward compatibility.\n" + )}, + }, + + { "x-shelf-log", svn_cl__shelf_log, {0}, {N_( + "Show the versions of a shelf.\n" + "usage: x-shelf-log SHELF [PATH...]\n" + "\n"), N_( + " Show all versions of SHELF for each working copy containing PATH (the\n" + " default PATH is '.').\n" + "\n"), N_( + " The shelving feature is EXPERIMENTAL. This command is likely to change\n" + " in the next release, and there is no promise of backward compatibility.\n" + )}, + {'q', 'v'} + }, + + { "x-shelf-save", svn_cl__shelf_save, {0}, {N_( + "Copy local changes onto a new version of a shelf.\n" + "usage: x-shelf-save SHELF [PATH...]\n" + "\n"), N_( + " Save local changes in the given PATHs as a new version of SHELF.\n" + " The shelf's log message can be set with -m, -F, etc.\n" + "\n"), N_( + " The same as 'svn shelve --keep-local'.\n" + "\n"), N_( + " The shelving feature is EXPERIMENTAL. This command is likely to change\n" + " in the next release, and there is no promise of backward compatibility.\n" + )}, + {'q', opt_dry_run, opt_depth, opt_targets, opt_changelist, - /* almost SVN_CL__LOG_MSG_OPTIONS but not currently opt_with_revprop: */ - 'm', 'F', opt_force_log, opt_editor_cmd, opt_encoding, - } }, + SVN_CL__LOG_MSG_OPTIONS, + } + }, - { "x-unshelve", svn_cl__unshelve, {"unshelve"}, N_ - ("Bring a shelved change back to a local change in the WC.\n" - "usage: 1. x-unshelve [--keep-shelved] [NAME]\n" - " 2. x-unshelve --list\n" - "\n" - " 1. Apply the shelved change NAME to the working copy.\n" - " Delete the patch unless the '--keep-shelved' option is given.\n" - " (A backup is kept, named with a '.bak' extension.)\n" - " NAME defaults to the most recent shelved change.\n" - "\n" - " 2. List shelved changes. Include the first line of any log message\n" - " and some details about the contents of the change, unless '-q' is\n" - " given.\n" - "\n" - " Any conflict between the change being unshelved and a change\n" - " already in the WC is handled the same way as by 'svn patch',\n" - " creating a 'reject' file.\n" - "\n" + { "x-shelve", svn_cl__shelf_shelve, {0}, {N_( + "Move local changes onto a shelf.\n" + "usage: x-shelve [--keep-local] SHELF [PATH...]\n" + "\n"), N_( + " Save the local changes in the given PATHs to a new or existing SHELF.\n" + " Revert those changes from the WC unless '--keep-local' is given.\n" + " The shelf's log message can be set with -m, -F, etc.\n" + "\n"), N_( + " 'svn shelve --keep-local' is the same as 'svn shelf-save'.\n" + "\n"), N_( + " The kinds of change you can shelve are committable changes to files and\n" + " properties, except the following kinds which are not yet supported:\n" + " * copies and moves\n" + " * mkdir and rmdir\n" + " Uncommittable states such as conflicts, unversioned and missing cannot\n" + " be shelved.\n" + "\n"), N_( + " To bring back shelved changes, use 'svn unshelve SHELF'.\n" + "\n"), N_( + " Shelves are currently stored under /.svn/experimental/shelves/ .\n" + " (In Subversion 1.10, shelves were stored under /.svn/shelves/ as\n" + " patch files. To recover a shelf created by 1.10, either use a 1.10\n" + " client to find and unshelve it, or find the patch file and use any\n" + " 1.10 or later 'svn patch' to apply it.)\n" + "\n"), N_( " The shelving feature is EXPERIMENTAL. This command is likely to change\n" " in the next release, and there is no promise of backward compatibility.\n" - ), - {opt_keep_shelved, opt_list, 'q', opt_dry_run} }, + )}, + {'q', opt_dry_run, opt_keep_local, + opt_depth, opt_targets, opt_changelist, + SVN_CL__LOG_MSG_OPTIONS, + } }, - { "x-shelves", svn_cl__shelves, {"shelves"}, N_ - ("List shelved changes.\n" - "usage: x-shelves\n" - "\n" + { "x-unshelve", svn_cl__shelf_unshelve, {0}, {N_( + "Copy shelved changes back into the WC.\n" + "usage: x-unshelve [--drop] [SHELF [VERSION]]\n" + "\n"), N_( + " Apply the changes stored in SHELF to the working copy.\n" + " SHELF defaults to the newest shelf.\n" + "\n"), N_( + " Apply the newest version of the shelf, by default. If VERSION is\n" + " specified, apply that version and discard all versions newer than that.\n" + " In any case, retain the unshelved version and versions older than that\n" + " (unless --drop is specified).\n" + "\n"), N_( + " With --drop, delete the entire shelf (like 'svn shelf-drop') after\n" + " successfully unshelving with no conflicts.\n" + "\n"), N_( + " The working files involved should be in a clean, unmodified state\n" + " before using this command. To roll back to an older version of the\n" + " shelf, first ensure any current working changes are removed, such as\n" + " by shelving or reverting them, and then unshelve the desired version.\n" + "\n"), N_( + " Unshelve normally refuses to apply any changes if any path involved is\n" + " already modified (or has any other abnormal status) in the WC. With\n" + " --force, it does not check and may error out and/or produce partial or\n" + " unexpected results.\n" + "\n"), N_( " The shelving feature is EXPERIMENTAL. This command is likely to change\n" " in the next release, and there is no promise of backward compatibility.\n" - ), - {'q'} }, + )}, + {opt_drop, 'q', opt_dry_run, opt_force} }, + + { "x-wc-copy-mods", svn_cl__wc_copy_mods, {0}, {N_( + "Copy local modifications from one WC to another.\n" + "usage: x-wc-copy-mods SRC_WC_PATH DST_WC_PATH\n" + "\n"), N_( + " The source and destination WC paths may be in the same WC or in different" + " WCs.\n" + "\n"), N_( + " This feature is EXPERIMENTAL. This command is likely to change\n" + " in the next release, and there is no promise of backward compatibility.\n" + )}, + }, - { NULL, NULL, {0}, NULL, {0} } + { NULL, NULL, {0}, {NULL}, {0} } }; @@ -2036,6 +2216,22 @@ add_search_pattern_to_latest_group(svn_cl__opt_state_t *opt_state, APR_ARRAY_PUSH(group, const char *) = pattern; } +/* Parse the argument to the --x-viewspec option. */ +static svn_error_t * +viewspec_from_word(enum svn_cl__viewspec_t *viewspec, + const char *utf8_opt_arg) +{ + if (!strcmp(utf8_opt_arg, "classic")) + *viewspec = svn_cl__viewspec_classic; + else if (!strcmp(utf8_opt_arg, "svn11")) + *viewspec = svn_cl__viewspec_svn11; + else + return svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL, + _("'%s' is not a valid --x-viewspec value"), + utf8_opt_arg); + return SVN_NO_ERROR; +} + /*** Main. ***/ @@ -2054,7 +2250,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) svn_client_ctx_t *ctx; apr_array_header_t *received_opts; int i; - const svn_opt_subcommand_desc2_t *subcommand = NULL; + const svn_opt_subcommand_desc3_t *subcommand = NULL; const char *dash_F_arg = NULL; svn_cl__cmd_baton_t command_baton; svn_auth_baton_t *ab; @@ -2102,6 +2298,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) opt_state.set_depth = svn_depth_unknown; opt_state.accept_which = svn_cl__accept_unspecified; opt_state.show_revs = svn_cl__show_revs_invalid; + opt_state.file_size_unit = SVN_CL__SIZE_UNIT_NONE; /* No args? Show usage. */ if (argc <= 1) @@ -2308,9 +2505,6 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) case opt_dry_run: opt_state.dry_run = TRUE; break; - case opt_list: - opt_state.list = TRUE; - break; case opt_revprop: opt_state.revprop = TRUE; break; @@ -2320,6 +2514,9 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) case 'N': descend = FALSE; break; + case 'H': + opt_state.file_size_unit = SVN_CL__SIZE_UNIT_BASE_2; + break; case opt_depth: err = svn_utf_cstring_to_utf8(&utf8_opt_arg, opt_arg, pool); if (err) @@ -2457,7 +2654,8 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) break; case opt_config_dir: SVN_ERR(svn_utf_cstring_to_utf8(&utf8_opt_arg, opt_arg, pool)); - opt_state.config_dir = svn_dirent_internal_style(utf8_opt_arg, pool); + SVN_ERR(svn_dirent_internal_style_safe(&opt_state.config_dir, NULL, + utf8_opt_arg, pool, pool)); break; case opt_config_options: if (!opt_state.config_options) @@ -2494,9 +2692,11 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) opt_state.diff.summarize = TRUE; break; case opt_remove: - case opt_delete: opt_state.remove = TRUE; break; + case opt_drop: + opt_state.drop = TRUE; + break; case opt_changelist: SVN_ERR(svn_utf_cstring_to_utf8(&utf8_opt_arg, opt_arg, pool)); if (utf8_opt_arg[0] == '\0') @@ -2510,7 +2710,6 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) opt_state.keep_changelists = TRUE; break; case opt_keep_local: - case opt_keep_shelved: opt_state.keep_local = TRUE; break; case opt_with_all_revprops: @@ -2625,6 +2824,9 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) case opt_remove_ignored: opt_state.remove_ignored = TRUE; break; + case opt_remove_added: + opt_state.remove_added = TRUE; + break; case opt_no_newline: case opt_strict: /* ### DEPRECATED */ opt_state.no_newline = TRUE; @@ -2645,6 +2847,11 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) case opt_vacuum_pristines: opt_state.vacuum_pristines = TRUE; break; + case opt_viewspec: + opt_state.viewspec = TRUE; + SVN_ERR(svn_utf_cstring_to_utf8(&utf8_opt_arg, opt_arg, pool)); + SVN_ERR(viewspec_from_word(&opt_state.viewspec, utf8_opt_arg)); + break; default: /* Hmmm. Perhaps this would be a good place to squirrel away opts that commands like svn diff might need. Hmmm indeed. */ @@ -2685,7 +2892,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) just typos/mistakes. Whatever the case, the subcommand to actually run is svn_cl__help(). */ if (opt_state.help) - subcommand = svn_opt_get_canonical_subcommand2(svn_cl__cmd_table, "help"); + subcommand = svn_opt_get_canonical_subcommand3(svn_cl__cmd_table, "help"); /* If we're not running the `help' subcommand, then look for a subcommand in the first argument. */ @@ -2696,8 +2903,8 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_state.version) { /* Use the "help" subcommand to handle the "--version" option. */ - static const svn_opt_subcommand_desc2_t pseudo_cmd = - { "--version", svn_cl__help, {0}, "", + static const svn_opt_subcommand_desc3_t pseudo_cmd = + { "--version", svn_cl__help, {0}, {""}, {opt_version, /* must accept its own option */ 'q', /* brief output */ 'v', /* verbose output */ @@ -2722,7 +2929,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) SVN_ERR(svn_utf_cstring_to_utf8(&first_arg, os->argv[os->ind++], pool)); - subcommand = svn_opt_get_canonical_subcommand2(svn_cl__cmd_table, + subcommand = svn_opt_get_canonical_subcommand3(svn_cl__cmd_table, first_arg); if (subcommand == NULL) { @@ -2760,12 +2967,12 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_id == 'h' || opt_id == '?') continue; - if (! svn_opt_subcommand_takes_option3(subcommand, opt_id, + if (! svn_opt_subcommand_takes_option4(subcommand, opt_id, svn_cl__global_options)) { const char *optstr; const apr_getopt_option_t *badopt = - svn_opt_get_option_from_code2(opt_id, svn_cl__options, + svn_opt_get_option_from_code3(opt_id, svn_cl__options, subcommand, pool); svn_opt_format_option(&optstr, badopt, FALSE, pool); if (subcommand->name[0] == '-') @@ -3024,7 +3231,9 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) || subcommand->cmd_func == svn_cl__move || subcommand->cmd_func == svn_cl__lock || subcommand->cmd_func == svn_cl__propedit - || subcommand->cmd_func == svn_cl__shelve)) + || subcommand->cmd_func == svn_cl__shelf_save + || subcommand->cmd_func == svn_cl__shelf_shelve + )) { /* If the -F argument is a file that's under revision control, that's probably not what the user intended. */ @@ -3032,7 +3241,10 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) { svn_node_kind_t kind; const char *local_abspath; - const char *fname = svn_dirent_internal_style(dash_F_arg, pool); + const char *fname; + + SVN_ERR(svn_dirent_internal_style_safe(&fname, NULL, dash_F_arg, + pool, pool)); err = svn_dirent_get_absolute(&local_abspath, fname, pool); diff --git a/subversion/svn/util.c b/subversion/svn/util.c index a18e5f3..757983a 100644 --- a/subversion/svn/util.c +++ b/subversion/svn/util.c @@ -163,6 +163,8 @@ svn_cl__merge_file_externally(const char *base_path, arguments[5] = wc_path; arguments[6] = NULL; + /* Presumably apr_filepath_get() returns a valid path, so we don't have + to use the safe version of svn_dirent_internal_style() here. */ SVN_ERR(svn_io_run_cmd(svn_dirent_internal_style(cwd, pool), merge_tool, arguments, &exitcode, NULL, TRUE, NULL, NULL, NULL, pool)); diff --git a/subversion/svn_private_config.h.in b/subversion/svn_private_config.h.in index 22dece7..3ecd337 100644 --- a/subversion/svn_private_config.h.in +++ b/subversion/svn_private_config.h.in @@ -16,12 +16,21 @@ /* Define to 1 if you have the `bind_textdomain_codeset' function. */ #undef HAVE_BIND_TEXTDOMAIN_CODESET +/* define if the Boost library is available */ +#undef HAVE_BOOST + +/* define if the Boost::Unit_Test_Framework library is available */ +#undef HAVE_BOOST_UNIT_TEST_FRAMEWORK + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ #undef HAVE_DOPRNT +/* Define to 1 if you have the header file. */ +#undef HAVE_ELF_H + /* Define to 1 if you have the `getpid' function. */ #undef HAVE_GETPID diff --git a/subversion/svnadmin/svnadmin.c b/subversion/svnadmin/svnadmin.c index 2fb0613..85a6279 100644 --- a/subversion/svnadmin/svnadmin.c +++ b/subversion/svnadmin/svnadmin.c @@ -42,6 +42,7 @@ #include "svn_time.h" #include "svn_user.h" #include "svn_xml.h" +#include "svn_fs.h" #include "private/svn_cmdline_private.h" #include "private/svn_opt_private.h" @@ -49,6 +50,7 @@ #include "private/svn_subr_private.h" #include "private/svn_cmdline_private.h" #include "private/svn_fspath.h" +#include "private/svn_fs_fs_private.h" #include "svn_private_config.h" @@ -114,6 +116,7 @@ static svn_opt_subcommand_t subcommand_lstxns, subcommand_pack, subcommand_recover, + subcommand_rev_size, subcommand_rmlocks, subcommand_rmtxns, subcommand_setlog, @@ -301,47 +304,59 @@ static const apr_getopt_option_t options_table[] = /* Array of available subcommands. * The entire list must be terminated with an entry of nulls. */ -static const svn_opt_subcommand_desc2_t cmd_table[] = +static const svn_opt_subcommand_desc3_t cmd_table[] = { - {"crashtest", subcommand_crashtest, {0}, N_ - ("usage: svnadmin crashtest REPOS_PATH\n\n" + {"crashtest", subcommand_crashtest, {0}, {N_( + "usage: svnadmin crashtest REPOS_PATH\n" + "\n"), N_( "Open the repository at REPOS_PATH, then abort, thus simulating\n" - "a process that crashes while holding an open repository handle.\n"), + "a process that crashes while holding an open repository handle.\n" + )}, {0} }, - {"create", subcommand_create, {0}, N_ - ("usage: svnadmin create REPOS_PATH\n\n" - "Create a new, empty repository at REPOS_PATH.\n"), + {"create", subcommand_create, {0}, {N_( + "usage: svnadmin create REPOS_PATH\n" + "\n"), N_( + "Create a new, empty repository at REPOS_PATH.\n" + )}, {svnadmin__bdb_txn_nosync, svnadmin__bdb_log_keep, svnadmin__config_dir, svnadmin__fs_type, svnadmin__compatible_version, svnadmin__pre_1_4_compatible, svnadmin__pre_1_5_compatible, svnadmin__pre_1_6_compatible } }, - {"delrevprop", subcommand_delrevprop, {0}, N_ - ("usage: 1. svnadmin delrevprop REPOS_PATH -r REVISION NAME\n" - " 2. svnadmin delrevprop REPOS_PATH -t TXN NAME\n\n" - "1. Delete the property NAME on revision REVISION.\n\n" + {"delrevprop", subcommand_delrevprop, {0}, {N_( + "usage: 1. svnadmin delrevprop REPOS_PATH -r REVISION NAME\n" + " 2. svnadmin delrevprop REPOS_PATH -t TXN NAME\n" + "\n"), N_( + "1. Delete the property NAME on revision REVISION.\n" + "\n"), N_( "Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n" "trigger the revision property-related hooks (for example, if you want\n" - "an email notification sent from your post-revprop-change hook).\n\n" + "an email notification sent from your post-revprop-change hook).\n" + "\n"), N_( "NOTE: Revision properties are not versioned, so this command will\n" - "irreversibly destroy the previous value of the property.\n\n" - "2. Delete the property NAME on transaction TXN.\n"), + "irreversibly destroy the previous value of the property.\n" + "\n"), N_( + "2. Delete the property NAME on transaction TXN.\n" + )}, {'r', 't', svnadmin__use_pre_revprop_change_hook, svnadmin__use_post_revprop_change_hook} }, - {"deltify", subcommand_deltify, {0}, N_ - ("usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n\n" + {"deltify", subcommand_deltify, {0}, {N_( + "usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n" + "\n"), N_( "Run over the requested revision range, performing predecessor delti-\n" "fication on the paths changed in those revisions. Deltification in\n" "essence compresses the repository by only storing the differences or\n" "delta from the preceding revision. If no revisions are specified,\n" - "this will simply deltify the HEAD revision.\n"), + "this will simply deltify the HEAD revision.\n" + )}, {'r', 'q', 'M'} }, - {"dump", subcommand_dump, {0}, N_ - ("usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n\n" + {"dump", subcommand_dump, {0}, {N_( + "usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n" + "\n"), N_( "Dump the contents of filesystem to stdout in a 'dumpfile'\n" "portable format, sending feedback to stderr. Dump revisions\n" "LOWER rev through UPPER rev. If no revisions are given, dump all\n" @@ -351,73 +366,94 @@ static const svn_opt_subcommand_desc2_t cmd_table[] = "every path present in the repository as of that revision. (In either\n" "case, the second and subsequent revisions, if any, describe only paths\n" "changed in those revisions.)\n" - "\n" + "\n"), N_( "Using --exclude or --include gives results equivalent to authz-based\n" "path exclusions. In particular, when the source of a copy is\n" - "excluded, the copy is transformed into an add (unlike in 'svndumpfilter').\n"), + "excluded, the copy is transformed into an add (unlike in 'svndumpfilter').\n" + )}, {'r', svnadmin__incremental, svnadmin__deltas, 'q', 'M', 'F', svnadmin__exclude, svnadmin__include, svnadmin__glob }, {{'F', N_("write to file ARG instead of stdout")}} }, - {"dump-revprops", subcommand_dump_revprops, {0}, N_ - ("usage: svnadmin dump-revprops REPOS_PATH [-r LOWER[:UPPER]]\n\n" + {"dump-revprops", subcommand_dump_revprops, {0}, {N_( + "usage: svnadmin dump-revprops REPOS_PATH [-r LOWER[:UPPER]]\n" + "\n"), N_( "Dump the revision properties of filesystem to stdout in a 'dumpfile'\n" "portable format, sending feedback to stderr. Dump revisions\n" "LOWER rev through UPPER rev. If no revisions are given, dump the\n" "properties for all revisions. If only LOWER is given, dump the\n" - "properties for that one revision.\n"), + "properties for that one revision.\n" + )}, {'r', 'q', 'F'}, {{'F', N_("write to file ARG instead of stdout")}} }, - {"freeze", subcommand_freeze, {0}, N_ - ("usage: 1. svnadmin freeze REPOS_PATH PROGRAM [ARG...]\n" - " 2. svnadmin freeze -F FILE PROGRAM [ARG...]\n\n" + {"freeze", subcommand_freeze, {0}, {N_( + "usage: 1. svnadmin freeze REPOS_PATH -- PROGRAM [ARG...]\n" + " 2. svnadmin freeze -F FILE -- PROGRAM [ARG...]\n" + "\n"), N_( "1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n" " Allows safe use of third-party backup tools on a live repository.\n" - "\n" + "\n"), N_( "2. Like 1 except all repositories listed in FILE are locked. The file\n" " format is repository paths separated by newlines. Repositories are\n" - " locked in the same order as they are listed in the file.\n"), + " locked in the same order as they are listed in the file.\n" + "\n" + "The '--' tells svnadmin to stop looking for svnadmin options and pass\n" + "all later arguments to PROGRAM even if they begin with '-'.\n" + )}, {'F'}, {{'F', N_("read repository paths from file ARG")}} }, - {"help", subcommand_help, {"?", "h"}, N_ - ("usage: svnadmin help [SUBCOMMAND...]\n\n" - "Describe the usage of this program or its subcommands.\n"), + {"help", subcommand_help, {"?", "h"}, {N_( + "usage: svnadmin help [SUBCOMMAND...]\n" + "\n"), N_( + "Describe the usage of this program or its subcommands.\n" + )}, {0} }, - {"hotcopy", subcommand_hotcopy, {0}, N_ - ("usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n\n" + {"hotcopy", subcommand_hotcopy, {0}, {N_( + "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n" + "\n"), N_( "Make a hot copy of a repository.\n" "If --incremental is passed, data which already exists at the destination\n" - "is not copied again. Incremental mode is implemented for FSFS repositories.\n"), + "is not copied again. Incremental mode is implemented for FSFS repositories.\n" + )}, {svnadmin__clean_logs, svnadmin__incremental, 'q'} }, - {"info", subcommand_info, {0}, N_ - ("usage: svnadmin info REPOS_PATH\n\n" - "Print information about the repository at REPOS_PATH.\n"), + {"info", subcommand_info, {0}, {N_( + "usage: svnadmin info REPOS_PATH\n" + "\n"), N_( + "Print information about the repository at REPOS_PATH.\n" + )}, {0} }, - {"list-dblogs", subcommand_list_dblogs, {0}, N_ - ("usage: svnadmin list-dblogs REPOS_PATH\n\n" - "List all Berkeley DB log files.\n\n" + {"list-dblogs", subcommand_list_dblogs, {0}, {N_( + "usage: svnadmin list-dblogs REPOS_PATH\n" + "\n"), N_( + "List all Berkeley DB log files.\n" + "\n"), N_( "WARNING: Modifying or deleting logfiles which are still in use\n" - "will cause your repository to be corrupted.\n"), + "will cause your repository to be corrupted.\n" + )}, {0} }, - {"list-unused-dblogs", subcommand_list_unused_dblogs, {0}, N_ - ("usage: svnadmin list-unused-dblogs REPOS_PATH\n\n" - "List unused Berkeley DB log files.\n\n"), + {"list-unused-dblogs", subcommand_list_unused_dblogs, {0}, {N_( + "usage: svnadmin list-unused-dblogs REPOS_PATH\n" + "\n"), N_( + "List unused Berkeley DB log files.\n" + )}, {0} }, - {"load", subcommand_load, {0}, N_ - ("usage: svnadmin load REPOS_PATH\n\n" + {"load", subcommand_load, {0}, {N_( + "usage: svnadmin load REPOS_PATH\n" + "\n"), N_( "Read a 'dumpfile'-formatted stream from stdin, committing\n" "new revisions into the repository's filesystem. If the repository\n" "was previously empty, its UUID will, by default, be changed to the\n" "one specified in the stream. Progress feedback is sent to stdout.\n" "If --revision is specified, limit the loaded revisions to only those\n" - "in the dump stream whose revision numbers match the specified range.\n"), + "in the dump stream whose revision numbers match the specified range.\n" + )}, {'q', 'r', svnadmin__ignore_uuid, svnadmin__force_uuid, svnadmin__ignore_dates, svnadmin__use_pre_commit_hook, svnadmin__use_post_commit_hook, @@ -426,122 +462,166 @@ static const svn_opt_subcommand_desc2_t cmd_table[] = svnadmin__no_flush_to_disk, 'F'}, {{'F', N_("read from file ARG instead of stdin")}} }, - {"load-revprops", subcommand_load_revprops, {0}, N_ - ("usage: svnadmin load-revprops REPOS_PATH\n\n" + {"load-revprops", subcommand_load_revprops, {0}, {N_( + "usage: svnadmin load-revprops REPOS_PATH\n" + "\n"), N_( "Read a 'dumpfile'-formatted stream from stdin, setting the revision\n" "properties in the repository's filesystem. Revisions not found in the\n" "repository will cause an error. Progress feedback is sent to stdout.\n" "If --revision is specified, limit the loaded revisions to only those\n" - "in the dump stream whose revision numbers match the specified range.\n"), + "in the dump stream whose revision numbers match the specified range.\n" + )}, {'q', 'r', svnadmin__force_uuid, svnadmin__normalize_props, svnadmin__bypass_prop_validation, svnadmin__no_flush_to_disk, 'F'}, {{'F', N_("read from file ARG instead of stdin")}} }, - {"lock", subcommand_lock, {0}, N_ - ("usage: svnadmin lock REPOS_PATH PATH USERNAME COMMENT-FILE [TOKEN]\n\n" + {"lock", subcommand_lock, {0}, {N_( + "usage: svnadmin lock REPOS_PATH PATH USERNAME COMMENT-FILE [TOKEN]\n" + "\n"), N_( "Lock PATH by USERNAME setting comments from COMMENT-FILE.\n" "If provided, use TOKEN as lock token. Use --bypass-hooks to avoid\n" - "triggering the pre-lock and post-lock hook scripts.\n"), + "triggering the pre-lock and post-lock hook scripts.\n" + )}, {svnadmin__bypass_hooks, 'q'} }, - {"lslocks", subcommand_lslocks, {0}, N_ - ("usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n\n" + {"lslocks", subcommand_lslocks, {0}, {N_( + "usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n" + "\n"), N_( "Print descriptions of all locks on or under PATH-IN-REPOS (which,\n" - "if not provided, is the root of the repository).\n"), + "if not provided, is the root of the repository).\n" + )}, {0} }, - {"lstxns", subcommand_lstxns, {0}, N_ - ("usage: svnadmin lstxns REPOS_PATH\n\n" + {"lstxns", subcommand_lstxns, {0}, {N_( + "usage: svnadmin lstxns REPOS_PATH\n" + "\n"), N_( "Print the names of uncommitted transactions. With -rN skip the output\n" "of those that have a base revision more recent than rN. Transactions\n" "with base revisions much older than HEAD are likely to have been\n" - "abandonded and are candidates to be removed.\n"), + "abandonded and are candidates to be removed.\n" + )}, {'r'}, { {'r', "transaction base revision ARG"} } }, - {"pack", subcommand_pack, {0}, N_ - ("usage: svnadmin pack REPOS_PATH\n\n" + {"pack", subcommand_pack, {0}, {N_( + "usage: svnadmin pack REPOS_PATH\n" + "\n"), N_( "Possibly compact the repository into a more efficient storage model.\n" - "This may not apply to all repositories, in which case, exit.\n"), + "This may not apply to all repositories, in which case, exit.\n" + )}, {'q', 'M'} }, - {"recover", subcommand_recover, {0}, N_ - ("usage: svnadmin recover REPOS_PATH\n\n" + {"recover", subcommand_recover, {0}, {N_( + "usage: svnadmin recover REPOS_PATH\n" + "\n"), N_( "Run the recovery procedure on a repository. Do this if you've\n" "been getting errors indicating that recovery ought to be run.\n" "Berkeley DB recovery requires exclusive access and will\n" - "exit if the repository is in use by another process.\n"), + "exit if the repository is in use by another process.\n" + )}, {svnadmin__wait} }, - {"rmlocks", subcommand_rmlocks, {0}, N_ - ("usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n\n" - "Unconditionally remove lock from each LOCKED_PATH.\n"), + {"rev-size", subcommand_rev_size, {0}, {N_( + "usage: svnadmin rev-size REPOS_PATH -r REVISION\n" + "\n"), N_( + "Print the total size in bytes of the representation on disk of\n" + "revision REVISION.\n" + "\n"), N_( + "The size includes revision properties and excludes FSFS indexes.\n" + )}, + {'r', 'q', 'M'}, + { {'q', "print only the size and a newline"} } }, + + {"rmlocks", subcommand_rmlocks, {0}, {N_( + "usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n" + "\n"), N_( + "Unconditionally remove lock from each LOCKED_PATH.\n" + )}, {'q'} }, - {"rmtxns", subcommand_rmtxns, {0}, N_ - ("usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n\n" - "Delete the named transaction(s).\n"), + {"rmtxns", subcommand_rmtxns, {0}, {N_( + "usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n" + "\n"), N_( + "Delete the named transaction(s).\n" + )}, {'q'} }, - {"setlog", subcommand_setlog, {0}, N_ - ("usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n\n" + {"setlog", subcommand_setlog, {0}, {N_( + "usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n" + "\n"), N_( "Set the log-message on revision REVISION to the contents of FILE. Use\n" "--bypass-hooks to avoid triggering the revision-property-related hooks\n" "(for example, if you do not want an email notification sent\n" "from your post-revprop-change hook, or because the modification of\n" "revision properties has not been enabled in the pre-revprop-change\n" - "hook).\n\n" + "hook).\n" + "\n"), N_( "NOTE: Revision properties are not versioned, so this command will\n" - "overwrite the previous log message.\n"), + "overwrite the previous log message.\n" + )}, {'r', svnadmin__bypass_hooks} }, - {"setrevprop", subcommand_setrevprop, {0}, N_ - ("usage: 1. svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n" - " 2. svnadmin setrevprop REPOS_PATH -t TXN NAME FILE\n\n" - "1. Set the property NAME on revision REVISION to the contents of FILE.\n\n" + {"setrevprop", subcommand_setrevprop, {0}, {N_( + "usage: 1. svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n" + " 2. svnadmin setrevprop REPOS_PATH -t TXN NAME FILE\n" + "\n"), N_( + "1. Set the property NAME on revision REVISION to the contents of FILE.\n" + "\n"), N_( "Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n" "trigger the revision property-related hooks (for example, if you want\n" - "an email notification sent from your post-revprop-change hook).\n\n" + "an email notification sent from your post-revprop-change hook).\n" + "\n"), N_( "NOTE: Revision properties are not versioned, so this command will\n" - "overwrite the previous value of the property.\n\n" - "2. Set the property NAME on transaction TXN to the contents of FILE.\n"), + "overwrite the previous value of the property.\n" + "\n"), N_( + "2. Set the property NAME on transaction TXN to the contents of FILE.\n" + )}, {'r', 't', svnadmin__use_pre_revprop_change_hook, svnadmin__use_post_revprop_change_hook} }, - {"setuuid", subcommand_setuuid, {0}, N_ - ("usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n\n" + {"setuuid", subcommand_setuuid, {0}, {N_( + "usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n" + "\n"), N_( "Reset the repository UUID for the repository located at REPOS_PATH. If\n" "NEW_UUID is provided, use that as the new repository UUID; otherwise,\n" - "generate a brand new UUID for the repository.\n"), + "generate a brand new UUID for the repository.\n" + )}, {0} }, - {"unlock", subcommand_unlock, {0}, N_ - ("usage: svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME TOKEN\n\n" + {"unlock", subcommand_unlock, {0}, {N_( + "usage: svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME TOKEN\n" + "\n"), N_( "Unlock LOCKED_PATH (as USERNAME) after verifying that the token\n" "associated with the lock matches TOKEN. Use --bypass-hooks to avoid\n" - "triggering the pre-unlock and post-unlock hook scripts.\n"), + "triggering the pre-unlock and post-unlock hook scripts.\n" + )}, {svnadmin__bypass_hooks, 'q'} }, - {"upgrade", subcommand_upgrade, {0}, N_ - ("usage: svnadmin upgrade REPOS_PATH\n\n" + {"upgrade", subcommand_upgrade, {0}, {N_( + "usage: svnadmin upgrade REPOS_PATH\n" + "\n"), N_( "Upgrade the repository located at REPOS_PATH to the latest supported\n" - "schema version.\n\n" + "schema version.\n" + "\n"), N_( "This functionality is provided as a convenience for repository\n" "administrators who wish to make use of new Subversion functionality\n" "without having to undertake a potentially costly full repository dump\n" "and load operation. As such, the upgrade performs only the minimum\n" "amount of work needed to accomplish this while still maintaining the\n" "integrity of the repository. It does not guarantee the most optimized\n" - "repository state as a dump and subsequent load would.\n"), + "repository state as a dump and subsequent load would.\n" + )}, {0} }, - {"verify", subcommand_verify, {0}, N_ - ("usage: svnadmin verify REPOS_PATH\n\n" - "Verify the data stored in the repository.\n"), + {"verify", subcommand_verify, {0}, {N_( + "usage: svnadmin verify REPOS_PATH\n" + "\n"), N_( + "Verify the data stored in the repository.\n" + )}, {'t', 'r', 'q', svnadmin__keep_going, 'M', svnadmin__check_normalization, svnadmin__metadata_only} }, - { NULL, NULL, {0}, NULL, {0} } + { NULL, NULL, {0}, {NULL}, {0} } }; @@ -1540,7 +1620,7 @@ subcommand_help(apr_getopt_t *os, void *baton, apr_pool_t *pool) version_footer = svn_stringbuf_create(fs_desc_start, pool); SVN_ERR(svn_fs_print_modules(version_footer, pool)); - SVN_ERR(svn_opt_print_help4(os, "svnadmin", + SVN_ERR(svn_opt_print_help5(os, "svnadmin", opt_state ? opt_state->version : FALSE, opt_state ? opt_state->quiet : FALSE, /*###opt_state ? opt_state->verbose :*/ FALSE, @@ -2781,6 +2861,68 @@ subcommand_delrevprop(apr_getopt_t *os, void *baton, apr_pool_t *pool) } +/* Set *REV_SIZE to the total size in bytes of the representation on disk + * of revision REVISION in FS. + * + * This is implemented only for FSFS repositories, and otherwise returns + * an SVN_ERR_UNSUPPORTED_FEATURE error. + * + * The size includes revision properties and excludes FSFS indexes. + */ +static svn_error_t * +revision_size(apr_off_t *rev_size, + svn_fs_t *fs, + svn_revnum_t revision, + apr_pool_t *scratch_pool) +{ + svn_error_t *err; + svn_fs_fs__ioctl_revision_size_input_t input = {0}; + svn_fs_fs__ioctl_revision_size_output_t *output; + + input.revision = revision; + err = svn_fs_ioctl(fs, SVN_FS_FS__IOCTL_REVISION_SIZE, + &input, (void **)&output, + check_cancel, NULL, scratch_pool, scratch_pool); + if (err && err->apr_err == SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE) + { + return svn_error_quick_wrapf(err, + _("Revision size query is not implemented " + "for the filesytem type found in '%s'"), + svn_fs_path(fs, scratch_pool)); + } + SVN_ERR(err); + + *rev_size = output->rev_size; + return SVN_NO_ERROR; +} + +/* This implements `svn_opt_subcommand_t'. */ +svn_error_t * +subcommand_rev_size(apr_getopt_t *os, void *baton, apr_pool_t *pool) +{ + struct svnadmin_opt_state *opt_state = baton; + svn_revnum_t revision; + apr_off_t rev_size; + svn_repos_t *repos; + + if (opt_state->start_revision.kind != svn_opt_revision_number + || opt_state->end_revision.kind != svn_opt_revision_unspecified) + return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL, + _("Invalid revision specifier")); + revision = opt_state->start_revision.value.number; + + SVN_ERR(open_repos(&repos, opt_state->repository_path, opt_state, pool)); + SVN_ERR(revision_size(&rev_size, svn_repos_fs(repos), revision, pool)); + + if (opt_state->quiet) + SVN_ERR(svn_cmdline_printf(pool, "%"APR_OFF_T_FMT"\n", rev_size)); + else + SVN_ERR(svn_cmdline_printf(pool, _("%12"APR_OFF_T_FMT" bytes in revision %ld\n"), + rev_size, revision)); + + return SVN_NO_ERROR; +} + /** Main. **/ @@ -2795,7 +2937,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) svn_error_t *err; apr_status_t apr_err; - const svn_opt_subcommand_desc2_t *subcommand = NULL; + const svn_opt_subcommand_desc3_t *subcommand = NULL; struct svnadmin_opt_state opt_state = { 0 }; apr_getopt_t *os; int opt_id; @@ -3050,7 +3192,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) just typos/mistakes. Whatever the case, the subcommand to actually run is subcommand_help(). */ if (opt_state.help) - subcommand = svn_opt_get_canonical_subcommand2(cmd_table, "help"); + subcommand = svn_opt_get_canonical_subcommand3(cmd_table, "help"); /* If we're not running the `help' subcommand, then look for a subcommand in the first argument. */ @@ -3061,8 +3203,8 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_state.version) { /* Use the "help" subcommand to handle the "--version" option. */ - static const svn_opt_subcommand_desc2_t pseudo_cmd = - { "--version", subcommand_help, {0}, "", + static const svn_opt_subcommand_desc3_t pseudo_cmd = + { "--version", subcommand_help, {0}, {""}, {svnadmin__version, /* must accept its own option */ 'q', /* --quiet */ } }; @@ -3084,7 +3226,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) SVN_ERR(svn_utf_cstring_to_utf8(&first_arg, os->argv[os->ind++], pool)); - subcommand = svn_opt_get_canonical_subcommand2(cmd_table, first_arg); + subcommand = svn_opt_get_canonical_subcommand3(cmd_table, first_arg); if (subcommand == NULL) { svn_error_clear( @@ -3136,11 +3278,11 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_id == 'h' || opt_id == '?') continue; - if (! svn_opt_subcommand_takes_option3(subcommand, opt_id, NULL)) + if (! svn_opt_subcommand_takes_option4(subcommand, opt_id, NULL)) { const char *optstr; const apr_getopt_option_t *badopt = - svn_opt_get_option_from_code2(opt_id, options_table, subcommand, + svn_opt_get_option_from_code3(opt_id, options_table, subcommand, pool); svn_opt_format_option(&optstr, badopt, FALSE, pool); if (subcommand->name[0] == '-') diff --git a/subversion/svnbench/cl.h b/subversion/svnbench/cl.h index f14e255..ad5c9a5 100644 --- a/subversion/svnbench/cl.h +++ b/subversion/svnbench/cl.h @@ -117,7 +117,7 @@ svn_opt_subcommand_t /* See definition in main.c for documentation. */ -extern const svn_opt_subcommand_desc2_t svn_cl__cmd_table[]; +extern const svn_opt_subcommand_desc3_t svn_cl__cmd_table[]; /* See definition in main.c for documentation. */ extern const int svn_cl__global_options[]; diff --git a/subversion/svnbench/help-cmd.c b/subversion/svnbench/help-cmd.c index ead4861..a19bcad 100644 --- a/subversion/svnbench/help-cmd.c +++ b/subversion/svnbench/help-cmd.c @@ -75,7 +75,7 @@ svn_cl__help(apr_getopt_t *os, version_footer = svn_stringbuf_create(ra_desc_start, pool); SVN_ERR(svn_ra_print_modules(version_footer, pool)); - return svn_opt_print_help4(os, + return svn_opt_print_help5(os, "svnbench", /* ### erm, derive somehow? */ opt_state ? opt_state->version : FALSE, opt_state ? opt_state->quiet : FALSE, diff --git a/subversion/svnbench/svnbench.c b/subversion/svnbench/svnbench.c index 80a8728..33e7b69 100644 --- a/subversion/svnbench/svnbench.c +++ b/subversion/svnbench/svnbench.c @@ -206,111 +206,117 @@ const int svn_cl__global_options[] = opt_config_dir, opt_config_options, 0 }; -const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] = +const svn_opt_subcommand_desc3_t svn_cl__cmd_table[] = { - { "help", svn_cl__help, {"?", "h"}, N_ - ("Describe the usage of this program or its subcommands.\n" - "usage: help [SUBCOMMAND...]\n"), + { "help", svn_cl__help, {"?", "h"}, {N_( + "Describe the usage of this program or its subcommands.\n" + "usage: help [SUBCOMMAND...]\n" + )}, {0} }, /* This command is also invoked if we see option "--help", "-h" or "-?". */ - { "null-blame", svn_cl__null_blame, {0}, N_ - ("Fetch all versions of a file in a batch.\n" + { "null-blame", svn_cl__null_blame, {0}, {N_( + "Fetch all versions of a file in a batch.\n" "usage: null-blame [-rM:N] TARGET[@REV]...\n" - "\n" + "\n"), N_( " With no revision range (same as -r0:REV), or with '-r M:N' where M < N,\n" " annotate each line that is present in revision N of the file, with\n" " the last revision at or before rN that changed or added the line,\n" " looking back no further than rM.\n" - "\n" + "\n"), N_( " With a reverse revision range '-r M:N' where M > N,\n" " annotate each line that is present in revision N of the file, with\n" " the next revision after rN that changed or deleted the line,\n" " looking forward no further than rM.\n" - "\n" + "\n"), N_( " If specified, REV determines in which revision the target is first\n" " looked up.\n" - "\n" - " Write the annotated result to standard output.\n"), + "\n"), N_( + " Write the annotated result to standard output.\n" + )}, {'r', 'g'} }, - { "null-export", svn_cl__null_export, {0}, N_ - ("Create an unversioned copy of a tree.\n" + { "null-export", svn_cl__null_export, {0}, {N_( + "Create an unversioned copy of a tree.\n" "usage: null-export [-r REV] URL[@PEGREV]\n" - "\n" + "\n"), N_( " Exports a clean directory tree from the repository specified by\n" " URL, at revision REV if it is given, otherwise at HEAD.\n" - "\n" + "\n"), N_( " If specified, PEGREV determines in which revision the target is first\n" - " looked up.\n"), + " looked up.\n" + )}, {'r', 'q', 'N', opt_depth} }, - { "null-list", svn_cl__null_list, {"ls"}, N_ - ("List directory entries in the repository.\n" + { "null-list", svn_cl__null_list, {"ls"}, {N_( + "List directory entries in the repository.\n" "usage: null-list [TARGET[@REV]...]\n" - "\n" + "\n"), N_( " List each TARGET file and the contents of each TARGET directory as\n" " they exist in the repository. If TARGET is a working copy path, the\n" " corresponding repository URL will be used. If specified, REV determines\n" " in which revision the target is first looked up.\n" - "\n" + "\n"), N_( " The default TARGET is '.', meaning the repository URL of the current\n" " working directory.\n" - "\n" + "\n"), N_( " With --verbose, the following fields will be fetched for each item:\n" - "\n" + "\n"), N_( " Revision number of the last commit\n" " Author of the last commit\n" " If locked, the letter 'O'. (Use 'svn info URL' to see details)\n" " Size (in bytes)\n" - " Date and time of the last commit\n"), + " Date and time of the last commit\n" + )}, {'r', 'v', 'q', 'R', opt_depth, opt_search} }, - { "null-log", svn_cl__null_log, {0}, N_ - ("Fetch the log messages for a set of revision(s) and/or path(s).\n" + { "null-log", svn_cl__null_log, {0}, {N_( + "Fetch the log messages for a set of revision(s) and/or path(s).\n" "usage: 1. null-log [PATH][@REV]\n" " 2. null-log URL[@REV] [PATH...]\n" - "\n" + "\n"), N_( " 1. Fetch the log messages for the URL corresponding to PATH\n" " (default: '.'). If specified, REV is the revision in which the\n" " URL is first looked up, and the default revision range is REV:1.\n" " If REV is not specified, the default revision range is BASE:1,\n" " since the URL might not exist in the HEAD revision.\n" - "\n" + "\n"), N_( " 2. Fetch the log messages for the PATHs (default: '.') under URL.\n" " If specified, REV is the revision in which the URL is first\n" " looked up, and the default revision range is REV:1; otherwise,\n" " the URL is looked up in HEAD, and the default revision range is\n" " HEAD:1.\n" - "\n" + "\n"), N_( " Multiple '-c' or '-r' options may be specified (but not a\n" " combination of '-c' and '-r' options), and mixing of forward and\n" " reverse ranges is allowed.\n" - "\n" + "\n"), N_( " With -v, also print all affected paths with each log message.\n" " With -q, don't print the log message body itself (note that this is\n" " compatible with -v).\n" - "\n" + "\n"), N_( " Each log message is printed just once, even if more than one of the\n" " affected paths for that revision were explicitly requested. Logs\n" " follow copy history by default. Use --stop-on-copy to disable this\n" - " behavior, which can be useful for determining branchpoints.\n"), + " behavior, which can be useful for determining branchpoints.\n" + )}, {'r', 'q', 'v', 'g', 'c', opt_targets, opt_stop_on_copy, 'l', opt_with_all_revprops, opt_with_no_revprops, opt_with_revprop,}, {{opt_with_revprop, N_("retrieve revision property ARG")}, {'c', N_("the change made in revision ARG")}} }, - { "null-info", svn_cl__null_info, {0}, N_ - ("Display information about a local or remote item.\n" + { "null-info", svn_cl__null_info, {0}, {N_( + "Display information about a local or remote item.\n" "usage: null-info [TARGET[@REV]...]\n" - "\n" + "\n"), N_( " Print information about each TARGET (default: '.').\n" " TARGET may be either a working-copy path or URL. If specified, REV\n" - " determines in which revision the target is first looked up.\n"), + " determines in which revision the target is first looked up.\n" + )}, {'r', 'R', opt_depth, opt_targets, opt_changelist} }, - { NULL, NULL, {0}, NULL, {0} } + { NULL, NULL, {0}, {NULL}, {0} } }; @@ -389,7 +395,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) svn_client_ctx_t *ctx; apr_array_header_t *received_opts; int i; - const svn_opt_subcommand_desc2_t *subcommand = NULL; + const svn_opt_subcommand_desc3_t *subcommand = NULL; svn_cl__cmd_baton_t command_baton; svn_auth_baton_t *ab; svn_config_t *cfg_config; @@ -722,7 +728,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) just typos/mistakes. Whatever the case, the subcommand to actually run is svn_cl__help(). */ if (opt_state.help) - subcommand = svn_opt_get_canonical_subcommand2(svn_cl__cmd_table, "help"); + subcommand = svn_opt_get_canonical_subcommand3(svn_cl__cmd_table, "help"); /* If we're not running the `help' subcommand, then look for a subcommand in the first argument. */ @@ -733,8 +739,8 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_state.version) { /* Use the "help" subcommand to handle the "--version" option. */ - static const svn_opt_subcommand_desc2_t pseudo_cmd = - { "--version", svn_cl__help, {0}, "", + static const svn_opt_subcommand_desc3_t pseudo_cmd = + { "--version", svn_cl__help, {0}, {""}, {opt_version, /* must accept its own option */ 'q', /* brief output */ 'v', /* verbose output */ @@ -759,7 +765,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) SVN_ERR(svn_utf_cstring_to_utf8(&first_arg, os->argv[os->ind++], pool)); - subcommand = svn_opt_get_canonical_subcommand2(svn_cl__cmd_table, + subcommand = svn_opt_get_canonical_subcommand3(svn_cl__cmd_table, first_arg); if (subcommand == NULL) { @@ -786,12 +792,12 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_id == 'h' || opt_id == '?') continue; - if (! svn_opt_subcommand_takes_option3(subcommand, opt_id, + if (! svn_opt_subcommand_takes_option4(subcommand, opt_id, svn_cl__global_options)) { const char *optstr; const apr_getopt_option_t *badopt = - svn_opt_get_option_from_code2(opt_id, svn_cl__options, + svn_opt_get_option_from_code3(opt_id, svn_cl__options, subcommand, pool); svn_opt_format_option(&optstr, badopt, FALSE, pool); if (subcommand->name[0] == '-') diff --git a/subversion/svndumpfilter/svndumpfilter.c b/subversion/svndumpfilter/svndumpfilter.c index 74dbf2a..a948b3a 100644 --- a/subversion/svndumpfilter/svndumpfilter.c +++ b/subversion/svndumpfilter/svndumpfilter.c @@ -43,6 +43,7 @@ #include "svn_mergeinfo.h" #include "svn_version.h" +#include "private/svn_dirent_uri_private.h" #include "private/svn_repos_private.h" #include "private/svn_mergeinfo_private.h" #include "private/svn_cmdline_private.h" @@ -271,9 +272,7 @@ magic_header_record(int version, void *parse_baton, apr_pool_t *pool) if (version >= SVN_REPOS_DUMPFILE_FORMAT_VERSION_DELTAS) pb->allow_deltas = TRUE; - SVN_ERR(svn_stream_printf(pb->out_stream, pool, - SVN_REPOS_DUMPFILE_MAGIC_HEADER ": %d\n\n", - version)); + SVN_ERR(svn_repos__dump_magic_header_record(pb->out_stream, version, pool)); return SVN_NO_ERROR; } @@ -446,8 +445,8 @@ static svn_error_t * uuid_record(const char *uuid, void *parse_baton, apr_pool_t *pool) { struct parse_baton_t *pb = parse_baton; - SVN_ERR(svn_stream_printf(pb->out_stream, pool, - SVN_REPOS_DUMPFILE_UUID ": %s\n\n", uuid)); + + SVN_ERR(svn_repos__dump_uuid_header_record(pb->out_stream, uuid, pool)); return SVN_NO_ERROR; } @@ -979,32 +978,35 @@ static const apr_getopt_option_t options_table[] = /* Array of available subcommands. * The entire list must be terminated with an entry of nulls. */ -static const svn_opt_subcommand_desc2_t cmd_table[] = +static const svn_opt_subcommand_desc3_t cmd_table[] = { - {"exclude", subcommand_exclude, {0}, - N_("Filter out nodes with given prefixes from dumpstream.\n" - "usage: svndumpfilter exclude PATH_PREFIX...\n"), + {"exclude", subcommand_exclude, {0}, {N_( + "Filter out nodes with given prefixes from dumpstream.\n" + "usage: svndumpfilter exclude PATH_PREFIX...\n" + )}, {svndumpfilter__drop_empty_revs, svndumpfilter__drop_all_empty_revs, svndumpfilter__renumber_revs, svndumpfilter__skip_missing_merge_sources, svndumpfilter__targets, svndumpfilter__preserve_revprops, svndumpfilter__quiet, svndumpfilter__glob} }, - {"include", subcommand_include, {0}, - N_("Filter out nodes without given prefixes from dumpstream.\n" - "usage: svndumpfilter include PATH_PREFIX...\n"), + {"include", subcommand_include, {0}, {N_( + "Filter out nodes without given prefixes from dumpstream.\n" + "usage: svndumpfilter include PATH_PREFIX...\n" + )}, {svndumpfilter__drop_empty_revs, svndumpfilter__drop_all_empty_revs, svndumpfilter__renumber_revs, svndumpfilter__skip_missing_merge_sources, svndumpfilter__targets, svndumpfilter__preserve_revprops, svndumpfilter__quiet, svndumpfilter__glob} }, - {"help", subcommand_help, {"?", "h"}, - N_("Describe the usage of this program or its subcommands.\n" - "usage: svndumpfilter help [SUBCOMMAND...]\n"), + {"help", subcommand_help, {"?", "h"}, {N_( + "Describe the usage of this program or its subcommands.\n" + "usage: svndumpfilter help [SUBCOMMAND...]\n" + )}, {0} }, - { NULL, NULL, {0}, NULL, {0} } + { NULL, NULL, {0}, {NULL}, {0} } }; @@ -1082,7 +1084,7 @@ subcommand_help(apr_getopt_t *os, void *baton, apr_pool_t *pool) "\n" "Available subcommands:\n"); - SVN_ERR(svn_opt_print_help4(os, "svndumpfilter", + SVN_ERR(svn_opt_print_help5(os, "svndumpfilter", opt_state ? opt_state->version : FALSE, opt_state ? opt_state->quiet : FALSE, /*###opt_state ? opt_state->verbose :*/ FALSE, @@ -1294,7 +1296,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) svn_error_t *err; apr_status_t apr_err; - const svn_opt_subcommand_desc2_t *subcommand = NULL; + const svn_opt_subcommand_desc3_t *subcommand = NULL; struct svndumpfilter_opt_state opt_state; apr_getopt_t *os; int opt_id; @@ -1401,7 +1403,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) just typos/mistakes. Whatever the case, the subcommand to actually run is subcommand_help(). */ if (opt_state.help) - subcommand = svn_opt_get_canonical_subcommand2(cmd_table, "help"); + subcommand = svn_opt_get_canonical_subcommand3(cmd_table, "help"); /* If we're not running the `help' subcommand, then look for a subcommand in the first argument. */ @@ -1412,8 +1414,8 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_state.version) { /* Use the "help" subcommand to handle the "--version" option. */ - static const svn_opt_subcommand_desc2_t pseudo_cmd = - { "--version", subcommand_help, {0}, "", + static const svn_opt_subcommand_desc3_t pseudo_cmd = + { "--version", subcommand_help, {0}, {""}, {svndumpfilter__version, /* must accept its own option */ svndumpfilter__quiet, } }; @@ -1436,7 +1438,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) SVN_ERR(svn_utf_cstring_to_utf8(&first_arg, os->argv[os->ind++], pool)); - subcommand = svn_opt_get_canonical_subcommand2(cmd_table, first_arg); + subcommand = svn_opt_get_canonical_subcommand3(cmd_table, first_arg); if (subcommand == NULL) { svn_error_clear( @@ -1466,7 +1468,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) /* Ensure that each prefix is UTF8-encoded, in internal style, and absolute. */ SVN_ERR(svn_utf_cstring_to_utf8(&prefix, os->argv[i], pool)); - prefix = svn_relpath__internal_style(prefix, pool); + SVN_ERR(svn_relpath__make_internal(&prefix, prefix, pool, pool)); if (prefix[0] != '/') prefix = apr_pstrcat(pool, "/", prefix, SVN_VA_NULL); APR_ARRAY_PUSH(opt_state.prefixes, const char *) = prefix; @@ -1522,11 +1524,11 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_id == 'h' || opt_id == '?') continue; - if (! svn_opt_subcommand_takes_option3(subcommand, opt_id, NULL)) + if (! svn_opt_subcommand_takes_option4(subcommand, opt_id, NULL)) { const char *optstr; const apr_getopt_option_t *badopt = - svn_opt_get_option_from_code2(opt_id, options_table, subcommand, + svn_opt_get_option_from_code3(opt_id, options_table, subcommand, pool); svn_opt_format_option(&optstr, badopt, FALSE, pool); if (subcommand->name[0] == '-') diff --git a/subversion/svnfsfs/dump-index-cmd.c b/subversion/svnfsfs/dump-index-cmd.c index 5598c98..7972480 100644 --- a/subversion/svnfsfs/dump-index-cmd.c +++ b/subversion/svnfsfs/dump-index-cmd.c @@ -79,6 +79,7 @@ dump_index(const char *path, apr_pool_t *pool) { svn_fs_t *fs; + svn_fs_fs__ioctl_dump_index_input_t input = {0}; /* Check repository type and open it. */ SVN_ERR(open_fs(&fs, path, pool)); @@ -87,8 +88,10 @@ dump_index(const char *path, printf(" Start Length Type Revision Item Checksum\n"); /* Dump the whole index contents */ - SVN_ERR(svn_fs_fs__dump_index(fs, revision, dump_index_entry, NULL, - check_cancel, NULL, pool)); + input.revision = revision; + input.callback_func = dump_index_entry; + SVN_ERR(svn_fs_ioctl(fs, SVN_FS_FS__IOCTL_DUMP_INDEX, &input, NULL, + check_cancel, NULL, pool, pool)); return SVN_NO_ERROR; } diff --git a/subversion/svnfsfs/load-index-cmd.c b/subversion/svnfsfs/load-index-cmd.c index e3b5c0d..88e2613 100644 --- a/subversion/svnfsfs/load-index-cmd.c +++ b/subversion/svnfsfs/load-index-cmd.c @@ -135,6 +135,7 @@ load_index(const char *path, svn_revnum_t revision = SVN_INVALID_REVNUM; apr_array_header_t *entries = apr_array_make(pool, 16, sizeof(void*)); apr_pool_t *iterpool = svn_pool_create(pool); + svn_fs_fs__ioctl_load_index_input_t ioctl_input = {0}; /* Check repository type and open it. */ SVN_ERR(open_fs(&fs, path, pool)); @@ -147,7 +148,7 @@ load_index(const char *path, /* Get the next line from the input and stop if there is none. */ svn_pool_clear(iterpool); - svn_stream_readline(input, &line, "\n", &eol, iterpool); + SVN_ERR(svn_stream_readline(input, &line, "\n", &eol, iterpool)); if (eol) break; @@ -173,7 +174,10 @@ load_index(const char *path, } /* Rewrite the indexes. */ - SVN_ERR(svn_fs_fs__load_index(fs, revision, entries, iterpool)); + ioctl_input.revision = revision; + ioctl_input.entries = entries; + SVN_ERR(svn_fs_ioctl(fs, SVN_FS_FS__IOCTL_LOAD_INDEX, &ioctl_input, NULL, + NULL, NULL, pool, pool)); svn_pool_destroy(iterpool); return SVN_NO_ERROR; diff --git a/subversion/svnfsfs/stats-cmd.c b/subversion/svnfsfs/stats-cmd.c index 2cd294a..1a2f3d4 100644 --- a/subversion/svnfsfs/stats-cmd.c +++ b/subversion/svnfsfs/stats-cmd.c @@ -500,15 +500,17 @@ svn_error_t * subcommand__stats(apr_getopt_t *os, void *baton, apr_pool_t *pool) { svnfsfs__opt_state *opt_state = baton; - svn_fs_fs__stats_t *stats; svn_fs_t *fs; + svn_fs_fs__ioctl_get_stats_input_t input = {0}; + svn_fs_fs__ioctl_get_stats_output_t *output; printf("Reading revisions\n"); SVN_ERR(open_fs(&fs, opt_state->repository_path, pool)); - SVN_ERR(svn_fs_fs__get_stats(&stats, fs, print_progress, NULL, - check_cancel, NULL, pool, pool)); - print_stats(stats, pool); + input.progress_func = print_progress; + SVN_ERR(svn_fs_ioctl(fs, SVN_FS_FS__IOCTL_GET_STATS, &input, (void **)&output, + check_cancel, NULL, pool, pool)); + print_stats(output->stats, pool); return SVN_NO_ERROR; } diff --git a/subversion/svnfsfs/svnfsfs.c b/subversion/svnfsfs/svnfsfs.c index ed3e664..6fcb792 100644 --- a/subversion/svnfsfs/svnfsfs.c +++ b/subversion/svnfsfs/svnfsfs.c @@ -111,22 +111,27 @@ static const apr_getopt_option_t options_table[] = /* Array of available subcommands. * The entire list must be terminated with an entry of nulls. */ -static const svn_opt_subcommand_desc2_t cmd_table[] = +static const svn_opt_subcommand_desc3_t cmd_table[] = { - {"help", subcommand__help, {"?", "h"}, N_ - ("usage: svnfsfs help [SUBCOMMAND...]\n\n" - "Describe the usage of this program or its subcommands.\n"), + {"help", subcommand__help, {"?", "h"}, {N_( + "usage: svnfsfs help [SUBCOMMAND...]\n" + "\n"), N_( + "Describe the usage of this program or its subcommands.\n" + )}, {0} }, - {"dump-index", subcommand__dump_index, {0}, N_ - ("usage: svnfsfs dump-index REPOS_PATH -r REV\n\n" + {"dump-index", subcommand__dump_index, {0}, {N_( + "usage: svnfsfs dump-index REPOS_PATH -r REV\n" + "\n"), N_( "Dump the index contents for the revision / pack file containing revision REV\n" "to console. This is only available for FSFS format 7 (SVN 1.9+) repositories.\n" "The table produced contains a header in the first line followed by one line\n" - "per index entry, ordered by location in the revision / pack file. Columns:\n\n" + "per index entry, ordered by location in the revision / pack file. Columns:\n" + "\n"), N_( " * Byte offset (hex) at which the item starts\n" " * Length (hex) of the item in bytes\n" - " * Item type (string) is one of the following:\n\n" + " * Item type (string) is one of the following:\n" + "\n"), N_( " none ... Unused section. File contents shall be NULs.\n" " frep ... File representation.\n" " drep ... Directory representation.\n" @@ -135,29 +140,36 @@ static const svn_opt_subcommand_desc2_t cmd_table[] = " node ... Node revision.\n" " chgs ... Changed paths list.\n" " rep .... Representation of unknown type. Should not be used.\n" - " ??? .... Invalid. Index data is corrupt.\n\n" + " ??? .... Invalid. Index data is corrupt.\n" + "\n"), N_( " The distinction between frep, drep, fprop and dprop is a mere internal\n" " classification used for various optimizations and does not affect the\n" - " operational correctness.\n\n" + " operational correctness.\n" + "\n"), N_( " * Revision that the item belongs to (decimal)\n" " * Item number (decimal) within that revision\n" - " * Modified FNV1a checksum (8 hex digits)\n"), + " * Modified FNV1a checksum (8 hex digits)\n" + )}, {'r', 'M'} }, - {"load-index", subcommand__load_index, {0}, N_ - ("usage: svnfsfs load-index REPOS_PATH\n\n" + {"load-index", subcommand__load_index, {0}, {N_( + "usage: svnfsfs load-index REPOS_PATH\n" + "\n"), N_( "Read index contents from console. The format is the same as produced by the\n" "dump-index command, except that checksum as well as header are optional and will\n" "be ignored. The data must cover the full revision / pack file; the revision\n" - "number is automatically extracted from input stream. No ordering is required.\n"), + "number is automatically extracted from input stream. No ordering is required.\n" + )}, {'M'} }, - {"stats", subcommand__stats, {0}, N_ - ("usage: svnfsfs stats REPOS_PATH\n\n" - "Write object size statistics to console.\n"), + {"stats", subcommand__stats, {0}, {N_( + "usage: svnfsfs stats REPOS_PATH\n" + "\n"), N_( + "Write object size statistics to console.\n" + )}, {'M'} }, - { NULL, NULL, {0}, NULL, {0} } + { NULL, NULL, {0}, {NULL}, {0} } }; @@ -196,7 +208,7 @@ subcommand__help(apr_getopt_t *os, void *baton, apr_pool_t *pool) "\n" "Available subcommands:\n"); - SVN_ERR(svn_opt_print_help4(os, "svnfsfs", + SVN_ERR(svn_opt_print_help5(os, "svnfsfs", opt_state ? opt_state->version : FALSE, opt_state ? opt_state->quiet : FALSE, /*###opt_state ? opt_state->verbose :*/ FALSE, @@ -221,7 +233,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) svn_error_t *err; apr_status_t apr_err; - const svn_opt_subcommand_desc2_t *subcommand = NULL; + const svn_opt_subcommand_desc3_t *subcommand = NULL; svnfsfs__opt_state opt_state = { 0 }; apr_getopt_t *os; int opt_id; @@ -325,7 +337,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) just typos/mistakes. Whatever the case, the subcommand to actually run is subcommand_help(). */ if (opt_state.help) - subcommand = svn_opt_get_canonical_subcommand2(cmd_table, "help"); + subcommand = svn_opt_get_canonical_subcommand3(cmd_table, "help"); /* If we're not running the `help' subcommand, then look for a subcommand in the first argument. */ @@ -336,8 +348,8 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_state.version) { /* Use the "help" subcommand to handle the "--version" option. */ - static const svn_opt_subcommand_desc2_t pseudo_cmd = - { "--version", subcommand__help, {0}, "", + static const svn_opt_subcommand_desc3_t pseudo_cmd = + { "--version", subcommand__help, {0}, {""}, {svnfsfs__version, /* must accept its own option */ 'q', /* --quiet */ } }; @@ -359,7 +371,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) SVN_ERR(svn_utf_cstring_to_utf8(&first_arg, os->argv[os->ind++], pool)); - subcommand = svn_opt_get_canonical_subcommand2(cmd_table, first_arg); + subcommand = svn_opt_get_canonical_subcommand3(cmd_table, first_arg); if (subcommand == NULL) { svn_error_clear( @@ -409,11 +421,11 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_id == 'h' || opt_id == '?') continue; - if (! svn_opt_subcommand_takes_option3(subcommand, opt_id, NULL)) + if (! svn_opt_subcommand_takes_option4(subcommand, opt_id, NULL)) { const char *optstr; const apr_getopt_option_t *badopt = - svn_opt_get_option_from_code2(opt_id, options_table, subcommand, + svn_opt_get_option_from_code3(opt_id, options_table, subcommand, pool); svn_opt_format_option(&optstr, badopt, FALSE, pool); if (subcommand->name[0] == '-') diff --git a/subversion/svnlook/svnlook.c b/subversion/svnlook/svnlook.c index 261909c..d6f9506 100644 --- a/subversion/svnlook/svnlook.c +++ b/subversion/svnlook/svnlook.c @@ -212,110 +212,144 @@ static const apr_getopt_option_t options_table[] = /* Array of available subcommands. * The entire list must be terminated with an entry of nulls. */ -static const svn_opt_subcommand_desc2_t cmd_table[] = +static const svn_opt_subcommand_desc3_t cmd_table[] = { - {"author", subcommand_author, {0}, - N_("usage: svnlook author REPOS_PATH\n\n" - "Print the author.\n"), + {"author", subcommand_author, {0}, {N_( + "usage: svnlook author REPOS_PATH\n" + "\n"), N_( + "Print the author.\n" + )}, {'r', 't'} }, - {"cat", subcommand_cat, {0}, - N_("usage: svnlook cat REPOS_PATH FILE_PATH\n\n" - "Print the contents of a file. Leading '/' on FILE_PATH is optional.\n"), + {"cat", subcommand_cat, {0}, {N_( + "usage: svnlook cat REPOS_PATH FILE_PATH\n" + "\n"), N_( + "Print the contents of a file. Leading '/' on FILE_PATH is optional.\n" + )}, {'r', 't'} }, - {"changed", subcommand_changed, {0}, - N_("usage: svnlook changed REPOS_PATH\n\n" - "Print the paths that were changed.\n"), + {"changed", subcommand_changed, {0}, {N_( + "usage: svnlook changed REPOS_PATH\n" + "\n"), N_( + "Print the paths that were changed.\n" + )}, {'r', 't', svnlook__copy_info} }, - {"date", subcommand_date, {0}, - N_("usage: svnlook date REPOS_PATH\n\n" - "Print the datestamp.\n"), + {"date", subcommand_date, {0}, {N_( + "usage: svnlook date REPOS_PATH\n" + "\n"), N_( + "Print the datestamp.\n" + )}, {'r', 't'} }, - {"diff", subcommand_diff, {0}, - N_("usage: svnlook diff REPOS_PATH\n\n" - "Print GNU-style diffs of changed files and properties.\n"), + {"diff", subcommand_diff, {0}, {N_( + "usage: svnlook diff REPOS_PATH\n" + "\n"), N_( + "Print GNU-style diffs of changed files and properties.\n" + )}, {'r', 't', svnlook__no_diff_deleted, svnlook__no_diff_added, svnlook__diff_copy_from, svnlook__diff_cmd, 'x', svnlook__ignore_properties, svnlook__properties_only} }, - {"dirs-changed", subcommand_dirschanged, {0}, - N_("usage: svnlook dirs-changed REPOS_PATH\n\n" + {"dirs-changed", subcommand_dirschanged, {0}, {N_( + "usage: svnlook dirs-changed REPOS_PATH\n" + "\n"), N_( "Print the directories that were themselves changed (property edits)\n" - "or whose file children were changed.\n"), + "or whose file children were changed.\n" + )}, {'r', 't'} }, - {"filesize", subcommand_filesize, {0}, - N_("usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n\n" + {"filesize", subcommand_filesize, {0}, {N_( + "usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n" + "\n"), N_( "Print the size (in bytes) of the file located at PATH_IN_REPOS as\n" - "it is represented in the repository.\n"), + "it is represented in the repository.\n" + )}, {'r', 't'} }, - {"help", subcommand_help, {"?", "h"}, - N_("usage: svnlook help [SUBCOMMAND...]\n\n" - "Describe the usage of this program or its subcommands.\n"), + {"help", subcommand_help, {"?", "h"}, {N_( + "usage: svnlook help [SUBCOMMAND...]\n" + "\n"), N_( + "Describe the usage of this program or its subcommands.\n" + )}, {0} }, - {"history", subcommand_history, {0}, - N_("usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n\n" + {"history", subcommand_history, {0}, {N_( + "usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n" + "\n"), N_( "Print information about the history of a path in the repository (or\n" - "the root directory if no path is supplied).\n"), + "the root directory if no path is supplied).\n" + )}, {'r', svnlook__show_ids, 'l'} }, - {"info", subcommand_info, {0}, - N_("usage: svnlook info REPOS_PATH\n\n" - "Print the author, datestamp, log message size, and log message.\n"), + {"info", subcommand_info, {0}, {N_( + "usage: svnlook info REPOS_PATH\n" + "\n"), N_( + "Print the author, datestamp, log message size, and log message.\n" + )}, {'r', 't'} }, - {"lock", subcommand_lock, {0}, - N_("usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n\n" - "If a lock exists on a path in the repository, describe it.\n"), + {"lock", subcommand_lock, {0}, {N_( + "usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n" + "\n"), N_( + "If a lock exists on a path in the repository, describe it.\n" + )}, {0} }, - {"log", subcommand_log, {0}, - N_("usage: svnlook log REPOS_PATH\n\n" - "Print the log message.\n"), + {"log", subcommand_log, {0}, {N_( + "usage: svnlook log REPOS_PATH\n" + "\n"), N_( + "Print the log message.\n" + )}, {'r', 't'} }, - {"propget", subcommand_pget, {"pget", "pg"}, - N_("usage: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n" + {"propget", subcommand_pget, {"pget", "pg"}, {N_( + "usage: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n" " " /* The line above is actually needed, so do NOT delete it! */ - " 2. svnlook propget --revprop REPOS_PATH PROPNAME\n\n" + " 2. svnlook propget --revprop REPOS_PATH PROPNAME\n" + "\n"), N_( "Print the raw value of a property on a path in the repository.\n" - "With --revprop, print the raw value of a revision property.\n"), + "With --revprop, print the raw value of a revision property.\n" + )}, {'r', 't', 'v', svnlook__revprop_opt, svnlook__show_inherited_props} }, - {"proplist", subcommand_plist, {"plist", "pl"}, - N_("usage: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n" + {"proplist", subcommand_plist, {"plist", "pl"}, {N_( + "usage: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n" " " /* The line above is actually needed, so do NOT delete it! */ - " 2. svnlook proplist --revprop REPOS_PATH\n\n" + " 2. svnlook proplist --revprop REPOS_PATH\n" + "\n"), N_( "List the properties of a path in the repository, or\n" "with the --revprop option, revision properties.\n" - "With -v, show the property values too.\n"), + "With -v, show the property values too.\n" + )}, {'r', 't', 'v', svnlook__revprop_opt, svnlook__xml_opt, svnlook__show_inherited_props} }, - {"tree", subcommand_tree, {0}, - N_("usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n\n" + {"tree", subcommand_tree, {0}, {N_( + "usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n" + "\n"), N_( "Print the tree, starting at PATH_IN_REPOS (if supplied, at the root\n" - "of the tree otherwise), optionally showing node revision ids.\n"), + "of the tree otherwise), optionally showing node revision ids.\n" + )}, {'r', 't', 'N', svnlook__show_ids, svnlook__full_paths, 'M'} }, - {"uuid", subcommand_uuid, {0}, - N_("usage: svnlook uuid REPOS_PATH\n\n" - "Print the repository's UUID.\n"), + {"uuid", subcommand_uuid, {0}, {N_( + "usage: svnlook uuid REPOS_PATH\n" + "\n"), N_( + "Print the repository's UUID.\n" + )}, {0} }, - {"youngest", subcommand_youngest, {0}, - N_("usage: svnlook youngest REPOS_PATH\n\n" - "Print the youngest revision number.\n"), + {"youngest", subcommand_youngest, {0}, {N_( + "usage: svnlook youngest REPOS_PATH\n" + "\n"), N_( + "Print the youngest revision number.\n" + )}, {svnlook__no_newline} }, - { NULL, NULL, {0}, NULL, {0} } + { NULL, NULL, {0}, {NULL}, {0} } }; @@ -2222,7 +2256,7 @@ subcommand_help(apr_getopt_t *os, void *baton, apr_pool_t *pool) version_footer = svn_stringbuf_create(fs_desc_start, pool); SVN_ERR(svn_fs_print_modules(version_footer, pool)); - SVN_ERR(svn_opt_print_help4(os, "svnlook", + SVN_ERR(svn_opt_print_help5(os, "svnlook", opt_state ? opt_state->version : FALSE, opt_state ? opt_state->quiet : FALSE, opt_state ? opt_state->verbose : FALSE, @@ -2437,7 +2471,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) svn_error_t *err; apr_status_t apr_err; - const svn_opt_subcommand_desc2_t *subcommand = NULL; + const svn_opt_subcommand_desc3_t *subcommand = NULL; struct svnlook_opt_state opt_state; apr_getopt_t *os; int opt_id; @@ -2634,7 +2668,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) just typos/mistakes. Whatever the case, the subcommand to actually run is subcommand_help(). */ if (opt_state.help) - subcommand = svn_opt_get_canonical_subcommand2(cmd_table, "help"); + subcommand = svn_opt_get_canonical_subcommand3(cmd_table, "help"); /* If we're not running the `help' subcommand, then look for a subcommand in the first argument. */ @@ -2645,8 +2679,8 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_state.version) { /* Use the "help" subcommand to handle the "--version" option. */ - static const svn_opt_subcommand_desc2_t pseudo_cmd = - { "--version", subcommand_help, {0}, "", + static const svn_opt_subcommand_desc3_t pseudo_cmd = + { "--version", subcommand_help, {0}, {""}, {svnlook__version, /* must accept its own option */ 'q', 'v', } }; @@ -2669,7 +2703,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) SVN_ERR(svn_utf_cstring_to_utf8(&first_arg, os->argv[os->ind++], pool)); - subcommand = svn_opt_get_canonical_subcommand2(cmd_table, first_arg); + subcommand = svn_opt_get_canonical_subcommand3(cmd_table, first_arg); if (subcommand == NULL) { svn_error_clear( @@ -2762,11 +2796,11 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_id == 'h' || opt_id == '?') continue; - if (! svn_opt_subcommand_takes_option3(subcommand, opt_id, NULL)) + if (! svn_opt_subcommand_takes_option4(subcommand, opt_id, NULL)) { const char *optstr; const apr_getopt_option_t *badopt = - svn_opt_get_option_from_code2(opt_id, options_table, subcommand, + svn_opt_get_option_from_code3(opt_id, options_table, subcommand, pool); svn_opt_format_option(&optstr, badopt, FALSE, pool); if (subcommand->name[0] == '-') diff --git a/subversion/svnmucc/svnmucc.c b/subversion/svnmucc/svnmucc.c index d9f893e..e6ec38a 100644 --- a/subversion/svnmucc/svnmucc.c +++ b/subversion/svnmucc/svnmucc.c @@ -342,7 +342,7 @@ display_version(apr_pool_t *pool) version_footer = svn_stringbuf_create(ra_desc_start, pool); SVN_ERR(svn_ra_print_modules(version_footer, pool)); - SVN_ERR(svn_opt_print_help4(NULL, "svnmucc", TRUE, FALSE, FALSE, + SVN_ERR(svn_opt_print_help5(NULL, "svnmucc", TRUE, FALSE, FALSE, version_footer->data, NULL, NULL, NULL, NULL, NULL, pool)); diff --git a/subversion/svnrdump/dump_editor.c b/subversion/svnrdump/dump_editor.c index f900e20..ef52b41 100644 --- a/subversion/svnrdump/dump_editor.c +++ b/subversion/svnrdump/dump_editor.c @@ -22,951 +22,28 @@ * ==================================================================== */ -#include "svn_hash.h" -#include "svn_pools.h" -#include "svn_repos.h" -#include "svn_path.h" +#include "svn_types.h" #include "svn_props.h" -#include "svn_subst.h" -#include "svn_dirent_uri.h" +#include "svn_ra.h" +#include "svn_io.h" +#include "svn_delta.h" #include "private/svn_repos_private.h" -#include "private/svn_subr_private.h" -#include "private/svn_dep_compat.h" #include "private/svn_editor.h" #include "svnrdump.h" #include -#define ARE_VALID_COPY_ARGS(p,r) ((p) && SVN_IS_VALID_REVNUM(r)) - - -/* A directory baton used by all directory-related callback functions - * in the dump editor. */ -struct dir_baton -{ - struct dump_edit_baton *eb; - - /* Pool for per-directory allocations */ - apr_pool_t *pool; - - /* the path to this directory */ - const char *repos_relpath; /* a relpath */ - - /* Copyfrom info for the node, if any. */ - const char *copyfrom_path; /* a relpath */ - svn_revnum_t copyfrom_rev; - - /* Headers accumulated so far for this directory */ - svn_repos__dumpfile_headers_t *headers; - - /* Properties which were modified during change_dir_prop. */ - apr_hash_t *props; - - /* Properties which were deleted during change_dir_prop. */ - apr_hash_t *deleted_props; - - /* Hash of paths that need to be deleted, though some -might- be - replaced. Maps const char * paths to this dir_baton. Note that - they're full paths, because that's what the editor driver gives - us, although they're all really within this directory. */ - apr_hash_t *deleted_entries; - - /* Flag to trigger dumping props. */ - svn_boolean_t dump_props; -}; - -/* A file baton used by all file-related callback functions in the dump - * editor */ -struct file_baton -{ - struct dump_edit_baton *eb; - - /* Pool for per-file allocations */ - apr_pool_t *pool; - - /* the path to this file */ - const char *repos_relpath; /* a relpath */ - - /* Properties which were modified during change_file_prop. */ - apr_hash_t *props; - - /* Properties which were deleted during change_file_prop. */ - apr_hash_t *deleted_props; - - /* The checksum of the file the delta is being applied to */ - const char *base_checksum; - - /* Copy state and source information (if any). */ - svn_boolean_t is_copy; - const char *copyfrom_path; - svn_revnum_t copyfrom_rev; - - /* The action associate with this node. */ - enum svn_node_action action; - - /* Flags to trigger dumping props and text. */ - svn_boolean_t dump_text; - svn_boolean_t dump_props; -}; /* The baton used by the dump editor. */ struct dump_edit_baton { - /* The output stream we write the dumpfile to */ - svn_stream_t *stream; - /* A backdoor ra session to fetch additional information during the edit. */ svn_ra_session_t *ra_session; - /* The repository relpath of the anchor of the editor when driven - via the RA update mechanism; NULL otherwise. (When the editor is - driven via the RA "replay" mechanism instead, the editor is - always anchored at the repository, we don't need to prepend an - anchor path to the dumped node paths, and open_root() doesn't - need to manufacture directory additions.) */ - const char *update_anchor_relpath; - - /* Pool for per-revision allocations */ - apr_pool_t *pool; - - /* Temporary file used for textdelta application along with its - absolute path; these two variables should be allocated in the - per-edit-session pool */ - const char *delta_abspath; - apr_file_t *delta_file; - /* The revision we're currently dumping. */ svn_revnum_t current_revision; - - /* The baton of the directory node whose block of - dump stream data has not been fully completed; NULL if there's no - such item. */ - struct dir_baton *pending_db; }; -/* Make a directory baton to represent the directory at PATH (relative - * to the EDIT_BATON). - * - * COPYFROM_PATH/COPYFROM_REV are the path/revision against which this - * directory should be compared for changes. If the copyfrom - * information is valid, the directory will be compared against its - * copy source. - * - * PB is the directory baton of this directory's parent, or NULL if - * this is the top-level directory of the edit. - * - * Perform all allocations in POOL. */ -static struct dir_baton * -make_dir_baton(const char *path, - const char *copyfrom_path, - svn_revnum_t copyfrom_rev, - void *edit_baton, - struct dir_baton *pb, - apr_pool_t *pool) -{ - struct dump_edit_baton *eb = edit_baton; - struct dir_baton *new_db = apr_pcalloc(pool, sizeof(*new_db)); - const char *repos_relpath; - - /* Construct the full path of this node. */ - if (pb) - repos_relpath = svn_relpath_canonicalize(path, pool); - else - repos_relpath = ""; - - /* Strip leading slash from copyfrom_path so that the path is - canonical and svn_relpath_join can be used */ - if (copyfrom_path) - copyfrom_path = svn_relpath_canonicalize(copyfrom_path, pool); - - new_db->eb = eb; - new_db->pool = pool; - new_db->repos_relpath = repos_relpath; - new_db->copyfrom_path = copyfrom_path - ? svn_relpath_canonicalize(copyfrom_path, pool) - : NULL; - new_db->copyfrom_rev = copyfrom_rev; - new_db->headers = NULL; - new_db->props = apr_hash_make(pool); - new_db->deleted_props = apr_hash_make(pool); - new_db->deleted_entries = apr_hash_make(pool); - - return new_db; -} - -/* Make a file baton to represent the directory at PATH (relative to - * PB->eb). PB is the directory baton of this directory's parent, or - * NULL if this is the top-level directory of the edit. Perform all - * allocations in POOL. */ -static struct file_baton * -make_file_baton(const char *path, - struct dir_baton *pb, - apr_pool_t *pool) -{ - struct file_baton *new_fb = apr_pcalloc(pool, sizeof(*new_fb)); - - new_fb->eb = pb->eb; - new_fb->pool = pool; - new_fb->repos_relpath = svn_relpath_canonicalize(path, pool); - new_fb->props = apr_hash_make(pool); - new_fb->deleted_props = apr_hash_make(pool); - new_fb->is_copy = FALSE; - new_fb->copyfrom_path = NULL; - new_fb->copyfrom_rev = SVN_INVALID_REVNUM; - new_fb->action = svn_node_action_change; - - return new_fb; -} - -/* Append to HEADERS the required headers, and set *CONTENT to the property - * content section, to represent the property delta of PROPS/DELETED_PROPS. - */ -static svn_error_t * -get_props_content(svn_repos__dumpfile_headers_t *headers, - svn_stringbuf_t **content, - apr_hash_t *props, - apr_hash_t *deleted_props, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) -{ - svn_stream_t *content_stream; - apr_hash_t *normal_props; - - *content = svn_stringbuf_create_empty(result_pool); - - content_stream = svn_stream_from_stringbuf(*content, scratch_pool); - - SVN_ERR(svn_rdump__normalize_props(&normal_props, props, scratch_pool)); - SVN_ERR(svn_hash_write_incremental(normal_props, deleted_props, - content_stream, "PROPS-END", - scratch_pool)); - SVN_ERR(svn_stream_close(content_stream)); - - /* Prop-delta: true */ - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_PROP_DELTA, "true"); - - return SVN_NO_ERROR; -} - -/* A special case of dump_node(), for a delete record. - * - * The only thing special about this version is it only writes one blank - * line, not two, after the headers. Why? Historical precedent for the - * case where a delete record is used as part of a (delete + add-with-history) - * in implementing a replacement. - */ -static svn_error_t * -dump_node_delete(svn_stream_t *stream, - const char *node_relpath, - apr_pool_t *pool) -{ - svn_repos__dumpfile_headers_t *headers - = svn_repos__dumpfile_headers_create(pool); - - assert(svn_relpath_is_canonical(node_relpath)); - - /* Node-path: ... */ - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_NODE_PATH, node_relpath); - - /* Node-action: delete */ - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_NODE_ACTION, "delete"); - - SVN_ERR(svn_repos__dump_node_record(stream, headers, - NULL, FALSE, 0, /* props & text */ - FALSE /*content_length_always*/, pool)); - return SVN_NO_ERROR; -} - -/* Set *HEADERS_P to contain some headers for the node at PATH of type KIND. - * - * ACTION describes what is happening to the node (see enum - * svn_node_action). - * - * If the node was itself copied, IS_COPY is TRUE and the - * path/revision of the copy source are in COPYFROM_PATH/COPYFROM_REV. - * If IS_COPY is FALSE, yet COPYFROM_PATH/COPYFROM_REV are valid, this - * node is part of a copied subtree. - * - * Iff ACTION is svn_node_action_replace and IS_COPY, then first write a - * complete deletion record to the dump stream. - * - * If ACTION is svn_node_action_delete, then the node record will be - * complete. (The caller may want to write two blank lines after the - * header block.) - */ -static svn_error_t * -dump_node(svn_repos__dumpfile_headers_t **headers_p, - struct dump_edit_baton *eb, - const char *repos_relpath, - struct dir_baton *db, - struct file_baton *fb, - enum svn_node_action action, - svn_boolean_t is_copy, - const char *copyfrom_path, - svn_revnum_t copyfrom_rev, - apr_pool_t *pool) -{ - const char *node_relpath = repos_relpath; - svn_repos__dumpfile_headers_t *headers - = svn_repos__dumpfile_headers_create(pool); - - assert(svn_relpath_is_canonical(repos_relpath)); - assert(!copyfrom_path || svn_relpath_is_canonical(copyfrom_path)); - assert(! (db && fb)); - - /* Add the edit root relpath prefix if necessary. */ - if (eb->update_anchor_relpath) - node_relpath = svn_relpath_join(eb->update_anchor_relpath, - node_relpath, pool); - - /* Node-path: ... */ - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_NODE_PATH, node_relpath); - - /* Node-kind: "file" | "dir" */ - if (fb) - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_NODE_KIND, "file"); - else if (db) - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_NODE_KIND, "dir"); - - - /* Write the appropriate Node-action header */ - switch (action) - { - case svn_node_action_change: - /* We are here after a change_file_prop or change_dir_prop. They - set up whatever dump_props they needed to- nothing to - do here but print node action information. - - Node-action: change. */ - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_NODE_ACTION, "change"); - break; - - case svn_node_action_delete: - /* Node-action: delete */ - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_NODE_ACTION, "delete"); - break; - - case svn_node_action_replace: - if (! is_copy) - { - /* Node-action: replace */ - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_NODE_ACTION, "replace"); - - /* Wait for a change_*_prop to be called before dumping - anything */ - if (fb) - fb->dump_props = TRUE; - else if (db) - db->dump_props = TRUE; - break; - } - else - { - /* More complex case: is_copy is true, and copyfrom_path/ - copyfrom_rev are present: delete the original, and then re-add - it */ - /* ### Why not write a 'replace' record? Don't know. */ - - /* ### Unusually, we end this 'delete' node record with only a single - blank line after the header block -- no extra blank line. */ - SVN_ERR(dump_node_delete(eb->stream, repos_relpath, pool)); - - /* The remaining action is a non-replacing add-with-history */ - /* action = svn_node_action_add; */ - } - /* FALL THROUGH to 'add' */ - - case svn_node_action_add: - /* Node-action: add */ - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_NODE_ACTION, "add"); - - if (is_copy) - { - /* Node-copyfrom-rev / Node-copyfrom-path */ - svn_repos__dumpfile_header_pushf( - headers, SVN_REPOS_DUMPFILE_NODE_COPYFROM_REV, "%ld", copyfrom_rev); - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_NODE_COPYFROM_PATH, copyfrom_path); - } - else - { - /* fb->dump_props (for files) is handled in close_file() - which is called immediately. - - However, directories are not closed until all the work - inside them has been done; db->dump_props (for directories) - is handled (via dump_pending()) in all the functions that - can possibly be called after add_directory(): - - - add_directory() - - open_directory() - - delete_entry() - - close_directory() - - add_file() - - open_file() - - change_dir_prop() is a special case. */ - if (fb) - fb->dump_props = TRUE; - else if (db) - db->dump_props = TRUE; - } - - break; - } - - /* Return the headers so far. We don't necessarily have all the headers - yet -- there may be property-related and content length headers to - come, if this was not a 'delete' record. */ - *headers_p = headers; - return SVN_NO_ERROR; -} - -static svn_error_t * -dump_mkdir(struct dump_edit_baton *eb, - const char *repos_relpath, - apr_pool_t *pool) -{ - svn_stringbuf_t *prop_content; - svn_repos__dumpfile_headers_t *headers - = svn_repos__dumpfile_headers_create(pool); - - /* Node-path: ... */ - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_NODE_PATH, repos_relpath); - - /* Node-kind: dir */ - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_NODE_KIND, "dir"); - - /* Node-action: add */ - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_NODE_ACTION, "add"); - - /* Dump the (empty) property block. */ - SVN_ERR(get_props_content(headers, &prop_content, - apr_hash_make(pool), apr_hash_make(pool), - pool, pool)); - SVN_ERR(svn_repos__dump_node_record(eb->stream, headers, prop_content, - FALSE, 0, FALSE /*content_length_always*/, - pool)); - - /* Newlines to tie it all off. */ - SVN_ERR(svn_stream_puts(eb->stream, "\n\n")); - - return SVN_NO_ERROR; -} - -/* Dump pending headers and properties for the directory EB->pending_db (if - * not null), to allow starting the dump of a child node */ -static svn_error_t * -dump_pending_dir(struct dump_edit_baton *eb, - apr_pool_t *scratch_pool) -{ - struct dir_baton *db = eb->pending_db; - svn_stringbuf_t *prop_content = NULL; - - if (! db) - return SVN_NO_ERROR; - - /* Some pending properties to dump? */ - if (db->dump_props) - { - SVN_ERR(get_props_content(db->headers, &prop_content, - db->props, db->deleted_props, - scratch_pool, scratch_pool)); - } - SVN_ERR(svn_repos__dump_node_record(eb->stream, db->headers, prop_content, - FALSE, 0, FALSE /*content_length_always*/, - scratch_pool)); - - /* No text is going to be dumped. Write a couple of newlines and - wait for the next node/ revision. */ - SVN_ERR(svn_stream_puts(eb->stream, "\n\n")); - - if (db->dump_props) - { - /* Cleanup so that data is never dumped twice. */ - apr_hash_clear(db->props); - apr_hash_clear(db->deleted_props); - db->dump_props = FALSE; - } - - /* Anything that was pending is pending no longer. */ - eb->pending_db = NULL; - - return SVN_NO_ERROR; -} - - - -/*** Editor Function Implementations ***/ - -static svn_error_t * -open_root(void *edit_baton, - svn_revnum_t base_revision, - apr_pool_t *pool, - void **root_baton) -{ - struct dump_edit_baton *eb = edit_baton; - struct dir_baton *new_db = NULL; - - /* Clear the per-revision pool after each revision */ - svn_pool_clear(eb->pool); - - if (eb->update_anchor_relpath) - { - int i; - const char *parent_path = eb->update_anchor_relpath; - apr_array_header_t *dirs_to_add = - apr_array_make(pool, 4, sizeof(const char *)); - apr_pool_t *iterpool = svn_pool_create(pool); - - while (! svn_path_is_empty(parent_path)) - { - APR_ARRAY_PUSH(dirs_to_add, const char *) = parent_path; - parent_path = svn_relpath_dirname(parent_path, pool); - } - - for (i = dirs_to_add->nelts; i; --i) - { - const char *dir_to_add = - APR_ARRAY_IDX(dirs_to_add, i - 1, const char *); - - svn_pool_clear(iterpool); - - /* For parents of the source directory, we just manufacture - the adds ourselves. */ - if (i > 1) - { - SVN_ERR(dump_mkdir(eb, dir_to_add, iterpool)); - } - else - { - /* ... but for the source directory itself, we'll defer - to letting the typical plumbing handle this task. */ - new_db = make_dir_baton(NULL, NULL, SVN_INVALID_REVNUM, - edit_baton, NULL, pool); - SVN_ERR(dump_node(&new_db->headers, - eb, new_db->repos_relpath, new_db, - NULL, svn_node_action_add, FALSE, - NULL, SVN_INVALID_REVNUM, pool)); - - /* Remember that we've started but not yet finished - handling this directory. */ - eb->pending_db = new_db; - } - } - svn_pool_destroy(iterpool); - } - - if (! new_db) - { - new_db = make_dir_baton(NULL, NULL, SVN_INVALID_REVNUM, - edit_baton, NULL, pool); - } - - *root_baton = new_db; - return SVN_NO_ERROR; -} - -static svn_error_t * -delete_entry(const char *path, - svn_revnum_t revision, - void *parent_baton, - apr_pool_t *pool) -{ - struct dir_baton *pb = parent_baton; - - SVN_ERR(dump_pending_dir(pb->eb, pool)); - - /* We don't dump this deletion immediate. Rather, we add this path - to the deleted_entries of the parent directory baton. That way, - we can tell (later) an addition from a replacement. All the real - deletions get handled in close_directory(). */ - svn_hash_sets(pb->deleted_entries, apr_pstrdup(pb->pool, path), pb); - - return SVN_NO_ERROR; -} - -static svn_error_t * -add_directory(const char *path, - void *parent_baton, - const char *copyfrom_path, - svn_revnum_t copyfrom_rev, - apr_pool_t *pool, - void **child_baton) -{ - struct dir_baton *pb = parent_baton; - void *was_deleted; - struct dir_baton *new_db; - svn_boolean_t is_copy; - - SVN_ERR(dump_pending_dir(pb->eb, pool)); - - new_db = make_dir_baton(path, copyfrom_path, copyfrom_rev, pb->eb, - pb, pb->pool); - - /* This might be a replacement -- is the path already deleted? */ - was_deleted = svn_hash_gets(pb->deleted_entries, path); - - /* Detect an add-with-history */ - is_copy = ARE_VALID_COPY_ARGS(copyfrom_path, copyfrom_rev); - - /* Dump the node */ - SVN_ERR(dump_node(&new_db->headers, - pb->eb, new_db->repos_relpath, new_db, NULL, - was_deleted ? svn_node_action_replace : svn_node_action_add, - is_copy, - is_copy ? new_db->copyfrom_path : NULL, - is_copy ? copyfrom_rev : SVN_INVALID_REVNUM, - pool)); - - if (was_deleted) - /* Delete the path, it's now been dumped */ - svn_hash_sets(pb->deleted_entries, path, NULL); - - /* Remember that we've started, but not yet finished handling this - directory. */ - pb->eb->pending_db = new_db; - - *child_baton = new_db; - return SVN_NO_ERROR; -} - -static svn_error_t * -open_directory(const char *path, - void *parent_baton, - svn_revnum_t base_revision, - apr_pool_t *pool, - void **child_baton) -{ - struct dir_baton *pb = parent_baton; - struct dir_baton *new_db; - const char *copyfrom_path = NULL; - svn_revnum_t copyfrom_rev = SVN_INVALID_REVNUM; - - SVN_ERR(dump_pending_dir(pb->eb, pool)); - - /* If the parent directory has explicit comparison path and rev, - record the same for this one. */ - if (ARE_VALID_COPY_ARGS(pb->copyfrom_path, pb->copyfrom_rev)) - { - copyfrom_path = svn_relpath_join(pb->copyfrom_path, - svn_relpath_basename(path, NULL), - pb->pool); - copyfrom_rev = pb->copyfrom_rev; - } - - new_db = make_dir_baton(path, copyfrom_path, copyfrom_rev, pb->eb, pb, - pb->pool); - - *child_baton = new_db; - return SVN_NO_ERROR; -} - -static svn_error_t * -close_directory(void *dir_baton, - apr_pool_t *pool) -{ - struct dir_baton *db = dir_baton; - apr_hash_index_t *hi; - svn_boolean_t this_pending; - - /* Remember if this directory is the one currently pending. */ - this_pending = (db->eb->pending_db == db); - - SVN_ERR(dump_pending_dir(db->eb, pool)); - - /* If this directory was pending, then dump_pending() should have - taken care of all the props and such. Of course, the only way - that would be the case is if this directory was added/replaced. - - Otherwise, if stuff for this directory has already been written - out (at some point in the past, prior to our handling other - nodes), we might need to generate a second "change" record just - to carry the information we've since learned about the - directory. */ - if ((! this_pending) && (db->dump_props)) - { - SVN_ERR(dump_node(&db->headers, - db->eb, db->repos_relpath, db, NULL, - svn_node_action_change, FALSE, - NULL, SVN_INVALID_REVNUM, pool)); - db->eb->pending_db = db; - SVN_ERR(dump_pending_dir(db->eb, pool)); - } - - /* Dump the deleted directory entries */ - for (hi = apr_hash_first(pool, db->deleted_entries); hi; - hi = apr_hash_next(hi)) - { - const char *path = apr_hash_this_key(hi); - - SVN_ERR(dump_node_delete(db->eb->stream, path, pool)); - /* This deletion record is complete -- write an extra newline */ - SVN_ERR(svn_stream_puts(db->eb->stream, "\n")); - } - - /* ### should be unnecessary */ - apr_hash_clear(db->deleted_entries); - - return SVN_NO_ERROR; -} - -static svn_error_t * -add_file(const char *path, - void *parent_baton, - const char *copyfrom_path, - svn_revnum_t copyfrom_rev, - apr_pool_t *pool, - void **file_baton) -{ - struct dir_baton *pb = parent_baton; - struct file_baton *fb; - void *was_deleted; - - SVN_ERR(dump_pending_dir(pb->eb, pool)); - - /* Make the file baton. */ - fb = make_file_baton(path, pb, pool); - - /* This might be a replacement -- is the path already deleted? */ - was_deleted = svn_hash_gets(pb->deleted_entries, path); - - /* Detect add-with-history. */ - if (ARE_VALID_COPY_ARGS(copyfrom_path, copyfrom_rev)) - { - fb->copyfrom_path = svn_relpath_canonicalize(copyfrom_path, fb->pool); - fb->copyfrom_rev = copyfrom_rev; - fb->is_copy = TRUE; - } - fb->action = was_deleted ? svn_node_action_replace : svn_node_action_add; - - /* Delete the path, it's now been dumped. */ - if (was_deleted) - svn_hash_sets(pb->deleted_entries, path, NULL); - - *file_baton = fb; - return SVN_NO_ERROR; -} - -static svn_error_t * -open_file(const char *path, - void *parent_baton, - svn_revnum_t ancestor_revision, - apr_pool_t *pool, - void **file_baton) -{ - struct dir_baton *pb = parent_baton; - struct file_baton *fb; - - SVN_ERR(dump_pending_dir(pb->eb, pool)); - - /* Make the file baton. */ - fb = make_file_baton(path, pb, pool); - - /* If the parent directory has explicit copyfrom path and rev, - record the same for this one. */ - if (ARE_VALID_COPY_ARGS(pb->copyfrom_path, pb->copyfrom_rev)) - { - fb->copyfrom_path = svn_relpath_join(pb->copyfrom_path, - svn_relpath_basename(path, NULL), - pb->pool); - fb->copyfrom_rev = pb->copyfrom_rev; - } - - *file_baton = fb; - return SVN_NO_ERROR; -} - -static svn_error_t * -change_dir_prop(void *parent_baton, - const char *name, - const svn_string_t *value, - apr_pool_t *pool) -{ - struct dir_baton *db = parent_baton; - svn_boolean_t this_pending; - - /* This directory is not pending, but something else is, so handle - the "something else". */ - this_pending = (db->eb->pending_db == db); - if (! this_pending) - SVN_ERR(dump_pending_dir(db->eb, pool)); - - if (svn_property_kind2(name) != svn_prop_regular_kind) - return SVN_NO_ERROR; - - if (value) - svn_hash_sets(db->props, - apr_pstrdup(db->pool, name), - svn_string_dup(value, db->pool)); - else - svn_hash_sets(db->deleted_props, apr_pstrdup(db->pool, name), ""); - - /* Make sure we eventually output the props */ - db->dump_props = TRUE; - - return SVN_NO_ERROR; -} - -static svn_error_t * -change_file_prop(void *file_baton, - const char *name, - const svn_string_t *value, - apr_pool_t *pool) -{ - struct file_baton *fb = file_baton; - - if (svn_property_kind2(name) != svn_prop_regular_kind) - return SVN_NO_ERROR; - - if (value) - svn_hash_sets(fb->props, - apr_pstrdup(fb->pool, name), - svn_string_dup(value, fb->pool)); - else - svn_hash_sets(fb->deleted_props, apr_pstrdup(fb->pool, name), ""); - - /* Dump the property headers and wait; close_file might need - to write text headers too depending on whether - apply_textdelta is called */ - fb->dump_props = TRUE; - - return SVN_NO_ERROR; -} - -static svn_error_t * -apply_textdelta(void *file_baton, const char *base_checksum, - apr_pool_t *pool, - svn_txdelta_window_handler_t *handler, - void **handler_baton) -{ - struct file_baton *fb = file_baton; - struct dump_edit_baton *eb = fb->eb; - svn_stream_t *delta_filestream; - - /* Use a temporary file to measure the Text-content-length */ - delta_filestream = svn_stream_from_aprfile2(eb->delta_file, TRUE, pool); - - /* Prepare to write the delta to the delta_filestream */ - svn_txdelta_to_svndiff3(handler, handler_baton, - delta_filestream, 0, - SVN_DELTA_COMPRESSION_LEVEL_DEFAULT, pool); - - /* Record that there's text to be dumped, and its base checksum. */ - fb->dump_text = TRUE; - fb->base_checksum = apr_pstrdup(fb->pool, base_checksum); - - return SVN_NO_ERROR; -} - -static svn_error_t * -close_file(void *file_baton, - const char *text_checksum, - apr_pool_t *pool) -{ - struct file_baton *fb = file_baton; - struct dump_edit_baton *eb = fb->eb; - svn_filesize_t text_content_length = 0; - svn_stringbuf_t *propstring = NULL; - svn_repos__dumpfile_headers_t *headers; - - SVN_ERR(dump_pending_dir(eb, pool)); - - /* Start dumping this node, by collecting some basic headers for it. */ - SVN_ERR(dump_node(&headers, eb, fb->repos_relpath, NULL, fb, - fb->action, fb->is_copy, fb->copyfrom_path, - fb->copyfrom_rev, pool)); - - /* Some pending properties to dump? We'll dump just the headers for - now, then dump the actual propchange content only after dumping - the text headers too (if present). */ - if (fb->dump_props) - { - SVN_ERR(get_props_content(headers, &propstring, - fb->props, fb->deleted_props, - pool, pool)); - } - - /* Dump the text headers */ - if (fb->dump_text) - { - /* Text-delta: true */ - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_TEXT_DELTA, "true"); - - SVN_ERR(svn_io_file_size_get(&text_content_length, eb->delta_file, - pool)); - - if (fb->base_checksum) - /* Text-delta-base-md5: */ - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_MD5, fb->base_checksum); - - /* Text-content-md5: 82705804337e04dcd0e586bfa2389a7f */ - svn_repos__dumpfile_header_push( - headers, SVN_REPOS_DUMPFILE_TEXT_CONTENT_MD5, text_checksum); - } - - /* Dump the headers and props now */ - SVN_ERR(svn_repos__dump_node_record(eb->stream, headers, propstring, - fb->dump_text, text_content_length, - FALSE /*content_length_always*/, - pool)); - - if (fb->dump_props) - { - /* Cleanup */ - fb->dump_props = FALSE; - apr_hash_clear(fb->props); - apr_hash_clear(fb->deleted_props); - } - - /* Dump the text */ - if (fb->dump_text) - { - /* Seek to the beginning of the delta file, map it to a stream, - and copy the stream to eb->stream. Then close the stream and - truncate the file so we can reuse it for the next textdelta - application. Note that the file isn't created, opened or - closed here */ - svn_stream_t *delta_filestream; - apr_off_t offset = 0; - - SVN_ERR(svn_io_file_seek(eb->delta_file, APR_SET, &offset, pool)); - delta_filestream = svn_stream_from_aprfile2(eb->delta_file, TRUE, pool); - SVN_ERR(svn_stream_copy3(delta_filestream, eb->stream, NULL, NULL, pool)); - - /* Cleanup */ - SVN_ERR(svn_stream_close(delta_filestream)); - SVN_ERR(svn_io_file_trunc(eb->delta_file, 0, pool)); - } - - /* Write a couple of blank lines for matching output with `svnadmin - dump` */ - SVN_ERR(svn_stream_puts(eb->stream, "\n\n")); - - return SVN_NO_ERROR; -} - -static svn_error_t * -close_edit(void *edit_baton, apr_pool_t *pool) -{ - return SVN_NO_ERROR; -} - static svn_error_t * fetch_base_func(const char **filename, void *baton, @@ -1085,47 +162,21 @@ svn_rdump__get_dump_editor(const svn_delta_editor_t **editor, apr_pool_t *pool) { struct dump_edit_baton *eb; - svn_delta_editor_t *de; svn_delta_shim_callbacks_t *shim_callbacks = svn_delta_shim_callbacks_default(pool); eb = apr_pcalloc(pool, sizeof(struct dump_edit_baton)); - eb->stream = stream; eb->ra_session = ra_session; - eb->update_anchor_relpath = update_anchor_relpath; eb->current_revision = revision; - eb->pending_db = NULL; - - /* Create a special per-revision pool */ - eb->pool = svn_pool_create(pool); - - /* Open a unique temporary file for all textdelta applications in - this edit session. The file is automatically closed and cleaned - up when the edit session is done. */ - SVN_ERR(svn_io_open_unique_file3(&(eb->delta_file), &(eb->delta_abspath), - NULL, svn_io_file_del_on_close, pool, pool)); - - de = svn_delta_default_editor(pool); - de->open_root = open_root; - de->delete_entry = delete_entry; - de->add_directory = add_directory; - de->open_directory = open_directory; - de->close_directory = close_directory; - de->change_dir_prop = change_dir_prop; - de->change_file_prop = change_file_prop; - de->apply_textdelta = apply_textdelta; - de->add_file = add_file; - de->open_file = open_file; - de->close_file = close_file; - de->close_edit = close_edit; - /* Set the edit_baton and editor. */ - *edit_baton = eb; - *editor = de; + SVN_ERR(svn_repos__get_dump_editor(editor, edit_baton, + stream, update_anchor_relpath, pool)); /* Wrap this editor in a cancellation editor. */ SVN_ERR(svn_delta_get_cancellation_editor(cancel_func, cancel_baton, - de, eb, editor, edit_baton, pool)); + *editor, *edit_baton, + editor, edit_baton, + pool)); shim_callbacks->fetch_base_func = fetch_base_func; shim_callbacks->fetch_props_func = fetch_props_func; diff --git a/subversion/svnrdump/load_editor.c b/subversion/svnrdump/load_editor.c index 2ebacf7..e426ad1 100644 --- a/subversion/svnrdump/load_editor.c +++ b/subversion/svnrdump/load_editor.c @@ -44,16 +44,59 @@ #define ARE_VALID_COPY_ARGS(p,r) ((p) && SVN_IS_VALID_REVNUM(r)) +/** + * A vtable that is driven by get_dumpstream_loader(). + */ +typedef struct loader_fns_t +{ + /* Callback on starting a revision, to obtain an editor for the revision. + * + * This callback returns in *EDITOR and *EDIT_BATON an editor through which + * its caller will drive the changes for revision REVISION. + * + * This callback should call the editor's SET_TARGET_REVISION method if + * required. + * + * REV_PROPS holds the revision properties. + * + * POOL (and REV_PROPS) will persist until after the REVFINISH callback + * returns. + * + * Modelled on svn_ra_replay_revstart_callback_t. + */ + svn_error_t *(*revstart)( + svn_revnum_t revision, + void *baton, + const svn_delta_editor_t **editor, + void **edit_baton, + apr_hash_t *rev_props, + apr_pool_t *pool); + + /* Fetch the node props for ORIG_PATH @ ORIG_REV, a node of kind KIND. + * + * This callback is required if a non-deltas-format dump is parsed; + * otherwise it will not be called and may be null. If required and not + * provided, the loader will return SVN_ERR_UNSUPPORTED_FEATURE. + * + * Only regular props are needed. Any special kinds of property such as + * entry-props and DAV/WC-props will be ignored. + */ + svn_error_t *(*fetch_props)( + apr_hash_t **props, + void *baton, + const char *orig_path, + svn_revnum_t orig_rev, + svn_node_kind_t kind, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool); + +} loader_fns_t; + /** * General baton used by the parser functions. */ struct parse_baton { - /* Commit editor and baton used to transfer loaded revisions to - the target repository. */ - const svn_delta_editor_t *commit_editor; - void *commit_edit_baton; - /* RA session(s) for committing to the target repository. */ svn_ra_session_t *session; svn_ra_session_t *aux_session; @@ -72,7 +115,7 @@ struct parse_baton /* A mapping of svn_revnum_t * dump stream revisions to their corresponding svn_revnum_t * target repository revisions. */ - /* ### See http://subversion.tigris.org/issues/show_bug.cgi?id=3903 + /* ### See https://issues.apache.org/jira/browse/SVN-3903 ### for discussion about improving the memory costs of this mapping. */ apr_hash_t *rev_map; @@ -87,6 +130,9 @@ struct parse_baton /* An hash containing specific revision properties to skip while loading. */ apr_hash_t *skip_revprops; + + const loader_fns_t *callbacks; + void *cb_baton; }; /** @@ -144,8 +190,14 @@ struct revision_baton { svn_revnum_t rev; apr_hash_t *revprop_table; + svn_revnum_t head_rev_before_commit; apr_int32_t rev_offset; + /* Commit editor and baton used to transfer loaded revisions to + the target repository. */ + const svn_delta_editor_t *commit_editor; + void *commit_edit_baton; + const svn_string_t *datestamp; const svn_string_t *author; @@ -183,204 +235,83 @@ get_revision_mapping(apr_hash_t *rev_map, static svn_error_t * -commit_callback(const svn_commit_info_t *commit_info, - void *baton, - apr_pool_t *pool) +magic_header_record(int version, + void *parse_baton, + apr_pool_t *pool) { - struct revision_baton *rb = baton; - struct parse_baton *pb = rb->pb; - - /* ### Don't print directly; generate a notification. */ - if (! pb->quiet) - SVN_ERR(svn_cmdline_printf(pool, "* Loaded revision %ld.\n", - commit_info->revision)); - - /* Add the mapping of the dumpstream revision to the committed revision. */ - set_revision_mapping(pb->rev_map, rb->rev, commit_info->revision); - - /* If the incoming dump stream has non-contiguous revisions (e.g. from - using svndumpfilter --drop-empty-revs without --renumber-revs) then - we must account for the missing gaps in PB->REV_MAP. Otherwise we - might not be able to map all mergeinfo source revisions to the correct - revisions in the target repos. */ - if ((pb->last_rev_mapped != SVN_INVALID_REVNUM) - && (rb->rev != pb->last_rev_mapped + 1)) - { - svn_revnum_t i; - - for (i = pb->last_rev_mapped + 1; i < rb->rev; i++) - { - set_revision_mapping(pb->rev_map, i, pb->last_rev_mapped); - } - } - - /* Update our "last revision mapped". */ - pb->last_rev_mapped = rb->rev; - return SVN_NO_ERROR; } -/* Implements `svn_ra__lock_retry_func_t'. */ -static svn_error_t * -lock_retry_func(void *baton, - const svn_string_t *reposlocktoken, - apr_pool_t *pool) -{ - return svn_cmdline_printf(pool, - _("Failed to get lock on destination " - "repos, currently held by '%s'\n"), - reposlocktoken->data); -} - - static svn_error_t * -fetch_base_func(const char **filename, - void *baton, - const char *path, - svn_revnum_t base_revision, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) +uuid_record(const char *uuid, + void *parse_baton, + apr_pool_t *pool) { - struct revision_baton *rb = baton; - svn_stream_t *fstream; - svn_error_t *err; - - if (! SVN_IS_VALID_REVNUM(base_revision)) - base_revision = rb->rev - 1; - - SVN_ERR(svn_stream_open_unique(&fstream, filename, NULL, - svn_io_file_del_on_pool_cleanup, - result_pool, scratch_pool)); - - err = svn_ra_get_file(rb->pb->aux_session, path, base_revision, - fstream, NULL, NULL, scratch_pool); - if (err && err->apr_err == SVN_ERR_FS_NOT_FOUND) - { - svn_error_clear(err); - SVN_ERR(svn_stream_close(fstream)); - - *filename = NULL; - return SVN_NO_ERROR; - } - else if (err) - return svn_error_trace(err); - - SVN_ERR(svn_stream_close(fstream)); - return SVN_NO_ERROR; } -static svn_error_t * -fetch_props_func(apr_hash_t **props, - void *baton, - const char *path, - svn_revnum_t base_revision, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) +/* Push information about another directory onto the linked list RB->db. + * + * CHILD_BATON is the baton returned by the commit editor. RELPATH is the + * repository-relative path of this directory. IS_ADDED is true iff this + * directory is being added (with or without history). If added with + * history then COPYFROM_PATH/COPYFROM_REV are the copyfrom source, else + * are NULL/SVN_INVALID_REVNUM. + */ +static void +push_directory(struct revision_baton *rb, + void *child_baton, + const char *relpath, + svn_boolean_t is_added, + const char *copyfrom_path, + svn_revnum_t copyfrom_rev) { - struct revision_baton *rb = baton; - svn_node_kind_t node_kind; - - if (! SVN_IS_VALID_REVNUM(base_revision)) - base_revision = rb->rev - 1; + struct directory_baton *child_db = apr_pcalloc(rb->pool, sizeof (*child_db)); - SVN_ERR(svn_ra_check_path(rb->pb->aux_session, path, base_revision, - &node_kind, scratch_pool)); + SVN_ERR_ASSERT_NO_RETURN( + is_added || (copyfrom_path == NULL && copyfrom_rev == SVN_INVALID_REVNUM)); - if (node_kind == svn_node_file) - { - SVN_ERR(svn_ra_get_file(rb->pb->aux_session, path, base_revision, - NULL, NULL, props, result_pool)); - } - else if (node_kind == svn_node_dir) + /* If this node is an existing (not newly added) child of a copied node, + calculate where it was copied from. */ + if (!is_added + && ARE_VALID_COPY_ARGS(rb->db->copyfrom_path, rb->db->copyfrom_rev)) { - apr_array_header_t *tmp_props; + const char *name = svn_relpath_basename(relpath, NULL); - SVN_ERR(svn_ra_get_dir2(rb->pb->aux_session, NULL, NULL, props, path, - base_revision, 0 /* Dirent fields */, - result_pool)); - tmp_props = svn_prop_hash_to_array(*props, result_pool); - SVN_ERR(svn_categorize_props(tmp_props, NULL, NULL, &tmp_props, - result_pool)); - *props = svn_prop_array_to_hash(tmp_props, result_pool); - } - else - { - *props = apr_hash_make(result_pool); + copyfrom_path = svn_relpath_join(rb->db->copyfrom_path, name, + rb->pool); + copyfrom_rev = rb->db->copyfrom_rev; } - return SVN_NO_ERROR; -} - -static svn_error_t * -fetch_kind_func(svn_node_kind_t *kind, - void *baton, - const char *path, - svn_revnum_t base_revision, - apr_pool_t *scratch_pool) -{ - struct revision_baton *rb = baton; - - if (! SVN_IS_VALID_REVNUM(base_revision)) - base_revision = rb->rev - 1; - - SVN_ERR(svn_ra_check_path(rb->pb->aux_session, path, base_revision, - kind, scratch_pool)); - - return SVN_NO_ERROR; -} - -static svn_delta_shim_callbacks_t * -get_shim_callbacks(struct revision_baton *rb, - apr_pool_t *pool) -{ - svn_delta_shim_callbacks_t *callbacks = - svn_delta_shim_callbacks_default(pool); - - callbacks->fetch_props_func = fetch_props_func; - callbacks->fetch_kind_func = fetch_kind_func; - callbacks->fetch_base_func = fetch_base_func; - callbacks->fetch_baton = rb; - - return callbacks; + child_db->baton = child_baton; + child_db->relpath = relpath; + child_db->copyfrom_path = copyfrom_path; + child_db->copyfrom_rev = copyfrom_rev; + child_db->parent = rb->db; + rb->db = child_db; } -/* Acquire a lock (of sorts) on the repository associated with the - * given RA SESSION. This lock is just a revprop change attempt in a - * time-delay loop. This function is duplicated by svnsync in - * svnsync/svnsync.c - * - * ### TODO: Make this function more generic and - * expose it through a header for use by other Subversion - * applications to avoid duplication. +/* Called to obtain an editor for the revision described by RB. */ static svn_error_t * -get_lock(const svn_string_t **lock_string_p, - svn_ra_session_t *session, - svn_cancel_func_t cancel_func, - void *cancel_baton, - apr_pool_t *pool) +revision_start_edit(struct revision_baton *rb, + apr_pool_t *scratch_pool) { - svn_boolean_t be_atomic; - - SVN_ERR(svn_ra_has_capability(session, &be_atomic, - SVN_RA_CAPABILITY_ATOMIC_REVPROPS, - pool)); - if (! be_atomic) - { - /* Pre-1.7 servers can't lock without a race condition. (Issue #3546) */ - svn_error_t *err = - svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, NULL, - _("Target server does not support atomic revision " - "property edits; consider upgrading it to 1.7.")); - svn_handle_warning2(stderr, err, "svnrdump: "); - svn_error_clear(err); - } + struct parse_baton *pb = rb->pb; + void *child_baton; - return svn_ra__get_operational_lock(lock_string_p, NULL, session, - SVNRDUMP_PROP_LOCK, FALSE, - 10 /* retries */, lock_retry_func, NULL, - cancel_func, cancel_baton, pool); + SVN_ERR(pb->callbacks->revstart(rb->rev, + pb->cb_baton, + &rb->commit_editor, &rb->commit_edit_baton, + rb->revprop_table, + rb->pool)); + SVN_ERR(rb->commit_editor->open_root(rb->commit_edit_baton, + rb->head_rev_before_commit, + rb->pool, &child_baton)); + /* child_baton corresponds to the root directory baton here */ + push_directory(rb, child_baton, "", TRUE /*is_added*/, + NULL, SVN_INVALID_REVNUM); + return SVN_NO_ERROR; } static svn_error_t * @@ -389,13 +320,11 @@ new_revision_record(void **revision_baton, void *parse_baton, apr_pool_t *pool) { + struct parse_baton *pb = parse_baton; struct revision_baton *rb; - struct parse_baton *pb; const char *rev_str; - svn_revnum_t head_rev; rb = apr_pcalloc(pool, sizeof(*rb)); - pb = parse_baton; rb->pool = svn_pool_create(pool); rb->pb = pb; rb->db = NULL; @@ -404,13 +333,14 @@ new_revision_record(void **revision_baton, if (rev_str) rb->rev = SVN_STR_TO_REV(rev_str); - SVN_ERR(svn_ra_get_latest_revnum(pb->session, &head_rev, pool)); + SVN_ERR(svn_ra_get_latest_revnum(pb->session, &rb->head_rev_before_commit, + pool)); /* FIXME: This is a lame fallback loading multiple segments of dump in several separate operations. It is highly susceptible to race conditions. Calculate the revision 'offset' for finding copyfrom sources. It might be positive or negative. */ - rb->rev_offset = (apr_int32_t) ((rb->rev) - (head_rev + 1)); + rb->rev_offset = (apr_int32_t) ((rb->rev) - (rb->head_rev_before_commit + 1)); /* Stash the oldest (non-zero) dumpstream revision seen. */ if ((rb->rev > 0) && (!SVN_IS_VALID_REVNUM(pb->oldest_dumpstream_rev))) @@ -418,8 +348,8 @@ new_revision_record(void **revision_baton, /* Set the commit_editor/ commit_edit_baton to NULL and wait for them to be created in new_node_record */ - rb->pb->commit_editor = NULL; - rb->pb->commit_edit_baton = NULL; + rb->commit_editor = NULL; + rb->commit_edit_baton = NULL; rb->revprop_table = apr_hash_make(rb->pool); *revision_baton = rb; @@ -427,88 +357,28 @@ new_revision_record(void **revision_baton, } static svn_error_t * -magic_header_record(int version, - void *parse_baton, - apr_pool_t *pool) +new_node_record(void **node_baton, + apr_hash_t *headers, + void *revision_baton, + apr_pool_t *pool) { - return SVN_NO_ERROR; -} + struct revision_baton *rb = revision_baton; + const struct svn_delta_editor_t *commit_editor = rb->commit_editor; + struct node_baton *nb; + apr_hash_index_t *hi; + void *child_baton; + const char *nb_dirname; -static svn_error_t * -uuid_record(const char *uuid, - void *parse_baton, - apr_pool_t *pool) -{ - return SVN_NO_ERROR; -} - -/* Push information about another directory onto the linked list RB->db. - * - * CHILD_BATON is the baton returned by the commit editor. RELPATH is the - * repository-relative path of this directory. IS_ADDED is true iff this - * directory is being added (with or without history). If added with - * history then COPYFROM_PATH/COPYFROM_REV are the copyfrom source, else - * are NULL/SVN_INVALID_REVNUM. - */ -static void -push_directory(struct revision_baton *rb, - void *child_baton, - const char *relpath, - svn_boolean_t is_added, - const char *copyfrom_path, - svn_revnum_t copyfrom_rev) -{ - struct directory_baton *child_db = apr_pcalloc(rb->pool, sizeof (*child_db)); - - SVN_ERR_ASSERT_NO_RETURN( - is_added || (copyfrom_path == NULL && copyfrom_rev == SVN_INVALID_REVNUM)); - - /* If this node is an existing (not newly added) child of a copied node, - calculate where it was copied from. */ - if (!is_added - && ARE_VALID_COPY_ARGS(rb->db->copyfrom_path, rb->db->copyfrom_rev)) - { - const char *name = svn_relpath_basename(relpath, NULL); - - copyfrom_path = svn_relpath_join(rb->db->copyfrom_path, name, - rb->pool); - copyfrom_rev = rb->db->copyfrom_rev; - } - - child_db->baton = child_baton; - child_db->relpath = relpath; - child_db->copyfrom_path = copyfrom_path; - child_db->copyfrom_rev = copyfrom_rev; - child_db->parent = rb->db; - rb->db = child_db; -} - -static svn_error_t * -new_node_record(void **node_baton, - apr_hash_t *headers, - void *revision_baton, - apr_pool_t *pool) -{ - struct revision_baton *rb = revision_baton; - const struct svn_delta_editor_t *commit_editor = rb->pb->commit_editor; - void *commit_edit_baton = rb->pb->commit_edit_baton; - struct node_baton *nb; - svn_revnum_t head_rev_before_commit = rb->rev - rb->rev_offset - 1; - apr_hash_index_t *hi; - void *child_baton; - const char *nb_dirname; - - nb = apr_pcalloc(rb->pool, sizeof(*nb)); - nb->rb = rb; - nb->is_added = FALSE; - nb->copyfrom_path = NULL; - nb->copyfrom_url = NULL; - nb->copyfrom_rev = SVN_INVALID_REVNUM; - nb->prop_changes = apr_hash_make(rb->pool); + nb = apr_pcalloc(rb->pool, sizeof(*nb)); + nb->rb = rb; + nb->is_added = FALSE; + nb->copyfrom_path = NULL; + nb->copyfrom_url = NULL; + nb->copyfrom_rev = SVN_INVALID_REVNUM; + nb->prop_changes = apr_hash_make(rb->pool); /* If the creation of commit_editor is pending, create it now and open_root on it; also create a top-level directory baton. */ - if (!commit_editor) { /* The revprop_table should have been filled in with important @@ -521,23 +391,8 @@ new_node_record(void **node_baton, svn_hash_sets(rb->revprop_table, SVN_PROP_REVISION_AUTHOR, NULL); svn_hash_sets(rb->revprop_table, SVN_PROP_REVISION_DATE, NULL); - SVN_ERR(svn_ra__register_editor_shim_callbacks(rb->pb->session, - get_shim_callbacks(rb, rb->pool))); - SVN_ERR(svn_ra_get_commit_editor3(rb->pb->session, &commit_editor, - &commit_edit_baton, rb->revprop_table, - commit_callback, revision_baton, - NULL, FALSE, rb->pool)); - - rb->pb->commit_editor = commit_editor; - rb->pb->commit_edit_baton = commit_edit_baton; - - SVN_ERR(commit_editor->open_root(commit_edit_baton, - head_rev_before_commit, - rb->pool, &child_baton)); - - /* child_baton corresponds to the root directory baton here */ - push_directory(rb, child_baton, "", TRUE /*is_added*/, - NULL, SVN_INVALID_REVNUM); + SVN_ERR(revision_start_edit(rb, pool)); + commit_editor = rb->commit_editor; } for (hi = apr_hash_first(rb->pool, headers); hi; hi = apr_hash_next(hi)) @@ -612,7 +467,7 @@ new_node_record(void **node_baton, rb->pool); SVN_ERR(commit_editor->open_directory(relpath_compose, rb->db->baton, - head_rev_before_commit, + rb->head_rev_before_commit, rb->pool, &child_baton)); push_directory(rb, child_baton, relpath_compose, TRUE /*is_added*/, NULL, SVN_INVALID_REVNUM); @@ -655,7 +510,7 @@ new_node_record(void **node_baton, case svn_node_action_delete: case svn_node_action_replace: SVN_ERR(commit_editor->delete_entry(nb->path, - head_rev_before_commit, + rb->head_rev_before_commit, rb->db->baton, rb->pool)); if (nb->action == svn_node_action_delete) break; @@ -693,7 +548,7 @@ new_node_record(void **node_baton, break; default: SVN_ERR(commit_editor->open_directory(nb->path, rb->db->baton, - head_rev_before_commit, + rb->head_rev_before_commit, rb->pool, &child_baton)); push_directory(rb, child_baton, nb->path, FALSE /*is_added*/, NULL, SVN_INVALID_REVNUM); @@ -723,7 +578,7 @@ set_revision_property(void *baton, svn_hash_sets(rb->revprop_table, apr_pstrdup(rb->pool, name), value); } - else if (rb->rev_offset == -1 + else if (rb->head_rev_before_commit == 0 && ! svn_hash_gets(rb->pb->skip_revprops, name)) { /* Special case: set revision 0 properties directly (which is @@ -856,16 +711,14 @@ remove_node_props(void *baton) /* Add-without-history; no "old" properties to worry about. */ return SVN_NO_ERROR; - if (nb->kind == svn_node_file) - { - SVN_ERR(svn_ra_get_file(nb->rb->pb->aux_session, - orig_path, orig_rev, NULL, NULL, &props, pool)); - } - else /* nb->kind == svn_node_dir */ - { - SVN_ERR(svn_ra_get_dir2(nb->rb->pb->aux_session, NULL, NULL, &props, - orig_path, orig_rev, 0, pool)); - } + if (! rb->pb->callbacks->fetch_props) + return svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, NULL, + _("This dumpstream reader requires a delta " + "format dumpstream")); + SVN_ERR(rb->pb->callbacks->fetch_props(&props, + rb->pb->cb_baton, + orig_path, orig_rev, nb->kind, + pool, pool)); for (hi = apr_hash_first(pool, props); hi; hi = apr_hash_next(hi)) { @@ -884,7 +737,7 @@ set_fulltext(svn_stream_t **stream, void *node_baton) { struct node_baton *nb = node_baton; - const struct svn_delta_editor_t *commit_editor = nb->rb->pb->commit_editor; + const struct svn_delta_editor_t *commit_editor = nb->rb->commit_editor; svn_txdelta_window_handler_t handler; void *handler_baton; apr_pool_t *pool = nb->rb->pool; @@ -902,7 +755,7 @@ apply_textdelta(svn_txdelta_window_handler_t *handler, void *node_baton) { struct node_baton *nb = node_baton; - const struct svn_delta_editor_t *commit_editor = nb->rb->pb->commit_editor; + const struct svn_delta_editor_t *commit_editor = nb->rb->commit_editor; apr_pool_t *pool = nb->rb->pool; SVN_ERR(commit_editor->apply_textdelta(nb->file_baton, nb->base_checksum, @@ -915,7 +768,7 @@ static svn_error_t * close_node(void *baton) { struct node_baton *nb = baton; - const struct svn_delta_editor_t *commit_editor = nb->rb->pb->commit_editor; + const struct svn_delta_editor_t *commit_editor = nb->rb->commit_editor; apr_pool_t *pool = nb->rb->pool; apr_hash_index_t *hi; @@ -956,8 +809,8 @@ static svn_error_t * close_revision(void *baton) { struct revision_baton *rb = baton; - const svn_delta_editor_t *commit_editor = rb->pb->commit_editor; - void *commit_edit_baton = rb->pb->commit_edit_baton; + const svn_delta_editor_t *commit_editor = rb->commit_editor; + void *commit_edit_baton = rb->commit_edit_baton; svn_revnum_t committed_rev = SVN_INVALID_REVNUM; /* Fake revision 0 */ @@ -982,20 +835,12 @@ close_revision(void *baton) } else { - svn_revnum_t head_rev_before_commit = rb->rev - rb->rev_offset - 1; - void *child_baton; - /* Legitimate revision with no node information */ - SVN_ERR(svn_ra_get_commit_editor3(rb->pb->session, &commit_editor, - &commit_edit_baton, rb->revprop_table, - commit_callback, baton, - NULL, FALSE, rb->pool)); - - SVN_ERR(commit_editor->open_root(commit_edit_baton, - head_rev_before_commit, - rb->pool, &child_baton)); + SVN_ERR(revision_start_edit(rb, rb->pool)); + commit_editor = rb->commit_editor; + commit_edit_baton = rb->commit_edit_baton; - SVN_ERR(commit_editor->close_directory(child_baton, rb->pool)); + SVN_ERR(commit_editor->close_directory(rb->db->baton, rb->pool)); SVN_ERR(commit_editor->close_edit(commit_edit_baton, rb->pool)); } @@ -1007,7 +852,7 @@ close_revision(void *baton) { committed_rev = get_revision_mapping(rb->pb->rev_map, rb->rev); } - else if (rb->rev_offset == -1) + else if (rb->head_rev_before_commit == 0) { committed_rev = 0; } @@ -1016,16 +861,12 @@ close_revision(void *baton) { if (!svn_hash_gets(rb->pb->skip_revprops, SVN_PROP_REVISION_DATE)) { - SVN_ERR(svn_repos__validate_prop(SVN_PROP_REVISION_DATE, - rb->datestamp, rb->pool)); SVN_ERR(svn_ra_change_rev_prop2(rb->pb->session, committed_rev, SVN_PROP_REVISION_DATE, NULL, rb->datestamp, rb->pool)); } if (!svn_hash_gets(rb->pb->skip_revprops, SVN_PROP_REVISION_AUTHOR)) { - SVN_ERR(svn_repos__validate_prop(SVN_PROP_REVISION_AUTHOR, - rb->author, rb->pool)); SVN_ERR(svn_ra_change_rev_prop2(rb->pb->session, committed_rev, SVN_PROP_REVISION_AUTHOR, NULL, rb->author, rb->pool)); @@ -1037,27 +878,238 @@ close_revision(void *baton) return SVN_NO_ERROR; } -svn_error_t * -svn_rdump__load_dumpstream(svn_stream_t *stream, - svn_ra_session_t *session, - svn_ra_session_t *aux_session, - svn_boolean_t quiet, - apr_hash_t *skip_revprops, - svn_cancel_func_t cancel_func, - void *cancel_baton, - apr_pool_t *pool) +/*----------------------------------------------------------------------*/ + +/** + * Baton used for commit callback (and Ev2 shims). + */ +struct commit_baton_t +{ + svn_revnum_t rev; + struct parse_baton *pb; +}; + +/* + * - Notification of the commit. + * - Update the revision number mapping to take account of the actual + * committed revision number. + */ +static svn_error_t * +commit_callback(const svn_commit_info_t *commit_info, + void *baton, + apr_pool_t *pool) +{ + struct commit_baton_t *cb = baton; + struct parse_baton *pb = cb->pb; + + /* ### Don't print directly; generate a notification. */ + if (! pb->quiet) + SVN_ERR(svn_cmdline_printf(pool, "* Loaded revision %ld.\n", + commit_info->revision)); + + /* Add the mapping of the dumpstream revision to the committed revision. */ + set_revision_mapping(pb->rev_map, cb->rev, commit_info->revision); + + /* If the incoming dump stream has non-contiguous revisions (e.g. from + using svndumpfilter --drop-empty-revs without --renumber-revs) then + we must account for the missing gaps in PB->REV_MAP. Otherwise we + might not be able to map all mergeinfo source revisions to the correct + revisions in the target repos. */ + if ((pb->last_rev_mapped != SVN_INVALID_REVNUM) + && (cb->rev != pb->last_rev_mapped + 1)) + { + svn_revnum_t i; + + for (i = pb->last_rev_mapped + 1; i < cb->rev; i++) + { + set_revision_mapping(pb->rev_map, i, pb->last_rev_mapped); + } + } + + /* Update our "last revision mapped". */ + pb->last_rev_mapped = cb->rev; + + return SVN_NO_ERROR; +} + +static svn_error_t * +fetch_base_func(const char **filename, + void *baton, + const char *path, + svn_revnum_t base_revision, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + struct commit_baton_t *cb = baton; + svn_stream_t *fstream; + svn_error_t *err; + + if (! SVN_IS_VALID_REVNUM(base_revision)) + base_revision = cb->rev - 1; + + SVN_ERR(svn_stream_open_unique(&fstream, filename, NULL, + svn_io_file_del_on_pool_cleanup, + result_pool, scratch_pool)); + + err = svn_ra_get_file(cb->pb->aux_session, path, base_revision, + fstream, NULL, NULL, scratch_pool); + if (err && err->apr_err == SVN_ERR_FS_NOT_FOUND) + { + svn_error_clear(err); + SVN_ERR(svn_stream_close(fstream)); + + *filename = NULL; + return SVN_NO_ERROR; + } + else if (err) + return svn_error_trace(err); + + SVN_ERR(svn_stream_close(fstream)); + + return SVN_NO_ERROR; +} + +static svn_error_t * +fetch_props(apr_hash_t **props, + void *baton, + const char *path, + svn_revnum_t base_revision, + svn_node_kind_t node_kind, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + struct parse_baton *pb = baton; + + if (node_kind == svn_node_file) + { + SVN_ERR(svn_ra_get_file(pb->aux_session, path, base_revision, + NULL, NULL, props, result_pool)); + } + else if (node_kind == svn_node_dir) + { + apr_array_header_t *tmp_props; + + SVN_ERR(svn_ra_get_dir2(pb->aux_session, NULL, NULL, props, path, + base_revision, 0 /* Dirent fields */, + result_pool)); + tmp_props = svn_prop_hash_to_array(*props, result_pool); + SVN_ERR(svn_categorize_props(tmp_props, NULL, NULL, &tmp_props, + result_pool)); + *props = svn_prop_array_to_hash(tmp_props, result_pool); + } + else + { + *props = apr_hash_make(result_pool); + } + + return SVN_NO_ERROR; +} + +static svn_error_t * +fetch_props_func(apr_hash_t **props, + void *baton, + const char *path, + svn_revnum_t base_revision, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + struct commit_baton_t *cb = baton; + svn_node_kind_t node_kind; + + if (! SVN_IS_VALID_REVNUM(base_revision)) + base_revision = cb->rev - 1; + + SVN_ERR(svn_ra_check_path(cb->pb->aux_session, path, base_revision, + &node_kind, scratch_pool)); + SVN_ERR(fetch_props(props, cb->pb, path, base_revision, node_kind, + result_pool, scratch_pool)); + + return SVN_NO_ERROR; +} + +static svn_error_t * +fetch_kind_func(svn_node_kind_t *kind, + void *baton, + const char *path, + svn_revnum_t base_revision, + apr_pool_t *scratch_pool) +{ + struct commit_baton_t *cb = baton; + + if (! SVN_IS_VALID_REVNUM(base_revision)) + base_revision = cb->rev - 1; + + SVN_ERR(svn_ra_check_path(cb->pb->aux_session, path, base_revision, + kind, scratch_pool)); + + return SVN_NO_ERROR; +} + +static svn_delta_shim_callbacks_t * +get_shim_callbacks(struct commit_baton_t *cb, + apr_pool_t *pool) +{ + svn_delta_shim_callbacks_t *callbacks = + svn_delta_shim_callbacks_default(pool); + + callbacks->fetch_props_func = fetch_props_func; + callbacks->fetch_kind_func = fetch_kind_func; + callbacks->fetch_base_func = fetch_base_func; + callbacks->fetch_baton = cb; + + return callbacks; +} + +/* */ +static svn_error_t * +revstart(svn_revnum_t revision, + void *baton, + const svn_delta_editor_t **editor_p, + void **edit_baton_p, + apr_hash_t *rev_props, + apr_pool_t *result_pool) +{ + struct parse_baton *pb = baton; + struct commit_baton_t *cb = apr_palloc(result_pool, sizeof(*cb)); + + cb->rev = revision; + cb->pb = pb; + SVN_ERR(svn_ra__register_editor_shim_callbacks(pb->session, + get_shim_callbacks(cb, result_pool))); + SVN_ERR(svn_ra_get_commit_editor3(pb->session, + editor_p, edit_baton_p, + rev_props, + commit_callback, cb, + NULL, FALSE, result_pool)); + return SVN_NO_ERROR; +} + +/* Return an implementation of the dumpstream parser API that will drive + * commits over the RA layer to the location described by SESSION. + * + * Use AUX_SESSION (which is opened to the same URL as SESSION) + * for any secondary, out-of-band RA communications required. This is + * needed when loading a non-deltas dump, and for Ev2. + * + * Print feedback to the console for each revision, unless QUIET is true. + * + * Ignore (don't set) any revision property whose name is a key in + * SKIP_REVPROPS. The values in the hash are unimportant. + */ +static svn_error_t * +get_dumpstream_loader(svn_repos_parse_fns3_t **parser_p, + void **parse_baton_p, + svn_ra_session_t *session, + svn_ra_session_t *aux_session, + svn_boolean_t quiet, + apr_hash_t *skip_revprops, + apr_pool_t *pool) { svn_repos_parse_fns3_t *parser; struct parse_baton *parse_baton; - const svn_string_t *lock_string; - svn_boolean_t be_atomic; - svn_error_t *err; const char *session_url, *root_url, *parent_dir; + static const loader_fns_t callbacks = { revstart, fetch_props }; - SVN_ERR(svn_ra_has_capability(session, &be_atomic, - SVN_RA_CAPABILITY_ATOMIC_REVPROPS, - pool)); - SVN_ERR(get_lock(&lock_string, session, cancel_func, cancel_baton, pool)); SVN_ERR(svn_ra_get_repos_root2(session, &root_url, pool)); SVN_ERR(svn_ra_get_session_url(session, &session_url, pool)); SVN_ERR(svn_ra_get_path_relative_to_root(session, &parent_dir, @@ -1087,6 +1139,300 @@ svn_rdump__load_dumpstream(svn_stream_t *stream, parse_baton->last_rev_mapped = SVN_INVALID_REVNUM; parse_baton->oldest_dumpstream_rev = SVN_INVALID_REVNUM; parse_baton->skip_revprops = skip_revprops; + parse_baton->callbacks = &callbacks; + parse_baton->cb_baton = parse_baton; + + *parser_p = parser; + *parse_baton_p = parse_baton; + return SVN_NO_ERROR; +} + +/*----------------------------------------------------------------------*/ + +/* Dump-stream parser wrapper */ + +struct filter_parse_baton_t +{ + const svn_repos_parse_fns3_t *wrapped_parser; + struct parse_baton *wrapped_pb; +}; + +struct filter_revision_baton_t +{ + struct filter_parse_baton_t *pb; + void *wrapped_rb; +}; + +struct filter_node_baton_t +{ + struct filter_revision_baton_t *rb; + void *wrapped_nb; +}; + +static svn_error_t * +filter_magic_header_record(int version, + void *parse_baton, + apr_pool_t *pool) +{ + struct filter_parse_baton_t *pb = parse_baton; + + SVN_ERR(pb->wrapped_parser->magic_header_record(version, pb->wrapped_pb, + pool)); + return SVN_NO_ERROR; +} + +static svn_error_t * +filter_uuid_record(const char *uuid, + void *parse_baton, + apr_pool_t *pool) +{ + struct filter_parse_baton_t *pb = parse_baton; + + SVN_ERR(pb->wrapped_parser->uuid_record(uuid, pb->wrapped_pb, pool)); + return SVN_NO_ERROR; +} + +static svn_error_t * +filter_new_revision_record(void **revision_baton, + apr_hash_t *headers, + void *parse_baton, + apr_pool_t *pool) +{ + struct filter_parse_baton_t *pb = parse_baton; + struct filter_revision_baton_t *rb = apr_pcalloc(pool, sizeof (*rb)); + + rb->pb = pb; + SVN_ERR(pb->wrapped_parser->new_revision_record(&rb->wrapped_rb, headers, + pb->wrapped_pb, pool)); + *revision_baton = rb; + return SVN_NO_ERROR; +} + +static svn_error_t * +filter_new_node_record(void **node_baton, + apr_hash_t *headers, + void *revision_baton, + apr_pool_t *pool) +{ + struct filter_revision_baton_t *rb = revision_baton; + struct filter_parse_baton_t *pb = rb->pb; + struct filter_node_baton_t *nb = apr_pcalloc(pool, sizeof (*nb)); + + nb->rb = rb; + SVN_ERR(pb->wrapped_parser->new_node_record(&nb->wrapped_nb, headers, + rb->wrapped_rb, pool)); + *node_baton = nb; + return SVN_NO_ERROR; +} + +static svn_error_t * +filter_set_revision_property(void *revision_baton, + const char *name, + const svn_string_t *value) +{ + struct filter_revision_baton_t *rb = revision_baton; + struct filter_parse_baton_t *pb = rb->pb; + + SVN_ERR(pb->wrapped_parser->set_revision_property(rb->wrapped_rb, + name, value)); + return SVN_NO_ERROR; +} + +static svn_error_t * +filter_set_node_property(void *node_baton, + const char *name, + const svn_string_t *value) +{ + struct filter_node_baton_t *nb = node_baton; + struct filter_revision_baton_t *rb = nb->rb; + struct filter_parse_baton_t *pb = rb->pb; + + SVN_ERR(pb->wrapped_parser->set_node_property(nb->wrapped_nb, + name, value)); + return SVN_NO_ERROR; +} + +static svn_error_t * +filter_delete_node_property(void *node_baton, + const char *name) +{ + struct filter_node_baton_t *nb = node_baton; + struct filter_revision_baton_t *rb = nb->rb; + struct filter_parse_baton_t *pb = rb->pb; + + SVN_ERR(pb->wrapped_parser->delete_node_property(nb->wrapped_nb, name)); + return SVN_NO_ERROR; +} + +static svn_error_t * +filter_remove_node_props(void *node_baton) +{ + struct filter_node_baton_t *nb = node_baton; + struct filter_revision_baton_t *rb = nb->rb; + struct filter_parse_baton_t *pb = rb->pb; + + SVN_ERR(pb->wrapped_parser->remove_node_props(nb->wrapped_nb)); + return SVN_NO_ERROR; +} + +static svn_error_t * +filter_set_fulltext(svn_stream_t **stream, + void *node_baton) +{ + struct filter_node_baton_t *nb = node_baton; + struct filter_revision_baton_t *rb = nb->rb; + struct filter_parse_baton_t *pb = rb->pb; + + SVN_ERR(pb->wrapped_parser->set_fulltext(stream, nb->wrapped_nb)); + return SVN_NO_ERROR; +} + +static svn_error_t * +filter_apply_textdelta(svn_txdelta_window_handler_t *handler, + void **handler_baton, + void *node_baton) +{ + struct filter_node_baton_t *nb = node_baton; + struct filter_revision_baton_t *rb = nb->rb; + struct filter_parse_baton_t *pb = rb->pb; + + SVN_ERR(pb->wrapped_parser->apply_textdelta(handler, handler_baton, + nb->wrapped_nb)); + return SVN_NO_ERROR; +} + +static svn_error_t * +filter_close_node(void *node_baton) +{ + struct filter_node_baton_t *nb = node_baton; + struct filter_revision_baton_t *rb = nb->rb; + struct filter_parse_baton_t *pb = rb->pb; + + SVN_ERR(pb->wrapped_parser->close_node(nb->wrapped_nb)); + return SVN_NO_ERROR; +} + +static svn_error_t * +filter_close_revision(void *revision_baton) +{ + struct filter_revision_baton_t *rb = revision_baton; + struct filter_parse_baton_t *pb = rb->pb; + + SVN_ERR(pb->wrapped_parser->close_revision(rb->wrapped_rb)); + return SVN_NO_ERROR; +} + +static svn_error_t * +get_dumpstream_filter(svn_repos_parse_fns3_t **parser_p, + void **parse_baton_p, + const svn_repos_parse_fns3_t *wrapped_parser, + void *wrapped_baton, + apr_pool_t *pool) +{ + svn_repos_parse_fns3_t *parser; + struct filter_parse_baton_t *b; + + parser = apr_pcalloc(pool, sizeof(*parser)); + parser->magic_header_record = filter_magic_header_record; + parser->uuid_record = filter_uuid_record; + parser->new_revision_record = filter_new_revision_record; + parser->new_node_record = filter_new_node_record; + parser->set_revision_property = filter_set_revision_property; + parser->set_node_property = filter_set_node_property; + parser->delete_node_property = filter_delete_node_property; + parser->remove_node_props = filter_remove_node_props; + parser->set_fulltext = filter_set_fulltext; + parser->apply_textdelta = filter_apply_textdelta; + parser->close_node = filter_close_node; + parser->close_revision = filter_close_revision; + + b = apr_pcalloc(pool, sizeof(*b)); + b->wrapped_parser = wrapped_parser; + b->wrapped_pb = wrapped_baton; + + *parser_p = parser; + *parse_baton_p = b; + return SVN_NO_ERROR; +} + +/*----------------------------------------------------------------------*/ + +/* Implements `svn_ra__lock_retry_func_t'. */ +static svn_error_t * +lock_retry_func(void *baton, + const svn_string_t *reposlocktoken, + apr_pool_t *pool) +{ + return svn_cmdline_printf(pool, + _("Failed to get lock on destination " + "repos, currently held by '%s'\n"), + reposlocktoken->data); +} + +/* Acquire a lock (of sorts) on the repository associated with the + * given RA SESSION. This lock is just a revprop change attempt in a + * time-delay loop. This function is duplicated by svnsync in + * svnsync/svnsync.c + * + * ### TODO: Make this function more generic and + * expose it through a header for use by other Subversion + * applications to avoid duplication. + */ +static svn_error_t * +get_lock(const svn_string_t **lock_string_p, + svn_ra_session_t *session, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *pool) +{ + svn_boolean_t be_atomic; + + SVN_ERR(svn_ra_has_capability(session, &be_atomic, + SVN_RA_CAPABILITY_ATOMIC_REVPROPS, + pool)); + if (! be_atomic) + { + /* Pre-1.7 servers can't lock without a race condition. (Issue #3546) */ + svn_error_t *err = + svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, NULL, + _("Target server does not support atomic revision " + "property edits; consider upgrading it to 1.7.")); + svn_handle_warning2(stderr, err, "svnrdump: "); + svn_error_clear(err); + } + + return svn_ra__get_operational_lock(lock_string_p, NULL, session, + SVNRDUMP_PROP_LOCK, FALSE, + 10 /* retries */, lock_retry_func, NULL, + cancel_func, cancel_baton, pool); +} + +svn_error_t * +svn_rdump__load_dumpstream(svn_stream_t *stream, + svn_ra_session_t *session, + svn_ra_session_t *aux_session, + svn_boolean_t quiet, + apr_hash_t *skip_revprops, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *pool) +{ + svn_repos_parse_fns3_t *parser; + void *parse_baton; + const svn_string_t *lock_string; + svn_error_t *err; + + SVN_ERR(get_lock(&lock_string, session, cancel_func, cancel_baton, pool)); + + SVN_ERR(get_dumpstream_loader(&parser, &parse_baton, + session, aux_session, + quiet, skip_revprops, + pool)); + + /* Interpose a filtering layer: currently doing nothing */ + SVN_ERR(get_dumpstream_filter(&parser, &parse_baton, + parser, parse_baton, + pool)); err = svn_repos_parse_dumpstream3(stream, parser, parse_baton, FALSE, cancel_func, cancel_baton, pool); diff --git a/subversion/svnrdump/svnrdump.c b/subversion/svnrdump/svnrdump.c index 50b8a89..e647b46 100644 --- a/subversion/svnrdump/svnrdump.c +++ b/subversion/svnrdump/svnrdump.c @@ -81,23 +81,31 @@ enum svn_svnrdump__longopt_t opt_non_interactive, \ opt_force_interactive -static const svn_opt_subcommand_desc2_t svnrdump__cmd_table[] = +static const svn_opt_subcommand_desc3_t svnrdump__cmd_table[] = { - { "dump", dump_cmd, { 0 }, - N_("usage: svnrdump dump URL [-r LOWER[:UPPER]]\n\n" + { "dump", dump_cmd, { 0 }, {N_( + "usage: svnrdump dump URL [-r LOWER[:UPPER]]\n" + "\n"), N_( "Dump revisions LOWER to UPPER of repository at remote URL to stdout\n" "in a 'dumpfile' portable format. If only LOWER is given, dump that\n" - "one revision.\n"), - { 'r', 'q', opt_incremental, SVN_SVNRDUMP__BASE_OPTIONS } }, - { "load", load_cmd, { 0 }, - N_("usage: svnrdump load URL\n\n" - "Load a 'dumpfile' given on stdin to a repository at remote URL.\n"), - { 'q', opt_skip_revprop, SVN_SVNRDUMP__BASE_OPTIONS } }, - { "help", 0, { "?", "h" }, - N_("usage: svnrdump help [SUBCOMMAND...]\n\n" - "Describe the usage of this program or its subcommands.\n"), + "one revision.\n" + )}, + { 'r', 'q', opt_incremental, 'F', SVN_SVNRDUMP__BASE_OPTIONS }, + {{'F', N_("write to file ARG instead of stdout")}} }, + { "load", load_cmd, { 0 }, {N_( + "usage: svnrdump load URL\n" + "\n"), N_( + "Load a 'dumpfile' given on stdin to a repository at remote URL.\n" + )}, + { 'q', opt_skip_revprop, 'F', SVN_SVNRDUMP__BASE_OPTIONS }, + {{'F', N_("read from file ARG instead of stdin")}} }, + { "help", 0, { "?", "h" }, {N_( + "usage: svnrdump help [SUBCOMMAND...]\n" + "\n"), N_( + "Describe the usage of this program or its subcommands.\n" + )}, { 0 } }, - { NULL, NULL, { 0 }, NULL, { 0 } } + { NULL, NULL, { 0 }, {NULL}, { 0 } } }; static const apr_getopt_option_t svnrdump__options[] = @@ -158,7 +166,8 @@ static const apr_getopt_option_t svnrdump__options[] = "valid certificate) and 'other' (all other not\n" " " "separately classified certificate errors).")}, - {"dumpfile", 'F', 1, N_("Read or write to a dumpfile instead of stdin/stdout")}, + {"file", 'F', 1, + N_("read/write file ARG instead of stdin/stdout")}, {0, 0, 0, 0} }; @@ -338,7 +347,7 @@ init_client_context(svn_client_ctx_t **ctx_p, ### auxiliary GETs/PROPFINDs to happening (well-ordered) on a ### single server connection. ### - ### See http://subversion.tigris.org/issues/show_bug.cgi?id=4116. + ### See https://issues.apache.org/jira/browse/SVN-4116. */ cfg_servers = svn_hash_gets(ctx->config, SVN_CONFIG_CATEGORY_SERVERS); svn_config_set_bool(cfg_servers, SVN_CONFIG_SECTION_GLOBAL, @@ -423,7 +432,7 @@ dump_initial_full_revision(svn_ra_session_t *session, our update-driven dump generation work the way a replay-driven one would. - See http://subversion.tigris.org/issues/show_bug.cgi?id=4101 + See https://issues.apache.org/jira/browse/SVN-4101 */ SVN_ERR(svn_ra_get_session_url(session, &session_url, pool)); SVN_ERR(svn_ra_get_path_relative_to_root(session, &source_relpath, @@ -491,12 +500,11 @@ replay_revisions(svn_ra_session_t *session, replay_baton->quiet = quiet; /* Write the magic header and UUID */ - SVN_ERR(svn_stream_printf(output_stream, pool, - SVN_REPOS_DUMPFILE_MAGIC_HEADER ": %d\n\n", - SVN_REPOS_DUMPFILE_FORMAT_VERSION)); + SVN_ERR(svn_repos__dump_magic_header_record(output_stream, + SVN_REPOS_DUMPFILE_FORMAT_VERSION, + pool)); SVN_ERR(svn_ra_get_uuid2(session, &uuid, pool)); - SVN_ERR(svn_stream_printf(output_stream, pool, - SVN_REPOS_DUMPFILE_UUID ": %s\n\n", uuid)); + SVN_ERR(svn_repos__dump_uuid_header_record(output_stream, uuid, pool)); /* Fake revision 0 if necessary */ if (start_revision == 0) @@ -540,6 +548,7 @@ replay_revisions(svn_ra_session_t *session, #endif } + SVN_ERR(svn_stream_close(output_stream)); return SVN_NO_ERROR; } @@ -572,6 +581,7 @@ load_revisions(svn_ra_session_t *session, quiet, skip_revprops, check_cancel, NULL, pool)); + SVN_ERR(svn_stream_close(output_stream)); return SVN_NO_ERROR; } @@ -612,7 +622,7 @@ version(const char *progname, pool); SVN_ERR(svn_ra_print_modules(version_footer, pool)); - return svn_opt_print_help4(NULL, ensure_appname(progname, pool), + return svn_opt_print_help5(NULL, ensure_appname(progname, pool), TRUE, quiet, FALSE, version_footer->data, NULL, NULL, NULL, NULL, NULL, pool); } @@ -671,7 +681,7 @@ help_cmd(apr_getopt_t *os, "\n" "Available subcommands:\n"); - return svn_opt_print_help4(os, "svnrdump", FALSE, FALSE, FALSE, NULL, + return svn_opt_print_help5(os, "svnrdump", FALSE, FALSE, FALSE, NULL, header, svnrdump__cmd_table, svnrdump__options, NULL, NULL, pool); } @@ -777,7 +787,7 @@ static svn_error_t * sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) { svn_error_t *err = SVN_NO_ERROR; - const svn_opt_subcommand_desc2_t *subcommand = NULL; + const svn_opt_subcommand_desc3_t *subcommand = NULL; opt_baton_t *opt_baton; svn_revnum_t latest_revision = SVN_INVALID_REVNUM; const char *config_dir = NULL; @@ -937,7 +947,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_baton->help) { - subcommand = svn_opt_get_canonical_subcommand2(svnrdump__cmd_table, + subcommand = svn_opt_get_canonical_subcommand3(svnrdump__cmd_table, "help"); } if (subcommand == NULL) @@ -947,8 +957,8 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_baton->version) { /* Use the "help" subcommand to handle the "--version" option. */ - static const svn_opt_subcommand_desc2_t pseudo_cmd = - { "--version", help_cmd, {0}, "", + static const svn_opt_subcommand_desc3_t pseudo_cmd = + { "--version", help_cmd, {0}, {""}, {opt_version, /* must accept its own option */ 'q', /* --quiet */ } }; @@ -968,7 +978,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) SVN_ERR(svn_utf_cstring_to_utf8(&first_arg, os->argv[os->ind++], pool)); - subcommand = svn_opt_get_canonical_subcommand2(svnrdump__cmd_table, + subcommand = svn_opt_get_canonical_subcommand3(svnrdump__cmd_table, first_arg); if (subcommand == NULL) @@ -996,11 +1006,11 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_id == 'h' || opt_id == '?') continue; - if (! svn_opt_subcommand_takes_option3(subcommand, opt_id, NULL)) + if (! svn_opt_subcommand_takes_option4(subcommand, opt_id, NULL)) { const char *optstr; const apr_getopt_option_t *badopt = - svn_opt_get_option_from_code2(opt_id, svnrdump__options, + svn_opt_get_option_from_code3(opt_id, svnrdump__options, subcommand, pool); svn_opt_format_option(&optstr, badopt, FALSE, pool); if (subcommand->name[0] == '-') diff --git a/subversion/svnrdump/svnrdump.h b/subversion/svnrdump/svnrdump.h index b6ac7c1..5529024 100644 --- a/subversion/svnrdump/svnrdump.h +++ b/subversion/svnrdump/svnrdump.h @@ -77,12 +77,21 @@ svn_rdump__get_dump_editor_v2(svn_editor_t **editor, /** * Load the dumpstream carried in @a stream to the location described - * by @a session. Use @a aux_session (which is opened to the same URL - * as @a session) for any secondary, out-of-band RA communications - * required. If @a quiet is set, suppress notifications. Use @a pool - * for all memory allocations. Use @a cancel_func and @a cancel_baton - * to check for user cancellation of the operation (for - * timely-but-safe termination). + * by @a session. + * + * Use @a aux_session (which is opened to the same URL as @a session) + * for any secondary, out-of-band RA communications required. This is + * needed when loading a non-deltas dump, and for Ev2. + * + * Print feedback to the console for each revision, unless @a quiet is true. + * + * Ignore (don't set) any revision property whose name is a key in + * @a skip_revprops. The values in the hash are unimportant. + * + * Use @a cancel_func and @a cancel_baton to check for user cancellation + * of the operation (for timely-but-safe termination). + * + * Use @a pool for all memory allocations. */ svn_error_t * svn_rdump__load_dumpstream(svn_stream_t *stream, diff --git a/subversion/svnserve/logger.c b/subversion/svnserve/logger.c index 19b6bd4..ccd793c 100644 --- a/subversion/svnserve/logger.c +++ b/subversion/svnserve/logger.c @@ -88,19 +88,21 @@ logger__create(logger_t **logger, return SVN_NO_ERROR; } -void -logger__log_error(logger_t *logger, - svn_error_t *err, - repository_t *repository, - client_info_t *client_info) +static void +log_message(logger_t *logger, + const svn_error_t *err, + const char *prefix, + repository_t *repository, + client_info_t *client_info) { if (logger && err) { const char *timestr, *continuation; const char *user, *repos, *remote_host; - char errbuf[256]; + /* 8192 from MAX_STRING_LEN in from httpd-2.2.4/include/httpd.h */ - char errstr[8192]; + const apr_size_t errstr_size = 8192; + char *errstr = apr_palloc(logger->pool, errstr_size); svn_error_clear(svn_mutex__lock(logger->mutex)); @@ -118,21 +120,22 @@ logger__log_error(logger_t *logger, continuation = ""; while (err) { + char errbuf[256]; const char *message = svn_err_best_message(err, errbuf, sizeof(errbuf)); /* based on httpd-2.2.4/server/log.c:log_error_core */ - apr_size_t len = apr_snprintf(errstr, sizeof(errstr), + apr_size_t len = apr_snprintf(errstr, errstr_size, "%" APR_PID_T_FMT - " %s %s %s %s ERR%s %s %ld %d ", + " %s %s %s %s %s%s %s %ld %d ", getpid(), timestr, remote_host, user, - repos, continuation, + repos, prefix, continuation, err->file ? err->file : "-", err->line, err->apr_err); len += escape_errorlog_item(errstr + len, message, - sizeof(errstr) - len); + errstr_size - len); /* Truncate for the terminator (as apr_snprintf does) */ - if (len > sizeof(errstr) - sizeof(APR_EOL_STR)) { - len = sizeof(errstr) - sizeof(APR_EOL_STR); + if (len > errstr_size - sizeof(APR_EOL_STR)) { + len = errstr_size - sizeof(APR_EOL_STR); } memcpy(errstr + len, APR_EOL_STR, sizeof(APR_EOL_STR)); @@ -150,6 +153,24 @@ logger__log_error(logger_t *logger, } } +void +logger__log_error(logger_t *logger, + const svn_error_t *err, + repository_t *repository, + client_info_t *client_info) +{ + log_message(logger, err, "ERR", repository, client_info); +} + +void +logger__log_warning(logger_t *logger, + const svn_error_t *err, + repository_t *repository, + client_info_t *client_info) +{ + log_message(logger, err, "WARN", repository, client_info); +} + svn_error_t * logger__write(logger_t *logger, const char *errstr, diff --git a/subversion/svnserve/logger.h b/subversion/svnserve/logger.h index aac804b..d8099e7 100644 --- a/subversion/svnserve/logger.h +++ b/subversion/svnserve/logger.h @@ -64,14 +64,21 @@ logger__write(logger_t *logger, /* Write a description of ERR with additional information from REPOSITORY * and CLIENT_INFO to the log file managed by LOGGER. REPOSITORY as well * as CLIENT_INFO may be NULL. If either ERR or LOGGER are NULL, this - * becomes a no-op. + * becomes a no-op. Does not clear ERR. */ void logger__log_error(logger_t *logger, - svn_error_t *err, + const svn_error_t *err, repository_t *repository, client_info_t *client_info); +/* Like logger__log_error() but for warnings. */ +void +logger__log_warning(logger_t *logger, + const svn_error_t *err, + repository_t *repository, + client_info_t *client_info); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/subversion/svnserve/serve.c b/subversion/svnserve/serve.c index 1fe27b2..06b58f8 100644 --- a/subversion/svnserve/serve.c +++ b/subversion/svnserve/serve.c @@ -107,15 +107,22 @@ typedef struct authz_baton_t { svn_ra_svn_conn_t *conn; } authz_baton_t; -/* svn_error_create() a new error, log_server_error() it, and - return it. */ +/* Log an error. */ static void -log_error(svn_error_t *err, server_baton_t *server) +log_error(const svn_error_t *err, server_baton_t *server) { logger__log_error(server->logger, err, server->repository, server->client_info); } +/* Log a warning. */ +static void +log_warning(const svn_error_t *err, server_baton_t *server) +{ + logger__log_warning(server->logger, err, server->repository, + server->client_info); +} + /* svn_error_create() a new error, log_server_error() it, and return it. */ static svn_error_t * @@ -264,17 +271,23 @@ canonicalize_access_file(const char **access_file, repository_t *repository, { if (svn_path_is_url(*access_file)) { - *access_file = svn_uri_canonicalize(*access_file, pool); + const char *canonical_url; + SVN_ERR(svn_uri_canonicalize_safe(&canonical_url, NULL, *access_file, + pool, pool)); + *access_file = canonical_url; } else if (svn_path_is_repos_relative_url(*access_file)) { const char *repos_root_url; + const char *canonical_url; SVN_ERR(svn_uri_get_file_url_from_dirent(&repos_root_url, repos_root, pool)); SVN_ERR(svn_path_resolve_repos_relative_url(access_file, *access_file, repos_root_url, pool)); - *access_file = svn_uri_canonicalize(*access_file, pool); + SVN_ERR(svn_uri_canonicalize_safe(&canonical_url, NULL, *access_file, + pool, pool)); + *access_file = canonical_url; } else { @@ -294,7 +307,10 @@ static svn_error_t * load_authz_config(repository_t *repository, const char *repos_root, svn_config_t *cfg, - apr_pool_t *pool) + svn_repos_authz_warning_func_t warning_func, + void *warning_baton, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) { const char *authzdb_path; const char *groupsdb_path; @@ -313,17 +329,18 @@ load_authz_config(repository_t *repository, /* Canonicalize and add the base onto the authzdb_path (if needed). */ err = canonicalize_access_file(&authzdb_path, repository, - repos_root, pool); + repos_root, scratch_pool); /* Same for the groupsdb_path if it is present. */ if (groupsdb_path && !err) err = canonicalize_access_file(&groupsdb_path, repository, - repos_root, pool); + repos_root, scratch_pool); if (!err) - err = svn_repos_authz_read3(&repository->authzdb, authzdb_path, + err = svn_repos_authz_read4(&repository->authzdb, authzdb_path, groupsdb_path, TRUE, repository->repos, - pool, pool); + warning_func, warning_baton, + result_pool, scratch_pool); if (err) return svn_error_create(SVN_ERR_AUTHZ_INVALID_CONFIG, err, NULL); @@ -369,7 +386,7 @@ handle_config_error(svn_error_t *error, /* Now that we've logged the error, clear it and return a * nice, generic error to the user: - * http://subversion.tigris.org/issues/show_bug.cgi?id=2271 */ + * https://issues.apache.org/jira/browse/SVN-2271 */ svn_error_clear(error); return svn_error_create(apr_err, NULL, NULL); } @@ -843,7 +860,7 @@ static svn_error_t *set_path(svn_ra_svn_conn_t *conn, apr_pool_t *pool, svn_ra_svn__list_t *params, void *baton) { report_driver_baton_t *b = baton; - const char *path, *lock_token, *depth_word; + const char *path, *lock_token, *depth_word, *canonical_relpath; svn_revnum_t rev; /* Default to infinity, for old clients that don't send depth. */ svn_depth_t depth = svn_depth_infinity; @@ -854,7 +871,9 @@ static svn_error_t *set_path(svn_ra_svn_conn_t *conn, apr_pool_t *pool, &depth_word)); if (depth_word) depth = svn_depth_from_word(depth_word); - path = svn_relpath_canonicalize(path, pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_relpath, NULL, path, + pool, pool)); + path = canonical_relpath; if (b->from_rev && strcmp(path, "") == 0) *b->from_rev = rev; if (!b->err) @@ -870,10 +889,12 @@ static svn_error_t *delete_path(svn_ra_svn_conn_t *conn, apr_pool_t *pool, svn_ra_svn__list_t *params, void *baton) { report_driver_baton_t *b = baton; - const char *path; + const char *path, *canonical_relpath; SVN_ERR(svn_ra_svn__parse_tuple(params, "c", &path)); - path = svn_relpath_canonicalize(path, pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_relpath, NULL, path, + pool, pool)); + path = canonical_relpath; if (!b->err) b->err = svn_repos_delete_path(b->report_baton, path, pool); return SVN_NO_ERROR; @@ -883,7 +904,8 @@ static svn_error_t *link_path(svn_ra_svn_conn_t *conn, apr_pool_t *pool, svn_ra_svn__list_t *params, void *baton) { report_driver_baton_t *b = baton; - const char *path, *url, *lock_token, *fs_path, *depth_word; + const char *path, *url, *lock_token, *fs_path, *depth_word, *canonical_url; + const char *canonical_path; svn_revnum_t rev; svn_boolean_t start_empty; /* Default to infinity, for old clients that don't send depth. */ @@ -895,8 +917,12 @@ static svn_error_t *link_path(svn_ra_svn_conn_t *conn, apr_pool_t *pool, /* ### WHAT?! The link path is an absolute URL?! Didn't see that coming... -- cmpilato */ - path = svn_relpath_canonicalize(path, pool); - url = svn_uri_canonicalize(url, pool); + + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + pool, pool)); + path = canonical_path; + SVN_ERR(svn_uri_canonicalize_safe(&canonical_url, NULL, url, pool, pool)); + url = canonical_url; if (depth_word) depth = svn_depth_from_word(depth_word); if (!b->err) @@ -1112,11 +1138,12 @@ reparent(svn_ra_svn_conn_t *conn, void *baton) { server_baton_t *b = baton; - const char *url; + const char *url, *canonical_url; const char *fs_path; SVN_ERR(svn_ra_svn__parse_tuple(params, "c", &url)); - url = svn_uri_canonicalize(url, pool); + SVN_ERR(svn_uri_canonicalize_safe(&canonical_url, NULL, url, pool, pool)); + url = canonical_url; SVN_ERR(trivial_auth_request(conn, pool, b)); SVN_CMD_ERR(get_fs_path(svn_path_uri_decode(b->repository->repos_url, pool), svn_path_uri_decode(url, pool), @@ -1335,6 +1362,7 @@ add_lock_tokens(const svn_ra_svn__list_t *lock_tokens, server_baton_t *sb, apr_pool_t *pool) { + const char *canonical_path; int i; svn_fs_access_t *fs_access; @@ -1364,9 +1392,10 @@ add_lock_tokens(const svn_ra_svn__list_t *lock_tokens, "Lock token isn't a string"); path = path_item->u.string.data; + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + pool, pool)); full_path = svn_fspath__join(sb->repository->fs_path->data, - svn_relpath_canonicalize(path, pool), - pool); + canonical_path, pool); if (! lookup_access(pool, sb, svn_authz_write, full_path, TRUE)) return error_create_and_log(SVN_ERR_RA_NOT_AUTHORIZED, NULL, NULL, @@ -1404,6 +1433,7 @@ unlock_paths(const svn_ra_svn__list_t *lock_tokens, int i; apr_pool_t *subpool = svn_pool_create(pool); apr_hash_t *targets = apr_hash_make(subpool); + const char *canonical_path; svn_error_t *err; for (i = 0; i < lock_tokens->nelts; ++i) @@ -1416,9 +1446,10 @@ unlock_paths(const svn_ra_svn__list_t *lock_tokens, token_item = &SVN_RA_SVN__LIST_ITEM(&item->u.list, 1); path = path_item->u.string.data; + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + subpool, subpool)); full_path = svn_fspath__join(sb->repository->fs_path->data, - svn_relpath_canonicalize(path, subpool), - subpool); + canonical_path, subpool); token = token_item->u.string.data; svn_hash_sets(targets, full_path, token); } @@ -1558,7 +1589,7 @@ get_file(svn_ra_svn_conn_t *conn, void *baton) { server_baton_t *b = baton; - const char *path, *full_path, *hex_digest; + const char *path, *full_path, *hex_digest, *canonical_path; svn_revnum_t rev; svn_fs_root_t *root; svn_stream_t *contents; @@ -1585,8 +1616,10 @@ get_file(svn_ra_svn_conn_t *conn, if (wants_inherited_props == SVN_RA_SVN_UNSPECIFIED_NUMBER) wants_inherited_props = FALSE; - full_path = svn_fspath__join(b->repository->fs_path->data, - svn_relpath_canonicalize(path, pool), pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, pool, + pool)); + full_path = svn_fspath__join(b->repository->fs_path->data, canonical_path, + pool); /* Check authorizations */ SVN_ERR(must_have_access(conn, pool, b, svn_authz_read, @@ -1743,7 +1776,7 @@ get_dir(svn_ra_svn_conn_t *conn, void *baton) { server_baton_t *b = baton; - const char *path, *full_path; + const char *path, *full_path, *canonical_path; svn_revnum_t rev; apr_hash_t *entries, *props = NULL; apr_array_header_t *inherited_props; @@ -1769,8 +1802,10 @@ get_dir(svn_ra_svn_conn_t *conn, wants_inherited_props = FALSE; SVN_ERR(parse_dirent_fields(&dirent_fields, dirent_fields_list)); - full_path = svn_fspath__join(b->repository->fs_path->data, - svn_relpath_canonicalize(path, pool), pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + pool, pool)); + full_path = svn_fspath__join(b->repository->fs_path->data, canonical_path, + pool); /* Check authorizations */ SVN_ERR(must_have_access(conn, pool, b, svn_authz_read, @@ -1917,7 +1952,7 @@ update(svn_ra_svn_conn_t *conn, { server_baton_t *b = baton; svn_revnum_t rev; - const char *target, *full_path, *depth_word; + const char *target, *full_path, *depth_word, *canonical_target; svn_boolean_t recurse; svn_tristate_t send_copyfrom_args; /* Optional; default FALSE */ svn_tristate_t ignore_ancestry; /* Optional; default FALSE */ @@ -1930,7 +1965,9 @@ update(svn_ra_svn_conn_t *conn, SVN_ERR(svn_ra_svn__parse_tuple(params, "(?r)cb?w3?3", &rev, &target, &recurse, &depth_word, &send_copyfrom_args, &ignore_ancestry)); - target = svn_relpath_canonicalize(target, pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_target, NULL, target, + pool, pool)); + target = canonical_target; if (depth_word) depth = svn_depth_from_word(depth_word); @@ -1976,7 +2013,7 @@ switch_cmd(svn_ra_svn_conn_t *conn, server_baton_t *b = baton; svn_revnum_t rev; const char *target, *depth_word; - const char *switch_url, *switch_path; + const char *switch_url, *switch_path, *canonical_url, *canonical_target; svn_boolean_t recurse; /* Default to unknown. Old clients won't send depth, but we'll handle that by converting recurse if necessary. */ @@ -1988,9 +2025,12 @@ switch_cmd(svn_ra_svn_conn_t *conn, SVN_ERR(svn_ra_svn__parse_tuple(params, "(?r)cbc?w?33", &rev, &target, &recurse, &switch_url, &depth_word, &send_copyfrom_args, &ignore_ancestry)); - target = svn_relpath_canonicalize(target, pool); - switch_url = svn_uri_canonicalize(switch_url, pool); - + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_target, NULL, target, + pool, pool)); + target = canonical_target; + SVN_ERR(svn_uri_canonicalize_safe(&canonical_url, NULL, switch_url, pool, + pool)); + switch_url = canonical_url; if (depth_word) depth = svn_depth_from_word(depth_word); else @@ -2028,7 +2068,7 @@ status(svn_ra_svn_conn_t *conn, { server_baton_t *b = baton; svn_revnum_t rev; - const char *target, *depth_word; + const char *target, *depth_word, *canonical_target; svn_boolean_t recurse; /* Default to unknown. Old clients won't send depth, but we'll handle that by converting recurse if necessary. */ @@ -2037,7 +2077,9 @@ status(svn_ra_svn_conn_t *conn, /* Parse the arguments. */ SVN_ERR(svn_ra_svn__parse_tuple(params, "cb?(?r)?w", &target, &recurse, &rev, &depth_word)); - target = svn_relpath_canonicalize(target, pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_target, NULL, target, + pool, pool)); + target = canonical_target; if (depth_word) depth = svn_depth_from_word(depth_word); @@ -2067,7 +2109,8 @@ diff(svn_ra_svn_conn_t *conn, { server_baton_t *b = baton; svn_revnum_t rev; - const char *target, *versus_url, *versus_path, *depth_word; + const char *target, *versus_url, *versus_path, *depth_word, *canonical_url; + const char *canonical_target; svn_boolean_t recurse, ignore_ancestry; svn_boolean_t text_deltas; /* Default to unknown. Old clients won't send depth, but we'll @@ -2090,8 +2133,12 @@ diff(svn_ra_svn_conn_t *conn, &ignore_ancestry, &versus_url, &text_deltas, &depth_word)); } - target = svn_relpath_canonicalize(target, pool); - versus_url = svn_uri_canonicalize(versus_url, pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_target, NULL, target, + pool, pool)); + target = canonical_target; + SVN_ERR(svn_uri_canonicalize_safe(&canonical_url, NULL, versus_url, + pool, pool)); + versus_url = canonical_url; if (depth_word) depth = svn_depth_from_word(depth_word); @@ -2216,13 +2263,15 @@ get_mergeinfo(svn_ra_svn_conn_t *conn, for (i = 0; i < paths->nelts; i++) { svn_ra_svn__item_t *item = &SVN_RA_SVN__LIST_ITEM(paths, i); - const char *full_path; + const char *full_path, *canonical_path; if (item->kind != SVN_RA_SVN_STRING) return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL, _("Path is not a string")); - full_path = svn_relpath_canonicalize(item->u.string.data, pool); - full_path = svn_fspath__join(b->repository->fs_path->data, full_path, pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, + item->u.string.data, pool, pool)); + full_path = svn_fspath__join(b->repository->fs_path->data, + canonical_path, pool); APR_ARRAY_PUSH(canonical_paths, const char *) = full_path; } @@ -2384,7 +2433,7 @@ log_cmd(svn_ra_svn_conn_t *conn, svn_error_t *err, *write_err; server_baton_t *b = baton; svn_revnum_t start_rev, end_rev; - const char *full_path; + const char *full_path, *canonical_path; svn_boolean_t send_changed_paths, strict_node, include_merged_revisions; apr_array_header_t *full_paths, *revprops; svn_ra_svn__list_t *paths, *revprop_items; @@ -2448,9 +2497,10 @@ log_cmd(svn_ra_svn_conn_t *conn, if (elt->kind != SVN_RA_SVN_STRING) return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL, _("Log path entry not a string")); - full_path = svn_relpath_canonicalize(elt->u.string.data, pool), - full_path = svn_fspath__join(b->repository->fs_path->data, full_path, - pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, + elt->u.string.data, pool, pool)); + full_path = svn_fspath__join(b->repository->fs_path->data, + canonical_path, pool); APR_ARRAY_PUSH(full_paths, const char *) = full_path; } SVN_ERR(trivial_auth_request(conn, pool, b)); @@ -2493,13 +2543,15 @@ check_path(svn_ra_svn_conn_t *conn, { server_baton_t *b = baton; svn_revnum_t rev; - const char *path, *full_path; + const char *path, *full_path, *canonical_path; svn_fs_root_t *root; svn_node_kind_t kind; SVN_ERR(svn_ra_svn__parse_tuple(params, "c(?r)", &path, &rev)); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + pool, pool));; full_path = svn_fspath__join(b->repository->fs_path->data, - svn_relpath_canonicalize(path, pool), pool); + canonical_path, pool); /* Check authorizations */ SVN_ERR(must_have_access(conn, pool, b, svn_authz_read, @@ -2526,13 +2578,15 @@ stat_cmd(svn_ra_svn_conn_t *conn, { server_baton_t *b = baton; svn_revnum_t rev; - const char *path, *full_path, *cdate; + const char *path, *full_path, *cdate, *canonical_path; svn_fs_root_t *root; svn_dirent_t *dirent; SVN_ERR(svn_ra_svn__parse_tuple(params, "c(?r)", &path, &rev)); - full_path = svn_fspath__join(b->repository->fs_path->data, - svn_relpath_canonicalize(path, pool), pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, pool, + pool)); + full_path = svn_fspath__join(b->repository->fs_path->data, canonical_path, + pool); /* Check authorizations */ SVN_ERR(must_have_access(conn, pool, b, svn_authz_read, @@ -2581,7 +2635,7 @@ get_locations(svn_ra_svn_conn_t *conn, svn_ra_svn__list_t *loc_revs_proto; svn_ra_svn__item_t *elt; int i; - const char *relative_path; + const char *relative_path, *canonical_path; svn_revnum_t peg_revision; apr_hash_t *fs_locations; const char *abs_path; @@ -2594,7 +2648,9 @@ get_locations(svn_ra_svn_conn_t *conn, SVN_ERR(svn_ra_svn__parse_tuple(params, "crl", &relative_path, &peg_revision, &loc_revs_proto)); - relative_path = svn_relpath_canonicalize(relative_path, pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, relative_path, + pool, pool)); + relative_path = canonical_path; abs_path = svn_fspath__join(b->repository->fs_path->data, relative_path, pool); @@ -2680,7 +2736,7 @@ get_location_segments(svn_ra_svn_conn_t *conn, svn_error_t *err, *write_err; server_baton_t *b = baton; svn_revnum_t peg_revision, start_rev, end_rev; - const char *relative_path; + const char *relative_path, *canonical_path; const char *abs_path; authz_baton_t ab; @@ -2691,7 +2747,9 @@ get_location_segments(svn_ra_svn_conn_t *conn, SVN_ERR(svn_ra_svn__parse_tuple(params, "c(?r)(?r)(?r)", &relative_path, &peg_revision, &start_rev, &end_rev)); - relative_path = svn_relpath_canonicalize(relative_path, pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, relative_path, + pool, pool)); + relative_path = canonical_path; abs_path = svn_fspath__join(b->repository->fs_path->data, relative_path, pool); @@ -2843,6 +2901,7 @@ get_file_revs(svn_ra_svn_conn_t *conn, svn_revnum_t start_rev, end_rev; const char *path; const char *full_path; + const char *canonical_path; apr_uint64_t include_merged_revs_param; svn_boolean_t include_merged_revisions; authz_baton_t ab; @@ -2854,7 +2913,9 @@ get_file_revs(svn_ra_svn_conn_t *conn, SVN_ERR(svn_ra_svn__parse_tuple(params, "c(?r)(?r)?B", &path, &start_rev, &end_rev, &include_merged_revs_param)); - path = svn_relpath_canonicalize(path, pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + pool, pool)); + path = canonical_path; SVN_ERR(trivial_auth_request(conn, pool, b)); full_path = svn_fspath__join(b->repository->fs_path->data, path, pool); @@ -2897,14 +2958,17 @@ lock(svn_ra_svn_conn_t *conn, const char *path; const char *comment; const char *full_path; + const char *canonical_path; svn_boolean_t steal_lock; svn_revnum_t current_rev; svn_lock_t *l; SVN_ERR(svn_ra_svn__parse_tuple(params, "c(?c)b(?r)", &path, &comment, &steal_lock, ¤t_rev)); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + pool, pool));; full_path = svn_fspath__join(b->repository->fs_path->data, - svn_relpath_canonicalize(path, pool), pool); + canonical_path, pool); SVN_ERR(must_have_access(conn, pool, b, svn_authz_write, full_path, TRUE)); @@ -2996,7 +3060,7 @@ lock_many(svn_ra_svn_conn_t *conn, /* Parse the lock requests from PATH_REVS into TARGETS. */ for (i = 0; i < path_revs->nelts; ++i) { - const char *path, *full_path; + const char *path, *full_path, *canonical_path; svn_revnum_t current_rev; svn_ra_svn__item_t *item = &SVN_RA_SVN__LIST_ITEM(path_revs, i); svn_fs_lock_target_t *target; @@ -3010,9 +3074,10 @@ lock_many(svn_ra_svn_conn_t *conn, SVN_ERR(svn_ra_svn__parse_tuple(&item->u.list, "c(?r)", &path, ¤t_rev)); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + subpool, subpool)); full_path = svn_fspath__join(b->repository->fs_path->data, - svn_relpath_canonicalize(path, subpool), - pool); + canonical_path, pool); target = svn_fs_lock_target_create(NULL, current_rev, pool); /* Any duplicate paths, once canonicalized, get collapsed into a @@ -3059,7 +3124,7 @@ lock_many(svn_ra_svn_conn_t *conn, /* Return results in the same order as the paths were supplied. */ for (i = 0; i < path_revs->nelts; ++i) { - const char *path, *full_path; + const char *path, *full_path, *canonical_path; svn_revnum_t current_rev; svn_ra_svn__item_t *item = &SVN_RA_SVN__LIST_ITEM(path_revs, i); struct lock_result_t *result; @@ -3071,9 +3136,10 @@ lock_many(svn_ra_svn_conn_t *conn, if (write_err) break; + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + subpool, subpool)); full_path = svn_fspath__join(b->repository->fs_path->data, - svn_relpath_canonicalize(path, subpool), - subpool); + canonical_path, subpool); result = svn_hash_gets(lmb.results, full_path); if (!result) @@ -3128,14 +3194,16 @@ unlock(svn_ra_svn_conn_t *conn, void *baton) { server_baton_t *b = baton; - const char *path, *token, *full_path; + const char *path, *token, *full_path, *canonical_path; svn_boolean_t break_lock; SVN_ERR(svn_ra_svn__parse_tuple(params, "c(?c)b", &path, &token, &break_lock)); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + pool, pool)); full_path = svn_fspath__join(b->repository->fs_path->data, - svn_relpath_canonicalize(path, pool), pool); + canonical_path, pool); /* Username required unless break_lock was specified. */ SVN_ERR(must_have_access(conn, pool, b, svn_authz_write, @@ -3179,7 +3247,7 @@ unlock_many(svn_ra_svn_conn_t *conn, for (i = 0; i < unlock_tokens->nelts; i++) { svn_ra_svn__item_t *item = &SVN_RA_SVN__LIST_ITEM(unlock_tokens, i); - const char *path, *full_path, *token; + const char *path, *full_path, *token, *canonical_path; svn_pool_clear(subpool); @@ -3192,9 +3260,10 @@ unlock_many(svn_ra_svn_conn_t *conn, if (!token) token = ""; + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + subpool, subpool)); full_path = svn_fspath__join(b->repository->fs_path->data, - svn_relpath_canonicalize(path, subpool), - pool); + canonical_path, pool); /* Any duplicate paths, once canonicalized, get collapsed into a single path that is processed once. The result is then @@ -3239,7 +3308,7 @@ unlock_many(svn_ra_svn_conn_t *conn, /* Return results in the same order as the paths were supplied. */ for (i = 0; i < unlock_tokens->nelts; ++i) { - const char *path, *token, *full_path; + const char *path, *token, *full_path, *canonical_path; svn_ra_svn__item_t *item = &SVN_RA_SVN__LIST_ITEM(unlock_tokens, i); struct lock_result_t *result; @@ -3250,9 +3319,10 @@ unlock_many(svn_ra_svn_conn_t *conn, if (write_err) break; + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + subpool, subpool)); full_path = svn_fspath__join(b->repository->fs_path->data, - svn_relpath_canonicalize(path, subpool), - pool); + canonical_path, pool); result = svn_hash_gets(lmb.results, full_path); if (!result) @@ -3302,12 +3372,15 @@ get_lock(svn_ra_svn_conn_t *conn, server_baton_t *b = baton; const char *path; const char *full_path; + const char *canonical_path; svn_lock_t *l; SVN_ERR(svn_ra_svn__parse_tuple(params, "c", &path)); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + pool, pool)); full_path = svn_fspath__join(b->repository->fs_path->data, - svn_relpath_canonicalize(path, pool), pool); + canonical_path, pool); SVN_ERR(must_have_access(conn, pool, b, svn_authz_read, full_path, FALSE)); @@ -3333,6 +3406,7 @@ get_locks(svn_ra_svn_conn_t *conn, server_baton_t *b = baton; const char *path; const char *full_path; + const char *canonical_path; const char *depth_word; svn_depth_t depth; apr_hash_t *locks; @@ -3356,8 +3430,10 @@ get_locks(svn_ra_svn_conn_t *conn, return log_fail_and_flush(err, b, conn, pool); } + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + pool, pool)); full_path = svn_fspath__join(b->repository->fs_path->data, - svn_relpath_canonicalize(path, pool), pool); + canonical_path, pool); SVN_ERR(trivial_auth_request(conn, pool, b)); @@ -3494,15 +3570,17 @@ get_deleted_rev(svn_ra_svn_conn_t *conn, void *baton) { server_baton_t *b = baton; - const char *path, *full_path; + const char *path, *full_path, *canonical_path; svn_revnum_t peg_revision; svn_revnum_t end_revision; svn_revnum_t revision_deleted; SVN_ERR(svn_ra_svn__parse_tuple(params, "crr", &path, &peg_revision, &end_revision)); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + pool, pool)); full_path = svn_fspath__join(b->repository->fs_path->data, - svn_relpath_canonicalize(path, pool), pool); + canonical_path, pool); SVN_ERR(log_command(b, conn, pool, "get-deleted-rev")); SVN_ERR(trivial_auth_request(conn, pool, b)); SVN_CMD_ERR(svn_repos_deleted_rev(b->repository->fs, full_path, peg_revision, @@ -3531,7 +3609,7 @@ get_inherited_props(svn_ra_svn_conn_t *conn, void *baton) { server_baton_t *b = baton; - const char *path, *full_path; + const char *path, *full_path, *canonical_path; svn_revnum_t rev; svn_fs_root_t *root; apr_array_header_t *inherited_props; @@ -3546,9 +3624,10 @@ get_inherited_props(svn_ra_svn_conn_t *conn, /* Parse arguments. */ SVN_ERR(svn_ra_svn__parse_tuple(params, "c(?r)", &path, &rev)); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + iterpool, iterpool)); full_path = svn_fspath__join(b->repository->fs_path->data, - svn_relpath_canonicalize(path, iterpool), - pool); + canonical_path, pool); /* Check authorizations */ SVN_ERR(must_have_access(conn, iterpool, b, svn_authz_read, @@ -3621,7 +3700,7 @@ list(svn_ra_svn_conn_t *conn, void *baton) { server_baton_t *b = baton; - const char *path, *full_path; + const char *path, *full_path, *canonical_path; svn_revnum_t rev; svn_depth_t depth; apr_array_header_t *patterns = NULL; @@ -3647,8 +3726,10 @@ list(svn_ra_svn_conn_t *conn, SVN_ERR(parse_dirent_fields(&rb.dirent_fields, dirent_fields_list)); depth = svn_depth_from_word(depth_word); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + pool, pool)); full_path = svn_fspath__join(b->repository->fs_path->data, - svn_relpath_canonicalize(path, pool), pool); + canonical_path, pool); /* Read the patterns list. */ if (patterns_list) @@ -3806,10 +3887,13 @@ find_repos(const char *url, repository_t *repository, svn_repos__config_pool_t *config_pool, apr_hash_t *fs_config, + svn_repos_authz_warning_func_t authz_warning_func, + void *authz_warning_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) { - const char *path, *full_path, *fs_path, *hooks_env; + const char *path, *full_path, *fs_path, *hooks_env, *canonical_path; + const char *canonical_root; svn_stringbuf_t *url_buf; svn_boolean_t sasl_requested; @@ -3825,8 +3909,9 @@ find_repos(const char *url, if (path == NULL) path = ""; } - path = svn_relpath_canonicalize(path, scratch_pool); - path = svn_path_uri_decode(path, scratch_pool); + SVN_ERR(svn_relpath_canonicalize_safe(&canonical_path, NULL, path, + scratch_pool, scratch_pool)); + path = svn_path_uri_decode(canonical_path, scratch_pool); /* Ensure that it isn't possible to escape the root by disallowing '..' segments. */ @@ -3835,8 +3920,9 @@ find_repos(const char *url, "Couldn't determine repository path"); /* Join the server-configured root with the client path. */ - full_path = svn_dirent_join(svn_dirent_canonicalize(root, scratch_pool), - path, scratch_pool); + SVN_ERR(svn_dirent_canonicalize_safe(&canonical_root, NULL, root, + scratch_pool, scratch_pool)); + full_path = svn_dirent_join(canonical_root, path, scratch_pool); /* Search for a repository in the full path. */ repository->repos_root = svn_repos_find_root_path(full_path, result_pool); @@ -3857,7 +3943,7 @@ find_repos(const char *url, svn_path_remove_components(url_buf, svn_path_component_count(repository->fs_path->data)); repository->repos_url = url_buf->data; - repository->authz_repos_name = svn_dirent_is_child(root, + repository->authz_repos_name = svn_dirent_is_child(canonical_root, repository->repos_root, result_pool); if (repository->authz_repos_name == NULL) @@ -3883,7 +3969,8 @@ find_repos(const char *url, SVN_ERR(load_pwdb_config(repository, cfg, config_pool, result_pool)); SVN_ERR(load_authz_config(repository, repository->repos_root, cfg, - result_pool)); + authz_warning_func, authz_warning_baton, + result_pool, scratch_pool)); /* Should we use Cyrus SASL? */ SVN_ERR(svn_config_get_bool(cfg, &sasl_requested, @@ -4105,6 +4192,16 @@ get_client_info(svn_ra_svn_conn_t *conn, return client_info; } +static void +handle_authz_warning(void *baton, + const svn_error_t *err, + apr_pool_t *scratch_pool) +{ + server_baton_t *const server_baton = baton; + log_warning(err, server_baton); + SVN_UNUSED(scratch_pool); +} + /* Construct the server baton for CONN using PARAMS and return it in *BATON. * It's lifetime is the same as that of CONN. SCRATCH_POOL */ @@ -4116,7 +4213,7 @@ construct_server_baton(server_baton_t **baton, { svn_error_t *err; apr_uint64_t ver; - const char *client_url, *ra_client_string, *client_string; + const char *client_url, *ra_client_string, *client_string, *canonical_url; svn_ra_svn__list_t *caplist; apr_pool_t *conn_pool = svn_ra_svn__get_pool(conn); server_baton_t *b = apr_pcalloc(conn_pool, sizeof(*b)); @@ -4183,15 +4280,21 @@ construct_server_baton(server_baton_t **baton, &ra_client_string, &client_string)); if (ver != 2) - return SVN_NO_ERROR; - - client_url = svn_uri_canonicalize(client_url, conn_pool); + return svn_error_createf(SVN_ERR_RA_SVN_BAD_VERSION, NULL, + "Unsupported ra_svn protocol version" + " %"APR_UINT64_T_FMT + " (supported versions: [2])", ver); + + SVN_ERR(svn_uri_canonicalize_safe(&canonical_url, NULL, client_url, + conn_pool, scratch_pool)); + client_url = canonical_url; SVN_ERR(svn_ra_svn__set_capabilities(conn, caplist)); /* All released versions of Subversion support edit-pipeline, * so we do not accept connections from clients that do not. */ if (! svn_ra_svn_has_capability(conn, SVN_RA_SVN_CAP_EDIT_PIPELINE)) - return SVN_NO_ERROR; + return svn_error_create(SVN_ERR_RA_SVN_BAD_VERSION, NULL, + "Missing edit-pipeline capability"); /* find_repos needs the capabilities as a list of words (eventually they get handed to the start-commit hook). While we could add a @@ -4227,10 +4330,14 @@ construct_server_baton(server_baton_t **baton, } } + /* (*b) has the logger, repository and client_info set, so it can + be used as the authz_warning_baton that eventyally gets passed + to log_warning(). */ err = handle_config_error(find_repos(client_url, params->root, b->vhost, b->read_only, params->cfg, b->repository, params->config_pool, params->fs_config, + handle_authz_warning, b, conn_pool, scratch_pool), b); if (!err) diff --git a/subversion/svnserve/svnserve.c b/subversion/svnserve/svnserve.c index b4ad64f..a92c3eb 100644 --- a/subversion/svnserve/svnserve.c +++ b/subversion/svnserve/svnserve.c @@ -479,7 +479,7 @@ static svn_error_t * version(svn_boolean_t quiet, apr_pool_t *pool) _("\nCyrus SASL authentication is available.\n")); #endif - return svn_opt_print_help4(NULL, "svnserve", TRUE, quiet, FALSE, + return svn_opt_print_help5(NULL, "svnserve", TRUE, quiet, FALSE, version_footer->data, NULL, NULL, NULL, NULL, NULL, pool); } diff --git a/subversion/svnsync/svnsync.c b/subversion/svnsync/svnsync.c index 9f50897..43c977b 100644 --- a/subversion/svnsync/svnsync.c +++ b/subversion/svnsync/svnsync.c @@ -89,17 +89,17 @@ enum svnsync__opt { svnsync_opt_config_dir, \ svnsync_opt_config_options -static const svn_opt_subcommand_desc2_t svnsync_cmd_table[] = +static const svn_opt_subcommand_desc3_t svnsync_cmd_table[] = { - { "initialize", initialize_cmd, { "init" }, - N_("usage: svnsync initialize DEST_URL SOURCE_URL\n" - "\n" + { "initialize", initialize_cmd, { "init" }, {N_( + "usage: svnsync initialize DEST_URL SOURCE_URL\n" + "\n"), N_( "Initialize a destination repository for synchronization from\n" "another repository.\n" - "\n" + "\n"), N_( "If the source URL is not the root of a repository, only the\n" "specified part of the repository will be synchronized.\n" - "\n" + "\n"), N_( "The destination URL must point to the root of a repository which\n" "has been configured to allow revision property changes. In\n" "the general case, the destination repository must contain no\n" @@ -109,65 +109,70 @@ static const svn_opt_subcommand_desc2_t svnsync_cmd_table[] = "their counterparts in the source repository. (This is useful\n" "when initializing a copy of a repository as a mirror of that same\n" "repository, for example.)\n" - "\n" + "\n"), N_( "You should not commit to, or make revision property changes in,\n" "the destination repository by any method other than 'svnsync'.\n" "In other words, the destination repository should be a read-only\n" - "mirror of the source repository.\n"), + "mirror of the source repository.\n" + )}, { SVNSYNC_OPTS_DEFAULT, svnsync_opt_source_prop_encoding, 'q', svnsync_opt_allow_non_empty, svnsync_opt_disable_locking, svnsync_opt_steal_lock, 'M' } }, - { "synchronize", synchronize_cmd, { "sync" }, - N_("usage: svnsync synchronize DEST_URL [SOURCE_URL]\n" - "\n" + { "synchronize", synchronize_cmd, { "sync" }, {N_( + "usage: svnsync synchronize DEST_URL [SOURCE_URL]\n" + "\n"), N_( "Transfer all pending revisions to the destination from the source\n" "with which it was initialized.\n" - "\n" + "\n"), N_( "If SOURCE_URL is provided, use that as the source repository URL,\n" "ignoring what is recorded in the destination repository as the\n" "source URL. Specifying SOURCE_URL is recommended in particular\n" "if untrusted users/administrators may have write access to the\n" - "DEST_URL repository.\n"), + "DEST_URL repository.\n" + )}, { SVNSYNC_OPTS_DEFAULT, svnsync_opt_source_prop_encoding, 'q', svnsync_opt_disable_locking, svnsync_opt_steal_lock, 'M' } }, - { "copy-revprops", copy_revprops_cmd, { 0 }, - N_("usage:\n" - "\n" + { "copy-revprops", copy_revprops_cmd, { 0 }, {N_( + "usage:\n" + "\n"), N_( " 1. svnsync copy-revprops DEST_URL [SOURCE_URL]\n" " 2. svnsync copy-revprops DEST_URL REV[:REV2]\n" - "\n" + "\n"), N_( "Copy the revision properties in a given range of revisions to the\n" "destination from the source with which it was initialized. If the\n" "revision range is not specified, it defaults to all revisions in\n" "the DEST_URL repository. Note also that the 'HEAD' revision is the\n" "latest in DEST_URL, not necessarily the latest in SOURCE_URL.\n" - "\n" + "\n"), N_( "If SOURCE_URL is provided, use that as the source repository URL,\n" "ignoring what is recorded in the destination repository as the\n" "source URL. Specifying SOURCE_URL is recommended in particular\n" "if untrusted users/administrators may have write access to the\n" "DEST_URL repository.\n" - "\n" + "\n"), N_( "Unless you need to trigger the destination repositoy's revprop\n" "change hooks for all revision properties, it is recommended to use\n" "the --skip-unchanged option for best performance.\n" - "\n" - "Form 2 is deprecated syntax, equivalent to specifying \"-rREV[:REV2]\".\n"), + "\n"), N_( + "Form 2 is deprecated syntax, equivalent to specifying \"-rREV[:REV2]\".\n" + )}, { SVNSYNC_OPTS_DEFAULT, svnsync_opt_source_prop_encoding, 'q', 'r', svnsync_opt_disable_locking, svnsync_opt_steal_lock, svnsync_opt_skip_unchanged, 'M' } }, - { "info", info_cmd, { 0 }, - N_("usage: svnsync info DEST_URL\n" - "\n" + { "info", info_cmd, { 0 }, {N_( + "usage: svnsync info DEST_URL\n" + "\n"), N_( "Print information about the synchronization destination repository\n" - "located at DEST_URL.\n"), + "located at DEST_URL.\n" + )}, { SVNSYNC_OPTS_DEFAULT } }, - { "help", help_cmd, { "?", "h" }, - N_("usage: svnsync help [SUBCOMMAND...]\n" - "\n" - "Describe the usage of this program or its subcommands.\n"), + { "help", help_cmd, { "?", "h" }, {N_( + "usage: svnsync help [SUBCOMMAND...]\n" + "\n"), N_( + "Describe the usage of this program or its subcommands.\n" + )}, { 0 } }, - { NULL, NULL, { 0 }, NULL, { 0 } } + { NULL, NULL, { 0 }, {NULL}, { 0 } } }; static const apr_getopt_option_t svnsync_options[] = @@ -1937,7 +1942,7 @@ help_cmd(apr_getopt_t *os, void *baton, apr_pool_t *pool) SVN_ERR(svn_ra_print_modules(version_footer, pool)); - SVN_ERR(svn_opt_print_help4(os, "svnsync", + SVN_ERR(svn_opt_print_help5(os, "svnsync", opt_baton ? opt_baton->version : FALSE, opt_baton ? opt_baton->quiet : FALSE, /*###opt_state ? opt_state->verbose :*/ FALSE, @@ -1960,7 +1965,7 @@ help_cmd(apr_getopt_t *os, void *baton, apr_pool_t *pool) static svn_error_t * sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) { - const svn_opt_subcommand_desc2_t *subcommand = NULL; + const svn_opt_subcommand_desc3_t *subcommand = NULL; apr_array_header_t *received_opts; opt_baton_t opt_baton; svn_config_t *config; @@ -2189,7 +2194,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) } if (opt_baton.help) - subcommand = svn_opt_get_canonical_subcommand2(svnsync_cmd_table, "help"); + subcommand = svn_opt_get_canonical_subcommand3(svnsync_cmd_table, "help"); /* The --non-interactive and --force-interactive options are mutually * exclusive. */ @@ -2269,8 +2274,8 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_baton.version) { /* Use the "help" subcommand to handle "--version". */ - static const svn_opt_subcommand_desc2_t pseudo_cmd = - { "--version", help_cmd, {0}, "", + static const svn_opt_subcommand_desc3_t pseudo_cmd = + { "--version", help_cmd, {0}, {""}, {svnsync_opt_version, /* must accept its own option */ 'q', /* --quiet */ } }; @@ -2290,7 +2295,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) SVN_ERR(svn_utf_cstring_to_utf8(&first_arg, os->argv[os->ind++], pool)); - subcommand = svn_opt_get_canonical_subcommand2(svnsync_cmd_table, + subcommand = svn_opt_get_canonical_subcommand3(svnsync_cmd_table, first_arg); if (subcommand == NULL) { @@ -2308,11 +2313,11 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_id == 'h' || opt_id == '?') continue; - if (! svn_opt_subcommand_takes_option3(subcommand, opt_id, NULL)) + if (! svn_opt_subcommand_takes_option4(subcommand, opt_id, NULL)) { const char *optstr; const apr_getopt_option_t *badopt = - svn_opt_get_option_from_code2(opt_id, svnsync_options, subcommand, + svn_opt_get_option_from_code3(opt_id, svnsync_options, subcommand, pool); svn_opt_format_option(&optstr, badopt, FALSE, pool); if (subcommand->name[0] == '-') diff --git a/subversion/svnversion/svnversion.c b/subversion/svnversion/svnversion.c index 8e4ceff..da65800 100644 --- a/subversion/svnversion/svnversion.c +++ b/subversion/svnversion/svnversion.c @@ -38,7 +38,7 @@ static svn_error_t * version(svn_boolean_t quiet, apr_pool_t *pool) { - return svn_opt_print_help4(NULL, "svnversion", TRUE, quiet, FALSE, + return svn_opt_print_help5(NULL, "svnversion", TRUE, quiet, FALSE, NULL, NULL, NULL, NULL, NULL, NULL, pool); } diff --git a/subversion/tests/afl/afl-svndiff-testcase/test1 b/subversion/tests/afl/afl-svndiff-testcase/test1 new file mode 100644 index 0000000..987db36 Binary files /dev/null and b/subversion/tests/afl/afl-svndiff-testcase/test1 differ diff --git a/subversion/tests/afl/afl-svndiff-testcase/test2 b/subversion/tests/afl/afl-svndiff-testcase/test2 new file mode 100644 index 0000000..984cbf5 Binary files /dev/null and b/subversion/tests/afl/afl-svndiff-testcase/test2 differ diff --git a/subversion/tests/afl/afl-svndiff-testcase/test3 b/subversion/tests/afl/afl-svndiff-testcase/test3 new file mode 100644 index 0000000..102ee8e Binary files /dev/null and b/subversion/tests/afl/afl-svndiff-testcase/test3 differ diff --git a/subversion/tests/afl/afl-svndiff.c b/subversion/tests/afl/afl-svndiff.c new file mode 100644 index 0000000..4ff00bf --- /dev/null +++ b/subversion/tests/afl/afl-svndiff.c @@ -0,0 +1,85 @@ +/* + * afl-svndiff.c an American Fuzz Lop test + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * + */ + +/* The input data can either be a file on disk or provided via stdin: + + afl-svndiff some-file + afl-svndiff < some-file + + In practice the file simply contains random binary data. The data + are interpreted as an svndiff as sent by a client to the server. */ + +#include "svn_delta.h" +#include "svn_cmdline.h" +#include "svn_pools.h" +#include "svn_io.h" + +#include + +static svn_error_t * +txdelta_window_handler(svn_txdelta_window_t *window, + void *baton) +{ + return SVN_NO_ERROR; +} + +static svn_error_t * +parse(const char *filename, apr_pool_t *pool) +{ + svn_stringbuf_t *buf; + svn_stream_t *svndiff; + svn_stream_t *stream; + + SVN_ERR(svn_stringbuf_from_file2(&buf, filename, pool)); + svndiff = svn_stream_from_stringbuf(buf, pool); + + stream = svn_txdelta_parse_svndiff(txdelta_window_handler, NULL, TRUE, pool); + SVN_ERR(svn_stream_copy3(svndiff, stream, NULL, NULL, pool)); + + return SVN_NO_ERROR; +} + +int main(int argc, char **argv) +{ + apr_pool_t *pool; + int exit_code = EXIT_SUCCESS; + svn_error_t *err; + const char *filename; + + if (argc == 2) + filename = argv[1]; + else + filename = "-"; + + if (svn_cmdline_init("afl-svndiff", stderr) != EXIT_SUCCESS) + return EXIT_FAILURE; + pool = apr_allocator_owner_get(svn_pool_create_allocator(FALSE)); + + err = parse(filename, pool); + if (err) + exit_code = EXIT_FAILURE; + svn_error_clear(err); + svn_pool_destroy(pool); + return exit_code; +} diff --git a/subversion/tests/afl/afl-x509-testcase/test2 b/subversion/tests/afl/afl-x509-testcase/test2 new file mode 100644 index 0000000..716ef59 Binary files /dev/null and b/subversion/tests/afl/afl-x509-testcase/test2 differ diff --git a/subversion/tests/afl/afl-x509-testcase/test3 b/subversion/tests/afl/afl-x509-testcase/test3 new file mode 100644 index 0000000..68d6e7e Binary files /dev/null and b/subversion/tests/afl/afl-x509-testcase/test3 differ diff --git a/subversion/tests/cmdline/authz_tests.py b/subversion/tests/cmdline/authz_tests.py index 2510cbe..760cb36 100755 --- a/subversion/tests/cmdline/authz_tests.py +++ b/subversion/tests/cmdline/authz_tests.py @@ -168,7 +168,7 @@ def authz_read_access(sbox): fws_url = B_url + '/folder with spaces' fws_empty_folder_url = fws_url + '/empty folder' - if sbox.repo_url.startswith("http"): + if svntest.main.is_ra_type_dav(): expected_err = ".*svn: E175013: .*[Ff]orbidden.*" else: expected_err = ".*svn: E170001: Authorization failed.*" @@ -280,7 +280,7 @@ def authz_write_access(sbox): write_restrictive_svnserve_conf(sbox.repo_dir) - if sbox.repo_url.startswith('http'): + if svntest.main.is_ra_type_dav(): expected_err = ".*svn: E175013: .*[Ff]orbidden.*" else: expected_err = ".*svn: E220004: Access denied.*" @@ -367,7 +367,7 @@ def authz_checkout_test(sbox): # 1st part: disable all read access, checkout should fail # write an authz file with *= on / - if sbox.repo_url.startswith('http'): + if svntest.main.is_ra_type_dav(): expected_err = ".*svn: E175013: .*[Ff]orbidden.*" else: expected_err = ".*svn: E170001: Authorization failed.*" @@ -502,7 +502,7 @@ def authz_log_and_tracing_test(sbox): write_restrictive_svnserve_conf(sbox.repo_dir) # write an authz file with *=rw on / - if sbox.repo_url.startswith('http'): + if svntest.main.is_ra_type_dav(): expected_err = ".*svn: E175013: .*[Ff]orbidden.*" else: expected_err = ".*svn: E170001: Authorization failed.*" @@ -533,7 +533,7 @@ def authz_log_and_tracing_test(sbox): # now disable read access on the first version of rho, keep the copy in # /A/D readable. - if sbox.repo_url.startswith('http'): + if svntest.main.is_ra_type_dav(): expected_err = ".*svn: E175013: .*[Ff]orbidden.*" else: expected_err = ".*svn: E170001: Authorization failed.*" @@ -551,7 +551,7 @@ def authz_log_and_tracing_test(sbox): 'log', '-r', '2', '--limit', '1', wc_dir) - if sbox.repo_url.startswith('http'): + if svntest.main.is_ra_type_dav(): expected_err2 = expected_err else: expected_err2 = ".*svn: E220001: ((Unreadable path encountered; " \ @@ -593,7 +593,7 @@ def authz_log_and_tracing_test(sbox): svntest.actions.run_and_verify_svn(None, expected_err2, 'cat', '-r', '2', D_url+'/rho') - if sbox.repo_url.startswith('http'): + if svntest.main.is_ra_type_dav(): expected_err2 = expected_err else: expected_err2 = ".*svn: E220001: Unreadable path encountered; access denied.*" @@ -624,7 +624,7 @@ def authz_aliases(sbox): write_restrictive_svnserve_conf(sbox.repo_dir) - if sbox.repo_url.startswith("http"): + if svntest.main.is_ra_type_dav(): expected_err = ".*svn: E175013: .*[Ff]orbidden.*" else: expected_err = ".*svn: E170001: Authorization failed.*" @@ -669,9 +669,9 @@ def authz_validate(sbox): write_authz_file(sbox, { "/" : "* = r", "/A/B" : "@undefined_group = rw" }) - if sbox.repo_url.startswith("http"): + if svntest.main.is_ra_type_dav(): expected_err = ".*svn: E175013: .*[Ff]orbidden.*" - elif sbox.repo_url.startswith("svn"): + elif svntest.main.is_ra_type_svn(): expected_err = ".*Invalid authz configuration" else: expected_err = ".*@undefined_group.*" @@ -688,9 +688,9 @@ devs1 = @admins, dev1 devs2 = @admins, dev2 devs = @devs1, dev3, dev4""" }) - if sbox.repo_url.startswith("http"): + if svntest.main.is_ra_type_dav(): expected_err = ".*svn: E175013: .*[Ff]orbidden.*" - elif sbox.repo_url.startswith("svn"): + elif svntest.main.is_ra_type_svn(): expected_err = ".*Invalid authz configuration" else: expected_err = ".*Circular dependency.*" @@ -726,7 +726,7 @@ def authz_locking(sbox): write_authz_file(sbox, {"/": "", "/A": "jrandom = rw"}) write_restrictive_svnserve_conf(sbox.repo_dir) - if sbox.repo_url.startswith('http'): + if svntest.main.is_ra_type_dav(): expected_err = ".*svn: E175013: .*[Ff]orbidden.*" else: expected_err = ".*svn: warning: W170001: Authorization failed.*" @@ -781,7 +781,7 @@ def authz_locking(sbox): svntest.actions.run_and_verify_info([{'Lock Token' : None}], sbox.ospath('A/mu')) - if sbox.repo_url.startswith('http'): + if svntest.main.is_ra_type_dav(): expected_err = ".*svn: warning: W160039: .*([Aa]uth.*perf|[Ff]orbidden).*" else: expected_err = ".*svn: warning: W170001: Authorization failed.*" @@ -863,7 +863,7 @@ def authz_svnserve_anon_access_read(sbox): # is not really a branch (it's the same URL), but we only care about # authz here, not the semantics of the merge. (Merges had been # failing in authz, for the reasons summarized in - # http://subversion.tigris.org/issues/show_bug.cgi?id=2712#desc13.) + # https://issues.apache.org/jira/browse/SVN-2712#desc13.) svntest.actions.run_and_verify_svn(None, [], 'merge', '-c', '2', B_url, B_path) @@ -981,7 +981,7 @@ def multiple_matches(sbox): sbox.build(create_wc = False) root_url = sbox.repo_url write_restrictive_svnserve_conf(sbox.repo_dir) - if sbox.repo_url.startswith("http"): + if svntest.main.is_ra_type_dav(): expected_err = ".*svn: E175013: .*[Ff]orbidden.*" else: expected_err = ".*svn: E170001: Authorization failed.*" @@ -1137,7 +1137,7 @@ def case_sensitive_authz(sbox): # error messages expected_error_for_commit = ".*Commit failed.*" - if sbox.repo_url.startswith("http"): + if svntest.main.is_ra_type_dav(): expected_error_for_cat = ".*[Ff]orbidden.*" else: expected_error_for_cat = ".*svn: E170001: Authorization failed.*" @@ -1694,7 +1694,7 @@ def inverted_group_membership(sbox): @Skip(svntest.main.is_ra_type_file) def group_member_empty_string(sbox): - "group definition ignores with empty member" + "group definition ignores empty member" sbox.build(create_wc = False) @@ -1710,6 +1710,27 @@ def group_member_empty_string(sbox): '--username', svntest.main.wc_author, sbox.repo_url) +@Issue(4802) +@Skip(svntest.main.is_ra_type_file) +def empty_group(sbox): + "empty group is ignored" + + sbox.build(create_wc = False) + + write_restrictive_svnserve_conf(sbox.repo_dir) + write_authz_file(sbox, + {"/" : ("$anonymous =\n" + "@empty = rw\n" + "@readonly = r\n")}, + {"groups": ("empty = \n" + "readonly = %s\n" % svntest.main.wc_author)}) + + expected_output = svntest.verify.UnorderedOutput(['A/\n', 'iota\n']) + svntest.actions.run_and_verify_svn(expected_output, [], + 'list', + '--username', svntest.main.wc_author, + sbox.repo_url) + ######################################################################## # Run the tests @@ -1749,6 +1770,7 @@ test_list = [ None, remove_access_after_commit, inverted_group_membership, group_member_empty_string, + empty_group, ] serial_only = True diff --git a/subversion/tests/cmdline/basic_tests.py b/subversion/tests/cmdline/basic_tests.py index af5b751..c6b7482 100755 --- a/subversion/tests/cmdline/basic_tests.py +++ b/subversion/tests/cmdline/basic_tests.py @@ -3024,16 +3024,19 @@ def peg_rev_on_non_existent_wc_path(sbox): # setup some history sbox.simple_move('A', 'A2') sbox.simple_move('A2/mu', 'A2/mu2') - open(sbox.ospath('A2/mu2'), 'w').write('r2\n') + with open(sbox.ospath('A2/mu2'), 'w') as f: + f.write('r2\n') sbox.simple_commit(message='r2') # sbox.simple_move('A2/mu2', 'A2/mu3') sbox.simple_move('A2', 'A3') - open(sbox.ospath('A3/mu3'), 'w').write('r3\n') + with open(sbox.ospath('A3/mu3'), 'w') as f: + f.write('r3\n') sbox.simple_commit(message='r3') # sbox.simple_move('A3/mu3', 'A3/mu4') - open(sbox.ospath('A3/mu4'), 'w').write('r4\n') + with open(sbox.ospath('A3/mu4'), 'w') as f: + f.write('r4\n') sbox.simple_move('A3', 'A4') sbox.simple_commit(message='r4') @@ -3130,24 +3133,27 @@ def filtered_ls(sbox): sbox.build(read_only=True) path = sbox.repo_url + "/A/D" - # check plain info - expected = [ "H/omega\n", - "gamma\n" ] + # with and without externals, because without externals on a 1.10+ server + # a server-side code path is used + for extra_opts in [ [], ['--include-externals'] ]: - exit_code, output, error = svntest.actions.run_and_verify_svn( - expected, [], 'ls', path, '--depth=infinity', '--search=*a') + expected = [ "H/omega\n", + "gamma\n" ] - # check case-insensitivity - exit_code, output, error = svntest.actions.run_and_verify_svn( - expected, [], 'ls', path, '--depth=infinity', '--search=*A') + exit_code, output, error = svntest.actions.run_and_verify_svn( + expected, [], 'ls', path, '--depth=infinity', '--search=*a', *extra_opts) - expected = [ "H/\n" ] - exit_code, output, error = svntest.actions.run_and_verify_svn( - expected, [], 'ls', path, '--depth=infinity', '--search=h') + # check case-insensitivity + exit_code, output, error = svntest.actions.run_and_verify_svn( + expected, [], 'ls', path, '--depth=infinity', '--search=*A', *extra_opts) - # we don't match full paths - exit_code, output, error = svntest.actions.run_and_verify_svn( - [], [], 'ls', path, '--depth=infinity', '--search=*/*') + expected = [ "H/\n" ] + exit_code, output, error = svntest.actions.run_and_verify_svn( + expected, [], 'ls', path, '--depth=infinity', '--search=h', *extra_opts) + + # we don't match full paths + exit_code, output, error = svntest.actions.run_and_verify_svn( + [], [], 'ls', path, '--depth=infinity', '--search=*/*', *extra_opts) @Issue(4700) @XFail(svntest.main.is_fs_type_fsx) @@ -3206,6 +3212,36 @@ def null_prop_update_last_changed_revision(sbox): 'info', sbox.path('iota'), '--show-item', 'last-changed-revision') +@Skip(svntest.main.is_os_windows) +def filtered_ls_top_level_path(sbox): + "filtered 'svn ls' top level path" + + sbox.build(read_only=True, create_wc=False) + d_path = sbox.repo_url + "/A/B" + f_path = sbox.repo_url + "/A/B/lambda" + + d_expected = svntest.verify.RegexListOutput([ + r".* \./", # expect '*B*' to match its name which is 'B' + r".* E/beta", + r".* lambda" ]) + f_expected = [ "lambda\n" ] + + # with and without externals, because without externals on a 1.10+ server + # a server-side code path is used + for extra_opts in [ [], ['--include-externals'] ]: + + exit_code, output, error = svntest.actions.run_and_verify_svn( + d_expected, [], 'ls', '-v', d_path, '-R', '--search=*B*', *extra_opts) + + exit_code, output, error = svntest.actions.run_and_verify_svn( + f_expected, [], 'ls', f_path, '--search=lambda', *extra_opts) + + # we don't match full paths, even for the top level path + exit_code, output, error = svntest.actions.run_and_verify_svn( + [], [], 'ls', '-v', d_path, '-R', '--search=*/*', *extra_opts) + exit_code, output, error = svntest.actions.run_and_verify_svn( + [], [], 'ls', f_path, '--search=*/*', *extra_opts) + ######################################################################## # Run the tests @@ -3281,6 +3317,7 @@ test_list = [ None, filtered_ls, null_update_last_changed_revision, null_prop_update_last_changed_revision, + filtered_ls_top_level_path, ] if __name__ == '__main__': diff --git a/subversion/tests/cmdline/blame_tests.py b/subversion/tests/cmdline/blame_tests.py index f824d25..8620dd4 100755 --- a/subversion/tests/cmdline/blame_tests.py +++ b/subversion/tests/cmdline/blame_tests.py @@ -958,7 +958,8 @@ def blame_youngest_to_oldest(sbox): sbox.simple_commit() #r3 # Delete a line. - open(iota_moved, 'w').write(line) + with open(iota_moved, 'w') as f: + f.write(line) sbox.simple_commit() #r4 expected_output = [ diff --git a/subversion/tests/cmdline/changelist_tests.py b/subversion/tests/cmdline/changelist_tests.py index 1bbb4a6..91cedc8 100755 --- a/subversion/tests/cmdline/changelist_tests.py +++ b/subversion/tests/cmdline/changelist_tests.py @@ -73,6 +73,33 @@ def changelist_all_files(wc_dir, name_func): else: svntest.main.run_svn(None, "changelist", clname, full_path) +def select_paths(target_path, depth, changelists, name_func): + """Return the subset of paths found on disk at TARGET_PATH, to a depth + of DEPTH, that match CHANGELISTS. + NAME_FUNC, rather than the working copy, determines what + changelist each path is associated with. + Returned paths are relative to the CWD. + + ### Only the paths of files are returned. + """ + dot_svn = svntest.main.get_admin_name() + for dirpath, dirs, files in os.walk(target_path): + # prepare to return paths relative to WC_DIR + if dot_svn in dirs: + dirs.remove(dot_svn) + if not changelists: # When changelists support dirs, add: "or name_func(name) in changelists" + yield os.path.normpath(dirpath) + if depth == 'empty': + dirs[:] = [] # process no subdirs + continue # nor files + for name in files: + if not changelists or name_func(name) in changelists: + yield os.path.normpath(os.path.join(dirpath, name)) + if depth == 'files': + dirs[:] = [] # process no subdirs + if depth == 'immediates': + depth = 'empty' # process subdirs, but no files nor dirs in them + def clname_from_lastchar_cb(full_path): """Callback for changelist_all_files() that returns a changelist name matching the last character in the file's name. For example, @@ -544,6 +571,8 @@ def info_with_changelists(sbox): #---------------------------------------------------------------------- +@XFail() +@Issue(4826) def diff_with_changelists(sbox): "diff --changelist (wc-wc and repos-wc)" @@ -553,31 +582,20 @@ def diff_with_changelists(sbox): # Add a line of text to all the versioned files in the tree. mod_all_files(wc_dir, "New text.\n") + # Also make a property modification on each directory. + svntest.main.run_svn(None, 'propset', 'p', 'v', '-R', wc_dir) + # Add files to changelists based on the last character in their names. changelist_all_files(wc_dir, clname_from_lastchar_cb) # Now, test various combinations of changelist specification and depths. for is_repos_wc in [0, 1]: - for clname in [['a'], ['i'], ['a', 'i']]: - for depth in ['files', 'infinity']: + for clname in [['a'], ['a', 'i'], []]: + for depth in ['empty', 'files', 'immediates', 'infinity', None]: + for subdir in ['.', 'A', 'A/D']: # Figure out what we expect to see in our diff output. - expected_paths = [] - if 'a' in clname: - if depth == 'infinity': - expected_paths.append('A/B/lambda') - expected_paths.append('A/B/E/alpha') - expected_paths.append('A/B/E/beta') - expected_paths.append('A/D/gamma') - expected_paths.append('A/D/H/omega') - if depth == 'files' or depth == 'infinity': - expected_paths.append('iota') - if 'i' in clname: - if depth == 'infinity': - expected_paths.append('A/D/G/pi') - expected_paths.append('A/D/H/chi') - expected_paths.append('A/D/H/psi') - expected_paths = sorted([os.path.join(wc_dir, x.replace('/', os.sep)) for x in expected_paths]) + expected_paths = sorted(select_paths(sbox.ospath(subdir), depth, clname, clname_from_lastchar_cb)) # Build the command line. args = ['diff'] @@ -589,11 +607,11 @@ def diff_with_changelists(sbox): args.append(depth) if is_repos_wc: args.append('--old') - args.append(sbox.repo_url) + args.append(sbox.repo_url + '/' + subdir) args.append('--new') - args.append(sbox.wc_dir) + args.append(os.path.join(wc_dir, subdir)) else: - args.append(wc_dir) + args.append(os.path.join(wc_dir, subdir)) # Run 'svn diff ...' exit_code, output, errput = svntest.main.run_svn(None, *args) @@ -1180,6 +1198,44 @@ def readd_after_revert(sbox): svntest.actions.run_and_verify_svn(None, [], 'add', dummy) +#---------------------------------------------------------------------- + +# A wc-wc diff returned no results if changelists were specified and the +# diff target dir was not the WC root. +@Issue(4822) +def diff_with_changelists_subdir(sbox): + "diff --changelist (wc-wc) in subdir of WC" + + sbox.build() + wc_dir = sbox.wc_dir + + expected_paths = sbox.ospaths(['A/D/gamma']) + subdir = 'A/D' + clname = 'a' + + for path in expected_paths: + svntest.main.file_append(path, "New text.\n") + svntest.main.run_svn(None, "changelist", clname, *expected_paths) + + # Run 'svn diff ...' + exit_code, output, errput = svntest.main.run_svn(None, + 'diff', '--changelist', clname, + sbox.ospath(subdir)) + + # Filter the output for lines that begin with 'Index:', and + # reduce even those lines to just the actual path. + paths = sorted([x[7:].rstrip() for x in output if x[:7] == 'Index: ']) + + # Diff output on Win32 uses '/' path separators. + if sys.platform == 'win32': + paths = [x.replace('/', os.sep) for x in paths] + + # And, compare! + if (paths != expected_paths): + raise svntest.Failure("Expected paths (%s) and actual paths (%s) " + "don't gel" + % (str(expected_paths), str(paths))) + ######################################################################## # Run the tests @@ -1203,6 +1259,7 @@ test_list = [ None, add_remove_non_existent_target, add_remove_unversioned_target, readd_after_revert, + diff_with_changelists_subdir, ] if __name__ == '__main__': diff --git a/subversion/tests/cmdline/commit_tests.py b/subversion/tests/cmdline/commit_tests.py index 4f4a6f9..7f7591e 100755 --- a/subversion/tests/cmdline/commit_tests.py +++ b/subversion/tests/cmdline/commit_tests.py @@ -2823,7 +2823,8 @@ def commit_add_subadd(sbox): # prepare targets file targets = "A/D A/D/H A/D/H/chi A/D/H/omega A/D/H/psi".split() - open(targets_file, 'w').write("\n".join(targets)) + with open(targets_file, 'w') as f: + f.write("\n".join(targets)) # r2: rm A/D sbox.simple_rm('A/D') @@ -3145,6 +3146,40 @@ def commit_issue4722_checksum(sbox): fp.write('abcdefghijklmnopqrstuvwxyz') sbox.simple_commit() +@XFail() +def commit_sees_tree_conflict_on_unversioned_path(sbox): + "commit sees tree conflict on unversioned path" + + sbox.build(empty=True) + was_cwd = os.getcwd() + os.chdir(sbox.wc_dir) + sbox.wc_dir = '.' + + # create a tree conflict victim at an unversioned path + sbox.simple_mkdir('topdir') + sbox.simple_commit() + sbox.simple_mkdir('topdir/subdir') + sbox.simple_commit() + sbox.simple_update() + sbox.simple_rm('topdir') + sbox.simple_commit() + sbox.simple_update() + svntest.actions.run_and_verify_svn( + None, [], + 'merge', '-c2', sbox.wc_dir, '--ignore-ancestry', '--accept', 'postpone') + # check that we did create a conflict + svntest.actions.run_and_verify_svn( + None, 'svn: E155015:.*existing.*conflict.*', + 'merge', '-c1', sbox.wc_dir, '--ignore-ancestry', '--accept', 'postpone') + + # attempt to commit; should fail + expected_err = "svn: E155015: .* '.*topdir' remains in conflict" + svntest.actions.run_and_verify_commit(sbox.wc_dir, None, None, + expected_err, + sbox.wc_dir) + + os.chdir(was_cwd) + ######################################################################## # Run the tests @@ -3224,6 +3259,7 @@ test_list = [ None, mkdir_conflict_proper_error, commit_xml, commit_issue4722_checksum, + commit_sees_tree_conflict_on_unversioned_path, ] if __name__ == '__main__': diff --git a/subversion/tests/cmdline/copy_tests.py b/subversion/tests/cmdline/copy_tests.py index a39331f..efc4dee 100755 --- a/subversion/tests/cmdline/copy_tests.py +++ b/subversion/tests/cmdline/copy_tests.py @@ -3808,70 +3808,49 @@ def URI_encoded_repos_to_wc(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) expected_disk = svntest.main.greek_state.copy() + def path_join(head, tail): + if not head: return tail + if not tail: return head + return head + '/' + tail + + def greek_file_item(path): + if path[-1:].islower(): + basename = re.sub('.*/', '', path) + return Item("This is the file '" + basename + "'.\n") + return Item() + + A_paths = [ + "", + "B", + "B/lambda", + "B/E", + "B/E/alpha", + "B/E/beta", + "B/F", + "mu", + "C", + "D", + "D/gamma", + "D/G", + "D/G/pi", + "D/G/rho", + "D/G/tau", + "D/H", + "D/H/chi", + "D/H/omega", + "D/H/psi", + ] + def copy_URL_to_WC(URL_rel_path, dest_name, rev): - lines = [ - "A " + os.path.join(wc_dir, dest_name, "B") + "\n", - "A " + os.path.join(wc_dir, dest_name, "B", "lambda") + "\n", - "A " + os.path.join(wc_dir, dest_name, "B", "E") + "\n", - "A " + os.path.join(wc_dir, dest_name, "B", "E", "alpha") + "\n", - "A " + os.path.join(wc_dir, dest_name, "B", "E", "beta") + "\n", - "A " + os.path.join(wc_dir, dest_name, "B", "F") + "\n", - "A " + os.path.join(wc_dir, dest_name, "mu") + "\n", - "A " + os.path.join(wc_dir, dest_name, "C") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "gamma") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "G") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "G", "pi") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "G", "rho") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "G", "tau") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "H") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "H", "chi") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "H", "omega") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "H", "psi") + "\n", - "Checked out revision " + str(rev - 1) + ".\n", - "A " + os.path.join(wc_dir, dest_name) + "\n"] - expected = svntest.verify.UnorderedOutput(lines) - expected_status.add({ - dest_name + "/B" : Item(status=' ', wc_rev=rev), - dest_name + "/B/lambda" : Item(status=' ', wc_rev=rev), - dest_name + "/B/E" : Item(status=' ', wc_rev=rev), - dest_name + "/B/E/alpha" : Item(status=' ', wc_rev=rev), - dest_name + "/B/E/beta" : Item(status=' ', wc_rev=rev), - dest_name + "/B/F" : Item(status=' ', wc_rev=rev), - dest_name + "/mu" : Item(status=' ', wc_rev=rev), - dest_name + "/C" : Item(status=' ', wc_rev=rev), - dest_name + "/D" : Item(status=' ', wc_rev=rev), - dest_name + "/D/gamma" : Item(status=' ', wc_rev=rev), - dest_name + "/D/G" : Item(status=' ', wc_rev=rev), - dest_name + "/D/G/pi" : Item(status=' ', wc_rev=rev), - dest_name + "/D/G/rho" : Item(status=' ', wc_rev=rev), - dest_name + "/D/G/tau" : Item(status=' ', wc_rev=rev), - dest_name + "/D/H" : Item(status=' ', wc_rev=rev), - dest_name + "/D/H/chi" : Item(status=' ', wc_rev=rev), - dest_name + "/D/H/omega" : Item(status=' ', wc_rev=rev), - dest_name + "/D/H/psi" : Item(status=' ', wc_rev=rev), - dest_name : Item(status=' ', wc_rev=rev)}) - expected_disk.add({ - dest_name : Item(props={}), - dest_name + '/B' : Item(), - dest_name + '/B/lambda' : Item("This is the file 'lambda'.\n"), - dest_name + '/B/E' : Item(), - dest_name + '/B/E/alpha' : Item("This is the file 'alpha'.\n"), - dest_name + '/B/E/beta' : Item("This is the file 'beta'.\n"), - dest_name + '/B/F' : Item(), - dest_name + '/mu' : Item("This is the file 'mu'.\n"), - dest_name + '/C' : Item(), - dest_name + '/D' : Item(), - dest_name + '/D/gamma' : Item("This is the file 'gamma'.\n"), - dest_name + '/D/G' : Item(), - dest_name + '/D/G/pi' : Item("This is the file 'pi'.\n"), - dest_name + '/D/G/rho' : Item("This is the file 'rho'.\n"), - dest_name + '/D/G/tau' : Item("This is the file 'tau'.\n"), - dest_name + '/D/H' : Item(), - dest_name + '/D/H/chi' : Item("This is the file 'chi'.\n"), - dest_name + '/D/H/omega' : Item("This is the file 'omega'.\n"), - dest_name + '/D/H/psi' : Item("This is the file 'psi'.\n"), - }) + expected = svntest.verify.UnorderedOutput( + [ "A " + sbox.ospath(path_join(dest_name, p)) + "\n" + for p in A_paths ]) + expected_status.add( + { path_join(dest_name, p) : Item(status=' ', wc_rev=rev) + for p in A_paths }) + expected_disk.add( + { path_join(dest_name, p) : greek_file_item(p) + for p in A_paths }) # Make a copy svntest.actions.run_and_verify_svn(expected, [], @@ -4490,7 +4469,7 @@ def copy_added_dir_with_copy(sbox): def copy_broken_symlink(sbox): """copy broken symlink""" - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=3303. ## + ## See https://issues.apache.org/jira/browse/SVN-3303. ## sbox.build() wc_dir = sbox.wc_dir diff --git a/subversion/tests/cmdline/dav-mirror-autocheck.sh b/subversion/tests/cmdline/dav-mirror-autocheck.sh index 298a8ba..7bc5e11 100755 --- a/subversion/tests/cmdline/dav-mirror-autocheck.sh +++ b/subversion/tests/cmdline/dav-mirror-autocheck.sh @@ -31,7 +31,7 @@ # # The set of changes sent through the system is currently # just the test case for issue 2939, using svnmucc -# http://subversion.tigris.org/issues/show_bug.cgi?id=2939 +# https://issues.apache.org/jira/browse/SVN-2939 # But of course, any svn traffic liable to break over # mirroring would be a good addition. # @@ -100,6 +100,7 @@ function setup_config() { say "setting up config: " $1 cat > "$1" <<__EOF__ +$LOAD_MOD_MPM $LOAD_MOD_LOG_CONFIG $LOAD_MOD_MIME $LOAD_MOD_UNIXD @@ -114,9 +115,30 @@ $LOAD_MOD_AUTHZ_CORE $LOAD_MOD_AUTHZ_USER $LOAD_MOD_AUTHZ_HOST +__EOF__ + +if "$HTTPD" -v | grep '/2\.[012]' >/dev/null; then + cat >> "$1" <<__EOF__ LockFile lock User $(id -un) Group $(id -gn) +__EOF__ +else +HTTPD_LOCK="$HTTPD_ROOT/lock" +mkdir "$HTTPD_LOCK" \ + || fail "couldn't create lock directory '$HTTPD_LOCK'" + cat >> "$1" <<__EOF__ +# worker and prefork MUST have a mpm-accept lockfile in 2.3.0+ + + Mutex "file:$HTTPD_LOCK" mpm-accept + + + Mutex "file:$HTTPD_LOCK" mpm-accept + +__EOF__ +fi + +cat >> "$1" <<__EOF__ Listen ${TEST_PORT} ServerName localhost PidFile "${HTTPD_ROOT}/pid" @@ -133,6 +155,9 @@ MaxRequestsPerChild 0 ThreadsPerChild 8 + + ThreadsPerChild 8 + MaxClients 16 HostNameLookups Off LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" format @@ -202,6 +227,12 @@ function usage() { SCRIPT=$(basename $0) +NO_TESTS= +if [ "x$1" = 'x--no-tests' ]; then + NO_TESTS=1 + shift +fi + if [ $# -ne 1 ] ; then usage fi @@ -249,7 +280,7 @@ HTPASSWD=$(get_prog_name htpasswd htpasswd2) \ SVN=$ABS_BUILDDIR/subversion/svn/svn SVNADMIN=$ABS_BUILDDIR/subversion/svnadmin/svnadmin SVNSYNC=$ABS_BUILDDIR/subversion/svnsync/svnsync -SVNMUCC=${SVNMUCC:-$ABS_BUILDDIR/tools/client-side/svnmucc/svnmucc} +SVNMUCC=$ABS_BUILDDIR/subversion/svnmucc/svnmucc SVNLOOK=$ABS_BUILDDIR/subversion/svnlook/svnlook [ -x $HTTPD ] || fail "HTTPD '$HTTPD' not executable" @@ -259,9 +290,7 @@ SVNLOOK=$ABS_BUILDDIR/subversion/svnlook/svnlook [ -x $SVNADMIN ] || fail "SVNADMIN $SVNADMIN not built" [ -x $SVNSYNC ] || fail "SVNSYNC $SVNSYNC not built" [ -x $SVNLOOK ] || fail "SVNLOOK $SVNLOOK not built" -[ -x $SVNMUCC ] \ - || fail SVNMUCC $SVNMUCC executable not built, needed for test. \ - \'cd $ABS_BUILDDIR\; make svnmucc\' to fix. +[ -x $SVNMUCC ] || fail "SVNMUCC $SVNMUCC not built" say HTTPD: $HTTPD say SVN: $SVN @@ -309,6 +338,10 @@ LOAD_MOD_AUTHN_FILE="$(get_loadmodule_config mod_authn_file)" \ LOAD_MOD_AUTHZ_USER="$(get_loadmodule_config mod_authz_user)" \ || fail "Authz_User module not found." } +if [ ${APACHE_MPM:+set} ]; then + LOAD_MOD_MPM=$(get_loadmodule_config mod_mpm_$APACHE_MPM) \ + || fail "MPM module not found" +fi if [ ${MODULE_PATH:+set} ]; then MOD_DAV_SVN="$MODULE_PATH/mod_dav_svn.so" @@ -365,7 +398,9 @@ $SVNADMIN create "$SLAVE_REPOS" || fail "create slave repos failed" $SVNADMIN dump "$MASTER_REPOS" | $SVNADMIN load "$SLAVE_REPOS" \ || fail "duplicate repositories failed" # make sure uuid's match -[ `cat "$SLAVE_REPOS/db/uuid"` = `cat "$MASTER_REPOS/db/uuid"` ] \ +read MASTER_UUID < "$MASTER_REPOS/db/uuid" +read SLAVE_UUID < "$SLAVE_REPOS/db/uuid" +[ "$SLAVE_UUID" = "$MASTER_UUID" ] \ || fail "master/slave uuid mismatch" # setup hooks: # slave allows revprop changes @@ -397,12 +432,18 @@ $SVNSYNC initialize --non-interactive "$SYNC_URL" "$MASTER_URL" \ --username=svnsync --password=svnsync \ || fail "svnsync initialize failed" +if [ $NO_TESTS ]; then + echo "MASTER_URL=$MASTER_URL" + echo "SLAVE_URL=$SLAVE_URL" + exit +fi + # OK, let's start testing! Commit changes to slave, expect # them to proxy through to the master, and then # svnsync back to the slave # # reproducible test case from: -# http://subversion.tigris.org/issues/show_bug.cgi?id=2939 +# https://issues.apache.org/jira/browse/SVN-2939 # BASE_URL="$SLAVE_URL" say running svnmucc test to $BASE_URL diff --git a/subversion/tests/cmdline/dav_tests.py b/subversion/tests/cmdline/dav_tests.py new file mode 100755 index 0000000..e2ad2c7 --- /dev/null +++ b/subversion/tests/cmdline/dav_tests.py @@ -0,0 +1,113 @@ +#!/usr/bin/env python +# +# dav_tests.py: testing connections to HTTP and DAV servers. +# +# Subversion is a tool for revision control. +# See http://subversion.apache.org for more information. +# +# ==================================================================== +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +###################################################################### + +# General modules +import os, sys +import re +import socket +import traceback + +# Our testing module +import svntest + +# (abbreviation) +Skip = svntest.testcase.Skip_deco +SkipUnless = svntest.testcase.SkipUnless_deco +XFail = svntest.testcase.XFail_deco +Issues = svntest.testcase.Issues_deco +Issue = svntest.testcase.Issue_deco +Wimp = svntest.testcase.Wimp_deco +Item = svntest.wc.StateItem + + +###################################################################### +# Tests +# +# Each test must return on success or raise on failure. + + +#---------------------------------------------------------------------- + +@SkipUnless(svntest.main.is_ra_type_dav) +def connect_plain_http_server(sbox): + "connect to a non-DAV HTTP server" + expected_errors = svntest.verify.RegexListOutput([ + "^svn: E170013: Unable to connect to a repository at URL '[^']+'", + "^svn: E175003: The server at '[^']+' does not support the HTTP/DAV protocol" + ], False) + svntest.actions.run_and_verify_svn([], expected_errors, + 'info', svntest.main.non_dav_root_url) + +@SkipUnless(svntest.main.is_ra_type_dav) +def connect_other_dav_server(sbox): + "connect to a DAV server which is not an SVN server" + svntest.actions.run_and_verify_svn([], svntest.verify.AnyOutput, + 'info', svntest.main.other_dav_root_url) + +#---------------------------------------------------------------------- + +@SkipUnless(svntest.main.is_remote_http_connection_allowed) +def connect_to_github_server(sbox): + "connect to GitHub's SVN bridge" + + #github_mirror_url = 'https://github.com/apache/subversion/trunk' + # FIXME: Subversion's mirror on GitHub seems to randomly return gateway + # errors (status 504), so use this more stable one instead. + github_mirror_url = 'https://github.com/apache/serf/trunk' + + # Skip this test if we can't connect to the GitHub server. + # We check this here instead of in a SkipUnless() predicate decorator, + # because the decorator's condition function is called seeveral times + # during test execution. + try: + s = socket.create_connection(('github.com', 443), 2) # 2-second timeout + s.close() + except: + etype, value, _ = sys.exc_info() + reason = ''.join(traceback.format_exception_only(etype, value)).rstrip() + svntest.main.logger.warn('Connection to github.com failed: ' + reason) + raise svntest.Skip + + svntest.actions.run_and_verify_svn(None, [], 'info', github_mirror_url) + + +######################################################################## +# Run the tests + + +# list all tests here, starting with None: +test_list = [ None, + connect_plain_http_server, + connect_other_dav_server, + connect_to_github_server, + ] + +if __name__ == '__main__': + svntest.main.run_tests(test_list) + # NOTREACHED + + +### End of file. diff --git a/subversion/tests/cmdline/davautocheck.sh b/subversion/tests/cmdline/davautocheck.sh index 064feb1..e88f760 100755 --- a/subversion/tests/cmdline/davautocheck.sh +++ b/subversion/tests/cmdline/davautocheck.sh @@ -281,6 +281,9 @@ say "Using '$HTPASSWD'..." LOAD_MOD_DAV=$(get_loadmodule_config mod_dav) \ || fail "DAV module not found" +LOAD_MOD_DAV_FS=$(get_loadmodule_config mod_dav_fs) \ + || fail "Filesystem DAV module not found" + LOAD_MOD_LOG_CONFIG=$(get_loadmodule_config mod_log_config) \ || fail "log_config module not found" @@ -447,6 +450,7 @@ $LOAD_MOD_MIME $LOAD_MOD_ALIAS $LOAD_MOD_UNIXD $LOAD_MOD_DAV +$LOAD_MOD_DAV_FS LoadModule dav_svn_module "$MOD_DAV_SVN" $LOAD_MOD_AUTH $LOAD_MOD_AUTHN_CORE @@ -482,6 +486,13 @@ mkdir "$HTTPD_LOCK" \ __EOF__ fi +HTTPD_DAV="$HTTPD_ROOT/dav" +mkdir "$HTTPD_DAV" \ + || fail "couldn't create DAV lock directory '$HTTPD_DAV'" +cat >> "$HTTPD_CFG" <<__EOF__ +DavLockDB "$HTTPD_DAV/lock.db" +__EOF__ + if [ ${USE_SSL:+set} ]; then cat >> "$HTTPD_CFG" <<__EOF__ SSLEngine on @@ -525,6 +536,15 @@ CustomLog "$HTTPD_ROOT/ops" "%t %u %{SVN-REPOS-NAME}e %{SVN-ACTION}e" #Require all granted +Alias /nodavroot $ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/nodavroot + + + +Alias /fsdavroot $ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/fsdavroot + + DAV filesystem + + __EOF__ location_common() { @@ -563,6 +583,14 @@ cat >> "$HTTPD_CFG" <<__EOF__ Require valid-user ${SVN_PATH_AUTHZ_LINE} + +__EOF__ +location_common +cat >> "$HTTPD_CFG" <<__EOF__ + SVNPath "$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/local_tmp/trojan" + Require valid-user + ${SVN_PATH_AUTHZ_LINE} + DAV svn SVNParentPath "$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/local_tmp" diff --git a/subversion/tests/cmdline/depth_tests.py b/subversion/tests/cmdline/depth_tests.py index 1277594..18ce379 100755 --- a/subversion/tests/cmdline/depth_tests.py +++ b/subversion/tests/cmdline/depth_tests.py @@ -1073,7 +1073,7 @@ def commit_depth_immediates(sbox): # Message-ID: <46968831.2070906@collab.net> # Date: Thu, 12 Jul 2007 15:59:45 -0400 # - # See also http://subversion.tigris.org/issues/show_bug.cgi?id=2882. + # See also https://issues.apache.org/jira/browse/SVN-2882. # # Outline of the test: # ==================== diff --git a/subversion/tests/cmdline/diff_tests.py b/subversion/tests/cmdline/diff_tests.py index 905bce3..63caa24 100755 --- a/subversion/tests/cmdline/diff_tests.py +++ b/subversion/tests/cmdline/diff_tests.py @@ -36,7 +36,6 @@ from svntest import err, wc from prop_tests import binary_mime_type_on_text_file_warning from svntest.verify import make_diff_header, make_no_diff_deleted_header, \ - make_diff_header, make_no_diff_deleted_header, \ make_git_diff_header, make_diff_prop_header, \ make_diff_prop_val, make_diff_prop_deleted, \ make_diff_prop_added, make_diff_prop_modified @@ -2712,7 +2711,7 @@ def diff_ignore_eolstyle(sbox): " Bb\n", "-Cc\n", "+Cc\n", - "\ No newline at end of file\n" ] + "\\ No newline at end of file\n" ] svntest.actions.run_and_verify_svn(expected_output, [], 'diff', '-x', '--ignore-eol-style', @@ -3855,7 +3854,7 @@ def diff_arbitrary_files_and_dirs(sbox): sbox.build() wc_dir = sbox.wc_dir - # diff iota with A/mu + # diff files (iota with A/mu) expected_output = make_diff_header("iota", "working copy", "working copy", "iota", "A/mu") + [ "@@ -1 +1 @@\n", @@ -3866,7 +3865,11 @@ def diff_arbitrary_files_and_dirs(sbox): 'diff', '--old', sbox.ospath('iota'), '--new', sbox.ospath('A/mu')) - # diff A/B/E with A/D + # diff dirs (A/B/E with A/D) + # .../gamma is to show as replaced; .../beta is to show as modified + sbox.simple_mkdir('A/B/E/gamma') + sbox.simple_propset('p', 'v', 'A/B/E/gamma') + sbox.simple_add_text("This is a different beta file.\n", 'A/D/beta') expected_output = make_diff_header("G/pi", "nonexistent", "working copy", "B/E", "D") + [ "@@ -0,0 +1 @@\n", @@ -3896,11 +3899,16 @@ def diff_arbitrary_files_and_dirs(sbox): "@@ -1 +0,0 @@\n", "-This is the file 'alpha'.\n" ] + make_diff_header("beta", "working copy", - "nonexistent", "B/E", "D") + [ - "@@ -1 +0,0 @@\n", - "-This is the file 'beta'.\n" - ] + make_diff_header("gamma", "nonexistent", "working copy", "B/E", "D") + [ + "@@ -1 +1 @@\n", + "-This is the file 'beta'.\n", + "+This is a different beta file.\n" + ] + make_diff_header("gamma", "working copy", + "nonexistent", "B/E", "D") \ + + make_diff_prop_header("gamma") \ + + make_diff_prop_deleted("p", "v") \ + + make_diff_header("gamma", "nonexistent", + "working copy", "B/E", "D") + [ "@@ -0,0 +1 @@\n", "+This is the file 'gamma'.\n" ] @@ -5160,6 +5168,90 @@ def diff_unversioned_files_git(sbox): '--old', sbox.ospath('foo'), '--new', sbox.ospath('A/bar')) +# Summary diff with a repository source side and a local copy target side. +# This particular combination crashed in 1.10.0 and earlier releases. +def diff_summary_repo_wc_local_copy(sbox): + "diff summary repo wc local copy" + sbox.build() + wc_dir = sbox.wc_dir + + sbox.simple_copy('iota', 'iota2') + sbox.simple_append('iota2', 'hello\n') + expected_diff = svntest.wc.State(wc_dir, { + 'iota': Item(status='M '), + }) + svntest.actions.run_and_verify_diff_summarize( + expected_diff, + '--old=' + sbox.ospath('iota') + '@HEAD', + '--new=' + sbox.ospath('iota2')) + +# Summary diff with a repository source side and a local copy target side. +# Svn reported the unmodified copy as modified in 1.10.0 and earlier releases. +@XFail() +def diff_summary_repo_wc_local_copy_unmodified(sbox): + "diff summary repo wc local copy unmodified" + sbox.build() + wc_dir = sbox.wc_dir + + sbox.simple_copy('iota', 'iota2') + expected_diff = svntest.wc.State(wc_dir, { + }) + svntest.actions.run_and_verify_diff_summarize( + expected_diff, + '--old=' + sbox.ospath('iota') + '@HEAD', + '--new=' + sbox.ospath('iota2')) + +# Fails with "Can't open file '.../iota': Too many levels of symbolic links" +# on Unix. +@XFail() +@Skip(svntest.main.is_os_windows) +def diff_file_replaced_by_symlink(sbox): + "diff base vs working: symlink replaces a file" + sbox.build(read_only=True) + wc_dir = sbox.wc_dir + + iota_path = sbox.ospath('iota') + os.remove(iota_path) + + # create a symlink pointing to itself + # alternatively it could point to a non-existing path + sbox.simple_symlink('iota', 'iota') + + # TODO: add a full expected output + expected_output = svntest.verify.AnyOutput + svntest.actions.run_and_verify_svn(expected_output, [], 'diff', wc_dir) + +# Test 'svn diff --git' with a copy. +# +# When this diff is rooted at a path below the repository root directory, +# it errored out while printing the git diff header, due to confusion of +# diff-relative and repository-relative copyfrom paths. +@XFail() +def diff_git_format_copy(sbox): + "diff git format copy" + sbox.build(create_wc=False) + svntest.actions.run_and_verify_svn(None, [], 'checkout', + sbox.repo_url + '/A/B', + sbox.wc_dir) + os.chdir(sbox.wc_dir) + sbox.wc_dir = '' + + sbox.simple_copy('E/alpha', 'alpha_copied') + sbox.simple_append('alpha_copied', "This is a copy of 'alpha'.\n") + + expected_output = \ + make_git_diff_header('alpha_copied', 'A/B/alpha_copied', + "revision 1", "working copy", + copyfrom_path="A/B/E/alpha", + copyfrom_rev='1', cp=True, + text_changes=True) + [ + "@@ -1 +1,2 @@\n", + " This is the file 'alpha'.\n", + "+This is a copy of 'alpha'.\n", + ] + + svntest.actions.run_and_verify_svn(expected_output, [], 'diff', + '--git', '.') ######################################################################## #Run the tests @@ -5257,6 +5349,10 @@ test_list = [ None, diff_symlinks, diff_peg_resolve, diff_unversioned_files_git, + diff_summary_repo_wc_local_copy, + diff_summary_repo_wc_local_copy_unmodified, + diff_file_replaced_by_symlink, + diff_git_format_copy, ] if __name__ == '__main__': diff --git a/subversion/tests/cmdline/entries_tests.py b/subversion/tests/cmdline/entries_tests.py index 0fcdc1a..78ba037 100755 --- a/subversion/tests/cmdline/entries_tests.py +++ b/subversion/tests/cmdline/entries_tests.py @@ -121,14 +121,17 @@ def basic_entries(sbox): G_path, iota_path) # Add a file over the DELETED 'alpha'. It should be schedule-add. - open(alpha_path, 'w').write('New alpha contents\n') + with open(alpha_path, 'w') as f: + f.write('New alpha contents\n') # Delete 'beta', then add a file over it. Should be schedule-replace. svntest.actions.run_and_verify_svn(None, [], 'rm', beta_path) - open(beta_path, 'w').write('New beta contents\n') + with open(beta_path, 'w') as f: + f.write('New beta contents\n') # Plain old add. Should have revision == 0. - open(added_path, 'w').write('Added file contents\n') + with open(added_path, 'w') as f: + f.write('Added file contents\n') svntest.actions.run_and_verify_svn(None, [], 'add', alpha_path, beta_path, added_path) diff --git a/subversion/tests/cmdline/export_tests.py b/subversion/tests/cmdline/export_tests.py index a8ac7b8..c524ff3 100755 --- a/subversion/tests/cmdline/export_tests.py +++ b/subversion/tests/cmdline/export_tests.py @@ -610,7 +610,8 @@ def export_file_overwrite_fails(sbox): os.mkdir(tmpdir) # Run it for source local - open(os.path.join(tmpdir, 'iota'), 'w').write(not_iota_contents) + with open(os.path.join(tmpdir, 'iota'), 'w') as f: + f.write(not_iota_contents) svntest.actions.run_and_verify_svn([], '.*exist.*', 'export', iota_path, tmpdir) @@ -621,7 +622,8 @@ def export_file_overwrite_fails(sbox): svntest.actions.verify_disk(tmpdir, expected_disk) # Run it for source URL - open(os.path.join(tmpdir, 'iota'), 'w').write(not_iota_contents) + with open(os.path.join(tmpdir, 'iota'), 'w') as f: + f.write(not_iota_contents) svntest.actions.run_and_verify_svn([], '.*exist.*', 'export', iota_url, tmpdir) @@ -721,7 +723,7 @@ def export_working_copy_ignoring_keyword_translation(sbox): def export_with_url_unsafe_characters(sbox): "export file with URL unsafe characters" - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=3683 ## + ## See https://issues.apache.org/jira/browse/SVN-3683 ## sbox.build() wc_dir = sbox.wc_dir @@ -904,14 +906,16 @@ def export_file_overwrite_with_force(sbox): }) # Run it for WC export - open(os.path.join(tmpdir, 'iota'), 'w').write(not_iota_contents) + with open(os.path.join(tmpdir, 'iota'), 'w') as f: + f.write(not_iota_contents) svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [], 'export', '--force', iota_path, tmpdir) svntest.actions.verify_disk(tmpdir, expected_disk) # Run it for URL export - open(os.path.join(tmpdir, 'iota'), 'w').write(not_iota_contents) + with open(os.path.join(tmpdir, 'iota'), 'w') as f: + f.write(not_iota_contents) svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [], 'export', '--force', iota_url, tmpdir) diff --git a/subversion/tests/cmdline/externals_tests.py b/subversion/tests/cmdline/externals_tests.py index c0ac029..2cb5b2c 100755 --- a/subversion/tests/cmdline/externals_tests.py +++ b/subversion/tests/cmdline/externals_tests.py @@ -1146,7 +1146,7 @@ def external_into_path_with_spaces(sbox): repo_url = sbox.repo_url ext = '^/A/D "A/copy of D"\n' +\ - '^/A/D A/another\ copy\ of\ D' + '^/A/D A/another\\ copy\\ of\\ D' change_external(wc_dir, ext) expected_output = svntest.wc.State(wc_dir, { @@ -2818,7 +2818,7 @@ def remap_file_external_with_prop_del(sbox): # Now update to bring the new external down. # This previously segfaulted as described in - # http://subversion.tigris.org/issues/show_bug.cgi?id=4093#desc1 + # https://issues.apache.org/jira/browse/SVN-4093#desc1 svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir) @@ -2946,7 +2946,7 @@ def url_to_wc_copy_of_externals(sbox): external_tau_path = os.path.join(wc_dir, "External-WC-to-URL-Copy", "external", "tau") expected_stdout = verify.UnorderedOutput([ - " U " + external_root_path + "\n", + "A " + external_root_path + "\n", "\n", "Fetching external item into '" + external_ex_path + "':\n", "A " + external_pi_path + "\n", @@ -2954,8 +2954,6 @@ def url_to_wc_copy_of_externals(sbox): "A " + external_tau_path + "\n", "Checked out external at revision 2.\n", "\n", - "Checked out revision 2.\n", - "A " + external_root_path + "\n" ]) exit_code, stdout, stderr = svntest.actions.run_and_verify_svn2( expected_stdout, [], 0, 'copy', repo_url + '/A/C', @@ -3871,12 +3869,14 @@ def copy_pin_externals_whitespace_dir(sbox): extdef = sbox.get_tempname('extdef') info = sbox.get_tempname('info') - open(extdef, 'w').write( + with open(extdef, 'w') as f: + f.write( '"' + ss_path +'/deps/sqlite" ext/sqlite\n' + '"^/deps/A P R" \'ext/A P R\'\n' + - '^/deps/B\ D\ B\' ext/B\ D\ B\'\n' + + '^/deps/B\\ D\\ B\' ext/B\\ D\\ B\'\n' + repo_url + '/deps/wors%23+t ext/wors#+t') - open(info, 'w').write('info\n') + with open(info, 'w') as f: + f.write('info\n') svntest.actions.run_and_verify_svnmucc(None, [], '-U', repo_url, 'mkdir', 'trunk', @@ -4408,7 +4408,17 @@ def update_dir_external_exclude(sbox): # Create an external in r2 sbox.simple_propset('svn:externals', '^/A/D/H X', 'A/B/E') sbox.simple_commit() - sbox.simple_update() + + # Update to fetch externals + expected_output = svntest.wc.State(sbox.wc_dir, { + 'A/B/E/X/chi' : Item(status='A '), + 'A/B/E/X/omega' : Item(status='A '), + 'A/B/E/X/psi' : Item(status='A '), + }) + svntest.actions.run_and_verify_update(sbox.wc_dir, + expected_output, None, None, + [], False, + sbox.ospath('A/B/E')) # Now make A/B/E shallow by updating with "--set-depth exclude" expected_output = svntest.wc.State(sbox.wc_dir, { diff --git a/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout b/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout index 05f0aa8..672cd3e 100644 --- a/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout +++ b/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout @@ -47,9 +47,8 @@ Available subcommands: unlock update (up) upgrade - x-shelve (shelve) - x-unshelve (unshelve) - x-shelves (shelves) + +(Use '-v' to show experimental subcommands.) Subversion is a tool for version control. For additional information, see http://subversion.apache.org/ diff --git a/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout b/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout index 5dddc70..0c4731e 100644 --- a/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout +++ b/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout @@ -84,6 +84,10 @@ usage: 1. log [PATH][@REV] was created: svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo + Show all log messages for commits between the tags ^/tags/2.0 and + ^/tags/3.0; assuming that tag 2.0 was created in revision 100: + svn log -rHEAD:100 ^/tags/3.0 + If ^/trunk/foo.c was moved to ^/trunk/bar.c' in revision 22, 'svn log -v' shows a deletion and a copy in its changed paths list, such as: D /trunk/foo.c @@ -131,30 +135,7 @@ Valid options: to prevent shell expansion) --search-and ARG : combine ARG with the previous search pattern -Global options: - --username ARG : specify a username ARG - --password ARG : specify a password ARG (caution: on many operating - systems, other users will be able to see this) - --password-from-stdin : read password from stdin - --no-auth-cache : do not cache authentication tokens - --non-interactive : do no interactive prompting (default is to prompt - only if standard input is a terminal device) - --force-interactive : do interactive prompting even if standard input - is not a terminal device - --trust-server-cert : deprecated; same as - --trust-server-cert-failures=unknown-ca - --trust-server-cert-failures ARG : with --non-interactive, accept SSL server - certificates with failures; ARG is comma-separated - list of 'unknown-ca' (Unknown Authority), - 'cn-mismatch' (Hostname mismatch), 'expired' - (Expired certificate), 'not-yet-valid' (Not yet - valid certificate) and 'other' (all other not - separately classified certificate errors). - --config-dir ARG : read user configuration files from directory ARG - --config-option ARG : set user configuration option in the format: - FILE:SECTION:OPTION=[VALUE] - For example: - servers:global:http-library=serf +(Use '-v' to show global and experimental options.) switch (sw): Update the working copy to a different URL within the same repository. usage: 1. switch URL[@PEGREV] [PATH] @@ -205,7 +186,7 @@ Valid options: 'BASE' base rev of item's working copy 'COMMITTED' last commit at or before BASE 'PREV' revision just before COMMITTED - -N [--non-recursive] : obsolete; try --depth=files or --depth=immediates + -N [--non-recursive] : obsolete; same as --depth=files --depth ARG : limit operation by depth ARG ('empty', 'files', 'immediates', or 'infinity') --set-depth ARG : set new working copy depth to ARG ('exclude', @@ -222,28 +203,5 @@ Valid options: 'p', 'mc', 'tc', 'mf', 'tf', 'e', 'l', 'r') --relocate : deprecated; use 'svn relocate' -Global options: - --username ARG : specify a username ARG - --password ARG : specify a password ARG (caution: on many operating - systems, other users will be able to see this) - --password-from-stdin : read password from stdin - --no-auth-cache : do not cache authentication tokens - --non-interactive : do no interactive prompting (default is to prompt - only if standard input is a terminal device) - --force-interactive : do interactive prompting even if standard input - is not a terminal device - --trust-server-cert : deprecated; same as - --trust-server-cert-failures=unknown-ca - --trust-server-cert-failures ARG : with --non-interactive, accept SSL server - certificates with failures; ARG is comma-separated - list of 'unknown-ca' (Unknown Authority), - 'cn-mismatch' (Hostname mismatch), 'expired' - (Expired certificate), 'not-yet-valid' (Not yet - valid certificate) and 'other' (all other not - separately classified certificate errors). - --config-dir ARG : read user configuration files from directory ARG - --config-option ARG : set user configuration option in the format: - FILE:SECTION:OPTION=[VALUE] - For example: - servers:global:http-library=serf +(Use '-v' to show global and experimental options.) diff --git a/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout b/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout index 05f0aa8..672cd3e 100644 --- a/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout +++ b/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout @@ -47,9 +47,8 @@ Available subcommands: unlock update (up) upgrade - x-shelve (shelve) - x-unshelve (unshelve) - x-shelves (shelves) + +(Use '-v' to show experimental subcommands.) Subversion is a tool for version control. For additional information, see http://subversion.apache.org/ diff --git a/subversion/tests/cmdline/info_tests.py b/subversion/tests/cmdline/info_tests.py index 187cd7f..7ac53a6 100755 --- a/subversion/tests/cmdline/info_tests.py +++ b/subversion/tests/cmdline/info_tests.py @@ -716,6 +716,72 @@ def info_item_uncommmitted(sbox): sbox.ospath('newfile'), sbox.ospath('newdir')) +def info_item_size_wc_recursive(sbox): + "recursive '--show-item=repos-size' on local path" + + sbox.build(read_only=True) + + svntest.actions.run_and_verify_svn( + [], [], + 'info', '--show-item=repos-size', '--recursive', + sbox.ospath('')) + + +def info_item_size_repos(sbox): + "non-recursive '--show-item=repos-size' on URL" + + sbox.build(read_only=True) + + svntest.actions.run_and_verify_svn( + "25\n", [], + 'info', '--show-item=repos-size', + sbox.repo_url + "/iota") + + # Same, but without the newline. + svntest.actions.run_and_verify_svn( + "25", [], + 'info', '--show-item=repos-size', '--no-newline', + sbox.repo_url + "/iota") + + # Same, but with "human-readable" output. + svntest.actions.run_and_verify_svn( + "25 B", [], + 'info', '--show-item=repos-size', '--human-readable', + sbox.repo_url + "/iota") + + # No output when the URL is a directory. + svntest.actions.run_and_verify_svn( + [], [], + 'info', '--show-item=repos-size', + sbox.repo_url) + + +def info_item_size_repos_recursive(sbox): + "recursive '--show-item=repos-size' on dir URL" + + sbox.build(read_only=True) + + expected_output = svntest.verify.UnorderedOutput([ + "25 " + sbox.repo_url + "/iota\n", + "27 " + sbox.repo_url + "/A/B/lambda\n", + "25 " + sbox.repo_url + "/A/B/E/beta\n", + "26 " + sbox.repo_url + "/A/B/E/alpha\n", + "23 " + sbox.repo_url + "/A/mu\n", + "26 " + sbox.repo_url + "/A/D/gamma\n", + "23 " + sbox.repo_url + "/A/D/G/pi\n", + "24 " + sbox.repo_url + "/A/D/G/rho\n", + "24 " + sbox.repo_url + "/A/D/G/tau\n", + "26 " + sbox.repo_url + "/A/D/H/omega\n", + "24 " + sbox.repo_url + "/A/D/H/psi\n", + "24 " + sbox.repo_url + "/A/D/H/chi\n", + ]) + + svntest.actions.run_and_verify_svn( + expected_output, [], + 'info', '--show-item=repos-size', '--recursive', + sbox.repo_url) + + def info_item_failures(sbox): "failure modes of 'svn info --show-item'" @@ -746,6 +812,11 @@ def info_item_failures(sbox): 'info', '--show-item=revision', '--no-newline', sbox.ospath('A'), sbox.ospath('iota')) + svntest.actions.run_and_verify_svn( + None, (r".*E200007: can't show in-repository size.*"), + 'info', '--show-item=repos-size', + sbox.ospath('iota')) + ######################################################################## # Run the tests @@ -767,6 +838,9 @@ test_list = [ None, info_item_simple_multiple, info_item_url, info_item_uncommmitted, + info_item_size_wc_recursive, + info_item_size_repos, + info_item_size_repos_recursive, info_item_failures, ] diff --git a/subversion/tests/cmdline/iprop_authz_tests.py b/subversion/tests/cmdline/iprop_authz_tests.py index 835cd37..c2a9d10 100755 --- a/subversion/tests/cmdline/iprop_authz_tests.py +++ b/subversion/tests/cmdline/iprop_authz_tests.py @@ -105,7 +105,7 @@ def iprops_authz(sbox): write_authz_file(sbox, { "/" : svntest.main.wc_author + "=rw", "/A/D/H/psi" : svntest.main.wc_author + "=",}) - if sbox.repo_url.startswith("http"): + if svntest.main.is_ra_type_dav(): expected_err = ".*[Ff]orbidden.*" else: expected_err = ".*svn: E170001: Authorization failed.*" diff --git a/subversion/tests/cmdline/lock_tests.py b/subversion/tests/cmdline/lock_tests.py index cd8e0d2..3e2952c 100755 --- a/subversion/tests/cmdline/lock_tests.py +++ b/subversion/tests/cmdline/lock_tests.py @@ -1571,7 +1571,8 @@ def cp_isnt_ro(sbox): mu2_path = sbox.ospath('A/mu2') mu3_path = sbox.ospath('A/mu3') kappa_path = sbox.ospath('kappa') - open(kappa_path, 'w').write("This is the file 'kappa'.\n") + with open(kappa_path, 'w') as f: + f.write("This is the file 'kappa'.\n") ## added file sbox.simple_add('kappa') @@ -2251,7 +2252,6 @@ def dav_lock_refresh(sbox): if r.status != httplib.OK: raise svntest.Failure('Lock refresh failed: %d %s' % (r.status, r.reason)) -@SkipUnless(svntest.main.is_ra_type_dav) def delete_locked_file_with_percent(sbox): "lock and delete a file called 'a %( ) .txt'" diff --git a/subversion/tests/cmdline/log_tests.py b/subversion/tests/cmdline/log_tests.py index 484103a..559dfb5 100755 --- a/subversion/tests/cmdline/log_tests.py +++ b/subversion/tests/cmdline/log_tests.py @@ -1592,7 +1592,7 @@ def merge_sensitive_log_added_mergeinfo_replaces_inherited(sbox): # a merge results in added explicit mergeinfo on a path, but that # path previously inherited mergeinfo (rather than had no explicit # or inherited mergeinfo). See issue #3235, specifically - # http://subversion.tigris.org/issues/show_bug.cgi?id=3235#desc8. + # https://issues.apache.org/jira/browse/SVN-3235#desc8. sbox.build() wc_dir = sbox.wc_dir @@ -1752,7 +1752,7 @@ def merge_sensitive_log_added_mergeinfo_replaces_inherited(sbox): def merge_sensitive_log_propmod_merge_inheriting_path(sbox): "log -g and simple propmod to merge-inheriting path" - # Issue #3285 (http://subversion.tigris.org/issues/show_bug.cgi?id=3285) + # Issue #3285 (https://issues.apache.org/jira/browse/SVN-3285) sbox.build() wc_dir = sbox.wc_dir @@ -2166,13 +2166,13 @@ def log_diff(sbox): + [ "@@ -1 +1,2 @@\n", " This is the file 'beta'.\n", "+9\n", - "\ No newline at end of file\n", + "\\ No newline at end of file\n", ] ] r8diff = [ make_diff_header('A2/D/G/rho', 'nonexistent', 'revision 8') + [ "@@ -0,0 +1 @@\n", "+88\n", - "\ No newline at end of file\n", + "\\ No newline at end of file\n", ] ] log_chain = parse_log_output(output, with_diffs=True) diff --git a/subversion/tests/cmdline/merge_authz_tests.py b/subversion/tests/cmdline/merge_authz_tests.py index 8e14089..b26e9c7 100755 --- a/subversion/tests/cmdline/merge_authz_tests.py +++ b/subversion/tests/cmdline/merge_authz_tests.py @@ -486,7 +486,7 @@ def mergeinfo_and_skipped_paths(sbox): def merge_fails_if_subtree_is_deleted_on_src(sbox): "merge fails if subtree is deleted on src" - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=2876. ## + ## See https://issues.apache.org/jira/browse/SVN-2876. ## # Create a WC sbox.build() @@ -613,7 +613,7 @@ def reintegrate_fails_if_no_root_access(sbox): # should be able to reintegrate, regardless of what authorization # they have to parents of the source and target. # - # See http://subversion.tigris.org/issues/show_bug.cgi?id=3242#desc78 + # See https://issues.apache.org/jira/browse/SVN-3242#desc78 # Some paths we'll care about wc_dir = sbox.wc_dir diff --git a/subversion/tests/cmdline/merge_automatic_tests.py b/subversion/tests/cmdline/merge_automatic_tests.py index f4bb231..fa00e04 100755 --- a/subversion/tests/cmdline/merge_automatic_tests.py +++ b/subversion/tests/cmdline/merge_automatic_tests.py @@ -1163,7 +1163,7 @@ def effective_sync_results_in_reintegrate(sbox): # Now try an explicit --reintegrate merge from ^/branch to A. # This should work because since the resolution of - # http://subversion.tigris.org/issues/show_bug.cgi?id=3577 + # https://issues.apache.org/jira/browse/SVN-3577 # if B is *effectively* synced with A, then B can be reintegrated # to A. sbox.simple_update() diff --git a/subversion/tests/cmdline/merge_reintegrate_tests.py b/subversion/tests/cmdline/merge_reintegrate_tests.py index 7a27373..1479400 100755 --- a/subversion/tests/cmdline/merge_reintegrate_tests.py +++ b/subversion/tests/cmdline/merge_reintegrate_tests.py @@ -1363,7 +1363,7 @@ def reintegrate_with_subtree_mergeinfo(sbox): # how can any prop changes be merged to it? The answer is that # the merge code does some quiet housekeeping, merging gamma_moved's # inherited mergeinfo into its incoming mergeinfo, see - # http://subversion.tigris.org/issues/show_bug.cgi?id=4309 + # https://issues.apache.org/jira/browse/SVN-4309 # This test is not covering issue #4309 so we let the current # behavior pass. # r17 - B) Synch merge from A to A_COPY diff --git a/subversion/tests/cmdline/merge_tests.py b/subversion/tests/cmdline/merge_tests.py index a67dada..3ca42a9 100755 --- a/subversion/tests/cmdline/merge_tests.py +++ b/subversion/tests/cmdline/merge_tests.py @@ -697,7 +697,7 @@ def simple_property_merges(sbox): def merge_similar_unrelated_trees(sbox): "merging similar trees ancestrally unrelated" - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=1249. ## + ## See https://issues.apache.org/jira/browse/SVN-1249. ## sbox.build() wc_dir = sbox.wc_dir @@ -3939,7 +3939,7 @@ def avoid_repeated_merge_on_subtree_with_merge_info(sbox): check_props=True) # Test for part of Issue #2821, see - # http://subversion.tigris.org/issues/show_bug.cgi?id=2821#desc22 + # https://issues.apache.org/jira/browse/SVN-2821#desc22 # # Revert all local changes. svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir) @@ -4966,11 +4966,11 @@ def merge_to_switched_path(sbox): A_COPY_D_G_rho_path = sbox.ospath('A_COPY/D/G/rho') expected = svntest.verify.UnorderedOutput( - ["A " + os.path.join(G_COPY_path, "pi") + "\n", - "A " + os.path.join(G_COPY_path, "rho") + "\n", - "A " + os.path.join(G_COPY_path, "tau") + "\n", - "Checked out revision 6.\n", - "A " + G_COPY_path + "\n"]) + ["A " + G_COPY_path + "\n", + "A " + os.path.join(G_COPY_path, "pi") + "\n", + "A " + os.path.join(G_COPY_path, "rho") + "\n", + "A " + os.path.join(G_COPY_path, "tau") + "\n", + ]) # r7 - Copy A/D/G to A/D/G_COPY and commit. svntest.actions.run_and_verify_svn(expected, [], 'copy', @@ -6007,7 +6007,7 @@ def foreign_repos_does_not_update_mergeinfo(sbox): def avoid_reflected_revs(sbox): "avoid repeated merges for cyclic merging" - # See . + # See . # # This test cherry-picks some changes (all of them, in fact) from the # parent branch 'A' to the child branch 'A_COPY', and then tries to @@ -8294,7 +8294,7 @@ def cherry_picking(sbox): def propchange_of_subdir_raises_conflict(sbox): "merge of propchange on subdir raises conflict" - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=2969. ## + ## See https://issues.apache.org/jira/browse/SVN-2969. ## # Create a WC with a single branch sbox.build() @@ -8515,7 +8515,7 @@ def reverse_merge_prop_add_on_child(sbox): def merge_target_with_non_inheritable_mergeinfo(sbox): "merge target with non inheritable mergeinfo" - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=2970. ## + ## See https://issues.apache.org/jira/browse/SVN-2970. ## # Create a WC with a single branch sbox.build() @@ -8547,7 +8547,7 @@ def merge_target_with_non_inheritable_mergeinfo(sbox): expected_output = wc.State(A_COPY_B_path, { 'lambda' : Item(status='U '), }) - # Issue #3642 http://subversion.tigris.org/issues/show_bug.cgi?id=3642 + # Issue #3642 https://issues.apache.org/jira/browse/SVN-3642 # # We don't expect A_COPY/B/F to have mergeinfo recorded on it because # not only is it unaffected by the merge at depth immediates, it could @@ -8820,7 +8820,7 @@ def merge_from_renamed_branch_fails_while_avoiding_repeat_merge(sbox): #Merge r4 from A/RENAMED_C to A/C #Merge r2:5 from A/RENAMED_C to A/C <-- This fails tracked via #3032. - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=3032. ## + ## See https://issues.apache.org/jira/browse/SVN-3032. ## # Create a WC with a single branch sbox.build() @@ -9250,7 +9250,7 @@ def new_subtrees_should_not_break_merge(sbox): # so we expect only subtree merges on A_COPY/D, A_COPY_D_H, and # A_COPY/D/H/nu. The fact that A/D/H/nu doesn't exist at r6 should not cause # the merge to fail -- see - # http://subversion.tigris.org/issues/show_bug.cgi?id=3067#desc7. + # https://issues.apache.org/jira/browse/SVN-3067#desc7. expected_output = wc.State(A_COPY_path, { 'D/H/omega': Item(status='U '), }) @@ -10495,7 +10495,7 @@ def reverse_merge_away_all_mergeinfo(sbox): # Another test for issue #3067: 'subtrees with intersecting mergeinfo, # that don't exist at the start of a merge range shouldn't break the # merge'. Specifically see -# http://subversion.tigris.org/issues/show_bug.cgi?id=3067#desc5 +# https://issues.apache.org/jira/browse/SVN-3067#desc5 @SkipUnless(server_has_mergeinfo) @Issues(3138,3067,4217) def dont_merge_revs_into_subtree_that_predate_it(sbox): @@ -10614,7 +10614,7 @@ def dont_merge_revs_into_subtree_that_predate_it(sbox): # Cherry harvest all eligible revisions from 'A/D/H' to 'H_COPY'. # # This is where we see the problem described in - # http://subversion.tigris.org/issues/show_bug.cgi?id=3067#desc5. + # https://issues.apache.org/jira/browse/SVN-3067#desc5. # # Use run_and_verify_svn() because run_and_verify_merge*() require # explicit revision ranges. @@ -11786,7 +11786,7 @@ def subtree_source_missing_in_requested_range(sbox): # Another test for issue #3067: 'subtrees that don't exist at the start # or end of a merge range shouldn't break the merge' # -# See http://subversion.tigris.org/issues/show_bug.cgi?id=3067#desc34 +# See https://issues.apache.org/jira/browse/SVN-3067#desc34 @Issue(3067) @SkipUnless(server_has_mergeinfo) def subtrees_with_empty_mergeinfo(sbox): @@ -12848,6 +12848,39 @@ def natural_history_filtering(sbox): # the revisions on 'trunk' which occurred after 'branch2' was copied as # these are not part of 'branch2's natural history. + def path_join(head, tail): + if not head: return tail + if not tail: return head + return head + '/' + tail + + def greek_file_item(path): + if path[-1:].islower(): + basename = re.sub('.*/', '', path) + return Item("This is the file '" + basename + "'.\n") + return Item() + + A_paths = [ + "", + "B", + "B/lambda", + "B/E", + "B/E/alpha", + "B/E/beta", + "B/F", + "mu", + "C", + "D", + "D/gamma", + "D/G", + "D/G/pi", + "D/G/rho", + "D/G/tau", + "D/H", + "D/H/chi", + "D/H/omega", + "D/H/psi", + ] + sbox.build() wc_dir = sbox.wc_dir @@ -12861,68 +12894,16 @@ def natural_history_filtering(sbox): # r7: Make a second 'branch': Copy A to A_COPY_2 expected = svntest.verify.UnorderedOutput( - ["A " + os.path.join(A_COPY_2_path, "B") + "\n", - "A " + os.path.join(A_COPY_2_path, "B", "lambda") + "\n", - "A " + os.path.join(A_COPY_2_path, "B", "E") + "\n", - "A " + os.path.join(A_COPY_2_path, "B", "E", "alpha") + "\n", - "A " + os.path.join(A_COPY_2_path, "B", "E", "beta") + "\n", - "A " + os.path.join(A_COPY_2_path, "B", "F") + "\n", - "A " + os.path.join(A_COPY_2_path, "mu") + "\n", - "A " + os.path.join(A_COPY_2_path, "C") + "\n", - "A " + os.path.join(A_COPY_2_path, "D") + "\n", - "A " + os.path.join(A_COPY_2_path, "D", "gamma") + "\n", - "A " + os.path.join(A_COPY_2_path, "D", "G") + "\n", - "A " + os.path.join(A_COPY_2_path, "D", "G", "pi") + "\n", - "A " + os.path.join(A_COPY_2_path, "D", "G", "rho") + "\n", - "A " + os.path.join(A_COPY_2_path, "D", "G", "tau") + "\n", - "A " + os.path.join(A_COPY_2_path, "D", "H") + "\n", - "A " + os.path.join(A_COPY_2_path, "D", "H", "chi") + "\n", - "A " + os.path.join(A_COPY_2_path, "D", "H", "omega") + "\n", - "A " + os.path.join(A_COPY_2_path, "D", "H", "psi") + "\n", - "Checked out revision 6.\n", - "A " + A_COPY_2_path + "\n"]) - wc_status.add({ - "A_COPY_2" + "/B" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/B/lambda" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/B/E" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/B/E/alpha" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/B/E/beta" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/B/F" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/mu" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/C" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/D" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/D/gamma" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/D/G" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/D/G/pi" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/D/G/rho" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/D/G/tau" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/D/H" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/D/H/chi" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/D/H/omega" : Item(status=' ', wc_rev=7), - "A_COPY_2" + "/D/H/psi" : Item(status=' ', wc_rev=7), - "A_COPY_2" : Item(status=' ', wc_rev=7), - }) - wc_disk.add({ - "A_COPY_2" : Item(), - "A_COPY_2" + '/B' : Item(), - "A_COPY_2" + '/B/lambda' : Item("This is the file 'lambda'.\n"), - "A_COPY_2" + '/B/E' : Item(), - "A_COPY_2" + '/B/E/alpha' : Item("This is the file 'alpha'.\n"), - "A_COPY_2" + '/B/E/beta' : Item("New content"), - "A_COPY_2" + '/B/F' : Item(), - "A_COPY_2" + '/mu' : Item("This is the file 'mu'.\n"), - "A_COPY_2" + '/C' : Item(), - "A_COPY_2" + '/D' : Item(), - "A_COPY_2" + '/D/gamma' : Item("This is the file 'gamma'.\n"), - "A_COPY_2" + '/D/G' : Item(), - "A_COPY_2" + '/D/G/pi' : Item("This is the file 'pi'.\n"), - "A_COPY_2" + '/D/G/rho' : Item("New content"), - "A_COPY_2" + '/D/G/tau' : Item("This is the file 'tau'.\n"), - "A_COPY_2" + '/D/H' : Item(), - "A_COPY_2" + '/D/H/chi' : Item("New content"), - "A_COPY_2" + '/D/H/omega' : Item("This is the file 'omega'.\n"), - "A_COPY_2" + '/D/H/psi' : Item("New content"), - }) + [ "A " + sbox.ospath(path_join("A_COPY_2", p)) + "\n" + for p in A_paths ]) + wc_status.add( + { path_join("A_COPY_2", p) : Item(status=' ', wc_rev=7) + for p in A_paths }) + wc_disk.add( + { path_join("A_COPY_2", p) : + Item("New content") if p in ['B/E/beta', 'D/G/rho', 'D/H/chi', 'D/H/psi'] + else greek_file_item(p) + for p in A_paths }) svntest.actions.run_and_verify_svn(expected, [], 'copy', sbox.repo_url + "/A", A_COPY_2_path) @@ -13305,7 +13286,7 @@ def no_self_referential_filtering_on_added_path(sbox): # how can any prop changes be merged to it? The answer is that # the merge code does some quiet housekeeping, merging C_MOVED's # inherited mergeinfo into its incoming mergeinfo, see - # http://subversion.tigris.org/issues/show_bug.cgi?id=4309 + # https://issues.apache.org/jira/browse/SVN-4309 # This test is not covering issue #4309 so we let the current # behavior pass. expected_mergeinfo_output = wc.State(A_COPY_2_path, { @@ -13374,7 +13355,7 @@ def no_self_referential_filtering_on_added_path(sbox): #---------------------------------------------------------------------- # Test for issue #3324 -# http://subversion.tigris.org/issues/show_bug.cgi?id=3324 +# https://issues.apache.org/jira/browse/SVN-3324 @Issue(3324) @SkipUnless(server_has_mergeinfo) def merge_range_prior_to_rename_source_existence(sbox): @@ -13881,7 +13862,7 @@ def dont_merge_gaps_in_history(sbox): #---------------------------------------------------------------------- # Test for issue #3432 'Merge can record mergeinfo from natural history -# gaps'. See http://subversion.tigris.org/issues/show_bug.cgi?id=3432 +# gaps'. See https://issues.apache.org/jira/browse/SVN-3432 @Issue(3432) @SkipUnless(server_has_mergeinfo) def handle_gaps_in_implicit_mergeinfo(sbox): @@ -15122,7 +15103,7 @@ def foreign_repos_del_and_props(sbox): #---------------------------------------------------------------------- # Test for issue #3642 'immediate depth merges don't create proper subtree -# mergeinfo'. See http://subversion.tigris.org/issues/show_bug.cgi?id=3642 +# mergeinfo'. See https://issues.apache.org/jira/browse/SVN-3642 @Issue(3642) def immediate_depth_merge_creates_minimal_subtree_mergeinfo(sbox): "no spurious mergeinfo from immediate depth merges" @@ -15817,7 +15798,7 @@ def subtree_merges_inherit_invalid_working_mergeinfo(sbox): #---------------------------------------------------------------------- # Test for issue #3686 'executable flag not correctly set on merge' -# See http://subversion.tigris.org/issues/show_bug.cgi?id=3686 +# See https://issues.apache.org/jira/browse/SVN-3686 @Issue(3686) @SkipUnless(server_has_mergeinfo) @SkipUnless(svntest.main.is_posix_os) diff --git a/subversion/tests/cmdline/merge_tree_conflict_tests.py b/subversion/tests/cmdline/merge_tree_conflict_tests.py index 4f1805b..344c2d2 100755 --- a/subversion/tests/cmdline/merge_tree_conflict_tests.py +++ b/subversion/tests/cmdline/merge_tree_conflict_tests.py @@ -540,7 +540,7 @@ def merge_add_over_versioned_file_conflicts(sbox): def mergeinfo_recording_in_skipped_merge(sbox): "mergeinfo recording in skipped merge" - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=2829. ## + ## See https://issues.apache.org/jira/browse/SVN-2829. ## # Create a WC with a single branch sbox.build() @@ -705,7 +705,7 @@ def del_differing_file(sbox): def tree_conflicts_and_obstructions(sbox): "tree conflicts and obstructions" - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=3146. ## + ## See https://issues.apache.org/jira/browse/SVN-3146. ## sbox.build() wc_dir = sbox.wc_dir diff --git a/subversion/tests/cmdline/mergeinfo_tests.py b/subversion/tests/cmdline/mergeinfo_tests.py index 328a9f2..fccf5fb 100755 --- a/subversion/tests/cmdline/mergeinfo_tests.py +++ b/subversion/tests/cmdline/mergeinfo_tests.py @@ -196,7 +196,7 @@ def mergeinfo_on_unknown_url(sbox): # Test for issue #3126 'svn mergeinfo shows too few or too many # eligible revisions'. Specifically -# http://subversion.tigris.org/issues/show_bug.cgi?id=3126#desc5. +# https://issues.apache.org/jira/browse/SVN-3126#desc5. @SkipUnless(server_has_mergeinfo) @Issue(3126) def non_inheritable_mergeinfo(sbox): diff --git a/subversion/tests/cmdline/mod_dav_svn_tests.py b/subversion/tests/cmdline/mod_dav_svn_tests.py old mode 100644 new mode 100755 index db30533..1ab2464 --- a/subversion/tests/cmdline/mod_dav_svn_tests.py +++ b/subversion/tests/cmdline/mod_dav_svn_tests.py @@ -640,6 +640,53 @@ def propfind_propname(sbox): actual_response = r.read() verify_xml_response(expected_response, actual_response) +@SkipUnless(svntest.main.is_ra_type_dav) +def last_modified_header(sbox): + "verify 'Last-Modified' header on 'external' GETs" + + sbox.build(create_wc=False, read_only=True) + + headers = { + 'Authorization': 'Basic ' + base64.b64encode(b'jconstant:rayjandom').decode(), + } + + h = svntest.main.create_http_connection(sbox.repo_url) + + # GET /repos/iota + # Expect to see a Last-Modified header. + h.request('GET', sbox.repo_url + '/iota', None, headers) + r = h.getresponse() + if r.status != httplib.OK: + raise svntest.Failure('Request failed: %d %s' % (r.status, r.reason)) + svntest.verify.compare_and_display_lines(None, 'Last-Modified', + svntest.verify.RegexOutput('.+'), + r.getheader('Last-Modified')) + r.read() + + # HEAD /repos/iota + # Expect to see a Last-Modified header. + h.request('HEAD', sbox.repo_url + '/iota', None, headers) + r = h.getresponse() + if r.status != httplib.OK: + raise svntest.Failure('Request failed: %d %s' % (r.status, r.reason)) + svntest.verify.compare_and_display_lines(None, 'Last-Modified', + svntest.verify.RegexOutput('.+'), + r.getheader('Last-Modified')) + r.read() + + # GET /repos/!svn/rvr/1/iota + # There should not be a Last-Modified header (it's costly and not useful, + # see r1724790) + h.request('GET', sbox.repo_url + '/!svn/rvr/1/iota', None, headers) + r = h.getresponse() + if r.status != httplib.OK: + raise svntest.Failure('Request failed: %d %s' % (r.status, r.reason)) + last_modified = r.getheader('Last-Modified') + if last_modified: + raise svntest.Failure('Unexpected Last-Modified header: %s' % last_modified) + r.read() + + ######################################################################## # Run the tests @@ -652,6 +699,7 @@ test_list = [ None, propfind_404, propfind_allprop, propfind_propname, + last_modified_header, ] serial_only = True diff --git a/subversion/tests/cmdline/move_tests.py b/subversion/tests/cmdline/move_tests.py index 1542af9..6da4a1d 100755 --- a/subversion/tests/cmdline/move_tests.py +++ b/subversion/tests/cmdline/move_tests.py @@ -1261,7 +1261,7 @@ def nested_replaces(sbox): ' D /A/B/C/Y', ])) expected_output = svntest.verify.UnorderedRegexListOutput(escaped - + [ '^-', '^r2', '^-', '^Changed paths:', ]) + + [ '^--*', '^r2.*', '^--*', '^Changed paths:', ]) svntest.actions.run_and_verify_svn(expected_output, [], 'log', '-qvr2', repo_url) diff --git a/subversion/tests/cmdline/patch_tests.py b/subversion/tests/cmdline/patch_tests.py index 5d41dd6..3cd4dd7 100755 --- a/subversion/tests/cmdline/patch_tests.py +++ b/subversion/tests/cmdline/patch_tests.py @@ -4246,7 +4246,7 @@ def patch_git_with_index_line(sbox): "+++ b/src/tools/ConsoleRunner/hi.txt\n", "@@ -0,0 +1 @@\n", "+hihihihihihi\n", - "\ No newline at end of file\n", + "\\ No newline at end of file\n", ] svntest.main.file_write(patch_file_path, ''.join(unidiff_patch)) @@ -4413,7 +4413,7 @@ def patch_replace_dir_with_file_and_vv(sbox): "+++ A/D\t(working copy)\n", "@@ -0,0 +1 @@\n", "+New file\n", - "\ No newline at end of file\n", + "\\ No newline at end of file\n", # Add iota as directory "Index: iota\n", @@ -4426,7 +4426,7 @@ def patch_replace_dir_with_file_and_vv(sbox): "Added: k\n", "## -0,0 +1 ##\n", "+v\n", - "\ No newline at end of property\n", + "\\ No newline at end of property\n", ])) expected_output = wc.State(wc_dir, { @@ -6541,7 +6541,7 @@ def patch_prop_madness(sbox): "Property: del_n\n" "## -1,1 +0,0 ##\n" "-no-eol\n" - "\ No newline at end of property\n" + "\\ No newline at end of property\n" % (sbox.path('iota'), sbox.path('iota'))), }) @@ -7791,6 +7791,225 @@ def patch_merge(sbox): expected_disk, None, expected_skip) +def patch_mergeinfo_in_regular_prop_format(sbox): + "patch mergeinfo in regular prop format" + + sbox.build() + wc_dir = sbox.wc_dir + strip_count = wc_dir.count(os.path.sep)+1 + + sbox.simple_copy('A/B/E', 'E') + sbox.simple_append('A/B/E/alpha', 'extra\nlines\n') + sbox.simple_commit() + + sbox.simple_propset('a', 'A', 'E') # 'a' < 'svn:mergeinfo' + sbox.simple_propset('z', 'Z', 'E') # 'z' > 'svn:mergeinfo' + + svntest.actions.run_and_verify_svn(None, [], + 'merge', '^/A/B/E', sbox.ospath('E')) + # Rename 'svn:mergeinfo' to 'svn_mergeinfo' so that 'diff' doesn't + # pretty-print it; then rename it back before we run it through 'patch'. + # (Alternatively, we could disable pretty-printing when we implement a + # command-line switch to do so.) + mergeinfo_value = sbox.simple_propget('svn:mergeinfo', 'E') + sbox.simple_propdel('svn:mergeinfo', 'E') + sbox.simple_propset('svn_mergeinfo', mergeinfo_value, 'E') + + _, diff, _ = svntest.actions.run_and_verify_svn(None, [], + 'diff', wc_dir) + diff = re.sub('svn_mergeinfo', 'svn:mergeinfo', ''.join(diff)) + + sbox.simple_revert('E', 'E/alpha') + + patch = sbox.get_tempname('recurse.patch') + svntest.main.file_write(patch, diff, mode='wb') + + expected_output = wc.State(wc_dir, { + 'E' : Item(status=' U'), + 'E/alpha' : Item(status='U '), + }) + expected_skip = wc.State(wc_dir, {}) + expected_status = svntest.actions.get_virginal_state(wc_dir, 1) + expected_status.add({ + 'E' : Item(status=' M', wc_rev='2'), + 'E/alpha' : Item(status='M ', wc_rev='2'), + 'E/beta' : Item(status=' ', wc_rev='2'), + }) + expected_status.tweak('A/B/E/alpha', wc_rev=2) + expected_disk = svntest.main.greek_state.copy() + expected_disk.tweak('A/B/E/alpha', contents="This is the file 'alpha'.\nextra\nlines\n") + expected_disk.add({ + 'E' : Item(props={'a': 'A', + # here is the correctly patched mergeinfo + 'svn:mergeinfo': '/A/B/E:2', + 'z': 'Z'}), + 'E/beta' : Item(contents="This is the file 'beta'.\n"), + 'E/alpha' : Item(contents="This is the file 'alpha'.\nextra\nlines\n"), + }) + + svntest.actions.run_and_verify_patch(wc_dir, patch, + expected_output, expected_disk, + expected_status, expected_skip, + [], True, True, + '--strip', strip_count) + +@XFail() +def patch_empty_prop(sbox): + "patch empty prop" + sbox.build(empty=True) + was_cwd = os.getcwd() + os.chdir(sbox.wc_dir) + sbox.wc_dir = '' + wc_dir = '' + + # start with a file with an empty prop + sbox.simple_add_text('', 'f') + sbox.simple_propset('p', '', 'f') + sbox.simple_commit() + + # a patch that modifies the prop to a non-empty value + unidiff_patch = [ + "--- f\n", + "+++ f\n", + "\n", + "Property changes on: f\n", + "___________________________________________________________________\n", + "Modified: p\n", + "## -0,0 +1 ##\n", + "+v\n", + ] + + trailing_eol = False + if trailing_eol: + value = "v\n" + else: + value = "v" + unidiff_patch += ['\ No newline at end of property\n'] + + patch_file_path = sbox.get_tempname('my.patch') + svntest.main.file_write(patch_file_path, ''.join(unidiff_patch), 'wb') + + expected_output = [ + ' U %s\n' % sbox.ospath('f'), + ] + + expected_disk = svntest.wc.State(wc_dir, {}) + expected_disk.add({'f': Item(props={'p' : value})}) + expected_status = svntest.wc.State(wc_dir, {}) + expected_status.add({'f': Item(status=' M')}) + expected_skip = wc.State('', { }) + + svntest.actions.run_and_verify_patch(wc_dir, patch_file_path, + expected_output, + expected_disk, + expected_status, + expected_skip, + None, # expected err + 1, # check-props + False, # dry-run + ) + + svntest.actions.check_prop('p', wc_dir, [value.encode()]) + + os.chdir(was_cwd) + +# Test that 'patch' can apply a patch that modifies properties on the root +# of a WC and/or the root of a repository. This test uses the format of +# diff output produced by 'svn diff --git' in svn <= 1.10.0: paths are given +# as 'a/' and 'b/' and 'Property changes on: ' (with no following '.'). +# +# See dev@ email thread 2018-07-09 from Dmitry Pavlenko, +# '[PATCH] can't "svn patch" working copy root if the patch is in --git format', +# https://lists.apache.org/thread.html/d1d9811ca36fac8cabb9339634840099e22811beac505be2ea59f19f@%3Cdev.subversion.apache.org%3E +@XFail() +def patch_git_wcroot(sbox): + "patch working copy root" + sbox.build(empty=True) + wc_dir = sbox.wc_dir + + git_patch = [ "Index: .\n", + "===================================================================\n", + "diff --git a/ b/\n", + "--- a/ (revision 0)\n", + "+++ b/ (working copy)\n", + "Property changes on: \n", + "___________________________________________________________________\n", + "Added: p\n", + "## -0,0 +1 ##\n", + "+v\n", + "\\ No newline at end of property\n", + ] + value = 'v' + + patch_file_path = sbox.get_tempname('my.patch') + svntest.main.file_write(patch_file_path, ''.join(git_patch), 'wb') + + expected_output = wc.State(wc_dir, { + '.' : Item(status=' U'), + }) + expected_disk = svntest.wc.State('', {}) + expected_disk.add({'': Item(props={'p' : value })}) + expected_status = svntest.wc.State(wc_dir, {}) + expected_status.add({'': Item(status=' M', wc_rev='0')}) + expected_skip = wc.State('', { }) + + svntest.actions.run_and_verify_patch(wc_dir, patch_file_path, + expected_output, + expected_disk, + expected_status, + expected_skip, + None, # expected err + True, # check-props + False, # dry-run + ) + + svntest.actions.check_prop('p', wc_dir, [value.encode()]) + +# Test that 'patch' can apply a patch that modifies properties on the root +# of a WC and/or the root of a repository. This test performs a round-trip +# through 'diff --git' and 'patch' rather than assuming any particular +# variant of the patch format. +# +# See dev@ email thread 2018-07-09 from Dmitry Pavlenko, +# '[PATCH] can't "svn patch" working copy root if the patch is in --git format', +# https://lists.apache.org/thread.html/d1d9811ca36fac8cabb9339634840099e22811beac505be2ea59f19f@%3Cdev.subversion.apache.org%3E +@XFail() +def patch_git_wcroot2(sbox): + "patch working copy root" + sbox.build(empty=True) + wc_dir = sbox.wc_dir + + value = 'v' + sbox.simple_propset('p', value, '') + exit_code, git_patch, err_output = svntest.main.run_svn(None, 'diff', + '--git', wc_dir) + + patch_file_path = sbox.get_tempname('my.patch') + svntest.main.file_write(patch_file_path, ''.join(git_patch), 'wb') + + sbox.simple_revert('') + + expected_output = wc.State(wc_dir, { + '.' : Item(status=' U'), + }) + expected_disk = svntest.wc.State('', {}) + expected_disk.add({'': Item(props={'p' : value })}) + expected_status = svntest.wc.State(wc_dir, {}) + expected_status.add({'': Item(status=' M', wc_rev='0')}) + expected_skip = wc.State('', { }) + + svntest.actions.run_and_verify_patch(wc_dir, patch_file_path, + expected_output, + expected_disk, + expected_status, + expected_skip, + None, # expected err + True, # check-props + False, # dry-run + ) + + svntest.actions.check_prop('p', wc_dir, [value.encode()]) + ######################################################################## #Run the tests @@ -7874,6 +8093,10 @@ test_list = [ None, missing_trailing_context, patch_missed_trail, patch_merge, + patch_mergeinfo_in_regular_prop_format, + patch_empty_prop, + patch_git_wcroot, + patch_git_wcroot2, ] if __name__ == '__main__': diff --git a/subversion/tests/cmdline/pegrev_parse_tests.py b/subversion/tests/cmdline/pegrev_parse_tests.py new file mode 100644 index 0000000..91469db --- /dev/null +++ b/subversion/tests/cmdline/pegrev_parse_tests.py @@ -0,0 +1,673 @@ +#!/usr/bin/env python +# +# basic_tests.py: testing working-copy interactions with ra_local +# +# Subversion is a tool for revision control. +# See http://subversion.apache.org for more information. +# +# ==================================================================== +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +###################################################################### + +# General modules +import shutil, stat, re, os, logging + +logger = logging.getLogger() + +# Our testing module +import svntest +from svntest import wc +from svntest import main +from svntest import actions + +# (abbreviation) +Skip = svntest.testcase.Skip_deco +SkipUnless = svntest.testcase.SkipUnless_deco +XFail = svntest.testcase.XFail_deco +Issues = svntest.testcase.Issues_deco +Issue = svntest.testcase.Issue_deco +Wimp = svntest.testcase.Wimp_deco +Item = wc.StateItem + +###################################################################### +# Helper functions + +# Most of our tests use absolute paths as parameters on the command line. But +# for these tests, it's important that we can use bare file names in the +# commands, because the parser may have (and as of this writing does have) +# edge-case bugs that we can only expose in this way. Therefore, these helpers +# ensure that we run 'svn' with the CWD at the root of the working copy. +def run_svn(sbox, expected_status, expected_stderr, *varargs): + if expected_stderr is None: + expected_stderr = [] + + cwd = os.getcwd() + try: + os.chdir(sbox.wc_dir) + actions.run_and_verify_svn(None, expected_stderr, *varargs) + finally: + os.chdir(cwd) + + if expected_status is not None: + actions.run_and_verify_status(sbox.wc_dir, expected_status) + +def get_trojan_virginal_state(sbox): + return actions.get_virginal_state(sbox.wc_dir, '1', tree='trojan') + +def build_trojan_sandbox(sbox, expected_stderr): + sbox.build(tree='trojan') + if expected_stderr is None: + return get_trojan_virginal_state(sbox) + return None + +def build_empty_sandbox(sbox, expected_stderr): + sbox.build(empty=True) + if expected_stderr is None: + return svntest.wc.State(sbox.wc_dir, { + '': svntest.wc.StateItem(status=' ', wc_rev='0') + }) + return None + +def build_sandbox(sbox, empty_sandbox, expected_stderr): + if not empty_sandbox: + return build_trojan_sandbox(sbox, expected_stderr) + else: + return build_empty_sandbox(sbox, expected_stderr) + +def do_add_file(sbox, dst, dst_cmdline, + expected_stderr=None, empty_sandbox=False): + expected_status = build_sandbox(sbox, empty_sandbox, expected_stderr) + if expected_status is not None: + expected_status.add({dst: Item(status='A ', wc_rev='-')}) + + main.file_write(sbox.ospath(dst), "This is file '" + dst + "'.") + run_svn(sbox, expected_status, expected_stderr, + 'add', dst_cmdline) + +def do_add_file_e(sbox, dst, dst_cmdline, expected_stderr=None): + "like do_add_file() but with an empty sandbox" + return do_add_file(sbox, dst, dst_cmdline, expected_stderr, True) + +def do_make_dir(sbox, dst, dst_cmdline, + expected_stderr=None, empty_sandbox=False): + expected_status = build_sandbox(sbox, empty_sandbox, expected_stderr) + if expected_status is not None: + expected_status.add({dst: Item(status='A ', wc_rev='-')}) + + run_svn(sbox, expected_status, expected_stderr, + 'mkdir', dst_cmdline) + +def do_make_dir_e(sbox, dst, dst_cmdline, expected_stderr=None): + "like do_make_dir() but with an empty sandbox" + return do_make_dir(sbox, dst, dst_cmdline, expected_stderr, True) + +def do_remove(sbox, dst, dst_cmdline, expected_stderr=None): + expected_status = build_trojan_sandbox(sbox, expected_stderr) + if expected_status is not None and dst in expected_status.desc: + expected_status.tweak(dst, status='D ') + + run_svn(sbox, expected_status, expected_stderr, + 'remove', dst_cmdline) + +def do_rename(sbox, src, src_cmdline, dst, dst_cmdline, + expected_stderr=None): + expected_status = build_trojan_sandbox(sbox, expected_stderr) + if expected_status is not None: + expected_status.tweak(src, status='D ', moved_to=dst) + expected_status.add({dst: Item(status='A ', copied='+', + moved_from=src, wc_rev='-')}) + + run_svn(sbox, expected_status, expected_stderr, + 'rename', src_cmdline, dst_cmdline) + + +###################################################################### +# Tests +# +# Each test must return on success or raise on failure. + +#===================================================================== +# Tests for 'svn add' in the current directory + +def add_file_here_1_escape_peg(sbox): + "add file 'tau' with pegrev escape" + do_add_file_e(sbox, 'tau', 'tau@') + +def add_file_here_2_escape_peg(sbox): + "add file '@tau' with pegrev escape" + do_add_file_e(sbox, '@tau', '@tau@') + +def add_file_here_3_escape_peg(sbox): + "add file '_@tau' with pegrev escape" + do_add_file_e(sbox, '_@tau', '_@tau@') + +def add_file_here_4_escape_peg(sbox): + "add file '.@tau' with pegrev escape" + do_add_file_e(sbox, '.@tau', '.@tau@') + +def add_file_here_5_escape_peg(sbox): + "add file 'tau@' with pegrev escape" + do_add_file_e(sbox, 'tau@', 'tau@@') + +def add_file_here_6_escape_peg(sbox): + "add file '@tau@' with pegrev escape" + do_add_file_e(sbox, '@tau@', '@tau@@') + +def add_file_here_7_escape_peg(sbox): + "add file '@' with pegrev escape" + do_add_file_e(sbox, '@', '@@') + +#--------------------------------------------------------------------- + +def add_file_here_1_no_escape_peg(sbox): + "add file 'tau' without pegrev escape" + do_add_file_e(sbox, 'tau', 'tau') + +def add_file_here_2_no_escape_peg(sbox): + "add file '@tau' without pegrev escape" + do_add_file_e(sbox, '@tau', '@tau', "svn: E125001: '@tau'") + +def add_file_here_3_no_escape_peg(sbox): + "add file '_@tau' without pegrev escape" + do_add_file_e(sbox, '_@tau', '_@tau', "svn: E200009: '_@tau'") + +@Wimp("The error message mentions '@tau' instead of '.@tau'") +def add_file_here_4_no_escape_peg(sbox): + "add file '.@tau' without pegrev escape" + do_add_file_e(sbox, '.@tau', '.@tau', "svn: E200009: '.@tau'") + +def add_file_here_5_no_escape_peg(sbox): + "add file 'tau@' without pegrev escape" + do_add_file_e(sbox, 'tau@', 'tau@', 'svn: E200009: ') + +def add_file_here_6_no_escape_peg(sbox): + "add file '@tau@' without pegrev escape" + do_add_file_e(sbox, '@tau@', '@tau@', 'svn: E200009: ') + +def add_file_here_7_no_escape_peg(sbox): + "add file '@' without pegrev escape" + do_add_file_e(sbox, '@', '@', "svn: E125001: '@'") + +#===================================================================== +# Tests for 'svn add' in a subdirectory + +def add_file_subdir_1_escape_peg(sbox): + "add file 'E/tau' with pegrev escape" + do_add_file(sbox, 'E/tau', 'E/tau@') + +def add_file_subdir_2_escape_peg(sbox): + "add file 'E/@tau' with pegrev escape" + do_add_file(sbox, 'E/@tau', 'E/@tau@') + +def add_file_subdir_3_escape_peg(sbox): + "add file 'E/_@tau' with pegrev escape" + do_add_file(sbox, 'E/_@tau', 'E/_@tau@') + +def add_file_subdir_4_escape_peg(sbox): + "add file 'E/.@tau' with pegrev escape" + do_add_file(sbox, 'E/.@tau', 'E/.@tau@') + +def add_file_subdir_5_escape_peg(sbox): + "add file 'E/tau@' with pegrev escape" + do_add_file(sbox, 'E/tau@', 'E/tau@@') + +def add_file_subdir_6_escape_peg(sbox): + "add file 'E/@tau@' with pegrev escape" + do_add_file(sbox, 'E/@tau@', 'E/@tau@@') + +def add_file_subdir_7_escape_peg(sbox): + "add file 'E/@' with pegrev escape" + do_add_file(sbox, 'E/@', 'E/@@') + +#--------------------------------------------------------------------- + +def add_file_subdir_1_no_escape_peg(sbox): + "add file 'E/tau' without pegrev escape" + do_add_file(sbox, 'E/tau', 'E/tau') + +@Wimp("The error message mentions 'E@tau' instead of 'E/@tau'") +@Wimp("The error message should be E125001") +def add_file_subdir_2_no_escape_peg(sbox): + "add file 'E/@tau' without pegrev escape" + do_add_file(sbox, 'E/@tau', 'E/@tau', r"svn: E200009: 'E[\\/]@tau'") + +def add_file_subdir_3_no_escape_peg(sbox): + "add file 'E/_@tau' without pegrev escape" + do_add_file(sbox, 'E/_@tau', 'E/_@tau', r"svn: E200009: 'E[\\/]_@tau'") + +@Wimp("The error message mentions 'E@tau' instead of 'E/.@tau'") +def add_file_subdir_4_no_escape_peg(sbox): + "add file 'E/.@tau' without pegrev escape" + do_add_file(sbox, 'E/.@tau', 'E/.@tau', r"svn: E200009: 'E[\\/].@tau'") + +def add_file_subdir_5_no_escape_peg(sbox): + "add file 'E/tau@' without pegrev escape" + do_add_file(sbox, 'E/tau@', 'E/tau@', 'svn: E200009: ') + +def add_file_subdir_6_no_escape_peg(sbox): + "add file 'E/@tau@' without pegrev escape" + do_add_file(sbox, 'E/@tau@', 'E/@tau@', 'svn: E200009: ') + +@Wimp("The error message is E200009 but should be E125001") +def add_file_subdir_7_no_escape_peg(sbox): + "add file 'E/@' without pegrev escape" + do_add_file(sbox, 'E/@', 'E/@', r"svn: E125001: 'E[\\/]@'") + +#===================================================================== +# Tests for 'svn mkdir' in the current directory + +def make_dir_here_1_escape_peg(sbox): + "create directory 'T' with pegrev escape" + do_make_dir_e(sbox, 'T', 'T@') + +def make_dir_here_2_escape_peg(sbox): + "create directory '@T' with pegrev escape" + do_make_dir_e(sbox, '@T', '@T@') + +def make_dir_here_3_escape_peg(sbox): + "create directory '_@T' with pegrev escape" + do_make_dir(sbox, '_@T', '_@T@') + +def make_dir_here_4_escape_peg(sbox): + "create directory '.@T' with pegrev escape" + do_make_dir_e(sbox, '.@T', '.@T@') + +def make_dir_here_5_escape_peg(sbox): + "create directory 'T@' with pegrev escape" + do_make_dir_e(sbox, 'T@', 'T@@') + +def make_dir_here_6_escape_peg(sbox): + "create directory '@T@' with pegrev escape" + do_make_dir_e(sbox, '@T@', '@T@@') + +def make_dir_here_7_escape_peg(sbox): + "create directory '@' with pegrev escape" + do_make_dir_e(sbox, '@', '@@') + +#--------------------------------------------------------------------- + +def make_dir_here_1_no_escape_peg(sbox): + "create directory 'T' without pegrev escape" + do_make_dir_e(sbox, 'T', 'T') + +def make_dir_here_2_no_escape_peg(sbox): + "create directory '@T' without pegrev escape" + do_make_dir_e(sbox, '@T', '@T', "svn: E125001: '@T'") + +def make_dir_here_3_no_escape_peg(sbox): + "create directory '_@T' without pegrev escape" + do_make_dir_e(sbox, '_@T', '_@T', "svn: E200009: '_@T'") + +@Wimp("The error message mentions '@T' instead of '.@T'") +def make_dir_here_4_no_escape_peg(sbox): + "create directory '.@T' without pegrev escape" + do_make_dir_e(sbox, '.@T', '.@T', "svn: E200009: '.@T'") + +# Skip tests 5 and 6 that create a directory with a trailing @ in the name +# because is correctly interpreted as a peg revision escape. This is already +# tested by: +# - make_dir_here_5_escape_peg +# - make_dir_here_6_escape_peg + +def make_dir_here_7_no_escape_peg(sbox): + "create directory '@' without pegrev escape" + do_make_dir_e(sbox, '@', '@', "svn: E125001: '@'") + +#===================================================================== +# Tests for 'svn add' in a subdirectory + +def make_dir_subdir_1_escape_peg(sbox): + "create directory 'E/T' with pegrev escape" + do_make_dir(sbox, 'E/T', 'E/T@') + +def make_dir_subdir_2_escape_peg(sbox): + "create directory 'E/@T' with pegrev escape" + do_make_dir(sbox, 'E/@T', 'E/@T@') + +def make_dir_subdir_3_escape_peg(sbox): + "create directory 'E/_@T' with pegrev escape" + do_make_dir(sbox, 'E/_@T', 'E/_@T@') + +def make_dir_subdir_4_escape_peg(sbox): + "create directory 'E/.@T' with pegrev escape" + do_make_dir(sbox, 'E/.@T', 'E/.@T@') + +def make_dir_subdir_5_escape_peg(sbox): + "create directory 'E/T@' with pegrev escape" + do_make_dir(sbox, 'E/T@', 'E/T@@') + +def make_dir_subdir_6_escape_peg(sbox): + "create directory 'E/@T@' with pegrev escape" + do_make_dir(sbox, 'E/@T@', 'E/@T@@') + +def make_dir_subdir_7_escape_peg(sbox): + "create directory 'E/@' with pegrev escape" + do_make_dir(sbox, 'E/@', 'E/@@') + +#--------------------------------------------------------------------- + +def make_dir_subdir_1_no_escape_peg(sbox): + "create directory 'E/T' without pegrev escape" + do_make_dir(sbox, 'E/T', 'E/T') + +@Wimp("The error message mentions 'E@T' instead of 'E/@T'") +@Wimp("The error message should be E125001") +def make_dir_subdir_2_no_escape_peg(sbox): + "create directory 'E/@T' without pegrev escape" + do_make_dir(sbox, 'E/@T', 'E/@T', r"svn: E200009: 'E[\\/]@T'") + +def make_dir_subdir_3_no_escape_peg(sbox): + "create directory 'E/_@T' without pegrev escape" + do_make_dir(sbox, 'E/_@T', 'E/_@T', r"svn: E200009: 'E[\\/]_@T'") + +@Wimp("The error message mentions 'E@T' instead of 'E/.@T'") +def make_dir_subdir_4_no_escape_peg(sbox): + "create directory 'E/.@T' without pegrev escape" + do_make_dir(sbox, 'E/.@T', 'E/.@T', r"svn: E200009: 'E[\\/].@T'") + +# Skip tests 5 and 6 that create a directory with a trailing @ in the name +# because is correctly interpreted as a peg revision escape. This is already +# tested by: +# - make_dir_subdir_5_escape_peg +# - make_dir_subdir_6_escape_peg + +@Wimp("Reports error that E exists but should be E125001 for E/@") +def make_dir_subdir_7_no_escape_peg(sbox): + "create directory 'E/@' without pegrev escape" + do_make_dir(sbox, 'E/@', 'E/@', r"svn: E125001: 'E[\\/]@'") + +#===================================================================== +# Tests for 'svn remove' in the current directory + +def remove_here_1_escape_peg(sbox): + "remove 'iota' with pegrev escape" + do_remove(sbox, 'iota', 'iota@') + +def remove_here_2_escape_peg(sbox): + "remove '@zeta' with pegrev escape" + do_remove(sbox, '@zeta', '@zeta@') + +def remove_here_3_escape_peg(sbox): + "remove '_@theta' with pegrev escape" + do_remove(sbox, '_@theta', '_@theta@') + +def remove_here_4_escape_peg(sbox): + "remove '.@kappa' with pegrev escape" + do_remove(sbox, '.@kappa', '.@kappa@') + +def remove_here_5_escape_peg(sbox): + "remove 'lambda@' with pegrev escape" + do_remove(sbox, 'lambda@', 'lambda@@') + +def remove_here_6_escape_peg(sbox): + "remove '@omicron@' with pegrev escape" + do_remove(sbox, '@omicron@', '@omicron@@') + +def remove_here_7_escape_peg(sbox): + "remove '@' with pegrev escape" + do_remove(sbox, '@', '@@') + +#--------------------------------------------------------------------- + +def remove_here_1_no_escape_peg(sbox): + "remove 'iota' without pegrev escape" + do_remove(sbox, 'iota', 'iota') + +def remove_here_2_no_escape_peg(sbox): + "remove '@zeta' without pegrev escape" + do_remove(sbox, '@zeta', '@zeta', "svn: E125001: '@zeta'") + +def remove_here_3_no_escape_peg(sbox): + "remove '_@theta' without pegrev escape" + do_remove(sbox, '_@theta', '_@theta', "svn: E200009: '_@theta'") + +@Wimp("The error message mentions '@kappa' instead of '.@kappa'") +def remove_here_4_no_escape_peg(sbox): + "remove '.@kappa' without pegrev escape" + do_remove(sbox, '.@kappa', '.@kappa', "svn: E200009: '.@kappa'") + +def remove_here_5_no_escape_peg(sbox): + "remove 'lambda@' without pegrev escape" + do_remove(sbox, 'lambda@', 'lambda@', 'svn: E200005: ') + +def remove_here_6_no_escape_peg(sbox): + "remove '@omicron@' without pegrev escape" + do_remove(sbox, '@omicron@', '@omicron@', 'svn: E200005: ') + +def remove_here_7_no_escape_peg(sbox): + "remove '@' without pegrev escape" + do_remove(sbox, '@', '@', "svn: E125001: '@'") + +#===================================================================== +# Tests for 'svn remove' in a subdirectory directory + +def remove_subdir_1_escape_peg(sbox): + "remove 'A/alpha' with pegrev escape" + do_remove(sbox, 'A/alpha', 'A/alpha@') + +def remove_subdir_2_escape_peg(sbox): + "remove 'B/@beta' with pegrev escape" + do_remove(sbox, 'B/@beta', 'B/@beta@') + +def remove_subdir_3_escape_peg(sbox): + "remove 'G/_@gamma' with pegrev escape" + do_remove(sbox, 'G/_@gamma', 'G/_@gamma@') + +def remove_subdir_4_escape_peg(sbox): + "remove 'D/.@delta' with pegrev escape" + do_remove(sbox, 'D/.@delta', 'D/.@delta@') + +def remove_subdir_5_escape_peg(sbox): + "remove 'B/pi@' with pegrev escape" + do_remove(sbox, 'B/pi@', 'B/pi@@') + +def remove_subdir_6_escape_peg(sbox): + "remove 'A/@omega@' with pegrev escape" + do_remove(sbox, 'A/@omega@', 'A/@omega@@') + +def remove_subdir_7_escape_peg(sbox): + "remove 'B/@' with pegrev escape" + do_remove(sbox, 'B/@', 'B/@@') + +def remove_subdir_7a_escape_peg(sbox): + "remove missing 'E/@' with pegrev escape" + do_remove(sbox, 'E/@', 'E/@@', r"svn: E200005: '.*[\\/]E[\\/]@'") + +def remove_subdir_7b_escape_peg(sbox): + "remove missing '@/@' with pegrev escape" + do_remove(sbox, '@/@@', '@/@@', r"svn: E200005: '.*[\\/]@[\\/]@'") + +#--------------------------------------------------------------------- + +def remove_subdir_1_no_escape_peg(sbox): + "remove 'A/alpha' without pegrev escape" + do_remove(sbox, 'A/alpha', 'A/alpha') + +@Wimp("The error message mentions 'B@beta' instead of 'B/@beta'") +@Wimp("The error message should be E125001") +def remove_subdir_2_no_escape_peg(sbox): + "remove 'B/@beta' without pegrev escape" + do_remove(sbox, 'B/@beta', 'B/@beta', r"svn: E200009: 'B[\\/]@beta'") + +def remove_subdir_3_no_escape_peg(sbox): + "remove 'G/_@gamma' without pegrev escape" + do_remove(sbox, 'G/_@gamma', 'G/_@gamma', r"svn: E200009: 'G[\\/]_@gamma'") + +@Wimp("The error message mentions 'D@delta' instead of 'D/.@delta'") +def remove_subdir_4_no_escape_peg(sbox): + "remove 'D/.@delta' without pegrev escape" + do_remove(sbox, 'D/.@delta', 'D/.@delta', "svn: E200009: 'D/.@delta'") + +# Skip tests 5 and 6 that remove a node with a trailing @ in the name +# because is correctly interpreted as a peg revision escape. This is already +# tested by: +# - remove_subdir_5_escape_peg +# - remove_subdir__escape_peg + +@Wimp("Removes B instead of reporting E125001 for B/@") +def remove_subdir_7_no_escape_peg(sbox): + "remove 'B/@' without pegrev escape" + do_remove(sbox, 'B/@', 'B/@') #, r"svn: E125001: 'B[\\/]@'") + +@Wimp("Removes E instead of reporting ENOENT or E125001 for E/@") +def remove_subdir_7a_no_escape_peg(sbox): + "remove missing 'E/@' without pegrev escape" + do_remove(sbox, 'E/@', 'E/@') #, r"svn: E125001: 'E[\\/]@'") + +@Wimp("Removes @ instead of reporting ENOENT or E125001 for @/@") +def remove_subdir_7b_no_escape_peg(sbox): + "remove missing '@/@' without pegrev escape" + do_remove(sbox, '@/@', '@/@') #, r"svn: E125001: '@[\\/]@'") + +#===================================================================== +# Test for 'svn move' to a subdirectory + +@Wimp("Rename creates 'E/@tau@' instead of '@/@tau'") +@Issue(4530) +def rename_to_subdir_2_dst_escape_peg(sbox): + "rename 'iota' to 'E/@tau with pegrev escape" + # NOTE: This rename succeeds, but creates E/@tau@ instead of E/@tau, even + # though it should strip away the pegrev escape from the target. + do_rename(sbox, 'iota', 'iota', 'E/@tau', 'E/@tau@') + +#--------------------------------------------------------------------- + +@Wimp("Rename creates 'E@tau' instead of failing") +@Issue(4530) +def rename_to_subdir_2_no_dst_escape_peg(sbox): + "rename 'iota' to 'E/@tau without pegrev escape" + # NOTE: This rename succeeds, but creates E@tau in the current directory, + # when instead it should fail with 'svn: E125001: ...'. + do_rename(sbox, 'iota', 'iota', 'E/@tau', 'E/@tau') ### 'svn: E200009: ' + + +######################################################################## +# Run the tests + +# list all tests here, starting with None: +test_list = [ None, + add_file_here_1_escape_peg, + add_file_here_2_escape_peg, + add_file_here_3_escape_peg, + add_file_here_4_escape_peg, + add_file_here_5_escape_peg, + add_file_here_6_escape_peg, + add_file_here_7_escape_peg, + + add_file_here_1_no_escape_peg, + add_file_here_2_no_escape_peg, + add_file_here_3_no_escape_peg, + add_file_here_4_no_escape_peg, + add_file_here_5_no_escape_peg, + add_file_here_6_no_escape_peg, + add_file_here_7_no_escape_peg, + + add_file_subdir_1_escape_peg, + add_file_subdir_2_escape_peg, + add_file_subdir_3_escape_peg, + add_file_subdir_4_escape_peg, + add_file_subdir_5_escape_peg, + add_file_subdir_6_escape_peg, + add_file_subdir_7_escape_peg, + + add_file_subdir_1_no_escape_peg, + add_file_subdir_2_no_escape_peg, + add_file_subdir_3_no_escape_peg, + add_file_subdir_4_no_escape_peg, + add_file_subdir_5_no_escape_peg, + add_file_subdir_6_no_escape_peg, + add_file_subdir_7_no_escape_peg, + + make_dir_here_1_escape_peg, + make_dir_here_2_escape_peg, + make_dir_here_3_escape_peg, + make_dir_here_4_escape_peg, + make_dir_here_5_escape_peg, + make_dir_here_6_escape_peg, + make_dir_here_7_escape_peg, + + make_dir_here_1_no_escape_peg, + make_dir_here_2_no_escape_peg, + make_dir_here_3_no_escape_peg, + make_dir_here_4_no_escape_peg, + # skipped: make_dir_here_5_no_escape_peg + # skipped: make_dir_here_6_no_escape_peg + make_dir_here_7_no_escape_peg, + + make_dir_subdir_1_escape_peg, + make_dir_subdir_2_escape_peg, + make_dir_subdir_3_escape_peg, + make_dir_subdir_4_escape_peg, + make_dir_subdir_5_escape_peg, + make_dir_subdir_6_escape_peg, + make_dir_subdir_7_escape_peg, + + make_dir_subdir_1_no_escape_peg, + make_dir_subdir_2_no_escape_peg, + make_dir_subdir_3_no_escape_peg, + make_dir_subdir_4_no_escape_peg, + # skipped: make_dir_subdir_5_no_escape_peg + # skipped: make_dir_subdir_6_no_escape_peg + make_dir_subdir_7_no_escape_peg, + + remove_here_1_escape_peg, + remove_here_2_escape_peg, + remove_here_3_escape_peg, + remove_here_4_escape_peg, + remove_here_5_escape_peg, + remove_here_6_escape_peg, + remove_here_7_escape_peg, + + remove_here_1_no_escape_peg, + remove_here_2_no_escape_peg, + remove_here_3_no_escape_peg, + remove_here_4_no_escape_peg, + remove_here_5_no_escape_peg, + remove_here_6_no_escape_peg, + remove_here_7_no_escape_peg, + + remove_subdir_1_escape_peg, + remove_subdir_2_escape_peg, + remove_subdir_3_escape_peg, + remove_subdir_4_escape_peg, + remove_subdir_5_escape_peg, + remove_subdir_6_escape_peg, + remove_subdir_7_escape_peg, + remove_subdir_7a_escape_peg, + remove_subdir_7b_escape_peg, + + remove_subdir_1_no_escape_peg, + remove_subdir_2_no_escape_peg, + remove_subdir_3_no_escape_peg, + remove_subdir_4_no_escape_peg, + # skipped: remove_subdir_5_no_escape_peg, + # skipped: remove_subdir_6_no_escape_peg, + remove_subdir_7_no_escape_peg, + remove_subdir_7a_no_escape_peg, + remove_subdir_7b_no_escape_peg, + + rename_to_subdir_2_dst_escape_peg, + rename_to_subdir_2_no_dst_escape_peg, + ] + +if __name__ == '__main__': + svntest.main.run_tests(test_list) + # NOTREACHED + + +### End of file. diff --git a/subversion/tests/cmdline/prop_tests.py b/subversion/tests/cmdline/prop_tests.py index 3709b20..ada2e09 100755 --- a/subversion/tests/cmdline/prop_tests.py +++ b/subversion/tests/cmdline/prop_tests.py @@ -1768,7 +1768,7 @@ def rm_of_replaced_file(sbox): 'proplist', '-v', mu_path + '@base') expected_output = svntest.verify.UnorderedRegexListOutput([ - 'Properties on', + 'Properties on.*', ' yellow', ' submarine', ' orange', diff --git a/subversion/tests/cmdline/revert_tests.py b/subversion/tests/cmdline/revert_tests.py index 39ce3c6..a092b48 100755 --- a/subversion/tests/cmdline/revert_tests.py +++ b/subversion/tests/cmdline/revert_tests.py @@ -46,6 +46,23 @@ Item = svntest.wc.StateItem ###################################################################### # Helpers +def expected_output_revert(reverted_paths, skipped_paths=[]): + return svntest.verify.UnorderedRegexListOutput( + ["Reverted '%s'\n" % re.escape(path) for path in reverted_paths] + + ["Skipped '%s'.*\n" % re.escape(path) for path in skipped_paths]) + +def run_and_verify_revert(targets, options=[], + reverted_paths=None, skipped_paths=[]): + """Run 'svn revert OPTIONS TARGETS'. Verify that the printed output matches + REVERTED_PATHS and SKIPPED_PATHS. If REVERTED_PATHS is None, it defaults + to TARGETS. + """ + if reverted_paths is None: + reverted_paths = targets + expected_output = expected_output_revert(reverted_paths, skipped_paths) + svntest.actions.run_and_verify_svn(expected_output, [], + *(['revert'] + options + targets)) + def revert_replacement_with_props(sbox, wc_copy): """Helper implementing the core of revert_{repos,wc}_to_wc_replace_with_props(). @@ -129,9 +146,7 @@ def revert_replacement_with_props(sbox, wc_copy): svntest.actions.run_and_verify_status(wc_dir, expected_status) expected_status.tweak('A/D/G/rho', status=' ', copied=None, wc_rev='2') - expected_output = ["Reverted '" + rho_path + "'\n"] - svntest.actions.run_and_verify_svn(expected_output, [], - 'revert', '-R', wc_dir) + run_and_verify_revert([wc_dir], ['-R'], [rho_path]) svntest.actions.run_and_verify_status(wc_dir, expected_status) # Check disk status @@ -356,8 +371,7 @@ def revert_replaced_file_without_props(sbox): svntest.actions.run_and_verify_status(wc_dir, expected_status) # revert file1 - svntest.actions.run_and_verify_svn(["Reverted '" + file1_path + "'\n"], - [], 'revert', file1_path) + run_and_verify_revert([file1_path]) # test that file1 really was reverted expected_status.tweak('file1', status=' ', wc_rev=2) @@ -402,10 +416,7 @@ def revert_moved_file(sbox): actions.run_and_verify_unquiet_status(wc_dir, expected_status) # svn revert iota - expected_stdout = ["Reverted '" + iota + "'\n"] - - actions.run_and_verify_svn2(expected_stdout, [], 0, 'revert', - iota) + run_and_verify_revert([iota]) # svn st expected_status.tweak('iota', status=' ', moved_to=None) @@ -644,9 +655,7 @@ def revert_propset__dir(sbox): wc_dir = sbox.wc_dir a_path = os.path.join(wc_dir, 'A') svntest.main.run_svn(None, 'propset', 'foo', 'x', a_path) - expected_output = re.escape("Reverted '" + a_path + "'") - svntest.actions.run_and_verify_svn(expected_output, [], "revert", - a_path) + run_and_verify_revert([a_path]) def revert_propset__file(sbox): "revert a simple propset on a file" @@ -655,9 +664,7 @@ def revert_propset__file(sbox): wc_dir = sbox.wc_dir iota_path = os.path.join(wc_dir, 'iota') svntest.main.run_svn(None, 'propset', 'foo', 'x', iota_path) - expected_output = re.escape("Reverted '" + iota_path + "'") - svntest.actions.run_and_verify_svn(expected_output, [], "revert", - iota_path) + run_and_verify_revert([iota_path]) def revert_propdel__dir(sbox): "revert a simple propdel on a dir" @@ -669,9 +676,7 @@ def revert_propdel__dir(sbox): svntest.main.run_svn(None, 'commit', '-m', 'ps', a_path) svntest.main.run_svn(None, 'propdel', 'foo', a_path) - expected_output = re.escape("Reverted '" + a_path + "'") - svntest.actions.run_and_verify_svn(expected_output, [], "revert", - a_path) + run_and_verify_revert([a_path]) def revert_propdel__file(sbox): "revert a simple propdel on a file" @@ -683,9 +688,7 @@ def revert_propdel__file(sbox): svntest.main.run_svn(None, 'commit', '-m', 'ps', iota_path) svntest.main.run_svn(None, 'propdel', 'foo', iota_path) - expected_output = re.escape("Reverted '" + iota_path + "'") - svntest.actions.run_and_verify_svn(expected_output, [], "revert", - iota_path) + run_and_verify_revert([iota_path]) def revert_replaced_with_history_file_1(sbox): "revert a committed replace-with-history == no-op" @@ -776,9 +779,7 @@ def status_of_missing_dir_after_revert(sbox): A_D_G_path = os.path.join(wc_dir, "A", "D", "G") svntest.actions.run_and_verify_svn(None, [], "rm", A_D_G_path) - expected_output = re.escape("Reverted '" + A_D_G_path + "'") - svntest.actions.run_and_verify_svn(expected_output, [], "revert", - A_D_G_path) + run_and_verify_revert([A_D_G_path]) expected_status = svntest.actions.get_virginal_state(wc_dir, 1) expected_status.tweak('A/D/G/rho', 'A/D/G/pi', 'A/D/G/tau', @@ -877,11 +878,7 @@ def status_of_missing_dir_after_revert_replaced_with_history_dir(sbox): revert_paths = [G_path] + [os.path.join(G_path, child) for child in ['alpha', 'beta', 'pi', 'rho', 'tau']] - expected_output = svntest.verify.UnorderedOutput([ - "Reverted '%s'\n" % path for path in revert_paths]) - - svntest.actions.run_and_verify_svn(expected_output, [], "revert", "-R", - G_path) + run_and_verify_revert([G_path], ["-R"], revert_paths) svntest.actions.run_and_verify_svn([], [], "status", wc_dir) @@ -947,12 +944,6 @@ def revert_tree_conflicts_in_updated_files(sbox): G2_tau = os.path.join(G2, 'tau') # Expectations - expected_output = svntest.verify.UnorderedOutput( - ["Reverted '%s'\n" % G_pi, - "Reverted '%s'\n" % G_rho, - "Reverted '%s'\n" % G_tau, - ]) - expected_status = svntest.actions.get_virginal_state(wc_dir, 2) expected_status.tweak('A/D/G/pi', status=' ') expected_status.remove('A/D/G/rho') @@ -965,23 +956,15 @@ def revert_tree_conflicts_in_updated_files(sbox): expected_disk.remove('A/D/G/tau') # Revert individually in wc - svntest.actions.run_and_verify_svn(expected_output, [], - 'revert', G_pi, G_rho, G_tau) + run_and_verify_revert([G_pi, G_rho, G_tau]) svntest.actions.run_and_verify_status(wc_dir, expected_status) svntest.actions.verify_disk(wc_dir, expected_disk) # Expectations - expected_output = svntest.verify.UnorderedOutput( - ["Reverted '%s'\n" % G2_pi, - "Reverted '%s'\n" % G2_rho, - "Reverted '%s'\n" % G2_tau, - ]) - expected_status.wc_dir = wc_dir_2 # Revert recursively in wc 2 - svntest.actions.run_and_verify_svn(expected_output, [], - 'revert', '-R', G2) + run_and_verify_revert([G2], ['-R'], [G2_pi, G2_rho, G2_tau]) svntest.actions.run_and_verify_status(wc_dir_2, expected_status) svntest.actions.verify_disk(wc_dir_2, expected_disk) @@ -1049,9 +1032,7 @@ def revert_child_of_copy(sbox): svntest.actions.run_and_verify_status(wc_dir, expected_status) # First revert removes text change, child is still copied - expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B/E2/beta')] - svntest.actions.run_and_verify_svn(expected_output, [], - 'revert', sbox.ospath('A/B/E2/beta')) + run_and_verify_revert(sbox.ospaths(['A/B/E2/beta'])) expected_status.tweak('A/B/E2/beta', status=' ') svntest.actions.run_and_verify_status(wc_dir, expected_status) @@ -1074,9 +1055,7 @@ def revert_non_recusive_after_delete(sbox): svntest.actions.run_and_verify_status(wc_dir, expected_status) # This appears to work but gets the op-depth wrong - expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B')] - svntest.actions.run_and_verify_svn(expected_output, [], - 'revert', sbox.ospath('A/B')) + run_and_verify_revert(sbox.ospaths(['A/B'])) expected_status.tweak('A/B', status=' ') svntest.actions.run_and_verify_status(wc_dir, expected_status) @@ -1086,9 +1065,7 @@ def revert_non_recusive_after_delete(sbox): svntest.actions.run_and_verify_status(wc_dir, expected_status) # Since the op-depth was wrong A/B/E erroneously remains deleted - expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B/E')] - svntest.actions.run_and_verify_svn(expected_output, [], - 'revert', sbox.ospath('A/B/E')) + run_and_verify_revert(sbox.ospaths(['A/B/E'])) expected_status.tweak('A/B/E', status=' ') svntest.actions.run_and_verify_status(wc_dir, expected_status) @@ -1134,17 +1111,13 @@ def revert_permissions_only(sbox): os.chmod(sbox.ospath('A/B/E/alpha'), svntest.main.S_ALL_READ) # read-only is_readonly(sbox.ospath('A/B/E/alpha')) - expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B/E/alpha')] - svntest.actions.run_and_verify_svn(expected_output, [], - 'revert', sbox.ospath('A/B/E/alpha')) + run_and_verify_revert(sbox.ospaths(['A/B/E/alpha'])) is_writable(sbox.ospath('A/B/E/alpha')) if svntest.main.is_posix_os(): os.chmod(sbox.ospath('A/B/E/beta'), svntest.main.S_ALL_RWX) # executable is_executable(sbox.ospath('A/B/E/beta')) - expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B/E/beta')] - svntest.actions.run_and_verify_svn(expected_output, [], - 'revert', sbox.ospath('A/B/E/beta')) + run_and_verify_revert(sbox.ospaths(['A/B/E/beta'])) is_non_executable(sbox.ospath('A/B/E/beta')) svntest.actions.run_and_verify_svn(None, [], @@ -1167,17 +1140,13 @@ def revert_permissions_only(sbox): os.chmod(sbox.ospath('A/B/E/alpha'), svntest.main.S_ALL_RW) # not read-only is_writable(sbox.ospath('A/B/E/alpha')) - expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B/E/alpha')] - svntest.actions.run_and_verify_svn(expected_output, [], - 'revert', sbox.ospath('A/B/E/alpha')) + run_and_verify_revert(sbox.ospaths(['A/B/E/alpha'])) is_readonly(sbox.ospath('A/B/E/alpha')) if svntest.main.is_posix_os(): os.chmod(sbox.ospath('A/B/E/beta'), svntest.main.S_ALL_RW) # not executable is_non_executable(sbox.ospath('A/B/E/beta')) - expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B/E/beta')] - svntest.actions.run_and_verify_svn(expected_output, [], - 'revert', sbox.ospath('A/B/E/beta')) + run_and_verify_revert(sbox.ospaths(['A/B/E/beta'])) is_executable(sbox.ospath('A/B/E/beta')) # copied file is always writeable @@ -1212,14 +1181,8 @@ def revert_copy_depth_files(sbox): }) svntest.actions.run_and_verify_status(wc_dir, expected_status) - expected_output = svntest.verify.UnorderedOutput([ - "Reverted '%s'\n" % sbox.ospath(path) for path in ['A/B/E2', - 'A/B/E2/alpha', - 'A/B/E2/beta']]) - - svntest.actions.run_and_verify_svn(expected_output, [], - 'revert', '--depth', 'files', - sbox.ospath('A/B/E2')) + run_and_verify_revert(sbox.ospaths(['A/B/E2']), ['--depth', 'files'], + sbox.ospaths(['A/B/E2', 'A/B/E2/alpha', 'A/B/E2/beta'])) expected_status.remove('A/B/E2', 'A/B/E2/alpha', 'A/B/E2/beta') svntest.actions.run_and_verify_status(wc_dir, expected_status) @@ -1242,12 +1205,8 @@ def revert_nested_add_depth_immediates(sbox): }) svntest.actions.run_and_verify_status(wc_dir, expected_status) - expected_output = svntest.verify.UnorderedOutput([ - "Reverted '%s'\n" % sbox.ospath(path) for path in ['A/X', 'A/X/Y']]) - - svntest.actions.run_and_verify_svn(expected_output, [], - 'revert', '--depth', 'immediates', - sbox.ospath('A/X')) + run_and_verify_revert(sbox.ospaths(['A/X']), ['--depth', 'immediates'], + sbox.ospaths(['A/X', 'A/X/Y'])) expected_status.remove('A/X', 'A/X/Y') svntest.actions.run_and_verify_status(wc_dir, expected_status) @@ -1299,9 +1258,7 @@ def revert_empty_actual(sbox): wc_dir = sbox.wc_dir # Non-recursive code path works - svntest.actions.run_and_verify_svn(["Reverted '%s'\n" % sbox.ospath('alpha')], - [], - 'revert', sbox.ospath('alpha')) + run_and_verify_revert(sbox.ospaths(['alpha'])) expected_status = svntest.actions.get_virginal_state(wc_dir, 2) svntest.actions.run_and_verify_status(wc_dir, expected_status) @@ -1316,9 +1273,7 @@ def revert_empty_actual_recursive(sbox): # Recursive code path fails, the superfluous actual node suppresses the # notification - svntest.actions.run_and_verify_svn(["Reverted '%s'\n" % sbox.ospath('alpha')], - [], - 'revert', '-R', sbox.ospath('alpha')) + run_and_verify_revert(sbox.ospaths(['alpha']), ['-R']) expected_status = svntest.actions.get_virginal_state(wc_dir, 2) svntest.actions.run_and_verify_status(wc_dir, expected_status) @@ -1433,7 +1388,7 @@ def revert_tree_conflicts_with_replacements(sbox): cd_and_status_u('A/D/H') # Revert everything (i.e., accept "theirs-full"). - svntest.actions.run_and_verify_revert([ + reverted_paths = [ wc('A/B/E'), wc('A/B/E/alpha'), # incoming & local wc('A/B/E/beta'), @@ -1450,7 +1405,8 @@ def revert_tree_conflicts_with_replacements(sbox): wc('A/D/H/loc_psi'), wc('A/D/gamma'), wc('A/mu'), - ], '-R', wc_dir) + ] + run_and_verify_revert([wc_dir], ['-R'], reverted_paths) # Remove a few unversioned files that revert left behind. os.remove(wc('A/B/E/loc_beta')) @@ -1511,10 +1467,7 @@ def revert_no_text_change_conflict(sbox): create_no_text_change_conflict(sbox) wc_dir = sbox.wc_dir - svntest.actions.run_and_verify_svn(["Reverted '%s'\n" - % sbox.ospath('A/B/E/alpha')], - [], - 'revert', sbox.ospath('A/B/E/alpha')) + run_and_verify_revert(sbox.ospaths(['A/B/E/alpha'])) expected_status = svntest.actions.get_virginal_state(wc_dir, 1) svntest.actions.run_and_verify_status(wc_dir, expected_status) @@ -1526,10 +1479,7 @@ def revert_no_text_change_conflict_recursive(sbox): create_no_text_change_conflict(sbox) wc_dir = sbox.wc_dir - svntest.actions.run_and_verify_svn(["Reverted '%s'\n" - % sbox.ospath('A/B/E/alpha')], - [], - 'revert', '-R', wc_dir) + run_and_verify_revert(sbox.ospaths(['A/B/E/alpha']), ['-R']) expected_status = svntest.actions.get_virginal_state(wc_dir, 1) svntest.actions.run_and_verify_status(wc_dir, expected_status) @@ -1550,20 +1500,18 @@ def revert_with_unversioned_targets(sbox): psi_contents = "modified psi\n" # touch delta - open(delta_path, 'w').write(delta_contents) + with open(delta_path, 'w') as f: + f.write(delta_contents) # modify chi psi - open(chi_path, 'w').write(chi_contents) - open(psi_path, 'w').write(psi_contents) + with open(chi_path, 'w') as f: + f.write(chi_contents) + with open(psi_path, 'w') as f: + f.write(psi_contents) # revert - expected_output = svntest.verify.UnorderedOutput([ - "Reverted '%s'\n" % sbox.ospath('A/D/H/chi'), - "Skipped '%s'\n" % sbox.ospath('A/D/H/delta'), - "Reverted '%s'\n" % sbox.ospath('A/D/H/psi'), - ]) - svntest.actions.run_and_verify_svn(expected_output, [], - 'revert', chi_path, delta_path, psi_path) + run_and_verify_revert([chi_path, delta_path, psi_path], [], + [chi_path, psi_path], [delta_path]) # verify status expected_status = svntest.actions.get_virginal_state(wc_dir, 1) @@ -1582,8 +1530,8 @@ def revert_with_unversioned_targets(sbox): def revert_nonexistent(sbox): 'svn revert -R nonexistent' sbox.build(read_only=True) - svntest.actions.run_and_verify_svn('Skipped.*nonexistent', [], - 'revert', '-R', sbox.ospath('nonexistent')) + run_and_verify_revert(sbox.ospaths(['nonexistent']), ['-R'], + [], sbox.ospaths(['nonexistent'])) @Issue(4168) def revert_obstructing_wc(sbox): @@ -1638,6 +1586,33 @@ def revert_moved_dir_partial(sbox): sbox.simple_move('A', 'A_') svntest.actions.run_and_verify_svn(None, [], 'revert', sbox.ospath('A')) +@XFail() +@Issue(4798) +def revert_remove_added(sbox): + "revert_remove_added" + + sbox.build(empty=True, read_only=True) + + # We'll test the items named with a '1' as direct targets to 'revert', + # and items named with a '2' as items found by recursion. + sbox.simple_mkdir('D1', 'D2') + sbox.simple_add_text('This is a new file.', + 'D1/file', 'file1', + 'D2/file', 'file2') + + run_and_verify_revert(sbox.ospaths(['D1']), ['--remove-added', '-R'], + sbox.ospaths(['D1/file', 'D1'])) + assert(not os.path.exists(sbox.ospath('D1'))) + + run_and_verify_revert(sbox.ospaths(['file1']), ['--remove-added'], + sbox.ospaths(['file1'])) + assert(not os.path.exists(sbox.ospath('file1'))) + + run_and_verify_revert(sbox.ospaths(['.']), ['--remove-added', '-R'], + sbox.ospaths(['D2/file', 'D2', 'file2'])) + assert(not os.path.exists(sbox.ospath('file2'))) + assert(not os.path.exists(sbox.ospath('D2'))) + ######################################################################## # Run the tests @@ -1680,6 +1655,7 @@ test_list = [ None, revert_nonexistent, revert_obstructing_wc, revert_moved_dir_partial, + revert_remove_added, ] if __name__ == '__main__': diff --git a/subversion/tests/cmdline/shelf_tests.py b/subversion/tests/cmdline/shelf_tests.py new file mode 100755 index 0000000..fe6108a --- /dev/null +++ b/subversion/tests/cmdline/shelf_tests.py @@ -0,0 +1,1012 @@ +#!/usr/bin/env python +# +# shelf_tests.py: testing shelving +# +# Subversion is a tool for revision control. +# See http://subversion.apache.org for more information. +# +# ==================================================================== +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +###################################################################### + +# General modules +import shutil, stat, re, os, logging + +logger = logging.getLogger() + +# Our testing module +import svntest +from svntest import wc +from svntest.verify import make_diff_header, make_no_diff_deleted_header, \ + make_git_diff_header, make_diff_prop_header, \ + make_diff_prop_val, make_diff_prop_deleted, \ + make_diff_prop_added, make_diff_prop_modified + +# (abbreviation) +Skip = svntest.testcase.Skip_deco +SkipUnless = svntest.testcase.SkipUnless_deco +XFail = svntest.testcase.XFail_deco +Issues = svntest.testcase.Issues_deco +Issue = svntest.testcase.Issue_deco +Wimp = svntest.testcase.Wimp_deco +Item = wc.StateItem + +#---------------------------------------------------------------------- + +def state_from_status(wc_dir, + v=True, u=True, q=True): + opts = () + if v: + opts += ('-v',) + if u: + opts += ('-u',) + if q: + opts += ('-q',) + _, output, _ = svntest.main.run_svn(None, 'status', wc_dir, *opts) + return svntest.wc.State.from_status(output, wc_dir) + +def get_wc_state(wc_dir): + """Return a description of the WC state. Include as much info as shelving + should be capable of restoring. + """ + return (state_from_status(wc_dir), + svntest.wc.State.from_wc(wc_dir, load_props=True), + ) + +def check_wc_state(wc_dir, expected): + """Check a description of the WC state. Include as much info as shelving + should be capable of restoring. + """ + expect_st, expect_wc = expected + actual_st, actual_wc = get_wc_state(wc_dir) + + # Verify actual status against expected status. + try: + expect_st.compare_and_display('status', actual_st) + except svntest.tree.SVNTreeError: + svntest.actions._log_tree_state("EXPECT STATUS TREE:", expect_st.old_tree(), + wc_dir) + svntest.actions._log_tree_state("ACTUAL STATUS TREE:", actual_st.old_tree(), + wc_dir) + raise + + # Verify actual WC against expected WC. + try: + expect_wc.compare_and_display('status', actual_wc) + except svntest.tree.SVNTreeError: + svntest.actions._log_tree_state("EXPECT WC TREE:", expect_wc.old_tree(), + wc_dir) + svntest.actions._log_tree_state("ACTUAL WC TREE:", actual_wc.old_tree(), + wc_dir) + raise + +def shelve_unshelve_verify(sbox, modifier, cannot_shelve=False): + """Round-trip: shelve; verify all changes are reverted; + unshelve; verify all changes are restored. + """ + + wc_dir = sbox.wc_dir + virginal_state = get_wc_state(wc_dir) + + # Make some changes to the working copy + modifier(sbox) + + # Save the modified state + modified_state = get_wc_state(wc_dir) + + if cannot_shelve: + svntest.actions.run_and_verify_svn(None, '.* could not be shelved.*', + 'x-shelve', 'foo') + return + + # Shelve; check there are no longer any modifications + svntest.actions.run_and_verify_svn(None, [], + 'x-shelve', 'foo') + check_wc_state(wc_dir, virginal_state) + + # List; ensure the shelf is listed + expected_output = svntest.verify.RegexListOutput( + [r'foo\s*version \d+.*', + r' ', + ]) + svntest.actions.run_and_verify_svn(expected_output, [], 'x-shelves') + + # Unshelve; check the original modifications are here again + svntest.actions.run_and_verify_svn(None, [], + 'x-unshelve', 'foo') + check_wc_state(wc_dir, modified_state) + +#---------------------------------------------------------------------- + +def shelve_unshelve(sbox, modifier, cannot_shelve=False): + """Round-trip: build 'sbox'; apply changes by calling 'modifier(sbox)'; + shelve and unshelve; verify changes are fully reverted and restored. + """ + + if not sbox.is_built(): + sbox.build() + was_cwd = os.getcwd() + os.chdir(sbox.wc_dir) + sbox.wc_dir = '' + + shelve_unshelve_verify(sbox, modifier, cannot_shelve) + + os.chdir(was_cwd) + +###################################################################### +# Tests +# +# Each test must return on success or raise on failure. + +def shelve_text_mods(sbox): + "shelve text mods" + + def modifier(sbox): + sbox.simple_append('A/mu', 'appended mu text') + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +def shelve_prop_changes(sbox): + "shelve prop changes" + + def modifier(sbox): + sbox.simple_propset('p', 'v', 'A') + sbox.simple_propset('p', 'v', 'A/mu') + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +def shelve_adds(sbox): + "shelve adds" + + def modifier(sbox): + sbox.simple_add_text('A new file\n', 'A/new') + sbox.simple_add_text('A new file\n', 'A/new2') + sbox.simple_propset('p', 'v', 'A/new2') + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +@Issue(4709) +def shelve_deletes(sbox): + "shelve deletes" + + def modifier(sbox): + sbox.simple_rm('A/mu') + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +def shelve_replace(sbox): + "shelve replace" + + def modifier(sbox): + sbox.simple_rm('A/mu') + sbox.simple_add_text('Replacement\n', 'A/mu') + sbox.simple_propset('p', 'v', 'A/mu') + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +def shelve_empty_adds(sbox): + "shelve empty adds" + sbox.build(empty=True) + + def modifier(sbox): + sbox.simple_add_text('', 'empty') + sbox.simple_add_text('', 'empty-with-prop') + sbox.simple_propset('p', 'v', 'empty-with-prop') + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +def shelve_empty_deletes(sbox): + "shelve empty deletes" + sbox.build(empty=True) + sbox.simple_add_text('', 'empty') + sbox.simple_add_text('', 'empty-with-prop') + sbox.simple_propset('p', 'v', 'empty-with-prop') + sbox.simple_commit() + + def modifier(sbox): + sbox.simple_rm('empty', 'empty-with-prop') + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +def shelve_from_inner_path(sbox): + "shelve from inner path" + + def modifier(sbox): + sbox.simple_append('A/mu', 'appended mu text') + + sbox.build() + was_cwd = os.getcwd() + os.chdir(sbox.ospath('A')) + sbox.wc_dir = '..' + + shelve_unshelve_verify(sbox, modifier) + + os.chdir(was_cwd) + +#---------------------------------------------------------------------- + +def save_revert_restore(sbox, modifier1, modifier2): + "Save 2 checkpoints; revert; restore 1st" + + sbox.build() + was_cwd = os.getcwd() + os.chdir(sbox.wc_dir) + sbox.wc_dir = '' + wc_dir = '' + + initial_state = get_wc_state(wc_dir) + + # Make some changes to the working copy + modifier1(sbox) + + # Remember the modified state + modified_state1 = get_wc_state(wc_dir) + + # Save a checkpoint; check nothing changed + svntest.actions.run_and_verify_svn(None, [], + 'x-shelf-save', 'foo') + check_wc_state(wc_dir, modified_state1) + + # Modify again; remember the state; save a checkpoint + modifier2(sbox) + modified_state2 = get_wc_state(wc_dir) + svntest.actions.run_and_verify_svn(None, [], + 'x-shelf-save', 'foo') + check_wc_state(wc_dir, modified_state2) + + # Revert + svntest.actions.run_and_verify_svn(None, [], + 'revert', '-R', '.') + check_wc_state(wc_dir, initial_state) + + # Restore; check the original modifications are here again + svntest.actions.run_and_verify_svn(None, [], + 'x-unshelve', 'foo', '1') + check_wc_state(wc_dir, modified_state1) + + os.chdir(was_cwd) + +#---------------------------------------------------------------------- + +def checkpoint_basic(sbox): + "checkpoint basic" + + def modifier1(sbox): + sbox.simple_append('A/mu', 'appended mu text\n') + + def modifier2(sbox): + sbox.simple_append('iota', 'appended iota text\n') + sbox.simple_append('A/mu', 'appended another line\n') + + save_revert_restore(sbox, modifier1, modifier2) + +#---------------------------------------------------------------------- + +@Issue(3747) +def shelve_mergeinfo(sbox): + "shelve mergeinfo" + + def modifier(sbox): + sbox.simple_propset('svn:mergeinfo', '/trunk/A:1-3,10', 'A') + sbox.simple_propset('svn:mergeinfo', '/trunk/A/mu:1-3,10', 'A/mu') + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +def unshelve_refuses_if_conflicts(sbox): + "unshelve refuses if conflicts" + + def modifier1(sbox): + sbox.simple_append('alpha', 'A-mod1\nB\nC\nD\n', truncate=True) + sbox.simple_append('beta', 'A-mod1\nB\nC\nD\n', truncate=True) + + def modifier2(sbox): + sbox.simple_append('beta', 'A-mod2\nB\nC\nD\n', truncate=True) + + sbox.build(empty=True) + was_cwd = os.getcwd() + os.chdir(sbox.wc_dir) + sbox.wc_dir = '' + wc_dir = '' + + sbox.simple_add_text('A\nB\nC\nD\n', 'alpha') + sbox.simple_add_text('A\nB\nC\nD\n', 'beta') + sbox.simple_commit() + initial_state = get_wc_state(wc_dir) + + # Make initial mods; remember this modified state + modifier1(sbox) + modified_state1 = get_wc_state(wc_dir) + assert modified_state1 != initial_state + + # Shelve; check there are no longer any local mods + svntest.actions.run_and_verify_svn(None, [], + 'x-shelve', 'foo') + check_wc_state(wc_dir, initial_state) + + # Make a different local mod that will conflict with the shelf + modifier2(sbox) + modified_state2 = get_wc_state(wc_dir) + + # Try to unshelve; check it fails with an error about a conflict + svntest.actions.run_and_verify_svn(None, '.*[Cc]onflict.*', + 'x-unshelve', 'foo') + # Check nothing changed in the attempt + check_wc_state(wc_dir, modified_state2) + +#---------------------------------------------------------------------- + +def shelve_binary_file_mod(sbox): + "shelve binary file mod" + + sbox.build(empty=True) + + existing_files = ['A/B/existing'] + mod_files = ['bin', 'A/B/bin'] + + sbox.simple_mkdir('A', 'A/B') + for f in existing_files + mod_files: + sbox.simple_add_text('\0\1\2\3\4\5', f) + sbox.simple_commit() + + def modifier(sbox): + for f in mod_files: + sbox.simple_append(f, '\6\5\4\3\2\1\0', truncate=True) + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +def shelve_binary_file_add(sbox): + "shelve binary file add" + + sbox.build(empty=True) + + existing_files = ['A/B/existing'] + mod_files = ['bin', 'A/B/bin'] + + sbox.simple_mkdir('A', 'A/B') + for f in existing_files: + sbox.simple_add_text('\0\1\2\3\4\5', f) + sbox.simple_commit() + + def modifier(sbox): + for f in mod_files: + sbox.simple_add_text('\0\1\2\3\4\5', f) + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +def shelve_binary_file_del(sbox): + "shelve binary file del" + + sbox.build(empty=True) + + existing_files = ['A/B/existing'] + mod_files = ['bin', 'A/B/bin'] + + sbox.simple_mkdir('A', 'A/B') + for f in existing_files + mod_files: + sbox.simple_add_text('\0\1\2\3\4\5', f) + sbox.simple_commit() + + def modifier(sbox): + for f in mod_files: + sbox.simple_rm(f) + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +def shelve_binary_file_replace(sbox): + "shelve binary file replace" + + sbox.build(empty=True) + + existing_files = ['A/B/existing'] + mod_files = ['bin', 'A/B/bin'] + + sbox.simple_mkdir('A', 'A/B') + for f in existing_files + mod_files: + sbox.simple_add_text('\0\1\2\3\4\5', f) + sbox.simple_commit() + + def modifier(sbox): + for f in mod_files: + sbox.simple_rm(f) + sbox.simple_add_text('\6\5\4\3\2\1\0', f) + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +def shelve_with_log_message(sbox): + "shelve with log message" + + sbox.build(empty=True) + was_cwd = os.getcwd() + os.chdir(sbox.wc_dir) + sbox.wc_dir = '' + + sbox.simple_add_text('New file', 'f') + log_message = 'Log message for foo' + svntest.actions.run_and_verify_svn(None, [], + 'x-shelve', 'foo', '-m', log_message) + expected_output = svntest.verify.RegexListOutput( + ['foo .*', + ' ' + log_message + ]) + svntest.actions.run_and_verify_svn(expected_output, [], + 'x-shelf-list') + + os.chdir(was_cwd) + +#---------------------------------------------------------------------- + +def run_and_verify_status(wc_dir_name, status_tree, changelists=[]): + """Run 'status' on WC_DIR_NAME and compare it with the + expected STATUS_TREE. + Returns on success, raises on failure.""" + + if not isinstance(status_tree, wc.State): + raise TypeError('wc.State tree expected') + + cl_opts = ('--cl=' + cl for cl in changelists) + exit_code, output, errput = svntest.main.run_svn(None, 'status', '-q', + wc_dir_name, *cl_opts) + + actual_status = svntest.wc.State.from_status(output, wc_dir=wc_dir_name) + + # Verify actual output against expected output. + try: + status_tree.compare_and_display('status', actual_status) + except svntest.tree.SVNTreeError: + svntest.actions._log_tree_state("ACTUAL STATUS TREE:", actual_status.old_tree(), + wc_dir_name) + raise + +def run_and_verify_shelf_status(wc_dir, expected_status, shelf): + run_and_verify_status(wc_dir, expected_status, + changelists=['svn:shelf:' + shelf]) + +def shelf_status(sbox): + "shelf status" + + sbox.build() + was_cwd = os.getcwd() + os.chdir(sbox.wc_dir) + sbox.wc_dir = '' + + sbox.simple_add_text('New file', 'f') + sbox.simple_append('iota', 'New text') + sbox.simple_propset('p', 'v', 'A/mu') + sbox.simple_rm('A/B/lambda') + # Not yet supported: + #sbox.simple_rm('A/B/E') + expected_status = state_from_status(sbox.wc_dir, v=False, u=False, q=False) + run_and_verify_status(sbox.wc_dir, expected_status) + + svntest.actions.run_and_verify_svn(None, [], + 'x-shelve', 'foo') + run_and_verify_shelf_status(sbox.wc_dir, expected_status, shelf='foo') + + os.chdir(was_cwd) + +#---------------------------------------------------------------------- + +@XFail() +def shelve_mkdir(sbox): + "shelve mkdir" + + sbox.build() + + def modifier(sbox): + sbox.simple_mkdir('D', 'D/D2') + sbox.simple_propset('p', 'v', 'D', 'D/D2') + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +def shelve_rmdir(sbox): + "shelve rmdir" + + sbox.build() + sbox.simple_propset('p', 'v', 'A/C') + sbox.simple_commit() + + def modifier(sbox): + sbox.simple_rm('A/C', 'A/D/G') + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +@XFail() +def shelve_replace_dir(sbox): + "shelve replace dir" + + sbox.build() + sbox.simple_propset('p', 'v', 'A/C') + sbox.simple_commit() + + def modifier(sbox): + sbox.simple_rm('A/C', 'A/D/G') + sbox.simple_mkdir('A/C', 'A/C/D2') + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +def shelve_file_copy(sbox): + "shelve file copy" + + sbox.build() + + def modifier(sbox): + sbox.simple_copy('iota', 'A/ii') + sbox.simple_propset('p', 'v', 'A/ii') + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +def shelve_dir_copy(sbox): + "shelve dir copy" + + sbox.build() + + def modifier(sbox): + sbox.simple_copy('A/B', 'BB') + sbox.simple_propset('p', 'v', 'BB') + + shelve_unshelve(sbox, modifier) + +#---------------------------------------------------------------------- + +def list_shelves(sbox): + "list_shelves" + + sbox.build() + was_cwd = os.getcwd() + os.chdir(sbox.wc_dir) + sbox.wc_dir = '' + + # an empty list + svntest.actions.run_and_verify_svn([], [], + 'x-shelf-list', '-q') + + # make two shelves + sbox.simple_append('A/mu', 'appended mu text') + svntest.actions.run_and_verify_svn(None, [], + 'x-shelf-save', 'foo') + sbox.simple_append('A/mu', 'appended more text') + svntest.actions.run_and_verify_svn(None, [], + 'x-shelf-save', 'foo', '-m', 'log msg') + svntest.actions.run_and_verify_svn(None, [], + 'x-shelf-save', 'bar', '-m', 'log msg') + + # We don't check for time-ordering of the shelves. If we want to do so, we + # would need to sleep for timestamps to differ, between creating them. + + # a quiet list + expected_out = svntest.verify.UnorderedRegexListOutput(['foo', 'bar']) + svntest.actions.run_and_verify_svn(expected_out, [], + 'x-shelf-list', '-q') + + # a detailed list + expected_out = svntest.verify.UnorderedRegexListOutput(['foo .* 1 path.*', + ' log msg', + 'bar .* 1 path.*', + ' log msg']) + svntest.actions.run_and_verify_svn(expected_out, [], + 'x-shelf-list') + + os.chdir(was_cwd) + +#---------------------------------------------------------------------- + +def refuse_to_shelve_conflict(sbox): + "refuse to shelve conflict" + + sbox.build(empty=True) + was_cwd = os.getcwd() + os.chdir(sbox.wc_dir) + sbox.wc_dir = '' + + # create a conflict + sbox.simple_mkdir('topdir') + sbox.simple_commit() + sbox.simple_update() + svntest.actions.run_and_verify_svn( + None, [], + 'merge', '-c1', '.', '--ignore-ancestry', '--accept', 'postpone') + # check that we did create a conflict + svntest.actions.run_and_verify_svn( + None, 'svn: E155035:.*conflict.*', + 'merge', '-c1', '.', '--ignore-ancestry', '--accept', 'postpone') + + # attempt to shelve + expected_err = "svn: E155015: .* '.*topdir' remains in conflict" + svntest.actions.run_and_verify_svn(None, expected_err, + 'x-shelf-save', 'foo') + + os.chdir(was_cwd) + +#---------------------------------------------------------------------- + +def unshelve_with_merge(sbox, setup, modifier1, modifier2, tweak_expected_state): + """Run a test scenario in which 'unshelve' needs to merge some shelved + changes made by modifier1() with some committed changes made by + modifier2(). tweak_expected_state() must produce the expected WC state. + """ + sbox.build() + was_cwd = os.getcwd() + os.chdir(sbox.wc_dir) + sbox.wc_dir = '' + wc_dir = sbox.wc_dir + + setup(sbox) + sbox.simple_commit() + initial_state = get_wc_state(wc_dir) + + # Make some changes to the working copy + modifier1(sbox) + modified_state = get_wc_state(wc_dir) + + # Shelve; check there are no longer any modifications + svntest.actions.run_and_verify_svn(None, [], + 'x-shelve', 'foo') + check_wc_state(wc_dir, initial_state) + + # Make a different change, with which we shall merge + modifier2(sbox) + sbox.simple_commit() + modified_state[0].tweak('A/mu', wc_rev='3') + + # Unshelve; check the expected result of the merge + svntest.actions.run_and_verify_svn(None, [], + 'x-unshelve', 'foo') + tweak_expected_state(modified_state) + check_wc_state(wc_dir, modified_state) + + os.chdir(was_cwd) + +@XFail() +def unshelve_text_mod_merge(sbox): + "unshelve text mod merge" + + orig_contents='A\nB\nC\nD\nE\n' + mod1_contents='A\nBB\nC\nD\nE\n' + mod2_contents='A\nB\nC\nDD\nE\n' + merged_contents='A\nBB\nC\nDD\nE\n' + + def setup(sbox): + sbox.simple_append('A/mu', orig_contents, truncate=True) + + def modifier1(sbox): + sbox.simple_append('A/mu', mod1_contents, truncate=True) + + def modifier2(sbox): + sbox.simple_append('A/mu', mod2_contents, truncate=True) + + def tweak_expected_state(modified_state): + modified_state[1].tweak('A/mu', contents=merged_contents) + + unshelve_with_merge(sbox, setup, modifier1, modifier2, tweak_expected_state) + +#---------------------------------------------------------------------- + +@XFail() +def unshelve_text_mod_conflict(sbox): + "unshelve text mod conflict" + + orig_contents='A\nB\nC\nD\nE\n' + mod1_contents='A\nBB\nC\nD\nE\n' + mod2_contents='A\nBCD\nC\nD\nE\n' + merged_contents = 'A\n<<<<<<< .working\nBCD\n||||||| .merge-left\nB\n=======\nBB\n>>>>>>> .merge-right\nC\nD\nE\n' + + def setup(sbox): + sbox.simple_append('A/mu', orig_contents, truncate=True) + + def modifier1(sbox): + sbox.simple_append('A/mu', mod1_contents, truncate=True) + + def modifier2(sbox): + sbox.simple_append('A/mu', mod2_contents, truncate=True) + + def tweak_expected_state(modified_state): + modified_state[0].tweak('A/mu', status='C ') + modified_state[1].tweak('A/mu', contents=merged_contents) + modified_state[1].add({ + 'A/mu.merge-left': Item(contents=orig_contents), + 'A/mu.merge-right': Item(contents=mod1_contents), + 'A/mu.working': Item(contents=mod2_contents), + }) + + unshelve_with_merge(sbox, setup, modifier1, modifier2, tweak_expected_state) + +#---------------------------------------------------------------------- + +@XFail() +def unshelve_undeclared_binary_mod_conflict(sbox): + "unshelve undeclared binary mod conflict" + + orig_contents='\1\2\3\4\5' + mod1_contents='\1\2\2\3\4\5' + mod2_contents='\1\2\3\4\3\4\5' + merged_contents = '<<<<<<< .working\n' + mod2_contents + '||||||| .merge-left\n' + orig_contents + '=======\n' + mod1_contents + '>>>>>>> .merge-right\n' + + def setup(sbox): + sbox.simple_append('A/mu', orig_contents, truncate=True) + + def modifier1(sbox): + sbox.simple_append('A/mu', mod1_contents, truncate=True) + + def modifier2(sbox): + sbox.simple_append('A/mu', mod2_contents, truncate=True) + + def tweak_expected_state(modified_state): + modified_state[0].tweak('A/mu', status='C ') + modified_state[1].tweak('A/mu', contents=merged_contents) + modified_state[1].add({ + 'A/mu.merge-left': Item(contents=orig_contents), + 'A/mu.merge-right': Item(contents=mod1_contents), + 'A/mu.working': Item(contents=mod2_contents), + }) + + unshelve_with_merge(sbox, setup, modifier1, modifier2, tweak_expected_state) + +#---------------------------------------------------------------------- + +@XFail() +def unshelve_binary_mod_conflict(sbox): + "unshelve binary mod conflict" + + orig_contents='\1\2\3\4\5' + mod1_contents='\1\2\2\3\4\5' + mod2_contents='\1\2\3\4\3\4\5' + + def setup(sbox): + sbox.simple_append('A/mu', orig_contents, truncate=True) + sbox.simple_propset('svn:mime-type', 'application/octet-stream', 'A/mu') + + def modifier1(sbox): + sbox.simple_append('A/mu', mod1_contents, truncate=True) + + def modifier2(sbox): + sbox.simple_append('A/mu', mod2_contents, truncate=True) + + def tweak_expected_state(modified_state): + modified_state[0].tweak('A/mu', status='C ') + modified_state[1].tweak('A/mu', contents=mod2_contents) + modified_state[1].add({ + 'A/mu.merge-left': Item(contents=orig_contents), + 'A/mu.merge-right': Item(contents=mod1_contents), + }) + + unshelve_with_merge(sbox, setup, modifier1, modifier2, tweak_expected_state) + +#---------------------------------------------------------------------- + +def unshelve_text_prop_merge(sbox): + "unshelve text prop merge" + + def setup(sbox): + sbox.simple_propset('p1', 'v', 'A/mu') + sbox.simple_propset('p2', 'v', 'A/mu') + + def modifier1(sbox): + sbox.simple_propset('p1', 'changed', 'A/mu') + + def modifier2(sbox): + sbox.simple_propset('p2', 'changed', 'A/mu') + + def tweak_expected_state(wc_state): + wc_state[1].tweak('A/mu', props={'p1':'changed', + 'p2':'changed'}) + + unshelve_with_merge(sbox, setup, modifier1, modifier2, tweak_expected_state) + +#---------------------------------------------------------------------- + +@XFail() +def unshelve_text_prop_conflict(sbox): + "unshelve text prop conflict" + + orig_contents='A' + mod1_contents='B' + mod2_contents='C' + merged_contents='C' + prej_contents='''Trying to change property 'p' +but the local property value conflicts with the incoming change. +<<<<<<< (local property value) +C||||||| (incoming 'changed from' value) +A======= +B>>>>>>> (incoming 'changed to' value) +''' + + def setup(sbox): + sbox.simple_propset('p', orig_contents, 'A/mu') + + def modifier1(sbox): + sbox.simple_propset('p', mod1_contents, 'A/mu') + + def modifier2(sbox): + sbox.simple_propset('p', mod2_contents, 'A/mu') + + def tweak_expected_state(wc_state): + wc_state[0].tweak('A/mu', status=' C') + wc_state[1].tweak('A/mu', props={'p':merged_contents}) + wc_state[1].add({ + 'A/mu.prej': Item(contents=prej_contents), + }) + + unshelve_with_merge(sbox, setup, modifier1, modifier2, tweak_expected_state) + +#---------------------------------------------------------------------- + +def run_and_verify_shelf_diff_summarize(output_tree, shelf, *args): + """Run 'svn shelf-diff --summarize' with the arguments *ARGS. + + The subcommand output will be verified against OUTPUT_TREE. Returns + on success, raises on failure. + """ + + if isinstance(output_tree, wc.State): + output_tree = output_tree.old_tree() + + exit_code, output, errput = svntest.actions.run_and_verify_svn( + None, [], + 'x-shelf-diff', '--summarize', shelf, *args) + + actual = svntest.tree.build_tree_from_diff_summarize(output) + + # Verify actual output against expected output. + try: + svntest.tree.compare_trees("output", actual, output_tree) + except svntest.tree.SVNTreeError: + svntest.verify.display_trees(None, 'DIFF OUTPUT TREE', output_tree, actual) + raise + +#---------------------------------------------------------------------- + +# Exercise a very basic case of shelf-diff. +def shelf_diff_simple(sbox): + "shelf diff simple" + + sbox.build() + was_cwd = os.getcwd() + os.chdir(sbox.wc_dir) + sbox.wc_dir = '' + wc_dir = sbox.wc_dir + + def setup(sbox): + sbox.simple_propset('p1', 'v', 'A/mu') + sbox.simple_propset('p2', 'v', 'A/mu') + + def modifier1(sbox): + sbox.simple_append('A/mu', 'New line.\n') + sbox.simple_propset('p1', 'changed', 'A/mu') + + setup(sbox) + sbox.simple_commit() + initial_state = get_wc_state(wc_dir) + + # Make some changes to the working copy + modifier1(sbox) + modified_state = get_wc_state(wc_dir) + + svntest.actions.run_and_verify_svn(None, [], + 'x-shelf-save', 'foo') + + # basic svn-style diff + expected_output = make_diff_header('A/mu', 'revision 2', 'working copy') + [ + "@@ -1 +1,2 @@\n", + " This is the file 'mu'.\n", + "+New line.\n", + ] + make_diff_prop_header('A/mu') \ + + make_diff_prop_modified('p1', 'v', 'changed') + svntest.actions.run_and_verify_svn(expected_output, [], + 'x-shelf-diff', 'foo') + + # basic summary diff + expected_diff = svntest.wc.State(wc_dir, { + 'A/mu': Item(status='MM'), + }) + run_and_verify_shelf_diff_summarize(expected_diff, 'foo') + +#---------------------------------------------------------------------- + +@XFail() +@Issue(4827) +def shelve_with_kw_translation(sbox): + "shelve with kw translation" + sbox.build(empty=True) + sbox.simple_add_text('$Rev$\n', 'file') + sbox.simple_propset('svn:keywords', 'rev', 'file') + sbox.simple_commit() + sbox.simple_update() + + def modifier(sbox): + sbox.simple_append('file', 'New line\n') + + shelve_unshelve(sbox, modifier) + + +######################################################################## +# Run the tests + +# list all tests here, starting with None: +test_list = [ None, + shelve_text_mods, + shelve_prop_changes, + shelve_adds, + shelve_deletes, + shelve_replace, + shelve_empty_adds, + shelve_empty_deletes, + shelve_from_inner_path, + checkpoint_basic, + shelve_mergeinfo, + unshelve_refuses_if_conflicts, + shelve_binary_file_mod, + shelve_binary_file_add, + shelve_binary_file_del, + shelve_binary_file_replace, + shelve_with_log_message, + shelf_status, + shelve_mkdir, + shelve_rmdir, + shelve_replace_dir, + shelve_file_copy, + shelve_dir_copy, + list_shelves, + refuse_to_shelve_conflict, + unshelve_text_mod_merge, + unshelve_text_mod_conflict, + unshelve_undeclared_binary_mod_conflict, + unshelve_binary_mod_conflict, + unshelve_text_prop_merge, + unshelve_text_prop_conflict, + shelf_diff_simple, + shelve_with_kw_translation, + ] + +if __name__ == '__main__': + svntest.main.run_tests(test_list) + # NOTREACHED + + +### End of file. diff --git a/subversion/tests/cmdline/shelve_tests.py b/subversion/tests/cmdline/shelve_tests.py deleted file mode 100755 index 4b48bfc..0000000 --- a/subversion/tests/cmdline/shelve_tests.py +++ /dev/null @@ -1,206 +0,0 @@ -#!/usr/bin/env python -# -# shelve_tests.py: testing shelving -# -# Subversion is a tool for revision control. -# See http://subversion.apache.org for more information. -# -# ==================================================================== -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -###################################################################### - -# General modules -import shutil, stat, re, os, sys, logging - -logger = logging.getLogger() - -# Our testing module -import svntest -from svntest import wc - -# (abbreviation) -Skip = svntest.testcase.Skip_deco -SkipUnless = svntest.testcase.SkipUnless_deco -XFail = svntest.testcase.XFail_deco -Issues = svntest.testcase.Issues_deco -Issue = svntest.testcase.Issue_deco -Wimp = svntest.testcase.Wimp_deco -Item = wc.StateItem - -#---------------------------------------------------------------------- - -def shelve_unshelve_verify(sbox, global_opts=()): - """Round-trip: shelve; verify all changes are reverted; - unshelve; verify all changes are restored. - """ - - wc_dir = sbox.wc_dir - - # Save the modified state - _, output, _ = svntest.main.run_svn(None, 'status', '-v', '-u', '-q', - wc_dir) - modified_state = svntest.wc.State.from_status(output, wc_dir) - - # Shelve; check there are no longer any modifications - svntest.actions.run_and_verify_svn(None, [], - 'shelve', 'foo', *global_opts) - virginal_state = svntest.actions.get_virginal_state(wc_dir, 1) - svntest.actions.run_and_verify_status(wc_dir, virginal_state) - - # Unshelve; check the original modifications are here again - svntest.actions.run_and_verify_svn(None, [], - 'unshelve', 'foo', *global_opts) - svntest.actions.run_and_verify_status(wc_dir, modified_state) - -#---------------------------------------------------------------------- - -def shelve_unshelve(sbox, modifier, global_opts=()): - """Round-trip: build 'sbox'; apply changes by calling 'modifier(sbox)'; - shelve and unshelve; verify changes are fully reverted and restored. - """ - - sbox.build() - was_cwd = os.getcwd() - os.chdir(sbox.wc_dir) - sbox.wc_dir = '' - - # Make some changes to the working copy - modifier(sbox) - - shelve_unshelve_verify(sbox, global_opts) - - os.chdir(was_cwd) - -###################################################################### -# Tests -# -# Each test must return on success or raise on failure. - -def shelve_text_mods(sbox): - "shelve text mods" - - def modifier(sbox): - sbox.simple_append('A/mu', 'appended mu text') - - shelve_unshelve(sbox, modifier) - -#---------------------------------------------------------------------- - -def shelve_prop_changes(sbox): - "shelve prop changes" - - def modifier(sbox): - sbox.simple_propset('p', 'v', 'A') - sbox.simple_propset('p', 'v', 'A/mu') - - shelve_unshelve(sbox, modifier) - -#---------------------------------------------------------------------- - -def shelve_adds(sbox): - "shelve adds" - - def modifier(sbox): - sbox.simple_append('A/new', 'A new file\n') - sbox.simple_add('A/new') - sbox.simple_append('A/new2', 'A new file\n') - sbox.simple_add('A/new2') - sbox.simple_propset('p', 'v', 'A/new2') - - shelve_unshelve(sbox, modifier) - -#---------------------------------------------------------------------- - -@XFail() -@Issue(4709) -def shelve_deletes(sbox): - "shelve deletes" - - def modifier(sbox): - sbox.simple_rm('A/mu') - - shelve_unshelve(sbox, modifier) - -#---------------------------------------------------------------------- - -def shelve_from_inner_path(sbox): - "shelve from inner path" - - def modifier(sbox): - sbox.simple_append('A/mu', 'appended mu text') - - sbox.build() - was_cwd = os.getcwd() - os.chdir(sbox.ospath('A')) - sbox.wc_dir = '..' - - modifier(sbox) - shelve_unshelve_verify(sbox) - - os.chdir(was_cwd) - -#---------------------------------------------------------------------- - -def shelve_ignores_external_diff(sbox): - "shelve ignores external diff" - - def modifier(sbox): - sbox.simple_append('A/mu', 'appended mu text') - - sbox.build() - was_cwd = os.getcwd() - os.chdir(sbox.ospath('A')) - sbox.wc_dir = '..' - - # Configure an external 'diff-cmd' that doesn't print a diff to stdout. - # (This path needs an explicit directory component to avoid searching.) - diff_script_path = os.path.join('.', 'diff') - svntest.main.create_python_hook_script(diff_script_path, 'import sys\n' - 'for arg in sys.argv[1:]:\n print(arg)\n') - if sys.platform == 'win32': - diff_script_path = "%s.bat" % diff_script_path - config_dir_path = sbox.get_tempname(prefix="config-dir") - os.mkdir(config_dir_path) - with open(os.path.join(config_dir_path, "config"), "w") as config_file: - config_file.write("[helpers]\n" - "diff-cmd = %s\n" % diff_script_path) - - modifier(sbox) - shelve_unshelve_verify(sbox, global_opts=("--config-dir", config_dir_path)) - - os.chdir(was_cwd) - -######################################################################## -# Run the tests - -# list all tests here, starting with None: -test_list = [ None, - shelve_text_mods, - shelve_prop_changes, - shelve_adds, - shelve_deletes, - shelve_from_inner_path, - shelve_ignores_external_diff, - ] - -if __name__ == '__main__': - svntest.main.run_tests(test_list) - # NOTREACHED - - -### End of file. diff --git a/subversion/tests/cmdline/special_tests.py b/subversion/tests/cmdline/special_tests.py index db612c1..2ec22cb 100755 --- a/subversion/tests/cmdline/special_tests.py +++ b/subversion/tests/cmdline/special_tests.py @@ -535,7 +535,7 @@ def diff_symlink_to_dir(sbox): "+++ link\t(working copy)\n", "@@ -0,0 +1 @@\n", "+link A/D\n", - "\ No newline at end of file\n", + "\\ No newline at end of file\n", "\n", "Property changes on: link\n", "___________________________________________________________________\n", @@ -730,7 +730,8 @@ def unrelated_changed_special_status(sbox): os.chdir(os.path.join(sbox.wc_dir, 'A/D/H')) - open('chi', 'a').write('random local mod') + with open('chi', 'a') as f: + f.write('random local mod') os.unlink('psi') os.symlink('omega', 'psi') # omega is versioned! svntest.main.run_svn(None, 'changelist', 'chi cl', 'chi') diff --git a/subversion/tests/cmdline/stat_tests.py b/subversion/tests/cmdline/stat_tests.py index afab961..e0f1306 100755 --- a/subversion/tests/cmdline/stat_tests.py +++ b/subversion/tests/cmdline/stat_tests.py @@ -1949,7 +1949,8 @@ def modified_modulo_translation(sbox): sbox.simple_commit() # CRLF it. - open(sbox.ospath('iota'), 'wb').write("This is the file 'iota'.\r\n") + with open(sbox.ospath('iota'), 'wb') as f: + f.write("This is the file 'iota'.\r\n") # Run status. Expect some output. # TODO: decide how such files should show in the output; whether they diff --git a/subversion/tests/cmdline/svnadmin_tests.py b/subversion/tests/cmdline/svnadmin_tests.py index 103bb11..bb71d3a 100755 --- a/subversion/tests/cmdline/svnadmin_tests.py +++ b/subversion/tests/cmdline/svnadmin_tests.py @@ -274,7 +274,8 @@ def patch_format(repo_dir, shard_size): new_contents = b"\n".join(processed_lines) os.chmod(format_path, svntest.main.S_ALL_RW) - open(format_path, 'wb').write(new_contents) + with open(format_path, 'wb') as f: + f.write(new_contents) def is_sharded(repo_dir): """Return whether the FSFS repository REPO_DIR is sharded.""" @@ -795,9 +796,13 @@ def verify_windows_paths_in_repos(sbox): def fsfs_file(repo_dir, kind, rev): if svntest.main.options.server_minor_version >= 5: if svntest.main.options.fsfs_sharding is None: + if svntest.main.is_fs_type_fsx(): + rev = 'r' + rev return os.path.join(repo_dir, 'db', kind, '0', rev) else: shard = int(rev) // svntest.main.options.fsfs_sharding + if svntest.main.is_fs_type_fsx(): + rev = 'r' + rev path = os.path.join(repo_dir, 'db', kind, str(shard), rev) if svntest.main.options.fsfs_packing is None or kind == 'revprops': @@ -1061,7 +1066,7 @@ def fsfs_recover_old_db_current(sbox): def load_with_parent_dir(sbox): "'svnadmin load --parent-dir' reparents mergeinfo" - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=2983. ## + ## See https://issues.apache.org/jira/browse/SVN-2983. ## sbox.build(empty=True) dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), @@ -1152,7 +1157,7 @@ def set_uuid(sbox): def reflect_dropped_renumbered_revs(sbox): "reflect dropped renumbered revs in svn:mergeinfo" - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=3020. ## + ## See https://issues.apache.org/jira/browse/SVN-3020. ## sbox.build(empty=True) @@ -1344,7 +1349,7 @@ def verify_with_invalid_revprops(sbox): # 2) Dump 'SOURCE-REPOS' in a series of incremental dumps and load # each of them to 'TARGET-REPOS'. # -# See http://subversion.tigris.org/issues/show_bug.cgi?id=3020#desc13 +# See https://issues.apache.org/jira/browse/SVN-3020#desc13 @Issue(3020) def dont_drop_valid_mergeinfo_during_incremental_loads(sbox): "don't filter mergeinfo revs from incremental dump" @@ -1530,7 +1535,7 @@ def dont_drop_valid_mergeinfo_during_incremental_loads(sbox): # Check the resulting mergeinfo. We expect the exact same results # as Part 3. - # See http://subversion.tigris.org/issues/show_bug.cgi?id=3020#desc16. + # See https://issues.apache.org/jira/browse/SVN-3020#desc16. svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url) @@ -1541,7 +1546,7 @@ def dont_drop_valid_mergeinfo_during_incremental_loads(sbox): def hotcopy_symlink(sbox): "'svnadmin hotcopy' replicates symlink" - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=2591. ## + ## See https://issues.apache.org/jira/browse/SVN-2591. ## # Create a repository. sbox.build(create_wc=False, empty=True) @@ -1647,9 +1652,9 @@ text sbox.build(empty=True) # Try to load the dumpstream, expecting a failure (because of mixed EOLs). - exp_err = svntest.verify.RegexListOutput(['svnadmin: E125005', - 'svnadmin: E125005', - 'svnadmin: E125017'], + exp_err = svntest.verify.RegexListOutput(['svnadmin: E125005:.*', + 'svnadmin: E125005:.*', + 'svnadmin: E125017:.*'], match_all=False) load_and_verify_dumpstream(sbox, [], exp_err, dumpfile_revisions, False, dump_str, '--ignore-uuid') @@ -1778,10 +1783,10 @@ def test_lslocks_and_rmlocks(sbox): def expected_output_list(path): return [ "Path: " + path, - "UUID Token: opaquelocktoken", + "UUID Token: opaquelocktoken:.*", "Owner: jrandom", - "Created:", - "Expires:", + "Created:.*", + "Expires:.*", "Comment \(1 line\):", "Locking files", "\n", # empty line @@ -1832,7 +1837,7 @@ def test_lslocks_and_rmlocks(sbox): def load_ranges(sbox): "'svnadmin load --revision X:Y'" - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=3734. ## + ## See https://issues.apache.org/jira/browse/SVN-3734. ## sbox.build(empty=True) dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), @@ -2183,7 +2188,7 @@ def verify_keep_going(sbox): sbox.repo_dir) if (svntest.main.is_fs_log_addressing()): - exp_out = svntest.verify.RegexListOutput([".*Verifying metadata at revision 0"]) + exp_out = svntest.verify.RegexListOutput([".*Verifying metadata at revision 0.*"]) else: exp_out = svntest.verify.RegexListOutput([".*Verified revision 0.", ".*Verified revision 1."]) @@ -2874,10 +2879,7 @@ def verify_quickly(sbox): "verify quickly using metadata" sbox.build(create_wc = False) - if svntest.main.is_fs_type_fsfs(): - rev_file = open(fsfs_file(sbox.repo_dir, 'revs', '1'), 'r+b') - else: - rev_file = open(fsfs_file(sbox.repo_dir, 'revs', 'r1'), 'r+b') + rev_file = open(fsfs_file(sbox.repo_dir, 'revs', '1'), 'r+b') # set new contents rev_file.seek(8) @@ -3476,7 +3478,8 @@ def load_from_file(sbox): sbox.build(empty=True) file = sbox.get_tempname() - open(file, 'wb').writelines(clean_dumpfile()) + with open(file, 'wb') as f: + f.writelines(clean_dumpfile()) svntest.actions.run_and_verify_svnadmin2(None, [], 0, 'load', '--file', file, '--ignore-uuid', sbox.repo_dir) @@ -3780,7 +3783,7 @@ def dump_exclude_all_rev_changes(sbox): # Check log. Revision properties ('svn:log' etc.) should be empty for r2. expected_output = svntest.verify.RegexListOutput([ '-+\\n', - 'r3\ |\ jrandom\ |\ .*\ |\ 1\ line\\n', + 'r3 | jrandom | .* | 1 line\\n', re.escape('Changed paths:'), re.escape(' A /r3a'), re.escape(' A /r3b'), @@ -3792,7 +3795,7 @@ def dump_exclude_all_rev_changes(sbox): '', '', '-+\\n', - 'r1\ |\ jrandom\ |\ .*\ |\ 1\ line\\n', + 'r1 | jrandom | .* | 1 line\\n', re.escape('Changed paths:'), re.escape(' A /r1a'), re.escape(' A /r1b'), @@ -3841,6 +3844,23 @@ def load_issue4725(sbox): sbox2.build(create_wc=False, empty=True) load_and_verify_dumpstream(sbox2, None, [], None, False, dump, '-M100') +@Issue(4767) +def dump_no_canonicalize_svndate(sbox): + "svnadmin dump shouldn't canonicalize svn:date" + + sbox.build(create_wc=False, empty=True) + svntest.actions.enable_revprop_changes(sbox.repo_dir) + + # set svn:date in a non-canonical format (not six decimal places) + propval = "2015-01-01T00:00:00.0Z" + svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [], + "propset", "--revprop", "-r0", "svn:date", + propval, + sbox.repo_url) + + dump_lines = svntest.actions.run_and_verify_dump(sbox.repo_dir) + assert propval + '\n' in dump_lines + def check_recover_prunes_rep_cache(sbox, enable_rep_sharing): """Check 'recover' prunes the rep-cache while enable-rep-sharing is true/false. @@ -4019,6 +4039,7 @@ test_list = [ None, dump_exclude_all_rev_changes, dump_invalid_filtering_option, load_issue4725, + dump_no_canonicalize_svndate, recover_prunes_rep_cache_when_enabled, recover_prunes_rep_cache_when_disabled, dump_include_copied_directory, diff --git a/subversion/tests/cmdline/svnauthz_tests.py b/subversion/tests/cmdline/svnauthz_tests.py index fb6318e..c050122 100755 --- a/subversion/tests/cmdline/svnauthz_tests.py +++ b/subversion/tests/cmdline/svnauthz_tests.py @@ -197,9 +197,8 @@ def svnauthz_validate_txn_test(sbox): svntest.main.create_python_hook_script(pre_commit_hook, hook_instance) svntest.main.file_append(authz_path, 'x') expected_status.tweak('A/authz', status=' ', wc_rev=4) - if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status) expected_data = svntest.verify.ExpectedOutput("Exit 2\n", match_all=False) verify_logfile(logfilepath, expected_data) @@ -275,9 +274,8 @@ def svnauthz_accessof_repo_test(sbox): expected_status.add({ 'A/authz' : Item(status=' ', wc_rev=2), }) - if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status) # Anonymous access with no path, and no repository should be rw # since it returns the highest level of access granted anywhere. @@ -967,7 +965,7 @@ def svnauthz_inverted_selector_test(sbox): os.remove(authz_path) -@Issue(4802) +@Issues(4802, 4803) def svnauthz_empty_group_test(sbox): "test empty group definition" @@ -986,12 +984,15 @@ def svnauthz_empty_group_test(sbox): (authz_fd, authz_path) = tempfile.mkstemp() svntest.main.file_write(authz_path, authz_content) + expected_stderr = svntest.verify.RegexOutput( + r".*warning: W220003:.*", match_all=False) + svntest.actions.run_and_verify_svnauthz( - [], None, 0, False, 'validate', authz_path) + [], expected_stderr, 0, False, 'validate', authz_path) svntest.actions.run_and_verify_svnauthz( - 'r', None, 0, False, 'accessof', - '--repository', 'A', '--username', 'user', authz_path) + 'r', expected_stderr, 0, False, 'accessof', + '--repository', 'A', '--username', 'user', authz_path) ######################################################################## diff --git a/subversion/tests/cmdline/svndumpfilter_tests.py b/subversion/tests/cmdline/svndumpfilter_tests.py index 7ee09a4..a45b50b 100755 --- a/subversion/tests/cmdline/svndumpfilter_tests.py +++ b/subversion/tests/cmdline/svndumpfilter_tests.py @@ -83,7 +83,7 @@ def filter_and_return_output(dump, bufsize=0, *varargs): def reflect_dropped_renumbered_revs(sbox): "reflect dropped renumbered revs in svn:mergeinfo" - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=2982. ## + ## See https://issues.apache.org/jira/browse/SVN-2982. ## # Test svndumpfilter with include option sbox.build(empty=True) @@ -134,7 +134,7 @@ def svndumpfilter_loses_mergeinfo(sbox): "svndumpfilter loses mergeinfo" #svndumpfilter loses mergeinfo if invoked without --renumber-revs - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=3181. ## + ## See https://issues.apache.org/jira/browse/SVN-3181. ## sbox.build(empty=True) dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), @@ -217,7 +217,7 @@ def _simple_dumpfilter_test(sbox, dumpfile, *dumpargs): @Issue(2697) def dumpfilter_with_targets(sbox): "svndumpfilter --targets blah" - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=2697. ## + ## See https://issues.apache.org/jira/browse/SVN-2697. ## sbox.build(empty=True) @@ -677,7 +677,7 @@ def accepts_deltas(sbox): @Issue(4234) def dumpfilter_targets_expect_leading_slash_prefixes(sbox): "dumpfilter targets expect leading '/' in prefixes" - ## See http://subversion.tigris.org/issues/show_bug.cgi?id=4234. ## + ## See https://issues.apache.org/jira/browse/SVN-4234. ## sbox.build(empty=True) diff --git a/subversion/tests/cmdline/svnfsfs_tests.py b/subversion/tests/cmdline/svnfsfs_tests.py index e1fd73d..aff3c2f 100755 --- a/subversion/tests/cmdline/svnfsfs_tests.py +++ b/subversion/tests/cmdline/svnfsfs_tests.py @@ -94,7 +94,8 @@ def patch_format(repo_dir, shard_size): new_contents = b"\n".join(processed_lines) os.chmod(format_path, svntest.main.S_ALL_RW) - open(format_path, 'wb').write(new_contents) + with open(format_path, 'wb') as f: + f.write(new_contents) ###################################################################### # Tests diff --git a/subversion/tests/cmdline/svnmover_tests.py b/subversion/tests/cmdline/svnmover_tests.py index bfdbb1f..6c98b64 100755 --- a/subversion/tests/cmdline/svnmover_tests.py +++ b/subversion/tests/cmdline/svnmover_tests.py @@ -469,7 +469,7 @@ rm A/B/C/Y ' D /top0/A/B/C/Y', ])) expected_output = svntest.verify.UnorderedRegexListOutput(escaped - + ['^-', '^r2', '^-', '^Changed paths:',]) + + ['^--*', '^r2.*', '^--*', '^Changed paths:',]) svntest.actions.run_and_verify_svn(expected_output, [], 'log', '-qvr2', repo_url) @@ -755,7 +755,7 @@ def simple_moves_within_a_branch(sbox): 'mv lib/foo/y2 y2') # move and rename, dir with children test_svnmover2(sbox, '/trunk', - reported_br_diff('') + + reported_br_diff('trunk') + reported_add('subdir') + reported_move('lib', 'subdir/lib2'), 'mkdir subdir', @@ -765,7 +765,7 @@ def simple_moves_within_a_branch(sbox): # moves and renames together # (put it all back to how it was, in one commit) test_svnmover2(sbox, '/trunk', - reported_br_diff('') + + reported_br_diff('trunk') + reported_move('subdir/lib2/README.txt', 'README') + reported_move('subdir/lib2', 'lib') + reported_move('y2', 'lib/foo/y') + diff --git a/subversion/tests/cmdline/svnmucc_tests.py b/subversion/tests/cmdline/svnmucc_tests.py index f95c558..3159ec2 100755 --- a/subversion/tests/cmdline/svnmucc_tests.py +++ b/subversion/tests/cmdline/svnmucc_tests.py @@ -458,7 +458,7 @@ rm A/B/C/Y ' D /A/B/C/Y', ])) expected_output = svntest.verify.UnorderedRegexListOutput(excaped - + ['^-', '^r3', '^-', '^Changed paths:',]) + + ['^--*', '^r3.*', '^--*', '^Changed paths:',]) svntest.actions.run_and_verify_svn(expected_output, [], 'log', '-qvr3', repo_url) diff --git a/subversion/tests/cmdline/svnrdump_tests.py b/subversion/tests/cmdline/svnrdump_tests.py index ae6a7e0..4393db7 100755 --- a/subversion/tests/cmdline/svnrdump_tests.py +++ b/subversion/tests/cmdline/svnrdump_tests.py @@ -80,7 +80,54 @@ def compare_repos_dumps(sbox, other_dumpfile, ### This call kind-of assumes EXPECTED is first and ACTUAL is second. svntest.verify.compare_dump_files( - "Dump files", "DUMP", other_dumpfile, sbox_dumpfile) + None, None, other_dumpfile, sbox_dumpfile) + +def run_and_verify_svnrdump_dump(dumpfile, + expected_stdout, + expected_stderr, + expected_exit, + *varargs): + """Run 'svnrdump dump'. + Verify the results against EXPECTED_*. + DUMPFILE is a filename to write to, or None to return the dump as a + list of strings. + """ + if dumpfile: + varargs += ('--file=' + dumpfile,) + exp_stdout = None + else: + exp_stdout = expected_stdout + output = svntest.actions.run_and_verify_svnrdump( + None, + exp_stdout, + expected_stderr, + expected_exit, + 'dump', + *varargs) + if not dumpfile: + return output + +def run_and_verify_svnrdump_load(dumpfile, + expected_stdout, + expected_stderr, + expected_exit, + *varargs): + """Run 'svnrdump load' to load a dumpfile. + Verify the results against EXPECTED_*. + DUMPFILE is a filename or the dump content as a list of strings. + """ + if isinstance(dumpfile, list): + dumpfile_content = dumpfile + else: + dumpfile_content = None + varargs += ('--file=' + dumpfile,) + svntest.actions.run_and_verify_svnrdump( + dumpfile_content, + expected_stdout, + expected_stderr, + expected_exit, + 'load', + *varargs) def run_dump_test(sbox, dumpfile_name, expected_dumpfile_name = None, subdir = None, bypass_prop_validation = False, @@ -112,10 +159,11 @@ def run_dump_test(sbox, dumpfile_name, expected_dumpfile_name = None, repo_url = repo_url + subdir # Create a dump file using svnrdump - opts = extra_options + ['-q', 'dump', repo_url] + opts = extra_options + ['-q', repo_url] svnrdump_dumpfile = \ - svntest.actions.run_and_verify_svnrdump(None, svntest.verify.AnyOutput, - [], 0, *opts) + run_and_verify_svnrdump_dump(None, + svntest.verify.AnyOutput, [], 0, + *opts) if expected_dumpfile_name: expected_dumpfile = open(os.path.join(svnrdump_tests_dir, @@ -170,9 +218,9 @@ def run_load_test(sbox, dumpfile_name, expected_dumpfile_name = None, 'setuuid', sbox.repo_dir, uuid) - svntest.actions.run_and_verify_svnrdump(original_dumpfile, - svntest.verify.AnyOutput, - [], 0, 'load', sbox.repo_url) + run_and_verify_svnrdump_load(original_dumpfile, + svntest.verify.AnyOutput, + [], 0, sbox.repo_url) # Re-dump the rdump-loaded repo using svnadmin dump resulted_dumpfile = svntest.actions.run_and_verify_dump(sbox.repo_dir, @@ -199,9 +247,9 @@ def basic_dump(sbox): sbox.build(read_only = True, create_wc = False) out = \ - svntest.actions.run_and_verify_svnrdump(None, svntest.verify.AnyOutput, - [], 0, '-q', 'dump', - sbox.repo_url) + run_and_verify_svnrdump_dump(None, + svntest.verify.AnyOutput, [], 0, + '-q', sbox.repo_url) if not out[0].startswith(b'SVN-fs-dump-format-version:'): raise svntest.Failure('No valid output') @@ -408,17 +456,14 @@ def reflect_dropped_renumbered_revs(sbox): # Load the specified dump file into the sbox repository using # svnrdump load - dump_file = open(os.path.join(os.path.dirname(sys.argv[0]), - 'svnrdump_tests_data', - 'with_merges.dump'), - 'rb') - svnrdump_dumpfile = dump_file.readlines() - dump_file.close() + dump_file = os.path.join(os.path.dirname(sys.argv[0]), + 'svnrdump_tests_data', + 'with_merges.dump') # svnrdump load the dump file. - svntest.actions.run_and_verify_svnrdump(svnrdump_dumpfile, - svntest.verify.AnyOutput, - [], 0, 'load', sbox.repo_url) + run_and_verify_svnrdump_load(dump_file, + svntest.verify.AnyOutput, [], 0, + sbox.repo_url) # Create the 'toplevel' directory in repository and then load the same # dumpfile into that subtree. @@ -426,10 +471,9 @@ def reflect_dropped_renumbered_revs(sbox): 'Committed revision 10.\n'], [], "mkdir", sbox.repo_url + "/toplevel", "-m", "Create toplevel dir to load into") - svntest.actions.run_and_verify_svnrdump(svnrdump_dumpfile, - svntest.verify.AnyOutput, - [], 0, 'load', - sbox.repo_url + "/toplevel") + run_and_verify_svnrdump_load(dump_file, + svntest.verify.AnyOutput, [], 0, + sbox.repo_url + "/toplevel") # Verify the svn:mergeinfo properties url = sbox.repo_url expected_output = svntest.verify.UnorderedOutput([ @@ -455,7 +499,7 @@ def reflect_dropped_renumbered_revs(sbox): # 2) Dump 'SOURCE-REPOS' in a series of incremental dumps and load # each of them to 'TARGET-REPOS'. # -# See http://subversion.tigris.org/issues/show_bug.cgi?id=3020#desc13 +# See https://issues.apache.org/jira/browse/SVN-3020#desc13 # # This test replicates svnadmin_tests.py 20 'don't filter mergeinfo revs # from incremental dump' but uses 'svnrdump [dump|load]' in place of @@ -515,16 +559,13 @@ def dont_drop_valid_mergeinfo_during_incremental_svnrdump_loads(sbox): # Properties on 'branches/B2': # svn:mergeinfo # /trunk:9 - dump_fp = open(os.path.join(os.path.dirname(sys.argv[0]), - 'svnrdump_tests_data', - 'mergeinfo_included_full.dump'), - 'rb') - dumpfile_full = dump_fp.readlines() - dump_fp.close() + dumpfile_full = os.path.join(os.path.dirname(sys.argv[0]), + 'svnrdump_tests_data', + 'mergeinfo_included_full.dump') - svntest.actions.run_and_verify_svnrdump(dumpfile_full, - svntest.verify.AnyOutput, - [], 0, 'load', sbox.repo_url) + run_and_verify_svnrdump_load(dumpfile_full, + svntest.verify.AnyOutput, [], 0, + sbox.repo_url) # Check that the mergeinfo is as expected. url = sbox.repo_url + '/branches/' @@ -542,33 +583,22 @@ def dont_drop_valid_mergeinfo_during_incremental_svnrdump_loads(sbox): # # Incrementally dump the repository into three dump files: dump_file_r1_10 = sbox.get_tempname("r1-10-dump") - output = svntest.actions.run_and_verify_svnrdump(None, - svntest.verify.AnyOutput, - [], 0, '-q', 'dump', '-r1:10', - sbox.repo_url) - dump_fp = open(dump_file_r1_10, 'wb') - dump_fp.writelines(output) - dump_fp.close() + run_and_verify_svnrdump_dump(dump_file_r1_10, + svntest.verify.AnyOutput, [], 0, + '-q', '-r1:10', + sbox.repo_url) dump_file_r11_13 = sbox.get_tempname("r11-13-dump") - output = svntest.actions.run_and_verify_svnrdump(None, - svntest.verify.AnyOutput, - [], 0, '-q', 'dump', - '--incremental', '-r11:13', - sbox.repo_url) - dump_fp = open(dump_file_r11_13, 'wb') - dump_fp.writelines(output) - dump_fp.close() + run_and_verify_svnrdump_dump(dump_file_r11_13, + svntest.verify.AnyOutput, [], 0, + '-q', '--incremental', '-r11:13', + sbox.repo_url) dump_file_r14_15 = sbox.get_tempname("r14-15-dump") - output = svntest.actions.run_and_verify_svnrdump(None, - svntest.verify.AnyOutput, - [], 0, '-q', 'dump', - '--incremental', '-r14:15', - sbox.repo_url) - dump_fp = open(dump_file_r14_15, 'wb') - dump_fp.writelines(output) - dump_fp.close() + run_and_verify_svnrdump_dump(dump_file_r14_15, + svntest.verify.AnyOutput, [], 0, + '-q', '--incremental', '-r14:15', + sbox.repo_url) # Blow away the current repos and create an empty one in its place. svntest.main.safe_rmtree(sbox.repo_dir, True) # Fix race with bdb in svnserve @@ -578,21 +608,15 @@ def dont_drop_valid_mergeinfo_during_incremental_svnrdump_loads(sbox): svntest.actions.enable_revprop_changes(sbox.repo_dir) # Load the three incremental dump files in sequence. - dump_fp = open(dump_file_r1_10, 'rb') - svntest.actions.run_and_verify_svnrdump(dump_fp.readlines(), - svntest.verify.AnyOutput, - [], 0, 'load', sbox.repo_url) - dump_fp.close() - dump_fp = open(dump_file_r11_13, 'rb') - svntest.actions.run_and_verify_svnrdump(dump_fp.readlines(), - svntest.verify.AnyOutput, - [], 0, 'load', sbox.repo_url) - dump_fp.close() - dump_fp = open(dump_file_r14_15, 'rb') - svntest.actions.run_and_verify_svnrdump(dump_fp.readlines(), - svntest.verify.AnyOutput, - [], 0, 'load', sbox.repo_url) - dump_fp.close() + run_and_verify_svnrdump_load(dump_file_r1_10, + svntest.verify.AnyOutput, [], 0, + sbox.repo_url) + run_and_verify_svnrdump_load(dump_file_r11_13, + svntest.verify.AnyOutput, [], 0, + sbox.repo_url) + run_and_verify_svnrdump_load(dump_file_r14_15, + svntest.verify.AnyOutput, [], 0, + sbox.repo_url) # Check the mergeinfo, we use the same expected output as before, # as it (duh!) should be exactly the same as when we loaded the @@ -622,21 +646,17 @@ def dont_drop_valid_mergeinfo_during_incremental_svnrdump_loads(sbox): # Project-Z (Added r5) # docs/ (Added r6) # README (Added r6) - dump_fp = open(os.path.join(os.path.dirname(sys.argv[0]), - 'svnrdump_tests_data', - 'skeleton.dump'), - 'rb') - dumpfile_skeleton = dump_fp.readlines() - dump_fp.close() - svntest.actions.run_and_verify_svnrdump(dumpfile_skeleton, - svntest.verify.AnyOutput, - [], 0, 'load', sbox.repo_url) + dumpfile_skeleton = os.path.join(os.path.dirname(sys.argv[0]), + 'svnrdump_tests_data', + 'skeleton.dump') + run_and_verify_svnrdump_load(dumpfile_skeleton, + svntest.verify.AnyOutput, [], 0, + sbox.repo_url) # Load 'svnadmin_tests_data/mergeinfo_included_full.dump' in one shot: - svntest.actions.run_and_verify_svnrdump(dumpfile_full, - svntest.verify.AnyOutput, - [], 0, 'load', - sbox.repo_url + '/Projects/Project-X') + run_and_verify_svnrdump_load(dumpfile_full, + svntest.verify.AnyOutput, [], 0, + sbox.repo_url + '/Projects/Project-X') # Check that the mergeinfo is as expected. This is exactly the # same expected mergeinfo we previously checked, except that the @@ -676,35 +696,26 @@ def dont_drop_valid_mergeinfo_during_incremental_svnrdump_loads(sbox): svntest.actions.enable_revprop_changes(sbox.repo_dir) # Load the skeleton repos into the empty target: - svntest.actions.run_and_verify_svnrdump(dumpfile_skeleton, - svntest.verify.AnyOutput, - [], 0, 'load', sbox.repo_url) + run_and_verify_svnrdump_load(dumpfile_skeleton, + svntest.verify.AnyOutput, [], 0, + sbox.repo_url) # Load the three incremental dump files in sequence. # # The first load fails the same as PART 3. - dump_fp = open(dump_file_r1_10, 'rb') - svntest.actions.run_and_verify_svnrdump(dump_fp.readlines(), - svntest.verify.AnyOutput, - [], 0, 'load', - sbox.repo_url + '/Projects/Project-X') - dump_fp.close() - dump_fp = open(dump_file_r11_13, 'rb') - svntest.actions.run_and_verify_svnrdump(dump_fp.readlines(), - svntest.verify.AnyOutput, - [], 0, 'load', - sbox.repo_url + '/Projects/Project-X') - dump_fp.close() - dump_fp = open(dump_file_r14_15, 'rb') - svntest.actions.run_and_verify_svnrdump(dump_fp.readlines(), - svntest.verify.AnyOutput, - [], 0, 'load', - sbox.repo_url + '/Projects/Project-X') - dump_fp.close() + run_and_verify_svnrdump_load(dump_file_r1_10, + svntest.verify.AnyOutput, [], 0, + sbox.repo_url + '/Projects/Project-X') + run_and_verify_svnrdump_load(dump_file_r11_13, + svntest.verify.AnyOutput, [], 0, + sbox.repo_url + '/Projects/Project-X') + run_and_verify_svnrdump_load(dump_file_r14_15, + svntest.verify.AnyOutput, [], 0, + sbox.repo_url + '/Projects/Project-X') # Check the resulting mergeinfo. We expect the exact same results # as Part 3. - # See http://subversion.tigris.org/issues/show_bug.cgi?id=3020#desc16. + # See https://issues.apache.org/jira/browse/SVN-3020#desc16. svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url) @@ -729,15 +740,12 @@ def svnrdump_load_partial_incremental_dump(sbox): # Load the specified dump file into the sbox repository using # svnrdump load - dump_file = open(os.path.join(os.path.dirname(sys.argv[0]), - 'svnrdump_tests_data', - 'partial_incremental.dump'), - 'rb') - svnrdump_dumpfile = dump_file.readlines() - dump_file.close() - svntest.actions.run_and_verify_svnrdump(svnrdump_dumpfile, - svntest.verify.AnyOutput, - [], 0, 'load', sbox.repo_url) + dump_file = os.path.join(os.path.dirname(sys.argv[0]), + 'svnrdump_tests_data', + 'partial_incremental.dump') + run_and_verify_svnrdump_load(dump_file, + svntest.verify.AnyOutput, [], 0, + sbox.repo_url) #---------------------------------------------------------------------- @@ -789,9 +797,9 @@ def load_prop_change_in_non_deltas_dump(sbox): # Try to load that dump. sbox.build(create_wc=False, empty=True) svntest.actions.enable_revprop_changes(sbox.repo_dir) - svntest.actions.run_and_verify_svnrdump(dump, - [], [], 0, - '-q', 'load', sbox.repo_url) + run_and_verify_svnrdump_load(dump, + [], [], 0, + '-q', sbox.repo_url) #---------------------------------------------------------------------- @@ -852,9 +860,9 @@ def load_non_deltas_copy_with_props(sbox): new_repo_dir, new_repo_url = sbox.add_repo_path('new_repo') svntest.main.create_repos(new_repo_dir) svntest.actions.enable_revprop_changes(new_repo_dir) - svntest.actions.run_and_verify_svnrdump(dumpfile, - svntest.verify.AnyOutput, - [], 0, 'load', new_repo_url) + run_and_verify_svnrdump_load(dumpfile, + svntest.verify.AnyOutput, [], 0, + new_repo_url) # Check that property 'p' really was deleted on each copied node for tgt_path in ['A/mu_COPY', 'A/B_COPY', 'A/B_COPY/E', @@ -899,9 +907,9 @@ def load_non_deltas_replace_copy_with_props(sbox): new_repo_dir, new_repo_url = sbox.add_repo_path('new_repo') svntest.main.create_repos(new_repo_dir) svntest.actions.enable_revprop_changes(new_repo_dir) - svntest.actions.run_and_verify_svnrdump(dumpfile, - svntest.verify.AnyOutput, - [], 0, 'load', new_repo_url) + run_and_verify_svnrdump_load(dumpfile, + svntest.verify.AnyOutput, [], 0, + new_repo_url) # Check that property 'p' really was deleted on each copied node # This used to fail, finding that property 'p' was still present @@ -928,9 +936,10 @@ def dump_replace_with_copy(sbox): sbox.simple_commit() # Dump with 'svnrdump' - dumpfile = svntest.actions.run_and_verify_svnrdump( - None, svntest.verify.AnyOutput, [], 0, - 'dump', '--quiet', '--incremental', '-r2', + dumpfile = run_and_verify_svnrdump_dump( + None, + svntest.verify.AnyOutput, [], 0, + '--quiet', '--incremental', '-r2', sbox.repo_url) # Check the 'delete' record headers: expect this parse to fail if headers @@ -969,9 +978,9 @@ def load_non_deltas_with_props(sbox): new_repo_dir, new_repo_url = sbox.add_repo_path('new_repo') svntest.main.create_repos(new_repo_dir) svntest.actions.enable_revprop_changes(new_repo_dir) - svntest.actions.run_and_verify_svnrdump(dumpfile, - svntest.verify.AnyOutput, - [], 0, 'load', new_repo_url) + run_and_verify_svnrdump_load(dumpfile, + svntest.verify.AnyOutput, [], 0, + new_repo_url) # Check that property 'q' remains on each modified node for tgt_path in ['A/mu', 'A/B']: @@ -982,6 +991,36 @@ def load_non_deltas_with_props(sbox): actual = map(str.strip, out) svntest.verify.compare_and_display_lines(None, 'PROPS', expected, actual) +def load_invalid_svn_date_revprop_in_r0(sbox): + "load: invalid svn:date revprop in r0" + svnrdump_tests_dir = os.path.join(os.path.dirname(sys.argv[0]), + 'svnrdump_tests_data') + sbox.build(create_wc=False, empty=True) + svntest.actions.enable_revprop_changes(sbox.repo_dir) + expected_err = svntest.verify.RegexListOutput( + ['.* E125005: Wrong or unexpected property value.*'], + match_all=False) + dumpfile = "bad-date-r0.dump" + dumpfile_path = os.path.join(svnrdump_tests_dir, dumpfile) + run_and_verify_svnrdump_load(dumpfile_path, + [], expected_err, 1, + sbox.repo_url) + +def load_invalid_svn_date_revprop_in_r1(sbox): + "load: invalid svn:date revprop in r1" + svnrdump_tests_dir = os.path.join(os.path.dirname(sys.argv[0]), + 'svnrdump_tests_data') + sbox.build(create_wc=False, empty=True) + svntest.actions.enable_revprop_changes(sbox.repo_dir) + expected_err = svntest.verify.RegexListOutput( + ['.* E125005: Wrong or unexpected property value.*'], + match_all=False) + dumpfile = "bad-date-r0.dump" + dumpfile_path = os.path.join(svnrdump_tests_dir, dumpfile) + run_and_verify_svnrdump_load(dumpfile_path, + [], expected_err, 1, + sbox.repo_url) + ######################################################################## # Run the tests @@ -1043,6 +1082,8 @@ test_list = [ None, load_non_deltas_replace_copy_with_props, dump_replace_with_copy, load_non_deltas_with_props, + load_invalid_svn_date_revprop_in_r0, + load_invalid_svn_date_revprop_in_r1, ] if __name__ == '__main__': diff --git a/subversion/tests/cmdline/svnrdump_tests_data/bad-date-r0.dump b/subversion/tests/cmdline/svnrdump_tests_data/bad-date-r0.dump new file mode 100644 index 0000000..857d406 --- /dev/null +++ b/subversion/tests/cmdline/svnrdump_tests_data/bad-date-r0.dump @@ -0,0 +1,14 @@ +SVN-fs-dump-format-version: 3 + +UUID: 0e893bae-2d4c-452c-8616-b774d5b9104e + +Revision-number: 0 +Prop-content-length: 36 +Content-length: 36 + +K 8 +svn:date +V 8 +bad date +PROPS-END + diff --git a/subversion/tests/cmdline/svnrdump_tests_data/bad-date-r1.dump b/subversion/tests/cmdline/svnrdump_tests_data/bad-date-r1.dump new file mode 100644 index 0000000..a212669 --- /dev/null +++ b/subversion/tests/cmdline/svnrdump_tests_data/bad-date-r1.dump @@ -0,0 +1,24 @@ +SVN-fs-dump-format-version: 3 + +UUID: 0e893bae-2d4c-452c-8616-b774d5b9104e + +Revision-number: 0 +Prop-content-length: 36 +Content-length: 36 + +K 8 +property +V 8 +anything +PROPS-END + +Revision-number: 1 +Prop-content-length: 36 +Content-length: 36 + +K 8 +svn:date +V 8 +bad date +PROPS-END + diff --git a/subversion/tests/cmdline/svnserveautocheck.sh b/subversion/tests/cmdline/svnserveautocheck.sh index 4fb0b1b..644a77e 100755 --- a/subversion/tests/cmdline/svnserveautocheck.sh +++ b/subversion/tests/cmdline/svnserveautocheck.sh @@ -74,6 +74,28 @@ fail() { exit 1 } +query() { + printf "%s" "$SCRIPT: $1 (y/n)? [$2] " + if [ -n "$BASH_VERSION" ]; then + read -n 1 -t 32 + else + # + prog=" +import select as s +import sys +import tty, termios +tty.setcbreak(sys.stdin.fileno(), termios.TCSANOW) +if s.select([sys.stdin.fileno()], [], [], 32)[0]: + sys.stdout.write(sys.stdin.read(1)) +" + stty_state=`stty -g` + REPLY=`$PYTHON -u -c "$prog" "$@"` + stty $stty_state + fi + echo + [ "${REPLY:-$2}" = 'y' ] +} + # Compute ABS_BUILDDIR and ABS_SRCDIR. if [ -x subversion/svn/svn ]; then # cwd is build tree root @@ -92,13 +114,21 @@ if [ ! -e $ABS_SRCDIR/subversion/include/svn_version.h ]; then fail "Run this script from the root of Subversion's build tree!" fi +# Create a directory for the PID and log files. If you change this, also make +# sure to change the svn:ignore entry for it and "make check-clean". +SVNSERVE_ROOT="$ABS_BUILDDIR/subversion/tests/cmdline/svnserve-$(date '+%Y%m%d-%H%M%S')" +mkdir "$SVNSERVE_ROOT" \ + || fail "couldn't create temporary directory '$SVNSERVE_ROOT'" + # If you change this, also make sure to change the svn:ignore entry # for it and "make check-clean". -SVNSERVE_PID=$ABS_BUILDDIR/subversion/tests/svnserveautocheck.pid +SVNSERVE_PID=$SVNSERVE_ROOT/svnserve.pid +SVNSERVE_LOG=$SVNSERVE_ROOT/svnserve.log SERVER_CMD="$ABS_BUILDDIR/subversion/svnserve/svnserve" rm -f $SVNSERVE_PID +rm -f $SVNSERVE_LOG random_port() { if [ -n "$BASH_VERSION" ]; then @@ -140,6 +170,7 @@ fi --listen-host 127.0.0.1 \ --listen-port $SVNSERVE_PORT \ --pid-file $SVNSERVE_PID \ + --log-file $SVNSERVE_LOG \ $SVNSERVE_ARGS & BASE_URL=svn://127.0.0.1:$SVNSERVE_PORT @@ -155,5 +186,11 @@ else cd - > /dev/null fi +query 'Browse server log' n \ + && less "$SVNSERVE_LOG" + +query 'Delete svnserve root directory' y \ + && rm -fr "$SVNSERVE_ROOT/" + really_cleanup exit $r diff --git a/subversion/tests/cmdline/svnsync_authz_tests.py b/subversion/tests/cmdline/svnsync_authz_tests.py index e8b9444..e464cde 100755 --- a/subversion/tests/cmdline/svnsync_authz_tests.py +++ b/subversion/tests/cmdline/svnsync_authz_tests.py @@ -415,7 +415,7 @@ def specific_deny_authz(sbox): # For mod_dav_svn's parent path setup we need per-repos permissions in # the authz file... - if sbox.repo_url.startswith('http'): + if svntest.main.is_ra_type_dav(): src_authz = sbox.authz_name() dst_authz = dest_sbox.authz_name() write_authz_file(sbox, None, diff --git a/subversion/tests/cmdline/svnsync_tests.py b/subversion/tests/cmdline/svnsync_tests.py index ba55fb5..744fbbb 100755 --- a/subversion/tests/cmdline/svnsync_tests.py +++ b/subversion/tests/cmdline/svnsync_tests.py @@ -167,7 +167,7 @@ def verify_mirror(dest_sbox, exp_dump_file_contents): dest_dump = svntest.actions.run_and_verify_dump(dest_sbox.repo_dir) svntest.verify.compare_dump_files( - "Dump files", "DUMP", exp_dump_file_contents, dest_dump) + None, None, exp_dump_file_contents, dest_dump) def run_test(sbox, dump_file_name, subdir=None, exp_dump_file_name=None, bypass_prop_validation=False, source_prop_encoding=None, diff --git a/subversion/tests/cmdline/svntest/actions.py b/subversion/tests/cmdline/svntest/actions.py index 8930b63..bb2ee63 100644 --- a/subversion/tests/cmdline/svntest/actions.py +++ b/subversion/tests/cmdline/svntest/actions.py @@ -64,22 +64,15 @@ def no_relocate_validation(): def do_relocate_validation(): os.environ['SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE_RELOCATE_VALIDATION'] = 'no' -def setup_pristine_greek_repository(): - """Create the pristine repository and 'svn import' the greek tree""" - - # these directories don't exist out of the box, so we may have to create them - if not os.path.exists(main.general_wc_dir): - os.makedirs(main.general_wc_dir) - - if not os.path.exists(main.general_repo_dir): - os.makedirs(main.general_repo_dir) # this also creates all the intermediate dirs - +def _setup_pristine_repo(tree_state, + repos_dir, dump_dir, repos_url, + use_precooked=True): # If there's no pristine repos, create one. - if not os.path.exists(main.pristine_greek_repos_dir): - if main.options.fsfs_version is not None: - main.unpack_greek_repos(main.pristine_greek_repos_dir) + if not os.path.exists(repos_dir): + if use_precooked and main.options.fsfs_version is not None: + main.unpack_greek_repos(repos_dir) else: - main.create_repos(main.pristine_greek_repos_dir) + main.create_repos(repos_dir) # if this is dav, gives us access rights to import the greek tree. if main.is_ra_type_dav(): @@ -87,15 +80,14 @@ def setup_pristine_greek_repository(): main.file_write(authz_file, "[/]\n* = rw\n") # dump the greek tree to disk. - main.greek_state.write_to_disk(main.greek_dump_dir) + tree_state.write_to_disk(dump_dir) # import the greek tree, using l:foo/p:bar ### todo: svn should not be prompting for auth info when using ### repositories with no auth/auth requirements _, output, _ = main.run_svn(None, 'import', '-m', 'Log message for revision 1.', - main.greek_dump_dir, - main.pristine_greek_repos_url) + dump_dir, repos_url) # verify the printed output of 'svn import'. lastline = output.pop().strip() @@ -107,7 +99,7 @@ def setup_pristine_greek_repository(): sys.exit(1) output_tree = wc.State.from_commit(output) - expected_output_tree = main.greek_state.copy(main.greek_dump_dir) + expected_output_tree = tree_state.copy(dump_dir) expected_output_tree.tweak(verb='Adding', contents=None) @@ -122,9 +114,36 @@ def setup_pristine_greek_repository(): # Finally, disallow any changes to the "pristine" repos. error_msg = "Don't modify the pristine repository" - create_failing_hook(main.pristine_greek_repos_dir, 'start-commit', error_msg) - create_failing_hook(main.pristine_greek_repos_dir, 'pre-lock', error_msg) - create_failing_hook(main.pristine_greek_repos_dir, 'pre-revprop-change', error_msg) + create_failing_hook(repos_dir, 'start-commit', error_msg) + create_failing_hook(repos_dir, 'pre-lock', error_msg) + create_failing_hook(repos_dir, 'pre-revprop-change', error_msg) + +def setup_pristine_repositories(): + """Create the pristine repository and 'svn import' the greek tree""" + + # these directories don't exist out of the box, so we may have to create them + if not os.path.exists(main.general_wc_dir): + os.makedirs(main.general_wc_dir) + + if not os.path.exists(main.general_repo_dir): + os.makedirs(main.general_repo_dir) # this also creates all the intermediate dirs + + if not os.path.exists(main.other_dav_root_dir): + os.makedirs(main.other_dav_root_dir) + if not os.path.exists(main.non_dav_root_dir): + os.makedirs(main.non_dav_root_dir) + + _setup_pristine_repo(main.greek_state, + main.pristine_greek_repos_dir, + main.greek_dump_dir, + main.pristine_greek_repos_url) + + # NOTE: We don't use precooked trojan repositories. + _setup_pristine_repo(main.trojan_state, + main.pristine_trojan_repos_dir, + main.trojan_dump_dir, + main.pristine_trojan_repos_url, + use_precooked=False) ###################################################################### @@ -144,23 +163,19 @@ def guarantee_empty_repository(path, minor_version): # Used by every test, so that they can run independently of one # another. Every time this routine is called, it recursively copies # the `pristine repos' to a new location. -# Note: make sure setup_pristine_greek_repository was called once before -# using this function. -def guarantee_greek_repository(path, minor_version): - """Guarantee that a local svn repository exists at PATH, containing - nothing but the greek-tree at revision 1.""" - - if path == main.pristine_greek_repos_dir: +# Note: make sure setup_pristine_repositories was called once before +# using these functions. +def _guarantee_repos(path, repos_dir, minor_version, use_precooked=True): + if path == repos_dir: logger.error("attempt to overwrite the pristine repos! Aborting.") sys.exit(1) # copy the pristine repository to PATH. main.safe_rmtree(path) - if (main.options.fsfs_version is not None): + if (use_precooked and main.options.fsfs_version is not None): failed = main.unpack_greek_repos(path) else: - failed = main.copy_repos(main.pristine_greek_repos_dir, - path, 1, 1, minor_version) + failed = main.copy_repos(repos_dir, path, 1, 1, minor_version) if failed: logger.error("copying repository failed.") sys.exit(1) @@ -171,6 +186,18 @@ def guarantee_greek_repository(path, minor_version): # give the repository a unique UUID run_and_verify_svnadmin([], [], 'setuuid', path) +def guarantee_greek_repository(path, minor_version): + """Guarantee that a local svn repository exists at PATH, containing + nothing but the greek-tree at revision 1.""" + + _guarantee_repos(path, main.pristine_greek_repos_dir, minor_version) + +def guarantee_trojan_repository(path, minor_version): + """Guarantee that a local svn repository exists at PATH, containing + nothing but the trojan-tree at revision 1.""" + + _guarantee_repos(path, main.pristine_trojan_repos_dir, minor_version, False) + def run_and_verify_atomic_ra_revprop_change(expected_stdout, expected_stderr, expected_exit, @@ -1937,7 +1964,7 @@ def run_and_verify_revert(expected_paths, *args): # This allows a test to *quickly* bootstrap itself. def make_repo_and_wc(sbox, create_wc=True, read_only=False, empty=False, - minor_version=None): + minor_version=None, tree=None): """Create a fresh repository and check out a WC from it. If EMPTY is True, the repository and WC will be empty and at revision 0, otherwise they will contain the 'Greek Tree' at revision 1. @@ -1962,9 +1989,17 @@ def make_repo_and_wc(sbox, create_wc=True, read_only=False, empty=False, guarantee_empty_repository(sbox.repo_dir, minor_version) expected_state = svntest.wc.State('', {}) else: - if not read_only: - guarantee_greek_repository(sbox.repo_dir, minor_version) - expected_state = main.greek_state + if tree == 'greek': + if not read_only: + guarantee_greek_repository(sbox.repo_dir, minor_version) + expected_state = main.greek_state + elif tree == 'trojan': + if not read_only: + guarantee_trojan_repository(sbox.repo_dir, minor_version) + expected_state = main.trojan_state + else: + raise ValueError("'tree' must be 'greek' or 'trojan'" + " but was '%s'" % str(tree)) if create_wc: # Generate the expected output tree. @@ -1998,14 +2033,21 @@ def duplicate_dir(wc_name, wc_copy_name): -def get_virginal_state(wc_dir, rev): +def get_virginal_state(wc_dir, rev, tree='greek'): "Return a virginal greek tree state for a WC and repos at revision REV." rev = str(rev) ### maybe switch rev to an integer? # copy the greek tree, shift it to the new wc_dir, insert a root elem, # then tweak all values - state = main.greek_state.copy() + if tree == 'greek': + state = main.greek_state.copy() + elif tree == 'trojan': + state = main.trojan_state.copy() + else: + raise ValueError("'tree' must be 'greek' or 'trojan'" + " but was '%s'" % str(tree)) + state.wc_dir = wc_dir state.desc[''] = wc.StateItem() state.tweak(contents=None, status=' ', wc_rev=rev) diff --git a/subversion/tests/cmdline/svntest/main.py b/subversion/tests/cmdline/svntest/main.py index ef281cd..38c03c5 100644 --- a/subversion/tests/cmdline/svntest/main.py +++ b/subversion/tests/cmdline/svntest/main.py @@ -55,8 +55,9 @@ except ImportError: import svntest from svntest import Failure from svntest import Skip +from svntest.wc import StateItem as Item -SVN_VER_MINOR = 10 +SVN_VER_MINOR = 13 ###################################################################### # @@ -199,6 +200,7 @@ svnmover_binary = os.path.abspath('../../../tools/dev/svnmover/svnmover' + _exe) # Location to the pristine repository, will be calculated from test_area_url # when we know what the user specified for --url. pristine_greek_repos_url = None +pristine_trojan_repos_url = None # Global variable to track all of our options options = None @@ -224,6 +226,10 @@ SVN_PROP_INHERITABLE_IGNORES = "svn:global-ignores" general_repo_dir = os.path.join(work_dir, "repositories") general_wc_dir = os.path.join(work_dir, "working_copies") +# Directories used for DAV tests +other_dav_root_dir = os.path.join(work_dir, "fsdavroot") +non_dav_root_dir = os.path.join(work_dir, "nodavroot") + # temp directory in which we will create our 'pristine' local # repository and other scratch data. This should be removed when we # quit and when we startup. @@ -231,7 +237,9 @@ temp_dir = os.path.join(work_dir, 'local_tmp') # (derivatives of the tmp dir.) pristine_greek_repos_dir = os.path.join(temp_dir, "repos") +pristine_trojan_repos_dir = os.path.join(temp_dir, "trojan") greek_dump_dir = os.path.join(temp_dir, "greekfiles") +trojan_dump_dir = os.path.join(temp_dir, "trojanfiles") default_config_dir = os.path.abspath(os.path.join(temp_dir, "config")) # @@ -241,28 +249,57 @@ default_config_dir = os.path.abspath(os.path.join(temp_dir, "config")) # call main.greek_state.copy(). That method will return a copy of this # State object which can then be edited. # -_item = svntest.wc.StateItem greek_state = svntest.wc.State('', { - 'iota' : _item("This is the file 'iota'.\n"), - 'A' : _item(), - 'A/mu' : _item("This is the file 'mu'.\n"), - 'A/B' : _item(), - 'A/B/lambda' : _item("This is the file 'lambda'.\n"), - 'A/B/E' : _item(), - 'A/B/E/alpha' : _item("This is the file 'alpha'.\n"), - 'A/B/E/beta' : _item("This is the file 'beta'.\n"), - 'A/B/F' : _item(), - 'A/C' : _item(), - 'A/D' : _item(), - 'A/D/gamma' : _item("This is the file 'gamma'.\n"), - 'A/D/G' : _item(), - 'A/D/G/pi' : _item("This is the file 'pi'.\n"), - 'A/D/G/rho' : _item("This is the file 'rho'.\n"), - 'A/D/G/tau' : _item("This is the file 'tau'.\n"), - 'A/D/H' : _item(), - 'A/D/H/chi' : _item("This is the file 'chi'.\n"), - 'A/D/H/psi' : _item("This is the file 'psi'.\n"), - 'A/D/H/omega' : _item("This is the file 'omega'.\n"), + 'iota' : Item("This is the file 'iota'.\n"), + 'A' : Item(), + 'A/mu' : Item("This is the file 'mu'.\n"), + 'A/B' : Item(), + 'A/B/lambda' : Item("This is the file 'lambda'.\n"), + 'A/B/E' : Item(), + 'A/B/E/alpha' : Item("This is the file 'alpha'.\n"), + 'A/B/E/beta' : Item("This is the file 'beta'.\n"), + 'A/B/F' : Item(), + 'A/C' : Item(), + 'A/D' : Item(), + 'A/D/gamma' : Item("This is the file 'gamma'.\n"), + 'A/D/G' : Item(), + 'A/D/G/pi' : Item("This is the file 'pi'.\n"), + 'A/D/G/rho' : Item("This is the file 'rho'.\n"), + 'A/D/G/tau' : Item("This is the file 'tau'.\n"), + 'A/D/H' : Item(), + 'A/D/H/chi' : Item("This is the file 'chi'.\n"), + 'A/D/H/psi' : Item("This is the file 'psi'.\n"), + 'A/D/H/omega' : Item("This is the file 'omega'.\n"), + }) + +# Likewise our pristine trojan-tree state (for peg revision parsing tests) +# NOTE: We don't use precooked trojan repositories. +trojan_state = svntest.wc.State('', { + 'iota' : Item("This is the file 'iota'.\n"), + '@zeta' : Item("This is the file 'zeta'.\n"), + '_@theta' : Item("This is the file 'theta'.\n"), + '.@kappa' : Item("This is the file 'kappa'.\n"), + 'lambda@' : Item("This is the file 'lambda'.\n"), + '@omicron@' : Item("This is the file 'omicron'.\n"), + '@' : Item(), + '@@' : Item(), + '_@' : Item(), + '.@' : Item(), + 'A' : Item(), + 'A/@@' : Item("This is the file 'A/@@'.\n"), + 'A/alpha' : Item("This is the file 'alpha'.\n"), + 'A/@omega@' : Item("This is the file 'omega'.\n"), + 'B' : Item(), + 'B/@' : Item("This is the file 'B/@'.\n"), + 'B/@beta' : Item("This is the file 'beta'.\n"), + 'B/pi@' : Item("This is the file 'pi'.\n"), + 'G' : Item(), + 'G/_@' : Item("This is the file 'G/_@'.\n"), + 'G/_@gamma' : Item("This is the file 'gamma'.\n"), + 'D' : Item(), + 'D/.@' : Item("This is the file 'D/.@'.\n"), + 'D/.@delta' : Item("This is the file 'delta'.\n"), + 'E' : Item(), }) @@ -978,7 +1015,8 @@ def file_write(path, contents, mode='w'): which is (w)rite by default.""" if sys.version_info < (3, 0): - open(path, mode).write(contents) + with open(path, mode) as f: + f.write(contents) else: # Python 3: Write data in the format required by MODE, i.e. byte arrays # to 'b' files, utf-8 otherwise.""" @@ -990,9 +1028,11 @@ def file_write(path, contents, mode='w'): contents = contents.decode("utf-8") if isinstance(contents, str): - codecs.open(path, mode, "utf-8").write(contents) + with codecs.open(path, mode, "utf-8") as f: + f.write(contents) else: - open(path, mode).write(contents) + with open(path, mode) as f: + f.write(contents) # For making local mods to files def file_append(path, new_text): @@ -1008,7 +1048,8 @@ def file_append_binary(path, new_text): def file_substitute(path, contents, new_contents): """Replace the CONTENTS in the file at PATH using the NEW_CONTENTS""" fcontent = open(path, 'r').read().replace(contents, new_contents) - open(path, 'w').write(fcontent) + with open(path, 'w') as f: + f.write(fcontent) # For setting up authz, hooks and making other tweaks to created repos def _post_create_repos(path, minor_version = None): @@ -1035,7 +1076,8 @@ def _post_create_repos(path, minor_version = None): users += (crosscheck_username + " = " + crosscheck_password + "\n") file_append(os.path.join(path, "conf", "passwd"), users) - if options.fs_type is None or options.fs_type == 'fsfs': + if options.fs_type is None or options.fs_type == 'fsfs' or \ + options.fs_type == 'fsx': # fsfs.conf file if (minor_version is None or minor_version >= 6): confpath = get_fsfs_conf_file_path(path) @@ -1309,30 +1351,29 @@ def create_http_connection(url, debuglevel=9): h.set_debuglevel(debuglevel) return h -def write_restrictive_svnserve_conf(repo_dir, anon_access="none"): +def write_restrictive_svnserve_conf(repo_dir, anon_access="none", + separate_groups_db=False): "Create a restrictive authz file ( no anynomous access )." fp = open(get_svnserve_conf_file_path(repo_dir), 'w') - fp.write("[general]\nanon-access = %s\nauth-access = write\n" - "authz-db = authz\n" % anon_access) + fp.write("[general]\n" + "anon-access = %s\n" + "auth-access = write\n" + "authz-db = authz\n" % anon_access); + if separate_groups_db: + fp.write("groups-db = groups\n") if options.enable_sasl: - fp.write("realm = svntest\n[sasl]\nuse-sasl = true\n"); + fp.write("realm = svntest\n" + "[sasl]\n", + "use-sasl = true\n"); else: fp.write("password-db = passwd\n") fp.close() -def write_restrictive_svnserve_conf_with_groups(repo_dir, - anon_access="none"): +def write_restrictive_svnserve_conf_with_groups(repo_dir, anon_access="none"): "Create a restrictive configuration with groups stored in a separate file." - fp = open(get_svnserve_conf_file_path(repo_dir), 'w') - fp.write("[general]\nanon-access = %s\nauth-access = write\n" - "authz-db = authz\ngroups-db = groups\n" % anon_access) - if options.enable_sasl: - fp.write("realm = svntest\n[sasl]\nuse-sasl = true\n"); - else: - fp.write("password-db = passwd\n") - fp.close() + return write_restrictive_svnserve_conf(repo_dir, anon_access, True) # Warning: because mod_dav_svn uses one shared authz file for all # repositories, you *cannot* use write_authz_file in any test that @@ -1653,7 +1694,6 @@ def is_plaintext_password_storage_disabled(): return False return True - # https://issues.apache.org/bugzilla/show_bug.cgi?id=56480 # https://issues.apache.org/bugzilla/show_bug.cgi?id=55397 __mod_dav_url_quoting_broken_versions = frozenset([ @@ -1677,6 +1717,10 @@ def is_httpd_authz_provider_enabled(): return (v[0] == '2' and int(v[1]) >= 3) or int(v[0]) > 2 return None +def is_remote_http_connection_allowed(): + return options.allow_remote_http_connection + + ###################################################################### @@ -1757,6 +1801,8 @@ class TestSpawningThread(threading.Thread): args.append('--fsfs-compression=' + options.fsfs_compression) if options.fsfs_dir_deltification: args.append('--fsfs-dir-deltification=' + options.fsfs_dir_deltification) + if options.allow_remote_http_connection: + args.append('--allow-remote-http-connection') if options.svn_bin: args.append('--bin=' + options.svn_bin) @@ -2099,7 +2145,7 @@ def _create_parser(usage=None): help='Run the given number of tests in parallel') parser.add_option('-c', action='store_true', dest='is_child_process', help='Flag if we are running this python test as a ' + - 'child process') + 'child process; used by build/run_tests.py:334') parser.add_option('--mode-filter', action='store', dest='mode_filter', default='ALL', help='Limit tests to those with type specified (e.g. XFAIL)') @@ -2175,6 +2221,8 @@ def _create_parser(usage=None): help='Set compression type (for fsfs)') parser.add_option('--fsfs-dir-deltification', action='store', type='str', help='Set directory deltification option (for fsfs)') + parser.add_option('--allow-remote-http-connection', action='store_true', + help='Run tests that connect to remote HTTP(S) servers') # most of the defaults are None, but some are other values, set them here parser.set_defaults( @@ -2344,6 +2392,9 @@ def execute_tests(test_list, serial_only = False, test_name = None, global pristine_url global pristine_greek_repos_url + global pristine_trojan_repos_url + global other_dav_root_url + global non_dav_root_url global svn_binary global svnadmin_binary global svnlook_binary @@ -2423,6 +2474,16 @@ def execute_tests(test_list, serial_only = False, test_name = None, pristine_greek_repos_dir.replace( os.path.sep, '/')) + # Calculate pristine_trojan_repos_url from test_area_url. + pristine_trojan_repos_url = options.test_area_url + '/' + \ + svntest.wc.svn_uri_quote( + pristine_trojan_repos_dir.replace( + os.path.sep, '/')) + + other_dav_root_url = options.test_area_url + '/fsdavroot' + non_dav_root_url = options.test_area_url + '/nodavroot' + + if options.use_jsvn: if options.svn_bin is None: options.svn_bin = '' @@ -2515,8 +2576,8 @@ def execute_tests(test_list, serial_only = False, test_name = None, http_proxy=options.http_proxy, exclusive_wc_locks=options.exclusive_wc_locks) - # Setup the pristine repository - svntest.actions.setup_pristine_greek_repository() + # Setup the pristine repositories + svntest.actions.setup_pristine_repositories() # Run the tests. exit_code = _internal_run_tests(test_list, testnums, options.parallel, diff --git a/subversion/tests/cmdline/svntest/mergetrees.py b/subversion/tests/cmdline/svntest/mergetrees.py old mode 100755 new mode 100644 index 0cee3d2..2a46ec6 --- a/subversion/tests/cmdline/svntest/mergetrees.py +++ b/subversion/tests/cmdline/svntest/mergetrees.py @@ -253,69 +253,48 @@ def set_up_branch(sbox, branch_only = False, nbr_of_branches = 1): expected_status = actions.get_virginal_state(wc_dir, 1) expected_disk = main.greek_state.copy() + def path_join(head, tail): + if not head: return tail + if not tail: return head + return head + '/' + tail + + def greek_file_item(path): + if path[-1:].islower(): + basename = re.sub('.*/', '', path) + return Item("This is the file '" + basename + "'.\n") + return Item() + + A_paths = [ + "", + "B", + "B/lambda", + "B/E", + "B/E/alpha", + "B/E/beta", + "B/F", + "mu", + "C", + "D", + "D/gamma", + "D/G", + "D/G/pi", + "D/G/rho", + "D/G/tau", + "D/H", + "D/H/chi", + "D/H/omega", + "D/H/psi", + ] def copy_A(dest_name, rev): expected = verify.UnorderedOutput( - ["A " + os.path.join(wc_dir, dest_name, "B") + "\n", - "A " + os.path.join(wc_dir, dest_name, "B", "lambda") + "\n", - "A " + os.path.join(wc_dir, dest_name, "B", "E") + "\n", - "A " + os.path.join(wc_dir, dest_name, "B", "E", "alpha") + "\n", - "A " + os.path.join(wc_dir, dest_name, "B", "E", "beta") + "\n", - "A " + os.path.join(wc_dir, dest_name, "B", "F") + "\n", - "A " + os.path.join(wc_dir, dest_name, "mu") + "\n", - "A " + os.path.join(wc_dir, dest_name, "C") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "gamma") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "G") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "G", "pi") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "G", "rho") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "G", "tau") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "H") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "H", "chi") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "H", "omega") + "\n", - "A " + os.path.join(wc_dir, dest_name, "D", "H", "psi") + "\n", - "Checked out revision " + str(rev - 1) + ".\n", - "A " + os.path.join(wc_dir, dest_name) + "\n"]) - expected_status.add({ - dest_name + "/B" : Item(status=' ', wc_rev=rev), - dest_name + "/B/lambda" : Item(status=' ', wc_rev=rev), - dest_name + "/B/E" : Item(status=' ', wc_rev=rev), - dest_name + "/B/E/alpha" : Item(status=' ', wc_rev=rev), - dest_name + "/B/E/beta" : Item(status=' ', wc_rev=rev), - dest_name + "/B/F" : Item(status=' ', wc_rev=rev), - dest_name + "/mu" : Item(status=' ', wc_rev=rev), - dest_name + "/C" : Item(status=' ', wc_rev=rev), - dest_name + "/D" : Item(status=' ', wc_rev=rev), - dest_name + "/D/gamma" : Item(status=' ', wc_rev=rev), - dest_name + "/D/G" : Item(status=' ', wc_rev=rev), - dest_name + "/D/G/pi" : Item(status=' ', wc_rev=rev), - dest_name + "/D/G/rho" : Item(status=' ', wc_rev=rev), - dest_name + "/D/G/tau" : Item(status=' ', wc_rev=rev), - dest_name + "/D/H" : Item(status=' ', wc_rev=rev), - dest_name + "/D/H/chi" : Item(status=' ', wc_rev=rev), - dest_name + "/D/H/omega" : Item(status=' ', wc_rev=rev), - dest_name + "/D/H/psi" : Item(status=' ', wc_rev=rev), - dest_name : Item(status=' ', wc_rev=rev)}) - expected_disk.add({ - dest_name : Item(), - dest_name + '/B' : Item(), - dest_name + '/B/lambda' : Item("This is the file 'lambda'.\n"), - dest_name + '/B/E' : Item(), - dest_name + '/B/E/alpha' : Item("This is the file 'alpha'.\n"), - dest_name + '/B/E/beta' : Item("This is the file 'beta'.\n"), - dest_name + '/B/F' : Item(), - dest_name + '/mu' : Item("This is the file 'mu'.\n"), - dest_name + '/C' : Item(), - dest_name + '/D' : Item(), - dest_name + '/D/gamma' : Item("This is the file 'gamma'.\n"), - dest_name + '/D/G' : Item(), - dest_name + '/D/G/pi' : Item("This is the file 'pi'.\n"), - dest_name + '/D/G/rho' : Item("This is the file 'rho'.\n"), - dest_name + '/D/G/tau' : Item("This is the file 'tau'.\n"), - dest_name + '/D/H' : Item(), - dest_name + '/D/H/chi' : Item("This is the file 'chi'.\n"), - dest_name + '/D/H/omega' : Item("This is the file 'omega'.\n"), - dest_name + '/D/H/psi' : Item("This is the file 'psi'.\n"), - }) + [ "A " + sbox.ospath(path_join(dest_name, p)) + "\n" + for p in A_paths ]) + expected_status.add( + { path_join(dest_name, p) : Item(status=' ', wc_rev=rev) + for p in A_paths }) + expected_disk.add( + { path_join(dest_name, p) : greek_file_item(p) + for p in A_paths }) # Make a branch A_COPY to merge into. actions.run_and_verify_svn(expected, [], 'copy', diff --git a/subversion/tests/cmdline/svntest/sandbox.py b/subversion/tests/cmdline/svntest/sandbox.py index b1c9861..d8c05e1 100644 --- a/subversion/tests/cmdline/svntest/sandbox.py +++ b/subversion/tests/cmdline/svntest/sandbox.py @@ -102,7 +102,7 @@ class Sandbox: self.was_cwd = os.getcwd() - def _set_name(self, name, read_only=False, empty=False): + def _set_name(self, name, read_only=False, empty=False, tree=None): """A convenience method for renaming a sandbox, useful when working with multiple repositories in the same unit test.""" if not name is None: @@ -117,8 +117,15 @@ class Sandbox: self.repo_dir.replace(os.path.sep, '/'))) self.add_test_path(self.repo_dir) else: - self.repo_dir = svntest.main.pristine_greek_repos_dir - self.repo_url = svntest.main.pristine_greek_repos_url + if tree == 'greek': + self.repo_dir = svntest.main.pristine_greek_repos_dir + self.repo_url = svntest.main.pristine_greek_repos_url + elif tree == 'trojan': + self.repo_dir = svntest.main.pristine_trojan_repos_dir + self.repo_url = svntest.main.pristine_trojan_repos_url + else: + raise ValueError("'tree' must be 'greek' or 'trojan'" + " but was '%s'" % str(tree)) if self.repo_url.startswith("http"): self.authz_file = os.path.join(svntest.main.work_dir, "authz") @@ -146,15 +153,15 @@ class Sandbox: return clone def build(self, name=None, create_wc=True, read_only=False, empty=False, - minor_version=None): - """Make a 'Greek Tree' repo (or refer to the central one if READ_ONLY), - or make an empty repo if EMPTY is true, + minor_version=None, tree='greek'): + """Make a 'Greek Tree' or 'Trojan Tree' repo (or refer to the central + one if READ_ONLY), or make an empty repo if EMPTY is true, and check out a WC from it (unless CREATE_WC is false). Change the sandbox's name to NAME. See actions.make_repo_and_wc() for details.""" - self._set_name(name, read_only, empty) + self._set_name(name, read_only, empty, tree) self._ensure_authz() svntest.actions.make_repo_and_wc(self, create_wc, read_only, empty, - minor_version) + minor_version, tree) self._is_built = True def _ensure_authz(self): @@ -168,7 +175,8 @@ class Sandbox: or open(self.authz_file,'r').read() != default_authz)): tmp_authz_file = os.path.join(svntest.main.work_dir, "authz-" + self.name) - open(tmp_authz_file, 'w').write(default_authz) + with open(tmp_authz_file, 'w') as f: + f.write(default_authz) shutil.move(tmp_authz_file, self.authz_file) def authz_name(self, repo_dir=None): @@ -492,7 +500,8 @@ class Sandbox: if not svnrdump_headers_always.match(l)] # Ignore differences in number of blank lines between node records, # as svnrdump puts 3 whereas svnadmin puts 2 after a replace-with-copy. - svntest.verify.compare_dump_files(None, None, + svntest.verify.compare_dump_files('svnadmin dump, tweaked', + 'svnrdump dump, tweaked', dumpfile_a_d_cmp, dumpfile_r_d_cmp, ignore_number_of_blank_lines=True) @@ -523,20 +532,22 @@ class Sandbox: reloaded_dumpfile_a_n = svntest.actions.run_and_verify_dump(repo_dir_a_n) reloaded_dumpfile_a_d = svntest.actions.run_and_verify_dump(repo_dir_a_d) reloaded_dumpfile_r_d = svntest.actions.run_and_verify_dump(repo_dir_r_d) - svntest.verify.compare_dump_files(None, None, + svntest.verify.compare_dump_files('svnadmin dump no delta, loaded, dumped', + 'svnadmin dump --deltas, loaded, dumped', reloaded_dumpfile_a_n, reloaded_dumpfile_a_d, ignore_uuid=True) - svntest.verify.compare_dump_files(None, None, + svntest.verify.compare_dump_files('svnadmin dump, loaded, dumped', + 'svnrdump dump, loaded, dumped', reloaded_dumpfile_a_d, reloaded_dumpfile_r_d, ignore_uuid=True) # Run each dump through svndumpfilter and check for no further change. - for dumpfile in [dumpfile_a_n, - dumpfile_a_d, - dumpfile_r_d - ]: + for dumpfile, dumpfile_desc in [(dumpfile_a_n, 'svnadmin dump'), + (dumpfile_a_d, 'svnadmin dump --deltas'), + (dumpfile_r_d, 'svnrdump dump'), + ]: ### No buffer size seems to work for update_tests-2. So skip that test? ### (Its dumpfile size is ~360 KB non-delta, ~180 KB delta.) if len(''.join(dumpfile)) > 100000: @@ -550,7 +561,9 @@ class Sandbox: # svndumpfilter strips them. # Ignore differences in number of blank lines between node records, # as svndumpfilter puts 3 instead of 2 after an add or delete record. - svntest.verify.compare_dump_files(None, None, dumpfile, dumpfile2, + svntest.verify.compare_dump_files(dumpfile_desc, + 'after svndumpfilter include /', + dumpfile, dumpfile2, expect_content_length_always=True, ignore_empty_prop_sections=True, ignore_number_of_blank_lines=True) diff --git a/subversion/tests/cmdline/svntest/testcase.py b/subversion/tests/cmdline/svntest/testcase.py index 4782831..85deec4 100644 --- a/subversion/tests/cmdline/svntest/testcase.py +++ b/subversion/tests/cmdline/svntest/testcase.py @@ -222,8 +222,8 @@ class _Wimp(_XFail): RESULT_SKIP: (2, TextColors.success('SKIP: '), True), } - def __init__(self, wip, test_case, cond_func=lambda: True): - _XFail.__init__(self, test_case, cond_func, wip) + def __init__(self, wip, test_case, cond_func=lambda: True, issues=None): + _XFail.__init__(self, test_case, cond_func, wip, issues) class _Skip(TestCase): diff --git a/subversion/tests/cmdline/svntest/tree.py b/subversion/tests/cmdline/svntest/tree.py index 6c34238..fbcbcfc 100644 --- a/subversion/tests/cmdline/svntest/tree.py +++ b/subversion/tests/cmdline/svntest/tree.py @@ -267,19 +267,8 @@ class SVNTreeNode: line += "%-20s: Item(" % ("'%s'" % path.replace(os.sep, '/')) comma = False - mime_type = self.props.get("svn:mime-type") - if not mime_type or mime_type.startswith("text/"): - if self.contents is not None: - # Escape some characters for nicer script and readability. - # (This is error output. I guess speed is no consideration here.) - line += "contents=\"%s\"" % (self.contents - .replace('\n','\\n') - .replace('"','\\"') - .replace('\r','\\r') - .replace('\t','\\t')) - comma = True - else: - line += 'content is binary data' + if self.contents is not None: + line += "contents=" + repr(self.contents) comma = True if self.props: diff --git a/subversion/tests/cmdline/svntest/verify.py b/subversion/tests/cmdline/svntest/verify.py index 904a044..0fb7bcd 100644 --- a/subversion/tests/cmdline/svntest/verify.py +++ b/subversion/tests/cmdline/svntest/verify.py @@ -150,8 +150,9 @@ class ExpectedOutput(object): MESSAGE unless it is None, the expected lines, the ACTUAL lines, and a diff, all labeled with LABEL. """ - display_lines(message, self.expected, actual, label, label) - display_lines_diff(self.expected, actual, label, label) + e_label = label + ' (match_all=%s)' % (self.match_all,) + display_lines(message, self.expected, actual, e_label, label) + display_lines_diff(self.expected, actual, e_label, label) class AnyOutput(ExpectedOutput): @@ -181,12 +182,36 @@ class AnyOutput(ExpectedOutput): logger.warn(message) +def re_fullmatch(pattern, string, flags=0): + """If the whole STRING matches the regular expression PATTERN, + return a corresponding match object. + Based on re.fullmatch() in Python 3.4. + """ + if pattern.endswith('$'): + return re.match(pattern, string, flags) + + return re.match(pattern + '$', string, flags) + +def regex_fullmatch(rx, string): + """If the whole STRING matches the compiled regular expression RX, + return a corresponding match object. + Based on regex.fullmatch() in Python 3.4. + """ + if rx.pattern.endswith('$'): + return rx.match(string) + + return re_fullmatch(rx.pattern, string, rx.flags) + class RegexOutput(ExpectedOutput): """Matches a single regular expression. If MATCH_ALL is true, every actual line must match the RE. If MATCH_ALL is false, at least one actual line must match the RE. In any case, there must be at least one line of actual output. + + The RE must match a prefix of the actual line, in contrast to the + RegexListOutput and UnorderedRegexListOutput classes which match + whole lines. """ def __init__(self, expected, match_all=True): @@ -212,7 +237,8 @@ class RegexOutput(ExpectedOutput): return any(self.expected_re.match(line) for line in actual) def display_differences(self, message, label, actual): - display_lines(message, self.expected, actual, label + ' (regexp)', label) + e_label = label + ' (regexp, match_all=%s)' % (self.match_all,) + display_lines(message, self.expected, actual, e_label, label) def insert(self, index, line): self.expected.insert(index, line) @@ -228,6 +254,9 @@ class RegexListOutput(ExpectedOutput): ones. In any case, there must be at least one line of actual output. + + The REs must match whole actual lines, in contrast to the RegexOutput + class which matches a prefix of the actual line. """ def __init__(self, expected, match_all=True): @@ -243,18 +272,37 @@ class RegexListOutput(ExpectedOutput): if self.match_all: return (len(self.expected_res) == len(actual) and - all(e.match(a) for e, a in zip(self.expected_res, actual))) + all(regex_fullmatch(e, a) for e, a in zip(self.expected_res, actual))) i_expected = 0 for actual_line in actual: - if self.expected_res[i_expected].match(actual_line): + if regex_fullmatch(self.expected_res[i_expected], actual_line): i_expected += 1 if i_expected == len(self.expected_res): return True return False def display_differences(self, message, label, actual): - display_lines(message, self.expected, actual, label + ' (regexp)', label) + e_label = label + ' (regexp, match_all=%s)' % (self.match_all,) + display_lines(message, self.expected, actual, e_label, label) + + assert actual is not None + if not isinstance(actual, list): + actual = [actual] + + if self.match_all: + logger.warn('DIFF ' + label + ':') + if len(self.expected) != len(actual): + logger.warn('# Expected %d lines; actual %d lines' % + (len(self.expected), len(actual))) + for e, a in map(None, self.expected_res, actual): + if e is not None and a is not None and regex_fullmatch(e, a): + logger.warn("| " + a.rstrip()) + else: + if e is not None: + logger.warn("| -" + repr(e.pattern)) + if a is not None: + logger.warn("| +" + repr(a)) def insert(self, index, line): self.expected.insert(index, line) @@ -279,8 +327,9 @@ class UnorderedOutput(ExpectedOutput): return sorted(self.expected) == sorted(actual) def display_differences(self, message, label, actual): - display_lines(message, self.expected, actual, label + ' (unordered)', label) - display_lines_diff(self.expected, actual, label + ' (unordered)', label) + e_label = label + ' (unordered)' + display_lines(message, self.expected, actual, e_label, label) + display_lines_diff(sorted(self.expected), sorted(actual), e_label, label) class UnorderedRegexListOutput(ExpectedOutput): @@ -295,6 +344,9 @@ class UnorderedRegexListOutput(ExpectedOutput): expressions. The implementation matches each expression in turn to the first unmatched actual line that it can match, and does not try all the permutations when there are multiple possible matches. + + The REs must match whole actual lines, in contrast to the RegexOutput + class which matches a prefix of the actual line. """ def __init__(self, expected): @@ -305,13 +357,16 @@ class UnorderedRegexListOutput(ExpectedOutput): assert actual is not None if not isinstance(actual, list): actual = [actual] + else: + # copy the list so we can remove elements without affecting caller + actual = actual[:] if len(self.expected) != len(actual): return False for e in self.expected: expect_re = re.compile(e) for actual_line in actual: - if expect_re.match(actual_line): + if regex_fullmatch(expect_re, actual_line): actual.remove(actual_line) break else: @@ -320,9 +375,30 @@ class UnorderedRegexListOutput(ExpectedOutput): return True def display_differences(self, message, label, actual): - display_lines(message, self.expected, actual, - label + ' (regexp) (unordered)', label) + e_label = label + ' (regexp) (unordered)' + display_lines(message, self.expected, actual, e_label, label) + + assert actual is not None + if not isinstance(actual, list): + actual = [actual] + else: + # copy the list so we can remove elements without affecting caller + actual = actual[:] + logger.warn('DIFF ' + label + ':') + if len(self.expected) != len(actual): + logger.warn('# Expected %d lines; actual %d lines' % + (len(self.expected), len(actual))) + for e in self.expected: + expect_re = re.compile(e) + for actual_line in actual: + if regex_fullmatch(expect_re, actual_line): + actual.remove(actual_line) + break + else: + logger.warn("| -" + expect_re.pattern.rstrip()) + for a in actual: + logger.warn("| +" + a.rstrip()) class AlternateOutput(ExpectedOutput): """Matches any one of a list of ExpectedOutput instances. @@ -730,7 +806,8 @@ class DumpParser: self.parse_all_revisions() return self.parsed -def compare_dump_files(message, label, expected, actual, +def compare_dump_files(label_expected, label_actual, + expected, actual, ignore_uuid=False, expect_content_length_always=False, ignore_empty_prop_sections=False, @@ -772,6 +849,8 @@ def compare_dump_files(message, label, expected, actual, if parsed_expected != parsed_actual: print('DIFF of raw dumpfiles (including expected differences)') + print('--- ' + (label_expected or 'expected')) + print('+++ ' + (label_actual or 'actual')) print(''.join(ndiff(expected, actual))) raise svntest.Failure('DIFF of parsed dumpfiles (ignoring expected differences)\n' + '\n'.join(ndiff( diff --git a/subversion/tests/cmdline/svnversion_tests.py b/subversion/tests/cmdline/svnversion_tests.py index 2ed6e46..e9d0927 100755 --- a/subversion/tests/cmdline/svnversion_tests.py +++ b/subversion/tests/cmdline/svnversion_tests.py @@ -71,9 +71,8 @@ def svnversion_test(sbox): expected_output = wc.State(wc_dir, {'A/mu' : Item(verb='Sending')}) expected_status = svntest.actions.get_virginal_state(wc_dir, 1) expected_status.tweak('A/mu', wc_rev=2) - if svntest.actions.run_and_verify_commit(wc_dir, - expected_output, expected_status): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, + expected_output, expected_status) # Unmodified, mixed svntest.actions.run_and_verify_svnversion(wc_dir, repo_url, @@ -98,13 +97,12 @@ def svnversion_test(sbox): + 'appended mu text') expected_disk.tweak('iota', contents=expected_disk.desc['A/D/gamma'].contents) - if svntest.actions.run_and_verify_switch(wc_dir, iota_path, gamma_url, - expected_output, - expected_disk, - expected_status, - [], - False, '--ignore-ancestry'): - raise svntest.Failure + svntest.actions.run_and_verify_switch(wc_dir, iota_path, gamma_url, + expected_output, + expected_disk, + expected_status, + [], + False, '--ignore-ancestry') # Prop modified, mixed, part wc switched svntest.actions.run_and_verify_svnversion(wc_dir, repo_url, diff --git a/subversion/tests/cmdline/switch_tests.py b/subversion/tests/cmdline/switch_tests.py index 984aaa4..f71ec73 100755 --- a/subversion/tests/cmdline/switch_tests.py +++ b/subversion/tests/cmdline/switch_tests.py @@ -1336,25 +1336,23 @@ def mergeinfo_switch_elision(sbox): # Make branches A/B_COPY_1 and A/B_COPY_2 expected_stdout = verify.UnorderedOutput([ - "A " + sbox.ospath('A/B_COPY_1/lambda') + "\n", - "A " + sbox.ospath('A/B_COPY_1/E') + "\n", - "A " + sbox.ospath('A/B_COPY_1/E/alpha') + "\n", - "A " + sbox.ospath('A/B_COPY_1/E/beta') + "\n", - "A " + sbox.ospath('A/B_COPY_1/F') + "\n", - "Checked out revision 1.\n", "A " + B_COPY_1_path + "\n", + "A " + sbox.ospath('A/B_COPY_1/lambda') + "\n", + "A " + sbox.ospath('A/B_COPY_1/E') + "\n", + "A " + sbox.ospath('A/B_COPY_1/E/alpha') + "\n", + "A " + sbox.ospath('A/B_COPY_1/E/beta') + "\n", + "A " + sbox.ospath('A/B_COPY_1/F') + "\n", ]) svntest.actions.run_and_verify_svn(expected_stdout, [], 'copy', sbox.repo_url + "/A/B", B_COPY_1_path) expected_stdout = verify.UnorderedOutput([ - "A " + sbox.ospath('A/B_COPY_2/lambda') + "\n", - "A " + sbox.ospath('A/B_COPY_2/E') + "\n", - "A " + sbox.ospath('A/B_COPY_2/E/alpha') + "\n", - "A " + sbox.ospath('A/B_COPY_2/E/beta') + "\n", - "A " + sbox.ospath('A/B_COPY_2/F') + "\n", - "Checked out revision 1.\n", "A " + B_COPY_2_path + "\n", + "A " + sbox.ospath('A/B_COPY_2/lambda') + "\n", + "A " + sbox.ospath('A/B_COPY_2/E') + "\n", + "A " + sbox.ospath('A/B_COPY_2/E/alpha') + "\n", + "A " + sbox.ospath('A/B_COPY_2/E/beta') + "\n", + "A " + sbox.ospath('A/B_COPY_2/F') + "\n", ]) svntest.actions.run_and_verify_svn(expected_stdout, [], 'copy', sbox.repo_url + "/A/B", B_COPY_2_path) diff --git a/subversion/tests/cmdline/trans_tests.py b/subversion/tests/cmdline/trans_tests.py index 0cab75e..71ca45e 100755 --- a/subversion/tests/cmdline/trans_tests.py +++ b/subversion/tests/cmdline/trans_tests.py @@ -814,7 +814,8 @@ def props_only_file_update(sbox): ] # Create r2 with iota's contents and svn:keywords modified - open(iota_path, 'w').writelines(content) + with open(iota_path, 'w') as f: + f.writelines(content) svntest.main.run_svn(None, 'propset', 'svn:keywords', 'Author', iota_path) expected_output = wc.State(wc_dir, { @@ -831,7 +832,8 @@ def props_only_file_update(sbox): # Create r3 that drops svn:keywords # put the content back to its untranslated form - open(iota_path, 'w').writelines(content) + with open(iota_path, 'w') as f: + f.writelines(content) svntest.main.run_svn(None, 'propdel', 'svn:keywords', iota_path) diff --git a/subversion/tests/cmdline/tree_conflict_tests.py b/subversion/tests/cmdline/tree_conflict_tests.py index b3335b2..61f3231 100755 --- a/subversion/tests/cmdline/tree_conflict_tests.py +++ b/subversion/tests/cmdline/tree_conflict_tests.py @@ -473,6 +473,7 @@ def ensure_tree_conflict(sbox, operation, run_and_verify_svn(expected_stdout, [], 'merge', '--allow-mixed-revisions', + '--accept=postpone', '-r', str(source_left_rev) + ':' + str(source_right_rev), source_url, target_path) else: @@ -1096,13 +1097,15 @@ def at_directory_external(sbox): svntest.main.run_svn(None, 'update', wc_dir) # r3: modify ^/A/B/E/alpha - open(sbox.ospath('A/B/E/alpha'), 'a').write('This is still A/B/E/alpha.\n') + with open(sbox.ospath('A/B/E/alpha'), 'a') as f: + f.write('This is still A/B/E/alpha.\n') svntest.main.run_svn(None, 'commit', '-m', 'file mod', wc_dir) svntest.main.run_svn(None, 'update', wc_dir) merge_rev = svntest.main.youngest(sbox.repo_dir) # r4: create ^/A/B/E/alpha2 - open(sbox.ospath('A/B/E/alpha2'), 'a').write("This is the file 'alpha2'.\n") + with open(sbox.ospath('A/B/E/alpha2'), 'a') as f: + f.write("This is the file 'alpha2'.\n") svntest.main.run_svn(None, 'add', sbox.ospath('A/B/E/alpha2')) svntest.main.run_svn(None, 'commit', '-m', 'file add', wc_dir) svntest.main.run_svn(None, 'update', wc_dir) @@ -1503,6 +1506,47 @@ def update_delete_mixed_rev(sbox): } run_and_verify_info([expected_info], sbox.repo_url + '/A/B/E/alpha2') +# NB: This test will run forever if the bug it is testing for is present! +def local_missing_dir_endless_loop(sbox): + "endless loop when resolving local-missing dir" + + sbox.build() + wc_dir = sbox.wc_dir + sbox.simple_copy('A', 'A1') + sbox.simple_commit() + sbox.simple_update() + sbox.simple_move('A/B', 'A/B2') + sbox.simple_commit() + sbox.simple_update() + main.file_append_binary(sbox.ospath("A/B2/lambda"), "This is more content.\n") + sbox.simple_commit() + sbox.simple_update() + + # Create a config which enables the interactive conflict resolver + config_contents = '''\ +[auth] +password-stores = + +[miscellany] +interactive-conflicts = true +''' + config_dir = sbox.create_config_dir(config_contents) + + # Bug: 'svn' keeps retrying interactive conflict resolution while the library + # keeps signalling 'SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE' -> endless loop + main.run_svn("Tree conflict on '%s'" % sbox.ospath("A1/B2"), + 'merge', '-c4', '^/A', sbox.ospath('A1'), + '--config-dir', config_dir, '--force-interactive') + + # If everything works as expected the resolver will recommended a + # resolution option and 'svn' will resolve the conflict automatically. + # Verify that 'A1/B/lambda' contains the merged content: + contents = open(sbox.ospath('A1/B/lambda'), 'rb').readlines() + svntest.verify.compare_and_display_lines( + "A1/B/lambda has unexpectected contents", sbox.ospath("A1/B/lambda"), + [ "This is the file 'lambda'.\n", "This is more content.\n"], contents) + + ####################################################################### # Run the tests @@ -1534,6 +1578,7 @@ test_list = [ None, actual_only_node_behaviour, update_dir_with_not_present, update_delete_mixed_rev, + local_missing_dir_endless_loop, ] if __name__ == '__main__': diff --git a/subversion/tests/cmdline/update_tests.py b/subversion/tests/cmdline/update_tests.py index 2805081..fa6d0d7 100755 --- a/subversion/tests/cmdline/update_tests.py +++ b/subversion/tests/cmdline/update_tests.py @@ -480,7 +480,7 @@ def update_to_rev_zero(sbox): def receive_overlapping_same_change(sbox): "overlapping identical changes should not conflict" - ### (See http://subversion.tigris.org/issues/show_bug.cgi?id=682.) + ### (See https://issues.apache.org/jira/browse/SVN-682.) ### ### How this test works: ### @@ -3046,13 +3046,12 @@ def mergeinfo_update_elision(sbox): # Make a branch A/B_COPY expected_stdout = verify.UnorderedOutput([ - "A " + sbox.ospath('A/B_COPY/lambda') + "\n", - "A " + sbox.ospath('A/B_COPY/E') + "\n", - "A " + sbox.ospath('A/B_COPY/E/alpha') + "\n", - "A " + sbox.ospath('A/B_COPY/E/beta') + "\n", - "A " + sbox.ospath('A/B_COPY/F') + "\n", - "Checked out revision 1.\n", "A " + B_COPY_path + "\n", + "A " + sbox.ospath('A/B_COPY/lambda') + "\n", + "A " + sbox.ospath('A/B_COPY/E') + "\n", + "A " + sbox.ospath('A/B_COPY/E/alpha') + "\n", + "A " + sbox.ospath('A/B_COPY/E/beta') + "\n", + "A " + sbox.ospath('A/B_COPY/F') + "\n", ]) svntest.actions.run_and_verify_svn(expected_stdout, [], 'copy', sbox.repo_url + "/A/B", B_COPY_path) @@ -6719,6 +6718,7 @@ def update_conflict_details(sbox): # Keywords should be updated in local file even if text change is shortcut # (due to the local change being the same as the incoming change, for example). @XFail() +@Issue(4585) def update_keywords_on_shortcut(sbox): "update_keywords_on_shortcut" diff --git a/subversion/tests/cmdline/upgrade_tests.py b/subversion/tests/cmdline/upgrade_tests.py index 43258f6..c60dab5 100755 --- a/subversion/tests/cmdline/upgrade_tests.py +++ b/subversion/tests/cmdline/upgrade_tests.py @@ -392,7 +392,8 @@ def xml_entries_relocate(path, from_url, to_url): entries = os.path.join(path, adm_name, 'entries') txt = open(entries).read().replace('url="' + from_url, 'url="' + to_url) os.chmod(entries, svntest.main.S_ALL_RWX) - open(entries, 'w').write(txt) + with open(entries, 'w') as f: + f.write(txt) for dirent in os.listdir(path): item_path = os.path.join(path, dirent) @@ -410,7 +411,8 @@ def simple_entries_replace(path, from_url, to_url): entries = os.path.join(path, adm_name, 'entries') txt = open(entries).read().replace(from_url, to_url) os.chmod(entries, svntest.main.S_ALL_RWX) - open(entries, 'wb').write(txt.encode()) + with open(entries, 'wb') as f: + f.write(txt.encode()) for dirent in os.listdir(path): item_path = os.path.join(path, dirent) diff --git a/subversion/tests/libsvn_client/client-test.c b/subversion/tests/libsvn_client/client-test.c index c4f3448..d8603f5 100644 --- a/subversion/tests/libsvn_client/client-test.c +++ b/subversion/tests/libsvn_client/client-test.c @@ -31,6 +31,7 @@ #include "../../libsvn_client/client.h" #include "svn_pools.h" #include "svn_client.h" +#include "private/svn_client_private.h" #include "private/svn_client_mtcc.h" #include "svn_repos.h" #include "svn_subst.h" @@ -735,7 +736,10 @@ test_foreign_repos_copy(const svn_test_opts_t *opts, const char *repos2_url; const char *wc_path; svn_client_ctx_t *ctx; -/* Create a filesytem and repository containing the Greek tree. */ + svn_ra_session_t *ra_session; + svn_client__pathrev_t *loc; + + /* Create a filesytem and repository containing the Greek tree. */ SVN_ERR(create_greek_repos(&repos_url, "foreign-copy1", opts, pool)); SVN_ERR(create_greek_repos(&repos2_url, "foreign-copy2", opts, pool)); @@ -756,19 +760,26 @@ test_foreign_repos_copy(const svn_test_opts_t *opts, SVN_ERR(svn_client_checkout3(NULL, repos_url, wc_path, &peg_rev, &rev, svn_depth_infinity, FALSE, FALSE, ctx, pool)); - SVN_ERR(svn_client__copy_foreign(svn_path_url_add_component2(repos2_url, "A", - pool), - svn_dirent_join(wc_path, "A-copied", pool), - &peg_rev, &rev, svn_depth_infinity, FALSE, FALSE, - ctx, pool)); - - - SVN_ERR(svn_client__copy_foreign(svn_path_url_add_component2(repos2_url, - "iota", - pool), - svn_dirent_join(wc_path, "iota-copied", pool), - &peg_rev, &rev, svn_depth_infinity, FALSE, FALSE, - ctx, pool)); + SVN_ERR(svn_client__ra_session_from_path2(&ra_session, &loc, + repos2_url, NULL, &peg_rev, &rev, + ctx, pool)); + + loc->url = svn_path_url_add_component2(repos2_url, "A", pool); + SVN_WC__CALL_WITH_WRITE_LOCK( + svn_client__repos_to_wc_copy_by_editor(NULL /*sleep*/, svn_node_dir, + loc->url, loc->rev, + svn_dirent_join(wc_path, "A-copied", pool), + ra_session, ctx, pool), + ctx->wc_ctx, wc_path, FALSE, pool); + + SVN_ERR(svn_ra_reparent(ra_session, repos2_url, pool)); + loc->url = svn_path_url_add_component2(repos2_url, "iota", pool); + SVN_WC__CALL_WITH_WRITE_LOCK( + svn_client__repos_to_wc_copy_by_editor(NULL /*sleep*/, svn_node_file, + loc->url, loc->rev, + svn_dirent_join(wc_path, "iota-copied", pool), + ra_session, ctx, pool), + ctx->wc_ctx, wc_path, FALSE, pool); return SVN_NO_ERROR; } diff --git a/subversion/tests/libsvn_client/conflicts-test.c b/subversion/tests/libsvn_client/conflicts-test.c index 9a511b6..54e0181 100644 --- a/subversion/tests/libsvn_client/conflicts-test.c +++ b/subversion/tests/libsvn_client/conflicts-test.c @@ -546,7 +546,7 @@ create_wc_with_dir_add_vs_dir_add_merge_conflict( /* Now move the new directory to the colliding path. */ new_dir_path = svn_relpath_join(trunk_path, new_dir_name, b->pool); SVN_ERR(sbox_wc_update(b, "", SVN_INVALID_REVNUM)); - sbox_wc_move(b, move_src_path, new_dir_path); + SVN_ERR(sbox_wc_move(b, move_src_path, new_dir_path)); SVN_ERR(sbox_wc_commit(b, "")); } new_dir_path = svn_relpath_join(branch_path, new_dir_name, b->pool); @@ -2626,6 +2626,7 @@ test_merge_incoming_delete_vs_local_delete(const svn_test_opts_t *opts, svn_client_conflict_option_id_t expected_opts[] = { svn_client_conflict_option_postpone, svn_client_conflict_option_accept_current_wc_state, + svn_client_conflict_option_incoming_delete_ignore, svn_client_conflict_option_incoming_delete_accept, -1 /* end of list */ }; @@ -2639,6 +2640,7 @@ test_merge_incoming_delete_vs_local_delete(const svn_test_opts_t *opts, svn_client_conflict_option_id_t expected_opts[] = { svn_client_conflict_option_postpone, svn_client_conflict_option_accept_current_wc_state, + svn_client_conflict_option_incoming_delete_ignore, svn_client_conflict_option_incoming_delete_accept, -1 /* end of list */ }; @@ -2909,10 +2911,13 @@ test_merge_incoming_edit_file_moved_away(const svn_test_opts_t *opts, svn_client_ctx_t *ctx; svn_opt_revision_t opt_rev; svn_client_conflict_t *conflict; + apr_array_header_t *options; + svn_client_conflict_option_t *option; svn_boolean_t text_conflicted; apr_array_header_t *props_conflicted; svn_boolean_t tree_conflicted; svn_stringbuf_t *buf; + apr_array_header_t *possible_moved_to_abspaths; SVN_ERR(svn_test__sandbox_create( b, "merge_incoming_edit_file_moved_away", opts, pool)); @@ -2974,6 +2979,19 @@ test_merge_incoming_edit_file_moved_away(const svn_test_opts_t *opts, SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts, pool)); } + SVN_ERR(svn_client_conflict_tree_get_resolution_options(&options, conflict, + ctx, b->pool, + b->pool)); + option = svn_client_conflict_option_find_by_id( + options, svn_client_conflict_option_local_move_file_text_merge); + SVN_TEST_ASSERT(option != NULL); + SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates( + &possible_moved_to_abspaths, option, b->pool, b->pool)); + SVN_TEST_INT_ASSERT(possible_moved_to_abspaths->nelts, 1); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_abspaths, 0, const char *), + sbox_wc_path(b, "A1/mu-moved")); + /* Resolve the tree conflict by applying the incoming edit to the local * move destination "mu-moved". */ SVN_ERR(svn_client_conflict_tree_resolve_by_id( @@ -4987,7 +5005,7 @@ test_cherry_pick_post_move_edit(const svn_test_opts_t *opts, svn_client_conflict_option_id_t expected_opts[] = { svn_client_conflict_option_postpone, svn_client_conflict_option_accept_current_wc_state, - svn_client_conflict_option_local_move_file_text_merge, + svn_client_conflict_option_sibling_move_file_text_merge, -1 /* end of list */ }; SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts, @@ -4997,7 +5015,7 @@ test_cherry_pick_post_move_edit(const svn_test_opts_t *opts, /* Try to resolve the conflict. */ SVN_ERR(svn_client_conflict_tree_resolve_by_id( conflict, - svn_client_conflict_option_local_move_file_text_merge, + svn_client_conflict_option_sibling_move_file_text_merge, ctx, b->pool)); /* The node "A1/mu-moved" should no longer exist. */ @@ -5008,7 +5026,14 @@ test_cherry_pick_post_move_edit(const svn_test_opts_t *opts, /* And "A1/mu" should have expected contents. */ SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A1/mu"), pool)); - SVN_TEST_STRING_ASSERT(buf->data, "More modified content." APR_EOL_STR); + SVN_TEST_STRING_ASSERT(buf->data, + "<<<<<<< .working" "\n" + "This is the file 'mu'." "\n" + "||||||| .old" "\n" + "Modified content." APR_EOL_STR + "=======" "\n" + "More modified content." APR_EOL_STR + ">>>>>>> .new" "\n"); return SVN_NO_ERROR; } @@ -5587,155 +5612,256 @@ test_merge_incoming_delete_file_unrelated_move(const svn_test_opts_t *opts, } static svn_error_t * -test_update_file_add_vs_unversiond_file(const svn_test_opts_t *opts, - apr_pool_t *pool) +test_cherry_pick_post_move_edit_dir(const svn_test_opts_t *opts, + apr_pool_t *pool) { svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); - svn_client_conflict_t *conflict; + const char *trunk_url; + svn_opt_revision_t peg_rev; + apr_array_header_t *ranges_to_merge; + svn_opt_revision_range_t merge_range; svn_client_ctx_t *ctx; - struct status_baton sb; - struct svn_client_status_t *status; - svn_opt_revision_t opt_rev; + svn_client_conflict_t *conflict; + svn_boolean_t tree_conflicted; svn_stringbuf_t *buf; - SVN_ERR(svn_test__sandbox_create(b, "update_file_add_vs_unversioned_file", + SVN_ERR(svn_test__sandbox_create(b, + "test_cherry_pick_post_move_edit_dir", opts, pool)); SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ - - /* Add a new file. */ - SVN_ERR(sbox_file_write(b, new_file_name, new_file_content)); - SVN_ERR(sbox_wc_add(b, new_file_name)); + /* Create a copy of node "A". */ + SVN_ERR(sbox_wc_copy(b, "A", "A1")); SVN_ERR(sbox_wc_commit(b, "")); /* r2 */ + /* On "trunk", move the directory B. */ + SVN_ERR(sbox_wc_move(b, "A/B", "A/B-moved")); + SVN_ERR(sbox_wc_commit(b, "")); /* r3 */ + /* On "trunk", edit B-moved/lambda. This will be r4. */ + SVN_ERR(sbox_file_write(b, "A/B-moved/lambda", "Modified content." + APR_EOL_STR)); + SVN_ERR(sbox_wc_commit(b, "")); /* r4 */ + SVN_ERR(sbox_wc_update(b, "", SVN_INVALID_REVNUM)); - SVN_ERR(sbox_wc_update(b, "", 1)); /* back to r1 */ - - /* Create an identical unversioned file. */ - SVN_ERR(sbox_file_write(b, new_file_name, new_file_content)); - SVN_ERR(sbox_wc_update(b, "", 2)); /* back to r2 */ - + /* Perform a cherry-pick merge of r4 from A to A1. */ SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool)); - SVN_ERR(svn_client_conflict_get(&conflict, sbox_wc_path(b, new_file_name), + trunk_url = apr_pstrcat(b->pool, b->repos_url, "/A", SVN_VA_NULL); + peg_rev.kind = svn_opt_revision_number; + peg_rev.value.number = 4; + merge_range.start.kind = svn_opt_revision_number; + merge_range.start.value.number = 3; + merge_range.end.kind = svn_opt_revision_number; + merge_range.end.value.number = 4; + ranges_to_merge = apr_array_make(b->pool, 1, + sizeof(svn_opt_revision_range_t *)); + APR_ARRAY_PUSH(ranges_to_merge, svn_opt_revision_range_t *) = &merge_range; + /* This should raise a "local missing vs incoming edit" conflict. */ + SVN_ERR(svn_client_merge_peg5(trunk_url, ranges_to_merge, &peg_rev, + sbox_wc_path(b, "A1"), svn_depth_infinity, + FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, + NULL, ctx, b->pool)); + + SVN_ERR(svn_client_conflict_get(&conflict, + sbox_wc_path(b, "A1/B-moved"), ctx, b->pool, b->pool)); - SVN_TEST_ASSERT(svn_client_conflict_get_local_change(conflict) == - svn_wc_conflict_reason_unversioned); - SVN_TEST_ASSERT(svn_client_conflict_get_incoming_change(conflict) == - svn_wc_conflict_action_add); + SVN_ERR(svn_client_conflict_get_conflicted(NULL, NULL, &tree_conflicted, + conflict, b->pool, b->pool)); + SVN_TEST_ASSERT(tree_conflicted); { svn_client_conflict_option_id_t expected_opts[] = { svn_client_conflict_option_postpone, svn_client_conflict_option_accept_current_wc_state, - svn_client_conflict_option_incoming_added_file_text_merge, -1 /* end of list */ }; SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts, b->pool)); } + SVN_ERR(svn_client_conflict_tree_get_details(conflict, ctx, b->pool)); + { + svn_client_conflict_option_id_t expected_opts[] = { + svn_client_conflict_option_postpone, + svn_client_conflict_option_accept_current_wc_state, + svn_client_conflict_option_sibling_move_dir_merge, + -1 /* end of list */ + }; + SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts, + b->pool)); + } + + /* Try to resolve the conflict. */ SVN_ERR(svn_client_conflict_tree_resolve_by_id( conflict, - svn_client_conflict_option_incoming_added_file_text_merge, + svn_client_conflict_option_sibling_move_dir_merge, ctx, b->pool)); - /* Ensure that the file has the expected status. */ - opt_rev.kind = svn_opt_revision_working; - sb.result_pool = b->pool; - SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, new_file_name), - &opt_rev, svn_depth_unknown, TRUE, TRUE, - TRUE, TRUE, FALSE, TRUE, NULL, - status_func, &sb, b->pool)); - status = sb.status; - SVN_TEST_ASSERT(status->kind == svn_node_file); - SVN_TEST_ASSERT(status->versioned); - SVN_TEST_ASSERT(!status->conflicted); - SVN_TEST_ASSERT(status->node_status == svn_wc_status_normal); - SVN_TEST_ASSERT(status->text_status == svn_wc_status_normal); - SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); - SVN_TEST_ASSERT(!status->copied); - SVN_TEST_ASSERT(!status->switched); - SVN_TEST_ASSERT(!status->file_external); - SVN_TEST_ASSERT(status->moved_from_abspath == NULL); - SVN_TEST_ASSERT(status->moved_to_abspath == NULL); + /* The node "B-moved" should no longer exist. */ + SVN_TEST_ASSERT_ERROR(svn_client_conflict_get(&conflict, + sbox_wc_path(b, "A1/B-moved"), + ctx, pool, pool), + SVN_ERR_WC_PATH_NOT_FOUND); + + /* And "A1/B/lambda" should have expected contents. */ + SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A1/B/lambda"), pool)); + SVN_TEST_STRING_ASSERT(buf->data, "Modified content." APR_EOL_STR); - /* Ensure that the file has the expected content. */ - SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, new_file_name), - b->pool)); - SVN_TEST_STRING_ASSERT(buf->data, new_file_content); return SVN_NO_ERROR; } static svn_error_t * -test_switch_file_add_vs_unversiond_file(const svn_test_opts_t *opts, - apr_pool_t *pool) +test_local_missing_abiguous_moves(const svn_test_opts_t *opts, + apr_pool_t *pool) { svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); - svn_client_conflict_t *conflict; + svn_opt_revision_t opt_rev; svn_client_ctx_t *ctx; + svn_client_conflict_t *conflict; + apr_array_header_t *options; + svn_client_conflict_option_t *option; + apr_array_header_t *possible_moved_to_repos_relpaths; + apr_array_header_t *possible_moved_to_abspaths; struct status_baton sb; struct svn_client_status_t *status; - svn_opt_revision_t opt_rev; svn_stringbuf_t *buf; - svn_revnum_t result_rev; - const char *trunk_url; - const char *new_file_path; - SVN_ERR(svn_test__sandbox_create(b, "switch_file_add_vs_unversioned_file", - opts, pool)); + SVN_ERR(svn_test__sandbox_create(b, "local_missing_ambiguous_moves", opts, + pool)); SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ - /* Create a branch of node "A". */ - SVN_ERR(sbox_wc_copy(b, trunk_path, branch_path)); + /* Create a copy of node "A" (the "trunk") to "A1" (the "branch"). */ + SVN_ERR(sbox_wc_copy(b, "A", "A1")); SVN_ERR(sbox_wc_commit(b, "")); /* r2 */ - /* Add a new file on trunk. */ - new_file_path = svn_relpath_join(trunk_path, new_file_name, b->pool); - SVN_ERR(sbox_file_write(b, new_file_path, new_file_content)); - SVN_ERR(sbox_wc_add(b, new_file_path)); + SVN_ERR(sbox_wc_update(b, "", SVN_INVALID_REVNUM)); + /* Copy a file across branch boundaries (gives ambiguous WC targets later). */ + SVN_ERR(sbox_wc_copy(b, "A/mu", "A1/mu-copied-from-A")); + /* Create an ambiguous move with the "trunk". */ + SVN_ERR(sbox_wc_copy(b, "A/mu", "A/mu-copied")); + SVN_ERR(sbox_wc_move(b, "A/mu", "A/mu-moved")); SVN_ERR(sbox_wc_commit(b, "")); /* r3 */ - SVN_ERR(sbox_wc_update(b, "", 2)); /* back to r2 */ - - /* Create an identical unversioned file on the branch. */ - new_file_path = svn_relpath_join(branch_path, new_file_name, b->pool); - SVN_ERR(sbox_file_write(b, new_file_path, new_file_content)); + /* Modify the moved file on the "branch". */ + SVN_ERR(sbox_file_write(b, "A1/mu", "Modified content." APR_EOL_STR)); + SVN_ERR(sbox_wc_commit(b, "")); /* r4 */ + SVN_ERR(sbox_wc_update(b, "", SVN_INVALID_REVNUM)); - /* Switch branch to trunk. */ - trunk_url = apr_pstrcat(b->pool, b->repos_url, "/", trunk_path, SVN_VA_NULL); - SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool)); + /* Merge "A1" ("branch") into "A" ("trunk"). */ opt_rev.kind = svn_opt_revision_head; opt_rev.value.number = SVN_INVALID_REVNUM; - SVN_ERR(svn_client_switch3(&result_rev, sbox_wc_path(b, branch_path), - trunk_url, &opt_rev, &opt_rev, - svn_depth_infinity, - TRUE, FALSE, FALSE, FALSE, ctx, b->pool)); + SVN_ERR(svn_test__create_client_ctx(&ctx, b, pool)); + SVN_ERR(svn_client_merge_peg5(svn_path_url_add_component2(b->repos_url, "A1", + pool), + NULL, &opt_rev, sbox_wc_path(b, "A"), + svn_depth_infinity, + FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, + NULL, ctx, pool)); - SVN_ERR(svn_client_conflict_get(&conflict, sbox_wc_path(b, new_file_path), + SVN_ERR(svn_client_conflict_get(&conflict, sbox_wc_path(b, "A/mu"), ctx, b->pool, b->pool)); - SVN_TEST_ASSERT(svn_client_conflict_get_local_change(conflict) == - svn_wc_conflict_reason_unversioned); - SVN_TEST_ASSERT(svn_client_conflict_get_incoming_change(conflict) == - svn_wc_conflict_action_add); { svn_client_conflict_option_id_t expected_opts[] = { svn_client_conflict_option_postpone, svn_client_conflict_option_accept_current_wc_state, - svn_client_conflict_option_incoming_added_file_text_merge, -1 /* end of list */ }; SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts, b->pool)); } + SVN_ERR(svn_client_conflict_tree_get_details(conflict, ctx, b->pool)); + { + svn_client_conflict_option_id_t expected_opts[] = { + svn_client_conflict_option_postpone, + svn_client_conflict_option_accept_current_wc_state, + svn_client_conflict_option_local_move_file_text_merge, + -1 /* end of list */ + }; + SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts, + b->pool)); + } + + SVN_ERR(svn_client_conflict_tree_get_resolution_options(&options, conflict, + ctx, b->pool, + b->pool)); + option = svn_client_conflict_option_find_by_id( + options, svn_client_conflict_option_local_move_file_text_merge); + SVN_TEST_ASSERT(option != NULL); + + /* + * Possible repository destinations for moved-away 'A/mu' are: + * (1): '^/A/mu-copied' + * (2): '^/A/mu-moved' + * (3): '^/A1/mu-copied-from-A' + */ + SVN_ERR(svn_client_conflict_option_get_moved_to_repos_relpath_candidates( + &possible_moved_to_repos_relpaths, option, b->pool, b->pool)); + SVN_TEST_INT_ASSERT(possible_moved_to_repos_relpaths->nelts, 3); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_repos_relpaths, 0, const char *), + "A/mu-copied"); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_repos_relpaths, 1, const char *), + "A/mu-moved"); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_repos_relpaths, 2, const char *), + "A1/mu-copied-from-A"); + + /* Move target for "A/mu-copied" (selected by default) is not ambiguous. */ + SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates( + &possible_moved_to_abspaths, option, b->pool, b->pool)); + SVN_TEST_INT_ASSERT(possible_moved_to_abspaths->nelts, 1); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_abspaths, 0, const char *), + sbox_wc_path(b, "A/mu-copied")); + + /* Move target for "A/mu-moved" is not ambiguous. */ + SVN_ERR(svn_client_conflict_option_set_moved_to_repos_relpath(option, 1, + ctx, b->pool)); + SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates( + &possible_moved_to_abspaths, option, b->pool, b->pool)); + SVN_TEST_INT_ASSERT(possible_moved_to_abspaths->nelts, 1); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_abspaths, 0, const char *), + sbox_wc_path(b, "A/mu-moved")); + + /* Select move target "A1/mu-copied-from-A". */ + SVN_ERR(svn_client_conflict_option_set_moved_to_repos_relpath(option, 2, + ctx, b->pool)); + + /* + * Possible working copy destinations for moved-away 'A/mu' are: + * (1): 'A/mu-copied-from-A' + * (2): 'A1/mu-copied-from-A' + */ + SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates( + &possible_moved_to_abspaths, option, b->pool, b->pool)); + SVN_TEST_INT_ASSERT(possible_moved_to_abspaths->nelts, 2); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_abspaths, 0, const char *), + sbox_wc_path(b, "A/mu-copied-from-A")); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_abspaths, 1, const char *), + sbox_wc_path(b, "A1/mu-copied-from-A")); + /* Select move target "A/mu-moved". */ + SVN_ERR(svn_client_conflict_option_set_moved_to_repos_relpath(option, 1, + ctx, b->pool)); + + /* Resolve the tree conflict. */ SVN_ERR(svn_client_conflict_tree_resolve_by_id( conflict, - svn_client_conflict_option_incoming_added_file_text_merge, - ctx, b->pool)); + svn_client_conflict_option_local_move_file_text_merge, ctx, + b->pool)); - /* Ensure that the file has the expected status. */ + /* The node "A/mu" should no longer exist. */ + SVN_TEST_ASSERT_ERROR(svn_client_conflict_get(&conflict, + sbox_wc_path(b, "A/mu"), + ctx, pool, pool), + SVN_ERR_WC_PATH_NOT_FOUND); + + /* Ensure that the merged file has the expected status. */ opt_rev.kind = svn_opt_revision_working; sb.result_pool = b->pool; - SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, new_file_path), + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, "A/mu-moved"), &opt_rev, svn_depth_unknown, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL, status_func, &sb, b->pool)); @@ -5743,8 +5869,8 @@ test_switch_file_add_vs_unversiond_file(const svn_test_opts_t *opts, SVN_TEST_ASSERT(status->kind == svn_node_file); SVN_TEST_ASSERT(status->versioned); SVN_TEST_ASSERT(!status->conflicted); - SVN_TEST_ASSERT(status->node_status == svn_wc_status_normal); - SVN_TEST_ASSERT(status->text_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_modified); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_modified); SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); SVN_TEST_ASSERT(!status->copied); SVN_TEST_ASSERT(!status->switched); @@ -5752,237 +5878,1587 @@ test_switch_file_add_vs_unversiond_file(const svn_test_opts_t *opts, SVN_TEST_ASSERT(status->moved_from_abspath == NULL); SVN_TEST_ASSERT(status->moved_to_abspath == NULL); - /* Ensure that the file has the expected content. */ - SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, new_file_path), - b->pool)); - SVN_TEST_STRING_ASSERT(buf->data, new_file_content); + /* And it should have expected contents. */ + SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A/mu-moved"), + pool)); + SVN_TEST_STRING_ASSERT(buf->data, "Modified content." APR_EOL_STR); + return SVN_NO_ERROR; } static svn_error_t * -create_unversioned_dir(const char **new_file_path, - const char **unversioned_file_path, - const char *new_dir_path, - svn_test__sandbox_t *b, apr_pool_t *pool) +test_local_missing_abiguous_moves_dir(const svn_test_opts_t *opts, + apr_pool_t *pool) { - apr_file_t *file; - apr_size_t content_len; + svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); + svn_opt_revision_t opt_rev; + svn_client_ctx_t *ctx; + svn_client_conflict_t *conflict; + apr_array_header_t *options; + svn_client_conflict_option_t *option; + apr_array_header_t *possible_moved_to_repos_relpaths; + apr_array_header_t *possible_moved_to_abspaths; + struct status_baton sb; + struct svn_client_status_t *status; + svn_stringbuf_t *buf; - /* Create an unversioned directory. */ - SVN_ERR(svn_io_dir_make(sbox_wc_path(b, new_dir_path), APR_OS_DEFAULT, - b->pool)); + SVN_ERR(svn_test__sandbox_create(b, "local_missing_ambiguous_moves_dir", + opts, pool)); - /* Create an unversioned file which will collide with a versioned file. */ - *new_file_path = svn_relpath_join(new_dir_path, new_file_name, b->pool); - SVN_ERR(svn_io_file_open(&file, sbox_wc_path(b, *new_file_path), - (APR_READ | APR_WRITE | APR_CREATE | APR_TRUNCATE), APR_OS_DEFAULT, - b->pool)); - content_len = strlen(unversioned_file_content); - SVN_ERR(svn_io_file_write(file, unversioned_file_content, &content_len, + SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ + + /* Create a copy of node "A" (the "trunk") to "A1" (the "branch"). */ + SVN_ERR(sbox_wc_copy(b, "A", "A1")); + SVN_ERR(sbox_wc_commit(b, "")); /* r2 */ + + SVN_ERR(sbox_wc_update(b, "", SVN_INVALID_REVNUM)); + /* Copy a dir across branch boundaries (gives ambiguous WC targets later). */ + SVN_ERR(sbox_wc_copy(b, "A/B", "A1/B-copied-from-A")); + /* Create an ambiguous move with the "trunk". */ + SVN_ERR(sbox_wc_copy(b, "A/B", "A/B-copied")); + SVN_ERR(sbox_wc_move(b, "A/B", "A/B-moved")); + SVN_ERR(sbox_wc_commit(b, "")); /* r3 */ + + /* Modify a file in the moved directory on the "branch". */ + SVN_ERR(sbox_file_write(b, "A1/B/lambda", "Modified content." APR_EOL_STR)); + SVN_ERR(sbox_wc_commit(b, "")); /* r4 */ + SVN_ERR(sbox_wc_update(b, "", SVN_INVALID_REVNUM)); + + /* Merge "A1" ("branch") into "A" ("trunk"). */ + opt_rev.kind = svn_opt_revision_head; + opt_rev.value.number = SVN_INVALID_REVNUM; + SVN_ERR(svn_test__create_client_ctx(&ctx, b, pool)); + SVN_ERR(svn_client_merge_peg5(svn_path_url_add_component2(b->repos_url, "A1", + pool), + NULL, &opt_rev, sbox_wc_path(b, "A"), + svn_depth_infinity, + FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, + NULL, ctx, pool)); + + SVN_ERR(svn_client_conflict_get(&conflict, sbox_wc_path(b, "A/B"), + ctx, b->pool, b->pool)); + { + svn_client_conflict_option_id_t expected_opts[] = { + svn_client_conflict_option_postpone, + svn_client_conflict_option_accept_current_wc_state, + -1 /* end of list */ + }; + SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts, + b->pool)); + } + SVN_ERR(svn_client_conflict_tree_get_details(conflict, ctx, b->pool)); + { + svn_client_conflict_option_id_t expected_opts[] = { + svn_client_conflict_option_postpone, + svn_client_conflict_option_accept_current_wc_state, + svn_client_conflict_option_local_move_dir_merge, + -1 /* end of list */ + }; + SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts, + b->pool)); + } + + SVN_ERR(svn_client_conflict_tree_get_resolution_options(&options, conflict, + ctx, b->pool, + b->pool)); + option = svn_client_conflict_option_find_by_id( + options, svn_client_conflict_option_local_move_dir_merge); + SVN_TEST_ASSERT(option != NULL); + + /* + * Possible repository destinations for moved-away 'A/B' are: + * (1): '^/A/B-copied' + * (2): '^/A/B-moved' + * (3): '^/A1/B-copied-from-A' + */ + SVN_ERR(svn_client_conflict_option_get_moved_to_repos_relpath_candidates( + &possible_moved_to_repos_relpaths, option, b->pool, b->pool)); + SVN_TEST_INT_ASSERT(possible_moved_to_repos_relpaths->nelts, 3); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_repos_relpaths, 0, const char *), + "A/B-copied"); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_repos_relpaths, 1, const char *), + "A/B-moved"); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_repos_relpaths, 2, const char *), + "A1/B-copied-from-A"); + + /* Move target for "A/B-copied" (selected by default) is not ambiguous. */ + SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates( + &possible_moved_to_abspaths, option, b->pool, b->pool)); + SVN_TEST_INT_ASSERT(possible_moved_to_abspaths->nelts, 1); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_abspaths, 0, const char *), + sbox_wc_path(b, "A/B-copied")); + + /* Move target for "A/B-moved" is not ambiguous. */ + SVN_ERR(svn_client_conflict_option_set_moved_to_repos_relpath(option, 1, + ctx, b->pool)); + SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates( + &possible_moved_to_abspaths, option, b->pool, b->pool)); + SVN_TEST_INT_ASSERT(possible_moved_to_abspaths->nelts, 1); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_abspaths, 0, const char *), + sbox_wc_path(b, "A/B-moved")); + + /* Select move target "A1/mu-copied-from-A". */ + SVN_ERR(svn_client_conflict_option_set_moved_to_repos_relpath(option, 2, + ctx, b->pool)); + + /* + * Possible working copy destinations for moved-away 'A/B-copied-from-A' are: + * (1): 'A/B-copied-from-A' + * (2): 'A1/B-copied-from-A' + */ + SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates( + &possible_moved_to_abspaths, option, b->pool, b->pool)); + SVN_TEST_INT_ASSERT(possible_moved_to_abspaths->nelts, 2); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_abspaths, 0, const char *), + sbox_wc_path(b, "A/B-copied-from-A")); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_abspaths, 1, const char *), + sbox_wc_path(b, "A1/B-copied-from-A")); + + /* Select move target "A/B-moved". */ + SVN_ERR(svn_client_conflict_option_set_moved_to_repos_relpath(option, 1, + ctx, b->pool)); + + /* Resolve the tree conflict. */ + SVN_ERR(svn_client_conflict_tree_resolve_by_id( + conflict, + svn_client_conflict_option_local_move_dir_merge, ctx, + b->pool)); + + /* The node "A/B" should no longer exist. */ + SVN_TEST_ASSERT_ERROR(svn_client_conflict_get(&conflict, + sbox_wc_path(b, "A/B"), + ctx, pool, pool), + SVN_ERR_WC_PATH_NOT_FOUND); + + /* Ensure that the merged file has the expected status. */ + opt_rev.kind = svn_opt_revision_working; + sb.result_pool = b->pool; + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, "A/B-moved/lambda"), + &opt_rev, svn_depth_unknown, TRUE, TRUE, + TRUE, TRUE, FALSE, TRUE, NULL, + status_func, &sb, b->pool)); + status = sb.status; + SVN_TEST_ASSERT(status->kind == svn_node_file); + SVN_TEST_ASSERT(status->versioned); + SVN_TEST_ASSERT(!status->conflicted); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_modified); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_modified); + SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); + SVN_TEST_ASSERT(!status->copied); + SVN_TEST_ASSERT(!status->switched); + SVN_TEST_ASSERT(!status->file_external); + SVN_TEST_ASSERT(status->moved_from_abspath == NULL); + SVN_TEST_ASSERT(status->moved_to_abspath == NULL); + + /* And it should have expected contents. */ + SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A/B-moved/lambda"), + pool)); + SVN_TEST_STRING_ASSERT(buf->data, "Modified content." APR_EOL_STR); + + return SVN_NO_ERROR; +} + +static svn_error_t * +test_file_vs_dir_move_merge_assertion_failure(const svn_test_opts_t *opts, + apr_pool_t *pool) +{ + svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); + svn_opt_revision_t opt_rev, peg_rev; + svn_client_ctx_t *ctx; + svn_client_conflict_t *conflict; + apr_array_header_t *options; + svn_client_conflict_option_t *option; + const char *wc_path; + + SVN_ERR(svn_test__sandbox_create(b, + "file_vs_dir_move_merge_assertion_failure", + opts, pool)); + + SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ + + /* Create a copy of node "A" (the "trunk") to "A1" (the "branch"). */ + SVN_ERR(sbox_wc_copy(b, "A", "A1")); + SVN_ERR(sbox_wc_commit(b, "")); /* r2 */ + + SVN_ERR(sbox_wc_update(b, "", SVN_INVALID_REVNUM)); + /* Move and modify file on the "branch" */ + SVN_ERR(sbox_wc_move(b, "A1/B/lambda", "A1/B/lambda-moved")); + SVN_ERR(sbox_file_write(b, "A1/B/lambda-moved", + "Modified content." APR_EOL_STR)); + SVN_ERR(sbox_wc_commit(b, "")); /* r3 */ + + /* Move a directory and modify a file inside of it on the "trunk". */ + SVN_ERR(sbox_wc_move(b, "A/B", "A/B-moved")); + SVN_ERR(sbox_file_write(b, "A/B-moved/lambda", + "Modified content." APR_EOL_STR)); + SVN_ERR(sbox_wc_commit(b, "")); /* r4 */ + SVN_ERR(sbox_wc_update(b, "", SVN_INVALID_REVNUM)); + + /* Create a fresh working copy for "A1" ("branch"). */ + wc_path = svn_test_data_path("file_vs_dir_move_merge_assertion_failure2", + pool); + SVN_ERR(svn_io_remove_dir2(wc_path, TRUE, NULL, NULL, pool)); + SVN_ERR(svn_io_make_dir_recursively(wc_path, pool)); + svn_test_add_dir_cleanup(wc_path); + + /* Merge "A" ("trunk") into a fresh working copy of "A1" ("branch"). */ + opt_rev.kind = svn_opt_revision_head; + opt_rev.value.number = SVN_INVALID_REVNUM; + peg_rev.kind = svn_opt_revision_unspecified; + SVN_ERR(svn_test__create_client_ctx(&ctx, b, pool)); + SVN_ERR(svn_client_checkout3(NULL, svn_path_url_add_component2(b->repos_url, + "A1", pool), + wc_path, &peg_rev, &opt_rev, svn_depth_infinity, + TRUE, FALSE, ctx, pool)); + + SVN_ERR(svn_client_merge_peg5(svn_path_url_add_component2(b->repos_url, "A", + pool), + NULL, &opt_rev, wc_path, svn_depth_infinity, + FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, + NULL, ctx, pool)); + + SVN_ERR(svn_client_conflict_get(&conflict, + svn_dirent_join(wc_path, "B", b->pool), + ctx, b->pool, b->pool)); + { + svn_client_conflict_option_id_t expected_opts[] = { + svn_client_conflict_option_postpone, + svn_client_conflict_option_accept_current_wc_state, + svn_client_conflict_option_incoming_delete_ignore, + svn_client_conflict_option_incoming_delete_accept, + -1 /* end of list */ + }; + SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts, + b->pool)); + } + SVN_ERR(svn_client_conflict_tree_get_details(conflict, ctx, b->pool)); + { + svn_client_conflict_option_id_t expected_opts[] = { + svn_client_conflict_option_postpone, + svn_client_conflict_option_accept_current_wc_state, + svn_client_conflict_option_incoming_move_dir_merge, + -1 /* end of list */ + }; + SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts, + b->pool)); + } + + SVN_ERR(svn_client_conflict_tree_get_resolution_options(&options, conflict, + ctx, b->pool, + b->pool)); + option = svn_client_conflict_option_find_by_id( + options, svn_client_conflict_option_incoming_move_dir_merge); + SVN_TEST_ASSERT(option != NULL); + + /* Resolve this conflict. Another one will be raised. */ + SVN_ERR(svn_client_conflict_tree_resolve_by_id( + conflict, + svn_client_conflict_option_incoming_move_dir_merge, ctx, + b->pool)); + + SVN_ERR(svn_client_conflict_get(&conflict, + svn_dirent_join_many(b->pool, + wc_path, "B-moved", "lambda", NULL), + ctx, b->pool, b->pool)); + { + svn_client_conflict_option_id_t expected_opts[] = { + svn_client_conflict_option_postpone, + svn_client_conflict_option_accept_current_wc_state, + -1 /* end of list */ + }; + SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts, + b->pool)); + } + + /* This used to trigger an assertion failure: + * svn_tests: E235000: In file 'subversion/libsvn_client/conflicts.c' \ + * line 2242: assertion failed (start_rev > end_rev) */ + SVN_ERR(svn_client_conflict_tree_get_details(conflict, ctx, b->pool)); + { + svn_client_conflict_option_id_t expected_opts[] = { + svn_client_conflict_option_postpone, + svn_client_conflict_option_accept_current_wc_state, + -1 /* end of list */ + }; + SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts, + b->pool)); + } + + /* Subversion is not yet smart enough to resolve this tree conflict. */ + + return SVN_NO_ERROR; +} + +static svn_error_t * +test_update_file_add_vs_unversiond_file(const svn_test_opts_t *opts, + apr_pool_t *pool) +{ + svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); + svn_client_conflict_t *conflict; + svn_client_ctx_t *ctx; + struct status_baton sb; + struct svn_client_status_t *status; + svn_opt_revision_t opt_rev; + svn_stringbuf_t *buf; + + SVN_ERR(svn_test__sandbox_create(b, "update_file_add_vs_unversioned_file", + opts, pool)); + + SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ + + /* Add a new file. */ + SVN_ERR(sbox_file_write(b, new_file_name, new_file_content)); + SVN_ERR(sbox_wc_add(b, new_file_name)); + SVN_ERR(sbox_wc_commit(b, "")); /* r2 */ + + SVN_ERR(sbox_wc_update(b, "", 1)); /* back to r1 */ + + /* Create an identical unversioned file. */ + SVN_ERR(sbox_file_write(b, new_file_name, new_file_content)); + SVN_ERR(sbox_wc_update(b, "", 2)); /* back to r2 */ + + SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool)); + SVN_ERR(svn_client_conflict_get(&conflict, sbox_wc_path(b, new_file_name), + ctx, b->pool, b->pool)); + SVN_TEST_ASSERT(svn_client_conflict_get_local_change(conflict) == + svn_wc_conflict_reason_unversioned); + SVN_TEST_ASSERT(svn_client_conflict_get_incoming_change(conflict) == + svn_wc_conflict_action_add); + { + svn_client_conflict_option_id_t expected_opts[] = { + svn_client_conflict_option_postpone, + svn_client_conflict_option_accept_current_wc_state, + svn_client_conflict_option_incoming_added_file_text_merge, + -1 /* end of list */ + }; + SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts, + b->pool)); + } + + SVN_ERR(svn_client_conflict_tree_resolve_by_id( + conflict, + svn_client_conflict_option_incoming_added_file_text_merge, + ctx, b->pool)); + + /* Ensure that the file has the expected status. */ + opt_rev.kind = svn_opt_revision_working; + sb.result_pool = b->pool; + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, new_file_name), + &opt_rev, svn_depth_unknown, TRUE, TRUE, + TRUE, TRUE, FALSE, TRUE, NULL, + status_func, &sb, b->pool)); + status = sb.status; + SVN_TEST_ASSERT(status->kind == svn_node_file); + SVN_TEST_ASSERT(status->versioned); + SVN_TEST_ASSERT(!status->conflicted); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); + SVN_TEST_ASSERT(!status->copied); + SVN_TEST_ASSERT(!status->switched); + SVN_TEST_ASSERT(!status->file_external); + SVN_TEST_ASSERT(status->moved_from_abspath == NULL); + SVN_TEST_ASSERT(status->moved_to_abspath == NULL); + + /* Ensure that the file has the expected content. */ + SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, new_file_name), + b->pool)); + SVN_TEST_STRING_ASSERT(buf->data, new_file_content); + return SVN_NO_ERROR; +} + +static svn_error_t * +test_switch_file_add_vs_unversiond_file(const svn_test_opts_t *opts, + apr_pool_t *pool) +{ + svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); + svn_client_conflict_t *conflict; + svn_client_ctx_t *ctx; + struct status_baton sb; + struct svn_client_status_t *status; + svn_opt_revision_t opt_rev; + svn_stringbuf_t *buf; + svn_revnum_t result_rev; + const char *trunk_url; + const char *new_file_path; + + SVN_ERR(svn_test__sandbox_create(b, "switch_file_add_vs_unversioned_file", + opts, pool)); + + SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ + + /* Create a branch of node "A". */ + SVN_ERR(sbox_wc_copy(b, trunk_path, branch_path)); + SVN_ERR(sbox_wc_commit(b, "")); /* r2 */ + + /* Add a new file on trunk. */ + new_file_path = svn_relpath_join(trunk_path, new_file_name, b->pool); + SVN_ERR(sbox_file_write(b, new_file_path, new_file_content)); + SVN_ERR(sbox_wc_add(b, new_file_path)); + SVN_ERR(sbox_wc_commit(b, "")); /* r3 */ + + SVN_ERR(sbox_wc_update(b, "", 2)); /* back to r2 */ + + /* Create an identical unversioned file on the branch. */ + new_file_path = svn_relpath_join(branch_path, new_file_name, b->pool); + SVN_ERR(sbox_file_write(b, new_file_path, new_file_content)); + + /* Switch branch to trunk. */ + trunk_url = apr_pstrcat(b->pool, b->repos_url, "/", trunk_path, SVN_VA_NULL); + SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool)); + opt_rev.kind = svn_opt_revision_head; + opt_rev.value.number = SVN_INVALID_REVNUM; + SVN_ERR(svn_client_switch3(&result_rev, sbox_wc_path(b, branch_path), + trunk_url, &opt_rev, &opt_rev, + svn_depth_infinity, + TRUE, FALSE, FALSE, FALSE, ctx, b->pool)); + + SVN_ERR(svn_client_conflict_get(&conflict, sbox_wc_path(b, new_file_path), + ctx, b->pool, b->pool)); + SVN_TEST_ASSERT(svn_client_conflict_get_local_change(conflict) == + svn_wc_conflict_reason_unversioned); + SVN_TEST_ASSERT(svn_client_conflict_get_incoming_change(conflict) == + svn_wc_conflict_action_add); + { + svn_client_conflict_option_id_t expected_opts[] = { + svn_client_conflict_option_postpone, + svn_client_conflict_option_accept_current_wc_state, + svn_client_conflict_option_incoming_added_file_text_merge, + -1 /* end of list */ + }; + SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts, + b->pool)); + } + + SVN_ERR(svn_client_conflict_tree_resolve_by_id( + conflict, + svn_client_conflict_option_incoming_added_file_text_merge, + ctx, b->pool)); + + /* Ensure that the file has the expected status. */ + opt_rev.kind = svn_opt_revision_working; + sb.result_pool = b->pool; + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, new_file_path), + &opt_rev, svn_depth_unknown, TRUE, TRUE, + TRUE, TRUE, FALSE, TRUE, NULL, + status_func, &sb, b->pool)); + status = sb.status; + SVN_TEST_ASSERT(status->kind == svn_node_file); + SVN_TEST_ASSERT(status->versioned); + SVN_TEST_ASSERT(!status->conflicted); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); + SVN_TEST_ASSERT(!status->copied); + SVN_TEST_ASSERT(!status->switched); + SVN_TEST_ASSERT(!status->file_external); + SVN_TEST_ASSERT(status->moved_from_abspath == NULL); + SVN_TEST_ASSERT(status->moved_to_abspath == NULL); + + /* Ensure that the file has the expected content. */ + SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, new_file_path), + b->pool)); + SVN_TEST_STRING_ASSERT(buf->data, new_file_content); + return SVN_NO_ERROR; +} + +static svn_error_t * +create_unversioned_dir(const char **new_file_path, + const char **unversioned_file_path, + const char *new_dir_path, + svn_test__sandbox_t *b, apr_pool_t *pool) +{ + apr_file_t *file; + apr_size_t content_len; + + /* Create an unversioned directory. */ + SVN_ERR(svn_io_dir_make(sbox_wc_path(b, new_dir_path), APR_OS_DEFAULT, + b->pool)); + + /* Create an unversioned file which will collide with a versioned file. */ + *new_file_path = svn_relpath_join(new_dir_path, new_file_name, b->pool); + SVN_ERR(svn_io_file_open(&file, sbox_wc_path(b, *new_file_path), + (APR_READ | APR_WRITE | APR_CREATE | APR_TRUNCATE), APR_OS_DEFAULT, + b->pool)); + content_len = strlen(unversioned_file_content); + SVN_ERR(svn_io_file_write(file, unversioned_file_content, &content_len, + b->pool)); + SVN_ERR(svn_io_file_close(file, b->pool)); + + /* Create another unversioned file at a different path. */ + *unversioned_file_path = svn_relpath_join(new_dir_path, unversioned_file_name, + b->pool); + SVN_ERR(svn_io_file_open(&file, sbox_wc_path(b, *unversioned_file_path), + (APR_READ | APR_WRITE | APR_CREATE | APR_TRUNCATE), APR_OS_DEFAULT, + b->pool)); + content_len = strlen(unversioned_file_content); + SVN_ERR(svn_io_file_write(file, unversioned_file_content, &content_len, b->pool)); SVN_ERR(svn_io_file_close(file, b->pool)); - /* Create another unversioned file at a different path. */ - *unversioned_file_path = svn_relpath_join(new_dir_path, unversioned_file_name, - b->pool); - SVN_ERR(svn_io_file_open(&file, sbox_wc_path(b, *unversioned_file_path), - (APR_READ | APR_WRITE | APR_CREATE | APR_TRUNCATE), APR_OS_DEFAULT, - b->pool)); - content_len = strlen(unversioned_file_content); - SVN_ERR(svn_io_file_write(file, unversioned_file_content, &content_len, - b->pool)); - SVN_ERR(svn_io_file_close(file, b->pool)); + return SVN_NO_ERROR; +} + +static svn_error_t * +resolve_added_dir_vs_unversioned_dir(const char *new_dir_path, + const char *new_file_path, + const char *unversioned_file_path, + svn_test__sandbox_t *b, apr_pool_t *pool) +{ + svn_client_ctx_t *ctx; + svn_client_conflict_t *conflict; + svn_opt_revision_t opt_rev; + struct status_baton sb; + struct svn_client_status_t *status; + svn_stringbuf_t *buf; + + SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool)); + SVN_ERR(svn_client_conflict_get(&conflict, sbox_wc_path(b, new_dir_path), + ctx, b->pool, b->pool)); + SVN_TEST_ASSERT(svn_client_conflict_get_local_change(conflict) == + svn_wc_conflict_reason_unversioned); + SVN_TEST_ASSERT(svn_client_conflict_get_incoming_change(conflict) == + svn_wc_conflict_action_add); + { + svn_client_conflict_option_id_t expected_opts[] = { + svn_client_conflict_option_postpone, + svn_client_conflict_option_accept_current_wc_state, + svn_client_conflict_option_incoming_added_dir_merge, + -1 /* end of list */ + }; + SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts, + b->pool)); + } + + SVN_ERR(svn_client_conflict_tree_resolve_by_id( + conflict, + svn_client_conflict_option_incoming_added_dir_merge, + ctx, b->pool)); + + /* Ensure that the directory has the expected status. */ + opt_rev.kind = svn_opt_revision_working; + sb.result_pool = b->pool; + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, new_dir_path), + &opt_rev, svn_depth_unknown, TRUE, TRUE, + TRUE, TRUE, FALSE, TRUE, NULL, + status_func, &sb, b->pool)); + status = sb.status; + SVN_TEST_ASSERT(status->kind == svn_node_dir); + SVN_TEST_ASSERT(status->versioned); + SVN_TEST_ASSERT(!status->conflicted); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); + SVN_TEST_ASSERT(!status->copied); + SVN_TEST_ASSERT(!status->switched); + SVN_TEST_ASSERT(!status->file_external); + SVN_TEST_ASSERT(status->moved_from_abspath == NULL); + SVN_TEST_ASSERT(status->moved_to_abspath == NULL); + + /* Ensure that the "collision" file has the expected status. */ + opt_rev.kind = svn_opt_revision_working; + sb.result_pool = b->pool; + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, new_file_path), + &opt_rev, svn_depth_unknown, TRUE, TRUE, + TRUE, TRUE, FALSE, TRUE, NULL, + status_func, &sb, b->pool)); + status = sb.status; + SVN_TEST_ASSERT(status->kind == svn_node_file); + SVN_TEST_ASSERT(status->versioned); + SVN_TEST_ASSERT(!status->conflicted); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_modified); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_modified); + SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); + SVN_TEST_ASSERT(!status->copied); + SVN_TEST_ASSERT(!status->switched); + SVN_TEST_ASSERT(!status->file_external); + SVN_TEST_ASSERT(status->moved_from_abspath == NULL); + SVN_TEST_ASSERT(status->moved_to_abspath == NULL); + + /* Ensure that the file has the expected content. */ + SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, new_file_path), + b->pool)); + SVN_TEST_STRING_ASSERT(buf->data, unversioned_file_content); + + /* Ensure that the unversioned file has the expected status. */ + opt_rev.kind = svn_opt_revision_working; + sb.result_pool = b->pool; + SVN_TEST_ASSERT_ERROR( + svn_client_status6(NULL, ctx, sbox_wc_path(b, unversioned_file_path), + &opt_rev, svn_depth_unknown, TRUE, TRUE, + TRUE, TRUE, FALSE, TRUE, NULL, + status_func, &sb, b->pool), + SVN_ERR_ENTRY_NOT_FOUND); + + /* Ensure that the file has the expected content. */ + SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, unversioned_file_path), + b->pool)); + SVN_TEST_STRING_ASSERT(buf->data, unversioned_file_content); + + return SVN_NO_ERROR; +} + +static svn_error_t * +test_update_dir_add_vs_unversioned_dir(const svn_test_opts_t *opts, + apr_pool_t *pool) +{ + svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); + const char *new_dir_path; + const char *new_file_path; + const char *unversioned_file_path; + + SVN_ERR(svn_test__sandbox_create(b, "update_dir_add_vs_unversioned_dir", + opts, pool)); + + SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ + + /* Add a new directory */ + new_dir_path = svn_relpath_join(trunk_path, new_dir_name, b->pool); + SVN_ERR(sbox_wc_mkdir(b, new_dir_path)); + new_file_path = svn_relpath_join(new_dir_path, new_file_name, b->pool); + SVN_ERR(sbox_file_write(b, new_file_path, new_file_content)); + SVN_ERR(sbox_wc_add(b, new_file_path)); + SVN_ERR(sbox_wc_commit(b, "")); /* r2 */ + + SVN_ERR(sbox_wc_update(b, "", 1)); /* back to r1 */ + + new_dir_path = svn_relpath_join(trunk_path, new_dir_name, b->pool); + SVN_ERR(create_unversioned_dir(&new_file_path, &unversioned_file_path, + new_dir_path, b, b->pool)); + + SVN_ERR(sbox_wc_update(b, "", 2)); /* back to r2 */ + + SVN_ERR(resolve_added_dir_vs_unversioned_dir(new_dir_path, new_file_path, + unversioned_file_path, + b, b->pool)); + return SVN_NO_ERROR; +} + +static svn_error_t * +test_switch_dir_add_vs_unversioned_dir(const svn_test_opts_t *opts, + apr_pool_t *pool) +{ + svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); + svn_client_ctx_t *ctx; + svn_opt_revision_t opt_rev; + svn_revnum_t result_rev; + const char *trunk_url; + const char *new_dir_path; + const char *new_file_path; + const char *unversioned_file_path; + + SVN_ERR(svn_test__sandbox_create(b, "switch_dir_add_vs_unversioned_dir", + opts, pool)); + + SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ + + /* Create a branch of node "A". */ + SVN_ERR(sbox_wc_copy(b, trunk_path, branch_path)); + SVN_ERR(sbox_wc_commit(b, "")); /* r2 */ + + /* Add a new directory on trunk. */ + new_dir_path = svn_relpath_join(trunk_path, new_dir_name, b->pool); + SVN_ERR(sbox_wc_mkdir(b, new_dir_path)); + new_file_path = svn_relpath_join(new_dir_path, new_file_name, b->pool); + SVN_ERR(sbox_file_write(b, new_file_path, new_file_content)); + SVN_ERR(sbox_wc_add(b, new_file_path)); + SVN_ERR(sbox_wc_commit(b, "")); /* r3 */ + + SVN_ERR(sbox_wc_update(b, "", 2)); /* back to r2 */ + + new_dir_path = svn_relpath_join(branch_path, new_dir_name, b->pool); + SVN_ERR(create_unversioned_dir(&new_file_path, &unversioned_file_path, + new_dir_path, b, b->pool)); + + /* Switch branch to trunk. */ + trunk_url = apr_pstrcat(b->pool, b->repos_url, "/", trunk_path, SVN_VA_NULL); + SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool)); + opt_rev.kind = svn_opt_revision_head; + opt_rev.value.number = SVN_INVALID_REVNUM; + SVN_ERR(svn_client_switch3(&result_rev, sbox_wc_path(b, branch_path), + trunk_url, &opt_rev, &opt_rev, + svn_depth_infinity, + TRUE, FALSE, FALSE, FALSE, ctx, b->pool)); + + SVN_ERR(resolve_added_dir_vs_unversioned_dir(new_dir_path, new_file_path, + unversioned_file_path, + b, b->pool)); + + return SVN_NO_ERROR; +} + +static svn_error_t * +create_file_move_vs_file_move_merge_conflict(svn_client_conflict_t **conflict, + svn_boolean_t edit_file, + svn_test__sandbox_t *b, + svn_client_ctx_t *ctx) +{ + svn_opt_revision_t opt_rev; + const char *branch_url; + + /* Create a branch of node "A". */ + SVN_ERR(sbox_wc_copy(b, "A", "A2")); + SVN_ERR(sbox_wc_commit(b, "")); /* r2 */ + + /* Move a file on trunk. */ + SVN_ERR(sbox_wc_move(b, "A/mu", "A/mu-moved")); + SVN_ERR(sbox_wc_commit(b, "")); /* r3 */ + + /* Move the same file to a different location on the branch. */ + SVN_ERR(sbox_wc_move(b, "A2/mu", "A2/mu-also-moved")); + SVN_ERR(sbox_wc_commit(b, "")); + if (edit_file) + { + /* Edit moved a file on the branch. */ + SVN_ERR(sbox_file_write(b, "A2/mu-also-moved", modified_file_content)); + SVN_ERR(sbox_wc_commit(b, "")); + } + + /* Merge branch to trunk. */ + SVN_ERR(sbox_wc_update(b, "", SVN_INVALID_REVNUM)); + branch_url = apr_pstrcat(b->pool, b->repos_url, "/A2", SVN_VA_NULL); + opt_rev.kind = svn_opt_revision_head; + opt_rev.value.number = SVN_INVALID_REVNUM; + SVN_ERR(svn_client_merge_peg5(branch_url, NULL, &opt_rev, + sbox_wc_path(b, "A"), + svn_depth_infinity, + FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, + NULL, ctx, b->pool)); + + SVN_ERR(svn_client_conflict_get(conflict, sbox_wc_path(b, "A/mu"), + ctx, b->pool, b->pool)); + { + svn_client_conflict_option_id_t expected_opts[] = { + svn_client_conflict_option_postpone, + svn_client_conflict_option_accept_current_wc_state, + svn_client_conflict_option_incoming_delete_ignore, + svn_client_conflict_option_incoming_delete_accept, + -1 /* end of list */ + }; + SVN_ERR(assert_tree_conflict_options(*conflict, ctx, expected_opts, + b->pool)); + } + + SVN_ERR(svn_client_conflict_tree_get_details(*conflict, ctx, b->pool)); + { + svn_client_conflict_option_id_t expected_opts[] = { + svn_client_conflict_option_postpone, + svn_client_conflict_option_accept_current_wc_state, + svn_client_conflict_option_both_moved_file_merge, + svn_client_conflict_option_both_moved_file_move_merge, + -1 /* end of list */ + }; + SVN_ERR(assert_tree_conflict_options(*conflict, ctx, expected_opts, + b->pool)); + } + + return SVN_NO_ERROR; +} + +static svn_error_t * +test_merge_file_move_vs_file_move(const svn_test_opts_t *opts, + apr_pool_t *pool) +{ + svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); + svn_client_ctx_t *ctx; + svn_client_conflict_t *conflict; + svn_opt_revision_t opt_rev; + struct status_baton sb; + struct svn_client_status_t *status; + + SVN_ERR(svn_test__sandbox_create(b, "merge_file_move_vs_file_move", + opts, pool)); + + SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ + + SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool)); + SVN_ERR(create_file_move_vs_file_move_merge_conflict(&conflict, + FALSE, b, ctx)); + + SVN_ERR(svn_client_conflict_tree_resolve_by_id( + conflict, + svn_client_conflict_option_both_moved_file_merge, + ctx, b->pool)); + + /* The node "A/mu" should no longer exist. */ + SVN_TEST_ASSERT_ERROR(svn_client_conflict_get( + &conflict, sbox_wc_path(b, "A/mu"), ctx, pool, pool), + SVN_ERR_WC_PATH_NOT_FOUND); + + /* The node "A/mu-also-moved" should not exist. */ + SVN_TEST_ASSERT_ERROR(svn_client_conflict_get( + &conflict, sbox_wc_path(b, "A/mu-also-moved"), ctx, + pool, pool), + SVN_ERR_WC_PATH_NOT_FOUND); + + /* Ensure that the merged file has the expected status. */ + opt_rev.kind = svn_opt_revision_working; + sb.result_pool = b->pool; + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, "A/mu-moved"), + &opt_rev, svn_depth_unknown, TRUE, TRUE, + TRUE, TRUE, FALSE, TRUE, NULL, + status_func, &sb, b->pool)); + status = sb.status; + SVN_TEST_ASSERT(status->kind == svn_node_file); + SVN_TEST_ASSERT(status->versioned); + SVN_TEST_ASSERT(!status->conflicted); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); + SVN_TEST_ASSERT(!status->copied); + SVN_TEST_ASSERT(!status->switched); + SVN_TEST_ASSERT(!status->file_external); + SVN_TEST_ASSERT(status->moved_from_abspath == NULL); + SVN_TEST_ASSERT(status->moved_to_abspath == NULL); + + return SVN_NO_ERROR; +} + +static svn_error_t * +test_merge_file_move_vs_file_move_accept_move(const svn_test_opts_t *opts, + apr_pool_t *pool) +{ + svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); + svn_client_ctx_t *ctx; + svn_client_conflict_t *conflict; + svn_opt_revision_t opt_rev; + struct status_baton sb; + struct svn_client_status_t *status; + + SVN_ERR(svn_test__sandbox_create(b, + "merge_file_move_vs_file_move_accept_move", + opts, pool)); + + SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ + + SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool)); + SVN_ERR(create_file_move_vs_file_move_merge_conflict(&conflict, + FALSE, b, ctx)); + + SVN_ERR(svn_client_conflict_tree_resolve_by_id( + conflict, + svn_client_conflict_option_both_moved_file_move_merge, + ctx, b->pool)); + + /* The node "A/mu" should no longer exist. */ + SVN_TEST_ASSERT_ERROR(svn_client_conflict_get(&conflict, + sbox_wc_path(b, "A/mu"), + ctx, pool, pool), + SVN_ERR_WC_PATH_NOT_FOUND); + + /* The node "A/mu-moved" should be moved to "A/mu-also-moved". */ + opt_rev.kind = svn_opt_revision_working; + sb.result_pool = b->pool; + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, "A/mu-moved"), + &opt_rev, svn_depth_unknown, TRUE, TRUE, + TRUE, TRUE, FALSE, TRUE, NULL, + status_func, &sb, b->pool)); + status = sb.status; + SVN_TEST_ASSERT(status->kind == svn_node_file); + SVN_TEST_ASSERT(status->versioned); + SVN_TEST_ASSERT(!status->conflicted); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_deleted); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); + SVN_TEST_ASSERT(!status->copied); + SVN_TEST_ASSERT(!status->switched); + SVN_TEST_ASSERT(!status->file_external); + SVN_TEST_ASSERT(status->moved_from_abspath == NULL); + SVN_TEST_STRING_ASSERT(status->moved_to_abspath, + sbox_wc_path(b, "A/mu-also-moved")); + + + /* Ensure that the merged file has the expected status. */ + opt_rev.kind = svn_opt_revision_working; + sb.result_pool = b->pool; + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, "A/mu-also-moved"), + &opt_rev, svn_depth_unknown, TRUE, TRUE, + TRUE, TRUE, FALSE, TRUE, NULL, + status_func, &sb, b->pool)); + status = sb.status; + SVN_TEST_ASSERT(status->kind == svn_node_file); + SVN_TEST_ASSERT(status->versioned); + SVN_TEST_ASSERT(!status->conflicted); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_added); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); + SVN_TEST_ASSERT(status->copied); + SVN_TEST_ASSERT(!status->switched); + SVN_TEST_ASSERT(!status->file_external); + SVN_TEST_STRING_ASSERT(status->moved_from_abspath, + sbox_wc_path(b, "A/mu-moved")); + SVN_TEST_ASSERT(status->moved_to_abspath == NULL); + + return SVN_NO_ERROR; +} + +static svn_error_t * +test_merge_file_edit_move_vs_file_move(const svn_test_opts_t *opts, + apr_pool_t *pool) +{ + svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); + svn_client_ctx_t *ctx; + svn_client_conflict_t *conflict; + svn_opt_revision_t opt_rev; + struct status_baton sb; + struct svn_client_status_t *status; + svn_stringbuf_t *buf; + + SVN_ERR(svn_test__sandbox_create(b, "merge_file_edit_move_vs_file_move", + opts, pool)); + + SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ + + SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool)); + SVN_ERR(create_file_move_vs_file_move_merge_conflict(&conflict, + TRUE, b, ctx)); + + SVN_ERR(svn_client_conflict_tree_resolve_by_id( + conflict, + svn_client_conflict_option_both_moved_file_merge, + ctx, b->pool)); + + /* The node "A/mu" should no longer exist. */ + SVN_TEST_ASSERT_ERROR(svn_client_conflict_get( + &conflict, sbox_wc_path(b, "A/mu"), ctx, pool, pool), + SVN_ERR_WC_PATH_NOT_FOUND); + + /* The node "A/mu-also-moved" should not exist. */ + SVN_TEST_ASSERT_ERROR(svn_client_conflict_get( + &conflict, sbox_wc_path(b, "A/mu-also-moved"), ctx, + pool, pool), + SVN_ERR_WC_PATH_NOT_FOUND); + + /* Ensure that the merged file has the expected status. */ + opt_rev.kind = svn_opt_revision_working; + sb.result_pool = b->pool; + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, "A/mu-moved"), + &opt_rev, svn_depth_unknown, TRUE, TRUE, + TRUE, TRUE, FALSE, TRUE, NULL, + status_func, &sb, b->pool)); + status = sb.status; + SVN_TEST_ASSERT(status->kind == svn_node_file); + SVN_TEST_ASSERT(status->versioned); + SVN_TEST_ASSERT(!status->conflicted); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_modified); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_modified); + SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); + SVN_TEST_ASSERT(!status->copied); + SVN_TEST_ASSERT(!status->switched); + SVN_TEST_ASSERT(!status->file_external); + SVN_TEST_ASSERT(status->moved_from_abspath == NULL); + SVN_TEST_ASSERT(status->moved_to_abspath == NULL); + + /* Make sure the file has the expected content. */ + SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A/mu-moved"), pool)); + SVN_TEST_STRING_ASSERT(buf->data, modified_file_content); + + return SVN_NO_ERROR; +} + +static svn_error_t * +test_merge_file_edit_move_vs_file_move_accept_move(const svn_test_opts_t *opts, + apr_pool_t *pool) +{ + svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); + svn_client_ctx_t *ctx; + svn_client_conflict_t *conflict; + svn_opt_revision_t opt_rev; + struct status_baton sb; + struct svn_client_status_t *status; + svn_stringbuf_t *buf; + + SVN_ERR(svn_test__sandbox_create( + b, "merge_file_edit_move_vs_file_move_accept_move", opts, pool)); + + SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ + + SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool)); + SVN_ERR(create_file_move_vs_file_move_merge_conflict(&conflict, + TRUE, b, ctx)); + + SVN_ERR(svn_client_conflict_tree_resolve_by_id( + conflict, + svn_client_conflict_option_both_moved_file_move_merge, + ctx, b->pool)); + + /* The node "A/mu" should no longer exist. */ + SVN_TEST_ASSERT_ERROR(svn_client_conflict_get(&conflict, + sbox_wc_path(b, "A/mu"), + ctx, pool, pool), + SVN_ERR_WC_PATH_NOT_FOUND); + + /* The node "A/mu-moved" should be moved to "A/mu-also-moved". */ + opt_rev.kind = svn_opt_revision_working; + sb.result_pool = b->pool; + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, "A/mu-moved"), + &opt_rev, svn_depth_unknown, TRUE, TRUE, + TRUE, TRUE, FALSE, TRUE, NULL, + status_func, &sb, b->pool)); + status = sb.status; + SVN_TEST_ASSERT(status->kind == svn_node_file); + SVN_TEST_ASSERT(status->versioned); + SVN_TEST_ASSERT(!status->conflicted); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_deleted); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); + SVN_TEST_ASSERT(!status->copied); + SVN_TEST_ASSERT(!status->switched); + SVN_TEST_ASSERT(!status->file_external); + SVN_TEST_ASSERT(status->moved_from_abspath == NULL); + SVN_TEST_STRING_ASSERT(status->moved_to_abspath, + sbox_wc_path(b, "A/mu-also-moved")); + + + /* Ensure that the merged file has the expected status. */ + opt_rev.kind = svn_opt_revision_working; + sb.result_pool = b->pool; + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, "A/mu-also-moved"), + &opt_rev, svn_depth_unknown, TRUE, TRUE, + TRUE, TRUE, FALSE, TRUE, NULL, + status_func, &sb, b->pool)); + status = sb.status; + SVN_TEST_ASSERT(status->kind == svn_node_file); + SVN_TEST_ASSERT(status->versioned); + SVN_TEST_ASSERT(!status->conflicted); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_added); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_modified); + SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); + SVN_TEST_ASSERT(status->copied); + SVN_TEST_ASSERT(!status->switched); + SVN_TEST_ASSERT(!status->file_external); + SVN_TEST_STRING_ASSERT(status->moved_from_abspath, + sbox_wc_path(b, "A/mu-moved")); + SVN_TEST_ASSERT(status->moved_to_abspath == NULL); + + /* Make sure the file has the expected content. */ + SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A/mu-also-moved"), + pool)); + SVN_TEST_STRING_ASSERT(buf->data, modified_file_content); + + return SVN_NO_ERROR; +} + +static svn_error_t * +create_dir_move_vs_dir_move_merge_conflict(svn_client_conflict_t **conflict, + svn_test__sandbox_t *b, + svn_client_ctx_t *ctx) +{ + svn_opt_revision_t opt_rev; + const char *branch_url; + apr_array_header_t *options; + svn_client_conflict_option_t *option; + apr_array_header_t *possible_moved_to_abspaths; + + /* Create a branch of node "A". */ + SVN_ERR(sbox_wc_copy(b, "A", "A2")); + SVN_ERR(sbox_wc_commit(b, "")); /* r2 */ + + /* Move a directory on trunk. */ + SVN_ERR(sbox_wc_move(b, "A/B", "A/B-moved")); + SVN_ERR(sbox_wc_commit(b, "")); /* r3 */ + + /* Edit a file in the moved directory on trunk. */ + SVN_ERR(sbox_file_write(b, "A/B-moved/E/alpha", + modified_file_content)); + SVN_ERR(sbox_wc_commit(b, "")); + + /* Move the same direcotry to a different location on the branch. */ + SVN_ERR(sbox_wc_move(b, "A2/B", "A2/B-also-moved")); + SVN_ERR(sbox_wc_commit(b, "")); + + /* Edit a file in the moved directory on the branch. */ + SVN_ERR(sbox_file_write(b, "A2/B-also-moved/lambda", + modified_file_content)); + SVN_ERR(sbox_wc_commit(b, "")); + + /* Merge branch to trunk. */ + SVN_ERR(sbox_wc_update(b, "", SVN_INVALID_REVNUM)); + branch_url = apr_pstrcat(b->pool, b->repos_url, "/A2", SVN_VA_NULL); + opt_rev.kind = svn_opt_revision_head; + opt_rev.value.number = SVN_INVALID_REVNUM; + SVN_ERR(svn_client_merge_peg5(branch_url, NULL, &opt_rev, + sbox_wc_path(b, "A"), + svn_depth_infinity, + FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, + NULL, ctx, b->pool)); + + SVN_ERR(svn_client_conflict_get(conflict, sbox_wc_path(b, "A/B"), + ctx, b->pool, b->pool)); + { + svn_client_conflict_option_id_t expected_opts[] = { + svn_client_conflict_option_postpone, + svn_client_conflict_option_accept_current_wc_state, + svn_client_conflict_option_incoming_delete_ignore, + svn_client_conflict_option_incoming_delete_accept, + -1 /* end of list */ + }; + SVN_ERR(assert_tree_conflict_options(*conflict, ctx, expected_opts, + b->pool)); + } + + SVN_ERR(svn_client_conflict_tree_get_details(*conflict, ctx, b->pool)); + { + svn_client_conflict_option_id_t expected_opts[] = { + svn_client_conflict_option_postpone, + svn_client_conflict_option_accept_current_wc_state, + svn_client_conflict_option_both_moved_dir_merge, + svn_client_conflict_option_both_moved_dir_move_merge, + -1 /* end of list */ + }; + SVN_ERR(assert_tree_conflict_options(*conflict, ctx, expected_opts, + b->pool)); + } + + SVN_ERR(svn_client_conflict_tree_get_resolution_options(&options, *conflict, + ctx, b->pool, + b->pool)); + option = svn_client_conflict_option_find_by_id( + options, svn_client_conflict_option_both_moved_dir_merge); + SVN_TEST_ASSERT(option != NULL); + SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates( + &possible_moved_to_abspaths, option, b->pool, b->pool)); + + /* The resolver finds two possible move destinations because both + * branches are checked out into the same working copy. + * + * Possible working copy destinations for moved-away 'A/B' are: + * (1): 'A/B-also-moved + * (2): 'A2/B-also-moved + * Only one destination can be a move; the others are copies. + */ + SVN_TEST_INT_ASSERT(possible_moved_to_abspaths->nelts, 2); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_abspaths, 0, const char *), + sbox_wc_path(b, "A/B-also-moved")); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_abspaths, 1, const char *), + sbox_wc_path(b, "A2/B-also-moved")); + + return SVN_NO_ERROR; +} + +static svn_error_t * +test_merge_dir_move_vs_dir_move(const svn_test_opts_t *opts, + apr_pool_t *pool) +{ + svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); + svn_client_ctx_t *ctx; + svn_client_conflict_t *conflict; + svn_opt_revision_t opt_rev; + struct status_baton sb; + struct svn_client_status_t *status; + svn_stringbuf_t *buf; + + SVN_ERR(svn_test__sandbox_create(b, "merge_dir_move_vs_dir_move", + opts, pool)); + + SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ + + SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool)); + SVN_ERR(create_dir_move_vs_dir_move_merge_conflict(&conflict, b, ctx)); + + SVN_ERR(svn_client_conflict_tree_resolve_by_id( + conflict, + svn_client_conflict_option_both_moved_dir_merge, + ctx, b->pool)); + + /* The node "A/B" should not exist. */ + SVN_TEST_ASSERT_ERROR(svn_client_conflict_get(&conflict, + sbox_wc_path(b, "A/B"), + ctx, pool, pool), + SVN_ERR_WC_PATH_NOT_FOUND); + + /* The node "A/B-also-moved" should not exist. */ + SVN_TEST_ASSERT_ERROR(svn_client_conflict_get( + &conflict, + sbox_wc_path(b, "A/B-also-moved"), ctx, pool, pool), + SVN_ERR_WC_PATH_NOT_FOUND); + + /* Ensure that the merged directory has the expected status. */ + opt_rev.kind = svn_opt_revision_working; + sb.result_pool = b->pool; + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, "A/B-moved"), + &opt_rev, svn_depth_unknown, TRUE, TRUE, + TRUE, TRUE, FALSE, TRUE, NULL, + status_func, &sb, b->pool)); + status = sb.status; + SVN_TEST_ASSERT(status->kind == svn_node_dir); + SVN_TEST_ASSERT(status->versioned); + SVN_TEST_ASSERT(!status->conflicted); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); + SVN_TEST_ASSERT(!status->copied); + SVN_TEST_ASSERT(!status->switched); + SVN_TEST_ASSERT(!status->file_external); + SVN_TEST_ASSERT(status->moved_from_abspath == NULL); + SVN_TEST_ASSERT(status->moved_to_abspath == NULL); + + /* Make sure the edited files have the expected content. */ + SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A/B-moved/lambda"), + pool)); + SVN_TEST_STRING_ASSERT(buf->data, modified_file_content); + SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A/B-moved/E/alpha"), + pool)); + SVN_TEST_STRING_ASSERT(buf->data, modified_file_content); + + return SVN_NO_ERROR; +} + +static svn_error_t * +test_merge_dir_move_vs_dir_move_accept_move(const svn_test_opts_t *opts, + apr_pool_t *pool) +{ + svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); + svn_client_ctx_t *ctx; + svn_client_conflict_t *conflict; + svn_opt_revision_t opt_rev; + struct status_baton sb; + struct svn_client_status_t *status; + svn_stringbuf_t *buf; + + SVN_ERR(svn_test__sandbox_create(b, "merge_dir_move_vs_dir_move_accept_move", + opts, pool)); + + SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ + + SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool)); + SVN_ERR(create_dir_move_vs_dir_move_merge_conflict(&conflict, b, ctx)); + + SVN_ERR(svn_client_conflict_tree_resolve_by_id( + conflict, + svn_client_conflict_option_both_moved_dir_move_merge, + ctx, b->pool)); + + /* The node "A/B" should not exist. */ + SVN_TEST_ASSERT_ERROR(svn_client_conflict_get(&conflict, + sbox_wc_path(b, "A/B"), + ctx, pool, pool), + SVN_ERR_WC_PATH_NOT_FOUND); + + /* The node "A/B-moved" should be moved to A/B-also-moved. */ + opt_rev.kind = svn_opt_revision_working; + sb.result_pool = b->pool; + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, "A/B-moved"), + &opt_rev, svn_depth_empty, TRUE, TRUE, + TRUE, TRUE, FALSE, TRUE, NULL, + status_func, &sb, b->pool)); + status = sb.status; + SVN_TEST_ASSERT(status->kind == svn_node_dir); + SVN_TEST_ASSERT(status->versioned); + SVN_TEST_ASSERT(!status->conflicted); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_deleted); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); + SVN_TEST_ASSERT(!status->copied); + SVN_TEST_ASSERT(!status->switched); + SVN_TEST_ASSERT(!status->file_external); + SVN_TEST_ASSERT(status->moved_from_abspath == NULL); + SVN_TEST_STRING_ASSERT(status->moved_to_abspath, + sbox_wc_path(b, "A/B-also-moved")); + + /* Ensure that the merged directory has the expected status. */ + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, "A/B-also-moved"), + &opt_rev, svn_depth_empty, TRUE, TRUE, + TRUE, TRUE, FALSE, TRUE, NULL, + status_func, &sb, b->pool)); + status = sb.status; + SVN_TEST_ASSERT(status->kind == svn_node_dir); + SVN_TEST_ASSERT(status->versioned); + SVN_TEST_ASSERT(!status->conflicted); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_added); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); + SVN_TEST_ASSERT(status->copied); + SVN_TEST_ASSERT(!status->switched); + SVN_TEST_ASSERT(!status->file_external); + SVN_TEST_STRING_ASSERT(status->moved_from_abspath, + sbox_wc_path(b, "A/B-moved")); + SVN_TEST_ASSERT(status->moved_to_abspath == NULL); + + /* Make sure the edited files have the expected content. */ + SVN_ERR(svn_stringbuf_from_file2(&buf, + sbox_wc_path(b, "A/B-also-moved/lambda"), + pool)); + SVN_TEST_STRING_ASSERT(buf->data, modified_file_content); + SVN_ERR(svn_stringbuf_from_file2(&buf, + sbox_wc_path(b, "A/B-also-moved/E/alpha"), + pool)); + SVN_TEST_STRING_ASSERT(buf->data, modified_file_content); return SVN_NO_ERROR; } static svn_error_t * -resolve_added_dir_vs_unversioned_dir(const char *new_dir_path, - const char *new_file_path, - const char *unversioned_file_path, - svn_test__sandbox_t *b, apr_pool_t *pool) +create_file_move_vs_file_move_update_conflict(svn_client_conflict_t **conflict, + svn_test__sandbox_t *b, + svn_client_ctx_t *ctx) { - svn_client_ctx_t *ctx; - svn_client_conflict_t *conflict; - svn_opt_revision_t opt_rev; - struct status_baton sb; - struct svn_client_status_t *status; - svn_stringbuf_t *buf; + apr_array_header_t *options; + svn_client_conflict_option_t *option; + apr_array_header_t *possible_moved_to_abspaths; - SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool)); - SVN_ERR(svn_client_conflict_get(&conflict, sbox_wc_path(b, new_dir_path), + /* Move a file. */ + SVN_ERR(sbox_wc_move(b, "A/mu", "A/mu-moved")); + + /* Edit moved file. */ + SVN_ERR(sbox_file_write(b, "A/mu-moved", modified_file_content)); + SVN_ERR(sbox_wc_commit(b, "")); + + /* Update back to r1, */ + SVN_ERR(sbox_wc_update(b, "", 1)); /* r2 */ + + /* Copy the file to test handling of ambiguous moves. */ + SVN_ERR(sbox_wc_copy(b, "A/mu", "A/mu-copied")); + + /* Move the same file to a different location. */ + SVN_ERR(sbox_wc_move(b, "A/mu", "A/mu-also-moved")); + + /* Edit moved file. */ + SVN_ERR(sbox_file_write(b, "A/mu-also-moved", + modified_file_in_working_copy_content)); + + /* Update to r2. */ + /* This should raise an "incoming delete vs local delete" tree conflict. */ + SVN_ERR(sbox_wc_update(b, "", SVN_INVALID_REVNUM)); + + SVN_ERR(svn_client_conflict_get(conflict, sbox_wc_path(b, "A/mu"), ctx, b->pool, b->pool)); - SVN_TEST_ASSERT(svn_client_conflict_get_local_change(conflict) == - svn_wc_conflict_reason_unversioned); - SVN_TEST_ASSERT(svn_client_conflict_get_incoming_change(conflict) == - svn_wc_conflict_action_add); { svn_client_conflict_option_id_t expected_opts[] = { svn_client_conflict_option_postpone, svn_client_conflict_option_accept_current_wc_state, - svn_client_conflict_option_incoming_added_dir_merge, + svn_client_conflict_option_incoming_delete_ignore, + svn_client_conflict_option_incoming_delete_accept, -1 /* end of list */ }; - SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts, + SVN_ERR(assert_tree_conflict_options(*conflict, ctx, expected_opts, + b->pool)); + } + + SVN_ERR(svn_client_conflict_tree_get_details(*conflict, ctx, b->pool)); + { + svn_client_conflict_option_id_t expected_opts[] = { + svn_client_conflict_option_postpone, + svn_client_conflict_option_accept_current_wc_state, + svn_client_conflict_option_both_moved_file_merge, + svn_client_conflict_option_both_moved_file_move_merge, + -1 /* end of list */ + }; + SVN_ERR(assert_tree_conflict_options(*conflict, ctx, expected_opts, b->pool)); } + /* Check possible move destinations for the file. */ + SVN_ERR(svn_client_conflict_tree_get_resolution_options(&options, *conflict, + ctx, b->pool, + b->pool)); + option = svn_client_conflict_option_find_by_id( + options, svn_client_conflict_option_both_moved_file_merge); + SVN_TEST_ASSERT(option != NULL); + + SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates( + &possible_moved_to_abspaths, option, b->pool, b->pool)); + + /* The resolver finds two possible destinations for the moved file: + * + * Possible working copy destinations for moved-away 'A/mu' are: + * (1): 'A/mu-also-moved' + * (2): 'A/mu-copied' + * Only one destination can be a move; the others are copies. + */ + SVN_TEST_INT_ASSERT(possible_moved_to_abspaths->nelts, 2); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_abspaths, 0, const char *), + sbox_wc_path(b, "A/mu-also-moved")); + SVN_TEST_STRING_ASSERT( + APR_ARRAY_IDX(possible_moved_to_abspaths, 1, const char *), + sbox_wc_path(b, "A/mu-copied")); + + return SVN_NO_ERROR; +} + + +static svn_error_t * +test_update_file_move_vs_file_move(const svn_test_opts_t *opts, + apr_pool_t *pool) +{ + svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); + svn_client_ctx_t *ctx; + svn_client_conflict_t *conflict; + svn_opt_revision_t opt_rev; + struct status_baton sb; + struct svn_client_status_t *status; + svn_stringbuf_t *buf; + svn_node_kind_t kind; + char *conflicted_content; + + SVN_ERR(svn_test__sandbox_create(b, "update_file_move_vs_file_move", + opts, pool)); + + SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ + + SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool)); + SVN_ERR(create_file_move_vs_file_move_update_conflict(&conflict, b, ctx)); + SVN_ERR(svn_client_conflict_tree_resolve_by_id( conflict, - svn_client_conflict_option_incoming_added_dir_merge, + svn_client_conflict_option_both_moved_file_merge, ctx, b->pool)); - /* Ensure that the directory has the expected status. */ + /* The node "A/mu" should no longer exist. */ + SVN_TEST_ASSERT_ERROR(svn_client_conflict_get( + &conflict, sbox_wc_path(b, "A/mu"), ctx, pool, pool), + SVN_ERR_WC_PATH_NOT_FOUND); + + /* The node "A/mu-moved" should now have moved to "A/mu-also-moved. */ + SVN_ERR(svn_io_check_path(sbox_wc_path(b, "A/mu"), &kind, b->pool)); + SVN_TEST_ASSERT(kind == svn_node_none); opt_rev.kind = svn_opt_revision_working; sb.result_pool = b->pool; - SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, new_dir_path), + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, "A/mu-moved"), &opt_rev, svn_depth_unknown, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL, status_func, &sb, b->pool)); status = sb.status; - SVN_TEST_ASSERT(status->kind == svn_node_dir); + SVN_TEST_ASSERT(status->kind == svn_node_file); SVN_TEST_ASSERT(status->versioned); SVN_TEST_ASSERT(!status->conflicted); - SVN_TEST_ASSERT(status->node_status == svn_wc_status_normal); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_deleted); SVN_TEST_ASSERT(status->text_status == svn_wc_status_normal); SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); SVN_TEST_ASSERT(!status->copied); SVN_TEST_ASSERT(!status->switched); SVN_TEST_ASSERT(!status->file_external); SVN_TEST_ASSERT(status->moved_from_abspath == NULL); - SVN_TEST_ASSERT(status->moved_to_abspath == NULL); + SVN_TEST_STRING_ASSERT(status->moved_to_abspath, + sbox_wc_path(b, "A/mu-also-moved")); - /* Ensure that the "collision" file has the expected status. */ + /* Ensure that the merged file has the expected status. */ opt_rev.kind = svn_opt_revision_working; sb.result_pool = b->pool; - SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, new_file_path), + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, "A/mu-also-moved"), &opt_rev, svn_depth_unknown, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL, status_func, &sb, b->pool)); status = sb.status; SVN_TEST_ASSERT(status->kind == svn_node_file); SVN_TEST_ASSERT(status->versioned); - SVN_TEST_ASSERT(!status->conflicted); - SVN_TEST_ASSERT(status->node_status == svn_wc_status_modified); - SVN_TEST_ASSERT(status->text_status == svn_wc_status_modified); + SVN_TEST_ASSERT(status->conflicted); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_conflicted); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_conflicted); SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); - SVN_TEST_ASSERT(!status->copied); + SVN_TEST_ASSERT(status->copied); SVN_TEST_ASSERT(!status->switched); SVN_TEST_ASSERT(!status->file_external); - SVN_TEST_ASSERT(status->moved_from_abspath == NULL); + SVN_TEST_STRING_ASSERT(status->moved_from_abspath, + sbox_wc_path(b, "A/mu-moved")); SVN_TEST_ASSERT(status->moved_to_abspath == NULL); - /* Ensure that the file has the expected content. */ - SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, new_file_path), - b->pool)); - SVN_TEST_STRING_ASSERT(buf->data, unversioned_file_content); - - /* Ensure that the unversioned file has the expected status. */ - opt_rev.kind = svn_opt_revision_working; - sb.result_pool = b->pool; - SVN_TEST_ASSERT_ERROR( - svn_client_status6(NULL, ctx, sbox_wc_path(b, unversioned_file_path), - &opt_rev, svn_depth_unknown, TRUE, TRUE, - TRUE, TRUE, FALSE, TRUE, NULL, - status_func, &sb, b->pool), - SVN_ERR_ENTRY_NOT_FOUND); - - /* Ensure that the file has the expected content. */ - SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, unversioned_file_path), + /* Ensure that the moved+merged file has the expected content. */ + SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A/mu-also-moved"), b->pool)); - SVN_TEST_STRING_ASSERT(buf->data, unversioned_file_content); - - return SVN_NO_ERROR; -} - -static svn_error_t * -test_update_dir_add_vs_unversioned_dir(const svn_test_opts_t *opts, - apr_pool_t *pool) -{ - svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); - const char *new_dir_path; - const char *new_file_path; - const char *unversioned_file_path; - - SVN_ERR(svn_test__sandbox_create(b, "update_dir_add_vs_unversioned_dir", - opts, pool)); - - SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ - - /* Add a new directory */ - new_dir_path = svn_relpath_join(trunk_path, new_dir_name, b->pool); - SVN_ERR(sbox_wc_mkdir(b, new_dir_path)); - new_file_path = svn_relpath_join(new_dir_path, new_file_name, b->pool); - SVN_ERR(sbox_file_write(b, new_file_path, new_file_content)); - SVN_ERR(sbox_wc_add(b, new_file_path)); - SVN_ERR(sbox_wc_commit(b, "")); /* r2 */ - - SVN_ERR(sbox_wc_update(b, "", 1)); /* back to r1 */ - - new_dir_path = svn_relpath_join(trunk_path, new_dir_name, b->pool); - SVN_ERR(create_unversioned_dir(&new_file_path, &unversioned_file_path, - new_dir_path, b, b->pool)); - - SVN_ERR(sbox_wc_update(b, "", 2)); /* back to r2 */ + conflicted_content = apr_psprintf(b->pool, + "<<<<<<< .working\n" + "%s" + "||||||| .old\n" + "This is the file 'mu'.\n" + "=======\n" + "%s" + ">>>>>>> .new\n", + modified_file_in_working_copy_content, + modified_file_content); + SVN_TEST_STRING_ASSERT(buf->data, conflicted_content); - SVN_ERR(resolve_added_dir_vs_unversioned_dir(new_dir_path, new_file_path, - unversioned_file_path, - b, b->pool)); return SVN_NO_ERROR; } +/* Same test case as above, but accept the incoming move. */ static svn_error_t * -test_switch_dir_add_vs_unversioned_dir(const svn_test_opts_t *opts, - apr_pool_t *pool) +test_update_file_move_vs_file_move_accept_move(const svn_test_opts_t *opts, + apr_pool_t *pool) { svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b)); svn_client_ctx_t *ctx; + svn_client_conflict_t *conflict; svn_opt_revision_t opt_rev; - svn_revnum_t result_rev; - const char *trunk_url; - const char *new_dir_path; - const char *new_file_path; - const char *unversioned_file_path; + struct status_baton sb; + struct svn_client_status_t *status; + svn_stringbuf_t *buf; + char *conflicted_content; - SVN_ERR(svn_test__sandbox_create(b, "switch_dir_add_vs_unversioned_dir", + SVN_ERR(svn_test__sandbox_create(b, + "update_file_move_vs_file_move_accept_move", opts, pool)); SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */ - /* Create a branch of node "A". */ - SVN_ERR(sbox_wc_copy(b, trunk_path, branch_path)); - SVN_ERR(sbox_wc_commit(b, "")); /* r2 */ + SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool)); + SVN_ERR(create_file_move_vs_file_move_update_conflict(&conflict, b, ctx)); - /* Add a new directory on trunk. */ - new_dir_path = svn_relpath_join(trunk_path, new_dir_name, b->pool); - SVN_ERR(sbox_wc_mkdir(b, new_dir_path)); - new_file_path = svn_relpath_join(new_dir_path, new_file_name, b->pool); - SVN_ERR(sbox_file_write(b, new_file_path, new_file_content)); - SVN_ERR(sbox_wc_add(b, new_file_path)); - SVN_ERR(sbox_wc_commit(b, "")); /* r3 */ + SVN_ERR(svn_client_conflict_tree_resolve_by_id( + conflict, + svn_client_conflict_option_both_moved_file_move_merge, + ctx, b->pool)); - SVN_ERR(sbox_wc_update(b, "", 2)); /* back to r2 */ + /* The node "A/mu" should no longer exist. */ + SVN_TEST_ASSERT_ERROR(svn_client_conflict_get( + &conflict, sbox_wc_path(b, "A/mu"), ctx, pool, pool), + SVN_ERR_WC_PATH_NOT_FOUND); - new_dir_path = svn_relpath_join(branch_path, new_dir_name, b->pool); - SVN_ERR(create_unversioned_dir(&new_file_path, &unversioned_file_path, - new_dir_path, b, b->pool)); + /* The node "A/mu-also-moved" should not exist. */ + SVN_TEST_ASSERT_ERROR(svn_client_conflict_get( + &conflict, sbox_wc_path(b, "A/mu-also-moved"), ctx, + pool, pool), + SVN_ERR_WC_PATH_NOT_FOUND); - /* Switch branch to trunk. */ - trunk_url = apr_pstrcat(b->pool, b->repos_url, "/", trunk_path, SVN_VA_NULL); - SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool)); - opt_rev.kind = svn_opt_revision_head; - opt_rev.value.number = SVN_INVALID_REVNUM; - SVN_ERR(svn_client_switch3(&result_rev, sbox_wc_path(b, branch_path), - trunk_url, &opt_rev, &opt_rev, - svn_depth_infinity, - TRUE, FALSE, FALSE, FALSE, ctx, b->pool)); + /* Ensure that the merged file has the expected status. */ + opt_rev.kind = svn_opt_revision_working; + sb.result_pool = b->pool; + SVN_ERR(svn_client_status6(NULL, ctx, sbox_wc_path(b, "A/mu-moved"), + &opt_rev, svn_depth_unknown, TRUE, TRUE, + TRUE, TRUE, FALSE, TRUE, NULL, + status_func, &sb, b->pool)); + status = sb.status; + SVN_TEST_ASSERT(status->kind == svn_node_file); + SVN_TEST_ASSERT(status->versioned); + SVN_TEST_ASSERT(status->conflicted); + SVN_TEST_ASSERT(status->node_status == svn_wc_status_conflicted); + SVN_TEST_ASSERT(status->text_status == svn_wc_status_conflicted); + SVN_TEST_ASSERT(status->prop_status == svn_wc_status_none); + SVN_TEST_ASSERT(!status->copied); + SVN_TEST_ASSERT(!status->switched); + SVN_TEST_ASSERT(!status->file_external); + SVN_TEST_ASSERT(status->moved_from_abspath == NULL); + SVN_TEST_ASSERT(status->moved_to_abspath == NULL); - SVN_ERR(resolve_added_dir_vs_unversioned_dir(new_dir_path, new_file_path, - unversioned_file_path, - b, b->pool)); + /* Ensure that the moved+merged file has the expected content. */ + SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A/mu-moved"), + b->pool)); + conflicted_content = apr_psprintf(b->pool, + "<<<<<<< .working\n" /* ### labels need fixing */ + "%s" + "||||||| .old\n" + "This is the file 'mu'.\n" + "=======\n" + "%s" + ">>>>>>> .new\n", + modified_file_content, + modified_file_in_working_copy_content); + SVN_TEST_STRING_ASSERT(buf->data, conflicted_content); return SVN_NO_ERROR; } + + /* ========================================================================== */ @@ -6069,7 +7545,7 @@ static struct svn_test_descriptor_t test_funcs[] = "merge incoming move file merge with CRLF eols"), SVN_TEST_OPTS_PASS(test_merge_incoming_move_file_text_merge_native_eol, "merge incoming move file merge with native eols"), - SVN_TEST_OPTS_XFAIL(test_cherry_pick_post_move_edit, + SVN_TEST_OPTS_PASS(test_cherry_pick_post_move_edit, "cherry-pick edit from moved file"), SVN_TEST_OPTS_PASS(test_merge_incoming_move_dir_across_branches, "merge incoming dir move across branches"), @@ -6079,6 +7555,14 @@ static struct svn_test_descriptor_t test_funcs[] = "merge two added dirs assertion failure (#4744)"), SVN_TEST_OPTS_PASS(test_merge_incoming_delete_file_unrelated_move, "do not suggest unrelated move targets (#4766)"), + SVN_TEST_OPTS_PASS(test_cherry_pick_post_move_edit_dir, + "cherry-pick edit from moved directory"), + SVN_TEST_OPTS_PASS(test_local_missing_abiguous_moves, + "local missing conflict with ambiguous moves"), + SVN_TEST_OPTS_PASS(test_local_missing_abiguous_moves_dir, + "local missing conflict with ambiguous dir moves"), + SVN_TEST_OPTS_PASS(test_file_vs_dir_move_merge_assertion_failure, + "file v dir move merge assertion failure"), SVN_TEST_OPTS_PASS(test_update_file_add_vs_unversiond_file, "file add vs unversioned file during update"), SVN_TEST_OPTS_PASS(test_switch_file_add_vs_unversiond_file, @@ -6087,6 +7571,22 @@ static struct svn_test_descriptor_t test_funcs[] = "dir add vs unversioned dir during update"), SVN_TEST_OPTS_PASS(test_switch_dir_add_vs_unversioned_dir, "dir add vs unversioned dir during switch"), + SVN_TEST_OPTS_PASS(test_merge_file_move_vs_file_move, + "file move vs file move during merge"), + SVN_TEST_OPTS_PASS(test_merge_file_move_vs_file_move_accept_move, + "file move vs file move during merge accept move"), + SVN_TEST_OPTS_PASS(test_merge_file_edit_move_vs_file_move, + "file move vs file edit-move during merge"), + SVN_TEST_OPTS_PASS(test_merge_file_edit_move_vs_file_move_accept_move, + "file edit-move vs file move merge accept move"), + SVN_TEST_OPTS_PASS(test_merge_dir_move_vs_dir_move, + "dir move vs dir move during merge"), + SVN_TEST_OPTS_PASS(test_merge_dir_move_vs_dir_move_accept_move, + "dir move vs dir move during merge accept move"), + SVN_TEST_OPTS_PASS(test_update_file_move_vs_file_move, + "file move vs file move during update"), + SVN_TEST_OPTS_PASS(test_update_file_move_vs_file_move_accept_move, + "file move vs file move during update accept move"), SVN_TEST_NULL }; diff --git a/subversion/tests/libsvn_fs/fs-test.c b/subversion/tests/libsvn_fs/fs-test.c index 95551d0..0033e6d 100644 --- a/subversion/tests/libsvn_fs/fs-test.c +++ b/subversion/tests/libsvn_fs/fs-test.c @@ -7441,6 +7441,34 @@ test_closest_copy_file_replaced_with_dir(const svn_test_opts_t *opts, return SVN_NO_ERROR; } +static svn_error_t * +test_unrecognized_ioctl(const svn_test_opts_t *opts, + apr_pool_t *pool) +{ + svn_fs_t *fs; + svn_error_t *err; + svn_fs_ioctl_code_t code = {0}; + + SVN_ERR(svn_test__create_fs(&fs, "test-unrecognized-ioctl", opts, pool)); + + code.fs_type = "NON-EXISTING"; + code.code = 98765; + err = svn_fs_ioctl(fs, code, NULL, NULL, NULL, NULL, pool, pool); + SVN_TEST_ASSERT_ERROR(err, SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE); + + code.fs_type = "NON-EXISTING"; + code.code = 98765; + err = svn_fs_ioctl(NULL, code, NULL, NULL, NULL, NULL, pool, pool); + SVN_TEST_ASSERT_ERROR(err, SVN_ERR_FS_UNKNOWN_FS_TYPE); + + code.fs_type = opts->fs_type; + code.code = 98765; + err = svn_fs_ioctl(NULL, code, NULL, NULL, NULL, NULL, pool, pool); + SVN_TEST_ASSERT_ERROR(err, SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE); + + return SVN_NO_ERROR; +} + /* ------------------------------------------------------------------------ */ /* The test table. */ @@ -7587,6 +7615,8 @@ static struct svn_test_descriptor_t test_funcs[] = "test issue SVN-4677 regression"), SVN_TEST_OPTS_PASS(test_closest_copy_file_replaced_with_dir, "svn_fs_closest_copy after replacing file with dir"), + SVN_TEST_OPTS_PASS(test_unrecognized_ioctl, + "test svn_fs_ioctl with unrecognized code"), SVN_TEST_NULL }; diff --git a/subversion/tests/libsvn_fs/locks-test.c b/subversion/tests/libsvn_fs/locks-test.c index 6251f1b..7f743ac 100644 --- a/subversion/tests/libsvn_fs/locks-test.c +++ b/subversion/tests/libsvn_fs/locks-test.c @@ -1089,6 +1089,9 @@ lock_cb_error(const svn_test_opts_t *opts, return SVN_NO_ERROR; } +/* XXX NOTE: + This test will fail on most Unix-like systems when run as the + root user, because flock() will ignore file permissions. */ static svn_error_t * obtain_write_lock_failure(const svn_test_opts_t *opts, apr_pool_t *pool) diff --git a/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c b/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c index 7a6e910..469eb4e 100644 --- a/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c +++ b/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c @@ -1631,8 +1631,8 @@ delta_chain_with_plain(const svn_test_opts_t *opts, svn_hash_sets(props, "p", svn_string_create(prop_value->data, pool)); hash_rep = svn_stringbuf_create_empty(pool); - svn_hash_write2(props, svn_stream_from_stringbuf(hash_rep, pool), "END", - pool); + SVN_ERR(svn_hash_write2(props, svn_stream_from_stringbuf(hash_rep, pool), + "END", pool)); SVN_ERR(svn_fs_begin_txn(&txn, fs, rev, pool)); SVN_ERR(svn_fs_txn_root(&root, txn, pool)); diff --git a/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c b/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c index 9ca0805..51bfac2 100644 --- a/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c +++ b/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c @@ -199,8 +199,10 @@ get_repo_stats(const svn_test_opts_t *opts, svn_repos_t *repos; svn_revnum_t rev; apr_size_t i; - svn_fs_fs__stats_t *stats; svn_fs_fs__extension_info_t *extension_info; + svn_fs_fs__ioctl_get_stats_input_t input = {0}; + svn_fs_fs__ioctl_get_stats_output_t *output; + const svn_fs_fs__stats_t *stats; /* Bail (with success) on known-untestable scenarios */ if (strcmp(opts->fs_type, "fsfs") != 0) @@ -211,8 +213,9 @@ get_repo_stats(const svn_test_opts_t *opts, SVN_ERR(create_greek_repo(&repos, &rev, opts, REPO_NAME, pool, pool)); /* Gather statistics info on that repo. */ - SVN_ERR(svn_fs_fs__get_stats(&stats, svn_repos_fs(repos), NULL, NULL, - NULL, NULL, pool, pool)); + SVN_ERR(svn_fs_ioctl(svn_repos_fs(repos), SVN_FS_FS__IOCTL_GET_STATS, + &input, (void**)&output, NULL, NULL, pool, pool)); + stats = output->stats; /* Check that the stats make sense. */ SVN_TEST_ASSERT(stats->total_size > 1000 && stats->total_size < 10000); @@ -324,6 +327,7 @@ dump_index(const svn_test_opts_t *opts, svn_repos_t *repos; svn_revnum_t rev; dump_baton_t baton; + svn_fs_fs__ioctl_dump_index_input_t input = {0}; /* Bail (with success) on known-untestable scenarios */ if (strcmp(opts->fs_type, "fsfs") != 0) @@ -342,8 +346,12 @@ dump_index(const svn_test_opts_t *opts, baton.offset = 0; baton.revision = rev; baton.numbers_seen = svn_bit_array__create(100, pool); - SVN_ERR(svn_fs_fs__dump_index(svn_repos_fs(repos), rev, dump_index_entry, - &baton, NULL, NULL, pool)); + + input.revision = rev; + input.callback_func = dump_index_entry; + input.callback_baton = &baton; + SVN_ERR(svn_fs_ioctl(svn_repos_fs(repos), SVN_FS_FS__IOCTL_DUMP_INDEX, + &input, NULL, NULL, NULL, pool, pool)); /* Check that we've got all data (20 noderevs + 20 reps + 1 changes list). */ SVN_TEST_ASSERT(baton.invocations == 41); @@ -377,6 +385,8 @@ load_index(const svn_test_opts_t *opts, apr_pool_t *pool) apr_array_header_t *entries = apr_array_make(pool, 41, sizeof(void *)); apr_array_header_t *alt_entries = apr_array_make(pool, 1, sizeof(void *)); svn_fs_fs__p2l_entry_t entry; + svn_fs_fs__ioctl_dump_index_input_t dump_input = {0}; + svn_fs_fs__ioctl_load_index_input_t load_input = {0}; /* Bail (with success) on known-untestable scenarios */ if (strcmp(opts->fs_type, "fsfs") != 0) @@ -391,8 +401,11 @@ load_index(const svn_test_opts_t *opts, apr_pool_t *pool) SVN_ERR(create_greek_repo(&repos, &rev, opts, REPO_NAME, pool, pool)); /* Read the original index contents for REV in ENTRIES. */ - SVN_ERR(svn_fs_fs__dump_index(svn_repos_fs(repos), rev, receive_index, - entries, NULL, NULL, pool)); + dump_input.revision = rev; + dump_input.callback_func = receive_index; + dump_input.callback_baton = entries; + SVN_ERR(svn_fs_ioctl(svn_repos_fs(repos), SVN_FS_FS__IOCTL_DUMP_INDEX, + &dump_input, NULL, NULL, NULL, pool, pool)); /* Replace it with an index that declares the whole revision contents as * "unused". */ @@ -404,14 +417,21 @@ load_index(const svn_test_opts_t *opts, apr_pool_t *pool) entry.item.revision = SVN_INVALID_REVNUM; APR_ARRAY_PUSH(alt_entries, svn_fs_fs__p2l_entry_t *) = &entry; - SVN_ERR(svn_fs_fs__load_index(svn_repos_fs(repos), rev, alt_entries, pool)); + load_input.revision = rev; + load_input.entries = alt_entries; + SVN_ERR(svn_fs_ioctl(svn_repos_fs(repos), SVN_FS_FS__IOCTL_LOAD_INDEX, + &load_input, NULL, NULL, NULL, pool, pool)); + SVN_TEST_ASSERT_ERROR(svn_repos_verify_fs3(repos, rev, rev, FALSE, FALSE, NULL, NULL, NULL, NULL, NULL, NULL, pool), SVN_ERR_FS_INDEX_CORRUPTION); /* Restore the original index. */ - SVN_ERR(svn_fs_fs__load_index(svn_repos_fs(repos), rev, entries, pool)); + load_input.revision = rev; + load_input.entries = entries; + SVN_ERR(svn_fs_ioctl(svn_repos_fs(repos), SVN_FS_FS__IOCTL_LOAD_INDEX, + &load_input, NULL, NULL, NULL, pool, pool)); SVN_ERR(svn_repos_verify_fs3(repos, rev, rev, FALSE, FALSE, NULL, NULL, NULL, NULL, NULL, NULL, pool)); diff --git a/subversion/tests/libsvn_repos/authz-test.c b/subversion/tests/libsvn_repos/authz-test.c index 6ee2448..fecafc8 100644 --- a/subversion/tests/libsvn_repos/authz-test.c +++ b/subversion/tests/libsvn_repos/authz-test.c @@ -212,7 +212,7 @@ test_authz_parse(const svn_test_opts_t *opts, APR_READ, APR_OS_DEFAULT, pool)); groups = svn_stream_from_aprfile2(groups_file, FALSE, pool); - SVN_ERR(svn_authz__parse(&authz, rules, groups, pool, pool)); + SVN_ERR(svn_authz__parse(&authz, rules, groups, NULL, NULL, pool, pool)); printf("Access check for ('%s', '%s')\n", check_user, check_repo); @@ -277,9 +277,9 @@ test_authz_parse(const svn_test_opts_t *opts, printf("[users]\n"); if (authz->has_anon_rights) - print_user_rights(NULL, NULL, 0, &authz->anon_rights, pool); + SVN_ERR(print_user_rights(NULL, NULL, 0, &authz->anon_rights, pool)); if (authz->has_authn_rights) - print_user_rights(NULL, NULL, 0, &authz->authn_rights, pool); + SVN_ERR(print_user_rights(NULL, NULL, 0, &authz->authn_rights, pool)); SVN_ERR(svn_iter_apr_hash(NULL, authz->user_rights, print_user_rights, NULL, pool)); printf("\n\n"); @@ -304,7 +304,7 @@ run_global_rights_tests(const char *contents, svn_stringbuf_t *buffer = svn_stringbuf_create(contents, pool); svn_stream_t *stream = svn_stream_from_stringbuf(buffer, pool); - SVN_ERR(svn_repos_authz_parse(&authz, stream, NULL, pool)); + SVN_ERR(svn_repos_authz_parse2(&authz, stream, NULL, NULL, NULL, pool, pool)); for (; test_cases->repos; ++test_cases) { @@ -463,7 +463,7 @@ issue_4741_groups(apr_pool_t *pool) svn_authz_t *authz; svn_boolean_t access_granted; - SVN_ERR(svn_repos_authz_parse(&authz, stream, NULL, pool)); + SVN_ERR(svn_repos_authz_parse2(&authz, stream, NULL, NULL, NULL, pool, pool)); SVN_ERR(svn_repos_authz_check_access(authz, "repo", "/", "userA", svn_authz_write, &access_granted, @@ -478,6 +478,39 @@ issue_4741_groups(apr_pool_t *pool) return SVN_NO_ERROR; } +static svn_error_t * +reposful_reposless_stanzas_inherit(apr_pool_t *pool) +{ + const char rules[] = + "[groups]" NL + "company = user1, user2, user3" NL + "customer = customer1, customer2" NL + "" NL + "# company can read-write on everything" NL + "[/]" NL + "@company = rw" NL + "" NL + "[project1:/]" NL + "@customer = r" NL + "" NL + "[project2:/]" NL; + + svn_stringbuf_t *buf = svn_stringbuf_create(rules, pool); + svn_stream_t *stream = svn_stream_from_stringbuf(buf, pool); + svn_authz_t *authz; + svn_boolean_t access_granted; + + SVN_ERR(svn_repos_authz_parse2(&authz, stream, NULL, NULL, NULL, pool, pool)); + + SVN_ERR(svn_repos_authz_check_access(authz, "project1", "/foo", "user1", + svn_authz_write | svn_authz_recursive, + &access_granted, + pool)); + SVN_TEST_ASSERT(access_granted == TRUE); + + return SVN_NO_ERROR; +} + static int max_threads = 4; static struct svn_test_descriptor_t test_funcs[] = @@ -489,6 +522,8 @@ static struct svn_test_descriptor_t test_funcs[] = "test svn_authz__get_global_rights"), SVN_TEST_PASS2(issue_4741_groups, "issue 4741 groups"), + SVN_TEST_XFAIL2(reposful_reposless_stanzas_inherit, + "[foo:/] inherits [/]"), SVN_TEST_NULL }; diff --git a/subversion/tests/libsvn_repos/dump-load-test.c b/subversion/tests/libsvn_repos/dump-load-test.c index 6940c85..e7450df 100644 --- a/subversion/tests/libsvn_repos/dump-load-test.c +++ b/subversion/tests/libsvn_repos/dump-load-test.c @@ -81,7 +81,7 @@ test_dump_bad_props(svn_stringbuf_t **dump_data_p, notify_func, notify_baton, NULL, NULL, NULL, NULL, pool)); - svn_stream_close(stream); + SVN_ERR(svn_stream_close(stream)); /* Check that the property appears in the dump data */ expected_str = apr_psprintf(pool, "K %d\n%s\n" @@ -131,7 +131,7 @@ test_load_bad_props(svn_stringbuf_t *dump_data, notify_func, notify_baton, NULL, NULL, /*cancellation*/ pool)); - svn_stream_close(stream); + SVN_ERR(svn_stream_close(stream)); /* Check the loaded property */ fs = svn_repos_fs(repos); diff --git a/subversion/tests/libsvn_repos/repos-test.c b/subversion/tests/libsvn_repos/repos-test.c index 8d5472c..63b76e1 100644 --- a/subversion/tests/libsvn_repos/repos-test.c +++ b/subversion/tests/libsvn_repos/repos-test.c @@ -4461,7 +4461,7 @@ test_list(const svn_test_opts_t *opts, SVN_ERR(svn_repos_list(rev_root, "/A", patterns, svn_depth_infinity, FALSE, NULL, NULL, list_callback, &counter, NULL, NULL, pool)); - SVN_TEST_ASSERT(counter == 6); + SVN_TEST_ASSERT(counter == 7); return SVN_NO_ERROR; } diff --git a/subversion/tests/libsvn_subr/dirent_uri-test.c b/subversion/tests/libsvn_subr/dirent_uri-test.c index 086cdbc..9afc5b6 100644 --- a/subversion/tests/libsvn_subr/dirent_uri-test.c +++ b/subversion/tests/libsvn_subr/dirent_uri-test.c @@ -36,6 +36,7 @@ #include "svn_pools.h" #include "svn_dirent_uri.h" +#include "private/svn_dirent_uri_private.h" #include "private/svn_fspath.h" #include "private/svn_cert.h" @@ -2331,11 +2332,12 @@ test_relpath_internal_style(apr_pool_t *pool) for (i = 0; i < COUNT_OF(tests); i++) { - const char *internal = svn_relpath__internal_style(tests[i].path, pool); + const char *internal; + SVN_ERR(svn_relpath__make_internal(&internal, tests[i].path, pool, pool)); if (strcmp(internal, tests[i].result)) return svn_error_createf(SVN_ERR_TEST_FAILED, NULL, - "svn_relpath__internal_style(\"%s\") returned " + "svn_relpath__make_internal(\"%s\") returned " "\"%s\" expected \"%s\"", tests[i].path, internal, tests[i].result); } diff --git a/subversion/tests/libsvn_subr/priority-queue-test.c b/subversion/tests/libsvn_subr/priority-queue-test.c index bd2d991..3fc5791 100644 --- a/subversion/tests/libsvn_subr/priority-queue-test.c +++ b/subversion/tests/libsvn_subr/priority-queue-test.c @@ -125,7 +125,7 @@ verify_queue_order(svn_priority_queue__t *queue) } /* the queue should now be empty */ - verify_empty_queue(queue); + SVN_ERR(verify_empty_queue(queue)); return SVN_NO_ERROR; } @@ -154,7 +154,7 @@ test_empty_queue(apr_pool_t *pool) svn_priority_queue__t *queue = svn_priority_queue__create(elements, compare_func); - verify_empty_queue(queue); + SVN_ERR(verify_empty_queue(queue)); return SVN_NO_ERROR; } @@ -214,7 +214,7 @@ test_update(apr_pool_t *pool) } /* the queue should now be empty */ - verify_empty_queue(queue); + SVN_ERR(verify_empty_queue(queue)); return SVN_NO_ERROR; } diff --git a/subversion/tests/libsvn_subr/stream-test.c b/subversion/tests/libsvn_subr/stream-test.c index 0083d41..1a36ce0 100644 --- a/subversion/tests/libsvn_subr/stream-test.c +++ b/subversion/tests/libsvn_subr/stream-test.c @@ -1000,6 +1000,71 @@ test_stream_readline_file_crlf(apr_pool_t *pool) return SVN_NO_ERROR; } +static svn_error_t * +test_stream_readline_file_nul(apr_pool_t *pool) +{ + /* Test is written based on the problem report in + https://lists.apache.org/thread.html/c96eb5618ac0bf6e083345e0fdcdcf834e30913f26eabe6ada7bab62@%3Cusers.subversion.apache.org%3E + where the user had an OOM when calling `svndumpfilter` with + a (most likely) invalid dump containing nul bytes. + */ + const char data[] = + { + 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', + 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', + 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', + 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', + 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', + 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', + 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', + 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', + 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', + 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', + 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', + 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', + 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', + 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n', 'a', '\0', '\n' + }; + const char *tmp_dir; + const char *tmp_file; + svn_stream_t *stream; + + SVN_ERR(svn_dirent_get_absolute(&tmp_dir, "test_stream_readline_file_nul", pool)); + SVN_ERR(svn_io_remove_dir2(tmp_dir, TRUE, NULL, NULL, pool)); + SVN_ERR(svn_io_make_dir_recursively(tmp_dir, pool)); + svn_test_add_dir_cleanup(tmp_dir); + + tmp_file = svn_dirent_join(tmp_dir, "file", pool); + SVN_ERR(svn_io_file_create_bytes(tmp_file, data, sizeof(data), pool)); + SVN_ERR(svn_stream_open_readonly(&stream, tmp_file, pool, pool)); + + while (1) + { + svn_boolean_t eof; + svn_stringbuf_t *line; + + SVN_ERR(svn_stream_readline(stream, &line, "\n", &eof, pool)); + if (eof) + break; + + /* Don't check the contents of the `line` here, at least for now. + + In other words, we just test that this case does not crash or cause + unexpected errors. The reason is that currently our `readline_fn` + implementations have inconsistent behavior when dealing with \0 bytes, + handling those differently, either in strchr() or memchr() styles. + + Once we make them consistent (or even decide to bail out with an error + for \0), this part of the test should start properly checking `data`; + maybe also for non-file streams. + */ + } + + SVN_ERR(svn_stream_close(stream)); + + return SVN_NO_ERROR; +} + /* The test table. */ static int max_threads = 1; @@ -1037,6 +1102,8 @@ static struct svn_test_descriptor_t test_funcs[] = "test reading LF-terminated lines from file"), SVN_TEST_PASS2(test_stream_readline_file_crlf, "test reading CRLF-terminated lines from file"), + SVN_TEST_PASS2(test_stream_readline_file_nul, + "test reading line from file with nul bytes"), SVN_TEST_NULL }; diff --git a/subversion/tests/libsvn_wc/conflict-data-test.c b/subversion/tests/libsvn_wc/conflict-data-test.c index 7d89825..239c18f 100644 --- a/subversion/tests/libsvn_wc/conflict-data-test.c +++ b/subversion/tests/libsvn_wc/conflict-data-test.c @@ -594,6 +594,7 @@ test_serialize_tree_conflict(const svn_test_opts_t *opts, svn_wc_conflict_reason_moved_away, svn_wc_conflict_action_delete, sbox_wc_path(&sbox, "A/B"), + sbox_wc_path(&sbox, "A/C"), pool, pool)); SVN_ERR(svn_wc__conflict_skel_set_op_switch( @@ -610,11 +611,13 @@ test_serialize_tree_conflict(const svn_test_opts_t *opts, { svn_wc_conflict_reason_t reason; svn_wc_conflict_action_t action; - const char *moved_away_op_root_abspath; + const char *moved_away_src_op_root_abspath; + const char *moved_away_dst_op_root_abspath; SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action, - &moved_away_op_root_abspath, + &moved_away_src_op_root_abspath, + &moved_away_dst_op_root_abspath, sbox.wc_ctx->db, sbox.wc_abspath, conflict_skel, @@ -622,8 +625,10 @@ test_serialize_tree_conflict(const svn_test_opts_t *opts, SVN_TEST_ASSERT(reason == svn_wc_conflict_reason_moved_away); SVN_TEST_ASSERT(action == svn_wc_conflict_action_delete); - SVN_TEST_STRING_ASSERT(moved_away_op_root_abspath, + SVN_TEST_STRING_ASSERT(moved_away_src_op_root_abspath, sbox_wc_path(&sbox, "A/B")); + SVN_TEST_STRING_ASSERT(moved_away_dst_op_root_abspath, + sbox_wc_path(&sbox, "A/C")); } return SVN_NO_ERROR; diff --git a/subversion/tests/libsvn_wc/op-depth-test.c b/subversion/tests/libsvn_wc/op-depth-test.c index bf6592d..66e5928 100644 --- a/subversion/tests/libsvn_wc/op-depth-test.c +++ b/subversion/tests/libsvn_wc/op-depth-test.c @@ -535,7 +535,7 @@ check_db_conflicts(svn_test__sandbox_t *b, SVN_ERR(svn_wc__conflict_read_tree_conflict(&info->tc.reason, &info->tc.action, &move_src_abspath, - b->wc_ctx->db, + NULL, b->wc_ctx->db, local_abspath, conflict, b->pool, iterpool)); diff --git a/subversion/tests/libsvn_wc/utils.c b/subversion/tests/libsvn_wc/utils.c index 766f93d..51a0729 100644 --- a/subversion/tests/libsvn_wc/utils.c +++ b/subversion/tests/libsvn_wc/utils.c @@ -417,11 +417,12 @@ sbox_wc_revert(svn_test__sandbox_t *b, const char *path, svn_depth_t depth) SVN_ERR(svn_wc__acquire_write_lock(&lock_root_abspath, b->wc_ctx, dir_abspath, FALSE /* lock_anchor */, b->pool, b->pool)); - SVN_ERR(svn_wc_revert5(b->wc_ctx, abspath, depth, + SVN_ERR(svn_wc_revert6(b->wc_ctx, abspath, depth, FALSE /* use_commit_times */, NULL /* changelist_filter */, FALSE /* clear_changelists */, FALSE /* metadata_only */, + TRUE /*added_keep_local*/, NULL, NULL, /* cancel baton + func */ NULL, NULL, /* notify baton + func */ b->pool)); diff --git a/subversion/tests/libsvn_wc/wc-queries-test.c b/subversion/tests/libsvn_wc/wc-queries-test.c index 24e3363..16bb877 100644 --- a/subversion/tests/libsvn_wc/wc-queries-test.c +++ b/subversion/tests/libsvn_wc/wc-queries-test.c @@ -99,6 +99,8 @@ static const int slow_statements[] = STMT_SELECT_DELETE_LIST, STMT_SELECT_UPDATE_MOVE_LIST, STMT_FIND_REPOS_PATH_IN_WC, + STMT_SELECT_PRESENT_HIGHEST_WORKING_NODES_BY_BASENAME_AND_KIND, + STMT_SELECT_COPIES_OF_REPOS_RELPATH, /* Designed as slow to avoid penalty on other queries */ STMT_SELECT_UNREFERENCED_PRISTINES, @@ -265,6 +267,14 @@ struct explanation_item const char *compound_right; svn_boolean_t create_btree; + svn_boolean_t create_union; + svn_boolean_t union_all; + + svn_boolean_t merge; + + svn_boolean_t multi_index; + svn_boolean_t multi_index_or; + int expression_vars; int expected_rows; }; @@ -311,6 +321,18 @@ parse_explanation_item(struct explanation_item **parsed_item, item->table = apr_psprintf(result_pool, "SUBQUERY-%s", apr_strtok(NULL, " ", &last)); } + else if (MATCH_TOKEN(token, "CONSTANT")) + { + item->table = "sqlite_master"; /* not worth checking. + Just a lookup */ + token = apr_strtok(NULL, " ", &last); + if (!MATCH_TOKEN(token, "ROW")) + { + printf("DBG: Expected 'ROW', got '%s' in '%s'\n", + token, text); + return SVN_NO_ERROR; + } + } else { printf("DBG: Expected 'TABLE', got '%s' in '%s'\n", token, text); @@ -432,39 +454,44 @@ parse_explanation_item(struct explanation_item **parsed_item, /* Handling temporary table (E.g. UNION) */ token = apr_strtok(NULL, " ", &last); - if (!MATCH_TOKEN(token, "SUBQUERIES")) - { - printf("DBG: Expected 'SUBQUERIES', got '%s' in '%s'\n", token, - text); - return SVN_NO_ERROR; - } - - item->compound_left = apr_strtok(NULL, " ", &last); - token = apr_strtok(NULL, " ", &last); - - if (!MATCH_TOKEN(token, "AND")) - { - printf("DBG: Expected 'AND', got '%s' in '%s'\n", token, text); - return SVN_NO_ERROR; - } - - item->compound_right = apr_strtok(NULL, " ", &last); - - token = apr_strtok(NULL, " ", &last); - if (MATCH_TOKEN(token, "USING")) + if (MATCH_TOKEN(token, "SUBQUERIES")) { + item->compound_left = apr_strtok(NULL, " ", &last); token = apr_strtok(NULL, " ", &last); - if (!MATCH_TOKEN(token, "TEMP")) + + if (!MATCH_TOKEN(token, "AND")) { - printf("DBG: Expected 'TEMP', got '%s' in '%s'\n", token, text); + printf("DBG: Expected 'AND', got '%s' in '%s'\n", token, text); + return SVN_NO_ERROR; } + + item->compound_right = apr_strtok(NULL, " ", &last); + token = apr_strtok(NULL, " ", &last); - if (!MATCH_TOKEN(token, "B-TREE")) + if (MATCH_TOKEN(token, "USING")) { - printf("DBG: Expected 'B-TREE', got '%s' in '%s'\n", token, - text); + token = apr_strtok(NULL, " ", &last); + if (!MATCH_TOKEN(token, "TEMP")) + { + printf("DBG: Expected 'TEMP', got '%s' in '%s'\n", token, text); + } + token = apr_strtok(NULL, " ", &last); + if (!MATCH_TOKEN(token, "B-TREE")) + { + printf("DBG: Expected 'B-TREE', got '%s' in '%s'\n", token, + text); + } + item->create_btree = TRUE; } - item->create_btree = TRUE; + } + else if (MATCH_TOKEN(token, "QUERY")) + { + } + else + { + printf("DBG: Expected 'SUBQUERIES', got '%s' in '%s'\n", token, + text); + return SVN_NO_ERROR; } } else if (MATCH_TOKEN(item->operation, "USE")) @@ -473,6 +500,48 @@ parse_explanation_item(struct explanation_item **parsed_item, /* ### Need parsing */ item->create_btree = TRUE; } + else if (MATCH_TOKEN(item->operation, "UNION")) + { + item->create_union = TRUE; + + token = apr_strtok(NULL, " ", &last); + if (MATCH_TOKEN(token, "ALL")) + item->union_all = TRUE; + else + item->union_all = FALSE; + } + else if (MATCH_TOKEN(item->operation, "INDEX")) + { + + } + else if (MATCH_TOKEN(item->operation, "MULTI-INDEX")) + { + item->multi_index = TRUE; + token = apr_strtok(NULL, " ", &last); + if (MATCH_TOKEN(token, "OR")) + item->multi_index_or = TRUE; + } + else if (MATCH_TOKEN(item->operation, "MERGE")) + { + item->merge = TRUE; + } + else if (MATCH_TOKEN(item->operation, "LEFT") + || MATCH_TOKEN(item->operation, "RIGHT")) + { + } + else if (MATCH_TOKEN(item->operation, "CORRELATED")) + { + item->merge = TRUE; + } + else if (MATCH_TOKEN(item->operation, "CO-ROUTINE")) + { + } + else if (MATCH_TOKEN(item->operation, "SCALAR")) + { + } + else if (MATCH_TOKEN(item->operation, "LEFT-MOST")) + { + } else { printf("DBG: Unhandled sqlite operation '%s' in explanation\n", item->operation); @@ -678,7 +747,7 @@ test_query_expectations(apr_pool_t *scratch_pool) as 'DROP TABLE foo', but the performance of such statements is not our concern here. */ - /* "Slow" statements do expect too see a warning, however. */ + /* "Slow" statements do expect to see a warning, however. */ if (is_slow_statement(i)) warned = TRUE; } diff --git a/subversion/tests/libsvn_wc/wc-test-queries.h b/subversion/tests/libsvn_wc/wc-test-queries.h index b454af3..0a58a37 100644 --- a/subversion/tests/libsvn_wc/wc-test-queries.h +++ b/subversion/tests/libsvn_wc/wc-test-queries.h @@ -1,4 +1,4 @@ -/* This file is automatically generated from wc-test-queries.sql and subversion/tests/libsvn_wc/token-map.h. +/* This file is automatically generated from wc-test-queries.sql and token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_SELECT_NODES_INFO 0 diff --git a/subversion/tests/svn_test_main.c b/subversion/tests/svn_test_main.c index c3537d3..31d670f 100644 --- a/subversion/tests/svn_test_main.c +++ b/subversion/tests/svn_test_main.c @@ -903,9 +903,12 @@ svn_test_main(int argc, const char *argv[], int max_threads, apr_err = apr_getopt_long(os, cl_options, &opt_id, &opt_arg); if (APR_STATUS_IS_EOF(apr_err)) break; - else if (apr_err && (apr_err != APR_BADCH)) + else if (apr_err) { /* Ignore invalid option error to allow passing arbitrary options */ + if (apr_err == APR_BADCH) + continue; + fprintf(stderr, "apr_getopt_long failed : [%d] %s\n", apr_err, apr_strerror(apr_err, errmsg, sizeof(errmsg))); exit(1); diff --git a/tools/backup/hot-backup.py.in b/tools/backup/hot-backup.py.in index 76bc91d..f497ce2 100755 --- a/tools/backup/hot-backup.py.in +++ b/tools/backup/hot-backup.py.in @@ -28,7 +28,7 @@ # under the License. # ==================================================================== -# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.10.x/tools/backup/hot-backup.py.in $ +# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/tools/backup/hot-backup.py.in $ # $LastChangedDate: 2015-12-21 15:02:31 +0000 (Mon, 21 Dec 2015) $ # $LastChangedBy: danielsh $ # $LastChangedRevision: 1721179 $ diff --git a/tools/buildbot/slaves/bb-openbsd/svnbuild.sh b/tools/buildbot/slaves/bb-openbsd/svnbuild.sh index 42c3260..8a8104c 100755 --- a/tools/buildbot/slaves/bb-openbsd/svnbuild.sh +++ b/tools/buildbot/slaves/bb-openbsd/svnbuild.sh @@ -22,7 +22,10 @@ set -e set -x -export JAVA_HOME=/usr/local/jdk-1.7.0 - -branch="$(basename $(svn info . | grep ^URL | cut -d' ' -f2))" -(cd .. && gmake BRANCH="$branch" THREADING="no") +(test -h ../GNUmakefile || ln -s ../unix-build/Makefile.svn ../GNUmakefile) +(cd .. && gmake dirs-create fetch) +url="$(svn info --show-item url)" +branch="${url##*/}" +mkdir -p ../objdir/svn-${branch} +touch ../objdir/svn-${branch}/.retrieved +(cd .. && gmake BRANCH="$branch" THREADING="no" JAVA="no" MAKE_JOBS=8) diff --git a/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh b/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh index 9d47b1f..e68775b 100755 --- a/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh +++ b/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh @@ -22,11 +22,11 @@ set -e set -x -branch="$(basename $(svn info . | grep ^URL | cut -d' ' -f2))" +url="$(svn info --show-item url)" +branch="${url##*/}" export MALLOC_OPTIONS=S -(cd .. && gmake BRANCH="$branch" THREADING="no" svn-check-bindings) +(cd .. && gmake BRANCH="$branch" THREADING="no" JAVA="no" svn-check-bindings) grep -q "^Result: PASS$" tests.log.bindings.pl || exit 1 grep -q "^OK$" tests.log.bindings.py || exit 1 grep -q ", 0 failures, 0 errors" tests.log.bindings.rb || exit 1 -#TODO javahl exit 0 diff --git a/tools/buildbot/slaves/bb-openbsd/svncheck.sh b/tools/buildbot/slaves/bb-openbsd/svncheck.sh index 7d50d98..1fe06b0 100755 --- a/tools/buildbot/slaves/bb-openbsd/svncheck.sh +++ b/tools/buildbot/slaves/bb-openbsd/svncheck.sh @@ -22,11 +22,11 @@ set -e set -x -branch="$(basename $(svn info . | grep ^URL | cut -d' ' -f2))" +url="$(svn info --show-item url)" +branch="${url##*/}" export MALLOC_OPTIONS=S -(cd .. && gmake BRANCH="$branch" PARALLEL="" THREADING="no" \ - MEMCACHED_SERVER="127.0.0.1:11211" \ - EXCLUSIVE_WC_LOCKS=1 \ +(cd .. && gmake BRANCH="$branch" PARALLEL="4" THREADING="no" JAVA="no" \ + EXCLUSIVE_WC_LOCKS=1 SVN_CHECK_FS_BACKENDS=fsfs \ svn-check-local \ svn-check-svn \ svn-check-neon \ diff --git a/tools/buildbot/slaves/bb-openbsd/svnclean.sh b/tools/buildbot/slaves/bb-openbsd/svnclean.sh index 063f4dd..a2f86e0 100755 --- a/tools/buildbot/slaves/bb-openbsd/svnclean.sh +++ b/tools/buildbot/slaves/bb-openbsd/svnclean.sh @@ -22,12 +22,20 @@ set -e set -x -branch="$(basename $(svn info . | grep ^URL | cut -d' ' -f2))" (test -h ../svn-trunk || ln -s build ../svn-trunk) -for i in 6 7 8 9 10; do +for i in $(jot - 6 12); do (test -h ../svn-1.${i}.x || ln -s build ../svn-1.${i}.x) done +lastchangedrev="$(svn info --show-item=last-changed-revision ../../unix-build/Makefile.svn)" svn update ../../unix-build +newlastchangedrev="$(svn info --show-item=last-changed-revision ../../unix-build/Makefile.svn)" (test -h ../GNUmakefile || ln -s ../unix-build/Makefile.svn ../GNUmakefile) -(cd .. && gmake BRANCH="$branch" reset clean) +# always rebuild svn, but only rebuild dependencies if Makefile.svn has changed +url="$(svn info --show-item url)" +branch="${url##*/}" +if [ "$lastchangedrev" != "$newlastchangedrev" ]; then + (cd .. && gmake BRANCH="$branch" reset clean) +else + (cd .. && gmake BRANCH="$branch" svn-reset svn-bindings-reset svn-clean) +fi rm -f tests.log* fails.log* diff --git a/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh b/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh deleted file mode 100755 index 74bc436..0000000 --- a/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# - -echo "========= autogen.sh" -./autogen.sh || exit $? - -echo "========= configure" -./configure --with-serf=./serf --with-apxs=/usr/sbin/apxs --without-berkeley-db --prefix=/Users/buildslave17/slave17/osx10.6-gcc4.2.1-x64-serf/build/svninstall --with-apache-libexecdir=/Users/buildslave17/slave17/osx10.6-gcc4.2.1-x64-serf/build/libexec || exit $? - -echo "========= make" -make || exit $? - -echo "========= make swig-py" -make swig-py || exit $? - -#echo "========= make swig-pl" -#make swig-pl || exit $? - -#echo "========= make swig-rb" -#make swig-rb || exit $? - -echo "========= make install" -make install || exit $? - -exit 0 diff --git a/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh b/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh deleted file mode 100755 index 7233d3c..0000000 --- a/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# - -set -x - -if test -z "$1" ; then - echo "Missing FS_TYPE specifier (arg #1)." - exit 1 -fi - -echo "========= make check" -if [ "$2" = "ra_serf" ]; then - make davautocheck FS_TYPE=$1 HTTP_LIBRARY=serf CLEANUP=1 || s=$?; -else - make davautocheck FS_TYPE=$1 CLEANUP=1 || s=$?; -fi - -echo "========= cat tests.log" -cat tests.log - -exit $s diff --git a/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh b/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh deleted file mode 100755 index 586e203..0000000 --- a/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# - -# ../unmount_ramd.sh - -echo "========= make extraclean" -test -e Makefile && { make extraclean || exit $?; } -rm -rf ../build/* -rm -rf .svn -rm -rf .buildbot-sourcedata - -exit 0 diff --git a/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh b/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh deleted file mode 100755 index ce845f8..0000000 --- a/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# - -# upload file to server -FILENAME=tests-`date +%Y%m%d%H%M`.log.tgz -tar -czf $FILENAME tests.log -ftp -n www.mobsol.be < ../ftpscript -rm $FILENAME - -echo "Logs of the testrun can be found here: http://www.mobsol.be/logs/osx10.4-gcc4.0.1-ia32/$FILENAME" - -exit 0 diff --git a/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnbuild.sh b/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnbuild.sh deleted file mode 100755 index a8750eb..0000000 --- a/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnbuild.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# - -echo "========= autogen.sh" -./autogen.sh || exit $? - -echo "========= configure" -./configure --without-serf --with-apxs=/usr/sbin/apxs --without-berkeley-db --prefix=/Users/buildslave17/slave17/osx10.6-gcc4.2.1-x64/build/svninstall --with-apache-libexecdir=/Users/buildslave17/slave17/osx10.6-gcc4.2.1-x64/build/libexec || exit $? - -echo "========= make" -make || exit $? - -echo "========= make swig-py" -make swig-py || exit $? - -#echo "========= make swig-pl" -#make swig-pl || exit $? - -#echo "========= make swig-rb" -#make swig-rb || exit $? - -echo "========= make install" -make install || exit $? - -exit 0 diff --git a/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svncheck.sh b/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svncheck.sh deleted file mode 100755 index 7233d3c..0000000 --- a/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svncheck.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# - -set -x - -if test -z "$1" ; then - echo "Missing FS_TYPE specifier (arg #1)." - exit 1 -fi - -echo "========= make check" -if [ "$2" = "ra_serf" ]; then - make davautocheck FS_TYPE=$1 HTTP_LIBRARY=serf CLEANUP=1 || s=$?; -else - make davautocheck FS_TYPE=$1 CLEANUP=1 || s=$?; -fi - -echo "========= cat tests.log" -cat tests.log - -exit $s diff --git a/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnclean.sh b/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnclean.sh deleted file mode 100755 index 586e203..0000000 --- a/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnclean.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# - -# ../unmount_ramd.sh - -echo "========= make extraclean" -test -e Makefile && { make extraclean || exit $?; } -rm -rf ../build/* -rm -rf .svn -rm -rf .buildbot-sourcedata - -exit 0 diff --git a/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh b/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh deleted file mode 100755 index ce845f8..0000000 --- a/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# - -# upload file to server -FILENAME=tests-`date +%Y%m%d%H%M`.log.tgz -tar -czf $FILENAME tests.log -ftp -n www.mobsol.be < ../ftpscript -rm $FILENAME - -echo "Logs of the testrun can be found here: http://www.mobsol.be/logs/osx10.4-gcc4.0.1-ia32/$FILENAME" - -exit 0 diff --git a/tools/buildbot/slaves/svn-x64-macosx/setenv.sh b/tools/buildbot/slaves/svn-x64-macosx/setenv.sh index d4130e1..f36ba2d 100644 --- a/tools/buildbot/slaves/svn-x64-macosx/setenv.sh +++ b/tools/buildbot/slaves/svn-x64-macosx/setenv.sh @@ -24,8 +24,9 @@ ## SVNBB_SERF Serf installation prefix ## Note: Serf should be built only ## with the system APR/-Util. +## SVNBB_APR Path of the default APR +## SVNBB_APRUTIL Path of the default APR-Util ## SVNBB_APR_13_NOTHREAD Path of APR-1.3 with threading disabled -## SVNBB_APR_15 Path of APR-1.5 ## SVNBB_APR_20_DEV Path of APR-2.0 ## SVNBB_JUNIT The path of the junit.jar ## SVNBB_PARALLEL Optional: parallelization; defaults to 2 @@ -45,7 +46,8 @@ export SVNBB_BDB export SVNBB_SWIG export SVNBB_SERF export SVNBB_APR_13_NOTHREAD -export SVNBB_APR_15 +export SVNBB_APR +export SVNBB_APRUTIL export SVNBB_APR_20_DEV export SVNBB_JUNIT export SVNBB_PARALLEL diff --git a/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh b/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh index fa085dd..284f320 100755 --- a/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh +++ b/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh @@ -25,21 +25,16 @@ scripts=$(cd $(dirname "$0") && pwd) . ${scripts}/setenv.sh # -# Step 4: build swig-py +# Step 4: build bindings # -echo "============ make swig-py" -cd ${absbld} -make swig-py +build_bindings() { + echo "============ make $1" + cd ${absbld} + make $1 +} -echo "============ make swig-pl" -cd ${absbld} -make swig-pl - -echo "============ make swig-rb" -cd ${absbld} -make swig-rb - -echo "============ make javahl" -cd ${absbld} -make javahl +build_bindings swig-py +build_bindings swig-pl +build_bindings swig-rb +build_bindings javahl diff --git a/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh b/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh index eff8986..8d70769 100755 --- a/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh +++ b/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh @@ -27,17 +27,33 @@ scripts=$(cd $(dirname "$0") && pwd) ${scripts}/mkramdisk.sh ${volume_name} ${ramconf} # These are the default APR and Serf config options -serfconfig="--with-serf=${SVNBB_SERF} --with-apxs=/usr/sbin/apxs" +serfconfig=" --with-serf=${SVNBB_SERF} --with-apxs=/usr/local/opt/httpd/bin/apxs" # An optional parameter tells build scripts which version of APR to use if [ ! -z "$1" ]; then aprdir=$(eval 'echo $SVNBB_'"$1") +else + aprconfig="--with-apr=${SVNBB_APR} --with-apr-util=${SVNBB_APRUTIL}" fi if [ ! -z "${aprdir}" -a -d "${aprdir}" ]; then aprconfig="--with-apr=${aprdir} --with-apr-util=${aprdir}" serfconfig=" --without-serf --without-apxs" fi +# An optional parameter tells us if this is a warnings-only build. +# We run the warnings build with a number of additional options. +if [ "$2" = "warnings" ]; then + parallel=1 + maintainer_mode=' -q --enable-maintainer-mode' + config_cflags="-Wno-deprecated-declarations" + config_cflags="${config_cflags} -DPACK_AFTER_EVERY_COMMIT" + config_cflags="${config_cflags} -DSVN_UNALIGNED_ACCESS_IS_OK=0" + config_cflags="${config_cflags} -DSUFFIX_LINES_TO_KEEP=0" + config_cflags="${config_cflags} -DSVN_DEPRECATED=" +else + parallel=${SVNBB_PARALLEL} +fi + # # Step 0: Create a directory for the test log files # @@ -82,8 +98,10 @@ fi echo "============ configure" cd ${absbld} -env CC=clang CXX=clang++ \ -${abssrc}/configure \ +env CC=clang CFLAGS="${config_cflags}" \ + CXX=clang++ CXXFLAGS="${config_cxxflags}" \ + LDFLAGS='-Wl,-w' \ +${abssrc}/configure${maintainer_mode} \ --prefix="${absbld}/.install-prefix" \ --enable-debug${optimizeconfig} \ --disable-nls \ @@ -91,6 +109,7 @@ ${abssrc}/configure \ ${aprconfig}${serfconfig} \ --with-swig="${SVNBB_SWIG}" \ --with-berkeley-db=db.h:"${SVNBB_BDB}/include":${SVNBB_BDB}/lib:db \ + --enable-bdb6 \ --enable-javahl \ --without-jikes \ ${lz4config} \ @@ -105,4 +124,4 @@ test -f config.log && mv config.log "${abssrc}/.test-logs/config.log" echo "============ make" cd ${absbld} -make -j${SVNBB_PARALLEL} +make -j${parallel} diff --git a/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh b/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh index 1fb538b..4810408 100755 --- a/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh +++ b/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh @@ -24,6 +24,8 @@ run_tests() { echo "============ make check-${check}" cd ${absbld} + make -s install + make -s install-${check} make check-${check} ${cleanup} || exit 1 } diff --git a/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh b/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh index 0d24286..9465d3f 100755 --- a/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh +++ b/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh @@ -24,15 +24,22 @@ run_tests() { ok=true case "${ra}" in - local) check=check; skipC=;; - svn) check=svnserveautocheck; skipC="SKIP_C_TESTS=1";; - dav) check=davautocheck; skipC="SKIP_C_TESTS=1";; + local) check=check; more=;; + svn) check=svnserveautocheck; more="SKIP_C_TESTS=1";; + dav) check=davautocheck; more="SKIP_C_TESTS=1"; + if [ "${fs}" == "bdb" ]; then + more="${more} APACHE_MPM=prefork" + else + more="${more} APACHE_MPM=event" + fi;; *) exit 1;; esac + ${allow_remote} && more="${more} ALLOW_REMOTE_HTTP_CONNECTION=1" + echo "============ make check ${ra}+${fs}" cd ${absbld} - make ${check} FS_TYPE=${fs} PARALLEL=${SVNBB_PARALLEL} CLEANUP=1 ${skipC} || ok=false + make ${check} FS_TYPE=${fs} PARALLEL=${SVNBB_PARALLEL} CLEANUP=1 ${more} || ok=false # Move any log files to the buildbot work directory test -f tests.log && mv tests.log "${abssrc}/.test-logs/tests-${ra}-${fs}.log" @@ -72,6 +79,7 @@ check_fsfs_v6=false check_fsfs_v4=false check_fsx=false check_bdb=false +allow_remote=false while [ ! -z "$1" ]; do case "$1" in @@ -84,6 +92,7 @@ while [ ! -z "$1" ]; do fsfs-v4) check_fsfs_v4=true;; fsx) check_fsx=true;; bdb) check_bdb=true;; + remote) allow_remote=true;; *) exit 1;; esac shift diff --git a/tools/buildbot/slaves/svnbot-common/README b/tools/buildbot/slaves/svnbot-common/README new file mode 100644 index 0000000..03925de --- /dev/null +++ b/tools/buildbot/slaves/svnbot-common/README @@ -0,0 +1,7 @@ +Common tool used by (some) buildslaves +--------------------------------------- + +Currently used by the following script sets: + + * svn-x64-macosx + * svn-arm64-gentoo (under construction -- literally :) diff --git a/tools/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl b/tools/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl deleted file mode 100644 index 1221b7a..0000000 --- a/tools/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl +++ /dev/null @@ -1,44 +0,0 @@ -REM Licensed to the Apache Software Foundation (ASF) under one -REM or more contributor license agreements. See the NOTICE file -REM distributed with this work for additional information -REM regarding copyright ownership. The ASF licenses this file -REM to you under the Apache License, Version 2.0 (the -REM "License"); you may not use this file except in compliance -REM with the License. You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, -REM software distributed under the License is distributed on an -REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -REM KIND, either express or implied. See the License for the -REM specific language governing permissions and limitations -REM under the License. - -set MSDEV=C:\Program Files\VS6.0 -set HTTPD_BIN_DIR=C:\Program Files\Apache2 -set TEST_DIR=C:\tmp\svn-auto-test -set SDK_DIR=C:\Program Files\VS.NET\Vc7\PlatformSDK\ - -set HTTPD_SRC_DIR=..\httpd -set BDB_DIR=..\db4-win32 -set NEON_DIR=..\neon -set ZLIB_DIR=..\zlib -set OPENSSL_DIR=..\openssl -set INTL_DIR=..\svn-win32-libintl - -REM Uncomment this if you want clean subversion build, after testing -REM set CLEAN_SVN=1 - -REM Uncomment this if you want disable ra_svn tests -REM set NO_RA_SVN=1 - -REM Uncomment this if you want disable ra_dav tests -REM set NO_RA_HTTP=1 - -set SDKINC=%SDK_DIR%\include -set SDKLIB=%SDK_DIR%\lib - -set PATH=%MSDEV%\VC98\Bin;%MSDEV%\Common\MSDev98\Bin\;%PATH% -set INCLUDE=%SDKINC%;%MSDEV%\VC98\ATL\INCLUDE;%MSDEV%\VC98\INCLUDE;%MSDEV%\VC98\MFC\INCLUDE -set LIB=%SDKLIB%;%MSDEV%\VC98\LIB;%MSDEV%\VC98\MFC\LIB diff --git a/tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat b/tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat deleted file mode 100644 index 2d5a671..0000000 --- a/tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat +++ /dev/null @@ -1,77 +0,0 @@ -REM Licensed to the Apache Software Foundation (ASF) under one -REM or more contributor license agreements. See the NOTICE file -REM distributed with this work for additional information -REM regarding copyright ownership. The ASF licenses this file -REM to you under the Apache License, Version 2.0 (the -REM "License"); you may not use this file except in compliance -REM with the License. You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, -REM software distributed under the License is distributed on an -REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -REM KIND, either express or implied. See the License for the -REM specific language governing permissions and limitations -REM under the License. - -IF NOT EXIST ..\config.bat GOTO noconfig -call ..\config.bat - -IF NOT "%OPENSSL_DIR%"=="" call :openssl -IF ERRORLEVEL 1 GOTO ERROR - -set PARAMS=-t dsp --with-berkeley-db=%BDB_DIR% --with-libintl=%INTL_DIR% --with-zlib=%ZLIB_DIR% --with-httpd=%HTTPD_SRC_DIR% --with-neon=%NEON_DIR% --enable-bdb-in-apr-util -IF NOT "%OPENSSL_DIR%"=="" set PARAMS=%PARAMS% --with-openssl=%OPENSSL_DIR% - -python gen-make.py %PARAMS% -IF ERRORLEVEL 1 GOTO ERROR - -MSDEV.COM %HTTPD_SRC_DIR%\apache.dsw /MAKE "BuildBin - Win32 Release" -IF ERRORLEVEL 1 GOTO ERROR - -MSDEV.COM subversion_msvc.dsw /USEENV /MAKE "__ALL_TESTS__ - Win32 Release" -IF ERRORLEVEL 1 GOTO ERROR - - -EXIT 0 - -REM ---------------------------------------------------- -:ERROR -ECHO. -ECHO *** Whoops, something choked. -ECHO. -CD .. -EXIT 1 - - -:openssl -rem ====== Build openssl. -pushd %OPENSSL_DIR% -perl Configure VC-WIN32 -IF ERRORLEVEL 1 goto openssl-err1 - -call ms\do_ms -IF ERRORLEVEL 1 goto openssl-err1 - -nmake -f ms\ntdll.mak /NOLOGO /S -IF ERRORLEVEL 1 goto openssl-err1 - -pushd out32dll -call ..\ms\test -IF ERRORLEVEL 1 goto openssl-err2 - -popd -popd -EXIT /B 0 - -:openssl-err2 -popd - -:openssl-err1 -popd -EXIT 1 - -:noconfig -echo File config.bat not found. Please copy it from config.bat.tmpl and tweak for you. -EXIT 2 diff --git a/tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat b/tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat deleted file mode 100644 index 70e8768..0000000 --- a/tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat +++ /dev/null @@ -1,51 +0,0 @@ -REM Licensed to the Apache Software Foundation (ASF) under one -REM or more contributor license agreements. See the NOTICE file -REM distributed with this work for additional information -REM regarding copyright ownership. The ASF licenses this file -REM to you under the Apache License, Version 2.0 (the -REM "License"); you may not use this file except in compliance -REM with the License. You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, -REM software distributed under the License is distributed on an -REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -REM KIND, either express or implied. See the License for the -REM specific language governing permissions and limitations -REM under the License. - -IF NOT EXIST ..\config.bat GOTO noconfig -call ..\config.bat - -set FS_TYPE=%1 -set RA_TYPE=%2 - -REM By default, return zero -set ERR=0 - -if "%RA_TYPE%"=="ra_local" goto ra_local -if "%RA_TYPE%"=="ra_svn" goto ra_svn -if "%RA_TYPE%"=="ra_dav" goto ra_dav - -echo Unknown ra method '%RA_TYPE%' -EXIT 3 - -:ra_local -python win-tests.py %TEST_DIR% -f %FS_TYPE% -c -r -if ERRORLEVEL 1 set ERR=1 -EXIT %ERR% - -:ra_svn -python win-tests.py %TEST_DIR% -f %FS_TYPE% -c -r -u svn://localhost -if ERRORLEVEL 1 set ERR=1 -EXIT %ERR% - -:ra_dav -python win-tests.py %TEST_DIR% -f %FS_TYPE% -c -r --httpd-dir="%HTTPD_BIN_DIR%" --httpd-port 1234 -if ERRORLEVEL 1 set ERR=1 -EXIT %ERR% - -:noconfig -echo File config.bat not found. Please copy it from config.bat.tmpl and tweak for you. -EXIT 2 diff --git a/tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat b/tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat deleted file mode 100644 index 64df9b8..0000000 --- a/tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat +++ /dev/null @@ -1,28 +0,0 @@ -REM Licensed to the Apache Software Foundation (ASF) under one -REM or more contributor license agreements. See the NOTICE file -REM distributed with this work for additional information -REM regarding copyright ownership. The ASF licenses this file -REM to you under the Apache License, Version 2.0 (the -REM "License"); you may not use this file except in compliance -REM with the License. You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, -REM software distributed under the License is distributed on an -REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -REM KIND, either express or implied. See the License for the -REM specific language governing permissions and limitations -REM under the License. - -IF NOT EXIST ..\config.bat GOTO noconfig -call ..\config.bat - -if NOT "%CLEAN_SVN%"=="" MSDEV.COM subversion_msvc.dsw /MAKE "__ALL_TESTS__ - Win32 Release" /CLEAN -if ERRORLEVEL 1 EXIT 1 - -EXIT 0 - -:noconfig -echo File config.bat not found. Please copy it from config.bat.tmpl and tweak for you. -EXIT 2 diff --git a/tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat b/tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat deleted file mode 100644 index bb0d872..0000000 --- a/tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat +++ /dev/null @@ -1,25 +0,0 @@ -REM Licensed to the Apache Software Foundation (ASF) under one -REM or more contributor license agreements. See the NOTICE file -REM distributed with this work for additional information -REM regarding copyright ownership. The ASF licenses this file -REM to you under the Apache License, Version 2.0 (the -REM "License"); you may not use this file except in compliance -REM with the License. You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, -REM software distributed under the License is distributed on an -REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -REM KIND, either express or implied. See the License for the -REM specific language governing permissions and limitations -REM under the License. - -IF NOT EXIST ..\config.bat GOTO noconfig -call ..\config.bat - -EXIT 0 - -:noconfig -echo File config.bat not found. Please copy it from config.bat.tmpl and tweak for you. -EXIT 2 diff --git a/tools/client-side/bash_completion b/tools/client-side/bash_completion index 53632fb..44d15bb 100644 --- a/tools/client-side/bash_completion +++ b/tools/client-side/bash_completion @@ -248,7 +248,8 @@ _svn() cmds="$cmds patch propdel pdel propedit pedit propget pget proplist" cmds="$cmds plist propset pset relocate resolve resolved revert status" cmds="$cmds switch unlock update upgrade" - cmds="$cmds shelve shelves unshelve" + cmds="$cmds x-shelf-diff x-shelf-drop x-shelf-list x-shelf-list-by-paths" + cmds="$cmds x-shelf-log x-shelf-save x-shelve x-shelves x-unshelve" # help options have a strange command status... local helpOpts='--help -h' @@ -845,9 +846,11 @@ _svn() # otherwise build possible options for the command pOpts="--username --password --no-auth-cache --non-interactive \ + --password-from-stdin \ --trust-server-cert-failures \ --force-interactive" - mOpts="-m --message -F --file --encoding --force-log --with-revprop" + mOpts="-m --message -F --file --encoding --force-log --with-revprop \ + --editor-cmd" rOpts="-r --revision" qOpts="-q --quiet" nOpts="-N --non-recursive --depth" @@ -886,16 +889,16 @@ _svn() --remove-ignored --remove-unversioned --vacuum-pristines" ;; commit|ci) - cmdOpts="$mOpts $qOpts $nOpts --targets --editor-cmd $pOpts \ + cmdOpts="$mOpts $qOpts $nOpts --targets $pOpts \ --no-unlock $cOpts --keep-changelists \ --include-externals" ;; copy|cp) - cmdOpts="$mOpts $rOpts $qOpts --editor-cmd $pOpts --parents \ + cmdOpts="$mOpts $rOpts $qOpts $pOpts --parents \ --ignore-externals --pin-externals" ;; delete|del|remove|rm) - cmdOpts="--force $mOpts $qOpts --targets --editor-cmd $pOpts \ + cmdOpts="--force $mOpts $qOpts --targets $pOpts \ --keep-local" ;; diff|di) @@ -915,7 +918,7 @@ _svn() ;; import) cmdOpts="--auto-props --no-auto-props $mOpts $qOpts $nOpts \ - --no-ignore --editor-cmd $pOpts --force" + --no-ignore $pOpts --force" ;; info) cmdOpts="$pOpts $rOpts --targets -R --recursive --depth \ @@ -949,10 +952,10 @@ _svn() $qOpts -v --verbose --incremental --log" ;; mkdir) - cmdOpts="$mOpts $qOpts --editor-cmd $pOpts --parents" + cmdOpts="$mOpts $qOpts $pOpts --parents" ;; move|mv|rename|ren) - cmdOpts="$mOpts $qOpts --force --editor-cmd $pOpts \ + cmdOpts="$mOpts $qOpts --force $pOpts \ --parents --allow-mixed-revisions" ;; patch) @@ -965,7 +968,7 @@ _svn() [[ $isRevProp || ! $prop ]] && cmdOpts="$cmdOpts --revprop" ;; propedit|pedit|pe) - cmdOpts="--editor-cmd $pOpts $mOpts --force" + cmdOpts="$pOpts $mOpts --force" [[ $isRevProp || ! $prop ]] && \ cmdOpts="$cmdOpts --revprop $rOpts" ;; @@ -1021,15 +1024,37 @@ _svn() upgrade) cmdOpts="$qOpts $pOpts" ;; - shelve) - cmdOpts="$qOpts --keep-local --delete --list -m --message -F --file --encoding --force-log --editor-cmd --dry-run --depth --targets $cOpts $pOpts" + x-shelf-list-by-paths) + cmdOpts="$pOpts" ;; - unshelve) - cmdOpts="$qOpts --keep-shelved --list --dry-run $pOpts" + x-shelf-diff) + cmdOpts="$pOpts --summarize" ;; - shelves) + x-shelf-drop) + cmdOpts="$pOpts" + ;; + x-shelf-list|x-shelves) + cmdOpts="$qOpts $pOpts" + ;; + x-shelf-log) cmdOpts="$qOpts $pOpts" ;; + x-shelf-save) + cmdOpts="--dry-run \ + --depth --targets $cOpts \ + $mOpts \ + $qOpts $pOpts" + ;; + x-shelve) + cmdOpts="--keep-local --dry-run \ + --depth --targets $cOpts \ + $mOpts \ + $qOpts $pOpts" + ;; + x-unshelve) + cmdOpts="--drop --dry-run \ + $qOpts $pOpts" + ;; *) ;; esac @@ -1114,7 +1139,7 @@ _svnadmin () # Possible expansions, without pure-prefix abbreviations such as "h". cmds='crashtest create delrevprop deltify dump dump-revprops freeze \ help hotcopy info list-dblogs list-unused-dblogs \ - load load-revprops lock lslocks lstxns pack recover rmlocks \ + load load-revprops lock lslocks lstxns pack recover rev-size rmlocks \ rmtxns setlog setrevprop setuuid unlock upgrade verify --version' if [[ $COMP_CWORD -eq 1 ]] ; then @@ -1186,6 +1211,9 @@ _svnadmin () recover) cmdOpts="--wait" ;; + rev-size) + cmdOpts="-r --revision -M --memory-cache-size -q --quiet" + ;; rmlocks) cmdOpts="-q --quiet" ;; diff --git a/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c b/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c index d2f1731..09e611e 100644 --- a/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c +++ b/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c @@ -176,7 +176,7 @@ svn_min__help(apr_getopt_t *os, svn_stringbuf_appendcstr(version_footer, "* KWallet (KDE)\n"); #endif - return svn_opt_print_help4(os, + return svn_opt_print_help5(os, "svn-mergeinfo-normalizer", opt_state ? opt_state->version : FALSE, opt_state ? opt_state->quiet : FALSE, diff --git a/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h b/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h index 8afff31..9112f05 100644 --- a/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h +++ b/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h @@ -117,7 +117,7 @@ svn_opt_subcommand_t svn_min__remove_branches; /* See definition in svn.c for documentation. */ -extern const svn_opt_subcommand_desc2_t svn_min__cmd_table[]; +extern const svn_opt_subcommand_desc3_t svn_min__cmd_table[]; /* See definition in svn.c for documentation. */ extern const int svn_min__global_options[]; diff --git a/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c b/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c index c0c7fc3..529621b 100644 --- a/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c +++ b/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c @@ -221,43 +221,44 @@ const int svn_min__global_options[] = opt_config_dir, opt_config_options, 0 }; -const svn_opt_subcommand_desc2_t svn_min__cmd_table[] = +const svn_opt_subcommand_desc3_t svn_min__cmd_table[] = { - { "help", svn_min__help, {"?", "h"}, N_ - ("Describe the usage of this program or its subcommands.\n" - "usage: help [SUBCOMMAND...]\n"), + { "help", svn_min__help, {"?", "h"}, {N_( + "Describe the usage of this program or its subcommands.\n" + "usage: help [SUBCOMMAND...]\n" + )}, {0} }, /* This command is also invoked if we see option "--help", "-h" or "-?". */ - { "analyze", svn_min__analyze, { "analyse" }, N_ - ("Generate a report of which part of the sub-tree mergeinfo can be\n" + { "analyze", svn_min__analyze, { "analyse" }, {N_( + "Generate a report of which part of the sub-tree mergeinfo can be\n" "removed and which part can't.\n" "usage: analyze [WCPATH...]\n" - "\n" + "\n"), N_( " If neither --remove-obsoletes, --remove-redundant nor --combine-ranges\n" " option is given, all three will be used implicitly.\n" - "\n" + "\n"), N_( " In verbose mode, the command will behave just like 'normalize --dry-run'\n" " but will show an additional summary of all deleted branches that were\n" " encountered plus the revision of their latest deletion (if available).\n" - "\n" + "\n"), N_( " In non-verbose mode, the per-node output does not give the parent path,\n" " no successful elisions and branch removals nor the list of remaining\n" " branches.\n" - ), + )}, {opt_targets, opt_depth, 'v', opt_remove_obsoletes, opt_remove_redundant, opt_remove_redundant_misaligned, opt_combine_ranges} }, - { "normalize", svn_min__normalize, { 0 }, N_ - ("Normalize / reduce the mergeinfo throughout the working copy sub-tree.\n" + { "normalize", svn_min__normalize, { 0 }, {N_( + "Normalize / reduce the mergeinfo throughout the working copy sub-tree.\n" "usage: normalize [WCPATH...]\n" - "\n" + "\n"), N_( " If neither --remove-obsoletes, --remove-redundant, --combine-ranges\n" " nor --remove-redundant-misaligned option is given, --remove-redundant\n" " will be used implicitly.\n" - "\n" + "\n"), N_( " In non-verbose mode, only general progress as well as a summary before\n" " and after the normalization process will be shown. Note that sub-node\n" " mergeinfo which could be removed entirely does not contribute to the\n" @@ -265,12 +266,12 @@ const svn_opt_subcommand_desc2_t svn_min__cmd_table[] = " ranges combined only refers to the mergeinfo lines still present after\n" " the normalization process. To get total numbers, compare the initial\n" " with the final mergeinfo statistics.\n" - "\n" + "\n"), N_( " The detailed operation log in verbose mode replaces the progress display.\n" " For each node with mergeinfo, the nearest parent node with mergeinfo is\n" " given - if there is one and the result of trying to remove the mergeinfo\n" " is shown for each branch. The various outputs are:\n" - "\n" + "\n"), N_( " elide redundant branch - Revision ranges are the same as in the parent.\n" " Mergeinfo for this branch can be elided.\n" " elide branch - Not an exact match with the parent but the\n" @@ -324,32 +325,34 @@ const svn_opt_subcommand_desc2_t svn_min__cmd_table[] = " The sub-tree mergeinfo cannot be elided.\n" " REVERSE RANGE(S) found - The mergeinfo contains illegal reverse ranges.\n" " The sub-tree mergeinfo cannot be elided.\n" - "\n" + "\n"), N_( " If all branches have been removed from a nodes' mergeinfo, the whole\n" " svn:mergeinfo property will be removed. Otherwise, only obsolete\n" " branches will be removed. In verbose mode, a list of branches that\n" - " could not be removed will be shown per node.\n"), + " could not be removed will be shown per node.\n" + )}, {opt_targets, opt_depth, opt_dry_run, 'q', 'v', opt_remove_obsoletes, opt_remove_redundant, opt_remove_redundant_misaligned, opt_combine_ranges} }, - { "remove-branches", svn_min__remove_branches, { 0 }, N_ - ("Read a list of branch names from the given file and remove all\n" + { "remove-branches", svn_min__remove_branches, { 0 }, {N_( + "Read a list of branch names from the given file and remove all\n" "mergeinfo referring to these branches from the given targets.\n" "usage: remove-branches [WCPATH...] --file FILE\n" - "\n" + "\n"), N_( " The command will behave just like 'normalize --remove-obsoletes' but\n" " will never actually contact the repository. Instead, it assumes any\n" " path given in FILE is a deleted branch.\n" - "\n" + "\n"), N_( " Compared to a simple 'normalize --remove-obsoletes' run, this command\n" " allows for selective removal of obsolete branches. It may therefore be\n" " better suited for large deployments with complex branch structures.\n" " You may also use this to remove mergeinfo that refers to still existing\n" - " branches.\n"), + " branches.\n" + )}, {opt_targets, opt_depth, opt_dry_run, 'q', 'v', 'F'} }, - { NULL, NULL, {0}, NULL, {0} } + { NULL, NULL, {0}, {NULL}, {0} } }; @@ -414,7 +417,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) svn_client_ctx_t *ctx; apr_array_header_t *received_opts; int i; - const svn_opt_subcommand_desc2_t *subcommand = NULL; + const svn_opt_subcommand_desc3_t *subcommand = NULL; svn_min__cmd_baton_t command_baton = { 0 }; svn_auth_baton_t *ab; svn_config_t *cfg_config; @@ -563,7 +566,8 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) break; case opt_config_dir: SVN_ERR(svn_utf_cstring_to_utf8(&utf8_opt_arg, opt_arg, pool)); - opt_state.config_dir = svn_dirent_internal_style(utf8_opt_arg, pool); + SVN_ERR(svn_dirent_internal_style_safe(&opt_state.config_dir, NULL, + utf8_opt_arg, pool, pool)); break; case opt_config_options: if (!opt_state.config_options) @@ -639,7 +643,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) just typos/mistakes. Whatever the case, the subcommand to actually run is svn_cl__help(). */ if (opt_state.help) - subcommand = svn_opt_get_canonical_subcommand2(svn_min__cmd_table, "help"); + subcommand = svn_opt_get_canonical_subcommand3(svn_min__cmd_table, "help"); /* If we're not running the `help' subcommand, then look for a subcommand in the first argument. */ @@ -650,8 +654,8 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_state.version) { /* Use the "help" subcommand to handle the "--version" option. */ - static const svn_opt_subcommand_desc2_t pseudo_cmd = - { "--version", svn_min__help, {0}, "", + static const svn_opt_subcommand_desc3_t pseudo_cmd = + { "--version", svn_min__help, {0}, {""}, {opt_version, /* must accept its own option */ 'q', /* brief output */ 'v', /* verbose output */ @@ -676,7 +680,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) SVN_ERR(svn_utf_cstring_to_utf8(&first_arg, os->argv[os->ind++], pool)); - subcommand = svn_opt_get_canonical_subcommand2(svn_min__cmd_table, + subcommand = svn_opt_get_canonical_subcommand3(svn_min__cmd_table, first_arg); if (subcommand == NULL) { @@ -704,12 +708,12 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_id == 'h' || opt_id == '?') continue; - if (! svn_opt_subcommand_takes_option3(subcommand, opt_id, + if (! svn_opt_subcommand_takes_option4(subcommand, opt_id, svn_min__global_options)) { const char *optstr; const apr_getopt_option_t *badopt = - svn_opt_get_option_from_code2(opt_id, svn_min__options, + svn_opt_get_option_from_code3(opt_id, svn_min__options, subcommand, pool); svn_opt_format_option(&optstr, badopt, FALSE, pool); if (subcommand->name[0] == '-') diff --git a/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c b/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c index 6d7b841..edc2208 100644 --- a/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c +++ b/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c @@ -112,8 +112,8 @@ static int compare_mergeinfo(const void *lhs, const void *rhs) { - const mergeinfo_t *lhs_mi = *(const mergeinfo_t **)lhs; - const mergeinfo_t *rhs_mi = *(const mergeinfo_t **)rhs; + const mergeinfo_t *lhs_mi = *(const mergeinfo_t *const *)lhs; + const mergeinfo_t *rhs_mi = *(const mergeinfo_t *const *)rhs; return strcmp(lhs_mi->local_path, rhs_mi->local_path); } diff --git a/tools/client-side/svn-viewspec.py b/tools/client-side/svn-viewspec.py index cdcd495..0f9ddf4 100755 --- a/tools/client-side/svn-viewspec.py +++ b/tools/client-side/svn-viewspec.py @@ -121,6 +121,8 @@ DEPTH_FILES = 'files' DEPTH_IMMEDIATES = 'immediates' DEPTH_INFINITY = 'infinity' +os_system = None +args = None class TreeNode: """A representation of a single node in a Subversion sparse @@ -159,8 +161,8 @@ def svn_path_compare_paths(path1, path2): NOTE: Stolen unapologetically from Subversion's Python bindings module svn.core.""" - path1_len = len(path1); - path2_len = len(path2); + path1_len = len(path1) + path2_len = len(path2) min_len = min(path1_len, path2_len) i = 0 @@ -280,10 +282,10 @@ def checkout_tree(base_url, revision, tree_node, target_dir, is_top=True): if revision != -1: revision_str = "--revision=%d " % (revision) if is_top: - os.system('svn checkout "%s" "%s" --depth=%s %s' + os_system('svn checkout "%s" "%s" --depth=%s %s' % (base_url, target_dir, depth, revision_str)) else: - os.system('svn update "%s" --set-depth=%s %s' + os_system('svn update "%s" --set-depth=%s %s' % (target_dir, depth, revision_str)) child_names = tree_node.children.keys() child_names.sort(svn_path_compare_paths) @@ -304,27 +306,34 @@ def checkout_spec(viewspec, target_dir): def usage_and_exit(errmsg=None): stream = errmsg and sys.stderr or sys.stdout - msg = __doc__.replace("__SCRIPTNAME__", os.path.basename(sys.argv[0])) + msg = __doc__.replace("__SCRIPTNAME__", os.path.basename(args[0])) stream.write(msg) if errmsg: stream.write("ERROR: %s\n" % (errmsg)) - sys.exit(errmsg and 1 or 0) + return 1 + return 0 + +def main(os_sys, args_in): + global os_system + global args + os_system = os_sys + args = args_in -def main(): - argc = len(sys.argv) + argc = len(args) if argc < 2: - usage_and_exit('Not enough arguments.') - subcommand = sys.argv[1] + return usage_and_exit('Not enough arguments.') + subcommand = args[1] if subcommand == 'help': - usage_and_exit() + return usage_and_exit() elif subcommand == 'help-format': msg = FORMAT_HELP.replace("__SCRIPTNAME__", - os.path.basename(sys.argv[0])) + os.path.basename(args[0])) sys.stdout.write(msg) + return 1 elif subcommand == 'examine': if argc < 3: - usage_and_exit('No viewspec file specified.') - fp = (sys.argv[2] == '-') and sys.stdin or open(sys.argv[2], 'r') + return usage_and_exit('No viewspec file specified.') + fp = (args[2] == '-') and sys.stdin or open(args[2], 'r') viewspec = parse_viewspec(fp) sys.stdout.write("Url: %s\n" % (viewspec.base_url)) revision = viewspec.revision @@ -336,13 +345,14 @@ def main(): viewspec.tree.dump(True) elif subcommand == 'checkout': if argc < 3: - usage_and_exit('No viewspec file specified.') + return usage_and_exit('No viewspec file specified.') if argc < 4: - usage_and_exit('No target directory specified.') - fp = (sys.argv[2] == '-') and sys.stdin or open(sys.argv[2], 'r') - checkout_spec(parse_viewspec(fp), sys.argv[3]) + return usage_and_exit('No target directory specified.') + fp = (args[2] == '-') and sys.stdin or open(args[2], 'r') + checkout_spec(parse_viewspec(fp), args[3]) else: - usage_and_exit('Unknown subcommand "%s".' % (subcommand)) + return usage_and_exit('Unknown subcommand "%s".' % (subcommand)) if __name__ == "__main__": - main() + if main(os.system, sys.argv): + sys.exit(1) diff --git a/tools/client-side/svnconflict/svnconflict.c b/tools/client-side/svnconflict/svnconflict.c index 3ee149b..afbedf4 100644 --- a/tools/client-side/svnconflict/svnconflict.c +++ b/tools/client-side/svnconflict/svnconflict.c @@ -148,18 +148,19 @@ static const int svnconflict_global_options[] = { opt_auth_username, opt_auth_password, opt_auth_password_from_stdin, opt_config_dir, opt_config_options, 0 }; -static const svn_opt_subcommand_desc2_t svnconflict_cmd_table[] = +static const svn_opt_subcommand_desc3_t svnconflict_cmd_table[] = { /* This command is also invoked if we see option "--help", "-h" or "-?". */ - { "help", svnconflict_help, {"?", "h"}, N_ - ("Describe the usage of this program or its subcommands.\n" - "usage: help [SUBCOMMAND...]\n"), + { "help", svnconflict_help, {"?", "h"}, {N_( + "Describe the usage of this program or its subcommands.\n" + "usage: help [SUBCOMMAND...]\n" + )}, {0} }, - { "list", svnconflict_list, {"ls"}, N_ - ("List conflicts at a conflicted path.\n" + { "list", svnconflict_list, {"ls"}, {N_( + "List conflicts at a conflicted path.\n" "usage: list PATH\n" - "\n" + "\n"), N_( " List conflicts at PATH, one per line. Possible conflicts are:\n" " \n" " text-conflict\n" @@ -176,67 +177,67 @@ static const svn_opt_subcommand_desc2_t svnconflict_cmd_table[] = " If a tree conflict exists, no text or property conflicts exist.\n" " \n" " If PATH is not in conflict, the exit code will be 1, and 0 otherwise.\n" - ""), + )}, {0}, }, - { "options-text", svnconflict_options_text, {0}, N_ - ("List options for resolving a text conflict at path.\n" + { "options-text", svnconflict_options_text, {0}, {N_( + "List options for resolving a text conflict at path.\n" "usage: options-text PATH\n" - "\n" + "\n"), N_( " List text conflict resolution options at PATH, one per line.\n" " Each line contains a numeric option ID, a colon, and a description.\n" " If PATH is not in conflict, the exit code will be 1, and 0 otherwise.\n" - ""), + )}, {0}, }, - { "options-prop", svnconflict_options_prop, {0}, N_ - ("List options for resolving a property conflict at path.\n" + { "options-prop", svnconflict_options_prop, {0}, {N_( + "List options for resolving a property conflict at path.\n" "usage: options-prop PATH\n" - "\n" + "\n"), N_( " List property conflict resolution options at PATH, one per line.\n" " Each line contains a numeric option ID, a colon, and a description.\n" " If PATH is not in conflict, the exit code will be 1, and 0 otherwise.\n" - ""), + )}, {0}, }, - { "options-tree", svnconflict_options_tree, {0}, N_ - ("List options for resolving a tree conflict at path.\n" + { "options-tree", svnconflict_options_tree, {0}, {N_( + "List options for resolving a tree conflict at path.\n" "usage: options-tree PATH\n" - "\n" + "\n"), N_( " List tree conflict resolution options at PATH, one per line.\n" " Each line contains a numeric option ID, a colon, and a description.\n" " If PATH is not in conflict, the exit code will be 1, and 0 otherwise.\n" - ""), + )}, {0}, }, - { "resolve-text", svnconflict_resolve_text, {0}, N_ - ("Resolve the text conflict at path.\n" + { "resolve-text", svnconflict_resolve_text, {0}, {N_( + "Resolve the text conflict at path.\n" "usage: resolve-text OPTION_ID PATH\n" - "\n" + "\n"), N_( " Resolve the text conflict at PATH with a given resolution option.\n" " If PATH is not in conflict, the exit code will be 1, and 0 otherwise.\n" - ""), + )}, {0}, }, - { "resolve-prop", svnconflict_resolve_prop, {0}, N_ - ("Resolve the property conflict at path.\n" + { "resolve-prop", svnconflict_resolve_prop, {0}, {N_( + "Resolve the property conflict at path.\n" "usage: resolve-prop PROPNAME OPTION_ID PATH\n" - "\n" + "\n"), N_( " Resolve conflicted property PROPNAME at PATH with a given resolution option.\n" " If PATH is not in conflict, the exit code will be 1, and 0 otherwise.\n" - ""), + )}, {0}, }, - { "resolve-tree", svnconflict_resolve_tree, {0}, N_ - ("Resolve the tree conflict at path.\n" + { "resolve-tree", svnconflict_resolve_tree, {0}, {N_( + "Resolve the tree conflict at path.\n" "usage: resolve-tree OPTION_ID PATH\n" - "\n" + "\n"), N_( " Resolve the tree conflict at PATH with a given resolution option.\n" " If PATH is not in conflict, the exit code will be 1, and 0 otherwise.\n" - ""), + )}, {0}, }, - { NULL, NULL, {0}, NULL, {0} } + { NULL, NULL, {0}, {NULL}, {0} } }; /* Version compatibility check */ @@ -297,7 +298,7 @@ svnconflict_help(apr_getopt_t *os, void *baton, apr_pool_t *pool) SVN_ERR(svn_ra_print_modules(version_footer, pool)); } - SVN_ERR(svn_opt_print_help4(os, + SVN_ERR(svn_opt_print_help5(os, "svnconflict", /* ### erm, derive somehow? */ opt_state ? opt_state->version : FALSE, FALSE, /* quiet */ @@ -368,12 +369,12 @@ svnconflict_list(apr_getopt_t *os, void *baton, apr_pool_t *pool) &conflict, local_abspath, ctx, pool)); if (text_conflicted) - svn_cmdline_printf(pool, "text-conflict\n"); + SVN_ERR(svn_cmdline_printf(pool, "text-conflict\n")); for (i = 0; i < props_conflicted->nelts; i++) { const char *propname = APR_ARRAY_IDX(props_conflicted, i, const char *); - svn_cmdline_printf(pool, "prop-conflict: %s\n", propname); + SVN_ERR(svn_cmdline_printf(pool, "prop-conflict: %s\n", propname)); } if (tree_conflicted) @@ -385,14 +386,14 @@ svnconflict_list(apr_getopt_t *os, void *baton, apr_pool_t *pool) &local_change, conflict, ctx, pool, pool)); - svn_cmdline_printf(pool, "tree-conflict: %s %s\n", - incoming_change, local_change); + SVN_ERR(svn_cmdline_printf(pool, "tree-conflict: %s %s\n", + incoming_change, local_change)); } return SVN_NO_ERROR; } -static void +static svn_error_t * print_conflict_options(apr_array_header_t *options, apr_pool_t *pool) { int i; @@ -406,8 +407,9 @@ print_conflict_options(apr_array_header_t *options, apr_pool_t *pool) option = APR_ARRAY_IDX(options, i, svn_client_conflict_option_t *); id = svn_client_conflict_option_get_id(option); label = svn_client_conflict_option_get_label(option, pool); - svn_cmdline_printf(pool, "%d: %s\n", id, label); + SVN_ERR(svn_cmdline_printf(pool, "%d: %s\n", id, label)); } + return SVN_NO_ERROR; } /* This implements the `svn_opt_subcommand_t' interface. */ @@ -438,7 +440,7 @@ svnconflict_options_text(apr_getopt_t *os, void *baton, apr_pool_t *pool) SVN_ERR(svn_client_conflict_text_get_resolution_options(&options, conflict, ctx, pool, pool)); - print_conflict_options(options, pool); + SVN_ERR(print_conflict_options(options, pool)); return SVN_NO_ERROR; } @@ -471,7 +473,7 @@ svnconflict_options_prop(apr_getopt_t *os, void *baton, apr_pool_t *pool) SVN_ERR(svn_client_conflict_prop_get_resolution_options(&options, conflict, ctx, pool, pool)); - print_conflict_options(options, pool); + SVN_ERR(print_conflict_options(options, pool)); return SVN_NO_ERROR; } @@ -505,7 +507,7 @@ svnconflict_options_tree(apr_getopt_t *os, void *baton, apr_pool_t *pool) SVN_ERR(svn_client_conflict_tree_get_resolution_options(&options, conflict, ctx, pool, pool)); - print_conflict_options(options, pool); + SVN_ERR(print_conflict_options(options, pool)); return SVN_NO_ERROR; } @@ -640,7 +642,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) apr_array_header_t *received_opts; svnconflict_cmd_baton_t command_baton; int i; - const svn_opt_subcommand_desc2_t *subcommand = NULL; + const svn_opt_subcommand_desc3_t *subcommand = NULL; svn_auth_baton_t *ab; svn_config_t *cfg_config; apr_hash_t *cfg_hash; @@ -715,7 +717,8 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) break; case opt_config_dir: SVN_ERR(svn_utf_cstring_to_utf8(&utf8_opt_arg, opt_arg, pool)); - opt_state.config_dir = svn_dirent_internal_style(utf8_opt_arg, pool); + SVN_ERR(svn_dirent_internal_style_safe(&opt_state.config_dir, NULL, + utf8_opt_arg, pool, pool)); break; case opt_config_options: if (!opt_state.config_options) @@ -741,7 +744,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) just typos/mistakes. Whatever the case, the subcommand to actually run is svnconflict_help(). */ if (opt_state.help) - subcommand = svn_opt_get_canonical_subcommand2(svnconflict_cmd_table, + subcommand = svn_opt_get_canonical_subcommand3(svnconflict_cmd_table, "help"); /* If we're not running the `help' subcommand, then look for a @@ -753,8 +756,8 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_state.version) { /* Use the "help" subcommand to handle the "--version" option. */ - static const svn_opt_subcommand_desc2_t pseudo_cmd = - { "--version", svnconflict_help, {0}, "", + static const svn_opt_subcommand_desc3_t pseudo_cmd = + { "--version", svnconflict_help, {0}, {""}, {opt_version, /* must accept its own option */ opt_config_dir /* all commands accept this */ } }; @@ -777,7 +780,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) SVN_ERR(svn_utf_cstring_to_utf8(&first_arg, os->argv[os->ind++], pool)); - subcommand = svn_opt_get_canonical_subcommand2(svnconflict_cmd_table, + subcommand = svn_opt_get_canonical_subcommand3(svnconflict_cmd_table, first_arg); if (subcommand == NULL) { @@ -804,12 +807,12 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_id == 'h' || opt_id == '?') continue; - if (! svn_opt_subcommand_takes_option3(subcommand, opt_id, + if (! svn_opt_subcommand_takes_option4(subcommand, opt_id, svnconflict_global_options)) { const char *optstr; const apr_getopt_option_t *badopt = - svn_opt_get_option_from_code2(opt_id, svnconflict_options, + svn_opt_get_option_from_code3(opt_id, svnconflict_options, subcommand, pool); svn_opt_format_option(&optstr, badopt, FALSE, pool); if (subcommand->name[0] == '-') diff --git a/tools/client-side/svnviewspec_test.py b/tools/client-side/svnviewspec_test.py new file mode 100755 index 0000000..ad98b15 --- /dev/null +++ b/tools/client-side/svnviewspec_test.py @@ -0,0 +1,428 @@ +#!/usr/bin/env python +# +# svnviewspec_test.py: testing the 'svn-viewspec.py' tool. +# +# Execute these tests using 'pytest' (pytest.org): +# py.test svnviewspec_test.py +# +# Subversion is a tool for revision control. +# See http://subversion.apache.org for more information. +# +# ==================================================================== +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +###################################################################### + + +import sys +import os.path +import tempfile + +sys.path.append(os.path.abspath(os.path.realpath(__file__))) + +svn_viewspec = __import__("svn-viewspec") +__SCRIPTNAME__ = 'svn-viewspec.py' + + +######################################################################### +# mock the 'system' call +os_system_lines = [] + +def my_os_system(str): + os_system_lines.append(str) + +def setup_function(function): + global os_system_lines + os_system_lines = [] + +######################################################################### + +def perform_viewspec(args): + return svn_viewspec.main(my_os_system, [__SCRIPTNAME__] + args) + +def test_that_viewspec_does_checkout_for_its_own_inline_example(capsys): + + spec = """Format: 1 +Url: http://svn.apache.org/r/a/s +Revision: 36 + +trunk/** +branches/1.5.x/** +branches/1.6.x/** +README +branches/1.4.x/STATUS +branches/1.4.x/s/tests/cmdline/~ +""" + + perform_viewspec( + ["checkout", (make_temp_file_containing(spec)), "a/b"]) + sys_out_lines, sys_err_lines = capsys.readouterr() + + expected = \ +"""svn checkout "http://svn.apache.org/r/a/s" "a/b" --depth=empty --revision=36 +svn update "a/b/README" --set-depth=empty --revision=36 +svn update "a/b/branches" --set-depth=empty --revision=36 +svn update "a/b/branches/1.4.x" --set-depth=empty --revision=36 +svn update "a/b/branches/1.4.x/STATUS" --set-depth=empty --revision=36 +svn update "a/b/branches/1.4.x/s" --set-depth=empty --revision=36 +svn update "a/b/branches/1.4.x/s/tests" --set-depth=empty --revision=36 +svn update "a/b/branches/1.4.x/s/tests/cmdline" --set-depth=files --revision=36 +svn update "a/b/branches/1.5.x" --set-depth=infinity --revision=36 +svn update "a/b/branches/1.6.x" --set-depth=infinity --revision=36 +svn update "a/b/trunk" --set-depth=infinity --revision=36""" + + all_the_lines_should_be_the_same(expected, os_system_lines) + + all_the_lines_should_be_the_same([], sys_err_lines) + all_the_lines_should_be_the_same([], sys_out_lines) + + +def test_that_viewspec_does_checkout_for_a_tilde_at_root_case(capsys): + + spec = """Format: 1 +Url: http://svn.apache.org/repos/asf/svn + +~ +""" + + perform_viewspec( + ["checkout", (make_temp_file_containing(spec)), "a/b"]) + sys_out_lines, sys_err_lines = capsys.readouterr() + + expected = \ +"""svn checkout "http://svn.apache.org/repos/asf/svn" "a/b" --depth=files""" + + # print ">>>" + "\n".join(os_system_lines) + "<<<" + + all_the_lines_should_be_the_same(expected, os_system_lines) + + all_the_lines_should_be_the_same([], sys_err_lines) + all_the_lines_should_be_the_same([], sys_out_lines) + + +def test_that_viewspec_does_checkout_a_splat_at_root_case(capsys): + + spec = """Format: 1 +Url: http://svn.apache.org/r/a/svn + +* +""" + + perform_viewspec( + ["checkout", (make_temp_file_containing(spec)), "a/b"]) + sys_out_lines, sys_err_lines = capsys.readouterr() + + expected = \ +"""svn checkout "http://svn.apache.org/r/a/svn" "a/b" --depth=immediates""" + + # print ">>>" + "\n".join(os_system_lines) + "<<<" + + all_the_lines_should_be_the_same(expected, os_system_lines) + + all_the_lines_should_be_the_same([], sys_err_lines) + all_the_lines_should_be_the_same([], sys_out_lines) + + +def test_that_viewspec_does_checkout_an_infinity_from_root_case(capsys): + + spec = """Format: 1 +Url: http://svn.apache.org/r/a/s + +** +""" + + perform_viewspec( + ["checkout", (make_temp_file_containing(spec)), "a/b"]) + sys_out_lines, sys_err_lines = capsys.readouterr() + + expected = \ +"""svn checkout "http://svn.apache.org/r/a/s" "a/b" --depth=infinity""" + + # print ">>>" + "\n".join(os_system_lines) + "<<<" + + all_the_lines_should_be_the_same(expected, os_system_lines) + + all_the_lines_should_be_the_same([], sys_err_lines) + all_the_lines_should_be_the_same([], sys_out_lines) + + +def test_that_viewspec_does_checkout_for_a_splat_n_tilde_in_a_subdir_case(capsys): + spec = """Format: 1 +Url: http://svn.apache.org/repos/asf/svn + +branches/foo/* +branches/bar/~ +""" + + perform_viewspec( + ["checkout", (make_temp_file_containing(spec)), "a/b"]) + sys_out_lines, sys_err_lines = capsys.readouterr() + + expected = \ +"""svn checkout "http://svn.apache.org/repos/asf/svn" "a/b" --depth=empty +svn update "a/b/branches" --set-depth=empty +svn update "a/b/branches/bar" --set-depth=files +svn update "a/b/branches/foo" --set-depth=immediates""" + + all_the_lines_should_be_the_same(expected, os_system_lines) + + all_the_lines_should_be_the_same([], sys_err_lines) + all_the_lines_should_be_the_same([], sys_out_lines) + + +def test_that_viewspec_does_examine_for_its_own_inline_example2(capsys): + + spec = """Format: 1 +Url: http://svn.apache.org/repos/asf/subversion +Revision: 36366 + +trunk/** +branches/1.5.x/** +branches/1.6.x/** +README +branches/1.4.x/STATUS +branches/1.4.x/subversion/tests/cmdline/~ +""" + + perform_viewspec( + ["examine", (make_temp_file_containing(spec)), "a/b"]) + sys_out_lines, sys_err_lines = capsys.readouterr() + + all_the_lines_should_be_the_same([], os_system_lines) + + expected = \ + """Path: (depth=empty) + Path: README (depth=empty) + Path: branches (depth=empty) + Path: 1.4.x (depth=empty) + Path: STATUS (depth=empty) + Path: subversion (depth=empty) + Path: tests (depth=empty) + Path: cmdline (depth=files) + Path: 1.5.x (depth=infinity) + Path: 1.6.x (depth=infinity) + Path: trunk (depth=infinity)""" + + all_the_lines_should_be_the_same(expected, sys_err_lines) + + expected = \ + """Url: http://svn.apache.org/repos/asf/subversion +Revision: 36366 + +""" + + all_the_lines_should_be_the_same(expected, sys_out_lines) + + +def test_that_viewspec_prints_help(capsys): + + rc = perform_viewspec(["help"]) + sys_out_lines, sys_err_lines = capsys.readouterr() + + assert 0 == rc + + all_the_lines_should_be_the_same([], sys_err_lines) + + expected = \ + """__SCRIPTNAME__: checkout utility for sparse Subversion working copies + +Usage: 1. __SCRIPTNAME__ checkout VIEWSPEC-FILE TARGET-DIR + 2. __SCRIPTNAME__ examine VIEWSPEC-FILE + 3. __SCRIPTNAME__ help + 4. __SCRIPTNAME__ help-format + +VIEWSPEC-FILE is the path of a file whose contents describe a +Subversion sparse checkouts layout, or '-' if that description should +be read from stdin. TARGET-DIR is the working copy directory created +by this script as it checks out the specified layout. + +1. Parse VIEWSPEC-FILE and execute the necessary 'svn' command-line + operations to build out a working copy tree at TARGET-DIR. + +2. Parse VIEWSPEC-FILE and dump out a human-readable representation of + the tree described in the specification. + +3. Show this usage message. + +4. Show information about the file format this program expects. + """.replace("__SCRIPTNAME__", __SCRIPTNAME__) + + all_the_lines_should_be_the_same(expected, sys_out_lines) + + +def test_that_viewspec_prints_unknown_subcommand(capsys): + + rc = perform_viewspec(["helppppppppp"]) + sys_out_lines, sys_err_lines = capsys.readouterr() + + assert 1 == rc + + all_the_lines_should_be_the_same([], sys_out_lines) + + expected = \ + """__SCRIPTNAME__: checkout utility for sparse Subversion working copies + +Usage: 1. __SCRIPTNAME__ checkout VIEWSPEC-FILE TARGET-DIR + 2. __SCRIPTNAME__ examine VIEWSPEC-FILE + 3. __SCRIPTNAME__ help + 4. __SCRIPTNAME__ help-format + +VIEWSPEC-FILE is the path of a file whose contents describe a +Subversion sparse checkouts layout, or '-' if that description should +be read from stdin. TARGET-DIR is the working copy directory created +by this script as it checks out the specified layout. + +1. Parse VIEWSPEC-FILE and execute the necessary 'svn' command-line + operations to build out a working copy tree at TARGET-DIR. + +2. Parse VIEWSPEC-FILE and dump out a human-readable representation of + the tree described in the specification. + +3. Show this usage message. + +4. Show information about the file format this program expects. + +ERROR: Unknown subcommand "helppppppppp".""".replace("__SCRIPTNAME__", __SCRIPTNAME__) + + all_the_lines_should_be_the_same(expected, sys_err_lines) + + +def test_that_viewspec_prints_help_format(capsys): + + rc = perform_viewspec(["help-format"]) + sys_out_lines, sys_err_lines = capsys.readouterr() + + assert 1 == rc + + # print ">>>" + "\n".join(sys_out_lines) + "<<<<" + + expected = \ + """Viewspec File Format +==================== + +The viewspec file format used by this tool is a collection of headers +(using the typical one-per-line name:value syntax), followed by an +empty line, followed by a set of one-per-line rules. + +The headers must contain at least the following: + + Format - version of the viewspec format used throughout the file + Url - base URL applied to all rules; tree checkout location + +The following headers are optional: + + Revision - version of the tree items to checkout + +Following the headers and blank line separator are the path rules. +The rules are list of URLs -- relative to the base URL stated in the +headers -- with optional annotations to specify the desired working +copy depth of each item: + + PATH/** - checkout PATH and all its children to infinite depth + PATH/* - checkout PATH and its immediate children + PATH/~ - checkout PATH and its file children + PATH - checkout PATH non-recursively + +By default, the top-level directory (associated with the base URL) is +checked out with empty depth. You can override this using the special +rules '**', '*', and '~' as appropriate. + +It is not necessary to explicitly list the parent directories of each +path associated with a rule. If the parent directory of a given path +is not "covered" by a previous rule, it will be checked out with empty +depth. + +Examples +======== + +Here's a sample viewspec file: + + Format: 1 + Url: http://svn.apache.org/repos/asf/subversion + Revision: 36366 + + trunk/** + branches/1.5.x/** + branches/1.6.x/** + README + branches/1.4.x/STATUS + branches/1.4.x/subversion/tests/cmdline/~ + +You may wish to version your viewspec files. If so, you can use this +script in conjunction with 'svn cat' to fetch, parse, and act on a +versioned viewspec file: + + $ svn cat http://svn.example.com/specs/dev-spec.txt | + __SCRIPTNAME__ checkout - /path/to/target/directory + """.replace("__SCRIPTNAME__", __SCRIPTNAME__) + + all_the_lines_should_be_the_same(expected, sys_out_lines) + + all_the_lines_should_be_the_same([], sys_err_lines) + + +def test_that_viewspec_does_checkout_with_no_revision_specified(capsys): + + spec = """Format: 1 +Url: http://svn.apache.org/repos/asf/svn + +trunk/** +branches/1.5.x/** +branches/1.6.x/** +README +branches/1.4.x/STATUS +branches/1.4.x/s/tests/cmdline/~ +""" + + perform_viewspec( + ["checkout", (make_temp_file_containing(spec)), "a/b"]) + sys_out_lines, sys_err_lines = capsys.readouterr() + + expected = \ + """svn checkout "http://svn.apache.org/repos/asf/svn" "a/b" --depth=empty + svn update "a/b/README" --set-depth=empty + svn update "a/b/branches" --set-depth=empty + svn update "a/b/branches/1.4.x" --set-depth=empty + svn update "a/b/branches/1.4.x/STATUS" --set-depth=empty + svn update "a/b/branches/1.4.x/s" --set-depth=empty + svn update "a/b/branches/1.4.x/s/tests" --set-depth=empty + svn update "a/b/branches/1.4.x/s/tests/cmdline" --set-depth=files + svn update "a/b/branches/1.5.x" --set-depth=infinity + svn update "a/b/branches/1.6.x" --set-depth=infinity + svn update "a/b/trunk" --set-depth=infinity """ + + all_the_lines_should_be_the_same(expected, os_system_lines) + all_the_lines_should_be_the_same([], sys_err_lines) + all_the_lines_should_be_the_same([], sys_out_lines) + + +def all_the_lines_should_be_the_same(expected_lines, + actual_lines): + if not isinstance(expected_lines, list): + expected_lines = expected_lines.splitlines() + if not isinstance(actual_lines, list): + actual_lines = actual_lines.splitlines() + assert len(actual_lines) == len(expected_lines) + for i, line in enumerate(actual_lines): + assert line.strip() == expected_lines[i].strip() + + +def make_temp_file_containing(spec): + new_file, filename = tempfile.mkstemp() + os.write(new_file, spec) + os.close(new_file) + return filename diff --git a/tools/dev/build-svn-deps-win.pl b/tools/dev/build-svn-deps-win.pl index d936369..d59ac59 100755 --- a/tools/dev/build-svn-deps-win.pl +++ b/tools/dev/build-svn-deps-win.pl @@ -92,7 +92,7 @@ our $SERF_VER = '1.3.6'; our $NEON_VER = '0.29.6'; # Sources for files to download -our $AWK_URL = 'http://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe'; +our $AWK_URL = 'https://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe'; our $HTTPD_URL; our $APR_URL; our $APU_URL; @@ -168,17 +168,17 @@ sub set_svn_ver_defaults { # Any variables with defaults that reference other values # should be set here. This defers setting of the default until runtime in these cases. sub set_defaults { - set_default(\$HTTPD_URL, "http://archive.apache.org/dist/httpd/httpd-$HTTPD_VER.tar.bz2"); - set_default(\$APR_URL, "http://archive.apache.org/dist/apr/apr-$APR_VER.tar.bz2"); - set_default(\$APU_URL, "http://archive.apache.org/dist/apr/apr-util-$APU_VER.tar.bz2"); - set_default(\$API_URL, "http://archive.apache.org/dist/apr/apr-iconv-$API_VER.tar.bz2"); - set_default(\$ZLIB_URL, "http://sourceforge.net/projects/libpng/files/zlib/$ZLIB_VER/zlib" . remove_dots($ZLIB_VER) . '.zip'); - set_default(\$OPENSSL_URL, "http://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz"); + set_default(\$HTTPD_URL, "https://archive.apache.org/dist/httpd/httpd-$HTTPD_VER.tar.bz2"); + set_default(\$APR_URL, "https://archive.apache.org/dist/apr/apr-$APR_VER.tar.bz2"); + set_default(\$APU_URL, "https://archive.apache.org/dist/apr/apr-util-$APU_VER.tar.bz2"); + set_default(\$API_URL, "https://archive.apache.org/dist/apr/apr-iconv-$API_VER.tar.bz2"); + set_default(\$ZLIB_URL, "https://sourceforge.net/projects/libpng/files/zlib/$ZLIB_VER/zlib" . remove_dots($ZLIB_VER) . '.zip'); + set_default(\$OPENSSL_URL, "https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz"); set_default(\$PCRE_URL, "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$PCRE_VER.zip"); - set_default(\$BDB_URL, "http://download.oracle.com/berkeley-db/db-5.3.21.zip"); - set_default(\$SQLITE_URL, "http://www.sqlite.org/2013/sqlite-amalgamation-$SQLITE_VER.zip"); + set_default(\$BDB_URL, "https://download.oracle.com/berkeley-db/db-5.3.21.zip"); + set_default(\$SQLITE_URL, "https://www.sqlite.org/2013/sqlite-amalgamation-$SQLITE_VER.zip"); set_default(\$SERF_URL, "https://archive.apache.org/dist/serf/serf-$SERF_VER.zip"); - set_default(\$NEON_URL, "http://www.webdav.org/neon/neon-$NEON_VER.tar.gz"); + set_default(\$NEON_URL, "https://www.webdav.org/neon/neon-$NEON_VER.tar.gz"); set_default(\$INSTDIR, $TOPDIR); set_default(\$BLDDIR, "$TOPDIR\\build"); set_default(\$SRCDIR, "$TOPDIR\\sources"); diff --git a/tools/dev/svnmover/svnmover.c b/tools/dev/svnmover/svnmover.c index 8bc8b65..a7cffd7 100644 --- a/tools/dev/svnmover/svnmover.c +++ b/tools/dev/svnmover/svnmover.c @@ -2436,7 +2436,7 @@ do_put_file(svn_branch__txn_t *txn, else SVN_ERR(svn_stream_for_stdin2(&src, FALSE, scratch_pool)); - svn_stringbuf_from_stream(&text, src, 0, scratch_pool); + SVN_ERR(svn_stringbuf_from_stream(&text, src, 0, scratch_pool)); } payload = svn_element__payload_create_file(props, text, scratch_pool); @@ -4042,7 +4042,7 @@ display_version(apr_getopt_t *os, svn_boolean_t _quiet, apr_pool_t *pool) version_footer = svn_stringbuf_create(ra_desc_start, pool); SVN_ERR(svn_ra_print_modules(version_footer, pool)); - SVN_ERR(svn_opt_print_help4(NULL, "svnmover", TRUE, _quiet, FALSE, + SVN_ERR(svn_opt_print_help5(NULL, "svnmover", TRUE, _quiet, FALSE, version_footer->data, NULL, NULL, NULL, NULL, NULL, pool)); diff --git a/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c b/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c index 65825d5..a68b5d2 100644 --- a/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c +++ b/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c @@ -52,7 +52,7 @@ static svn_error_t * version(apr_pool_t *pool) { - return svn_opt_print_help4(NULL, "svnraisetreeconflict", TRUE, FALSE, FALSE, + return svn_opt_print_help5(NULL, "svnraisetreeconflict", TRUE, FALSE, FALSE, NULL, NULL, NULL, NULL, NULL, NULL, pool); } diff --git a/tools/dev/unix-build/Makefile.svn b/tools/dev/unix-build/Makefile.svn index 2c0561c..b00a074 100644 --- a/tools/dev/unix-build/Makefile.svn +++ b/tools/dev/unix-build/Makefile.svn @@ -45,6 +45,8 @@ EXCLUSIVE_WC_LOCKS ?= 1 USE_HTTPV1 ?= no USE_AUTHZ_SHORT_CIRCUIT ?= no RAMDISK ?= /ramdisk +MAKE_JOBS ?= 4 +SVN_CHECK_FS_BACKENDS ?= fsfs bdb PWD = $(shell pwd) UNAME = $(shell uname) @@ -71,6 +73,12 @@ endif # 2.2 endif # 2.3 endif # 2.4 +ifeq ($(UNAME),OpenBSD) +# Pick the correct base compiler (ie. clang rather than ancient gcc 4.2.1) +CC = cc +CXX = c++ +endif + TAG ?= none ifeq ($(TAG),none) BRANCH ?= trunk @@ -94,14 +102,15 @@ APR_VER = 1.5.2 APR_ICONV_VER = 1.2.1 GNU_ICONV_VER = 1.15 APR_UTIL_VER = 1.5.4 -HTTPD_VER = 2.2.32 +PCRE_VER = 8.41 +HTTPD_VER = 2.4.37 NEON_VER = 0.30.2 SERF_VER = 1.3.9 SERF_OLD_VER = 0.3.1 CYRUS_SASL_VER = 2.1.25 SQLITE_VER = 3160200 LIBMAGIC_VER = 5.30 -RUBY_VER = 2.4.2 +RUBY_VER = 2.4.4 BZ2_VER = 1.0.6 PYTHON_VER = 2.7.13 JUNIT_VER = 4.10 @@ -114,6 +123,7 @@ GNU_ICONV_DIST = libiconv-$(GNU_ICONV_VER).tar.gz NEON_DIST = neon-$(NEON_VER).tar.gz SQLITE_DIST = sqlite-autoconf-$(SQLITE_VER).tar.gz CYRUS_SASL_DIST = cyrus-sasl-$(CYRUS_SASL_VER).tar.gz +PCRE_DIST = pcre-$(PCRE_VER).tar.gz HTTPD_DIST = httpd-$(HTTPD_VER).tar.gz LIBMAGIC_DIST = file-$(LIBMAGIC_VER).tar.gz RUBY_DIST = ruby-$(RUBY_VER).tar.gz @@ -126,12 +136,13 @@ LZ4_DIST = lz4-$(LZ4_VER).tar.gz SHA256_${BDB_DIST} = f14fd96dd38915a1d63dcb94a63fbb8092334ceba6b5060760427096f631263e SHA256_${APR_ICONV_DIST} = 19381959d50c4a5f3b9c84d594a5f9ffb3809786919b3058281f4c87e1f4b245 SHA256_${GNU_ICONV_DIST} = ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178 -SHA256_${HTTPD_DIST} = b6e1528779f99c301d6438d89ae892a311619b43a39f16297f9eabd4a8d16cb8 +SHA256_${PCRE_DIST} = 244838e1f1d14f7e2fa7681b857b3a8566b74215f28133f14a8f5e59241b682c +SHA256_${HTTPD_DIST} = aa97a834a32d51974be8d8a013b561e28d327387cb1da2c3c2762acd0146aabd SHA256_${NEON_DIST} = db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca SHA256_${CYRUS_SASL_DIST} = 418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe SHA256_${SQLITE_DIST} = 65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615 SHA256_${LIBMAGIC_DIST} = 694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214 -SHA256_${RUBY_DIST} = 93b9e75e00b262bc4def6b26b7ae8717efc252c47154abb7392e54357e6c8c9c +SHA256_${RUBY_DIST} = 254f1c1a79e4cc814d1e7320bc5bdd995dc57e08727d30a767664619a9c8ae5a SHA256_${BZ2_DIST} = a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd SHA256_${PYTHON_DIST} = a4f05a0720ce0fd92626f0278b6b433eee9a6173ddf2bced7957dfb599a5ece1 SHA256_${JUNIT_DIST} = 36a747ca1e0b86f6ea88055b8723bb87030d627766da6288bf077afdeeb0f75a @@ -154,6 +165,7 @@ endef DISTFILES = $(DISTDIR)/$(NEON_DIST) \ $(DISTDIR)/$(SERF_DIST) \ $(DISTDIR)/$(SQLITE_DIST) \ + $(DISTDIR)/$(PCRE_DIST) \ $(DISTDIR)/$(HTTPD_DIST) \ $(DISTDIR)/$(APR_ICONV_DIST) \ $(DISTDIR)/$(GNU_ICONV_DIST) \ @@ -170,20 +182,22 @@ FETCH_CMD = wget -c SUBVERSION_REPOS_URL = https://svn.apache.org/repos/asf/subversion BDB_URL = http://download.oracle.com/berkeley-db/$(BDB_DIST) APR_URL = https://svn.apache.org/repos/asf/apr/apr -APR_ICONV_URL = https://www.apache.org/dist/apr/$(APR_ICONV_DIST) +APR_ICONV_URL = https://archive.apache.org/dist/apr/$(APR_ICONV_DIST) GNU_ICONV_URL = https://ftp.gnu.org/pub/gnu/libiconv/$(GNU_ICONV_DIST) APR_UTIL_URL = https://svn.apache.org/repos/asf/apr/apr-util +PCRE_URL = https://ftp.pcre.org/pub/pcre/$(PCRE_DIST) HTTPD_URL = https://archive.apache.org/dist/httpd/$(HTTPD_DIST) -NEON_URL = http://webdav.org/neon/$(NEON_DIST) +#NEON_URL = http://webdav.org/neon/$(NEON_DIST) +NEON_URL = http://ftp.openbsd.org/pub/OpenBSD/distfiles/$(NEON_DIST) SERF_URL = https://svn.apache.org/repos/asf/serf/tags/$(SERF_VER) SERF_OLD_URL = https://svn.apache.org/repos/asf/serf/tags/$(SERF_OLD_VER) SQLITE_URL = https://www.sqlite.org/2017/$(SQLITE_DIST) -CYRUS_SASL_URL = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$(CYRUS_SASL_DIST) +CYRUS_SASL_URL = https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${CYRUS_SASL_VER}/$(CYRUS_SASL_DIST) LIBMAGIC_URL = ftp://ftp.astron.com/pub/file/$(LIBMAGIC_DIST) RUBY_URL = https://cache.ruby-lang.org/pub/ruby/2.4/$(RUBY_DIST) -BZ2_URL = http://bzip.org/$(BZ2_VER)/$(BZ2_DIST) +BZ2_URL = https://stsp.name/distfiles/$(BZ2_DIST) PYTHON_URL = https://python.org/ftp/python/$(PYTHON_VER)/$(PYTHON_DIST) -JUNIT_URL = https://downloads.sourceforge.net/project/junit/junit/$(JUNIT_VER)/$(JUNIT_DIST) +JUNIT_URL = https://stsp.name/distfiles/$(JUNIT_DIST) GETTEXT_URL = https://ftp.gnu.org/pub/gnu/gettext/$(GETTEXT_DIST) LZ4_URL = https://github.com/lz4/lz4/archive/v$(LZ4_VER).tar.gz @@ -193,6 +207,7 @@ APR_SRCDIR = $(SRCDIR)/apr-$(APR_VER) APR_ICONV_SRCDIR = $(SRCDIR)/apr-iconv-$(APR_ICONV_VER) GNU_ICONV_SRCDIR = $(SRCDIR)/libiconv-$(GNU_ICONV_VER) APR_UTIL_SRCDIR = $(SRCDIR)/apr-util-$(APR_UTIL_VER) +PCRE_SRCDIR = $(SRCDIR)/pcre-$(PCRE_VER) HTTPD_SRCDIR = $(SRCDIR)/httpd-$(HTTPD_VER) NEON_SRCDIR = $(SRCDIR)/neon-$(NEON_VER) SERF_SRCDIR = $(SRCDIR)/serf-$(SERF_VER) @@ -212,6 +227,7 @@ APR_OBJDIR = $(OBJDIR)/apr-$(APR_VER) APR_ICONV_OBJDIR = $(OBJDIR)/apr-iconv-$(APR_ICONV_VER) GNU_ICONV_OBJDIR = $(OBJDIR)/libiconv-$(GNU_ICONV_VER) APR_UTIL_OBJDIR = $(OBJDIR)/apr-util-$(APR_UTIL_VER) +PCRE_OBJDIR = $(OBJDIR)/pcre-$(PCRE_VER) HTTPD_OBJDIR = $(OBJDIR)/httpd-$(HTTPD_VER) NEON_OBJDIR = $(OBJDIR)/neon-$(NEON_VER) SERF_OBJDIR = $(OBJDIR)/serf-$(SERF_VER) @@ -238,6 +254,10 @@ endif # We need this to make sure some targets below pick up the right libraries LD_LIBRARY_PATH=$(PREFIX)/apr/lib:$(PREFIX)/gettext/lib:$(PREFIX)/iconv/lib:$(PREFIX)/bdb/lib:$(PREFIX)/neon/lib:$(PREFIX)/serf/lib:$(PREFIX)/sqlite/lib:$(PREFIX)/cyrus-sasl/lib:$(PREFIX)/iconv/lib:$(PREFIX)/libmagic/lib:$(PREFIX)/ruby/lib:$(PREFIX)/python/lib:$(PREFIX)/svn-$(WC)/lib +# We need this to make sure some targets below pick up the right pkg-config files +PKG_CONFIG_PATH=$(PREFIX)/apr/lib/pkgconfig:$(PREFIX)/neon/lib/pkgconfig:$(PREFIX)/serf/lib/pkgconfig:$(PREFIX)/sqlite/lib/pkgconfig:$(PREFIX)/ruby/lib/pkgconfig:$(PREFIX)/python/lib/pkgconfig:$(PREFIX)/lz4/lib/pkgconfig + + ####################################################################### # Main targets. ####################################################################### @@ -245,19 +265,19 @@ LD_LIBRARY_PATH=$(PREFIX)/apr/lib:$(PREFIX)/gettext/lib:$(PREFIX)/iconv/lib:$(PR .PHONY: all reset clean nuke fetch all: dirs-create bdb-install apr-install iconv-install apr-util-install \ - httpd-install neon-install serf-install serf-old-install \ + pcre-install httpd-install neon-install serf-install serf-old-install \ sqlite-install cyrus-sasl-install libmagic-install \ ruby-install bz2-install python-install gettext-install \ lz4-install svn-install svn-bindings-install # Use these to start a build from the beginning. reset: dirs-reset bdb-reset apr-reset iconv-reset apr-util-reset \ - httpd-reset neon-reset serf-reset serf-old-reset sqlite-reset \ - cyrus-sasl-reset libmagic-reset ruby-reset python-reset \ + pcre-reset httpd-reset neon-reset serf-reset serf-old-reset \ + sqlite-reset cyrus-sasl-reset libmagic-reset ruby-reset python-reset \ bz2-reset gettext-reset lz4-reset svn-reset # Use to save disk space. -clean: bdb-clean apr-clean iconv-clean apr-util-clean httpd-clean \ +clean: bdb-clean apr-clean iconv-clean apr-util-clean pcre-clean httpd-clean \ neon-clean serf-clean serf-old-clean sqlite-clean cyrus-sasl-clean \ libmagic-clean ruby-clean bz2-clean python-clean gettext-clean \ lz4-clean svn-clean @@ -331,6 +351,7 @@ $(BDB_OBJDIR)/.retrieved: $(DISTDIR)/$(BDB_DIST) $(BDB_OBJDIR)/.configured: $(BDB_OBJDIR)/.retrieved cd $(BDB_SRCDIR)/build_unix \ && env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`" \ + CC=$(CC) CXX=$(CXX) \ ../dist/configure \ --prefix=$(PREFIX)/bdb \ --enable-debug @@ -338,7 +359,7 @@ $(BDB_OBJDIR)/.configured: $(BDB_OBJDIR)/.retrieved # compile bdb $(BDB_OBJDIR)/.compiled: $(BDB_OBJDIR)/.configured - (cd $(BDB_SRCDIR)/build_unix && env MAKEFLAGS= make) + (cd $(BDB_SRCDIR)/build_unix && env MAKEFLAGS= make -j${MAKE_JOBS}) touch $@ # install bdb @@ -388,6 +409,8 @@ $(APR_OBJDIR)/.configured: $(APR_OBJDIR)/.retrieved $(BDB_OBJDIR)/.installed cd $(APR_SRCDIR) && ./buildconf cd $(APR_OBJDIR) \ && env CFLAGS="-O0 -g $(PROFILE_CFLAGS)" GREP="`which grep`" \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ + CC=$(CC) CXX=$(CXX) \ $(APR_SRCDIR)/configure \ --prefix=$(PREFIX)/apr \ --enable-maintainer-mode \ @@ -397,7 +420,7 @@ $(APR_OBJDIR)/.configured: $(APR_OBJDIR)/.retrieved $(BDB_OBJDIR)/.installed # compile apr $(APR_OBJDIR)/.compiled: $(APR_OBJDIR)/.configured - (cd $(APR_OBJDIR) && env MAKEFLAGS= make) + (cd $(APR_OBJDIR) && env MAKEFLAGS= make -j${MAKE_JOBS}) touch $@ # install apr @@ -436,7 +459,9 @@ $(APR_ICONV_OBJDIR)/.configured: $(APR_ICONV_OBJDIR)/.retrieved \ $(APR_OBJDIR)/.installed cd $(APR_ICONV_OBJDIR) \ && env CFLAGS="-g $(PROFILE_CFLAGS) -DAPR_POOL_DEBUG" \ + CC=$(CC) CXX=$(CXX) \ GREP="`which grep`" \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ $(APR_ICONV_SRCDIR)/configure \ --prefix=$(PREFIX)/apr \ --with-apr=$(PREFIX)/apr @@ -445,7 +470,7 @@ $(APR_ICONV_OBJDIR)/.configured: $(APR_ICONV_OBJDIR)/.retrieved \ # compile apr-iconv $(APR_ICONV_OBJDIR)/.compiled: $(APR_ICONV_OBJDIR)/.configured (cd $(APR_ICONV_OBJDIR) \ - && env MAKEFLAGS= make CPPFLAGS="-D_OSD_POSIX" CFLAGS="-g -O0 $(PROFILE_CFLAGS)") + && env MAKEFLAGS= make CPPFLAGS="-D_OSD_POSIX" CFLAGS="-g -O0 $(PROFILE_CFLAGS)" -j${MAKE_JOBS}) touch $@ # install apr-iconv @@ -520,6 +545,8 @@ $(GNU_ICONV_OBJDIR)/.configured: $(GNU_ICONV_OBJDIR)/.retrieved ${MAKE} -f Makefile.devel lib/aliases.h cd $(GNU_ICONV_OBJDIR) \ && env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`"\ + CC=$(CC) CXX=$(CXX) \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ $(GNU_ICONV_SRCDIR)/configure \ --prefix=$(PREFIX)/iconv \ --enable-extra-encodings @@ -527,7 +554,7 @@ $(GNU_ICONV_OBJDIR)/.configured: $(GNU_ICONV_OBJDIR)/.retrieved # compile gnu-iconv $(GNU_ICONV_OBJDIR)/.compiled: $(GNU_ICONV_OBJDIR)/.configured - (cd $(GNU_ICONV_OBJDIR) && env MAKEFLAGS= make) + (cd $(GNU_ICONV_OBJDIR) && env MAKEFLAGS= make -j${MAKE_JOBS}) touch $@ # install gnu-iconv @@ -590,7 +617,9 @@ $(APR_UTIL_OBJDIR)/.configured: $(APR_UTIL_OBJDIR)/.retrieved \ cd $(APR_UTIL_SRCDIR) && ./buildconf --with-apr=$(APR_SRCDIR) cd $(APR_UTIL_OBJDIR) \ && env LD_LIBRARY_PATH=$(PREFIX)/bdb/lib \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ CFLAGS="-O0 -g $(PROFILE_CFLAGS) -DAPR_POOL_DEBUG" \ + CC=$(CC) CXX=$(CXX) \ GREP="`which grep`" \ $(APR_UTIL_SRCDIR)/configure \ --prefix=$(PREFIX)/apr \ @@ -602,7 +631,7 @@ $(APR_UTIL_OBJDIR)/.configured: $(APR_UTIL_OBJDIR)/.retrieved \ # compile apr-util $(APR_UTIL_OBJDIR)/.compiled: $(APR_UTIL_OBJDIR)/.configured - (cd $(APR_UTIL_OBJDIR) && env MAKEFLAGS= make) + (cd $(APR_UTIL_OBJDIR) && env MAKEFLAGS= make -j${MAKE_JOBS}) touch $@ # install apr-util @@ -610,6 +639,53 @@ $(APR_UTIL_OBJDIR)/.installed: $(APR_UTIL_OBJDIR)/.compiled (cd $(APR_UTIL_OBJDIR) && env MAKEFLAGS= make install) touch $@ +####################################################################### +# pcre +####################################################################### + +pcre-retrieve: $(PCRE_OBJDIR)/.retrieved +pcre-configure: $(PCRE_OBJDIR)/.configured +pcre-compile: $(PCRE_OBJDIR)/.compiled +pcre-install: $(PCRE_OBJDIR)/.installed +pcre-reset: + $(foreach f, .retrieved .configured .compiled .installed, \ + rm -f $(PCRE_OBJDIR)/$(f);) + +pcre-clean: + -(cd $(PCRE_OBJDIR) && env MAKEFLAGS= make clean) + +# fetch distfile for pcre +$(DISTDIR)/$(PCRE_DIST): + cd $(DISTDIR) && $(FETCH_CMD) $(PCRE_URL) + +# retrieve pcre +$(PCRE_OBJDIR)/.retrieved: $(DISTDIR)/$(PCRE_DIST) + $(call do_check_sha256,$(PCRE_DIST)) + [ -d $(PCRE_OBJDIR) ] || mkdir -p $(PCRE_OBJDIR) + tar -C $(SRCDIR) -zxf $(DISTDIR)/$(PCRE_DIST) + touch $@ + +# configure pcre +$(PCRE_OBJDIR)/.configured: $(PCRE_OBJDIR)/.retrieved + cd $(PCRE_OBJDIR) \ + && env CFLAGS="-g $(PROFILE_CFLAGS)" \ + CC=$(CC) CXX=$(CXX) \ + GREP="`which grep`" \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ + $(PCRE_SRCDIR)/configure \ + --prefix=$(PREFIX)/pcre + touch $@ + +# compile pcre +$(PCRE_OBJDIR)/.compiled: $(PCRE_OBJDIR)/.configured + (cd $(PCRE_OBJDIR) && env MAKEFLAGS= make -j${MAKE_JOBS}) + touch $@ + +# install pcre +$(PCRE_OBJDIR)/.installed: $(PCRE_OBJDIR)/.compiled + (cd $(PCRE_OBJDIR) && env MAKEFLAGS= make install) + touch $@ + ####################################################################### # httpd ####################################################################### @@ -625,113 +701,72 @@ httpd-reset: httpd-clean: -(cd $(HTTPD_OBJDIR) && env MAKEFLAGS= make clean) - -rm ${HTTPD_OBJDIR}/chil-engine.diff - -rm ${HTTPD_OBJDIR}/ssl-set-state.diff - -rm ${HTTPD_OBJDIR}/acinclude.diff + rm -f $(HTTPD_OBJDIR)/mod-proxy-no-threads-2.4.diff + rm -f $(HTTPD_OBJDIR)/ssl-init-proxy-certs.diff # fetch distfile for httpd $(DISTDIR)/$(HTTPD_DIST): cd $(DISTDIR) && $(FETCH_CMD) $(HTTPD_URL) -$(HTTPD_OBJDIR)/chil-engine.diff: +$(HTTPD_OBJDIR)/ssl-init-proxy-certs.diff: mkdir -p $(dir $@) - echo > $@.tmp '--- modules/ssl/ssl_engine_init.c.orig Mon Apr 14 13:20:57 2014' - echo >>$@.tmp '+++ modules/ssl/ssl_engine_init.c Mon Apr 14 13:21:22 2014' - echo >>$@.tmp '@@ -406,9 +406,11 @@ void ssl_init_Engine(server_rec *s, apr_pool_t *p)' - echo >>$@.tmp ' ssl_die();' - echo >>$@.tmp ' }' - echo >>$@.tmp ' ' - echo >>$@.tmp '+#ifdef ENGINE_CTRL_CHIL_SET_FORKCHECK' - echo >>$@.tmp ' if (strEQ(mc->szCryptoDevice, "chil")) {' - echo >>$@.tmp ' ENGINE_ctrl(e, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0);' - echo >>$@.tmp ' }' - echo >>$@.tmp '+#endif' - echo >>$@.tmp ' ' - echo >>$@.tmp ' if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {' - echo >>$@.tmp ' ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,' + echo > $@.tmp '--- modules/ssl/ssl_engine_init.c.orig Sun Dec 16 13:34:14 2018' + echo >> $@.tmp '+++ modules/ssl/ssl_engine_init.c Sun Dec 16 13:34:59 2018' + echo >> $@.tmp '@@ -1492,7 +1492,7 @@' + echo >> $@.tmp ' X509_STORE_CTX *sctx;' + echo >> $@.tmp ' X509_STORE *store = SSL_CTX_get_cert_store(mctx->ssl_ctx);' + echo >> $@.tmp ' ' + echo >> $@.tmp '-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL' + echo >> $@.tmp '+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER)' + echo >> $@.tmp ' /* For OpenSSL >=1.1.1, turn on client cert support which is' + echo >> $@.tmp ' * otherwise turned off by default (by design).' + echo >> $@.tmp ' * https://github.com/openssl/openssl/issues/6933 */' mv -f $@.tmp $@ -$(HTTPD_OBJDIR)/ssl-set-state.diff: - mkdir -p $(dir $@) - echo > $@.tmp '--- modules/ssl/ssl_toolkit_compat.h.orig Fri Feb 3 10:47:33 2017' - echo >>$@.tmp '+++ modules/ssl/ssl_toolkit_compat.h Fri Feb 3 10:52:17 2017' - echo >>$@.tmp '@@ -84,7 +84,9 @@' - echo >>$@.tmp ' #define SSL_get_state(ssl) SSL_state(ssl)' - echo >>$@.tmp ' #endif' - echo >>$@.tmp ' ' - echo >>$@.tmp '+#ifndef HAVE_SSL_SET_STATE' - echo >>$@.tmp ' #define SSL_set_state(ssl,val) (ssl)->state = val' - echo >>$@.tmp '+#endif' - echo >>$@.tmp ' ' - echo >>$@.tmp ' #define MODSSL_BIO_CB_ARG_TYPE const char' - echo >>$@.tmp ' #define MODSSL_CRYPTO_CB_ARG_TYPE const char' - mv -f $@.tmp $@ - -$(HTTPD_OBJDIR)/acinclude.diff: - mkdir -p $(dir $@) - echo >$@.tmp '--- acinclude.m4.orig Fri Feb 3 11:05:08 2017' - echo >>$@.tmp '+++ acinclude.m4 Fri Feb 3 11:05:15 2017' - echo >>$@.tmp '@@ -455,6 +455,7 @@' - echo >>$@.tmp ' AC_CHECK_HEADERS([openssl/engine.h])' - echo >>$@.tmp ' AC_CHECK_FUNCS([SSLeay_version SSL_CTX_new], [], [liberrors="yes"])' - echo >>$@.tmp ' AC_CHECK_FUNCS([ENGINE_init ENGINE_load_builtin_engines])' - echo >>$@.tmp '+ AC_CHECK_FUNCS(SSL_set_state)' - echo >>$@.tmp ' else' - echo >>$@.tmp ' AC_CHECK_FUNCS([SSLC_library_version SSL_CTX_new], [], [liberrors="yes"])' - echo >>$@.tmp ' AC_CHECK_FUNCS(SSL_set_state)' - mv -f $@.tmp $@ +$(HTTPD_OBJDIR)/mod-proxy-no-threads-2.4.diff: + cd $(HTTPD_OBJDIR) && $(FETCH_CMD) https://stsp.name/mod-proxy-no-threads-2.4.diff # retrieve httpd $(HTTPD_OBJDIR)/.retrieved: $(DISTDIR)/$(HTTPD_DIST) \ - $(HTTPD_OBJDIR)/chil-engine.diff $(HTTPD_OBJDIR)/ssl-set-state.diff \ - $(HTTPD_OBJDIR)/acinclude.diff + $(HTTPD_OBJDIR)/ssl-init-proxy-certs.diff \ + $(HTTPD_OBJDIR)/mod-proxy-no-threads-2.4.diff $(call do_check_sha256,$(HTTPD_DIST)) [ -d $(HTTPD_OBJDIR) ] || mkdir -p $(HTTPD_OBJDIR) tar -C $(SRCDIR) -zxf $(DISTDIR)/$(HTTPD_DIST) - cd $(HTTPD_SRCDIR) && patch -p0 < $(HTTPD_OBJDIR)/chil-engine.diff - cd $(HTTPD_SRCDIR) && patch -p0 < $(HTTPD_OBJDIR)/ssl-set-state.diff - cd $(HTTPD_SRCDIR) && patch -p0 < $(HTTPD_OBJDIR)/acinclude.diff - cp $(HTTPD_SRCDIR)/modules/ssl/ssl_toolkit_compat.h \ - $(HTTPD_SRCDIR)/modules/ssl/ssl_toolkit_compat.h.orig - sed '/^#define HAVE_SSL_RAND_EGD/d' \ - < $(HTTPD_SRCDIR)/modules/ssl/ssl_toolkit_compat.h.orig \ - > $(HTTPD_SRCDIR)/modules/ssl/ssl_toolkit_compat.h - cp $(HTTPD_SRCDIR)/modules/ssl/ssl_engine_vars.c \ - $(HTTPD_SRCDIR)/modules/ssl/ssl_engine_vars.c.orig - sed 's/^\(#if (OPENSSL_VERSION_NUMBER >= 0x00908000)\)$$/\1 \&\& !defined(OPENSSL_NO_COMP)/' \ - < $(HTTPD_SRCDIR)/modules/ssl/ssl_engine_vars.c.orig \ - > $(HTTPD_SRCDIR)/modules/ssl/ssl_engine_vars.c - cp $(HTTPD_SRCDIR)/modules/ssl/ssl_engine_init.c \ - $(HTTPD_SRCDIR)/modules/ssl/ssl_engine_init.c.orig - $(foreach f, ssl_engine_init.c ssl_util_ssl.c ssl_util_ssl.h, \ - cp $(HTTPD_SRCDIR)/modules/ssl/${f} $(HTTPD_SRCDIR)/modules/ssl/${f}.orig; \ - sed 's/SSL_CTX_use_certificate_chain/_SSL_CTX_use_certificate_chain/' \ - < $(HTTPD_SRCDIR)/modules/ssl/${f}.orig \ - > $(HTTPD_SRCDIR)/modules/ssl/${f};\ - ) + (cd $(HTTPD_SRCDIR) && patch -p0 < $(HTTPD_OBJDIR)/ssl-init-proxy-certs.diff) + (cd $(HTTPD_SRCDIR) && patch -p0 < $(HTTPD_OBJDIR)/mod-proxy-no-threads-2.4.diff) + (cd $(HTTPD_SRCDIR) && svn diff -cr1849590 https://svn.apache.org/repos/asf/httpd/httpd/trunk | patch -p0) + (cd $(HTTPD_SRCDIR) && svn diff -cr1663375 https://svn.apache.org/repos/asf/httpd/httpd/trunk | patch -p0) touch $@ # configure httpd $(HTTPD_OBJDIR)/.configured: $(HTTPD_OBJDIR)/.retrieved \ - $(APR_UTIL_OBJDIR)/.installed - cd $(HTTPD_SRCDIR) && ./buildconf + $(APR_UTIL_OBJDIR)/.installed $(PCRE_OBJDIR)/.installed + cd $(HTTPD_SRCDIR) && ./buildconf \ + --with-apr="$(PREFIX)/apr/bin/apr-1-config" \ + --with-apr-util="$(PREFIX)/apr/bin/apu-1-config" cd $(HTTPD_OBJDIR) \ && env CFLAGS="-g $(PROFILE_CFLAGS) -DAPR_POOL_DEBUG" \ + CC=$(CC) CXX=$(CXX) \ GREP="`which grep`" \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ $(HTTPD_SRCDIR)/configure \ --prefix=$(PREFIX)/httpd \ - --enable-maintainer-mode \ + --with-mpm=prefork \ --enable-ssl \ --enable-dav \ --enable-proxy \ - --with-mpm=prefork \ - --with-apr="$(PREFIX)/apr" \ - --with-apr-util="$(PREFIX)/apr" + --disable-md \ + --disable-http2 \ + --disable-brotli \ + --with-apr="$(PREFIX)/apr/bin/apr-1-config" \ + --with-apr-util="$(PREFIX)/apr/bin/apu-1-config" \ + --with-pcre="$(PREFIX)/pcre" touch $@ # compile httpd $(HTTPD_OBJDIR)/.compiled: $(HTTPD_OBJDIR)/.configured - (cd $(HTTPD_OBJDIR) && env MAKEFLAGS= make) + (cd $(HTTPD_OBJDIR) && env MAKEFLAGS= make -j${MAKE_JOBS}) touch $@ # install httpd @@ -745,19 +780,28 @@ $(HTTPD_CONF): echo > $@.tmp '# httpd config for use with mod_dav_svn' echo >>$@.tmp 'ServerRoot "$(PREFIX)/httpd"' echo >>$@.tmp 'Listen localhost:8080' + echo >>$@.tmp 'LoadModule unixd_module modules/mod_unixd.so' + echo >>$@.tmp 'LoadModule alias_module modules/mod_alias.so' + echo >>$@.tmp 'LoadModule access_compat_module modules/mod_access_compat.so' + echo >>$@.tmp 'LoadModule authn_core_module modules/mod_authn_core.so' + echo >>$@.tmp 'LoadModule authn_file_module modules/mod_authn_file.so' + echo >>$@.tmp 'LoadModule authz_core_module modules/mod_authz_core.so' + echo >>$@.tmp 'LoadModule authz_user_module modules/mod_authz_user.so' + echo >>$@.tmp 'LoadModule authz_groupfile_module modules/mod_authz_groupfile.so' + echo >>$@.tmp 'LoadModule auth_basic_module modules/mod_auth_basic.so' + echo >>$@.tmp 'LoadModule dav_module modules/mod_dav.so' echo >>$@.tmp 'LoadModule dav_svn_module modules/svn-$(WC)/mod_dav_svn.so' echo >>$@.tmp 'LoadModule authz_svn_module modules/svn-$(WC)/mod_authz_svn.so' echo >>$@.tmp 'DocumentRoot "$(PREFIX)/httpd/htdocs"' echo >>$@.tmp '' echo >>$@.tmp ' Options FollowSymLinks' echo >>$@.tmp ' AllowOverride None' - echo >>$@.tmp ' Order deny,allow' - echo >>$@.tmp ' Deny from all' + echo >>$@.tmp ' Require all denied' echo >>$@.tmp '' echo >>$@.tmp '' echo >>$@.tmp ' DAV svn' echo >>$@.tmp ' SVNPath /tmp/svn-sandbox/repos' - echo >>$@.tmp ' Allow from localhost' + echo >>$@.tmp ' Require ip localhost' echo >>$@.tmp '' mv -f $@.tmp $@ @@ -802,6 +846,8 @@ $(NEON_OBJDIR)/.configured: $(NEON_OBJDIR)/.retrieved fi cd $(NEON_OBJDIR) \ && env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`" \ + CC=$(CC) CXX=$(CXX) \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ $(NEON_SRCDIR)/configure \ PATH=$(NEON_OBJDIR):$$PATH \ --prefix=$(PREFIX)/neon \ @@ -812,7 +858,7 @@ $(NEON_OBJDIR)/.configured: $(NEON_OBJDIR)/.retrieved # compile neon $(NEON_OBJDIR)/.compiled: $(NEON_OBJDIR)/.configured - (cd $(NEON_OBJDIR) && env MAKEFLAGS= make) + (cd $(NEON_OBJDIR) && env MAKEFLAGS= make -j${MAKE_JOBS}) touch $@ # install neon @@ -860,11 +906,13 @@ $(SERF_OBJDIR)/.retrieved: $(SERF_OBJDIR)/.compiled: $(SERF_OBJDIR)/.retrieved \ $(APR_UTIL_OBJDIR)/.installed cd $(SERF_SRCDIR) && \ - scons DEBUG=1 \ + scons -j${MAKE_JOBS} DEBUG=1 \ CFLAGS="-O0 -g $(PROFILE_CFLAGS) -DAPR_POOL_DEBUG" \ + CC=$(CC) CXX=$(CXX) \ APR=$(PREFIX)/apr \ APU=$(PREFIX)/apr \ - PREFIX=$(PREFIX)/serf + PREFIX=$(PREFIX)/serf \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) touch $@ # install serf @@ -905,6 +953,7 @@ $(SERF_OLD_OBJDIR)/.compiled: $(SERF_OLD_OBJDIR)/.retrieved \ $(APR_UTIL_OBJDIR)/.installed cd $(SERF_OLD_SRCDIR) && \ env CFLAGS="-O0 -g $(PROFILE_CFLAGS) -DAPR_POOL_DEBUG" \ + CC=$(CC) CXX=$(CXX) \ ./serfmake --with-apr=$(PREFIX)/apr \ --prefix=$(PREFIX)/serf-old \ build @@ -956,6 +1005,8 @@ endif $(SQLITE_OBJDIR)/.configured: $(SQLITE_OBJDIR)/.retrieved cd $(SQLITE_OBJDIR) \ && env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`" \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ + CC=$(CC) CXX=$(CXX) \ $(SQLITE_SRCDIR)/configure \ --prefix=$(PREFIX)/sqlite \ $(THREADSAFE_FLAG) @@ -963,7 +1014,7 @@ $(SQLITE_OBJDIR)/.configured: $(SQLITE_OBJDIR)/.retrieved # compile sqlite $(SQLITE_OBJDIR)/.compiled: $(SQLITE_OBJDIR)/.configured - (cd $(SQLITE_OBJDIR) && env MAKEFLAGS= make) + (cd $(SQLITE_OBJDIR) && env MAKEFLAGS= make -j${MAKE_JOBS}) touch $@ # install sqlite @@ -1025,7 +1076,9 @@ $(CYRUS_SASL_OBJDIR)/.configured: $(CYRUS_SASL_OBJDIR)/.retrieved \ cd $(CYRUS_SASL_OBJDIR) \ && env CFLAGS="-g $(PROFILE_CFLAGS)" \ CPPFLAGS="-I/usr/include/kerberosV" \ + CC=$(CC) CXX=$(CXX) \ GREP="`which grep`" \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ $(CYRUS_SASL_SRCDIR)/configure \ --with-dbpath=$(PREFIX)/cyrus-sasl/etc/sasldb2 \ --with-plugindir=$(PREFIX)/cyrus-sasl/lib/sasl2 \ @@ -1037,7 +1090,7 @@ $(CYRUS_SASL_OBJDIR)/.configured: $(CYRUS_SASL_OBJDIR)/.retrieved \ --prefix=$(PREFIX)/cyrus-sasl touch $@ -# compile cyrus-sasl +# compile cyrus-sasl (ignore MAKE_JOBS; multiple jobs cause random build failures) $(CYRUS_SASL_OBJDIR)/.compiled: $(CYRUS_SASL_OBJDIR)/.configured (cd $(CYRUS_SASL_OBJDIR) && env MAKEFLAGS= make) touch $@ @@ -1077,6 +1130,8 @@ $(LIBMAGIC_OBJDIR)/.retrieved: $(DISTDIR)/$(LIBMAGIC_DIST) $(LIBMAGIC_OBJDIR)/.configured: $(LIBMAGIC_OBJDIR)/.retrieved cd $(LIBMAGIC_OBJDIR) \ && env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`"\ + CC=$(CC) CXX=$(CXX) \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ $(LIBMAGIC_SRCDIR)/configure \ --enable-fsect-man5 \ --prefix=$(PREFIX)/libmagic @@ -1084,7 +1139,7 @@ $(LIBMAGIC_OBJDIR)/.configured: $(LIBMAGIC_OBJDIR)/.retrieved # compile libmagic $(LIBMAGIC_OBJDIR)/.compiled: $(LIBMAGIC_OBJDIR)/.configured - (cd $(LIBMAGIC_OBJDIR) && env MAKEFLAGS= make) + (cd $(LIBMAGIC_OBJDIR) && env MAKEFLAGS= make -j${MAKE_JOBS}) touch $@ # install libmagic @@ -1111,13 +1166,54 @@ ruby-clean: $(DISTDIR)/$(RUBY_DIST): cd $(DISTDIR) && $(FETCH_CMD) $(RUBY_URL) +$(RUBY_OBJDIR)/openssl_missing.patch: + mkdir -p $(dir $@) + echo > $@.tmp 'Index: ext/openssl/openssl_missing.h' + echo >> $@.tmp '--- ext/openssl/openssl_missing.h.orig' + echo >> $@.tmp '+++ ext/openssl/openssl_missing.h' + echo >> $@.tmp '@@ -119,6 +119,9 @@ void ossl_HMAC_CTX_free(HMAC_CTX *);' + echo >> $@.tmp ' #if !defined(HAVE_X509_STORE_SET_EX_DATA)' + echo >> $@.tmp ' # define X509_STORE_set_ex_data(x, idx, data) \' + echo >> $@.tmp ' CRYPTO_set_ex_data(&(x)->ex_data, (idx), (data))' + echo >> $@.tmp '+#endif' + echo >> $@.tmp '+' + echo >> $@.tmp '+#if !defined(HAVE_X509_STORE_GET_EX_NEW_INDEX)' + echo >> $@.tmp ' # define X509_STORE_get_ex_new_index(l, p, newf, dupf, freef) \' + echo >> $@.tmp ' CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509_STORE, (l), (p), \' + echo >> $@.tmp ' (newf), (dupf), (freef))' + echo >> $@.tmp '@@ -192,6 +195,7 @@ void ossl_X509_REQ_get0_signature(const X509_REQ *, co' + echo >> $@.tmp ' #endif' + echo >> $@.tmp ' ' + echo >> $@.tmp ' #if !defined(HAVE_OPAQUE_OPENSSL)' + echo >> $@.tmp '+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL' + echo >> $@.tmp ' #define IMPL_PKEY_GETTER(_type, _name) \' + echo >> $@.tmp ' static inline _type *EVP_PKEY_get0_##_type(EVP_PKEY *pkey) { \' + echo >> $@.tmp ' return pkey->pkey._name; }' + echo >> $@.tmp '@@ -243,6 +247,7 @@ IMPL_PKEY_GETTER(EC_KEY, ec)' + echo >> $@.tmp ' #undef IMPL_PKEY_GETTER' + echo >> $@.tmp ' #undef IMPL_KEY_ACCESSOR2' + echo >> $@.tmp ' #undef IMPL_KEY_ACCESSOR3' + echo >> $@.tmp '+#endif' + echo >> $@.tmp ' #endif /* HAVE_OPAQUE_OPENSSL */' + echo >> $@.tmp ' ' + echo >> $@.tmp ' #if defined(HAVE_AUTHENTICATED_ENCRYPTION) && !defined(EVP_CTRL_AEAD_GET_TAG)' + mv -f $@.tmp $@ + +ifeq ($(UNAME),OpenBSD) +RUBY_SSL_EX_NEW_DATA_PATCH = sed -i -e '/^have_func("X509_STORE_set_ex_data")$$/ { p; s/^.*$$/\have_func("X509_STORE_get_ex_new_index")/; }' +else +RUBY_SSL_EX_NEW_DATA_PATCH = true +endif + # retrieve ruby # -$(RUBY_OBJDIR)/.retrieved: $(DISTDIR)/$(RUBY_DIST) +$(RUBY_OBJDIR)/.retrieved: $(DISTDIR)/$(RUBY_DIST) $(RUBY_OBJDIR)/openssl_missing.patch $(call do_check_sha256,$(RUBY_DIST)) [ -d $(RUBY_OBJDIR) ] || mkdir -p $(RUBY_OBJDIR) tar -C $(SRCDIR) -zxf $(DISTDIR)/$(RUBY_DIST) -which ghead && sed -i -e "s/head -c/ghead -c/" $(RUBY_SRCDIR)/configure + $(RUBY_SSL_EX_NEW_DATA_PATCH) $(RUBY_SRCDIR)/ext/openssl/extconf.rb + cd $(RUBY_SRCDIR) && patch -p0 < $(RUBY_OBJDIR)/openssl_missing.patch touch $@ ifeq ($(THREADING),yes) @@ -1130,6 +1226,8 @@ endif $(RUBY_OBJDIR)/.configured: $(RUBY_OBJDIR)/.retrieved cd $(RUBY_OBJDIR) \ && env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`"\ + CC=$(CC) CXX=$(CXX) \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ $(RUBY_SRCDIR)/configure \ --prefix=$(PREFIX)/ruby \ --enable-shared \ @@ -1140,7 +1238,7 @@ $(RUBY_OBJDIR)/.configured: $(RUBY_OBJDIR)/.retrieved --without-gmp touch $@ -# compile ruby +# compile ruby (ignore MAKE_JOBS; multiple jobs cause random build failures) $(RUBY_OBJDIR)/.compiled: $(RUBY_OBJDIR)/.configured (cd $(RUBY_OBJDIR) && env MAKEFLAGS= make) touch $@ @@ -1177,7 +1275,8 @@ $(BZ2_OBJDIR)/.retrieved: $(DISTDIR)/$(BZ2_DIST) # compile bz2 $(BZ2_OBJDIR)/.compiled: $(BZ2_OBJDIR)/.retrieved - (cd $(BZ2_SRCDIR) && env MAKEFLAGS= make CFLAGS="-g $(PROFILE_CFLAGS) -fPIC") + (cd $(BZ2_SRCDIR) && env MAKEFLAGS= make CC=$(CC) CXX=$(CXX) \ + CFLAGS="-g $(PROFILE_CFLAGS) -fPIC" -j${MAKE_JOBS}) touch $@ # install bz2 @@ -1237,9 +1336,11 @@ $(PYTHON_OBJDIR)/.configured: $(PYTHON_OBJDIR)/.retrieved \ $(BZ2_OBJDIR)/.installed cd $(PYTHON_OBJDIR) \ && env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`" \ + CC=$(CC) CXX=$(CXX) \ CPPFLAGS="-I$(PREFIX)/bz2/include" \ LDFLAGS="-Wl,-rpath=$(PREFIX)/python/lib -L$(PREFIX)/bz2/lib" \ LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$$LD_LIBRARY_PATH" \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ $(PYTHON_SRCDIR)/configure \ --prefix=$(PREFIX)/python \ --enable-shared \ @@ -1253,7 +1354,7 @@ $(PYTHON_OBJDIR)/.compiled: $(PYTHON_OBJDIR)/.configured (cd $(PYTHON_OBJDIR) && \ env MAKEFLAGS= \ LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$$LD_LIBRARY_PATH" \ - make) + make -j${MAKE_JOBS}) touch $@ # install python @@ -1306,7 +1407,9 @@ $(GETTEXT_OBJDIR)/.retrieved: $(DISTDIR)/$(GETTEXT_DIST) $(GETTEXT_OBJDIR)/.configured: $(GETTEXT_OBJDIR)/.retrieved cd $(GETTEXT_SRCDIR) \ && env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`"\ + CC=$(CC) CXX=$(CXX) \ LDFLAGS="-L$(PREFIX)/iconv/lib" \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ $(GETTEXT_SRCDIR)/configure \ --prefix=$(PREFIX)/gettext \ --with-libiconv-prefix=$(PREFIX)/iconv \ @@ -1324,7 +1427,7 @@ $(GETTEXT_OBJDIR)/.configured: $(GETTEXT_OBJDIR)/.retrieved # compile gettext $(GETTEXT_OBJDIR)/.compiled: $(GETTEXT_OBJDIR)/.configured - (cd $(GETTEXT_SRCDIR) && env MAKEFLAGS= make) + (cd $(GETTEXT_SRCDIR) && env MAKEFLAGS= make -j${MAKE_JOBS}) touch $@ # install gettext @@ -1365,7 +1468,8 @@ $(LZ4_OBJDIR)/.configured: $(LZ4_OBJDIR)/.retrieved # compile lz4 $(LZ4_OBJDIR)/.compiled: $(LZ4_OBJDIR)/.configured (cd $(LZ4_SRCDIR)/lib && \ - env MAKEFLAGS= $(MAKE) PREFIX=$(PREFIX)/lz4) + env MAKEFLAGS= $(MAKE) CC=$(CC) CXX=$(CXX) \ + -j${MAKE_JOBS} PREFIX=$(PREFIX)/lz4) touch $@ # install lz4 @@ -1467,6 +1571,7 @@ SERF_FLAG=--with-serf="$(PREFIX)/serf" # serf >= 1.3.0 is built with scons and no longer sets up rpath linker flags, # so we have to do that ourselves :( SERF_LDFLAG=-Wl,-rpath,$(PREFIX)/serf/lib -Wl,-rpath,$(PREFIX)/bdb/lib +LZ4_LDFLAG=-Wl,-rpath,$(PREFIX)/lz4/lib MOD_DAV_SVN=modules/svn-$(WC)/mod_dav_svn.so MOD_AUTHZ_SVN=modules/svn-$(WC)/mod_authz_svn.so MOD_DONTDOTHAT=modules/svn-$(WC)/mod_dontdothat.so @@ -1492,6 +1597,17 @@ SVN_WITH_HTTPD=--with-apxs="$(PREFIX)/httpd/bin/apxs" \ SVN_WITH_SASL=--with-sasl="$(PREFIX)/cyrus-sasl" endif +# On OpenBSD, MExtUtils -e ldopts outputs -L/usr/local/lib, which can +# cause us to link Perl bindings against the wrong set of SVN libraries. +# As a workaround, we patch the configure script after it has been generated. +ifeq ($(UNAME),OpenBSD) +SWIG_PL_INCLUDES_HACK= sed -i 's^\($$PERL -MExtUtils::Embed -e ccopts\)^\1 | sed -e s@-I/usr/local/include@@^' $(svn_builddir)/configure +SWIG_PL_LINK_HACK= sed -i 's^\($$PERL -MExtUtils::Embed -e ldopts\)^\1 | sed -e s@-L/usr/local/lib@@^' $(svn_builddir)/configure +else +SWIG_PL_INCLUDES_HACK=true +SWIG_PL_LINK_HACK=true +endif + $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)/.retrieved $(DISTDIR)/$(JUNIT_DIST) \ $(APR_OBJDIR)/.installed $(APR_UTIL_OBJDIR)/.installed \ $(BDB_OBJDIR)/.installed $(SQLITE_OBJDIR)/.installed \ @@ -1500,11 +1616,15 @@ $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)/.retrieved $(DISTDIR)/$(JUNIT_DIST) \ $(SERF_OBJDIR)/.installed $(SERF_OLD_OBJDIR)/.installed \ $(RUBY_OBJDIR)/.installed $(PYTHON_OBJDIR)/.installed cd $(SVN_SRCDIR) && ./autogen.sh + $(SWIG_PL_INCLUDES_HACK) + $(SWIG_PL_LINK_HACK) cd $(svn_builddir) && \ - env LDFLAGS="-L$(PREFIX)/neon/lib -L$(PREFIX)/apr/lib $(SERF_LDFLAG) -L$(PREFIX)/gettext/lib -L$(PREFIX)/iconv/lib" \ + env LDFLAGS="-L$(PREFIX)/neon/lib -L$(PREFIX)/apr/lib $(SERF_LDFLAG) $(LZ4_LDFLAG) -L$(PREFIX)/gettext/lib -L$(PREFIX)/iconv/lib" \ + CC=$(CC) CXX=$(CXX) \ CFLAGS="-I$(PREFIX)/gettext/include -DAPR_POOL_DEBUG" \ CXXFLAGS="-I$(PREFIX)/gettext/include -DAPR_POOL_DEBUG" \ LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$$LD_LIBRARY_PATH" \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ GREP="`which grep`" \ PATH=$(PREFIX)/ruby/bin:$(PREFIX)/python/bin:$(PREFIX)/gettext/bin:$$PATH \ $(SVN_SRCDIR)/configure \ @@ -1533,7 +1653,7 @@ $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)/.retrieved $(DISTDIR)/$(JUNIT_DIST) \ # compile svn $(SVN_OBJDIR)/.compiled: $(SVN_OBJDIR)/.configured cd $(svn_builddir) \ - && env MAKEFLAGS= make EXTRA_CFLAGS="$(PROFILE_CFLAGS) $(W_NO_SYSTEM_HEADERS)" + && env MAKEFLAGS= make -j${MAKE_JOBS} EXTRA_CFLAGS="$(PROFILE_CFLAGS) $(W_NO_SYSTEM_HEADERS)" touch $@ # install svn @@ -1552,17 +1672,30 @@ $(SVN_OBJDIR)/.pre-generated-swig-cleaned: && env MAKEFLAGS= make clean-swig touch $@ + +# On OpenBSD, Perl's LDDLFLAGS include -L/usr/local/lib, which can cause +# us to link Perl bindings against the wrong set of SVN libraries. +# We manually fix up the generated Makefile.PL to work around this issue. +ifeq ($(UNAME),OpenBSD) +MAKEFILE_PL_LDDLFLAGS_HACK= sed -i 's@^WriteMakefile@$$config{LDDLFLAGS} =~ s+-L/usr/local/lib++; WriteMakefile@' \ + $(SVN_SRCDIR)/subversion/bindings/swig/perl/native/Makefile.PL +else +MAKEFILE_PL_LDDLFLAGS_HACK=true +endif + $(SVN_OBJDIR)/.bindings-compiled: $(SVN_OBJDIR)/.installed $(SVN_OBJDIR)/.pre-generated-swig-cleaned cd $(svn_builddir) \ && env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \ - env MAKEFLAGS= make swig-py + env MAKEFLAGS= make -j${MAKE_JOBS} swig-py cd $(svn_builddir) && \ env PATH=$(PREFIX)/ruby/bin:$$PATH \ - LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) env MAKEFLAGS= make swig-rb + LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) env MAKEFLAGS= make -j${MAKE_JOBS} swig-rb if [ $(ENABLE_PERL_BINDINGS) = yes ]; then \ + cd $(svn_builddir) && make $(SVN_SRCDIR)/subversion/bindings/swig/perl/native/Makefile.PL; \ + $(MAKEFILE_PL_LDDLFLAGS_HACK); \ cd $(svn_builddir) \ && env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \ - env MAKEFLAGS= make swig-pl; \ + env MAKEFLAGS= make -j${MAKE_JOBS} swig-pl; \ fi if [ $(ENABLE_JAVA_BINDINGS) = yes ]; then \ cd $(svn_builddir) \ @@ -1576,13 +1709,15 @@ $(SVN_OBJDIR)/.bindings-installed: $(SVN_OBJDIR)/.bindings-compiled env MAKEFLAGS= make install-swig-py cd $(svn_builddir) && \ env PATH=$(PREFIX)/ruby/bin:$$PATH \ - LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) env MAKEFLAGS= make install-swig-rb + LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) MAKEFLAGS= make install-swig-rb if [ $(ENABLE_PERL_BINDINGS) = yes ]; then \ cd $(svn_builddir) \ - && env MAKEFLAGS= make install-swig-pl-lib; \ - cd subversion/bindings/swig/perl/native \ - && perl Makefile.PL PREFIX="$(SVN_PREFIX)" \ - && env MAKEFLAGS= make install; \ + && env MAKEFLAGS= LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \ + make install-swig-pl-lib; \ + cd subversion/bindings/swig/perl/native \ + && perl Makefile.PL PREFIX="$(SVN_PREFIX)" \ + && env MAKEFLAGS= LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \ + make install; \ fi if [ $(ENABLE_JAVA_BINDINGS) = yes ]; then \ cd $(svn_builddir) \ @@ -1620,6 +1755,16 @@ $(HTTPD_CHECK_CONF): $(MOD_DONTDOTHAT_CONF) $(HTTPD_CHECK_GROUPS) echo > $@.tmp '# httpd config for make check' echo >>$@.tmp 'ServerRoot "$(PREFIX)/httpd"' echo >>$@.tmp 'Listen localhost:$(HTTPD_CHECK_PORT)' + echo >>$@.tmp 'LoadModule unixd_module modules/mod_unixd.so' + echo >>$@.tmp 'LoadModule alias_module modules/mod_alias.so' + echo >>$@.tmp 'LoadModule access_compat_module modules/mod_access_compat.so' + echo >>$@.tmp 'LoadModule authn_core_module modules/mod_authn_core.so' + echo >>$@.tmp 'LoadModule authn_file_module modules/mod_authn_file.so' + echo >>$@.tmp 'LoadModule authz_core_module modules/mod_authz_core.so' + echo >>$@.tmp 'LoadModule authz_user_module modules/mod_authz_user.so' + echo >>$@.tmp 'LoadModule authz_groupfile_module modules/mod_authz_groupfile.so' + echo >>$@.tmp 'LoadModule auth_basic_module modules/mod_auth_basic.so' + echo >>$@.tmp 'LoadModule dav_module modules/mod_dav.so' echo >>$@.tmp 'LoadModule dav_svn_module $(MOD_DAV_SVN)' echo >>$@.tmp 'LoadModule authz_svn_module $(MOD_AUTHZ_SVN)' echo >>$@.tmp 'LoadModule dontdothat_module $(MOD_DONTDOTHAT)' @@ -1628,8 +1773,7 @@ $(HTTPD_CHECK_CONF): $(MOD_DONTDOTHAT_CONF) $(HTTPD_CHECK_GROUPS) echo >>$@.tmp '' echo >>$@.tmp ' Options FollowSymLinks' echo >>$@.tmp ' AllowOverride None' - echo >>$@.tmp ' Order deny,allow' - echo >>$@.tmp ' Allow from all' + echo >>$@.tmp ' Require all granted' echo >>$@.tmp '' echo >>$@.tmp '' echo >>$@.tmp ' DAV svn' @@ -1657,6 +1801,21 @@ endif ifeq ($(USE_HTTPV1),yes) echo >>$@.tmp ' SVNAdvertiseV2Protocol off' endif +ifeq ($(USE_AUTHZ_SHORT_CIRCUIT),yes) + echo >>$@.tmp ' SVNPathAuthz short_circuit' +endif + echo >>$@.tmp '' + echo >>$@.tmp '' + echo >>$@.tmp ' DAV svn' + echo >>$@.tmp ' SVNPath $(SVN_WC)/subversion/tests/cmdline/svn-test-work/local_tmp/trojan' + echo >>$@.tmp ' AuthzSVNAccessFile $(SVN_WC)/subversion/tests/cmdline/svn-test-work/authz' + echo >>$@.tmp ' AuthType Basic' + echo >>$@.tmp ' AuthName "Subversion Repository"' + echo >>$@.tmp ' AuthUserFile $(HTTPD_CHECK_USERS)' + echo >>$@.tmp ' Require valid-user' +ifeq ($(USE_HTTPV1),yes) + echo >>$@.tmp ' SVNAdvertiseV2Protocol off' +endif ifeq ($(USE_AUTHZ_SHORT_CIRCUIT),yes) echo >>$@.tmp ' SVNPathAuthz short_circuit' endif @@ -1665,7 +1824,7 @@ endif echo >>$@.tmp '' echo >>$@.tmp ' DAV svn' echo >>$@.tmp ' SVNParentPath /tmp' - echo >>$@.tmp ' Allow from all' + echo >>$@.tmp ' Require all granted' echo >>$@.tmp ' #AuthType Basic' echo >>$@.tmp ' #AuthName "Subversion Repository"' echo >>$@.tmp ' #AuthUserFile $(HTTPD_CHECK_USERS)' @@ -1706,7 +1865,7 @@ endif echo >>$@.tmp ' Require all granted' echo >>$@.tmp ' ' echo >>$@.tmp ' ' - echo >>$@.tmp ' Allow from all' + echo >>$@.tmp ' Requite all granted' echo >>$@.tmp ' ' ifeq ($(USE_AUTHZ_SHORT_CIRCUIT),yes) echo >>$@.tmp ' SVNPathAuthz short_circuit' @@ -1724,7 +1883,7 @@ endif echo >>$@.tmp ' AuthName "Subversion Repository"' echo >>$@.tmp ' AuthUserFile $(HTTPD_CHECK_USERS)' echo >>$@.tmp ' Require valid-user' - echo >>$@.tmp ' Satisfy Any' + echo >>$@.tmp ' Satisfy Any' ifeq ($(USE_AUTHZ_SHORT_CIRCUIT),yes) echo >>$@.tmp ' SVNPathAuthz short_circuit' endif @@ -1814,7 +1973,7 @@ endif echo >>$@.tmp '' echo >>$@.tmp ' ' echo >>$@.tmp ' DAV svn' - echo >>$@.tmp ' SVNParentPath $($SVN_WC)/subversion/tests/cmdline/svn-test-work/local_tmp' + echo >>$@.tmp ' SVNParentPath $(SVN_WC)/subversion/tests/cmdline/svn-test-work/local_tmp' echo >>$@.tmp ' AuthzSVNAccessFile $(SVN_WC)/subversion/tests/cmdline/svn-test-work/authz' ifeq ($(USE_HTTPV1),yes) echo >>$@.tmp ' SVNAdvertiseV2Protocol off' @@ -1857,7 +2016,7 @@ endif echo >>$@.tmp '' echo >>$@.tmp 'RedirectMatch permanent ^/svn-test-work/repositories/REDIRECT-PERM-(.*)$$ /svn-test-work/repositories/$$1' echo >>$@.tmp 'RedirectMatch ^/svn-test-work/repositories/REDIRECT-TEMP-(.*)$$ /svn-test-work/repositories/$$1' - echo >>$@.tmp 'Include "conf/$(SVN_REL_WC)*-custom.conf"' + echo >>$@.tmp 'IncludeOptional "conf/$(SVN_REL_WC)*-custom.conf"' echo >> $@.tmp '#SVNInMemoryCacheSize 0' echo >> $@.tmp '#SVNCacheTextDeltas Off' echo >> $@.tmp '#SVNCacheRevProps Off' @@ -1868,6 +2027,16 @@ $(HTTPD_PROXY_CONF): $(HTTPD_CHECK_CONF) echo > $@.tmp '# httpd config for a write-through proxy' echo >>$@.tmp 'ServerRoot "$(PREFIX)/httpd"' echo >>$@.tmp 'Listen localhost:$(HTTPD_PROXY_PORT)' + echo >>$@.tmp 'LoadModule unixd_module modules/mod_unixd.so' + echo >>$@.tmp 'LoadModule alias_module modules/mod_alias.so' + echo >>$@.tmp 'LoadModule access_compat_module modules/mod_access_compat.so' + echo >>$@.tmp 'LoadModule authn_core_module modules/mod_authn_core.so' + echo >>$@.tmp 'LoadModule authn_file_module modules/mod_authn_file.so' + echo >>$@.tmp 'LoadModule authz_core_module modules/mod_authz_core.so' + echo >>$@.tmp 'LoadModule authz_user_module modules/mod_authz_user.so' + echo >>$@.tmp 'LoadModule authz_groupfile_module modules/mod_authz_groupfile.so' + echo >>$@.tmp 'LoadModule auth_basic_module modules/mod_auth_basic.so' + echo >>$@.tmp 'LoadModule dav_module modules/mod_dav.so' echo >>$@.tmp 'LoadModule dav_svn_module $(MOD_DAV_SVN)' echo >>$@.tmp 'LoadModule authz_svn_module $(MOD_AUTHZ_SVN)' echo >>$@.tmp 'LoadModule dontdothat_module $(MOD_DONTDOTHAT)' @@ -1877,7 +2046,7 @@ $(HTTPD_PROXY_CONF): $(HTTPD_CHECK_CONF) echo >>$@.tmp ' DAV svn' echo >>$@.tmp ' SVNParentPath /tmp/svn-$(BRANCH)-proxy' echo >>$@.tmp ' SVNMasterURI http://localhost:$(HTTPD_CHECK_PORT)/svn/' - echo >>$@.tmp ' Allow from all' + echo >>$@.tmp ' Requite all granted' echo >>$@.tmp ' #AuthType Basic' echo >>$@.tmp ' #AuthName "Subversion Repository"' echo >>$@.tmp ' #AuthUserFile $(HTTPD_CHECK_USERS)' @@ -1893,7 +2062,7 @@ endif echo >>$@.tmp '' echo >>$@.tmp 'DAV svn' echo >>$@.tmp 'SVNParentPath /tmp/svn-$(BRANCH)-proxy' - echo >>$@.tmp 'Allow from all' + echo >>$@.tmp 'Require all granted' echo >>$@.tmp '' mv -f $@.tmp $@ @@ -1913,6 +2082,7 @@ endif HTTPD_CMD = env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) $(LIB_PTHREAD_HACK) \ $(PREFIX)/httpd/bin/apachectl +HTTPD_LOG_ROTATE = mv $(PREFIX)/httpd/logs/error_log $(PREFIX)/httpd/logs/error_log.old HTTPD_START_CMD = $(HTTPD_CMD) -f $(HTTPD_CHECK_CONF) -k start HTTPD_START_CMD_PROXY = $(HTTPD_CMD) -f $(HTTPD_PROXY_CONF) HTTPD_START_CMD_DEBUG = $(HTTPD_START_CMD) -X @@ -1931,6 +2101,7 @@ SVNSERVE_STOP_CMD = kill `cat $(PWD)/svnserve-$(WC).pid`; sleep 3; \ rm -f $(PWD)/svnserve-$(WC).pid start-httpd: $(HTTPD_CHECK_CONF) + -$(HTTPD_LOG_ROTATE) $(HTTPD_START_CMD) @echo "To run tests over http, run:" @echo " make check BASE_URL=http://localhost:$(HTTPD_CHECK_PORT)" @@ -1965,12 +2136,13 @@ stop-svnserve: $(SVNSERVE_STOP_CMD) define do_check --cd $(svn_builddir) && for fs in fsfs bdb; do \ +-cd $(svn_builddir) && for fs in $(SVN_CHECK_FS_BACKENDS); do \ echo "Begin test: $(subst svn-check-,,$@) x $$fs"; \ test -d "$(RAMDISK)/tmp" && export TMPDIR="$(RAMDISK)/tmp"; \ env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) $(LIB_PTHREAD_HACK) \ env MAKEFLAGS= make check PARALLEL=$(PARALLEL) CLEANUP=$(CLEANUP) \ EXCLUSIVE_WC_LOCKS=$(EXCLUSIVE_WC_LOCKS) \ + SVN_BIN_DIR=$(SVN_PREFIX)/bin \ MEMCACHED_SERVER=$(MEMCACHED_SERVER) $1 FS_TYPE=$$fs; \ for log in tests.log fails.log; do \ test -f $$log && mv -f $$log $$log.$@-$$fs; \ @@ -2050,9 +2222,10 @@ svn-check-swig-rb: svn-check-javahl: -if [ $(ENABLE_JAVA_BINDINGS) = yes ]; then \ + ln -s libsvnjavahl-1.so.0.0 $(PREFIX)/svn-$(WC)/lib/libsvnjavahl-1.so; \ (cd $(svn_builddir) && \ env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \ - env MAKEFLAGS= make $(JAVAHL_CHECK_TARGET) 2>&1) | \ + MAKEFLAGS= make $(JAVAHL_CHECK_TARGET) 2>&1) | \ tee $(svn_builddir)/tests.log.bindings.javahl; \ fi diff --git a/tools/dev/unix-build/README b/tools/dev/unix-build/README index 13cdc42..8a3780c 100644 --- a/tools/dev/unix-build/README +++ b/tools/dev/unix-build/README @@ -94,3 +94,22 @@ everything is "svn-check". Notes ===== The script currently doesn't build Ctypes Python bindings. + +OpenBSD-specific notes +====================== +On OpenBSD install the following packages to get dependencies and +tools not covered by this Makefile: + +pkg_add autoconf automake bison coreutils gmake gperf groff libtool \ + python ruby scons subversion swig wget + +Some of these packages are available in several versions. Tested at time +of writing were: autoconf-2.68 automake-1.19 python-2.7.14 ruby-2.4.2 + +OpenBSD's autoconf and automake wrappers require desired versions in +environment variables and will raise errors if these aren't set: +export AUTOCONF_VERSION=2.68 +export AUTOMAKE_VERSION=1.19 + +A 'python' symlink is required; follow instructions printed by pkg_add +when the python package is installed. diff --git a/tools/dev/wc-ng/svn-wc-db-tester.c b/tools/dev/wc-ng/svn-wc-db-tester.c index ccdd102..ba63b63 100644 --- a/tools/dev/wc-ng/svn-wc-db-tester.c +++ b/tools/dev/wc-ng/svn-wc-db-tester.c @@ -44,7 +44,7 @@ static svn_error_t * version(apr_pool_t *pool) { - return svn_opt_print_help4(NULL, "svn-wc-db-tester", TRUE, FALSE, FALSE, + return svn_opt_print_help5(NULL, "svn-wc-db-tester", TRUE, FALSE, FALSE, NULL, NULL, NULL, NULL, NULL, NULL, pool); } diff --git a/tools/dev/which-error.py b/tools/dev/which-error.py index 6c683cb..b8e3800 100755 --- a/tools/dev/which-error.py +++ b/tools/dev/which-error.py @@ -23,7 +23,7 @@ # under the License. # ==================================================================== # -# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.10.x/tools/dev/which-error.py $ +# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/tools/dev/which-error.py $ # $LastChangedDate: 2016-04-30 08:16:53 +0000 (Sat, 30 Apr 2016) $ # $LastChangedBy: stefan2 $ # $LastChangedRevision: 1741723 $ diff --git a/tools/dist/README.backport b/tools/dist/README.backport index 0b9c66e..c3fdc68 100644 --- a/tools/dist/README.backport +++ b/tools/dist/README.backport @@ -7,20 +7,23 @@ F1. Auto-merge bot; the nightly svn-role commits. F2. Conflicts detector bot; the svn-backport-conflicts-1.9.x buildbot task. -And two interactive functions, described later. +And two interactive functions¹: + +F3. Reviewing STATUS nominations and casting votes. + +F4. Adding new entries to STATUS. The scripts are: backport.pl: - oldest script, implements both [F1] and [F2], plus two interactive - functions¹. As of March 2015, used in production by svn-role and - by svn-backport-conflicts-1.9.x. + oldest script, implements [F1], [F2], and [F3]. As of Feb 2018, used in + production by svn-role (running on svn-qavm3) and by svn-backport-conflicts-1.9.x + (a buildbot job). nominate.pl: - Symlink to backport.pl. Implements one of the two interactive features. - Not used by bots. + Symlink to backport.pl. Implements [F4]. (The script inspects its argv[0].) backport_tests_pl.py: Regression tests for backport.pl. @@ -39,9 +42,11 @@ backport/*.py: detect-conflicting-backports.py: Implementation of [F2] using backport.py. + Not currently used in production. merge-approved-backports.py: Implementation of [F1] using backport.py. + Not currently used in production. backport_tests_py.py: Regression tests for detect-conflicting-backports.py and merge-approved-backports.py @@ -52,13 +57,28 @@ backport_tests.py: svntest framework (../../subversion/tests/cmdline/svntest/), which is written in Python 2. -backport*.dump: + Note that backport_tests.py and backport/*.py are written in different + languages, so they never 'import' each other. backport_tests.py invokes + detect-conflicting-backports.py, merge-approved-backports.py, and + backport.pl in the same manner: through subprocess.check_call(). + +backport_tests_data/backport*.dump: Expected output files for backport_tests.py; see the BackportTest - decorator. + decorator in backport_tests.py. All scripts can be run with '--help' to display their usage messages. +backport.pl is considered deprecated since backport.py is better architected +and is written in a language that many more active developers are comfortable +with. The unattended jobs [F1] and [F2] should be converted to using +backport.py whenever someone gets around to do the legwork. The interactive +versions [F3] and [F4] are still in active use, however, so the physical +backport.pl script should be kept around until Python versions of these are +available. + + +TODO: document that "Notes: ... --accept=foo ..." is parsed, see backport_tests.py #3. ¹ For backport.pl's interactive features, see: diff --git a/tools/dist/backport.pl b/tools/dist/backport.pl index 67f8313..df3da22 100755 --- a/tools/dist/backport.pl +++ b/tools/dist/backport.pl @@ -9,11 +9,11 @@ use v5.10.0; # needed for $^V # experimental and "subject to change" in v5.18 (see perl5180delta). Every # use of it now triggers a warning. # -# As of Perl v5.24.1, the semantics of given/when provided by Perl are +# As of Perl v5.26.1, the semantics of given/when provided by Perl are # compatible with those expected by the script, so disable the warning for # those Perls. But don't try to disable the the warning category on Perls # that don't know that category, since that breaks compilation. -no if (v5.17.0 le $^V and $^V le v5.24.1), +no if (v5.17.0 le $^V and $^V le v5.26.1), warnings => 'experimental::smartmatch'; # Licensed to the Apache Software Foundation (ASF) under one @@ -791,7 +791,7 @@ sub vote { # Add to state votes that aren't '+0' or 'edit' $state->{$_->{digest}}++ for grep - +{ qw/-1 t -0 t +1 t/ }->{$_->{vote}}, + +($_->{approval} or $_->{vote} =~ /^(-1|-0|[+]1)$/), @votesarray; } } @@ -1027,7 +1027,7 @@ sub handle_entry { # the "next PROMPT;" is; there's a "last;" at the end of the loop body. PROMPT: while (1) { say ""; - say "\n>>> $entry{header_start}:"; + say "\n\e\x5b32m>>> $entry{header_start}:\e\x5b0m"; say join ", ", map { "r$_" } @{$entry{revisions}} if @{$entry{revisions}}; say "$BRANCHES/$entry{branch}" if $entry{branch}; say "--accept=$entry{accept}" if $entry{accept}; @@ -1196,7 +1196,7 @@ sub backport_main { given ($lines[0]) { # Section header when (/^[A-Z].*:$/i) { - say "\n\n=== $lines[0]" unless $YES; + say "\n\n\e\x5b33m\e\x5b1m=== $lines[0]\e\x5b0m" unless $YES; $in_approved = $lines[0] =~ /^Approved changes/; } # Comment @@ -1279,7 +1279,7 @@ sub nominate_main { # Open the file in line-mode (not paragraph-mode). my @STATUS; tie @STATUS, "Tie::File", $STATUS, recsep => "\n"; - my ($index) = grep { $STATUS[$_] =~ /^Veto/ } (0..$#STATUS); + my ($index) = grep { $STATUS[$_] =~ /^Veto|^Approved/ } (0..$#STATUS); die "Couldn't find where to add an entry" unless $index; # Add an empty line if needed. @@ -1297,7 +1297,8 @@ sub nominate_main { # Done! system "$SVN diff -- $STATUS"; if (prompt "Commit this nomination? ") { - system "$SVN commit -m '* STATUS: Nominate r$revnums[0].' -- $STATUS"; + my $header = join ', ', map "r$_", @revnums; + system "$SVN commit -m '* STATUS: Nominate $header.' -- $STATUS"; exit $?; } elsif (!$had_local_mods or prompt "Revert STATUS (destroying local mods)? ") { diff --git a/tools/dist/backport/status.py b/tools/dist/backport/status.py index 727939d..7ec378d 100644 --- a/tools/dist/backport/status.py +++ b/tools/dist/backport/status.py @@ -194,10 +194,10 @@ class StatusFile: try: entry = StatusEntry(para_text, status_file=self) kind = Kind.nomination - except ParseException: + except ParseException as e: kind = Kind.unknown - logger.warning("Failed to parse entry {!r} in {!r}".format( - para_text, status_fp)) + logger.warning("Failed to parse entry {!r} in {!r}: {}".format( + para_text, status_fp, e)) else: kind = Kind.preamble @@ -379,9 +379,11 @@ class StatusEntry: raise ParseException("Entry found with neither branch nor revisions") # Parse the logsummary. - while lines and not self._is_subheader(lines[0]): + while True: self.logsummary.append(lines[0]) lines = lines[1:] + if (not lines) or self._is_subheader(lines[0]): + break # Parse votes. if "Votes:" in lines: diff --git a/tools/dist/backport_tests.py b/tools/dist/backport_tests.py index ec483a7..27df294 100644 --- a/tools/dist/backport_tests.py +++ b/tools/dist/backport_tests.py @@ -53,6 +53,12 @@ import sys @contextlib.contextmanager def chdir(dir): + """This is a context manager that saves the current working directory's + pathname. Upon entry it chdir's to the argument DIR; upon exit it chdir's + back to the saved pathname. + + The current working directory is restored using os.chdir(), not os.fchdir(). + """ try: saved_dir = os.getcwd() os.chdir(dir) @@ -660,6 +666,21 @@ def backport_unicode_entry(sbox): # Run it. run_backport(sbox) +#---------------------------------------------------------------------- +@BackportTest('76cee987-25c9-4d6c-ad40-000000000013') +def backport_logsummary_colon(sbox): + "a logsummary that looks like a header" + + # r6: nominate r4 + approved_entries = [ + make_entry([4], logsummary="HTTPv2: Add comments."), + ] + sbox.simple_append(STATUS, serialize_STATUS(approved_entries)) + sbox.simple_commit(message='Nominate r4') + + # Run it. + run_backport(sbox) + #---------------------------------------------------------------------- @@ -680,6 +701,7 @@ test_list = [ None, backport_otherproject_change, backport_STATUS_mods, backport_unicode_entry, + backport_logsummary_colon, # When adding a new test, include the test number in the last # 6 bytes of the UUID, in decimal. ] diff --git a/tools/dist/backport_tests_data/backport_logsummary_colon.dump b/tools/dist/backport_tests_data/backport_logsummary_colon.dump new file mode 100644 index 0000000..db9d6ce --- /dev/null +++ b/tools/dist/backport_tests_data/backport_logsummary_colon.dump @@ -0,0 +1,522 @@ +SVN-fs-dump-format-version: 2 + +UUID: 76cee987-25c9-4d6c-ad40-000000000013 + +Revision-number: 0 +Prop-content-length: 10 +Content-length: 10 + +PROPS-END + +Revision-number: 1 +Prop-content-length: 83 +Content-length: 83 + +K 10 +svn:author +V 7 +jrandom +K 7 +svn:log +V 27 +Log message for revision 1. +PROPS-END + +Node-path: A +Node-kind: dir +Node-action: add +Prop-content-length: 10 +Content-length: 10 + +PROPS-END + + +Node-path: A/B +Node-kind: dir +Node-action: add +Prop-content-length: 10 +Content-length: 10 + +PROPS-END + + +Node-path: A/B/E +Node-kind: dir +Node-action: add +Prop-content-length: 10 +Content-length: 10 + +PROPS-END + + +Node-path: A/B/E/alpha +Node-kind: file +Node-action: add +Text-content-md5: d1fa4a3ced98961674a441930a51f2d3 +Text-content-sha1: b347d1da69df9a6a70433ceeaa0d46c8483e8c03 +Prop-content-length: 10 +Text-content-length: 26 +Content-length: 36 + +PROPS-END +This is the file 'alpha'. + + +Node-path: A/B/E/beta +Node-kind: file +Node-action: add +Text-content-md5: 67c756078f24f946f6ec2d00d02f50e1 +Text-content-sha1: d001710ac8e622c6d1fe59b1e265a3908acdd2a3 +Prop-content-length: 10 +Text-content-length: 25 +Content-length: 35 + +PROPS-END +This is the file 'beta'. + + +Node-path: A/B/F +Node-kind: dir +Node-action: add +Prop-content-length: 10 +Content-length: 10 + +PROPS-END + + +Node-path: A/B/lambda +Node-kind: file +Node-action: add +Text-content-md5: 911c7a8d869b8c1e566f57da54d889c6 +Text-content-sha1: 784a9298366863da2b65ebf82b4e1123755a2421 +Prop-content-length: 10 +Text-content-length: 27 +Content-length: 37 + +PROPS-END +This is the file 'lambda'. + + +Node-path: A/C +Node-kind: dir +Node-action: add +Prop-content-length: 10 +Content-length: 10 + +PROPS-END + + +Node-path: A/D +Node-kind: dir +Node-action: add +Prop-content-length: 10 +Content-length: 10 + +PROPS-END + + +Node-path: A/D/G +Node-kind: dir +Node-action: add +Prop-content-length: 10 +Content-length: 10 + +PROPS-END + + +Node-path: A/D/G/pi +Node-kind: file +Node-action: add +Text-content-md5: adddfc3e6b605b5f90ceeab11b4e8ab6 +Text-content-sha1: 411e258dc14b42701fdc29b75f653e93f8686415 +Prop-content-length: 10 +Text-content-length: 23 +Content-length: 33 + +PROPS-END +This is the file 'pi'. + + +Node-path: A/D/G/rho +Node-kind: file +Node-action: add +Text-content-md5: 82f2211cf4ab22e3555fc7b835fbc604 +Text-content-sha1: 56388a031dffbf9df7c32e1f299b1d5d7ef60881 +Prop-content-length: 10 +Text-content-length: 24 +Content-length: 34 + +PROPS-END +This is the file 'rho'. + + +Node-path: A/D/G/tau +Node-kind: file +Node-action: add +Text-content-md5: 9936e2716e469bb686deb98c280ead58 +Text-content-sha1: 62e8c07d56bee94ea4577e80414fa8805aaf0175 +Prop-content-length: 10 +Text-content-length: 24 +Content-length: 34 + +PROPS-END +This is the file 'tau'. + + +Node-path: A/D/H +Node-kind: dir +Node-action: add +Prop-content-length: 10 +Content-length: 10 + +PROPS-END + + +Node-path: A/D/H/chi +Node-kind: file +Node-action: add +Text-content-md5: 8f5ebad6d1f7775c2682e54417cbe4d3 +Text-content-sha1: abeac1bf62099ab66b44779198dc19f40e3244f4 +Prop-content-length: 10 +Text-content-length: 24 +Content-length: 34 + +PROPS-END +This is the file 'chi'. + + +Node-path: A/D/H/omega +Node-kind: file +Node-action: add +Text-content-md5: fe4ec8bdd3d2056db4f55b474a10fadc +Text-content-sha1: c06e671bf15a6af55086176a0931d3b5034c82e6 +Prop-content-length: 10 +Text-content-length: 26 +Content-length: 36 + +PROPS-END +This is the file 'omega'. + + +Node-path: A/D/H/psi +Node-kind: file +Node-action: add +Text-content-md5: e81f8f68ba50e749c200cb3c9ce5d2b1 +Text-content-sha1: 9c438bde39e8ccbbd366df2638e3cb6700950204 +Prop-content-length: 10 +Text-content-length: 24 +Content-length: 34 + +PROPS-END +This is the file 'psi'. + + +Node-path: A/D/gamma +Node-kind: file +Node-action: add +Text-content-md5: 412138bd677d64cd1c32fafbffe6245d +Text-content-sha1: 74b75d7f2e1a0292f17d5a57c570bd89783f5d1c +Prop-content-length: 10 +Text-content-length: 26 +Content-length: 36 + +PROPS-END +This is the file 'gamma'. + + +Node-path: A/mu +Node-kind: file +Node-action: add +Text-content-md5: baf78ae06a2d5b7d9554c5f1280d3fa8 +Text-content-sha1: b4d00c56351d1a752e24d839d41a362d8da4a4c7 +Prop-content-length: 10 +Text-content-length: 23 +Content-length: 33 + +PROPS-END +This is the file 'mu'. + + +Node-path: iota +Node-kind: file +Node-action: add +Text-content-md5: 2d18c5e57e84c5b8a5e9a6e13fa394dc +Text-content-sha1: 2c0aa9014a0cd07f01795a333d82485ef6d083e2 +Prop-content-length: 10 +Text-content-length: 25 +Content-length: 35 + +PROPS-END +This is the file 'iota'. + + +Revision-number: 2 +Prop-content-length: 68 +Content-length: 68 + +K 10 +svn:author +V 7 +jrandom +K 7 +svn:log +V 12 +Create trunk +PROPS-END + +Node-path: subversion +Node-kind: dir +Node-action: add +Prop-content-length: 10 +Content-length: 10 + +PROPS-END + + +Node-path: subversion/branches +Node-kind: dir +Node-action: add +Prop-content-length: 10 +Content-length: 10 + +PROPS-END + + +Node-path: subversion/tags +Node-kind: dir +Node-action: add +Prop-content-length: 10 +Content-length: 10 + +PROPS-END + + +Node-path: subversion/trunk +Node-kind: dir +Node-action: add +Prop-content-length: 10 +Content-length: 10 + +PROPS-END + + +Node-path: subversion/trunk/A +Node-kind: dir +Node-action: add +Node-copyfrom-rev: 1 +Node-copyfrom-path: A + + +Node-path: subversion/trunk/iota +Node-kind: file +Node-action: add +Node-copyfrom-rev: 1 +Node-copyfrom-path: iota +Text-copy-source-md5: 2d18c5e57e84c5b8a5e9a6e13fa394dc +Text-copy-source-sha1: 2c0aa9014a0cd07f01795a333d82485ef6d083e2 + + +Node-path: A +Node-action: delete + + +Node-path: iota +Node-action: delete + + +Revision-number: 3 +Prop-content-length: 87 +Content-length: 87 + +K 10 +svn:author +V 7 +jrandom +K 7 +svn:log +V 31 +Create branch, with STATUS file +PROPS-END + +Node-path: branch +Node-kind: dir +Node-action: add +Node-copyfrom-rev: 2 +Node-copyfrom-path: subversion/trunk + + +Node-path: branch/STATUS +Node-kind: file +Node-action: add +Text-content-md5: d41d8cd98f00b204e9800998ecf8427e +Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709 +Prop-content-length: 10 +Text-content-length: 0 +Content-length: 10 + +PROPS-END + + +Revision-number: 4 +Prop-content-length: 68 +Content-length: 68 + +K 10 +svn:author +V 7 +jrandom +K 7 +svn:log +V 12 +First change +PROPS-END + +Node-path: subversion/trunk/iota +Node-kind: file +Node-action: change +Text-content-md5: 67f471c2ecc2c9e561d122d6e6b0f847 +Text-content-sha1: 750accb6e7f880a1d05ce725c19eb60183bb4b26 +Text-content-length: 38 +Content-length: 38 + +This is the file 'iota'. +First change + + +Revision-number: 5 +Prop-content-length: 69 +Content-length: 69 + +K 10 +svn:author +V 7 +jrandom +K 7 +svn:log +V 13 +Second change +PROPS-END + +Node-path: subversion/trunk/A/mu +Node-kind: file +Node-action: change +Text-content-md5: eab751301b4e650c83324dfef4aad667 +Text-content-sha1: ab36cad564c7c50dec5ac1eb0bf879cf4e3a5f99 +Text-content-length: 37 +Content-length: 37 + +This is the file 'mu'. +Second change + + +Revision-number: 6 +Prop-content-length: 67 +Content-length: 67 + +K 10 +svn:author +V 7 +jrandom +K 7 +svn:log +V 11 +Nominate r4 +PROPS-END + +Node-path: branch/STATUS +Node-kind: file +Node-action: change +Text-content-md5: 21cf72d59d9e71a49260e3cf31f78b76 +Text-content-sha1: 9938559a403d5a18099aace3db6719bdb8940449 +Text-content-length: 245 +Content-length: 245 + +Status of 1.8.x: + +Candidate changes: +================== + +Random new subheading: +====================== + +Veto-blocked changes: +===================== + +Approved changes: +================= + + * r4 + HTTPv2: Add comments. + Votes: + +1: jrandom + + + +Revision-number: 7 +Prop-content-length: 135 +Content-length: 135 + +K 10 +svn:author +V 6 +daniel +K 7 +svn:log +V 80 +Merge r4 from trunk: + + * r4 + HTTPv2: Add comments. + Votes: + +1: jrandom + +PROPS-END + +Node-path: branch +Node-kind: dir +Node-action: change +Prop-content-length: 54 +Content-length: 54 + +K 13 +svn:mergeinfo +V 19 +/subversion/trunk:4 +PROPS-END + + +Node-path: branch/STATUS +Node-kind: file +Node-action: change +Text-content-md5: 6f71fec92afeaa5c1ebe02349f548ca9 +Text-content-sha1: eece02003d9c51610249e3fdd0d4e191e02ba3b7 +Text-content-length: 185 +Content-length: 185 + +Status of 1.8.x: + +Candidate changes: +================== + +Random new subheading: +====================== + +Veto-blocked changes: +===================== + +Approved changes: +================= + + +Node-path: branch/iota +Node-kind: file +Node-action: change +Text-content-md5: 67f471c2ecc2c9e561d122d6e6b0f847 +Text-content-sha1: 750accb6e7f880a1d05ce725c19eb60183bb4b26 +Text-content-length: 38 +Content-length: 38 + +This is the file 'iota'. +First change + + diff --git a/tools/dist/changes-to-html.py b/tools/dist/changes-to-html.py new file mode 100755 index 0000000..73ec19f --- /dev/null +++ b/tools/dist/changes-to-html.py @@ -0,0 +1,88 @@ +#!/usr/bin/env python +# python: coding=utf-8 +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +import re +import sys + + +HEADER = """ + +CHANGES + + + +
    +"""
+
+FOOTER = """
    + + +""" + + +url_rx = re.compile(r'(?:^|(?<=\W))(https?://[\w\d./?&=]+)') +url_sub = r'\1' + +issue_rx = re.compile(r'(?<=\W)(#(\d+))') +issue_sub = r'\1' + +revision_rx = re.compile(r'(?:^|(?<=\W))(r\d+)') +revision_sub = r'\1' + +branchtag_rx = re.compile(r'(?<=\W)(/(?:branches|tags)/[\w\d.]+)') +branchtag_sub = r'\1' + + +def generate(stream): + sys.stdout.write(HEADER) + + beginning = True + for n in stream.readlines(): + # Skip initial comments and empty lines in the CHANGES file. + n = n.rstrip() + if beginning and (not n or n.startswith('#')): + continue + beginning = False + + n = url_rx.sub(url_sub, n) + n = issue_rx.sub(issue_sub, n) + n = revision_rx.sub(revision_sub, n) + n = branchtag_rx.sub(branchtag_sub, n) + + sys.stdout.write(n) + sys.stdout.write('\n') + + sys.stdout.write(FOOTER) + + +def generate_from(filenme): + with open(filenme, 'rt') as stream: + return generate(stream) + + +def main(): + if len(sys.argv) < 2 or sys.argv[1] == '-': + return generate(sys.stdin) + else: + return generate_from(sys.argv[1]) + +if __name__ == '__main__': + main() diff --git a/tools/dist/create-minor-release-branch.py b/tools/dist/create-minor-release-branch.py new file mode 100755 index 0000000..a68fa23 --- /dev/null +++ b/tools/dist/create-minor-release-branch.py @@ -0,0 +1,328 @@ +#!/usr/bin/env python +# python: coding=utf-8 +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + + +# About this script: +# This script is intended to automate steps in creating a new Subversion +# minor release. + +import os +import re +import sys +import logging +import subprocess +import argparse # standard in Python 2.7 + +from release import Version + + +# Some constants +repos = 'https://svn.apache.org/repos/asf/subversion' +secure_repos = 'https://svn.apache.org/repos/asf/subversion' +buildbot_repos = 'https://svn.apache.org/repos/infra/infrastructure/buildbot/aegis/buildmaster' + +# Parameters +dry_run = False + +# Local working copies +base_dir = None # set by main() + +def get_trunk_wc_path(path=None): + trunk_wc_path = os.path.join(base_dir, 'svn-trunk') + if path is None: return trunk_wc_path + return os.path.join(trunk_wc_path, path) +def get_branch_wc_path(ver, path=None): + branch_wc_path = os.path.join(base_dir, ver.branch + '.x') + if path is None: return branch_wc_path + return os.path.join(branch_wc_path, path) +def get_buildbot_wc_path(path=None): + buildbot_wc_path = os.path.join(base_dir, 'svn-buildmaster') + if path is None: return buildbot_wc_path + return os.path.join(buildbot_wc_path, path) + +def get_trunk_url(): + return secure_repos + '/trunk' +def get_branch_url(ver): + return secure_repos + '/branches/' + ver.branch + '.x' +def get_tag_url(ver): + return secure_repos + '/tags/' + ver.base +def get_buildbot_url(): + return buildbot_repos + +#---------------------------------------------------------------------- +# Utility functions + +def run(cmd, dry_run=False): + print('+ ' + ' '.join(cmd)) + if not dry_run: + stdout = subprocess.check_output(cmd) + print(stdout) + else: + print(' ## dry-run; not executed') + +def run_svn(cmd, dry_run=False): + run(['svn'] + cmd, dry_run) + +def svn_commit(cmd): + run_svn(['commit'] + cmd, dry_run=dry_run) + +def svn_copy_branch(src, dst, message): + args = ['copy', src, dst, '-m', message] + run_svn(args, dry_run=dry_run) + +def svn_checkout(url, wc, *args): + args = ['checkout', url, wc] + list(args) + run_svn(args) + +#---------------------------------------------------------------------- +def edit_file(path, pattern, replacement): + print("Editing '%s'" % (path,)) + print(" pattern='%s'" % (pattern,)) + print(" replace='%s'" % (replacement,)) + old_text = open(path, 'r').read() + new_text = re.sub(pattern, replacement, old_text) + assert new_text != old_text + open(path, 'w').write(new_text) + +def edit_changes_file(path, newtext): + """Insert NEWTEXT in the 'CHANGES' file found at PATH, + just before the first line that starts with 'Version '. + """ + print("Prepending to '%s'" % (path,)) + print(" text='%s'" % (newtext,)) + lines = open(path, 'r').readlines() + for i, line in enumerate(lines): + if line.startswith('Version '): + with open(path, 'w') as newfile: + newfile.writelines(lines[:i]) + newfile.write(newtext) + newfile.writelines(lines[i:]) + break + +#---------------------------------------------------------------------- +def make_release_branch(ver, revnum): + svn_copy_branch(get_trunk_url() + '@' + (str(revnum) if revnum else ''), + get_branch_url(ver), + 'Create the ' + ver.branch + '.x release branch.') + +#---------------------------------------------------------------------- +def update_minor_ver_in_trunk(ver, revnum): + """Change the minor version in trunk to the next (future) minor version. + """ + trunk_wc = get_trunk_wc_path() + trunk_url = get_trunk_url() + svn_checkout(trunk_url + '@' + (str(revnum) if revnum else ''), + trunk_wc) + + prev_ver = Version('1.%d.0' % (ver.minor - 1,)) + next_ver = Version('1.%d.0' % (ver.minor + 1,)) + relpaths = [] + + relpath = 'subversion/include/svn_version.h' + relpaths.append(relpath) + edit_file(get_trunk_wc_path(relpath), + r'(#define SVN_VER_MINOR *)%s' % (ver.minor,), + r'\g<1>%s' % (next_ver.minor,)) + + relpath = 'subversion/tests/cmdline/svntest/main.py' + relpaths.append(relpath) + edit_file(get_trunk_wc_path(relpath), + r'(SVN_VER_MINOR = )%s' % (ver.minor,), + r'\g<1>%s' % (next_ver.minor,)) + + relpath = 'subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java' + relpaths.append(relpath) + try: + # since r1817921 (just after branching 1.10) + edit_file(get_trunk_wc_path(relpath), + r'SVN_VER_MINOR = %s;' % (ver.minor,), + r'SVN_VER_MINOR = %s;' % (next_ver.minor,)) + except: + # before r1817921: two separate places + edit_file(get_trunk_wc_path(relpath), + r'version.isAtLeast\(1, %s, 0\)' % (ver.minor,), + r'version.isAtLeast\(1, %s, 0\)' % (next_ver.minor,)) + edit_file(get_trunk_wc_path(relpath), + r'1.%s.0, but' % (ver.minor,), + r'1.%s.0, but' % (next_ver.minor,)) + + relpath = 'CHANGES' + relpaths.append(relpath) + # insert at beginning of CHANGES file + edit_changes_file(get_trunk_wc_path(relpath), + 'Version ' + next_ver.base + '\n' + + '(?? ??? 20XX, from /branches/' + next_ver.branch + '.x)\n' + + get_tag_url(next_ver) + '\n' + + '\n') + + log_msg = '''\ +Increment the trunk version number to %s, and introduce a new CHANGES +section, following the creation of the %s.x release branch. + +* subversion/include/svn_version.h, + subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java, + subversion/tests/cmdline/svntest/main.py + (SVN_VER_MINOR): Increment to %s. + +* CHANGES: New section for %s.0. +''' % (next_ver.branch, ver.branch, next_ver.minor, next_ver.branch) + commit_paths = [get_trunk_wc_path(p) for p in relpaths] + svn_commit(commit_paths + ['-m', log_msg]) + +#---------------------------------------------------------------------- +def create_status_file_on_branch(ver): + branch_wc = get_branch_wc_path(ver) + branch_url = get_branch_url(ver) + svn_checkout(branch_url, branch_wc, '--depth=immediates') + + status_local_path = os.path.join(branch_wc, 'STATUS') + text='''\ + * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * + * THIS RELEASE STREAM IS OPEN FOR STABILIZATION. * + * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * + +This file tracks the status of releases in the %s.x line. + +See http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization +for details on how release lines and voting work, what kinds of bugs can +delay a release, etc. + +Status of %s: + +Candidate changes: +================== + + +Veto-blocked changes: +===================== + + +Approved changes: +================= +''' % (ver.branch, ver.base) + open(status_local_path, 'wx').write(text) + run_svn(['add', status_local_path]) + svn_commit([status_local_path, + '-m', '* branches/' + ver.branch + '.x/STATUS: New file.']) + +#---------------------------------------------------------------------- +def update_backport_bot(ver): + print("""MANUAL STEP: Fork & edit & pull-request on GitHub: +https://github.com/apache/infrastructure-puppet/blob/deployment/modules/svnqavm_pvm_asf/manifests/init.pp +"Add new %s.x branch to list of backport branches" +""" % (ver.branch,)) + print("""Someone needs to run the 'svn checkout' manually. +The exact checkout command is documented in machines/svn-qavm2/notes.txt +in the private repository (need to use a trunk client and the svn-master.a.o +hostname). +""") + +#---------------------------------------------------------------------- +def update_buildbot_config(ver): + """Add the new branch to the list of branches monitored by the buildbot + master. + """ + buildbot_wc = get_buildbot_wc_path() + buildbot_url = get_buildbot_url() + svn_checkout(buildbot_url, buildbot_wc) + + prev_ver = Version('1.%d.0' % (ver.minor - 1,)) + next_ver = Version('1.%d.0' % (ver.minor + 1,)) + + relpath = 'master1/projects/subversion.conf' + edit_file(get_buildbot_wc_path(relpath), + r'(MINOR_LINES=\[.*%s)(\])' % (prev_ver.minor,), + r'\1, %s\2' % (ver.minor,)) + + log_msg = '''\ +Subversion: start monitoring the %s branch. +''' % (ver.branch) + commit_paths = [get_buildbot_wc_path(relpath)] + svn_commit(commit_paths + ['-m', log_msg]) + +#---------------------------------------------------------------------- +def create_release_branch(args): + make_release_branch(args.version, args.revnum) + update_minor_ver_in_trunk(args.version, args.revnum) + create_status_file_on_branch(args.version) + update_backport_bot(args.version) + update_buildbot_config(args.version) + + +#---------------------------------------------------------------------- +# Main entry point for argument parsing and handling + +def main(): + 'Parse arguments, and drive the appropriate subcommand.' + + # Setup our main parser + parser = argparse.ArgumentParser( + description='Create an Apache Subversion release branch.') + subparsers = parser.add_subparsers(title='subcommands') + + # Setup the parser for the create-release-branch subcommand + subparser = subparsers.add_parser('create-release-branch', + help='''Create a minor release branch: branch from trunk, + update version numbers on trunk, create status + file on branch, update backport bot, + update buildbot config.''') + subparser.set_defaults(func=create_release_branch) + subparser.add_argument('version', type=Version, + help='''A version number to indicate the branch, such as + '1.7.0' (the '.0' is required).''') + subparser.add_argument('revnum', type=lambda arg: int(arg.lstrip('r')), + nargs='?', default=None, + help='''The trunk revision number to base the branch on. + Default is HEAD.''') + subparser.add_argument('--dry-run', action='store_true', default=False, + help='Avoid committing any changes to repositories.') + subparser.add_argument('--verbose', action='store_true', default=False, + help='Increase output verbosity') + subparser.add_argument('--base-dir', default=os.getcwd(), + help='''The directory in which to create needed files and + folders. The default is the current working + directory.''') + + # Parse the arguments + args = parser.parse_args() + + global base_dir, dry_run + base_dir = args.base_dir + dry_run = args.dry_run + + # Set up logging + logger = logging.getLogger() + if args.verbose: + logger.setLevel(logging.DEBUG) + else: + logger.setLevel(logging.INFO) + + # Make timestamps in tarballs independent of local timezone + os.environ['TZ'] = 'UTC' + + # finally, run the subcommand, and give it the parsed arguments + args.func(args) + + +if __name__ == '__main__': + main() diff --git a/tools/dist/edit-N-log-messages b/tools/dist/edit-N-log-messages new file mode 100755 index 0000000..fa6a2a2 --- /dev/null +++ b/tools/dist/edit-N-log-messages @@ -0,0 +1,94 @@ +#!/usr/bin/env zsh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e + +# setup +0=${0:t}; NAME=$0 +svn=${SVN:-svn} +svnadmin=${SVNADMIN:-svnadmin} + +usage() { + echo "usage: $NAME -r N:M" + echo " will retrieve all log messages in the range rN:rM, open them in" + echo " \$EDITOR, and commit any edits to them." + echo "" + echo " Run this with cwd being a working copy of ^/subversion/trunk." + # TODO: We only need the cwd in case SVN_CLIENT__REVKIND_NEEDS_WC() is true + # for N or M. When N and M are both numeric or HEAD, teach this script + # to disregard its cwd and contact ^/subversion/trunk directly. +} + +# parse argv +while getopts r: letter; do + if [[ $letter == r ]]; then + revision_range=$OPTARG + else + usage >&2 + exit 1 + fi +done +shift $((OPTIND - 1)) +[[ -n $revision_range ]] || { usage >&2; exit 1; } + +# get log messages +cd "$(mktemp -d)" +echo "${0}: Temporary directory: ${(q-)PWD}" +revisions=( ${(f)"$( + # We use $OLDPWD rather than a URL in case $revision_range is, say, + # "BASE:HEAD". + $svn log -q -r $revision_range -- $OLDPWD | + grep '^r' | cut -d' ' -f1 | grep '^r[0-9]*$' +)"} ) +for rN in $revisions; do + $svn propget --revprop -r $rN --strict 'svn:log' -- $OLDPWD > ./$rN & +done +wait + +# set up to detect which ones have changed +$svnadmin create ./.r +$svn checkout -q file://$PWD/.r ./ +$svn add -q ./r* +$svn commit -q -m "Import revisions $revision_range" +rm -rf ./.r # (!) + +# edit +case $EDITOR in + (*vim*) $EDITOR -p ./r*;; + (*) $EDITOR ./r*;; +esac + +# prompt for permission to continue +if $svn status -q | grep -q ''; then + $svn status -q + read -q "?Commit the above propedits? " || { echo "${0}: exiting"; exit 0; } + echo "" +else + echo "${0}: No changes." + echo "${0}: You can remove ${(q-)PWD} now." + exit 0 +fi + +# make propedits +# TODO: make these changes atomically +# 'svn propedit' is atomic and could drive a non-interactive $EDITOR, but for +# now, we just trust the committer to read commits@. +targets=( ${(f)"$($svn status -q | grep '^M' | cut -c9-)"} ) +for i in $targets; do + $svn propset --revprop -r $i -F ./$i -- 'svn:log' $OLDPWD +done diff --git a/tools/dist/nightly.sh b/tools/dist/nightly.sh index b167ab3..c4f8ebf 100755 --- a/tools/dist/nightly.sh +++ b/tools/dist/nightly.sh @@ -21,7 +21,7 @@ # set -e -repo=http://svn.apache.org/repos/asf/subversion +repo=https://svn.apache.org/repos/asf/subversion svn=svn olds=7 diff --git a/tools/dist/release.py b/tools/dist/release.py index 5518d6f..5b12c00 100755 --- a/tools/dist/release.py +++ b/tools/dist/release.py @@ -51,6 +51,9 @@ import operator import itertools import subprocess import argparse # standard in Python 2.7 +import io + +import backport.status # Find ezt, using Subversion's copy, if there isn't one on the system. try: @@ -71,16 +74,40 @@ tool_versions = { '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'], 'libtool' : ['2.4.6', 'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'], - 'swig' : ['3.0.10', - '2939aae39dec06095462f1b95ce1c958ac80d07b926e48871046d17c0094f44c'], + 'swig' : ['3.0.12', + '7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'], + }, + '1.13' : { + 'autoconf' : ['2.69', + '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'], + 'libtool' : ['2.4.6', + 'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'], + 'swig' : ['3.0.12', + '7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'], + }, + '1.12' : { + 'autoconf' : ['2.69', + '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'], + 'libtool' : ['2.4.6', + 'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'], + 'swig' : ['3.0.12', + '7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'], + }, + '1.11' : { + 'autoconf' : ['2.69', + '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'], + 'libtool' : ['2.4.6', + 'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'], + 'swig' : ['3.0.12', + '7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'], }, '1.10' : { 'autoconf' : ['2.69', '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'], 'libtool' : ['2.4.6', 'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'], - 'swig' : ['3.0.10', - '2939aae39dec06095462f1b95ce1c958ac80d07b926e48871046d17c0094f44c'], + 'swig' : ['3.0.12', + '7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'], }, '1.9' : { 'autoconf' : ['2.69', @@ -102,14 +129,16 @@ tool_versions = { # The version that is our current recommended release # ### TODO: derive this from svn_version.h; see ../../build/getversion.py -recommended_release = '1.9' +recommended_release = '1.12' +# For clean-dist, a whitelist of artifacts to keep, by version. +supported_release_lines = frozenset({"1.9", "1.10", "1.12", "1.13"}) # Some constants -repos = 'https://svn.apache.org/repos/asf/subversion' -secure_repos = 'https://svn.apache.org/repos/asf/subversion' +svn_repos = 'https://svn.apache.org/repos/asf/subversion' dist_repos = 'https://dist.apache.org/repos/dist' dist_dev_url = dist_repos + '/dev/subversion' dist_release_url = dist_repos + '/release/subversion' +dist_archive_url = 'https://archive.apache.org/dist/subversion' KEYS = 'https://people.apache.org/keys/group/subversion.asc' extns = ['zip', 'tar.gz', 'tar.bz2'] @@ -174,7 +203,7 @@ class Version(object): ver_tag = '" (Alpha %d)"' % self.pre_num ver_numtag = '"-alpha%d"' % self.pre_num elif self.pre == 'beta': - ver_tag = '" (Beta %d)"' % args.version.pre_num + ver_tag = '" (Beta %d)"' % self.pre_num ver_numtag = '"-beta%d"' % self.pre_num elif self.pre == 'rc': ver_tag = '" (Release Candidate %d)"' % self.pre_num @@ -263,6 +292,15 @@ def get_target(args): else: return get_deploydir(args.base_dir) +def get_branch_path(args): + if not args.branch: + try: + args.branch = 'branches/%d.%d.x' % (args.version.major, args.version.minor) + except AttributeError: + raise RuntimeError("Please specify the release version label or --branch-path") + + return args.branch.rstrip('/') # canonicalize for later comparisons + def get_tmpldir(): return os.path.join(os.path.abspath(sys.path[0]), 'templates') @@ -271,7 +309,7 @@ def get_tmplfile(filename): return open(os.path.join(get_tmpldir(), filename)) except IOError: # Hmm, we had a problem with the local version, let's try the repo - return urllib2.urlopen(repos + '/trunk/tools/dist/templates/' + filename) + return urllib2.urlopen(svn_repos + '/trunk/tools/dist/templates/' + filename) def get_nullfile(): return open(os.path.devnull, 'w') @@ -531,16 +569,12 @@ def replace_lines(path, actions): def roll_tarballs(args): 'Create the release artifacts.' - if not args.branch: - args.branch = 'branches/%d.%d.x' % (args.version.major, args.version.minor) - - branch = args.branch # shorthand - branch = branch.rstrip('/') # canonicalize for later comparisons + branch = get_branch_path(args) logging.info('Rolling release %s from branch %s@%d' % (args.version, branch, args.revnum)) - check_copyright_year(repos, args.branch, args.revnum) + check_copyright_year(svn_repos, branch, args.revnum) # Ensure we've got the appropriate rolling dependencies available autoconf = AutoconfDep(args.base_dir, False, args.verbose, @@ -559,7 +593,7 @@ def roll_tarballs(args): if branch != 'trunk': # Make sure CHANGES is sync'd. - compare_changes(repos, branch, args.revnum) + compare_changes(svn_repos, branch, args.revnum) # Ensure the output directory doesn't already exist if os.path.exists(get_deploydir(args.base_dir)): @@ -571,7 +605,7 @@ def roll_tarballs(args): logging.info('Preparing working copy source') shutil.rmtree(get_workdir(args.base_dir), True) run_script(args.verbose, 'svn checkout %s %s' - % (repos + '/' + branch + '@' + str(args.revnum), + % (svn_repos + '/' + branch + '@' + str(args.revnum), get_workdir(args.base_dir))) # Exclude stuff we don't want in the tarball, it will not be present @@ -712,9 +746,13 @@ def roll_tarballs(args): filepath = os.path.join(get_tempdir(args.base_dir), filename) shutil.move(filepath, get_deploydir(args.base_dir)) filepath = os.path.join(get_deploydir(args.base_dir), filename) - m = hashlib.sha1() - m.update(open(filepath, 'r').read()) - open(filepath + '.sha1', 'w').write(m.hexdigest()) + if args.version < Version("1.11.0-alpha1"): + # 1.10 and earlier generate *.sha1 files for compatibility reasons. + # They are deprecated, however, so we don't publicly link them in + # the announcements any more. + m = hashlib.sha1() + m.update(open(filepath, 'r').read()) + open(filepath + '.sha1', 'w').write(m.hexdigest()) m = hashlib.sha512() m.update(open(filepath, 'r').read()) open(filepath + '.sha512', 'w').write(m.hexdigest()) @@ -737,8 +775,12 @@ def sign_candidates(args): def sign_file(filename): asc_file = open(filename + '.asc', 'a') logging.info("Signing %s" % filename) - proc = subprocess.check_call(['gpg', '-ba', '-o', '-', filename], - stdout=asc_file) + if args.userid: + proc = subprocess.check_call(['gpg', '-ba', '-u', args.userid, + '-o', '-', filename], stdout=asc_file) + else: + proc = subprocess.check_call(['gpg', '-ba', '-o', '-', filename], + stdout=asc_file) asc_file.close() target = get_target(args) @@ -746,7 +788,7 @@ def sign_candidates(args): for e in extns: filename = os.path.join(target, 'subversion-%s.%s' % (args.version, e)) sign_file(filename) - if args.version.major >= 1 and args.version.minor <= 6: + if args.version.major == 1 and args.version.minor <= 6: filename = os.path.join(target, 'subversion-deps-%s.%s' % (args.version, e)) sign_file(filename) @@ -773,26 +815,24 @@ def post_candidates(args): #---------------------------------------------------------------------- # Create tag +# Bump versions on branch -def create_tag(args): +def create_tag_only(args): 'Create tag in the repository' target = get_target(args) logging.info('Creating tag for %s' % str(args.version)) - if not args.branch: - args.branch = 'branches/%d.%d.x' % (args.version.major, args.version.minor) - - branch = secure_repos + '/' + args.branch.rstrip('/') + branch_url = svn_repos + '/' + get_branch_path(args) - tag = secure_repos + '/tags/' + str(args.version) + tag = svn_repos + '/tags/' + str(args.version) svnmucc_cmd = ['svnmucc', '-m', 'Tagging release ' + str(args.version)] if (args.username): svnmucc_cmd += ['--username', args.username] - svnmucc_cmd += ['cp', str(args.revnum), branch, tag] + svnmucc_cmd += ['cp', str(args.revnum), branch_url, tag] svnmucc_cmd += ['put', os.path.join(target, 'svn_version.h.dist' + '-' + str(args.version)), tag + '/subversion/include/svn_version.h'] @@ -805,62 +845,84 @@ def create_tag(args): logging.error("Do you need to pass --branch=trunk?") raise +def bump_versions_on_branch(args): + 'Bump version numbers on branch' + + logging.info('Bumping version numbers on the branch') + + branch_url = svn_repos + '/' + get_branch_path(args) + + def replace_in_place(fd, startofline, flat, spare): + """In file object FD, replace FLAT with SPARE in the first line + starting with regex STARTOFLINE.""" + + pattern = r'^(%s)%s' % (startofline, re.escape(flat)) + repl = r'\g<1>%s' % (spare,) + fd.seek(0, os.SEEK_SET) + lines = fd.readlines() + for i, line in enumerate(lines): + replacement = re.sub(pattern, repl, line) + if replacement != line: + lines[i] = replacement + break + else: + raise RuntimeError("Could not replace r'%s' with r'%s' in '%s'" + % (pattern, repl, fd.url)) + + fd.seek(0, os.SEEK_SET) + fd.writelines(lines) + fd.truncate() # for current callers, new value is never shorter. + + new_version = Version('%d.%d.%d' % + (args.version.major, args.version.minor, + args.version.patch + 1)) + + HEAD = subprocess.check_output(['svn', 'info', '--show-item=revision', + '--', branch_url]).strip() + HEAD = int(HEAD) + def file_object_for(relpath): + fd = tempfile.NamedTemporaryFile() + url = branch_url + '/' + relpath + fd.url = url + subprocess.check_call(['svn', 'cat', '%s@%d' % (url, HEAD)], + stdout=fd) + return fd + + svn_version_h = file_object_for('subversion/include/svn_version.h') + replace_in_place(svn_version_h, '#define SVN_VER_PATCH *', + str(args.version.patch), str(new_version.patch)) + + STATUS = file_object_for('STATUS') + replace_in_place(STATUS, 'Status of ', + str(args.version), str(new_version)) + + svn_version_h.seek(0, os.SEEK_SET) + STATUS.seek(0, os.SEEK_SET) + subprocess.check_call(['svnmucc', '-r', str(HEAD), + '-m', 'Post-release housekeeping: ' + 'bump the %s branch to %s.' + % (branch_url.split('/')[-1], str(new_version)), + 'put', svn_version_h.name, svn_version_h.url, + 'put', STATUS.name, STATUS.url, + ]) + del svn_version_h + del STATUS + +def create_tag_and_bump_versions(args): + '''Create tag in the repository and, if not a prerelease version, + bump version numbers on the branch''' + + create_tag_only(args) + if not args.version.is_prerelease(): - logging.info('Bumping revisions on the branch') - def replace_in_place(fd, startofline, flat, spare): - """In file object FD, replace FLAT with SPARE in the first line - starting with STARTOFLINE.""" - - fd.seek(0, os.SEEK_SET) - lines = fd.readlines() - for i, line in enumerate(lines): - if line.startswith(startofline): - lines[i] = line.replace(flat, spare) - break - else: - raise RuntimeError('Definition of %r not found' % startofline) - - fd.seek(0, os.SEEK_SET) - fd.writelines(lines) - fd.truncate() # for current callers, new value is never shorter. - - new_version = Version('%d.%d.%d' % - (args.version.major, args.version.minor, - args.version.patch + 1)) - - def file_object_for(relpath): - fd = tempfile.NamedTemporaryFile() - url = branch + '/' + relpath - fd.url = url - subprocess.check_call(['svn', 'cat', '%s@%d' % (url, args.revnum)], - stdout=fd) - return fd - - svn_version_h = file_object_for('subversion/include/svn_version.h') - replace_in_place(svn_version_h, '#define SVN_VER_PATCH ', - str(args.version.patch), str(new_version.patch)) - - STATUS = file_object_for('STATUS') - replace_in_place(STATUS, 'Status of ', - str(args.version), str(new_version)) - - svn_version_h.seek(0, os.SEEK_SET) - STATUS.seek(0, os.SEEK_SET) - subprocess.check_call(['svnmucc', '-r', str(args.revnum), - '-m', 'Post-release housekeeping: ' - 'bump the %s branch to %s.' - % (branch.split('/')[-1], str(new_version)), - 'put', svn_version_h.name, svn_version_h.url, - 'put', STATUS.name, STATUS.url, - ]) - del svn_version_h - del STATUS + bump_versions_on_branch(args) #---------------------------------------------------------------------- # Clean dist def clean_dist(args): - 'Clean the distribution directory of all but the most recent artifacts.' + '''Clean the distribution directory of release artifacts of + no-longer-supported minor lines.''' stdout = subprocess.check_output(['svn', 'list', dist_release_url]) @@ -872,21 +934,20 @@ def clean_dist(args): filenames = stdout.split('\n') filenames = filter(lambda x: x.startswith('subversion-'), filenames) versions = set(map(Version, filenames)) - minor_lines = set(map(minor, versions)) to_keep = set() - # Keep 3 minor lines: 1.10.0-alpha3, 1.9.7, 1.8.19. # TODO: When we release 1.A.0 GA we'll have to manually remove 1.(A-2).* artifacts. - for recent_line in sorted(minor_lines, reverse=True)[:3]: - to_keep.add(max( + for line_to_keep in [minor(Version(x + ".0")) for x in supported_release_lines]: + candidates = list( x for x in versions - if minor(x) == recent_line - )) + if minor(x) == line_to_keep + ) + if candidates: + to_keep.add(max(candidates)) for i in sorted(to_keep): logging.info("Saving release '%s'", i) svnmucc_cmd = ['svnmucc', '-m', 'Remove old Subversion releases.\n' + - 'They are still available at ' + - 'https://archive.apache.org/dist/subversion/'] + 'They are still available at ' + dist_archive_url] if (args.username): svnmucc_cmd += ['--username', args.username] for filename in filenames: @@ -938,6 +999,7 @@ def write_news(args): 'version_base' : args.version.base, 'anchor': args.version.get_download_anchor(), 'is_recommended': ezt_bool(args.version.is_recommended()), + 'announcement_url': args.announcement_url, } if args.version.is_prerelease(): @@ -947,38 +1009,53 @@ def write_news(args): template = ezt.Template() template.parse(get_tmplfile(template_filename).read()) - template.generate(sys.stdout, data) + + # Insert the output into an existing file if requested, else print it + if args.edit_html_file: + tmp_name = args.edit_html_file + '.tmp' + with open(args.edit_html_file, 'r') as f, open(tmp_name, 'w') as g: + inserted = False + for line in f: + if not inserted and line.startswith('
    1 else '') + print(' * %s (%s)' % (change, rev_string)) + +def write_changelog(args): + 'Write changelog, parsed from commit messages' + # Changelog lines are lines with the following format: + # '['[audience[:section]]']' + # or: + # '['[audience[:section]]']' + # where audience = U (User-visible) or D (Developer-visible) + # section = general|major|minor|client|server|clientserver|other|api|bindings + # (section is optional and is treated case-insensitively) + # message = the actual text for CHANGES + # + # This means the "changes label" can be used as prefix or suffix, and it + # can also be left empty (which results in an uncategorized changes entry), + # if the committer isn't sure where the changelog entry belongs. + # + # Putting [skip], [ignore], [c:skip] or [c:ignore] somewhere in the + # log message means this commit must be ignored for Changelog processing + # (ignored even with the --include-unlabeled-summaries option). + # + # If there is no changes label anywhere in the commit message, and the + # --include-unlabeled-summaries option is used, we'll consider the summary + # line of the commit message (= first line except if it starts with a *) + # as an uncategorized changes entry, except if it contains "status", + # "changes", "post-release housekeeping" or "follow-up". + # + # Examples: + # [U:major] Better interactive conflict resolution for tree conflicts + # ra_serf: Adjustments for serf versions with HTTP/2 support [U:minor] + # [U] Fix 'svn diff URL@REV WC' wrongly looks up URL@HEAD (issue #4597) + # Fix bug with canonicalizing Window-specific drive-relative URL [] + # New svn_ra_list() API function [D:api] + # [D:bindings] JavaHL: Allow access to constructors of a couple JavaHL classes + + branch_url = svn_repos + '/' + get_branch_path(args) + previous = svn_repos + '/' + args.previous + include_unlabeled = args.include_unlabeled + separator_line = ('-' * 72) + '\n' + + mergeinfo = subprocess.check_output(['svn', 'mergeinfo', '--show-revs', + 'eligible', '--log', branch_url, previous]) + log_messages_dict = { + # This is a dictionary mapping revision numbers to their respective + # log messages. The expression in the "key:" part of the dict + # comprehension extracts the revision number, as integer, from the + # 'svn log' output. + int(log_message.splitlines()[0].split()[0][1:]): log_message + # The [1:-1] ignores the empty first and last element of the split(). + for log_message in mergeinfo.split(separator_line)[1:-1] + } + mergeinfo = mergeinfo.splitlines() + + separator_pattern = re.compile('^-{72}$') + revline_pattern = re.compile('^r(\d+) \| [^\|]+ \| [^\|]+ \| \d+ lines?$') + changes_prefix_pattern = re.compile(r'^\[(U|D)?:?([^\]]+)?\](.+)$') + changes_suffix_pattern = re.compile(r'^(.+)\[(U|D)?:?([^\]]+)?\]$') + # TODO: push this into backport.status as a library function + auto_merge_pattern = \ + re.compile(r'^Merge (r\d+,? |the r\d+ group |the \S+ branch:)') + + changes_dict = dict() # audience -> (section -> (change -> set(revision))) + revision = -1 + got_firstline = False + unlabeled_summary = None + changes_ignore = False + audience = None + section = None + message = None + + for line in mergeinfo: + if separator_pattern.match(line): + # New revision section. Reset variables. + # If there's an unlabeled summary from a previous section, and + # include_unlabeled is True, put it into uncategorized_changes. + if include_unlabeled and unlabeled_summary and not changes_ignore: + if auto_merge_pattern.match(unlabeled_summary): + # 1. Parse revision numbers from the first line + merged_revisions = [ + int(x) for x in + re.compile(r'(?<=\br)\d+\b').findall(unlabeled_summary) + ] + # TODO pass each revnum in MERGED_REVISIONS through this + # logic, in order to extract CHANGES_PREFIX_PATTERN + # and CHANGES_SUFFIX_PATTERN lines from the trunk log + # message. + + # 2. Parse the STATUS entry + this_log_message = log_messages_dict[revision] + status_paragraph = this_log_message.split('\n\n')[2] + logsummary = \ + backport.status.StatusEntry(status_paragraph).logsummary + add_to_changes_dict(changes_dict, None, None, + ' '.join(logsummary), revision) + else: + add_to_changes_dict(changes_dict, None, None, + unlabeled_summary, revision) + revision = -1 + got_firstline = False + unlabeled_summary = None + changes_ignore = False + audience = None + section = None + message = None + continue + + revmatch = revline_pattern.match(line) + if revmatch and (revision == -1): + # A revision line: get the revision number + revision = int(revmatch.group(1)) + logging.debug('Changelog processing revision r%d' % revision) + continue + + if line.strip() == '': + # Skip empty / whitespace lines + continue + + if not got_firstline: + got_firstline = True + if (not re.search(r'status|changes|post-release housekeeping|follow-up|^\*', + line, re.IGNORECASE) + and not changes_prefix_pattern.match(line) + and not changes_suffix_pattern.match(line)): + unlabeled_summary = line + + if re.search(r'\[(c:)?(skip|ignore)\]', line, re.IGNORECASE): + changes_ignore = True + + prefix_match = changes_prefix_pattern.match(line) + if prefix_match: + audience = prefix_match.group(1) + section = prefix_match.group(2) + message = prefix_match.group(3) + add_to_changes_dict(changes_dict, audience, section, message, revision) + + suffix_match = changes_suffix_pattern.match(line) + if suffix_match: + message = suffix_match.group(1) + audience = suffix_match.group(2) + section = suffix_match.group(3) + add_to_changes_dict(changes_dict, audience, section, message, revision) + + # Output the sorted changelog entries + # 1) Uncategorized changes + print_section(changes_dict, None, None, None) + print + # 2) User-visible changes + print(' User-visible changes:') + print_section(changes_dict, 'U', None, None) + print_section(changes_dict, 'U', 'general', 'General') + print_section(changes_dict, 'U', 'major', 'Major new features') + print_section(changes_dict, 'U', 'minor', 'Minor new features and improvements') + print_section(changes_dict, 'U', 'client', 'Client-side bugfixes', mandatory=True) + print_section(changes_dict, 'U', 'server', 'Server-side bugfixes', mandatory=True) + print_section(changes_dict, 'U', 'clientserver', 'Client-side and server-side bugfixes') + print_section(changes_dict, 'U', 'other', 'Other tool improvements and bugfixes') + print_section(changes_dict, 'U', 'bindings', 'Bindings bugfixes', mandatory=True) + print + # 3) Developer-visible changes + print(' Developer-visible changes:') + print_section(changes_dict, 'D', None, None) + print_section(changes_dict, 'D', 'general', 'General', mandatory=True) + print_section(changes_dict, 'D', 'api', 'API changes', mandatory=True) + print_section(changes_dict, 'D', 'bindings', 'Bindings') + #---------------------------------------------------------------------- # Main entry point for argument parsing and handling @@ -1191,6 +1466,10 @@ def main(): help='''The directory in which to create needed files and folders. The default is the current working directory.''') + parser.add_argument('--branch', + help='''The branch to base the release on, + as a path relative to ^/subversion/. + Default: 'branches/MAJOR.MINOR.x'.''') subparsers = parser.add_subparsers(title='subcommands') # Setup the parser for the build-env subcommand @@ -1216,9 +1495,6 @@ def main(): help='''The release label, such as '1.7.0-alpha1'.''') subparser.add_argument('revnum', type=lambda arg: int(arg.lstrip('r')), help='''The revision number to base the release on.''') - subparser.add_argument('--branch', - help='''The branch to base the release on, - relative to ^/subversion/.''') subparser.add_argument('--patches', help='''The path to the directory containing patches.''') @@ -1231,6 +1507,10 @@ def main(): subparser.add_argument('--target', help='''The full path to the directory containing release artifacts.''') + subparser.add_argument('--userid', + help='''The (optional) USER-ID specifying the key to be + used for signing, such as '110B1C95' (Key-ID). If + omitted, uses the default key.''') # Setup the parser for the post-candidates subcommand subparser = subparsers.add_parser('post-candidates', @@ -1247,25 +1527,36 @@ def main(): # Setup the parser for the create-tag subcommand subparser = subparsers.add_parser('create-tag', - help='''Create the release tag.''') - subparser.set_defaults(func=create_tag) + help='''Create the release tag and, if not a prerelease + version, bump version numbers on the branch.''') + subparser.set_defaults(func=create_tag_and_bump_versions) + subparser.add_argument('version', type=Version, + help='''The release label, such as '1.7.0-alpha1'.''') + subparser.add_argument('revnum', type=lambda arg: int(arg.lstrip('r')), + help='''The revision number to base the release on.''') + subparser.add_argument('--username', + help='''Username for ''' + svn_repos + '''.''') + subparser.add_argument('--target', + help='''The full path to the directory containing + release artifacts.''') + + # Setup the parser for the bump-versions-on-branch subcommand + subparser = subparsers.add_parser('bump-versions-on-branch', + help='''Bump version numbers on branch.''') + subparser.set_defaults(func=bump_versions_on_branch) subparser.add_argument('version', type=Version, help='''The release label, such as '1.7.0-alpha1'.''') subparser.add_argument('revnum', type=lambda arg: int(arg.lstrip('r')), help='''The revision number to base the release on.''') - subparser.add_argument('--branch', - help='''The branch to base the release on, - relative to ^/subversion/.''') subparser.add_argument('--username', - help='''Username for ''' + secure_repos + '''.''') + help='''Username for ''' + svn_repos + '''.''') subparser.add_argument('--target', help='''The full path to the directory containing release artifacts.''') # The clean-dist subcommand subparser = subparsers.add_parser('clean-dist', - help='''Clean the distribution directory (and mirrors) of - all but the most recent MAJOR.MINOR release.''') + help=clean_dist.__doc__.split('\n\n')[0]) subparser.set_defaults(func=clean_dist) subparser.add_argument('--dist-dir', help='''The directory to clean.''') @@ -1288,6 +1579,11 @@ def main(): help='''Output to stdout template text for use in the news section of the Subversion website.''') subparser.set_defaults(func=write_news) + subparser.add_argument('--announcement-url', + help='''The URL to the archived announcement email.''') + subparser.add_argument('--edit-html-file', + help='''Insert the text into this file + news.html, index.html).''') subparser.add_argument('version', type=Version, help='''The release label, such as '1.7.0-alpha1'.''') @@ -1338,6 +1634,25 @@ def main(): separate subcommand.''') subparser.set_defaults(func=cleanup) + # write-changelog + subparser = subparsers.add_parser('write-changelog', + help='''Output to stdout changelog entries parsed from + commit messages, optionally labeled with a category + like [U:client], [D:api], [U], ...''') + subparser.set_defaults(func=write_changelog) + subparser.add_argument('previous', + help='''The "previous" branch or tag, relative to + ^/subversion/, to compare "branch" against.''') + subparser.add_argument('--include-unlabeled-summaries', + dest='include_unlabeled', + action='store_true', default=False, + help='''Include summary lines that do not have a changes + label, unless an explicit [c:skip] or [c:ignore] + is part of the commit message (except if the + summary line contains 'STATUS', 'CHANGES', + 'Post-release housekeeping', 'Follow-up' or starts + with '*').''') + # Parse the arguments args = parser.parse_args() diff --git a/tools/dist/security/parser.py b/tools/dist/security/parser.py index 2f1b883..2827e94 100644 --- a/tools/dist/security/parser.py +++ b/tools/dist/security/parser.py @@ -50,9 +50,16 @@ class Notification(object): CULPRIT_SERVER = 'server' CULPRIT_CLIENT = 'client' - __CULPRITS = ((CULPRIT_SERVER, CULPRIT_CLIENT, - (CULPRIT_SERVER, CULPRIT_CLIENT), - (CULPRIT_CLIENT, CULPRIT_SERVER))) + # For compatibility, 'client' and 'server' may be specified either with + # or without a tuple. + __CULPRITS = ( + CULPRIT_SERVER, + CULPRIT_CLIENT, + (CULPRIT_SERVER,) + (CULPRIT_CLIENT,) + (CULPRIT_SERVER, CULPRIT_CLIENT), + (CULPRIT_CLIENT, CULPRIT_SERVER), + ) def __init__(self, basedir, tracking_id, title, culprit, advisory, patches): diff --git a/tools/dist/templates/download.ezt b/tools/dist/templates/download.ezt index 4c6fda8..19dac3d 100644 --- a/tools/dist/templates/download.ezt +++ b/tools/dist/templates/download.ezt @@ -2,16 +2,14 @@ - [for fileinfo] - - - + + [end]
    FileChecksum (SHA1) Checksum (SHA512) Signatures
    [fileinfo.filename][fileinfo.sha1] [SHA-512][PGP][SHA-512][PGP]
    diff --git a/tools/dist/templates/rc-news.ezt b/tools/dist/templates/rc-news.ezt index a645ffa..04f094d 100644 --- a/tools/dist/templates/rc-news.ezt +++ b/tools/dist/templates/rc-news.ezt @@ -8,10 +8,10 @@ release is not intended for production use, but is provided as a milestone to encourage wider testing and feedback from intrepid users and maintainers. Please see the - release + release announcement for more information about this release, and the release notes and - + change log for information about what will eventually be in the [version_base] release.

    diff --git a/tools/dist/templates/rc-release-ann.ezt b/tools/dist/templates/rc-release-ann.ezt index ca5f4d0..a8bb0f5 100644 --- a/tools/dist/templates/rc-release-ann.ezt +++ b/tools/dist/templates/rc-release-ann.ezt @@ -1,16 +1,13 @@ From: ...@apache.org To: announce@subversion.apache.org, users@subversion.apache.org, dev@subversion.apache.org, announce@apache.org +Reply-To: users@subversion.apache.org Subject: [[]ANNOUNCE] Apache Subversion [version] released I'm happy to announce the release of Apache Subversion [version]. Please choose the mirror closest to you by visiting: - http://subversion.apache.org/download.cgi#[anchor] + https://subversion.apache.org/download.cgi#[anchor] -The SHA1 checksums are: - -[for sha1info] [sha1info.sha1] [sha1info.filename] -[end] SHA-512 checksums are available at: https://www.apache.org/dist/subversion/subversion-[version].tar.bz2.sha512 @@ -19,9 +16,9 @@ SHA-512 checksums are available at: PGP Signatures are available at: - http://www.apache.org/dist/subversion/subversion-[version].tar.bz2.asc - http://www.apache.org/dist/subversion/subversion-[version].tar.gz.asc - http://www.apache.org/dist/subversion/subversion-[version].zip.asc + https://www.apache.org/dist/subversion/subversion-[version].tar.bz2.asc + https://www.apache.org/dist/subversion/subversion-[version].tar.gz.asc + https://www.apache.org/dist/subversion/subversion-[version].zip.asc For this release, the following people have provided PGP signatures: @@ -57,13 +54,18 @@ end users please. Release notes for the [major-minor].x release series may be found at: - http://subversion.apache.org/docs/release-notes/[major-minor].html + https://subversion.apache.org/docs/release-notes/[major-minor].html You can find the list of changes between [version] and earlier versions at: - http://svn.apache.org/repos/asf/subversion/tags/[version]/CHANGES + https://svn.apache.org/repos/asf/subversion/tags/[version]/CHANGES Questions, comments, and bug reports to users@subversion.apache.org. Thanks, - The Subversion Team + +-- +To unsubscribe, please see: + + https://subversion.apache.org/mailing-lists.html#unsubscribing diff --git a/tools/dist/templates/stable-news.ezt b/tools/dist/templates/stable-news.ezt index 8fcaae9..4cd82ac 100644 --- a/tools/dist/templates/stable-news.ezt +++ b/tools/dist/templates/stable-news.ezt @@ -10,10 +10,10 @@ [else] This is the most complete release of the [major-minor].x line to date, and we encourage all users to upgrade as soon as reasonable. [end] Please see the - release announcement and the - change log for more information about this release.

    + release notes for more information about this release.

    To get this release from the nearest mirror, please visit our download page.

    diff --git a/tools/dist/templates/stable-release-ann.ezt b/tools/dist/templates/stable-release-ann.ezt index 2aec041..dea8c88 100644 --- a/tools/dist/templates/stable-release-ann.ezt +++ b/tools/dist/templates/stable-release-ann.ezt @@ -1,5 +1,6 @@ From: ...@apache.org To: announce@subversion.apache.org, users@subversion.apache.org, dev@subversion.apache.org, announce@apache.org +Reply-To: users@subversion.apache.org [if-any security]Cc: security@apache.org, oss-security@lists.openwall.com, bugtraq@securityfocus.com [end][if-any security]Subject: [[]SECURITY][[]ANNOUNCE] Apache Subversion [version] released [else]Subject: [[]ANNOUNCE] Apache Subversion [version] released @@ -7,7 +8,7 @@ To: announce@subversion.apache.org, users@subversion.apache.org, dev@subversion. I'm happy to announce the release of Apache Subversion [version]. Please choose the mirror closest to you by visiting: - http://subversion.apache.org/download.cgi#[anchor] + https://subversion.apache.org/download.cgi#[anchor] [if-any dot-zero] This is a stable feature release of the Apache Subversion open source version control system. @@ -18,10 +19,6 @@ open source version control system. This is a stable bugfix release of the Apache Subversion open source version control system. [end][end] -The SHA1 checksums are: - -[for sha1info] [sha1info.sha1] [sha1info.filename] -[end] SHA-512 checksums are available at: https://www.apache.org/dist/subversion/subversion-[version].tar.bz2.sha512 @@ -30,22 +27,27 @@ SHA-512 checksums are available at: PGP Signatures are available at: - http://www.apache.org/dist/subversion/subversion-[version].tar.bz2.asc - http://www.apache.org/dist/subversion/subversion-[version].tar.gz.asc - http://www.apache.org/dist/subversion/subversion-[version].zip.asc + https://www.apache.org/dist/subversion/subversion-[version].tar.bz2.asc + https://www.apache.org/dist/subversion/subversion-[version].tar.gz.asc + https://www.apache.org/dist/subversion/subversion-[version].zip.asc For this release, the following people have provided PGP signatures: [siginfo] Release notes for the [major-minor].x release series may be found at: - http://subversion.apache.org/docs/release-notes/[major-minor].html + https://subversion.apache.org/docs/release-notes/[major-minor].html You can find the list of changes between [version] and earlier versions at: - http://svn.apache.org/repos/asf/subversion/tags/[version]/CHANGES + https://svn.apache.org/repos/asf/subversion/tags/[version]/CHANGES Questions, comments, and bug reports to users@subversion.apache.org. Thanks, - The Subversion Team + +-- +To unsubscribe, please see: + + https://subversion.apache.org/mailing-lists.html#unsubscribing diff --git a/tools/examples/svnlook.py b/tools/examples/svnlook.py index 5865e22..c289aeb 100755 --- a/tools/examples/svnlook.py +++ b/tools/examples/svnlook.py @@ -21,7 +21,7 @@ # under the License. ###################################################################### # -# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.10.x/tools/examples/svnlook.py $ +# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/tools/examples/svnlook.py $ # $LastChangedDate: 2013-11-14 11:11:07 +0000 (Thu, 14 Nov 2013) $ # $LastChangedRevision: 1541878 $ diff --git a/tools/hook-scripts/commit-access-control.pl.in b/tools/hook-scripts/commit-access-control.pl.in index 5710276..ceb5e73 100755 --- a/tools/hook-scripts/commit-access-control.pl.in +++ b/tools/hook-scripts/commit-access-control.pl.in @@ -6,7 +6,7 @@ # commit in repository REPOS using the permissions listed in the # configuration file CONF_FILE. # -# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.10.x/tools/hook-scripts/commit-access-control.pl.in $ +# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/tools/hook-scripts/commit-access-control.pl.in $ # $LastChangedDate: 2009-11-16 19:07:17 +0000 (Mon, 16 Nov 2009) $ # $LastChangedBy: hwright $ # $LastChangedRevision: 880911 $ diff --git a/tools/hook-scripts/mailer/mailer.py b/tools/hook-scripts/mailer/mailer.py index c8d658c..b3045f3 100755 --- a/tools/hook-scripts/mailer/mailer.py +++ b/tools/hook-scripts/mailer/mailer.py @@ -22,10 +22,10 @@ # # mailer.py: send email describing a commit # -# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.10.x/tools/hook-scripts/mailer/mailer.py $ -# $LastChangedDate: 2017-01-07 19:35:49 +0000 (Sat, 07 Jan 2017) $ -# $LastChangedBy: julianfoad $ -# $LastChangedRevision: 1777846 $ +# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/tools/hook-scripts/mailer/mailer.py $ +# $LastChangedDate: 2018-02-18 19:06:38 +0000 (Sun, 18 Feb 2018) $ +# $LastChangedBy: danielsh $ +# $LastChangedRevision: 1824690 $ # # USAGE: mailer.py commit REPOS REVISION [CONFIG-FILE] # mailer.py propchange REPOS REVISION AUTHOR REVPROPNAME [CONFIG-FILE] @@ -71,16 +71,10 @@ _MIN_SVN_VERSION = [1, 5, 0] # Import the Subversion Python bindings, making sure they meet our # minimum version requirements. -try: - import svn.fs - import svn.delta - import svn.repos - import svn.core -except ImportError: - sys.stderr.write( - "You need version %s or better of the Subversion Python bindings.\n" \ - % ".".join([str(x) for x in _MIN_SVN_VERSION])) - sys.exit(1) +import svn.fs +import svn.delta +import svn.repos +import svn.core if _MIN_SVN_VERSION > [svn.core.SVN_VER_MAJOR, svn.core.SVN_VER_MINOR, svn.core.SVN_VER_PATCH]: diff --git a/tools/hook-scripts/svn2feed.py b/tools/hook-scripts/svn2feed.py index c3abe8c..e2fe2f3 100755 --- a/tools/hook-scripts/svn2feed.py +++ b/tools/hook-scripts/svn2feed.py @@ -70,7 +70,7 @@ Options: # is actually set only on initial feed creation, and thereafter simply # re-used from the pickle each time. -# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.10.x/tools/hook-scripts/svn2feed.py $ +# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/tools/hook-scripts/svn2feed.py $ # $LastChangedDate: 2016-04-30 08:16:53 +0000 (Sat, 30 Apr 2016) $ # $LastChangedBy: stefan2 $ # $LastChangedRevision: 1741723 $ diff --git a/tools/hook-scripts/svnperms.py b/tools/hook-scripts/svnperms.py index 6f059fa..f029db0 100755 --- a/tools/hook-scripts/svnperms.py +++ b/tools/hook-scripts/svnperms.py @@ -21,7 +21,7 @@ # # -# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.10.x/tools/hook-scripts/svnperms.py $ +# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/tools/hook-scripts/svnperms.py $ # $LastChangedDate: 2016-04-30 08:16:53 +0000 (Sat, 30 Apr 2016) $ # $LastChangedBy: stefan2 $ # $LastChangedRevision: 1741723 $ diff --git a/tools/server-side/fsfs-reshard.py b/tools/server-side/fsfs-reshard.py index d9937ad..d491c51 100755 --- a/tools/server-side/fsfs-reshard.py +++ b/tools/server-side/fsfs-reshard.py @@ -46,7 +46,7 @@ # under the License. # ==================================================================== # -# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.10.x/tools/server-side/fsfs-reshard.py $ +# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/tools/server-side/fsfs-reshard.py $ # $LastChangedDate: 2016-04-30 08:16:53 +0000 (Sat, 30 Apr 2016) $ # $LastChangedBy: stefan2 $ # $LastChangedRevision: 1741723 $ diff --git a/tools/server-side/svnauthz.c b/tools/server-side/svnauthz.c index fc6cd89..310757c 100644 --- a/tools/server-side/svnauthz.c +++ b/tools/server-side/svnauthz.c @@ -31,6 +31,7 @@ #include "private/svn_fspath.h" #include "private/svn_cmdline_private.h" +#include "svn_private_config.h" /*** Option Processing. ***/ @@ -99,6 +100,9 @@ struct svnauthz_opt_state /* Libtool command prefix */ #define SVNAUTHZ_LT_PREFIX "lt-" +/* The prefix for handling errors and warnings. */ +#define SVNAUTHZ_ERR_PREFIX "svnauthz: " + /*** Subcommands. */ @@ -110,29 +114,34 @@ static svn_opt_subcommand_t /* Array of available subcommands. * The entire list must be terminated with an entry of nulls. */ -static const svn_opt_subcommand_desc2_t cmd_table[] = +static const svn_opt_subcommand_desc3_t cmd_table[] = { - {"help", subcommand_help, {"?", "h"}, - ("usage: svnauthz help [SUBCOMMAND...]\n\n" - "Describe the usage of this program or its subcommands.\n"), + {"help", subcommand_help, {"?", "h"}, {( + "usage: svnauthz help [SUBCOMMAND...]\n" + "\n" + "Describe the usage of this program or its subcommands.\n" + )}, {0} }, - {"validate", subcommand_validate, {0} /* no aliases */, - ("Checks the syntax of an authz file.\n" + {"validate", subcommand_validate, {0} /* no aliases */, {( + "Checks the syntax of an authz file.\n" "usage: 1. svnauthz validate TARGET\n" - " 2. svnauthz validate --transaction TXN REPOS_PATH FILE_PATH\n\n" + " 2. svnauthz validate --transaction TXN REPOS_PATH FILE_PATH\n" + "\n" " 1. Loads and validates the syntax of the authz file at TARGET.\n" " TARGET can be a path to a file or an absolute file:// URL to an authz\n" - " file in a repository, but cannot be a repository relative URL (^/).\n\n" + " file in a repository, but cannot be a repository relative URL (^/).\n" + "\n" " 2. Loads and validates the syntax of the authz file at FILE_PATH in the\n" - " transaction TXN in the repository at REPOS_PATH.\n\n" + " transaction TXN in the repository at REPOS_PATH.\n" + "\n" "Returns:\n" " 0 when syntax is OK.\n" " 1 when syntax is invalid.\n" " 2 operational error\n" - ), + )}, {'t'} }, - {"accessof", subcommand_accessof, {0} /* no aliases */, - ("Print or test the permissions set by an authz file.\n" + {"accessof", subcommand_accessof, {0} /* no aliases */, {( + "Print or test the permissions set by an authz file.\n" "usage: 1. svnauthz accessof TARGET\n" " 2. svnauthz accessof -t TXN REPOS_PATH FILE_PATH\n" "\n" @@ -159,10 +168,10 @@ static const svn_opt_subcommand_desc2_t cmd_table[] = " 1 when syntax is invalid.\n" " 2 operational error\n" " 3 when '--is' argument doesn't match\n" - ), + )}, {'t', svnauthz__username, svnauthz__path, svnauthz__repos, svnauthz__is, svnauthz__groups_file, 'R'} }, - { NULL, NULL, {0}, NULL, {0} } + { NULL, NULL, {0}, {NULL}, {0} } }; static svn_error_t * @@ -171,11 +180,14 @@ subcommand_help(apr_getopt_t *os, void *baton, apr_pool_t *pool) struct svnauthz_opt_state *opt_state = baton; const char *header = ("general usage: svnauthz SUBCOMMAND TARGET [ARGS & OPTIONS ...]\n" - " " SVNAUTHZ_COMPAT_NAME " TARGET\n\n" + " " SVNAUTHZ_COMPAT_NAME " TARGET\n" + "\n" "If the command name starts with '" SVNAUTHZ_COMPAT_NAME "', runs in\n" - "pre-1.8 compatibility mode: run the 'validate' subcommand on TARGET.\n\n" + "pre-1.8 compatibility mode: run the 'validate' subcommand on TARGET.\n" + "\n" "Type 'svnauthz help ' for help on a specific subcommand.\n" - "Type 'svnauthz --version' to see the program version.\n\n" + "Type 'svnauthz --version' to see the program version.\n" + "\n" "Available subcommands:\n"); const char *fs_desc_start @@ -186,7 +198,7 @@ subcommand_help(apr_getopt_t *os, void *baton, apr_pool_t *pool) version_footer = svn_stringbuf_create(fs_desc_start, pool); SVN_ERR(svn_fs_print_modules(version_footer, pool)); - SVN_ERR(svn_opt_print_help4(os, "svnauthz", + SVN_ERR(svn_opt_print_help5(os, "svnauthz", opt_state ? opt_state->version : FALSE, FALSE, /* quiet */ FALSE, /* verbose */ @@ -216,6 +228,18 @@ read_file_contents(svn_stream_t **contents, const char *filename, return SVN_NO_ERROR; } +/* Handles warning emitted by the authz parser. */ +static void +handle_parser_warning(void *baton, + const svn_error_t *err, + apr_pool_t *scratch_pool) +{ + svn_handle_warning2(stderr, err, SVNAUTHZ_ERR_PREFIX); + SVN_UNUSED(baton); + SVN_UNUSED(scratch_pool); +} + + /* Loads the authz config into *AUTHZ from the file at AUTHZ_FILE in repository at REPOS_PATH from the transaction TXN_NAME. If GROUPS_FILE is set, the resulting *AUTHZ will be constructed from AUTHZ_FILE with @@ -248,7 +272,8 @@ get_authz_from_txn(svn_authz_t **authz, const char *repos_path, else groups_contents = NULL; - err = svn_repos_authz_parse(authz, authz_contents, groups_contents, pool); + err = svn_repos_authz_parse2(authz, authz_contents, groups_contents, + handle_parser_warning, NULL, pool, pool); /* Add the filename to the error stack since the parser doesn't have it. */ if (err != SVN_NO_ERROR) @@ -275,9 +300,11 @@ get_authz(svn_authz_t **authz, struct svnauthz_opt_state *opt_state, opt_state->txn, pool); /* Else */ - return svn_repos_authz_read3(authz, opt_state->authz_file, + return svn_repos_authz_read4(authz, opt_state->authz_file, opt_state->groups_file, - TRUE, NULL, pool, pool); + TRUE, NULL, + handle_parser_warning, NULL, + pool, pool); } static svn_error_t * @@ -387,7 +414,12 @@ subcommand_accessof(apr_getopt_t *os, void *baton, apr_pool_t *pool) static svn_boolean_t use_compat_mode(const char *cmd, apr_pool_t *pool) { - cmd = svn_dirent_internal_style(cmd, pool); + svn_error_t *err = svn_dirent_internal_style_safe(&cmd, NULL, cmd, pool, pool); + if (err) + { + svn_error_clear(err); + return FALSE; + } cmd = svn_dirent_basename(cmd, NULL); /* Skip over the Libtool command prefix if it exists on the command. */ @@ -429,7 +461,9 @@ canonicalize_access_file(const char **canonicalized_access_file, access_file); } - *canonicalized_access_file = svn_uri_canonicalize(access_file, pool); + SVN_ERR(svn_uri_canonicalize_safe( + canonicalized_access_file, NULL, + access_file, pool, pool)); } else if (within_txn) { @@ -442,8 +476,9 @@ canonicalize_access_file(const char **canonicalized_access_file, { /* If it isn't a URL and there's no transaction flag then it's a * dirent to the access file on local disk. */ - *canonicalized_access_file = - svn_dirent_internal_style(access_file, pool); + SVN_ERR(svn_dirent_internal_style_safe( + canonicalized_access_file, NULL, + access_file, pool, pool)); } return SVN_NO_ERROR; @@ -459,7 +494,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) { svn_error_t *err; - const svn_opt_subcommand_desc2_t *subcommand = NULL; + const svn_opt_subcommand_desc3_t *subcommand = NULL; struct svnauthz_opt_state opt_state = { 0 }; apr_getopt_t *os; apr_array_header_t *received_opts; @@ -545,9 +580,9 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) { /* Pre 1.8 compatibility mode. */ if (argc == 1) /* No path argument */ - subcommand = svn_opt_get_canonical_subcommand2(cmd_table, "help"); + subcommand = svn_opt_get_canonical_subcommand3(cmd_table, "help"); else - subcommand = svn_opt_get_canonical_subcommand2(cmd_table, "validate"); + subcommand = svn_opt_get_canonical_subcommand3(cmd_table, "validate"); } /* If the user asked for help, then the rest of the arguments are @@ -555,7 +590,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) just typos/mistakes. Whatever the case, the subcommand to actually run is subcommand_help(). */ if (opt_state.help) - subcommand = svn_opt_get_canonical_subcommand2(cmd_table, "help"); + subcommand = svn_opt_get_canonical_subcommand3(cmd_table, "help"); if (subcommand == NULL) { @@ -564,8 +599,8 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_state.version) { /* Use the "help" subcommand to handle the "--version" option. */ - static const svn_opt_subcommand_desc2_t pseudo_cmd = - { "--version", subcommand_help, {0}, "", + static const svn_opt_subcommand_desc3_t pseudo_cmd = + { "--version", subcommand_help, {0}, {""}, {svnauthz__version /* must accept its own option */ } }; subcommand = &pseudo_cmd; @@ -585,7 +620,7 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) SVN_ERR(svn_utf_cstring_to_utf8(&first_arg, os->argv[os->ind++], pool)); - subcommand = svn_opt_get_canonical_subcommand2(cmd_table, first_arg); + subcommand = svn_opt_get_canonical_subcommand3(cmd_table, first_arg); if (subcommand == NULL) { os->ind++; @@ -618,7 +653,9 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) pool)); os->ind++; - opt_state.repos_path = svn_dirent_internal_style(opt_state.repos_path, pool); + SVN_ERR(svn_dirent_internal_style_safe(&opt_state.repos_path, NULL, + opt_state.repos_path, + pool, pool)); } /* Exactly 1 non-option argument */ @@ -658,11 +695,11 @@ sub_main(int *exit_code, int argc, const char *argv[], apr_pool_t *pool) if (opt_id == 'h' || opt_id == '?') continue; - if (! svn_opt_subcommand_takes_option3(subcommand, opt_id, NULL)) + if (! svn_opt_subcommand_takes_option4(subcommand, opt_id, NULL)) { const char *optstr; const apr_getopt_option_t *badopt = - svn_opt_get_option_from_code2(opt_id, options_table, subcommand, + svn_opt_get_option_from_code3(opt_id, options_table, subcommand, pool); svn_opt_format_option(&optstr, badopt, FALSE, pool); if (subcommand->name[0] == '-') @@ -737,7 +774,7 @@ main(int argc, const char *argv[]) { if (exit_code == 0) exit_code = EXIT_FAILURE; - svn_cmdline_handle_exit_error(err, NULL, "svnauthz: "); + svn_cmdline_handle_exit_error(err, NULL, SVNAUTHZ_ERR_PREFIX); } svn_pool_destroy(pool); diff --git a/tools/server-side/svnpubsub/svnwcsub.py b/tools/server-side/svnpubsub/svnwcsub.py index 1a65b37..ca47293 100755 --- a/tools/server-side/svnpubsub/svnwcsub.py +++ b/tools/server-side/svnpubsub/svnwcsub.py @@ -32,7 +32,7 @@ # TODO: # - bulk update at startup time to avoid backlog warnings -# - fold BDEC into Daemon +# - fold BigDoEverythingClasss ("BDEC") into Daemon # - fold WorkingCopy._get_match() into __init__ # - remove wc_ready(). assume all WorkingCopy instances are usable. # place the instances into .watch at creation. the .update_applies() diff --git a/win-tests.py b/win-tests.py index 5aaa37c..a0bdfa6 100644 --- a/win-tests.py +++ b/win-tests.py @@ -24,7 +24,7 @@ Driver for running the tests on Windows. For a list of options, run this script with the --help option. """ -# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.10.x/win-tests.py $ +# $HeadURL: https://svn.apache.org/repos/asf/subversion/branches/1.13.x/win-tests.py $ # $LastChangedRevision: 1813897 $ import os, sys, subprocess -- cgit v1.2.3